Major update to GStreamer plugins-ugly 0.10.13.

Months (years?) of changes, refer to the source for changelog.

Simplify DESCR.

tested on a bulk by jasper@
feedback and sparc64+macppc testing from landry@

"commitski" jasper, ok landry@

multimedia/gstreamer-0.10/plugins-ugly/Makefile

@@ -1,15 +1,15 @@
-# $OpenBSD: Makefile,v 1.12 2009/09/28 19:52:15 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.13 2009/11/29 09:17:54 ajacoutot Exp $
 
-COMMENT-main =		multimedia framework - plugins ugly
+COMMENT-main =		ugly elements for GStreamer
-COMMENT-sidplay =	multimedia framework - sidplay plugin
+COMMENT-sidplay =	sidplay element for GStreamer (ugly)
-COMMENT-lame =		multimedia framework - lame plugin
+COMMENT-lame =		lame element for GStreamer (ugly)
 
-V =			0.10.7
+V =			0.10.13
 DISTNAME =		gst-plugins-ugly-$V
 
-PKGNAME-main =		gstreamer-plugins-ugly-$Vp3
+PKGNAME-main =		gstreamer-plugins-ugly-$V
-PKGNAME-sidplay =	gstreamer-sidplay-$Vp3
+PKGNAME-sidplay =	gstreamer-sidplay-$V
-PKGNAME-lame =		gstreamer-lame-$Vp3
+PKGNAME-lame =		gstreamer-lame-$V
 
 MULTI_PACKAGES =	-main -sidplay -lame
 
@@ -22,22 +22,28 @@ MODULES =		devel/gettext
 
 WANTLIB =		glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \
 			xml2 m z pcre
+
+.for i in ${MULTI_PACKAGES}
+REGRESS_DEPENDS +=	::${BASE_PKGPATH},${i}
+.endfor
+
 LIB_DEPENDS =		gstreamer-0.10:gstreamer->=0.10:$P/core
 RUN_DEPENDS =		::${BUILD_PKGPATH}
 
 WANTLIB-main =		${WANTLIB}
 LIB_DEPENDS-main =	${LIB_DEPENDS} \
-			gstriff-0.10,gstrtsp-0.10,gstsdp-0.10,gsttag-0.10::$P/plugins-base \
+			gstriff-0.10,gstrtsp-0.10,gstsdp-0.10,gsttag-0.10,gstrtp-0.10,gstvideo-0.10::$P/plugins-base \
 			gstbase-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:$P/core \
 			oil-0.3::devel/liboil \
 			a52::audio/liba52 \
 			id3tag::audio/libid3tag \
 			mad::audio/libmad \
 			mpeg2::graphics/libmpeg2 \
-			dvdread::devel/libdvdread
+			dvdread::devel/libdvdread \
-RUN_DEPENDS-main =	
+			x264.>=3::multimedia/x264
-			
+RUN_DEPENDS-main =	${MODGETTEXT_RUN_DEPENDS}
-WANTLIB-sidplay =	${WANTLIB} stdc++
+
+WANTLIB-sidplay =	${WANTLIB} gstbase-0.10 stdc++
 LIB_DEPENDS-sidplay =	${LIB_DEPENDS} \
 			sidplay::audio/libsidplay
 
@@ -45,6 +51,9 @@ WANTLIB-lame =		${WANTLIB}
 LIB_DEPENDS-lame =	${LIB_DEPENDS} \
 			mp3lame::audio/lame
 
-CONFIGURE_ARGS =		--disable-amrnb
+CONFIGURE_ARGS =	--disable-amrnb \
+			--disable-cdio \
+			--disable-twolame
+CONFIGURE_ENV +=	ac_cv_path_PYTHON=""
 
 .include <bsd.port.mk>

multimedia/gstreamer-0.10/plugins-ugly/distinfo

@@ -1,5 +1,5 @@
-MD5 (gst-plugins-ugly-0.10.7.tar.bz2) = z/T1UTjRIVLPWAo+5xwlGQ==
+MD5 (gst-plugins-ugly-0.10.13.tar.bz2) = Fhk2UkfvnNfaHNiQKFv4eg==
-RMD160 (gst-plugins-ugly-0.10.7.tar.bz2) = 6xj90S/JgJ3eoBN9XWQbumd3W/4=
+RMD160 (gst-plugins-ugly-0.10.13.tar.bz2) = HPhW/Sc//4sIs72YfsNrgsM8N0o=
-SHA1 (gst-plugins-ugly-0.10.7.tar.bz2) = oe7Zhezm2rV6K08x7xRNlewCSvs=
+SHA1 (gst-plugins-ugly-0.10.13.tar.bz2) = ICUsx0PL3MpixwK1q3A8K+D52VU=
-SHA256 (gst-plugins-ugly-0.10.7.tar.bz2) = VWuiQHK9sy7laK3Ggtaa3RJB13k2vJVj5QzblTCXvjU=
+SHA256 (gst-plugins-ugly-0.10.13.tar.bz2) = OfB6YHOfXfpPVXSgLbFd5p/QW56mMjlIgzjsNJG/aag=
-SIZE (gst-plugins-ugly-0.10.7.tar.bz2) = 868172
+SIZE (gst-plugins-ugly-0.10.13.tar.bz2) = 1016859

multimedia/gstreamer-0.10/plugins-ugly/patches/patch-common_m4_as-python_m4

@@ -1,13 +0,0 @@
-$OpenBSD: patch-common_m4_as-python_m4,v 1.1.1.1 2007/01/08 17:37:27 espie Exp $
---- common/m4/as-python.m4.orig	Mon Jan 20 19:05:46 2003
-+++ common/m4/as-python.m4	Mon Jan  8 17:33:37 2007
-@@ -40,8 +40,7 @@ AC_DEFUN([AS_PATH_PYTHON],
-   dnl in 1.5, and I don't want to maintain that logic.
- 
-   dnl should we do the version check?
--  PYTHON_CANDIDATES="python python2.2 python2.1 python2.0 python2 \
--                     python1.6 python1.5"
-+  PYTHON_CANDIDATES="python$MODPY_VERSION"
-   ifelse([$1],[],
-          [AC_PATH_PROG(PYTHON, $PYTHON_CANDIDATES)],
-          [

multimedia/gstreamer-0.10/plugins-ugly/patches/patch-configure_ac

@@ -0,0 +1,23 @@
+$OpenBSD: patch-configure_ac,v 1.1 2009/11/29 09:17:54 ajacoutot Exp $
+--- configure.ac.orig	Tue Nov 24 10:21:47 2009
++++ configure.ac	Tue Nov 24 10:23:01 2009
+@@ -357,7 +357,7 @@ AG_GST_CHECK_FEATURE(TWOLAME, [twolame], twolame, [
+ dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
+ translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
+ AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
+-  AG_GST_CHECK_LIBHEADER(X264, x264, x264_encoder_encode, -lm, x264.h,
++  AG_GST_CHECK_LIBHEADER(X264, x264, x264_encoder_encode, -pthread -lm, x264.h,
+       AC_MSG_CHECKING([for uptodate x264 API version])
+       dnl _stdint not yet generated, so no compiling
+       AC_TRY_CPP([
+@@ -367,8 +367,8 @@ AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
+         #endif
+       ], [
+         AC_MSG_RESULT(yes)
+-        X264_LIBS="$LDFLAGS -lx264 -lm"
+-        X264_CFLAGS="$CFLAGS"
++        X264_LIBS="$LDFLAGS -lx264 -pthread -lm"
++        X264_CFLAGS="$CFLAGS -pthread"
+         AC_SUBST(X264_LIBS)
+         AC_SUBST(X264_CFLAGS)
+       ], [

multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c

@@ -1,6 +1,6 @@
-$OpenBSD: patch-ext_dvdread_dvdreadsrc_c,v 1.2 2008/05/13 15:11:51 espie Exp $
+$OpenBSD: patch-ext_dvdread_dvdreadsrc_c,v 1.3 2009/11/29 09:17:54 ajacoutot Exp $
---- ext/dvdread/dvdreadsrc.c.orig	Mon Feb 18 16:49:58 2008
+--- ext/dvdread/dvdreadsrc.c.orig	Mon Oct 12 12:25:41 2009
-+++ ext/dvdread/dvdreadsrc.c	Tue May 13 16:00:51 2008
++++ ext/dvdread/dvdreadsrc.c	Tue Nov 24 10:21:00 2009
 @@ -128,7 +128,7 @@ gst_dvd_read_src_init (GstDvdReadSrc * src, GstDvdRead
    src->vmg_file = NULL;
    src->dvd_title = NULL;
@@ -10,7 +10,7 @@ $OpenBSD: patch-ext_dvdread_dvdreadsrc_c,v 1.2 2008/05/13 15:11:51 espie Exp $
    src->last_uri = NULL;
    src->new_seek = TRUE;
    src->new_cell = TRUE;
-@@ -955,7 +955,7 @@ gst_dvd_read_src_set_property (GObject * object, guint
+@@ -970,7 +970,7 @@ gst_dvd_read_src_set_property (GObject * object, guint
        g_free (src->location);
        /* clear the filename if we get a NULL (is that possible?) */
        if (g_value_get_string (value) == NULL) {

multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c

@@ -1,14 +0,0 @@
-$OpenBSD: patch-ext_lame_gstlame_c,v 1.1 2008/05/13 15:11:51 espie Exp $
---- ext/lame/gstlame.c.orig	Tue May 13 16:07:51 2008
-+++ ext/lame/gstlame.c	Tue May 13 16:08:14 2008
-@@ -577,8 +577,8 @@ zero_output_rate:
-   }
- setup_failed:
-   {
--    GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS,
--        (_("Failed to configure LAME encoder. Check your encoding parameters.")), NULL);
-+    GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS, (NULL),
-+        ("Failed to configure LAME encoder. Check your encoding parameters."));
-     return FALSE;
-   }
- }

multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in

@@ -1,12 +1,12 @@
-$OpenBSD: patch-ext_sidplay_Makefile_in,v 1.2 2008/05/13 15:11:51 espie Exp $
+$OpenBSD: patch-ext_sidplay_Makefile_in,v 1.3 2009/11/29 09:17:54 ajacoutot Exp $
---- ext/sidplay/Makefile.in.orig	Thu Feb 21 00:36:39 2008
+--- ext/sidplay/Makefile.in.orig	Wed Oct 21 17:55:39 2009
-+++ ext/sidplay/Makefile.in	Tue May 13 16:00:55 2008
++++ ext/sidplay/Makefile.in	Tue Nov 24 10:21:05 2009
-@@ -293,7 +293,7 @@ SED = @SED@
+@@ -278,7 +278,7 @@ SED = @SED@
  SET_MAKE = @SET_MAKE@
  SHELL = @SHELL@
  SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@
 -SIDPLAY_LIBS = @SIDPLAY_LIBS@
 +SIDPLAY_LIBS = @SIDPLAY_LIBS@ -lstdc++
  STRIP = @STRIP@
- USE_A52DEC_FALSE = @USE_A52DEC_FALSE@
+ TWOLAME_CFLAGS = @TWOLAME_CFLAGS@
- USE_A52DEC_TRUE = @USE_A52DEC_TRUE@
+ TWOLAME_LIBS = @TWOLAME_LIBS@

multimedia/gstreamer-0.10/plugins-ugly/pkg/DESCR-lame

@@ -1,2 +1 @@
-plugin for gstreamer-${VERSION} with controversial licence.
+This package contains the "lame" element for gstreamer-${VERSION} (ugly).
-* lame     encode MP3s with LAME

multimedia/gstreamer-0.10/plugins-ugly/pkg/DESCR-main

@@ -1,25 +1,6 @@
-This package contains "ugly" plugins for gstreamer-${VERSION}.
+This package contains "ugly" elements for gstreamer-${VERSION}.
-The gstreamer people split plugins into:
+GStreamer plugins are splitted into:
-- base plugins (plugins-base)
+- an essential exemplary set of elements (plugins-base)
-- plugins with good code and a good licence (plugins-good)
+- a set of good-quality plug-ins under LGPL (plugins-good)
-- plugins with licence issues (plugins-ugly)
+- a set of good-quality plug-ins that might pose distribution problems (plugins-ugly)
-- plugins with relatively bad code (plugins-bad)
+- a set of plug-ins that need more quality (plugins-bad)
-
-* a52dec         decodes ATSC A/52 encoded audio streams
-* asf            demuxes and muxes audio and video in Microsoft's ASF format
-* dvdlpcmdec     decode DVD LPCM frames into standard PCM
-* dvdread        Access a DVD title/chapter/angle using libdvdread
-* dvdsub         aecode DVD subtitles to AYUV video frames
-* iec958         convert raw AC3 into IEC958 (S/PDIF) frames
-* mad            id3 tag manipulation and mp3 decoding based on the mad library
-* mpeg2dec       LibMpeg2 decoder
-* mpegaudioparse MPEG-1 layer 1/2/3 audio parser
-* mpegstream     MPEG system stream parser: mpeg1, mpeg2, dvd/vob
-* rmdemux        Realmedia stream demuxer
-
-The following plugins are in specific packages because of dependencies:
-* lame
-* siddec
-
-The following plugins are not built:
-* amrnb (support library not ported/not existing)

multimedia/gstreamer-0.10/plugins-ugly/pkg/DESCR-sidplay

@@ -1,2 +1 @@
-plugin for gstreamer-${VERSION} with controversial licence.
+This package contains the "siddec" element for gstreamer-${VERSION} (ugly).
-* siddec     uses libsidplay to decode .sid audio tunes        

multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-lame

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST-lame,v 1.2 2009/09/28 18:28:36 ajacoutot Exp $
+@comment $OpenBSD: PLIST-lame,v 1.3 2009/11/29 09:17:54 ajacoutot Exp $
-lib/gstreamer-${VERSION}/libgstlame.la
+@comment lib/gstreamer-${VERSION}/libgstlame.la
 lib/gstreamer-${VERSION}/libgstlame.so

multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main

@@ -1,49 +1,69 @@
-@comment $OpenBSD: PLIST-main,v 1.5 2009/09/28 18:28:36 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.6 2009/11/29 09:17:54 ajacoutot Exp $
+@conflict gstreamer-bad-<0.10.17
 @conflict gstreamer-a52-*
 @conflict gstreamer-mad-*
 @conflict gstreamer-mpeg2-*
 @conflict gstreamer-dvdread-*
-lib/gstreamer-${VERSION}/libgsta52dec.la
+@comment lib/gstreamer-${VERSION}/libgsta52dec.la
 lib/gstreamer-${VERSION}/libgsta52dec.so
-lib/gstreamer-${VERSION}/libgstasf.la
+@comment lib/gstreamer-${VERSION}/libgstasf.la
 lib/gstreamer-${VERSION}/libgstasf.so
-lib/gstreamer-${VERSION}/libgstdvdlpcmdec.la
+@comment lib/gstreamer-${VERSION}/libgstdvdlpcmdec.la
 lib/gstreamer-${VERSION}/libgstdvdlpcmdec.so
-lib/gstreamer-${VERSION}/libgstdvdread.la
+@comment lib/gstreamer-${VERSION}/libgstdvdread.la
 lib/gstreamer-${VERSION}/libgstdvdread.so
-lib/gstreamer-${VERSION}/libgstdvdsub.la
+@comment lib/gstreamer-${VERSION}/libgstdvdsub.la
 lib/gstreamer-${VERSION}/libgstdvdsub.so
-lib/gstreamer-${VERSION}/libgstiec958.la
+@comment lib/gstreamer-${VERSION}/libgstiec958.la
 lib/gstreamer-${VERSION}/libgstiec958.so
-lib/gstreamer-${VERSION}/libgstmad.la
+@comment lib/gstreamer-${VERSION}/libgstmad.la
 lib/gstreamer-${VERSION}/libgstmad.so
-lib/gstreamer-${VERSION}/libgstmpeg2dec.la
+@comment lib/gstreamer-${VERSION}/libgstmpeg2dec.la
 lib/gstreamer-${VERSION}/libgstmpeg2dec.so
-lib/gstreamer-${VERSION}/libgstmpegaudioparse.la
+@comment lib/gstreamer-${VERSION}/libgstmpegaudioparse.la
 lib/gstreamer-${VERSION}/libgstmpegaudioparse.so
-lib/gstreamer-${VERSION}/libgstmpegstream.la
+@comment lib/gstreamer-${VERSION}/libgstmpegstream.la
 lib/gstreamer-${VERSION}/libgstmpegstream.so
-lib/gstreamer-${VERSION}/libgstrmdemux.la
+@comment lib/gstreamer-${VERSION}/libgstrmdemux.la
 lib/gstreamer-${VERSION}/libgstrmdemux.so
+@comment lib/gstreamer-${VERSION}/libgstx264.la
+lib/gstreamer-${VERSION}/libgstx264.so
+share/gstreamer-${VERSION}/
+share/gstreamer-${VERSION}/presets/
+share/gstreamer-${VERSION}/presets/GstX264Enc.prs
 share/locale/af/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/az/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/bg/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
+share/locale/ca/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/cs/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/da/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
+share/locale/de/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/en_GB/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 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/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
+share/locale/ja/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
+share/locale/lt/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
+share/locale/lv/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
+share/locale/ms/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
+share/locale/mt/
+share/locale/mt/LC_MESSAGES/
+share/locale/mt/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/nb/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 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/ru/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/sk/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/sq/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/sr/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/sv/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
+share/locale/tr/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/uk/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/vi/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo
 share/locale/zh_CN/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo

multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-sidplay

@@ -1,3 +1,3 @@
-@comment $OpenBSD: PLIST-sidplay,v 1.2 2009/09/28 18:28:36 ajacoutot Exp $
+@comment $OpenBSD: PLIST-sidplay,v 1.3 2009/11/29 09:17:54 ajacoutot Exp $
-lib/gstreamer-${VERSION}/libgstsid.la
+@comment lib/gstreamer-${VERSION}/libgstsid.la
 lib/gstreamer-${VERSION}/libgstsid.so