summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--MOVED1
-rw-r--r--Mk/bsd.gstreamer.mk16
-rw-r--r--audio/Makefile1
-rw-r--r--graphics/Makefile2
-rw-r--r--graphics/gstreamer1-plugins-openjpeg/Makefile13
-rw-r--r--graphics/gstreamer1-plugins-webp/Makefile13
-rw-r--r--multimedia/Makefile1
-rw-r--r--multimedia/gstreamer1-libav/Makefile12
-rw-r--r--multimedia/gstreamer1-libav/distinfo4
-rw-r--r--multimedia/gstreamer1-libav/files/patch-ext_libav_gstavauddec.c12
-rw-r--r--multimedia/gstreamer1-libav/files/patch-ext_libav_gstavdec.c12
-rw-r--r--multimedia/gstreamer1-libav/pkg-plist2
-rw-r--r--multimedia/gstreamer1-plugins-all/Makefile5
-rw-r--r--multimedia/gstreamer1-plugins-bad/pkg-plist90
-rw-r--r--multimedia/gstreamer1-plugins-core/Makefile2
-rw-r--r--multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2-calls.c14
-rw-r--r--multimedia/gstreamer1-plugins-good/pkg-plist2
-rw-r--r--multimedia/gstreamer1-plugins-kate/Makefile (renamed from audio/gstreamer1-plugins-celt/Makefile)6
-rw-r--r--multimedia/gstreamer1-plugins/Makefile41
-rw-r--r--multimedia/gstreamer1-plugins/Makefile.common22
-rw-r--r--multimedia/gstreamer1-plugins/distinfo16
-rw-r--r--multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c8
-rw-r--r--multimedia/gstreamer1-plugins/pkg-plist31
-rw-r--r--multimedia/gstreamer1/Makefile11
-rw-r--r--multimedia/gstreamer1/distinfo4
-rw-r--r--multimedia/gstreamer1/files/patch-gst_gstdatetime.c12
-rw-r--r--multimedia/gstreamer1/pkg-plist14
27 files changed, 219 insertions, 148 deletions
diff --git a/MOVED b/MOVED
index 7ff3ae15fc09..85bc3f0253d9 100644
--- a/MOVED
+++ b/MOVED
@@ -5247,3 +5247,4 @@ devel/rubygem-ripper||2013-11-20|Removed: it is only for Ruby 1.8 which is remov
editors/mode-info||2013-11-20|Has expired: Misbuilding since 2004, not maintained since 2008
devel/netbsd-pkgsrc-mk-files||2013-11-20|Has expired: Imported for devel/mk-configure but no longer required
net/ptpd|net/ptpd2|2013-11-20|Protocol and software no longer supported
+audio/gstreamer1-plugins-celt||2013-11-20|Removed, audio/gstreamer1-plugins-opus can be used as replacement
diff --git a/Mk/bsd.gstreamer.mk b/Mk/bsd.gstreamer.mk
index 6fc403ed10a6..7df830991e01 100644
--- a/Mk/bsd.gstreamer.mk
+++ b/Mk/bsd.gstreamer.mk
@@ -55,10 +55,10 @@ GST_SHLIB_VERSION= 1
GSTREAMER1_PORT= ${PORTSDIR}/multimedia/gstreamer1-plugins
_GST1_LIB_BASE= ${LOCALBASE}/lib/gstreamer-${GST1_VERSION}
-GST1_VERSION= 1.0
+GST1_VERSION= 1.2
GST1_MINOR_VERSION= .0
GST1_SHLIB_VERSION= 0
-GST1_MINIMAL_VERSION= .8
+GST1_MINIMAL_VERSION= .0
#
# missing base: alsa ivorbisdec
@@ -89,8 +89,8 @@ _GSTREAMER_PLUGINS+= \
# plugins only in 1.0
.if defined(USE_GSTREAMER1)
_GSTREAMER_PLUGINS+= \
- assrender celt curl dvdread libav modplug png rtmp spandsp vpx \
- x ximagesrc zbar
+ assrender curl dvdread kate libav modplug openjpeg png rtmp \
+ spandsp vpx webp x ximagesrc zbar
.endif
# other plugins
@@ -118,8 +118,6 @@ artsd_DEPENDS= audio/gstreamer-plugins-artsd
audiofile_DEPENDS= audio/gstreamer-plugins-audiofile
-celt_DEPENDS= audio/gstreamer-plugins-celt
-
cdaudio_DEPENDS= audio/gstreamer-plugins-cdaudio
cdparanoia_DEPENDS= audio/gstreamer-plugins-cdparanoia
@@ -242,8 +240,12 @@ libvisual_DEPENDS= graphics/gstreamer-plugins-libvisual
opencv_DEPENDS= graphics/gstreamer-plugins-opencv
+openjpeg_DEPENDS= graphics/gstreamer-plugins-openjpeg
+
png_DEPENDS= graphics/gstreamer-plugins-png
+webp_DEPENDS= graphics/gstreamer-plugins-webp
+
zbar_DEPENDS= graphics/gstreamer-plugins-zbar
#-- multimedia plugins section --------------------------------------------#
@@ -271,6 +273,8 @@ good_DEPENDS= multimedia/gstreamer-plugins-good
gnonlin_DEPENDS= multimedia/gstreamer-plugins-gnonlin
+kate_DEPENDS= multimedia/gstreamer-plugins-kate
+
libav_DEPENDS= multimedia/gstreamer-libav
libav_GST_PREFIX= gstreamer1-
libav_GST_SUFX= # empty
diff --git a/audio/Makefile b/audio/Makefile
index c2deb07585c7..71bb86963111 100644
--- a/audio/Makefile
+++ b/audio/Makefile
@@ -276,7 +276,6 @@
SUBDIR += gstreamer1-plugins-amrnb
SUBDIR += gstreamer1-plugins-amrwbdec
SUBDIR += gstreamer1-plugins-cdparanoia
- SUBDIR += gstreamer1-plugins-celt
SUBDIR += gstreamer1-plugins-faac
SUBDIR += gstreamer1-plugins-faad
SUBDIR += gstreamer1-plugins-flac
diff --git a/graphics/Makefile b/graphics/Makefile
index 101fe89f69eb..03736b312e44 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -334,7 +334,9 @@
SUBDIR += gstreamer1-plugins-libcaca
SUBDIR += gstreamer1-plugins-libvisual
SUBDIR += gstreamer1-plugins-opencv
+ SUBDIR += gstreamer1-plugins-openjpeg
SUBDIR += gstreamer1-plugins-png
+ SUBDIR += gstreamer1-plugins-webp
SUBDIR += gstreamer1-plugins-zbar
SUBDIR += gthumb
SUBDIR += gtimelapse
diff --git a/graphics/gstreamer1-plugins-openjpeg/Makefile b/graphics/gstreamer1-plugins-openjpeg/Makefile
new file mode 100644
index 000000000000..fca954293d0a
--- /dev/null
+++ b/graphics/gstreamer1-plugins-openjpeg/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTREVISION= 0
+CATEGORIES= graphics
+
+COMMENT= Gstreamer jpeg2000 decoder plugin
+
+GST_PLUGIN= openjpeg
+DIST= bad
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/graphics/gstreamer1-plugins-webp/Makefile b/graphics/gstreamer1-plugins-webp/Makefile
new file mode 100644
index 000000000000..56a61a2bd385
--- /dev/null
+++ b/graphics/gstreamer1-plugins-webp/Makefile
@@ -0,0 +1,13 @@
+# $FreeBSD$
+
+PORTREVISION= 0
+CATEGORIES= graphics
+
+COMMENT= Gstreamer webp image decoder plugin
+
+GST_PLUGIN= webp
+DIST= bad
+
+MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
+
+.include "${MASTERDIR}/Makefile"
diff --git a/multimedia/Makefile b/multimedia/Makefile
index dc8451ba6969..967842e2ba0c 100644
--- a/multimedia/Makefile
+++ b/multimedia/Makefile
@@ -123,6 +123,7 @@
SUBDIR += gstreamer1-plugins-dv
SUBDIR += gstreamer1-plugins-dvdread
SUBDIR += gstreamer1-plugins-good
+ SUBDIR += gstreamer1-plugins-kate
SUBDIR += gstreamer1-plugins-mpeg2dec
SUBDIR += gstreamer1-plugins-mpeg2enc
SUBDIR += gstreamer1-plugins-resindvd
diff --git a/multimedia/gstreamer1-libav/Makefile b/multimedia/gstreamer1-libav/Makefile
index fca69f20b508..97049e1d4ee0 100644
--- a/multimedia/gstreamer1-libav/Makefile
+++ b/multimedia/gstreamer1-libav/Makefile
@@ -3,7 +3,7 @@
# $MCom: ports/multimedia/gstreamer1-libav/Makefile,v 1.4 2013/01/15 21:43:45 kwm Exp $
PORTNAME= gstreamer1-libav
-PORTVERSION= 1.0.10
+PORTVERSION= 1.2.1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gst-libav/
DISTNAME= gst-libav-${PORTVERSION}
@@ -18,18 +18,17 @@ BUILD_DEPENDS= yasm:${PORTSDIR}/devel/yasm \
LIB_DEPENDS= liborc-0.4.so:${PORTSDIR}/devel/orc
USE_XZ= yes
-USE_GMAKE= yes
USE_LDCONFIG= yes
USE_GSTREAMER1= yes
GNU_CONFIGURE= yes
-USES= pkgconfig
+USES= gmake pkgconfig
LIBAV_CONFIG= --cc=${CC} \
--enable-runtime-cpudetect \
--enable-pic
LDFLAGS+= -Wl,-Bsymbolic
CFLAGS+= -fno-force-addr
-PLIST_SUB= VERSION="${GST1_VERSION}"
+PLIST_SUB= VERSION="1.0"
# sse hardware vector support
.if defined(MACHINE_CPU) && (${MACHINE_CPU:Msse} == "sse" || ${MACHINE_CPU:Mamd64} == "amd64")
@@ -54,10 +53,11 @@ CONFIGURE_ARGS+= --with-libav-extra-configure="${LIBAV_CONFIG}"
.include <bsd.port.pre.mk>
.if ${OSVERSION} < 900033
-
BUILD_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
MAKE_ENV= COMPILER_PATH=${LOCALBASE}/bin
-
.endif
+post-install:
+ @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0/libgstlibav.so
+
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer1-libav/distinfo b/multimedia/gstreamer1-libav/distinfo
index cf2ec000023f..4eb5d81f276a 100644
--- a/multimedia/gstreamer1-libav/distinfo
+++ b/multimedia/gstreamer1-libav/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gst-libav-1.0.10.tar.xz) = b6d059d1a39967ef7e1d345009fe003afe14ab55006d68e895a64f4a36968c5e
-SIZE (gst-libav-1.0.10.tar.xz) = 4240440
+SHA256 (gst-libav-1.2.1.tar.xz) = fd152b7aec56ae76ad58b9759913a8bfe1792bdf64f260d0acaba75b75076676
+SIZE (gst-libav-1.2.1.tar.xz) = 4575744
diff --git a/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavauddec.c b/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavauddec.c
new file mode 100644
index 000000000000..1132b2e9ab8e
--- /dev/null
+++ b/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavauddec.c
@@ -0,0 +1,12 @@
+--- ext/libav/gstavauddec.c.orig 2013-11-21 00:29:36.000000000 +0100
++++ ext/libav/gstavauddec.c 2013-11-21 00:29:59.000000000 +0100
+@@ -909,9 +909,6 @@
+ case AV_CODEC_ID_SIPR:
+ rank = GST_RANK_SECONDARY;
+ break;
+- case AV_CODEC_ID_MP3:
+- rank = GST_RANK_NONE;
+- break;
+ default:
+ rank = GST_RANK_MARGINAL;
+ break;
diff --git a/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavdec.c b/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavdec.c
deleted file mode 100644
index cf058acb78b5..000000000000
--- a/multimedia/gstreamer1-libav/files/patch-ext_libav_gstavdec.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- ext/libav/gstavdec.c.orig 2013-08-20 23:08:42.000000000 +0200
-+++ ext/libav/gstavdec.c 2013-08-20 23:08:53.000000000 +0200
-@@ -1432,9 +1432,6 @@
- case CODEC_ID_SIPR:
- rank = GST_RANK_SECONDARY;
- break;
-- case CODEC_ID_MP3:
-- rank = GST_RANK_NONE;
-- break;
- default:
- rank = GST_RANK_MARGINAL;
- break;
diff --git a/multimedia/gstreamer1-libav/pkg-plist b/multimedia/gstreamer1-libav/pkg-plist
index 2022bcd22777..4267f9306d9a 100644
--- a/multimedia/gstreamer1-libav/pkg-plist
+++ b/multimedia/gstreamer1-libav/pkg-plist
@@ -1,4 +1,2 @@
-lib/gstreamer-%%VERSION%%/libgstavscale.la
-lib/gstreamer-%%VERSION%%/libgstavscale.so
lib/gstreamer-%%VERSION%%/libgstlibav.la
lib/gstreamer-%%VERSION%%/libgstlibav.so
diff --git a/multimedia/gstreamer1-plugins-all/Makefile b/multimedia/gstreamer1-plugins-all/Makefile
index 05e97afcf3c9..777b20f4a01f 100644
--- a/multimedia/gstreamer1-plugins-all/Makefile
+++ b/multimedia/gstreamer1-plugins-all/Makefile
@@ -3,7 +3,7 @@
PORTNAME= gstreamer1-plugins-all
PORTVERSION= ${GST1_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= multimedia
MASTER_SITES= # empty
DISTFILES= # empty
@@ -14,6 +14,7 @@ COMMENT= Meta-port of all gstreamer 1.x plugins with options
.MAKE.FreeBSD_UL= yes
NO_BUILD= yes
+NO_INSTALL= yes
USE_GSTREAMER1= yes
.include "${.CURDIR}/../../Mk/bsd.gstreamer.mk"
@@ -41,6 +42,4 @@ USE_GSTREAMER1+=${f:L}
.endif
.endfor
-do-install: # empty
-
.include <bsd.port.mk>
diff --git a/multimedia/gstreamer1-plugins-bad/pkg-plist b/multimedia/gstreamer1-plugins-bad/pkg-plist
index 0f1df48c4fc6..a1ebeeac4b51 100644
--- a/multimedia/gstreamer1-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer1-plugins-bad/pkg-plist
@@ -3,32 +3,49 @@ include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabin-enum.h
include/gstreamer-%%VERSION%%/gst/basecamerabinsrc/gstcamerabinpreview.h
include/gstreamer-%%VERSION%%/gst/codecparsers/gsth264parser.h
include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpeg4parser.h
+include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpegvideometa.h
include/gstreamer-%%VERSION%%/gst/codecparsers/gstmpegvideoparser.h
include/gstreamer-%%VERSION%%/gst/codecparsers/gstvc1parser.h
+include/gstreamer-%%VERSION%%/gst/insertbin/gstinsertbin.h
include/gstreamer-%%VERSION%%/gst/interfaces/photography-enumtypes.h
include/gstreamer-%%VERSION%%/gst/interfaces/photography.h
-include/gstreamer-%%VERSION%%/gst/signalprocessor/gstsignalprocessor.h
-include/gstreamer-%%VERSION%%/gst/video/gstsurfaceconverter.h
-include/gstreamer-%%VERSION%%/gst/video/gstsurfacemeta.h
-include/gstreamer-%%VERSION%%/gst/video/videocontext.h
+include/gstreamer-%%VERSION%%/gst/mpegts/gst-atsc-section.h
+include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-descriptor.h
+include/gstreamer-%%VERSION%%/gst/mpegts/gst-dvb-section.h
+include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtsdescriptor.h
+include/gstreamer-%%VERSION%%/gst/mpegts/gstmpegtssection.h
+include/gstreamer-%%VERSION%%/gst/mpegts/mpegts.h
+include/gstreamer-%%VERSION%%/gst/uridownloader/gstfragment.h
+include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader.h
+include/gstreamer-%%VERSION%%/gst/uridownloader/gsturidownloader_debug.h
+lib/girepository-%%VERSION%%/GstInsertBin-%%VERSION%%.typelib
+lib/girepository-%%VERSION%%/GstMpegts-%%VERSION%%.typelib
+lib/gstreamer-%%VERSION%%/libgstaccurip.la
+lib/gstreamer-%%VERSION%%/libgstaccurip.so
lib/gstreamer-%%VERSION%%/libgstadpcmdec.la
lib/gstreamer-%%VERSION%%/libgstadpcmdec.so
lib/gstreamer-%%VERSION%%/libgstadpcmenc.la
lib/gstreamer-%%VERSION%%/libgstadpcmenc.so
+lib/gstreamer-%%VERSION%%/libgstaiff.la
+lib/gstreamer-%%VERSION%%/libgstaiff.so
lib/gstreamer-%%VERSION%%/libgstasfmux.la
lib/gstreamer-%%VERSION%%/libgstasfmux.so
+lib/gstreamer-%%VERSION%%/libgstaudiofxbad.la
+lib/gstreamer-%%VERSION%%/libgstaudiofxbad.so
+lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.la
+lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.so
lib/gstreamer-%%VERSION%%/libgstautoconvert.la
lib/gstreamer-%%VERSION%%/libgstautoconvert.so
lib/gstreamer-%%VERSION%%/libgstbayer.la
lib/gstreamer-%%VERSION%%/libgstbayer.so
+lib/gstreamer-%%VERSION%%/libgstcamerabin2.la
+lib/gstreamer-%%VERSION%%/libgstcamerabin2.so
lib/gstreamer-%%VERSION%%/libgstcoloreffects.la
lib/gstreamer-%%VERSION%%/libgstcoloreffects.so
lib/gstreamer-%%VERSION%%/libgstdataurisrc.la
lib/gstreamer-%%VERSION%%/libgstdataurisrc.so
lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.la
lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.so
-lib/gstreamer-%%VERSION%%/libgstdtmf.la
-lib/gstreamer-%%VERSION%%/libgstdtmf.so
lib/gstreamer-%%VERSION%%/libgstdvb.la
lib/gstreamer-%%VERSION%%/libgstdvb.so
lib/gstreamer-%%VERSION%%/libgstdvbsuboverlay.la
@@ -39,8 +56,8 @@ lib/gstreamer-%%VERSION%%/libgstfestival.la
lib/gstreamer-%%VERSION%%/libgstfestival.so
lib/gstreamer-%%VERSION%%/libgstfieldanalysis.la
lib/gstreamer-%%VERSION%%/libgstfieldanalysis.so
-lib/gstreamer-%%VERSION%%/libgstfragmented.la
-lib/gstreamer-%%VERSION%%/libgstfragmented.so
+lib/gstreamer-%%VERSION%%/libgstfreeverb.la
+lib/gstreamer-%%VERSION%%/libgstfreeverb.so
lib/gstreamer-%%VERSION%%/libgstfrei0r.la
lib/gstreamer-%%VERSION%%/libgstfrei0r.so
lib/gstreamer-%%VERSION%%/libgstgaudieffects.la
@@ -55,10 +72,14 @@ lib/gstreamer-%%VERSION%%/libgstinter.la
lib/gstreamer-%%VERSION%%/libgstinter.so
lib/gstreamer-%%VERSION%%/libgstinterlace.la
lib/gstreamer-%%VERSION%%/libgstinterlace.so
+lib/gstreamer-%%VERSION%%/libgstivtc.la
+lib/gstreamer-%%VERSION%%/libgstivtc.so
lib/gstreamer-%%VERSION%%/libgstjpegformat.la
lib/gstreamer-%%VERSION%%/libgstjpegformat.so
lib/gstreamer-%%VERSION%%/libgstliveadder.la
lib/gstreamer-%%VERSION%%/libgstliveadder.so
+lib/gstreamer-%%VERSION%%/libgstmfc.la
+lib/gstreamer-%%VERSION%%/libgstmfc.so
lib/gstreamer-%%VERSION%%/libgstmidi.la
lib/gstreamer-%%VERSION%%/libgstmidi.so
lib/gstreamer-%%VERSION%%/libgstmpegpsdemux.la
@@ -69,18 +90,16 @@ lib/gstreamer-%%VERSION%%/libgstmpegtsdemux.la
lib/gstreamer-%%VERSION%%/libgstmpegtsdemux.so
lib/gstreamer-%%VERSION%%/libgstmpegtsmux.la
lib/gstreamer-%%VERSION%%/libgstmpegtsmux.so
+lib/gstreamer-%%VERSION%%/libgstmxf.la
+lib/gstreamer-%%VERSION%%/libgstmxf.so
lib/gstreamer-%%VERSION%%/libgstpcapparse.la
lib/gstreamer-%%VERSION%%/libgstpcapparse.so
lib/gstreamer-%%VERSION%%/libgstpnm.la
lib/gstreamer-%%VERSION%%/libgstpnm.so
lib/gstreamer-%%VERSION%%/libgstrawparse.la
lib/gstreamer-%%VERSION%%/libgstrawparse.so
-lib/gstreamer-%%VERSION%%/libgstrtpmux.la
-lib/gstreamer-%%VERSION%%/libgstrtpmux.so
-lib/gstreamer-%%VERSION%%/libgstrtpvp8.la
-lib/gstreamer-%%VERSION%%/libgstrtpvp8.so
-lib/gstreamer-%%VERSION%%/libgstscaletempoplugin.la
-lib/gstreamer-%%VERSION%%/libgstscaletempoplugin.so
+lib/gstreamer-%%VERSION%%/libgstremovesilence.la
+lib/gstreamer-%%VERSION%%/libgstremovesilence.so
lib/gstreamer-%%VERSION%%/libgstsdpelem.la
lib/gstreamer-%%VERSION%%/libgstsdpelem.so
lib/gstreamer-%%VERSION%%/libgstsegmentclip.la
@@ -89,45 +108,44 @@ lib/gstreamer-%%VERSION%%/libgstshm.la
lib/gstreamer-%%VERSION%%/libgstshm.so
lib/gstreamer-%%VERSION%%/libgstsiren.la
lib/gstreamer-%%VERSION%%/libgstsiren.so
+lib/gstreamer-%%VERSION%%/libgstsmooth.la
+lib/gstreamer-%%VERSION%%/libgstsmooth.so
lib/gstreamer-%%VERSION%%/libgstspeed.la
lib/gstreamer-%%VERSION%%/libgstspeed.so
lib/gstreamer-%%VERSION%%/libgstsubenc.la
lib/gstreamer-%%VERSION%%/libgstsubenc.so
+lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.la
+lib/gstreamer-%%VERSION%%/libgstvideofiltersbad.so
lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.la
lib/gstreamer-%%VERSION%%/libgstvideoparsersbad.so
lib/gstreamer-%%VERSION%%/libgsty4mdec.la
lib/gstreamer-%%VERSION%%/libgsty4mdec.so
-lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.la
-lib/gstreamer-%%VERSION%%/libgstaudiovisualizers.so
-lib/gstreamer-%%VERSION%%/libgstcamerabin2.la
-lib/gstreamer-%%VERSION%%/libgstcamerabin2.so
-lib/gstreamer-%%VERSION%%/libgstremovesilence.la
-lib/gstreamer-%%VERSION%%/libgstremovesilence.so
-lib/gstreamer-%%VERSION%%/libgstsmooth.la
-lib/gstreamer-%%VERSION%%/libgstsmooth.so
-lib/libgstbasecamerabinsrc-%%VERSION%%.a
+lib/gstreamer-%%VERSION%%/libgstyadif.la
+lib/gstreamer-%%VERSION%%/libgstyadif.so
lib/libgstbasecamerabinsrc-%%VERSION%%.la
lib/libgstbasecamerabinsrc-%%VERSION%%.so
lib/libgstbasecamerabinsrc-%%VERSION%%.so.0
-lib/libgstbasevideo-%%VERSION%%.a
-lib/libgstbasevideo-%%VERSION%%.la
-lib/libgstbasevideo-%%VERSION%%.so
-lib/libgstbasevideo-%%VERSION%%.so.0
-lib/libgstcodecparsers-%%VERSION%%.a
lib/libgstcodecparsers-%%VERSION%%.la
lib/libgstcodecparsers-%%VERSION%%.so
lib/libgstcodecparsers-%%VERSION%%.so.0
-lib/libgstphotography-%%VERSION%%.a
+lib/libgstinsertbin-%%VERSION%%.la
+lib/libgstinsertbin-%%VERSION%%.so
+lib/libgstinsertbin-%%VERSION%%.so.0
+lib/libgstmpegts-%%VERSION%%.la
+lib/libgstmpegts-%%VERSION%%.so
+lib/libgstmpegts-%%VERSION%%.so.0
lib/libgstphotography-%%VERSION%%.la
lib/libgstphotography-%%VERSION%%.so
lib/libgstphotography-%%VERSION%%.so.0
-lib/libgstsignalprocessor-%%VERSION%%.a
-lib/libgstsignalprocessor-%%VERSION%%.la
-lib/libgstsignalprocessor-%%VERSION%%.so
-lib/libgstsignalprocessor-%%VERSION%%.so.0
+lib/libgsturidownloader-%%VERSION%%.la
+lib/libgsturidownloader-%%VERSION%%.so
+lib/libgsturidownloader-%%VERSION%%.so.0
libdata/pkgconfig/gstreamer-codecparsers-%%VERSION%%.pc
-libdata/pkgconfig/gstreamer-basevideo-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-insertbin-%%VERSION%%.pc
+libdata/pkgconfig/gstreamer-mpegts-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-plugins-bad-%%VERSION%%.pc
+share/gir-%%VERSION%%/GstInsertBin-%%VERSION%%.gir
+share/gir-%%VERSION%%/GstMpegts-%%VERSION%%.gir
share/locale/af/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
share/locale/az/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
share/locale/bg/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
@@ -170,7 +188,9 @@ share/locale/vi/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-%%VERSION%%.mo
@dirrmtry share/locale/ky/LC_MESSAGES
@dirrmtry share/locale/ky
-@dirrm include/gstreamer-%%VERSION%%/gst/signalprocessor
+@dirrm include/gstreamer-%%VERSION%%/gst/uridownloader
+@dirrm include/gstreamer-%%VERSION%%/gst/mpegts
@dirrm include/gstreamer-%%VERSION%%/gst/interfaces
+@dirrm include/gstreamer-%%VERSION%%/gst/insertbin
@dirrm include/gstreamer-%%VERSION%%/gst/codecparsers
@dirrm include/gstreamer-%%VERSION%%/gst/basecamerabinsrc
diff --git a/multimedia/gstreamer1-plugins-core/Makefile b/multimedia/gstreamer1-plugins-core/Makefile
index 7ee09f5da603..72a2bc755247 100644
--- a/multimedia/gstreamer1-plugins-core/Makefile
+++ b/multimedia/gstreamer1-plugins-core/Makefile
@@ -4,7 +4,7 @@
PORTNAME= gstreamer1-plugins-core
PORTVERSION= ${GST1_VERSION}${GST1_MINIMAL_VERSION}
-PORTREVISION= 1
+PORTREVISION= 0
CATEGORIES= multimedia audio
MASTER_SITES= # empty
DISTFILES= # empty
diff --git a/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2-calls.c b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2-calls.c
new file mode 100644
index 000000000000..8fa152c1378a
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-good/files/patch-sys_v4l2_v4l2-calls.c
@@ -0,0 +1,14 @@
+--- sys/v4l2/v4l2_calls.c.orig 2013-09-24 15:05:22.000000000 +0200
++++ sys/v4l2/v4l2_calls.c 2013-11-21 00:31:40.000000000 +0100
+@@ -205,7 +205,11 @@
+ standard.index = n;
+
+ if (v4l2_ioctl (v4l2object->video_fd, VIDIOC_ENUMSTD, &standard) < 0) {
++#if defined(ENODATA)
+ if (errno == EINVAL || errno == ENOTTY || errno == ENODATA)
++#else
++ if (errno == EINVAL || errno == ENOTTY)
++#endif
+ break; /* end of enumeration */
+ else {
+ GST_ELEMENT_ERROR (e, RESOURCE, SETTINGS,
diff --git a/multimedia/gstreamer1-plugins-good/pkg-plist b/multimedia/gstreamer1-plugins-good/pkg-plist
index 504cad934a5e..926389ec3e75 100644
--- a/multimedia/gstreamer1-plugins-good/pkg-plist
+++ b/multimedia/gstreamer1-plugins-good/pkg-plist
@@ -22,6 +22,8 @@ lib/gstreamer-%%VERSION%%/libgstdebug.la
lib/gstreamer-%%VERSION%%/libgstdebug.so
lib/gstreamer-%%VERSION%%/libgstdeinterlace.la
lib/gstreamer-%%VERSION%%/libgstdeinterlace.so
+lib/gstreamer-%%VERSION%%/libgstdtmf.la
+lib/gstreamer-%%VERSION%%/libgstdtmf.so
lib/gstreamer-%%VERSION%%/libgsteffectv.la
lib/gstreamer-%%VERSION%%/libgsteffectv.so
lib/gstreamer-%%VERSION%%/libgstequalizer.la
diff --git a/audio/gstreamer1-plugins-celt/Makefile b/multimedia/gstreamer1-plugins-kate/Makefile
index 86c4ca7ad921..3a7a848b15fa 100644
--- a/audio/gstreamer1-plugins-celt/Makefile
+++ b/multimedia/gstreamer1-plugins-kate/Makefile
@@ -1,11 +1,11 @@
# $FreeBSD$
PORTREVISION= 0
-CATEGORIES= audio
+CATEGORIES= multimedia
-COMMENT= Gstreamer celt plugin
+COMMENT= Gstreamer kate codec plugin
-GST_PLUGIN= celt
+GST_PLUGIN= kate
DIST= bad
MASTERDIR= ${.CURDIR}/../../multimedia/gstreamer1-plugins
diff --git a/multimedia/gstreamer1-plugins/Makefile b/multimedia/gstreamer1-plugins/Makefile
index 8b90f879cabb..ced463ff558c 100644
--- a/multimedia/gstreamer1-plugins/Makefile
+++ b/multimedia/gstreamer1-plugins/Makefile
@@ -27,29 +27,25 @@ RUN_DEPENDS+= iso-codes>=0:${PORTSDIR}/misc/iso-codes
PORTSCOUT= limitw:1,even
-BASE_PORTVERSION= 1.0.10
+BASE_PORTVERSION= 1.2.1
BASE_DISTNAME= gst-plugins-base-${BASE_PORTVERSION}
BASE_DISTFILE= ${BASE_DISTNAME}${EXTRACT_SUFX}
-BAD_PORTVERSION= 1.0.10
+BAD_PORTVERSION= 1.2.1
BAD_DISTNAME= gst-plugins-bad-${BAD_PORTVERSION}
BAD_DISTFILE= ${BAD_DISTNAME}${EXTRACT_SUFX}
-GOOD_PORTVERSION= 1.0.10
+GOOD_PORTVERSION= 1.2.1
GOOD_DISTNAME= gst-plugins-good-${GOOD_PORTVERSION}
GOOD_DISTFILE= ${GOOD_DISTNAME}${EXTRACT_SUFX}
-UGLY_PORTVERSION= 1.0.10
+UGLY_PORTVERSION= 1.2.1
UGLY_DISTNAME= gst-plugins-ugly-${UGLY_PORTVERSION}
UGLY_DISTFILE= ${UGLY_DISTNAME}${EXTRACT_SUFX}
DIST?= base
-SHLIB_VERSION= 0
-VERSION= ${GST1_VERSION}
-
USES= gettext gmake pathfix pkgconfig
WANT_GSTREAMER= yes
USE_XZ= yes
-USE_GNOME+= glib20 gnomehier introspection:build libxml2 ltverhack:0 \
- ltasneededhack
-USE_AUTOTOOLS= libtool
+USE_GNOME+= glib20 gnomehier introspection:build libxml2 ltverhack
+GNU_CONFIGURE= yes
GST_PLUGIN?= base
USE_LDCONFIG= yes
@@ -64,6 +60,13 @@ DEFAULT_AUDIOSRC?= osssrc
IGNORE= DIST not specified
.endif
+SHLIB_VERSION= 0
+VERSION= 1.0
+
+PLIST_SUB+= VERSION="${VERSION}" \
+ SHLIB_VERSION="${SHLIB_VERSION}"
+
+
.include <bsd.port.pre.mk>
.if ${ARCH}=="i386"
@@ -90,9 +93,6 @@ CONFIGURE_ARGS+=--with-default-audiosink="${DEFAULT_AUDIOSINK}" \
--with-default-audiosrc="${DEFAULT_AUDIOSRC}"
.endif
-PLIST_SUB+= VERSION="${VERSION}" \
- SHLIB_VERSION="${SHLIB_VERSION}"
-
.include "${MASTERDIR}/Makefile.common"
.if ${DIST}=="base"
@@ -135,8 +135,8 @@ DEFAULT_DVD_DEVICE=/dev/cd0
post-patch:
.if ${DIST}=="bad"
- @${REINPLACE_CMD} -e 's|opencv <= 2.3.1|opencv <= 2.3.99|g' \
- ${WRKSRC}/configure
+# @${REINPLACE_CMD} -e 's|opencv <= 2.3.1|opencv <= 2.3.99|g' \
+# ${WRKSRC}/configure
@${REINPLACE_CMD} -e 's|/dev/dvd|${DEFAULT_DVD_DEVICE}|g' \
${WRKSRC}/ext/resindvd/resindvdbin.c \
${WRKSRC}/ext/resindvd/resindvdsrc.c
@@ -146,6 +146,7 @@ post-patch:
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgsttag-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstaudio-$$(GST_API_VERSION).la|; \
+ s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstpbutils-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstriff-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstsignalprocessor-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-@GST_API_VERSION@.la|${LOCALBASE}/lib/libgstbasevideo-$$(GST_API_VERSION).la|; \
@@ -155,6 +156,7 @@ post-patch:
${XARGS} -n 10 ${REINPLACE_CMD} -e \
's|$$(top_builddir)/gst-libs/gst/tag/libgsttag-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgsttag-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/audio/libgstaudio-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstaudio-$$(GST_API_VERSION).la|; \
+ s|$$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstpbutils-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/riff/libgstriff-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstriff-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/signalprocessor/libgstsignalprocessor-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstsignalprocessor-$$(GST_API_VERSION).la|; \
s|$$(top_builddir)/gst-libs/gst/video/libgstbasevideo-$$(GST_API_VERSION).la|${LOCALBASE}/lib/libgstbasevideo-$$(GST_API_VERSION).la|; \
@@ -172,10 +174,13 @@ post-patch:
USE_GCC= any
.endif
+pre-install:
+ ${MKDIR} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0
+
post-install:
-.if ${GST_PLUGIN}==base
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst*.so.0
+.if ${GST_PLUGIN}==base || ${GST_PLUGIN}==bad
+ -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libgst*.so.0
.endif
- @${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0/libgst*.so
+ -@${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/gstreamer-1.0/libgst*.so
.include <bsd.port.post.mk>
diff --git a/multimedia/gstreamer1-plugins/Makefile.common b/multimedia/gstreamer1-plugins/Makefile.common
index 0351bf64e5ac..1acd8b201205 100644
--- a/multimedia/gstreamer1-plugins/Makefile.common
+++ b/multimedia/gstreamer1-plugins/Makefile.common
@@ -15,7 +15,6 @@ BASE_GST_ALL_PLUGINS= \
BAD_GST_ALL_PLUGINS+= \
assrender \
- celt \
curl \
dts \
faac \
@@ -23,6 +22,7 @@ BAD_GST_ALL_PLUGINS+= \
flite \
gme \
gsm \
+ kate \
libmms \
librfb \
modplug \
@@ -32,12 +32,14 @@ BAD_GST_ALL_PLUGINS+= \
ofa \
openal \
opencv \
+ openjpeg \
opus \
resindvd \
rtmp \
schro \
soundtouch \
spandsp \
+ webp \
zbar \
# plugins not yet ported to the 1.0 API, or not portable
@@ -45,20 +47,15 @@ BAD_GST_ALL_PLUGINS+= \
apexsink \
cdaudio \
chromaprint \
- cog \
decklink \
directfb \
- dirac \
eglgles \
- jasper \
- kate \
ladspa \
linsys \
lv2 \
mimic \
mpg123 \
musepack \
- musicbrainz \
mythtv \
nas \
opensles \
@@ -74,7 +71,6 @@ BAD_GST_ALL_PLUGINS+= \
voaacenc \
voamrwbenc \
wayland \
- swfdec \
xvid
BAD_GST_NON_PLUGINS= \
@@ -227,9 +223,6 @@ gst_cdparanoia_LIB_DEPENDS= libcdda_interface.so:${PORTSDIR}/audio/cdparanoia
# cdio
gst_cdio_LIB_DEPENDS= libcdio.so:${PORTSDIR}/sysutils/libcdio
-# celt
-gst_celt_LIB_DEPENDS= libcelt0.so:${PORTSDIR}/audio/celt
-
# curl
gst_curl_LIB_DEPENDS= libcurl.so:${PORTSDIR}/ftp/curl
@@ -276,6 +269,9 @@ gst_jack_LIB_DEPENDS= libjack.so:${PORTSDIR}/audio/jack
# jpeg
gst_jpeg_LIB_DEPENDS= libjpeg.so:${PORTSDIR}/graphics/jpeg
+# kate
+gst_kate_LIB_DEPENDS= libkate.so:${PORTSDIR}/multimedia/libkate
+
# lame
gst_lame_LIB_DEPENDS= libmp3lame.so:${PORTSDIR}/audio/lame
@@ -320,6 +316,9 @@ gst_ogg_LIB_DEPENDS= libogg.so:${PORTSDIR}/audio/libogg
# opencv
gst_opencv_LIB_DEPENDS= libopencv_highgui.so:${PORTSDIR}/graphics/opencv
+# openjpeg
+gst_openjpeg_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg
+
# opus
gst_opus_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
@@ -394,6 +393,9 @@ gst_vpx_PLIST_FILES= ${GST_LIB_DIR}/libgstvpx.la \
gst_vpx_PLIST_DIRSTRY= share/gstreamer-${VERSION}/presets \
share/gstreamer-${VERSION}
+# webp
+gst_webp_LIB_DEPENDS= libwebp.so:${PORTSDIR}/graphics/webp
+
# X ximage and xvimage sinks aka output
.if ${DIST} == base
gst_x_USE_XORG= x11 xv xext
diff --git a/multimedia/gstreamer1-plugins/distinfo b/multimedia/gstreamer1-plugins/distinfo
index 6317db609ab9..91ff978dbbc5 100644
--- a/multimedia/gstreamer1-plugins/distinfo
+++ b/multimedia/gstreamer1-plugins/distinfo
@@ -1,8 +1,8 @@
-SHA256 (gst-plugins-base-1.0.10.tar.xz) = 9754e83b2a3ff61266112915bfc84c895c4d145519ad9a3381edceb216bc97e8
-SIZE (gst-plugins-base-1.0.10.tar.xz) = 2371640
-SHA256 (gst-plugins-bad-1.0.10.tar.xz) = 91da60ba2ee5c681f11188a4a456894e7f989435c2102c15eff97bbd4fc4c726
-SIZE (gst-plugins-bad-1.0.10.tar.xz) = 3186192
-SHA256 (gst-plugins-ugly-1.0.10.tar.xz) = bed3510e09f036e7609e8d291535c395d25109b1180324b16859f475eac3a3c0
-SIZE (gst-plugins-ugly-1.0.10.tar.xz) = 829852
-SHA256 (gst-plugins-good-1.0.10.tar.xz) = c60342d6080ac6f794c5c2427dfbdee9140a2f67b82e7e945e286a2d416428ae
-SIZE (gst-plugins-good-1.0.10.tar.xz) = 2732272
+SHA256 (gst-plugins-base-1.2.1.tar.xz) = de2444a5c150d4e4b680364d7c0414cd8b015d95b305ff65d65a17683379532f
+SIZE (gst-plugins-base-1.2.1.tar.xz) = 2512216
+SHA256 (gst-plugins-bad-1.2.1.tar.xz) = f33e7c81fcb742fe50b73ad87ef8a4baa7d6b59c5002a10bf63c8dee22404929
+SIZE (gst-plugins-bad-1.2.1.tar.xz) = 3276352
+SHA256 (gst-plugins-ugly-1.2.1.tar.xz) = 35ae5d45de54827604e24f57f54ab30a5ab2245b4c4120977273eb11d19c2395
+SIZE (gst-plugins-ugly-1.2.1.tar.xz) = 843228
+SHA256 (gst-plugins-good-1.2.1.tar.xz) = 660fa02dbe01086fcf702d87acc0ba5dde2559d6a11ecf438874afe504c50517
+SIZE (gst-plugins-good-1.2.1.tar.xz) = 2875300
diff --git a/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c
index b088869104fc..f66e4faaf78d 100644
--- a/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c
+++ b/multimedia/gstreamer1-plugins/files/patch-gst_audioresample_float.c
@@ -1,7 +1,7 @@
---- gst/audioresample/speex_resampler_float.c.orig 2012-07-17 09:48:45.000000000 +0200
-+++ gst/audioresample/speex_resampler_float.c 2012-07-17 09:49:38.000000000 +0200
+--- gst/audioresample/speex_resampler_float.c.orig 2013-04-26 08:20:28.000000000 +0200
++++ gst/audioresample/speex_resampler_float.c 2013-10-20 17:32:45.000000000 +0200
@@ -17,8 +17,20 @@
- * Boston, MA 02111-1307, USA.
+ * Boston, MA 02110-1301, USA.
*/
+#ifdef HAVE_CONFIG_H
@@ -18,6 +18,6 @@
+#endif
+#endif
+
+ #define _USE_NEON
#define FLOATING_POINT
#define OUTSIDE_SPEEX
- #define RANDOM_PREFIX resample_float
diff --git a/multimedia/gstreamer1-plugins/pkg-plist b/multimedia/gstreamer1-plugins/pkg-plist
index 0e8516a74e19..8208d0d678aa 100644
--- a/multimedia/gstreamer1-plugins/pkg-plist
+++ b/multimedia/gstreamer1-plugins/pkg-plist
@@ -1,4 +1,8 @@
bin/gst-discoverer-%%VERSION%%
+bin/gst-play-%%VERSION%%
+include/gstreamer-%%VERSION%%/gst/allocators/allocators.h
+include/gstreamer-%%VERSION%%/gst/allocators/gstdmabuf.h
+include/gstreamer-%%VERSION%%/gst/app/app.h
include/gstreamer-%%VERSION%%/gst/app/gstappsink.h
include/gstreamer-%%VERSION%%/gst/app/gstappsrc.h
include/gstreamer-%%VERSION%%/gst/audio/audio-channels.h
@@ -19,6 +23,7 @@ include/gstreamer-%%VERSION%%/gst/audio/gstaudioringbuffer.h
include/gstreamer-%%VERSION%%/gst/audio/gstaudiosink.h
include/gstreamer-%%VERSION%%/gst/audio/gstaudiosrc.h
include/gstreamer-%%VERSION%%/gst/audio/streamvolume.h
+include/gstreamer-%%VERSION%%/gst/fft/fft.h
include/gstreamer-%%VERSION%%/gst/fft/gstfft.h
include/gstreamer-%%VERSION%%/gst/fft/gstfftf32.h
include/gstreamer-%%VERSION%%/gst/fft/gstfftf64.h
@@ -37,13 +42,17 @@ include/gstreamer-%%VERSION%%/gst/pbutils/pbutils.h
include/gstreamer-%%VERSION%%/gst/riff/riff-ids.h
include/gstreamer-%%VERSION%%/gst/riff/riff-media.h
include/gstreamer-%%VERSION%%/gst/riff/riff-read.h
+include/gstreamer-%%VERSION%%/gst/riff/riff.h
include/gstreamer-%%VERSION%%/gst/rtp/gstrtcpbuffer.h
include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbaseaudiopayload.h
include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbasedepayload.h
include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbasepayload.h
include/gstreamer-%%VERSION%%/gst/rtp/gstrtpbuffer.h
+include/gstreamer-%%VERSION%%/gst/rtp/gstrtphdrext.h
include/gstreamer-%%VERSION%%/gst/rtp/gstrtppayloads.h
+include/gstreamer-%%VERSION%%/gst/rtp/rtp.h
include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsp-enumtypes.h
+include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsp.h
include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspconnection.h
include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspdefs.h
include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspextension.h
@@ -51,8 +60,10 @@ include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspmessage.h
include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsprange.h
include/gstreamer-%%VERSION%%/gst/rtsp/gstrtsptransport.h
include/gstreamer-%%VERSION%%/gst/rtsp/gstrtspurl.h
+include/gstreamer-%%VERSION%%/gst/rtsp/rtsp.h
include/gstreamer-%%VERSION%%/gst/sdp/gstsdp.h
include/gstreamer-%%VERSION%%/gst/sdp/gstsdpmessage.h
+include/gstreamer-%%VERSION%%/gst/sdp/sdp.h
include/gstreamer-%%VERSION%%/gst/tag/gsttagdemux.h
include/gstreamer-%%VERSION%%/gst/tag/gsttagmux.h
include/gstreamer-%%VERSION%%/gst/tag/tag.h
@@ -68,6 +79,7 @@ include/gstreamer-%%VERSION%%/gst/video/gstvideosink.h
include/gstreamer-%%VERSION%%/gst/video/gstvideoutils.h
include/gstreamer-%%VERSION%%/gst/video/navigation.h
include/gstreamer-%%VERSION%%/gst/video/video-blend.h
+include/gstreamer-%%VERSION%%/gst/video/video-chroma.h
include/gstreamer-%%VERSION%%/gst/video/video-color.h
include/gstreamer-%%VERSION%%/gst/video/video-enumtypes.h
include/gstreamer-%%VERSION%%/gst/video/video-event.h
@@ -78,6 +90,7 @@ include/gstreamer-%%VERSION%%/gst/video/video-overlay-composition.h
include/gstreamer-%%VERSION%%/gst/video/video.h
include/gstreamer-%%VERSION%%/gst/video/videoorientation.h
include/gstreamer-%%VERSION%%/gst/video/videooverlay.h
+lib/girepository-1.0/GstAllocators-%%VERSION%%.typelib
lib/girepository-1.0/GstApp-%%VERSION%%.typelib
lib/girepository-1.0/GstAudio-%%VERSION%%.typelib
lib/girepository-1.0/GstFft-%%VERSION%%.typelib
@@ -122,46 +135,40 @@ lib/gstreamer-%%VERSION%%/libgstvideotestsrc.la
lib/gstreamer-%%VERSION%%/libgstvideotestsrc.so
lib/gstreamer-%%VERSION%%/libgstvolume.la
lib/gstreamer-%%VERSION%%/libgstvolume.so
-lib/libgstapp-%%VERSION%%.a
+lib/libgstallocators-%%VERSION%%.la
+lib/libgstallocators-%%VERSION%%.so
+lib/libgstallocators-%%VERSION%%.so.0
lib/libgstapp-%%VERSION%%.la
lib/libgstapp-%%VERSION%%.so
lib/libgstapp-%%VERSION%%.so.0
-lib/libgstaudio-%%VERSION%%.a
lib/libgstaudio-%%VERSION%%.la
lib/libgstaudio-%%VERSION%%.so
lib/libgstaudio-%%VERSION%%.so.0
-lib/libgstfft-%%VERSION%%.a
lib/libgstfft-%%VERSION%%.la
lib/libgstfft-%%VERSION%%.so
lib/libgstfft-%%VERSION%%.so.0
-lib/libgstpbutils-%%VERSION%%.a
lib/libgstpbutils-%%VERSION%%.la
lib/libgstpbutils-%%VERSION%%.so
lib/libgstpbutils-%%VERSION%%.so.0
-lib/libgstriff-%%VERSION%%.a
lib/libgstriff-%%VERSION%%.la
lib/libgstriff-%%VERSION%%.so
lib/libgstriff-%%VERSION%%.so.0
-lib/libgstrtp-%%VERSION%%.a
lib/libgstrtp-%%VERSION%%.la
lib/libgstrtp-%%VERSION%%.so
lib/libgstrtp-%%VERSION%%.so.0
-lib/libgstrtsp-%%VERSION%%.a
lib/libgstrtsp-%%VERSION%%.la
lib/libgstrtsp-%%VERSION%%.so
lib/libgstrtsp-%%VERSION%%.so.0
-lib/libgstsdp-%%VERSION%%.a
lib/libgstsdp-%%VERSION%%.la
lib/libgstsdp-%%VERSION%%.so
lib/libgstsdp-%%VERSION%%.so.0
-lib/libgsttag-%%VERSION%%.a
lib/libgsttag-%%VERSION%%.la
lib/libgsttag-%%VERSION%%.so
lib/libgsttag-%%VERSION%%.so.0
-lib/libgstvideo-%%VERSION%%.a
lib/libgstvideo-%%VERSION%%.la
lib/libgstvideo-%%VERSION%%.so
lib/libgstvideo-%%VERSION%%.so.0
+libdata/pkgconfig/gstreamer-allocators-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-app-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-audio-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-fft-%%VERSION%%.pc
@@ -174,6 +181,8 @@ libdata/pkgconfig/gstreamer-sdp-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-tag-%%VERSION%%.pc
libdata/pkgconfig/gstreamer-video-%%VERSION%%.pc
man/man1/gst-discoverer-1.0.1.gz
+man/man1/gst-play-1.0.1.gz
+share/gir-1.0/GstAllocators-%%VERSION%%.gir
share/gir-1.0/GstApp-%%VERSION%%.gir
share/gir-1.0/GstAudio-%%VERSION%%.gir
share/gir-1.0/GstFft-%%VERSION%%.gir
@@ -200,8 +209,8 @@ share/locale/eu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/fi/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/fr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/gl/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
-share/locale/hr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/hu/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/id/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/it/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
share/locale/ja/LC_MESSAGES/gst-plugins-base-%%VERSION%%.mo
diff --git a/multimedia/gstreamer1/Makefile b/multimedia/gstreamer1/Makefile
index d4da8794686f..ae524f195f53 100644
--- a/multimedia/gstreamer1/Makefile
+++ b/multimedia/gstreamer1/Makefile
@@ -3,7 +3,7 @@
# $MCom: ports/multimedia/gstreamer1/Makefile,v 1.5 2013/01/15 21:43:45 kwm Exp $
PORTNAME= gstreamer1
-PORTVERSION= 1.0.10
+PORTVERSION= 1.2.1
CATEGORIES= multimedia
MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/
DISTNAME= ${PORTNAME:S/1//}-${PORTVERSION}
@@ -18,20 +18,17 @@ PORTSCOUT= limitw:1,even
CFLAGS:= ${CFLAGS} -O2 -Wno-format
USES= bison gettext gmake pathfix pkgconfig
USE_XZ= yes
-USE_GNOME= glib20 gnomehier introspection:build ltverhack:0 ltasneededhack
-USE_AUTOTOOLS= libtool
+USE_GNOME= glib20 gnomehier introspection:build ltverhack
+GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-tests \
--disable-examples \
--disable-failing-tests \
--disable-fatal-warnings \
--disable-gtk-doc
-#--enable-gst-debug --enable-debug
-CPPFLAGS+= -I${LOCALBASE}/include
-LDFLAGS+= -L${LOCALBASE}/lib
CONFIGURE_ENV= ac_cv_func_register_printf_function="no"
PLIST_SUB= VERSION=${GST10_VERSION}
USE_LDCONFIG= yes
-GST10_VERSION= ${PORTVERSION:R}
+GST10_VERSION= 1.0
OPTIONS_DEFINE= LIBCHECK
LIBCHECK_DESC= Unit tests support
diff --git a/multimedia/gstreamer1/distinfo b/multimedia/gstreamer1/distinfo
index 4d970b27d1c3..1dc16cc3497d 100644
--- a/multimedia/gstreamer1/distinfo
+++ b/multimedia/gstreamer1/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gstreamer-1.0.10.tar.xz) = 8e0aa9f41370586171a2616326fbc508bc4b61ffc4d55b2a8c4c3459d0cc1130
-SIZE (gstreamer-1.0.10.tar.xz) = 3140588
+SHA256 (gstreamer-1.2.1.tar.xz) = a4523d2471bca6cd0059a32e3b042f50faa4dadc6439852af8b43ca3f17d1fc9
+SIZE (gstreamer-1.2.1.tar.xz) = 3191504
diff --git a/multimedia/gstreamer1/files/patch-gst_gstdatetime.c b/multimedia/gstreamer1/files/patch-gst_gstdatetime.c
deleted file mode 100644
index 8eac4d8c76d4..000000000000
--- a/multimedia/gstreamer1/files/patch-gst_gstdatetime.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- gst/gstdatetime.c.orig 2013-10-20 16:05:12.000000000 +0200
-+++ gst/gstdatetime.c 2013-10-20 16:05:24.000000000 +0200
-@@ -21,8 +21,8 @@
- #include "config.h"
- #endif
-
--#include "glib-compat-private.h"
- #include "gst_private.h"
-+#include "glib-compat-private.h"
- #include "gstdatetime.h"
- #include "gstvalue.h"
- #include <glib.h>
diff --git a/multimedia/gstreamer1/pkg-plist b/multimedia/gstreamer1/pkg-plist
index 398249d75c87..ce1af138c20e 100644
--- a/multimedia/gstreamer1/pkg-plist
+++ b/multimedia/gstreamer1/pkg-plist
@@ -1,8 +1,11 @@
bin/gst-inspect-%%VERSION%%
bin/gst-launch-%%VERSION%%
bin/gst-typefind-%%VERSION%%
+include/gstreamer-%%VERSION%%/gst/base/base.h
include/gstreamer-%%VERSION%%/gst/base/gstadapter.h
include/gstreamer-%%VERSION%%/gst/base/gstbaseparse.h
+include/gstreamer-%%VERSION%%/gst/base/gstdataqueue.h
+include/gstreamer-%%VERSION%%/gst/base/gstqueuearray.h
include/gstreamer-%%VERSION%%/gst/base/gstbasesink.h
include/gstreamer-%%VERSION%%/gst/base/gstbasesrc.h
include/gstreamer-%%VERSION%%/gst/base/gstbasetransform.h
@@ -12,10 +15,13 @@ include/gstreamer-%%VERSION%%/gst/base/gstbytewriter.h
include/gstreamer-%%VERSION%%/gst/base/gstcollectpads.h
include/gstreamer-%%VERSION%%/gst/base/gstpushsrc.h
include/gstreamer-%%VERSION%%/gst/base/gsttypefindhelper.h
+%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/check.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstbufferstraw.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstcheck.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gstconsistencychecker.h
+%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/gsttestclock.h
%%CHECK%%include/gstreamer-%%VERSION%%/gst/check/internal-check.h
+include/gstreamer-%%VERSION%%/gst/controller/controller.h
include/gstreamer-%%VERSION%%/gst/controller/gstargbcontrolbinding.h
include/gstreamer-%%VERSION%%/gst/controller/gstdirectcontrolbinding.h
include/gstreamer-%%VERSION%%/gst/controller/gsttimedvaluecontrolsource.h
@@ -32,10 +38,12 @@ include/gstreamer-%%VERSION%%/gst/gstbufferlist.h
include/gstreamer-%%VERSION%%/gst/gstbufferpool.h
include/gstreamer-%%VERSION%%/gst/gstbus.h
include/gstreamer-%%VERSION%%/gst/gstcaps.h
+include/gstreamer-%%VERSION%%/gst/gstcapsfeatures.h
include/gstreamer-%%VERSION%%/gst/gstchildproxy.h
include/gstreamer-%%VERSION%%/gst/gstclock.h
include/gstreamer-%%VERSION%%/gst/gstcompat.h
include/gstreamer-%%VERSION%%/gst/gstconfig.h
+include/gstreamer-%%VERSION%%/gst/gstcontext.h
include/gstreamer-%%VERSION%%/gst/gstcontrolbinding.h
include/gstreamer-%%VERSION%%/gst/gstcontrolsource.h
include/gstreamer-%%VERSION%%/gst/gstdatetime.h
@@ -84,6 +92,7 @@ include/gstreamer-%%VERSION%%/gst/gstutils.h
include/gstreamer-%%VERSION%%/gst/gstvalue.h
include/gstreamer-%%VERSION%%/gst/gstversion.h
include/gstreamer-%%VERSION%%/gst/math-compat.h
+include/gstreamer-%%VERSION%%/gst/net/net.h
include/gstreamer-%%VERSION%%/gst/net/gstnet.h
include/gstreamer-%%VERSION%%/gst/net/gstnetaddressmeta.h
include/gstreamer-%%VERSION%%/gst/net/gstnetclientclock.h
@@ -96,23 +105,18 @@ lib/girepository-1.0/GstController-%%VERSION%%.typelib
lib/girepository-1.0/GstNet-%%VERSION%%.typelib
lib/gstreamer-%%VERSION%%/libgstcoreelements.la
lib/gstreamer-%%VERSION%%/libgstcoreelements.so
-lib/libgstbase-%%VERSION%%.a
lib/libgstbase-%%VERSION%%.la
lib/libgstbase-%%VERSION%%.so
lib/libgstbase-%%VERSION%%.so.0
-%%CHECK%%lib/libgstcheck-%%VERSION%%.a
%%CHECK%%lib/libgstcheck-%%VERSION%%.la
%%CHECK%%lib/libgstcheck-%%VERSION%%.so
%%CHECK%%lib/libgstcheck-%%VERSION%%.so.0
-lib/libgstcontroller-%%VERSION%%.a
lib/libgstcontroller-%%VERSION%%.la
lib/libgstcontroller-%%VERSION%%.so
lib/libgstcontroller-%%VERSION%%.so.0
-lib/libgstnet-%%VERSION%%.a
lib/libgstnet-%%VERSION%%.la
lib/libgstnet-%%VERSION%%.so
lib/libgstnet-%%VERSION%%.so.0
-lib/libgstreamer-%%VERSION%%.a
lib/libgstreamer-%%VERSION%%.la
lib/libgstreamer-%%VERSION%%.so
lib/libgstreamer-%%VERSION%%.so.0