6 files changed, 31 insertions, 9 deletions

diff --git a/multimedia/gstreamer-plugins-ugly/Makefile b/multimedia/gstreamer-plugins-ugly/Makefile
index 6e58f2a8444a..8f2db5579f80 100644
--- a/multimedia/gstreamer-plugins-ugly/Makefile
+++ b/multimedia/gstreamer-plugins-ugly/Makefile
@@ -6,7 +6,7 @@
 #    $MCom: ports/multimedia/gstreamer-plugins-ugly/Makefile,v 1.13 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Ugly gstreamer-plugins
@@ -17,7 +17,6 @@ GST_PLUGIN_SUFFIX=	-ugly
 MASTERDIR=	${.CURDIR}/../../multimedia/gstreamer-plugins
 
 BUILD_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
-LIB_DEPENDS+=	oil-0.3.0:${PORTSDIR}/devel/liboil
 RUN_DEPENDS+=	gstreamer-plugins>=${GST_VERSION}${GST_MINOR_VERSION}:${PORTSDIR}/multimedia/gstreamer-plugins
 
 gst_ugly_DIST=	ugly
diff --git a/multimedia/gstreamer-plugins-ugly/pkg-plist b/multimedia/gstreamer-plugins-ugly/pkg-plist
index 5e99032a6061..ad9c5a415952 100644
--- a/multimedia/gstreamer-plugins-ugly/pkg-plist
+++ b/multimedia/gstreamer-plugins-ugly/pkg-plist
@@ -25,6 +25,7 @@ share/locale/es/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/eu/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/fi/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/fr/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/hu/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/id/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/it/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
@@ -38,6 +39,7 @@ share/locale/nl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/or/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/pl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/pt_BR/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
+share/locale/ro/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/ru/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/sk/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
 share/locale/sl/LC_MESSAGES/gst-plugins-ugly-%%VERSION%%.mo
diff --git a/multimedia/gstreamer-plugins-x264/Makefile b/multimedia/gstreamer-plugins-x264/Makefile
index 9ff5576ca6e0..9c355de0326d 100644
--- a/multimedia/gstreamer-plugins-x264/Makefile
+++ b/multimedia/gstreamer-plugins-x264/Makefile
@@ -6,7 +6,7 @@
 #   $MCom: ports/multimedia/gstreamer-plugins-x264/Makefile,v 1.3 2008/03/19 14:05:37 ahze Exp $
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	multimedia
 
 COMMENT=	Gstreamer x264 plugin
diff --git a/multimedia/gstreamer-plugins/Makefile b/multimedia/gstreamer-plugins/Makefile
index 66a182b5e6cc..e3bafa1b697e 100644
--- a/multimedia/gstreamer-plugins/Makefile
+++ b/multimedia/gstreamer-plugins/Makefile
@@ -39,7 +39,7 @@ BAD_DISTFILE=		${BAD_DISTNAME}${EXTRACT_SUFX}
 GOOD_PORTVERSION=	0.10.24
 GOOD_DISTNAME=		gst-plugins-good-${GOOD_PORTVERSION}
 GOOD_DISTFILE=		${GOOD_DISTNAME}${EXTRACT_SUFX}
-UGLY_PORTVERSION=	0.10.15
+UGLY_PORTVERSION=	0.10.16
 UGLY_DISTNAME=		gst-plugins-ugly-${UGLY_PORTVERSION}
 UGLY_DISTFILE=		${UGLY_DISTNAME}${EXTRACT_SUFX}
 DIST?=		good
diff --git a/multimedia/gstreamer-plugins/Makefile.common b/multimedia/gstreamer-plugins/Makefile.common
index 08bf8dffc439..4e3ce689d327 100644
--- a/multimedia/gstreamer-plugins/Makefile.common
+++ b/multimedia/gstreamer-plugins/Makefile.common
@@ -14,7 +14,7 @@ BASE_GST_ALL_PLUGINS= \
 # bad
 BAD_GST_ALL_PLUGINS+= \
 		alsaspdif \
-		amrwbenc \
+		amrwb \
 		apexsink \
 		assrender \
 		bz2 \
@@ -118,7 +118,6 @@ CONFIGURE_ARGS+=--disable-tests \
 		--disable-examples \
 		--disable-1394 \
 		--disable-acm \
-		--disable-amrnb \
 		--disable-alsa \
 		--disable-dvb \
 		--disable-http \
@@ -163,6 +162,22 @@ gst_aalib_LIB_DEPENDS+=	aa.1:${PORTSDIR}/graphics/aalib
 gst_aalib_PLIST_FILES=	${GST_LIB_DIR}/libgstaasink.so \
 		${GST_LIB_DIR}/libgstaasink.la
 
+# amrnb
+gst_amrnb_LIB_DEPENDS+=	opencore-amrnb.0:${PORTSDIR}/audio/opencore-amr
+gst_amrnb_PLIST_FILES=	${GST_LIB_DIR}/libgstamrnb.la \
+			${GST_LIB_DIR}/libgstamrnb.so \
+			share/gstreamer-${VERSION}/presets/GstAmrnbEnc.prs
+gst_amrnb_PLIST_DIRS=	share/gstreamer-${VERSION}/presets \
+			share/gstreamer-${VERSION}
+gst_amrnb_DIST=		ugly
+
+# amrwbdec
+gst_amrwbdec_LIB_DEPENDS+=	opencore-amrwb.0:${PORTSDIR}/audio/opencore-amr
+gst_amrwbdec_CONFIGURE_ARGS+=	--enable-amrwb
+gst_amrwbdec_PLIST_FILES=	${GST_LIB_DIR}/libgstamrwbdec.la \
+				${GST_LIB_DIR}/libgstamrwbdec.so
+gst_amrwbdec_DIST=	ugly
+
 # annodex
 gst_annodex_LIB_DEPENDS+=	xml2.5:${PORTSDIR}/textproc/libxml2
 gst_annodex_PLIST_FILES=	${GST_LIB_DIR}/libgstannodex.la \
@@ -452,6 +467,12 @@ gst_theora_PLIST_FILES=		${GST_LIB_DIR}/libgsttheora.la \
 		${GST_LIB_DIR}/libgsttheora.so
 gst_theora_DIST=	base
 
+# twolame
+gst_twolame_LIB_DEPENDS+=	twolame.0:${PORTSDIR}/audio/twolame
+gst_twolame_PLIST_FILES=	${GST_LIB_DIR}/libgsttwolame.la \
+				${GST_LIB_DIR}/libgsttwolame.so
+gst_twolame_DIST=		ugly
+
 # gst_v4l2
 gst_gst_v4l2_LIB_DEPENDS+=	v4l2.0:${PORTSDIR}/multimedia/libv4l
 .if ${OSVERSION} >= 800000
diff --git a/multimedia/gstreamer-plugins/distinfo b/multimedia/gstreamer-plugins/distinfo
index 22275dadb8c2..f12b04ff0603 100644
--- a/multimedia/gstreamer-plugins/distinfo
+++ b/multimedia/gstreamer-plugins/distinfo
@@ -4,9 +4,9 @@ SIZE (gst-plugins-base-0.10.30.tar.bz2) = 2455042
 MD5 (gst-plugins-bad-0.10.19.tar.bz2) = 368f72e2a1c7a6e8fe60394e4315259b
 SHA256 (gst-plugins-bad-0.10.19.tar.bz2) = 7b6c49f22caad3b573aee481381355b38ac9f2077f291d9f33a9a808a2568888
 SIZE (gst-plugins-bad-0.10.19.tar.bz2) = 3009513
-MD5 (gst-plugins-ugly-0.10.15.tar.bz2) = 21c034a762a5da252f91640e53bfe457
-SHA256 (gst-plugins-ugly-0.10.15.tar.bz2) = ceebb7878d957a61cf437c1f93934a0371631fa50e4111ef016691d65866790c
-SIZE (gst-plugins-ugly-0.10.15.tar.bz2) = 1034223
+MD5 (gst-plugins-ugly-0.10.16.tar.bz2) = 989e1b0fab010f73f76912f70ec5f62a
+SHA256 (gst-plugins-ugly-0.10.16.tar.bz2) = d7fc7636001e78736540c628ad889888cb85ea722f08d1c6813b16682dd9c09c
+SIZE (gst-plugins-ugly-0.10.16.tar.bz2) = 1041297
 MD5 (gst-plugins-good-0.10.24.tar.bz2) = dc0de606e3e303cf378327b72a4d281f
 SHA256 (gst-plugins-good-0.10.24.tar.bz2) = f274aac9c5b8efc66833c33cfad353209c785ac111465b37146680ee0de2d0be
 SIZE (gst-plugins-good-0.10.24.tar.bz2) = 2921780