Update to 0.10.18.

Ivorbis plugin got merged with the vorbis plugin.
Depend on neon29 instead of neon28 if it is found.

6 files changed, 19 insertions, 20 deletions

diff --git a/multimedia/gstreamer-plugins-bad/Makefile b/multimedia/gstreamer-plugins-bad/Makefile
index 9088efb94be3..6ef4097a51cd 100644
--- a/multimedia/gstreamer-plugins-bad/Makefile
+++ b/multimedia/gstreamer-plugins-bad/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-bad/Makefile,v 1.11 2008/03/19 14:05:35 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Bad gstreamer-plugins
diff --git a/multimedia/gstreamer-plugins-bad/pkg-plist b/multimedia/gstreamer-plugins-bad/pkg-plist
index 297a8a27c51d..7778399e3727 100644
--- a/multimedia/gstreamer-plugins-bad/pkg-plist
+++ b/multimedia/gstreamer-plugins-bad/pkg-plist
@@ -6,24 +6,26 @@ include/gstreamer-%%VERSION%%/gst/video/gstbasevideodecoder.h
 include/gstreamer-%%VERSION%%/gst/video/gstbasevideoencoder.h
 include/gstreamer-%%VERSION%%/gst/video/gstbasevideoparse.h
 include/gstreamer-%%VERSION%%/gst/video/gstbasevideoutils.h
-lib/gstreamer-%%VERSION%%/libgstaacparse.la
-lib/gstreamer-%%VERSION%%/libgstaacparse.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%%/libgstamrparse.la
-lib/gstreamer-%%VERSION%%/libgstamrparse.so
 lib/gstreamer-%%VERSION%%/libgstasfmux.la
 lib/gstreamer-%%VERSION%%/libgstasfmux.so
 lib/gstreamer-%%VERSION%%/libgstautoconvert.la
 lib/gstreamer-%%VERSION%%/libgstautoconvert.so
+lib/gstreamer-%%VERSION%%/libgstaudioparsersbad.la
+lib/gstreamer-%%VERSION%%/libgstaudioparsersbad.so
 lib/gstreamer-%%VERSION%%/libgstbayer.la
 lib/gstreamer-%%VERSION%%/libgstbayer.so
 lib/gstreamer-%%VERSION%%/libgstcamerabin.la
 lib/gstreamer-%%VERSION%%/libgstcamerabin.so
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.la
 lib/gstreamer-%%VERSION%%/libgstcdxaparse.so
+lib/gstreamer-%%VERSION%%/libgstdataurisrc.la
+lib/gstreamer-%%VERSION%%/libgstdataurisrc.so
 lib/gstreamer-%%VERSION%%/libgstdccp.la
 lib/gstreamer-%%VERSION%%/libgstdccp.so
 lib/gstreamer-%%VERSION%%/libgstdebugutilsbad.la
@@ -44,6 +46,8 @@ lib/gstreamer-%%VERSION%%/libgsthdvparse.la
 lib/gstreamer-%%VERSION%%/libgsthdvparse.so
 lib/gstreamer-%%VERSION%%/libgstid3tag.la
 lib/gstreamer-%%VERSION%%/libgstid3tag.so
+lib/gstreamer-%%VERSION%%/libgstjpegformat.la
+lib/gstreamer-%%VERSION%%/libgstjpegformat.so
 lib/gstreamer-%%VERSION%%/libgstlegacyresample.la
 lib/gstreamer-%%VERSION%%/libgstlegacyresample.so
 lib/gstreamer-%%VERSION%%/libgstliveadder.la
@@ -89,8 +93,6 @@ lib/gstreamer-%%VERSION%%/libgstsdpelem.la
 lib/gstreamer-%%VERSION%%/libgstsdpelem.so
 lib/gstreamer-%%VERSION%%/libgstselector.la
 lib/gstreamer-%%VERSION%%/libgstselector.so
-lib/gstreamer-%%VERSION%%/libgstshapewipe.la
-lib/gstreamer-%%VERSION%%/libgstshapewipe.so
 lib/gstreamer-%%VERSION%%/libgstsiren.la
 lib/gstreamer-%%VERSION%%/libgstsiren.so
 lib/gstreamer-%%VERSION%%/libgstspeed.la
diff --git a/multimedia/gstreamer-plugins-mpeg2enc/Makefile b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
index 3333a6d274ba..ec0488758256 100644
--- a/multimedia/gstreamer-plugins-mpeg2enc/Makefile
+++ b/multimedia/gstreamer-plugins-mpeg2enc/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-mpeg2enc/Makefile,v 1.5 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer mpeg encoder plugin
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index b214b92bdacd..1b1d412329c9 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -34,7 +34,7 @@ CFLAGS:=	${CFLAGS} -O2 -Wno-format
 BASE_PORTVERSION=	0.10.28
 BASE_DISTNAME=		gst-plugins-base-${BASE_PORTVERSION}
 BASE_DISTFILE=		${BASE_DISTNAME}${EXTRACT_SUFX}
-BAD_PORTVERSION=	0.10.17
+BAD_PORTVERSION=	0.10.18
 BAD_DISTNAME=		gst-plugins-bad-${BAD_PORTVERSION}
 BAD_DISTFILE=		${BAD_DISTNAME}${EXTRACT_SUFX}
 GOOD_PORTVERSION=	0.10.17
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index d24bbcd659be..adff6907f72c 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -30,7 +30,6 @@ BAD_GST_ALL_PLUGINS+= \
 		faad \
 		gme \
 		gsm \
-		ivorbis \
 		jack \
 		jp2k \
 		kate \
@@ -73,7 +72,6 @@ GOOD_GST_ALL_PLUGINS+= \
 		gdk_pixbuf \
 		hal \
 		jpeg \
-		ladspa \
 		libcaca \
 		libpng \
 		pulse \
@@ -279,12 +277,6 @@ gst_gsm_PLIST_FILES=	${GST_LIB_DIR}/libgstgsm.la \
 		${GST_LIB_DIR}/libgstgsm.so
 gst_gsm_DIST=	bad
 
-# ivorbis
-gst_ivorbis_LIB_DEPENDS+=	vorbisidec.1:${PORTSDIR}/audio/libtremor
-gst_ivorbis_PLIST_FILES=	${GST_LIB_DIR}/libgstivorbis.la \
-		${GST_LIB_DIR}/libgstivorbis.so
-gst_ivorbis_DIST=	bad
-
 # hal
 gst_hal_LIB_DEPENDS+=	hal.1:${PORTSDIR}/sysutils/hal
 gst_hal_PLIST_FILES=	${GST_LIB_DIR}/libgsthalelements.la \
@@ -305,6 +297,7 @@ gst_jpeg_PLIST_FILES=	${GST_LIB_DIR}/libgstjpeg.la \
 gst_ladspa_BUILD_DEPENDS+=	${LOCALBASE}/include/ladspa.h:${PORTSDIR}/audio/ladspa
 gst_ladspa_PLIST_FILES=		${GST_LIB_DIR}/libgstladspa.la \
 				${GST_LIB_DIR}/libgstladspa.so
+gst_ladspa_DIST=	bad
 
 # lame
 gst_lame_LIB_DEPENDS+=	mp3lame.0:${PORTSDIR}/audio/lame
@@ -373,7 +366,11 @@ gst_nas_PLIST_FILES=	${GST_LIB_DIR}/libgstnassink.la \
 		${GST_LIB_DIR}/libgstnassink.so
 
 # neon
+.if exists(${LOCALBASE}/lib/libneon.so.29)
+gst_neon_LIB_DEPENDS+=	neon.29:${PORTSDIR}/www/neon29
+.else
 gst_neon_LIB_DEPENDS+=	neon.28:${PORTSDIR}/www/neon28
+.endif
 gst_neon_CONFIGURE_ENV+=	NEON_CFLAGS="-I${LOCALBASE}/include/neon"
 gst_neon_PLIST_FILES=	${GST_LIB_DIR}/libgstneonhttpsrc.la \
 			${GST_LIB_DIR}/libgstneonhttpsrc.so
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 36e747f3f1ee..23f5da5f497a 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -1,9 +1,9 @@
 MD5 (gst-plugins-base-0.10.28.tar.bz2) = 0107cf985ac90544bae70288220f5bab
 SHA256 (gst-plugins-base-0.10.28.tar.bz2) = 132b6fd7749fcbfa9ad88c854aada44b6870c4175bda21cdb01a52b59a98e14f
 SIZE (gst-plugins-base-0.10.28.tar.bz2) = 2343870
-MD5 (gst-plugins-bad-0.10.17.tar.bz2) = c0c3e79430d4441c4825436387d200f4
-SHA256 (gst-plugins-bad-0.10.17.tar.bz2) = 531559d331d6802545b759e50fe5de28da147d0dcd5b9e883d87a6821fbd064a
-SIZE (gst-plugins-bad-0.10.17.tar.bz2) = 2946258
+MD5 (gst-plugins-bad-0.10.18.tar.bz2) = 84838893b447e774d401a698ff812b32
+SHA256 (gst-plugins-bad-0.10.18.tar.bz2) = 2f800127e00da0f157358f87b06563b3de23cbc630fbf6295b43405e52e02070
+SIZE (gst-plugins-bad-0.10.18.tar.bz2) = 3028412
 MD5 (gst-plugins-ugly-0.10.14.tar.bz2) = 0bc0d27bcce88c73ef6c81e88624e686
 SHA256 (gst-plugins-ugly-0.10.14.tar.bz2) = 78dba9963e130cfd09f294b60219e6562459c5d848bc3b38a653db7f21fc850b
 SIZE (gst-plugins-ugly-0.10.14.tar.bz2) = 1028518