|
View:
New views
2 Messages
—
Rating Filter:
Alert me
|
|
|
[update] Gstreamer-0.10 & RhythmboxHi all,
I have updated rhythmbox and gstreamer. It's works in i386. Rhythmbox require totem-pl-parser & libmusicbrainz to build. Thanks, BSDManiak [gstreamer-0.10.diff] diff -urN multimedia/gstreamer-0.10/Makefile.inc mystuff/multimedia/gstreamer-0.10/Makefile.inc --- multimedia/gstreamer-0.10/Makefile.inc Wed Jan 10 00:22:56 2007 +++ mystuff/multimedia/gstreamer-0.10/Makefile.inc Fri Mar 14 15:17:46 2008 @@ -1,4 +1,4 @@ -# $OpenBSD: Makefile.inc,v 1.3 2007/01/09 23:22:56 espie Exp $ +#$OpenBSD: Makefile.inc,v 1.3 2007/01/09 23:22:56 espie Exp $ CATEGORIES?= multimedia devel @@ -21,11 +21,12 @@ USE_LIBTOOL?= Yes LIBTOOL_FLAGS?= --tag=disable-static -MODULES+= lang/python +MODULES+= lang/python \ + devel/gettext BUILD_DEPENDS+= :bison-*:devel/bison -AUTOCONF_VERSION?= 2.60 +AUTOCONF_VERSION= 2.61 CONFIGURE_STYLE?= autoconf CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ @@ -33,7 +34,6 @@ --with-cachedir=/var/db/gstreamer-${VERSION} \ --disable-debug \ --disable-valgrind \ - --disable-static \ # --enable-gtk-doc CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ diff -urN multimedia/gstreamer-0.10/core/Makefile mystuff/multimedia/gstreamer-0.10/core/Makefile --- multimedia/gstreamer-0.10/core/Makefile Mon Oct 8 10:22:41 2007 +++ mystuff/multimedia/gstreamer-0.10/core/Makefile Fri Mar 14 15:18:30 2008 @@ -3,10 +3,10 @@ COMMENT-main= streaming media framework - core COMMENT-frontend= streaming media framework - frontend commands -V= 0.10.12 +V= 0.10.17 -PKGNAME-main= gstreamer-$Vp0 -PKGNAME-frontend= gstreamer-frontend-$Vp0 +PKGNAME-main= gstreamer-$V +PKGNAME-frontend= gstreamer-frontend-$V DISTNAME= gstreamer-$V @@ -19,12 +19,14 @@ MASTER_SITES= ${MASTER_SITE_GST:=gstreamer/} MULTI_PACKAGES= -main -frontend -WANTLIB= c m pthread z -MODULES= devel/gettext +WANTLIB= c pcre iconv +WANTLIB-main= ${WANTLIB} m pthread z +WANTLIB-frontend= ${WANTLIB} -LIB_DEPENDS= glib-2.0.>=200.0,gmodule-2.0.>=200.0,gobject-2.0.>=200.0,gthread-2.0.>=200.0::devel/glib2 \ - xml2.>=6::textproc/libxml - -CONFIGURE_ARGS= --disable-gst-debug +LIB_DEPENDS= glib-2.0.>=200.0::devel/glib2 +LIB_DEPENDS-main= gmodule-2.0.>=200.0,gobject-2.0.>=200.0,gthread-2.0.>=200.0::devel/glib2 \ + xml2.>=6::textproc/libxml \ + ${LIB_DEPENDS} +LIB_DEPENDS-frontend= ${LIB_DEPENDS} .include <bsd.port.mk> diff -urN multimedia/gstreamer-0.10/core/distinfo mystuff/multimedia/gstreamer-0.10/core/distinfo --- multimedia/gstreamer-0.10/core/distinfo Thu Apr 5 18:20:06 2007 +++ mystuff/multimedia/gstreamer-0.10/core/distinfo Sun Mar 9 15:36:36 2008 @@ -1,5 +1,5 @@ -MD5 (gstreamer-0.10.12.tar.bz2) = 060bXyZasb1pVAX+omMXpA== -RMD160 (gstreamer-0.10.12.tar.bz2) = cTCULTzByNoZplle1LaxlGDGSz8= -SHA1 (gstreamer-0.10.12.tar.bz2) = fj63zQzAb0niQRD4oBG3OAFK5G0= -SHA256 (gstreamer-0.10.12.tar.bz2) = zZedD1AJaEk2VtNUmDCw5GoKEI6WS1bJA2AnnogExuk= -SIZE (gstreamer-0.10.12.tar.bz2) = 1841766 +MD5 (gstreamer-0.10.17.tar.bz2) = MjJBbqb86rYoI21np9CkSg== +RMD160 (gstreamer-0.10.17.tar.bz2) = A3m+Dk37Sw5TXDCT4QuNAqktD68= +SHA1 (gstreamer-0.10.17.tar.bz2) = xjIDSwnLUNmphjAgkdIHxKy2Mhg= +SHA256 (gstreamer-0.10.17.tar.bz2) = RChi3JPnNKpY8TvPORTcekDT+ijwriFSyARXQ43DVpw= +SIZE (gstreamer-0.10.17.tar.bz2) = 2167909 diff -urN multimedia/gstreamer-0.10/core/patches/CVS/Entries mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Entries --- multimedia/gstreamer-0.10/core/patches/CVS/Entries Thu Mar 6 12:01:42 2008 +++ mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Entries Thu Jan 1 01:00:00 1970 @@ -1,4 +0,0 @@ -/patch-common_m4_as-libtool_m4/1.1/Mon Jan 8 17:39:53 2007// -/patch-common_m4_as-python_m4/1.1/Mon Jan 8 17:39:53 2007// -/patch-common_m4_gettext_m4/1.2/Sat Mar 17 21:35:31 2007// -D diff -urN multimedia/gstreamer-0.10/core/patches/CVS/Repository mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Repository --- multimedia/gstreamer-0.10/core/patches/CVS/Repository Thu Mar 6 12:01:42 2008 +++ mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Repository Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -ports/multimedia/gstreamer-0.10/core/patches diff -urN multimedia/gstreamer-0.10/core/patches/CVS/Root mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Root --- multimedia/gstreamer-0.10/core/patches/CVS/Root Thu Mar 6 12:01:42 2008 +++ mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Root Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -/cvs diff -urN multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 --- multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 Mon Jan 8 18:39:53 2007 +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 Thu Jan 1 01:00:00 1970 @@ -1,14 +0,0 @@ -$OpenBSD: patch-common_m4_as-libtool_m4,v 1.1 2007/01/08 17:39:53 espie Exp $ ---- common/m4/as-libtool.m4.orig Mon Jan 8 13:57:26 2007 -+++ common/m4/as-libtool.m4 Mon Jan 8 13:57:31 2007 -@@ -35,10 +35,6 @@ AC_DEFUN([AS_LIBTOOL], - AC_SUBST([$1]_LIBVERSION) - - [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -version-info $[$1]_LIBVERSION" -- if test ! -z "[$5]" -- then -- [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -release [$5]" -- fi - AC_SUBST([$1]_LT_LDFLAGS) - - AC_LIBTOOL_DLOPEN diff -urN multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 --- multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 Sat Mar 17 22:35:31 2007 +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 Thu Jan 1 01:00:00 1970 @@ -1,17 +0,0 @@ -$OpenBSD: patch-common_m4_gettext_m4,v 1.2 2007/03/17 21:35:31 espie Exp $ ---- common/m4/gettext.m4.orig Thu Nov 30 23:25:12 2006 -+++ common/m4/gettext.m4 Sat Mar 17 11:59:13 2007 -@@ -315,8 +315,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext] - ]) - - dnl For backward compatibility. Some Makefiles may be using this. -- INTLLIBS="$LIBINTL" -+ INTLLIBS="$LTLIBINTL" - AC_SUBST(INTLLIBS) -+ -+ dnl Let's cheat -+ LIBICONV="$LTLIBICONV" -+ LIBINTL="$LTLIBINTL" - - dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in Sun Mar 9 17:27:26 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tests/examples/controller/Makefile.in.orig Wed Jan 30 14:04:51 2008 ++++ tests/examples/controller/Makefile.in Sun Mar 9 17:27:23 2008 +@@ -92,7 +92,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ -L$(top_builddir)/libs/gst/controller/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = audio-example.c + DIST_SOURCES = audio-example.c + ETAGS = etags diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in Sun Mar 9 17:29:52 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tests/examples/manual/Makefile.in.orig Sun Mar 9 17:29:13 2008 ++++ tests/examples/manual/Makefile.in Sun Mar 9 17:29:48 2008 +@@ -166,7 +166,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = bin.c decodebin.c dynamic.c elementcreate.c elementfactory.c \ + elementget.c elementlink.c elementmake.c fakesrc.c ghostpad.c \ + helloworld.c init.c pad.c playbin.c query.c typefind.c \ diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in Sun Mar 9 17:32:25 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tests/examples/metadata/Makefile.in.orig Sun Mar 9 17:31:24 2008 ++++ tests/examples/metadata/Makefile.in Sun Mar 9 17:32:22 2008 +@@ -92,7 +92,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = read-metadata.c + DIST_SOURCES = read-metadata.c + ETAGS = etags diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in Sun Mar 9 17:33:58 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tests/examples/xml/Makefile.in.orig Sun Mar 9 17:33:20 2008 ++++ tests/examples/xml/Makefile.in Sun Mar 9 17:33:52 2008 +@@ -95,7 +95,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = createxml.c runxml.c + DIST_SOURCES = createxml.c runxml.c + ETAGS = etags diff -urN multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in --- multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in Sun Mar 9 17:11:48 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- tools/Makefile.in.orig Sun Mar 9 17:04:33 2008 ++++ tools/Makefile.in Sun Mar 9 17:06:00 2008 +@@ -167,7 +167,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ + $(AM_CFLAGS) $(CFLAGS) + CCLD = $(CC) + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ + SOURCES = $(gst_feedback_SOURCES) $(gst_inspect_SOURCES) \ + $(gst_inspect_@GST_MAJORMINOR@_SOURCES) $(gst_launch_SOURCES) \ + $(gst_launch_@GST_MAJORMINOR@_SOURCES) $(gst_typefind_SOURCES) \ diff -urN multimedia/gstreamer-0.10/core/pkg/PLIST-frontend mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-frontend --- multimedia/gstreamer-0.10/core/pkg/PLIST-frontend Mon Jan 8 18:39:53 2007 +++ mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-frontend Sun Mar 9 15:02:16 2008 @@ -4,4 +4,3 @@ bin/gst-launch bin/gst-typefind bin/gst-xmlinspect -bin/gst-xmllaunch diff -urN multimedia/gstreamer-0.10/core/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-main --- multimedia/gstreamer-0.10/core/pkg/PLIST-main Tue Jan 9 21:00:23 2007 +++ mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-main Sun Mar 9 17:36:06 2008 @@ -6,6 +6,7 @@ bin/gst-launch-${VERSION} bin/gst-typefind-${VERSION} bin/gst-xmlinspect-${VERSION} +bin/gst-xmllaunch bin/gst-xmllaunch-${VERSION} include/gstreamer-${VERSION}/ include/gstreamer-${VERSION}/gst/ @@ -20,6 +21,9 @@ include/gstreamer-${VERSION}/gst/base/gsttypefindhelper.h include/gstreamer-${VERSION}/gst/controller/ include/gstreamer-${VERSION}/gst/controller/gstcontroller.h +include/gstreamer-${VERSION}/gst/controller/gstcontrolsource.h +include/gstreamer-${VERSION}/gst/controller/gstinterpolationcontrolsource.h +include/gstreamer-${VERSION}/gst/controller/gstlfocontrolsource.h include/gstreamer-${VERSION}/gst/dataprotocol/ include/gstreamer-${VERSION}/gst/dataprotocol/dataprotocol.h include/gstreamer-${VERSION}/gst/glib-compat.h @@ -32,6 +36,7 @@ include/gstreamer-${VERSION}/gst/gstclock.h include/gstreamer-${VERSION}/gst/gstcompat.h include/gstreamer-${VERSION}/gst/gstconfig.h +include/gstreamer-${VERSION}/gst/gstdebugutils.h include/gstreamer-${VERSION}/gst/gstelement.h include/gstreamer-${VERSION}/gst/gstelementfactory.h include/gstreamer-${VERSION}/gst/gstenumtypes.h @@ -52,6 +57,7 @@ include/gstreamer-${VERSION}/gst/gstobject.h include/gstreamer-${VERSION}/gst/gstpad.h include/gstreamer-${VERSION}/gst/gstpadtemplate.h +include/gstreamer-${VERSION}/gst/gstparamspecs.h include/gstreamer-${VERSION}/gst/gstparse.h include/gstreamer-${VERSION}/gst/gstpipeline.h include/gstreamer-${VERSION}/gst/gstplugin.h @@ -104,20 +110,33 @@ @man man/man1/gst-xmlinspect-${VERSION}.1 @man man/man1/gst-xmllaunch-${VERSION}.1 share/aclocal/gst-element-check-${VERSION}.m4 +share/gtk-doc/ +share/gtk-doc/html/ +share/gtk-doc/html/gstreamer-${VERSION}/ +share/gtk-doc/html/gstreamer-libs-${VERSION}/ +share/gtk-doc/html/gstreamer-plugins-${VERSION}/ share/locale/af/ share/locale/af/LC_MESSAGES/ share/locale/af/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/az/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/be/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/bg/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/ca/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/cs/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/da/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/de/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/en_GB/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/es/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/fi/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/fr/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/hu/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/it/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/nb/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/nl/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/pl/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/ru/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/rw/LC_MESSAGES/gstreamer-${VERSION}.mo +share/locale/sk/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/sq/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/sr/LC_MESSAGES/gstreamer-${VERSION}.mo share/locale/sv/LC_MESSAGES/gstreamer-${VERSION}.mo diff -urN multimedia/gstreamer-0.10/ffmpeg/Makefile mystuff/multimedia/gstreamer-0.10/ffmpeg/Makefile --- multimedia/gstreamer-0.10/ffmpeg/Makefile Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/Makefile Fri Mar 14 17:05:00 2008 @@ -0,0 +1,19 @@ +# $OpenBSD: Makefile,v 1.1.1.1 2008/01/22 08:53:41 ajacoutot Exp $ + +COMMENT= ffmpeg plugin for gstreamer + +V= 0.10.3 +DISTNAME= gst-ffmpeg-$V +PKGNAME= gstreamer-ffmpeg-$V + +HOMEPAGE= http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html + +MASTER_SITES= ${MASTER_SITE_GST:=gst-ffmpeg/} + +WANTLIB+= m z glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ + pcre xml2 +LIB_DEPENDS+= gstreamer-0.10,gstbase-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ + gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base \ + oil-0.3::devel/liboil + +.include <bsd.port.mk> diff -urN multimedia/gstreamer-0.10/ffmpeg/distinfo mystuff/multimedia/gstreamer-0.10/ffmpeg/distinfo --- multimedia/gstreamer-0.10/ffmpeg/distinfo Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/distinfo Fri Mar 14 15:20:35 2008 @@ -0,0 +1,5 @@ +MD5 (gst-ffmpeg-0.10.3.tar.bz2) = wH/S2gg1mJ/E6uKRy8BfCQ== +RMD160 (gst-ffmpeg-0.10.3.tar.bz2) = ClbiyJb7FNAAxzTHW9X2SjWi78M= +SHA1 (gst-ffmpeg-0.10.3.tar.bz2) = 3UDMOPdYFBLl4j0r9AHMZsm6H1U= +SHA256 (gst-ffmpeg-0.10.3.tar.bz2) = uFiZrBx5LbLhLXBjxFwMZjjcjMI006xnhrc5zGSGQ58= +SIZE (gst-ffmpeg-0.10.3.tar.bz2) = 2529034 diff -urN multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 mystuff/multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 --- multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 Fri Mar 14 15:30:58 2008 @@ -0,0 +1,13 @@ +$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 16:16:19 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)], + [ diff -urN multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR --- multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR Fri Mar 14 15:49:48 2008 @@ -0,0 +1,3 @@ +GStreamer FFmpeg plug-in contains one plugin with a set of elements +using the FFmpeg library code. It contains most popular decoders as +well as very fast colorspace conversion elements. diff -urN multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST --- multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST Fri Mar 14 15:48:57 2008 @@ -0,0 +1,6 @@ +@comment $OpenBSD$ +lib/gstreamer-${VERSION}/ +lib/gstreamer-${VERSION}/libgstffmpeg.la +lib/gstreamer-${VERSION}/libgstffmpeg.so +lib/gstreamer-${VERSION}/libgstpostproc.la +lib/gstreamer-${VERSION}/libgstpostproc.so diff -urN multimedia/gstreamer-0.10/plugins-bad/Makefile mystuff/multimedia/gstreamer-0.10/plugins-bad/Makefile --- multimedia/gstreamer-0.10/plugins-bad/Makefile Mon Oct 8 10:22:41 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/Makefile Fri Mar 14 15:18:46 2008 @@ -6,47 +6,48 @@ COMMENT-faac= multimedia framework - faac plugin COMMENT-faad= multimedia framework - faad plugin COMMENT-xvid= multimedia framework - xvid plugin -COMMENT-sdl= multimedia framework - sdl plugin COMMENT-bz2= multimedia framework - bz2 plugin COMMENT-gsm= multimedia framework - gsm plugin COMMENT-ladspa= multimedia framework - ladspa plugin COMMENT-neon= multimedia framework - neon plugin COMMENT-swf= multimedia framework - flash plugin +COMMENT-sdl= multimedia framework - sdl plugin -V= 0.10.4 +V= 0.10.6 DISTNAME= gst-plugins-bad-$V -PKGNAME-main= gstreamer-plugins-bad-$Vp0 -PKGNAME-tremor= gstreamer-tremor-$Vp0 -PKGNAME-musepack= gstreamer-musepack-$Vp0 -PKGNAME-faac= gstreamer-faac-$Vp0 -PKGNAME-faad= gstreamer-faad-$Vp0 -PKGNAME-xvid= gstreamer-xvid-$Vp0 -PKGNAME-sdl= gstreamer-sdl-$Vp0 -PKGNAME-bz2= gstreamer-bz2-$Vp0 -PKGNAME-gsm= gstreamer-gsm-$Vp0 -PKGNAME-ladspa= gstreamer-ladspa-$Vp0 -PKGNAME-neon= gstreamer-neon-$Vp0 -PKGNAME-swf= gstreamer-flash-$Vp0 -MULTI_PACKAGES= -main -tremor -musepack -faac -faad -xvid -sdl -bz2 \ - -gsm -ladspa +PKGNAME-main= gstreamer-plugins-bad-$V +PKGNAME-tremor= gstreamer-tremor-$V +PKGNAME-musepack= gstreamer-musepack-$V +PKGNAME-faac= gstreamer-faac-$V +PKGNAME-faad= gstreamer-faad-$V +PKGNAME-xvid= gstreamer-xvid-$V +PKGNAME-bz2= gstreamer-bz2-$V +PKGNAME-gsm= gstreamer-gsm-$V +PKGNAME-ladspa= gstreamer-ladspa-$V +PKGNAME-neon= gstreamer-neon-$V +PKGNAME-swf= gstreamer-flash-$V +PKGNAME-sdl= gstreamer-sdl-$V +MULTI_PACKAGES= -main -tremor -musepack -faac -faad -xvid -bz2 \ + -gsm -ladspa -sdl +SHARED_LIBS= gstapp-0.10 0.0 + MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-bad/} -MODULES= devel/gettext WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 xml2 \ - z m + z m pcre LIB_DEPENDS= gstreamer-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core RUN_DEPENDS= ::${BUILD_PKGPATH} WANTLIB-main= ${WANTLIB} \ - GL ICE SM X11 stdc++ \ - gstbase-0.10 gstcontroller-0.10 + stdc++ gstbase-0.10 gstcontroller-0.10 LIB_DEPENDS-main= ${LIB_DEPENDS} \ - gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10::multimedia/gstreamer-0.10/plugins-base + exif.>=12::graphics/libexif \ + gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10,gstnetbuffer-0.10,gstpbutils-0.10,gstrtp-0.10,gsttag-0.10,gstsdp-0.10::multimedia/gstreamer-0.10/plugins-base -RUN_DEPENDS-main= - +RUN_DEPENDS-main= + WANTLIB-tremor= ${WANTLIB} \ gstbase-0.10 @@ -78,12 +79,6 @@ LIB_DEPENDS-xvid= ${LIB_DEPENDS} \ xvidcore::multimedia/xvidcore -WANTLIB-sdl= ${WANTLIB} \ - X11 Xext gstbase-0.10 usbhid -LIB_DEPENDS-sdl= ${LIB_DEPENDS} \ - gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base \ - SDL::devel/sdl - WANTLIB-bz2= ${WANTLIB} \ gstbase-0.10 LIB_DEPENDS-bz2= ${LIB_DEPENDS} \ @@ -99,6 +94,7 @@ WANTLIB-ladspa= ${WANTLIB} \ gstbase-0.10 + LIB_DEPENDS-ladspa= ${LIB_DEPENDS} \ gstaudio-0.10,gstinterfaces-0.10::multimedia/gstreamer-0.10/plugins-base @@ -110,6 +106,13 @@ LIB_DEPENDS-swf= ${LIB_DEPENDS} +WANTLIB-sdl= ${WANTLIB} \ + X11 Xau Xdmcp Xext Xrandr Xrender gstaudio-0.10 gstinterfaces-0.10 \ + gstvideo-0.10 usbhid gstbase-0.10 gstreamer-0.10 iconv + +LIB_DEPENDS-sdl= ${LIB_DEPENDS} \ + SDL::devel/sdl + CONFIGURE_ARGS= --disable-cdaudio CONFIGURE_ARGS+= --disable-alsa \ @@ -119,7 +122,6 @@ --disable-dts \ --disable-jack \ --disable-libmms \ - --disable-musicbrainz \ --disable-soundtouch \ --disable-spc \ --disable-theoradec \ diff -urN multimedia/gstreamer-0.10/plugins-bad/distinfo mystuff/multimedia/gstreamer-0.10/plugins-bad/distinfo --- multimedia/gstreamer-0.10/plugins-bad/distinfo Thu Apr 5 18:20:07 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/distinfo Mon Mar 10 13:25:18 2008 @@ -1,5 +1,5 @@ -MD5 (gst-plugins-bad-0.10.4.tar.bz2) = Llc5XN9yczR3+zKPH6PwUw== -RMD160 (gst-plugins-bad-0.10.4.tar.bz2) = 1Z54x1lMlLweWapYQa/kJAJHEL0= -SHA1 (gst-plugins-bad-0.10.4.tar.bz2) = bnP2Es/XJnWx5bXrN4uWILYtSUY= -SHA256 (gst-plugins-bad-0.10.4.tar.bz2) = JAuaJf8RbqxkV+pggTKR9sd/98Fn1b8+w9kLutMdoc4= -SIZE (gst-plugins-bad-0.10.4.tar.bz2) = 1231000 +MD5 (gst-plugins-bad-0.10.6.tar.bz2) = +0eDiqDM71JoPOpdiTZAUw== +RMD160 (gst-plugins-bad-0.10.6.tar.bz2) = EFUDGXrCd7ZXdvwyNQPALNh3OxM= +SHA1 (gst-plugins-bad-0.10.6.tar.bz2) = c0F+TcOpFz7qPkV0JZcnIksNjGU= +SHA256 (gst-plugins-bad-0.10.6.tar.bz2) = xwLas007Mw7AbZFakak32tsKk6ziW76OM3Ij3bg07+Y= +SIZE (gst-plugins-bad-0.10.6.tar.bz2) = 1776962 diff -urN multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac mystuff/multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac --- multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac Sat Apr 7 17:54:06 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ -$OpenBSD: patch-configure_ac,v 1.1 2007/04/07 15:54:06 espie Exp $ ---- configure.ac.orig Sat Apr 7 17:25:58 2007 -+++ configure.ac Sat Apr 7 17:26:53 2007 -@@ -235,7 +235,7 @@ GST_CHECK_X - save_CPPFLAGS="$CPPFLAGS" - save_LIBS="$LIBS" - CPPFLAGS="$CPPFLAGS $X_CFLAGS" --LIBS="$LIBS $X_LIBS" -+LIBS="$LIBS $X_LIBS -lm" - GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [ - GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, - GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no") diff -urN multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main --- multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main Thu Jan 11 19:12:36 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main Wed Mar 12 18:51:00 2008 @@ -1,55 +1,98 @@ @comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/01/11 18:12:36 espie Exp $ +include/gstreamer-${VERSION}/gst/app/ +include/gstreamer-${VERSION}/gst/app/gstappbuffer.h +include/gstreamer-${VERSION}/gst/app/gstappsink.h +include/gstreamer-${VERSION}/gst/app/gstappsrc.h +lib/gstreamer-${VERSION}/libgstapp.la +lib/gstreamer-${VERSION}/libgstapp.so +lib/gstreamer-${VERSION}/libgstbayer.la +lib/gstreamer-${VERSION}/libgstbayer.so lib/gstreamer-${VERSION}/libgstcdxaparse.la lib/gstreamer-${VERSION}/libgstcdxaparse.so lib/gstreamer-${VERSION}/libgstdeinterlace.la lib/gstreamer-${VERSION}/libgstdeinterlace.so +lib/gstreamer-${VERSION}/libgstdvdspu.la +lib/gstreamer-${VERSION}/libgstdvdspu.so +lib/gstreamer-${VERSION}/libgstfestival.la +lib/gstreamer-${VERSION}/libgstfestival.so lib/gstreamer-${VERSION}/libgstfilter.la lib/gstreamer-${VERSION}/libgstfilter.so +lib/gstreamer-${VERSION}/libgstflvdemux.la +lib/gstreamer-${VERSION}/libgstflvdemux.so lib/gstreamer-${VERSION}/libgstfreeze.la lib/gstreamer-${VERSION}/libgstfreeze.so -lib/gstreamer-${VERSION}/libgstglimagesink.la -lib/gstreamer-${VERSION}/libgstglimagesink.so lib/gstreamer-${VERSION}/libgsth264parse.la lib/gstreamer-${VERSION}/libgsth264parse.so +lib/gstreamer-${VERSION}/libgstinterleave.la +lib/gstreamer-${VERSION}/libgstinterleave.so +lib/gstreamer-${VERSION}/libgstmetadata.la +lib/gstreamer-${VERSION}/libgstmetadata.so lib/gstreamer-${VERSION}/libgstmodplug.la lib/gstreamer-${VERSION}/libgstmodplug.so -lib/gstreamer-${VERSION}/libgstmultifile.la -lib/gstreamer-${VERSION}/libgstmultifile.so +lib/gstreamer-${VERSION}/libgstmpeg4videoparse.la +lib/gstreamer-${VERSION}/libgstmpeg4videoparse.so +lib/gstreamer-${VERSION}/libgstmpegtsparse.la +lib/gstreamer-${VERSION}/libgstmpegtsparse.so +lib/gstreamer-${VERSION}/libgstmpegvideoparse.la +lib/gstreamer-${VERSION}/libgstmpegvideoparse.so +lib/gstreamer-${VERSION}/libgstmve.la +lib/gstreamer-${VERSION}/libgstmve.so lib/gstreamer-${VERSION}/libgstnsf.la lib/gstreamer-${VERSION}/libgstnsf.so lib/gstreamer-${VERSION}/libgstnuvdemux.la lib/gstreamer-${VERSION}/libgstnuvdemux.so -lib/gstreamer-${VERSION}/libgstqtdemux.la -lib/gstreamer-${VERSION}/libgstqtdemux.so +lib/gstreamer-${VERSION}/libgstrawparse.la +lib/gstreamer-${VERSION}/libgstrawparse.so +lib/gstreamer-${VERSION}/libgstreal.la +lib/gstreamer-${VERSION}/libgstreal.so lib/gstreamer-${VERSION}/libgstreplaygain.la lib/gstreamer-${VERSION}/libgstreplaygain.so lib/gstreamer-${VERSION}/libgstrfbsrc.la lib/gstreamer-${VERSION}/libgstrfbsrc.so -lib/gstreamer-${VERSION}/libgstspectrum.la -lib/gstreamer-${VERSION}/libgstspectrum.so +lib/gstreamer-${VERSION}/libgstrtpmanager.la +lib/gstreamer-${VERSION}/libgstrtpmanager.so +lib/gstreamer-${VERSION}/libgstsdpelem.la +lib/gstreamer-${VERSION}/libgstsdpelem.so +lib/gstreamer-${VERSION}/libgstselector.la +lib/gstreamer-${VERSION}/libgstselector.so lib/gstreamer-${VERSION}/libgstspeed.la lib/gstreamer-${VERSION}/libgstspeed.so +lib/gstreamer-${VERSION}/libgstspeexresample.la +lib/gstreamer-${VERSION}/libgstspeexresample.so +lib/gstreamer-${VERSION}/libgststereo.la +lib/gstreamer-${VERSION}/libgststereo.so lib/gstreamer-${VERSION}/libgsttta.la lib/gstreamer-${VERSION}/libgsttta.so -lib/gstreamer-${VERSION}/libgstvideocrop.la -lib/gstreamer-${VERSION}/libgstvideocrop.so -lib/gstreamer-${VERSION}/libgstvideoparse.la -lib/gstreamer-${VERSION}/libgstvideoparse.so -lib/gstreamer-${VERSION}/libgstxingheader.la -lib/gstreamer-${VERSION}/libgstxingheader.so +lib/gstreamer-${VERSION}/libgstvideosignal.la +lib/gstreamer-${VERSION}/libgstvideosignal.so +lib/gstreamer-${VERSION}/libgstvmnc.la +lib/gstreamer-${VERSION}/libgstvmnc.so lib/gstreamer-${VERSION}/libgsty4menc.la lib/gstreamer-${VERSION}/libgsty4menc.so +lib/libgstapp-${VERSION}.la +@lib lib/libgstapp-${VERSION}.so.${LIBgstapp-0.10_VERSION} 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 share/locale/cs/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/da/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/es/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/fi/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/hu/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/it/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/ky/ +share/locale/ky/LC_MESSAGES/ +share/locale/ky/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/nb/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/nl/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/or/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/pl/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/pt_BR/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/sk/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/sq/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/sr/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/sv/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/uk/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo share/locale/vi/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo +share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo diff -urN multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon --- multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon Wed Mar 12 18:51:28 2008 @@ -0,0 +1,2 @@ +lib/gstreamer-${VERSION}/libgstneonhttpsrc.la +lib/gstreamer-${VERSION}/libgstneonhttpsrc.so diff -urN multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl --- multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl Sat Jan 13 12:23:38 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl Wed Mar 12 18:32:27 2008 @@ -1,5 +1,5 @@ @comment $OpenBSD: PLIST-sdl,v 1.1 2007/01/13 11:23:38 espie Exp $ @option no-default-conflict @conflict gstreamer-sdl->=0.10 -lib/gstreamer-${VERSION}/libgstsdlvideosink.la -lib/gstreamer-${VERSION}/libgstsdlvideosink.so +lib/gstreamer-${VERSION}/libgstsdl.la +lib/gstreamer-${VERSION}/libgstsdl.so diff -urN multimedia/gstreamer-0.10/plugins-base/Makefile mystuff/multimedia/gstreamer-0.10/plugins-base/Makefile --- multimedia/gstreamer-0.10/plugins-base/Makefile Mon Oct 8 10:22:41 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-base/Makefile Fri Mar 14 15:18:51 2008 @@ -8,48 +8,49 @@ COMMENT-theora= multimedia framework - theora plugin COMMENT-pango= multimedia framework - pango renderer -V= 0.10.12 +V= 0.10.17 DISTNAME= gst-plugins-base-$V -PKGNAME-main= gstreamer-plugins-base-$Vp0 -PKGNAME-gnome= gstreamer-gnome-$Vp1 -PKGNAME-cdda= gstreamer-cdda-$Vp0 -PKGNAME-ogg= gstreamer-ogg-$Vp0 -PKGNAME-theora= gstreamer-theora-$Vp0 -PKGNAME-vorbis= gstreamer-vorbis-$Vp0 -PKGNAME-pango= gstreamer-pango-$Vp0 +PKGNAME-main= gstreamer-plugins-base-$V +PKGNAME-gnome= gstreamer-gnome-$V +PKGNAME-cdda= gstreamer-cdda-$V +PKGNAME-ogg= gstreamer-ogg-$V +PKGNAME-theora= gstreamer-theora-$V +PKGNAME-vorbis= gstreamer-vorbis-$V +PKGNAME-pango= gstreamer-pango-$V MULTI_PACKAGES= -main -gnome -cdda -ogg -theora -vorbis -pango -SHARED_LIBS += gstinterfaces-0.10 0.1 # .8.0 -SHARED_LIBS += gsttag-0.10 0.1 # .8.0 -SHARED_LIBS += gstaudio-0.10 0.1 # .8.0 -SHARED_LIBS += gstcdda-0.10 0.1 # .8.0 -SHARED_LIBS += gstnetbuffer-0.10 0.1 # .8.0 -SHARED_LIBS += gstpbutils-0.10 0.0 # .8.0 -SHARED_LIBS += gstriff-0.10 0.1 # .8.0 -SHARED_LIBS += gstrtp-0.10 0.1 # .8.0 -SHARED_LIBS += gstvideo-0.10 0.1 # .8.0 +SHARED_LIBS += gstinterfaces-0.10 0.1 # .8.0 +SHARED_LIBS += gsttag-0.10 0.1 # .8.0 +SHARED_LIBS += gstaudio-0.10 0.1 # .8.0 +SHARED_LIBS += gstcdda-0.10 0.1 # .8.0 +SHARED_LIBS += gstnetbuffer-0.10 0.1 # .8.0 +SHARED_LIBS += gstpbutils-0.10 0.0 # .8.0 +SHARED_LIBS += gstriff-0.10 0.1 # .8.0 +SHARED_LIBS += gstrtp-0.10 0.1 # .8.0 +SHARED_LIBS += gstvideo-0.10 0.1 # .8.0 +SHARED_LIBS += gstfft-0.10 12.0 +SHARED_LIBS += gstrtsp-0.10 12.0 +SHARED_LIBS += gstsdp-0.10 12.0 MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-base/} -MODULES= devel/gettext RUN_DEPENDS= ::${BUILD_PKGPATH} WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 xml2 \ - z m + z m pcre LIB_DEPENDS= gstreamer-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ WANTLIB-main= ${WANTLIB} \ - Xv X11 ICE SM Xext \ + Xau Xdmcp Xv X11 ICE SM Xext \ gstdataprotocol-0.10 gstcontroller-0.10 gstbase-0.10 LIB_DEPENDS-main= ${LIB_DEPENDS} \ oil-0.3::devel/liboil RUN_DEPENDS-main= WANTLIB-gnome= ${WANTLIB} \ - ORBit-2 ORBitCosNaming-2 crypto gconf-2 ssl \ - gstbase-0.10 + ORBit-2 crypto gconf-2 ssl \ + gstbase-0.10 dbus-1 dbus-glib-1 util LIB_DEPENDS-gnome= ${LIB_DEPENDS} \ - popt::devel/popt \ - bonobo-2.>=1,bonobo-activation.>=5::x11/gnome/libbonobo \ + gsttag-0.10::${BUILD_PKGPATH} \ gnomevfs-2::x11/gnome/vfs2 WANTLIB-cdda= ${WANTLIB} \ @@ -67,7 +68,7 @@ WANTLIB-theora= ${WANTLIB} \ ogg LIB_DEPENDS-theora= ${LIB_DEPENDS} \ - gsttag-0.10::${BUILD_PKGPATH} \ + gsttag-0.10,gstbase-0.10::${BUILD_PKGPATH} \ theora::multimedia/libtheora WANTLIB-vorbis= ${WANTLIB} \ @@ -77,7 +78,7 @@ vorbis,vorbisenc::audio/libvorbis WANTLIB-pango= ${WANTLIB} \ - X11 fontconfig freetype \ + X11 fontconfig freetype Xau Xdmcp \ gstbase-0.10 LIB_DEPENDS-pango= ${LIB_DEPENDS} \ pango-1.0,pangoft2-1.0::devel/pango diff -urN multimedia/gstreamer-0.10/plugins-base/distinfo mystuff/multimedia/gstreamer-0.10/plugins-base/distinfo --- multimedia/gstreamer-0.10/plugins-base/distinfo Thu Apr 5 18:20:07 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-base/distinfo Mon Mar 10 13:42:51 2008 @@ -1,5 +1,5 @@ -MD5 (gst-plugins-base-0.10.12.tar.bz2) = DuNUVaTrUHvPv81E2eFdHg== -RMD160 (gst-plugins-base-0.10.12.tar.bz2) = MKuJyyKw5ZZ0mmUe6oZCHHK6BCU= -SHA1 (gst-plugins-base-0.10.12.tar.bz2) = syNYm2fw7jeQ1pNBvi5UWHDQoOk= -SHA256 (gst-plugins-base-0.10.12.tar.bz2) = uIqFshSZvQZKUxo7XQauae4CWtX4i26G7UryRVCSR+4= -SIZE (gst-plugins-base-0.10.12.tar.bz2) = 1460658 +MD5 (gst-plugins-base-0.10.17.tar.bz2) = FRtmIo4Iqwx2AXEwMPscPw== +RMD160 (gst-plugins-base-0.10.17.tar.bz2) = D84hURdovsxqT3RNUzNb/+hK+/k= +SHA1 (gst-plugins-base-0.10.17.tar.bz2) = oRh9aG6ryYDNKP+mEOAm6IVVB+c= +SHA256 (gst-plugins-base-0.10.17.tar.bz2) = +Cz9VmnHVnJvUD3eWTbi++KWljEJXw78QN8frhp09w0= +SIZE (gst-plugins-base-0.10.17.tar.bz2) = 1849092 Binary files multimedia/gstreamer-0.10/plugins-base/perl.core and mystuff/multimedia/gstreamer-0.10/plugins-base/perl.core differ diff -urN multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main --- multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main Sat Mar 17 22:35:31 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main Mon Mar 10 13:55:51 2008 @@ -12,6 +12,12 @@ include/gstreamer-${VERSION}/gst/audio/mixerutils.h include/gstreamer-${VERSION}/gst/audio/multichannel-enumtypes.h include/gstreamer-${VERSION}/gst/audio/multichannel.h +include/gstreamer-${VERSION}/gst/fft/ +include/gstreamer-${VERSION}/gst/fft/gstfft.h +include/gstreamer-${VERSION}/gst/fft/gstfftf32.h +include/gstreamer-${VERSION}/gst/fft/gstfftf64.h +include/gstreamer-${VERSION}/gst/fft/gstffts16.h +include/gstreamer-${VERSION}/gst/fft/gstffts32.h include/gstreamer-${VERSION}/gst/floatcast/ include/gstreamer-${VERSION}/gst/floatcast/floatcast.h include/gstreamer-${VERSION}/gst/interfaces/ @@ -34,6 +40,7 @@ include/gstreamer-${VERSION}/gst/pbutils/descriptions.h include/gstreamer-${VERSION}/gst/pbutils/install-plugins.h include/gstreamer-${VERSION}/gst/pbutils/missing-plugins.h +include/gstreamer-${VERSION}/gst/pbutils/pbutils-enumtypes.h include/gstreamer-${VERSION}/gst/pbutils/pbutils.h include/gstreamer-${VERSION}/gst/riff/ include/gstreamer-${VERSION}/gst/riff/riff-ids.h @@ -43,8 +50,24 @@ include/gstreamer-${VERSION}/gst/rtp/gstbasertpaudiopayload.h include/gstreamer-${VERSION}/gst/rtp/gstbasertpdepayload.h include/gstreamer-${VERSION}/gst/rtp/gstbasertppayload.h +include/gstreamer-${VERSION}/gst/rtp/gstrtcpbuffer.h include/gstreamer-${VERSION}/gst/rtp/gstrtpbuffer.h +include/gstreamer-${VERSION}/gst/rtp/gstrtppayloads.h +include/gstreamer-${VERSION}/gst/rtsp/ +include/gstreamer-${VERSION}/gst/rtsp/gstrtsp-enumtypes.h +include/gstreamer-${VERSION}/gst/rtsp/gstrtspbase64.h +include/gstreamer-${VERSION}/gst/rtsp/gstrtspconnection.h +include/gstreamer-${VERSION}/gst/rtsp/gstrtspdefs.h +include/gstreamer-${VERSION}/gst/rtsp/gstrtspextension.h +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/sdp/ +include/gstreamer-${VERSION}/gst/sdp/gstsdp.h +include/gstreamer-${VERSION}/gst/sdp/gstsdpmessage.h include/gstreamer-${VERSION}/gst/tag/ +include/gstreamer-${VERSION}/gst/tag/gsttagdemux.h include/gstreamer-${VERSION}/gst/tag/tag.h include/gstreamer-${VERSION}/gst/video/ include/gstreamer-${VERSION}/gst/video/gstvideofilter.h @@ -70,6 +93,8 @@ lib/gstreamer-${VERSION}/libgstgdp.so lib/gstreamer-${VERSION}/libgstplaybin.la lib/gstreamer-${VERSION}/libgstplaybin.so +lib/gstreamer-${VERSION}/libgstqueue2.la +lib/gstreamer-${VERSION}/libgstqueue2.so lib/gstreamer-${VERSION}/libgstsubparse.la lib/gstreamer-${VERSION}/libgstsubparse.so lib/gstreamer-${VERSION}/libgsttcp.la @@ -90,6 +115,8 @@ lib/gstreamer-${VERSION}/libgstxvimagesink.so lib/libgstaudio-${VERSION}.la @lib lib/libgstaudio-${VERSION}.so.${LIBgstaudio-0.10_VERSION} +lib/libgstfft-${VERSION}.la +@lib lib/libgstfft-${VERSION}.so.${LIBgstfft-0.10_VERSION} lib/libgstinterfaces-${VERSION}.la @lib lib/libgstinterfaces-${VERSION}.so.${LIBgstinterfaces-0.10_VERSION} lib/libgstnetbuffer-${VERSION}.la @@ -100,24 +127,52 @@ @lib lib/libgstriff-${VERSION}.so.${LIBgstriff-0.10_VERSION} lib/libgstrtp-${VERSION}.la @lib lib/libgstrtp-${VERSION}.so.${LIBgstrtp-0.10_VERSION} +lib/libgstrtsp-${VERSION}.la +@lib lib/libgstrtsp-${VERSION}.so.${LIBgstrtsp-0.10_VERSION} +lib/libgstsdp-${VERSION}.la +@lib lib/libgstsdp-${VERSION}.so.${LIBgstsdp-0.10_VERSION} lib/libgsttag-${VERSION}.la @lib lib/libgsttag-${VERSION}.so.${LIBgsttag-0.10_VERSION} lib/libgstvideo-${VERSION}.la @lib lib/libgstvideo-${VERSION}.so.${LIBgstvideo-0.10_VERSION} +lib/pkgconfig/gstreamer-audio-${VERSION}.pc +lib/pkgconfig/gstreamer-cdda-${VERSION}.pc +lib/pkgconfig/gstreamer-fft-${VERSION}.pc +lib/pkgconfig/gstreamer-floatcast-${VERSION}.pc +lib/pkgconfig/gstreamer-interfaces-${VERSION}.pc +lib/pkgconfig/gstreamer-netbuffer-${VERSION}.pc +lib/pkgconfig/gstreamer-pbutils-${VERSION}.pc lib/pkgconfig/gstreamer-plugins-base-${VERSION}.pc +lib/pkgconfig/gstreamer-riff-${VERSION}.pc +lib/pkgconfig/gstreamer-rtp-${VERSION}.pc +lib/pkgconfig/gstreamer-rtsp-${VERSION}.pc +lib/pkgconfig/gstreamer-sdp-${VERSION}.pc +lib/pkgconfig/gstreamer-tag-${VERSION}.pc +lib/pkgconfig/gstreamer-video-${VERSION}.pc +man/cat3f/ @man man/man1/gst-visualise-${VERSION}.1 +man/man3f/ +share/gtk-doc/html/gst-plugins-base-libs-${VERSION}/ share/locale/af/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/az/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/bg/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/ca/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/cs/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/da/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/de/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/es/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/fi/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/hu/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/it/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/nb/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/nl/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/or/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/pl/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/sk/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/sq/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/sr/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/sv/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/uk/LC_MESSAGES/gst-plugins-base-${VERSION}.mo share/locale/vi/LC_MESSAGES/gst-plugins-base-${VERSION}.mo +share/locale/zh_CN/LC_MESSAGES/gst-plugins-base-${VERSION}.mo diff -urN multimedia/gstreamer-0.10/plugins-good/Makefile mystuff/multimedia/gstreamer-0.10/plugins-good/Makefile --- multimedia/gstreamer-0.10/plugins-good/Makefile Thu Feb 14 19:51:59 2008 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/Makefile Fri Mar 14 15:18:57 2008 @@ -15,22 +15,22 @@ COMMENT-caca= multimedia framework - libcaca plugin COMMENT-shout= multimedia framework - shoutcast plugin -V= 0.10.5 +V= 0.10.7 DISTNAME= gst-plugins-good-$V -PKGNAME-main= gstreamer-plugins-good-$Vp2 -PKGNAME-aalib= gstreamer-aalib-$Vp2 -PKGNAME-cairo= gstreamer-cairo-$Vp3 -PKGNAME-gconf= gstreamer-confelements-$Vp3 -PKGNAME-esd= gstreamer-esd-$Vp1 -PKGNAME-flac= gstreamer-flac-$Vp2 -PKGNAME-speex= gstreamer-speex-$Vp1 -PKGNAME-taglib= gstreamer-taglib-$Vp1 -PKGNAME-dv= gstreamer-dv-$Vp1 -PKGNAME-jpeg= gstreamer-jpeg-$Vp1 -PKGNAME-png= gstreamer-png-$Vp1 -PKGNAME-gdk= gstreamer-gdk-pixbuf-$Vp3 -PKGNAME-caca= gstreamer-libcaca-$Vp2 -PKGNAME-shout= gstreamer-shoutcast-$Vp1 +PKGNAME-main= gstreamer-plugins-good-$V +PKGNAME-aalib= gstreamer-aalib-$V +PKGNAME-cairo= gstreamer-cairo-$V +PKGNAME-gconf= gstreamer-confelements-$V +PKGNAME-esd= gstreamer-esd-$V +PKGNAME-flac= gstreamer-flac-$V +PKGNAME-speex= gstreamer-speex-$V +PKGNAME-taglib= gstreamer-taglib-$V +PKGNAME-dv= gstreamer-dv-$V +PKGNAME-jpeg= gstreamer-jpeg-$V +PKGNAME-png= gstreamer-png-$V +PKGNAME-gdk= gstreamer-gdk-pixbuf-$V +PKGNAME-caca= gstreamer-libcaca-$V +PKGNAME-shout= gstreamer-shoutcast-$V MULTI_PACKAGES= -main -aalib -cairo -gconf -esd -flac -speex \ @@ -40,7 +40,6 @@ MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-good/} USE_X11= Yes -MODULES= devel/gettext RUN_DEPENDS= ::${BUILD_PKGPATH} WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ @@ -52,7 +51,7 @@ gstcontroller-0.10 gstbase-0.10 Xau Xdmcp LIB_DEPENDS-main= ${LIB_DEPENDS} \ oil-0.3::devel/liboil \ - gstaudio-0.10,gstinterfaces-0.10,gstnetbuffer-0.10,gstriff-0.10,gstrtp-0.10,gsttag-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base + gstfft-0.10,gstrtsp-0.10,gstsdp-0.10,gstaudio-0.10,gstinterfaces-0.10,gstnetbuffer-0.10,gstriff-0.10,gstrtp-0.10,gsttag-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base RUN_DEPENDS-main= WANTLIB-aalib= ${WANTLIB} \ @@ -62,7 +61,7 @@ WANTLIB-cairo= ${WANTLIB} \ X11 Xau Xdmcp Xrender fontconfig freetype \ - glitz png gstbase-0.10 expat + glitz png gstbase-0.10 LIB_DEPENDS-cairo= ${LIB_DEPENDS} \ cairo::graphics/cairo @@ -96,6 +95,7 @@ stdc++ LIB_DEPENDS-taglib= ${LIB_DEPENDS} \ + gstbase-0.10::multimedia/gstreamer-0.10/core \ gsttag-0.10::multimedia/gstreamer-0.10/plugins-base \ tag::audio/taglib @@ -120,7 +120,7 @@ X11 Xcomposite Xdamage Xext Xrender atk-1.0 \ cairo fontconfig freetype glitz pango-1.0 \ pangocairo-1.0 pangoft2-1.0 png gstbase-0.10 \ - Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat + Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr LIB_DEPENDS-gdk= ${LIB_DEPENDS} \ gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 diff -urN multimedia/gstreamer-0.10/plugins-good/distinfo mystuff/multimedia/gstreamer-0.10/plugins-good/distinfo --- multimedia/gstreamer-0.10/plugins-good/distinfo Thu Apr 5 18:20:07 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/distinfo Thu Mar 13 18:44:24 2008 @@ -1,5 +1,5 @@ -MD5 (gst-plugins-good-0.10.5.tar.bz2) = xF/JrOn+tNPfMtoKbSYthA== -RMD160 (gst-plugins-good-0.10.5.tar.bz2) = k9CzGlxUxYGF9zoL9bAiPN8Sytc= -SHA1 (gst-plugins-good-0.10.5.tar.bz2) = Ib30LEARKdG44Bmx1SAPWw0jdVc= -SHA256 (gst-plugins-good-0.10.5.tar.bz2) = 3PVqSbj8DbFphb8TPUCF2EYCoZwVrLeYkKwBLXz5+WI= -SIZE (gst-plugins-good-0.10.5.tar.bz2) = 1356388 +MD5 (gst-plugins-good-0.10.7.tar.bz2) = 4C1ymyJFH3VBSidFauXBag== +RMD160 (gst-plugins-good-0.10.7.tar.bz2) = bO5ShG/IgoaTidLzLbzmffRQS80= +SHA1 (gst-plugins-good-0.10.7.tar.bz2) = s5PpClA3gfvJhLHr0HEt3d51QKU= +SHA256 (gst-plugins-good-0.10.7.tar.bz2) = nhLFinlOYcASS30jnq5zHUrEhjpPwoFHIC04EcO8450= +SIZE (gst-plugins-good-0.10.7.tar.bz2) = 1746120 diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 --- multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 Thu Feb 14 19:52:00 2008 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 Thu Mar 13 19:42:10 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-common_m4_gst-default_m4,v 1.1 2008/02/14 18:52:00 ajacoutot Exp $ ---- common/m4/gst-default.m4.orig Thu Feb 14 09:39:16 2008 -+++ common/m4/gst-default.m4 Thu Feb 14 09:43:41 2008 -@@ -25,6 +25,11 @@ AC_DEFUN([GST_DEFAULT_ELEMENTS], +--- common/m4/gst-default.m4.orig Wed Feb 28 20:24:38 2007 ++++ common/m4/gst-default.m4 Thu Mar 13 19:30:33 2008 +@@ -25,6 +25,11 @@ AC_DEFUN([AG_GST_DEFAULT_ELEMENTS], DEFAULT_AUDIOSRC="osxaudiosrc" DEFAULT_VIDEOSINK="osxvideosink" ;; diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac --- multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac Tue Sep 18 20:33:25 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac Thu Mar 13 19:42:10 2008 @@ -1,30 +1,21 @@ -$OpenBSD: patch-configure_ac,v 1.3 2007/09/18 18:33:25 naddy Exp $ ---- configure.ac.orig Thu Dec 21 15:20:44 2006 -+++ configure.ac Mon Sep 17 19:44:32 2007 -@@ -551,16 +551,7 @@ GST_CHECK_FEATURE(ESD, [ESounD sound daemon], esdsink, - dnl *** FLAC *** - translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true) - GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [ -- GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__seekable_stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm") -- dnl API change in FLAC 1.1.1, so require that... -- dnl (this check will also fail with FLAC 1.1.3 which changed API again -- dnl and with which our plugin does not compile or work yet) -- if test x$HAVE_FLAC = xyes; then -- AC_CHECK_DECL(FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR, -- HAVE_FLAC="yes", HAVE_FLAC="no", [ --#include <FLAC/seekable_stream_encoder.h> -- ]) -- fi -+ GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__stream_encoder_new, -logg -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -logg -lm") - AC_SUBST(FLAC_LIBS) +$OpenBSD$ +--- configure.ac.orig Wed Feb 20 23:09:26 2008 ++++ configure.ac Thu Mar 13 19:42:01 2008 +@@ -690,7 +690,7 @@ AG_GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac ]) - -@@ -632,7 +623,7 @@ GST_CHECK_FEATURE(LIBDV, [libdv DV demuxer/decoder], d + else + AG_GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [ +- AG_GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm") ++ AG_GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__stream_encoder_new, -lm -logg, FLAC/all.h, FLAC_LIBS="-lFLAC -lm -logg") + dnl API change in FLAC 1.1.3, so require that... + if test x$HAVE_FLAC = xyes; then + AC_CHECK_DECL(FLAC__STREAM_ENCODER_TELL_STATUS_ERROR, +@@ -770,7 +770,7 @@ AG_GST_CHECK_FEATURE(LIBDV, [libdv DV demuxer/decoder] dnl *** libpng *** translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true) - GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [ -- GST_PKG_CHECK_MODULES(LIBPNG, libpng12) -+ GST_PKG_CHECK_MODULES(LIBPNG, libpng) + AG_GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [ +- AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng12) ++ AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng) ]) dnl *** dv1394 *** diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c Tue Sep 18 20:33:25 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c Thu Jan 1 01:00:00 1970 @@ -1,352 +0,0 @@ -$OpenBSD: patch-ext_flac_gstflacdec_c,v 1.1 2007/09/18 18:33:25 naddy Exp $ ---- ext/flac/gstflacdec.c.orig Mon Sep 17 19:59:07 2007 -+++ ext/flac/gstflacdec.c Mon Sep 17 22:08:10 2007 -@@ -93,25 +93,25 @@ static void gst_flac_dec_reset_decoders (GstFlacDec * - static void gst_flac_dec_setup_seekable_decoder (GstFlacDec * flacdec); - static void gst_flac_dec_setup_stream_decoder (GstFlacDec * flacdec); - --static FLAC__SeekableStreamDecoderReadStatus --gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, -- FLAC__byte buffer[], unsigned *bytes, void *client_data); --static FLAC__SeekableStreamDecoderSeekStatus --gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, -+static FLAC__StreamDecoderReadStatus -+gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, -+ FLAC__byte buffer[], size_t *bytes, void *client_data); -+static FLAC__StreamDecoderSeekStatus -+gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, - FLAC__uint64 position, void *client_data); --static FLAC__SeekableStreamDecoderTellStatus --gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, -+static FLAC__StreamDecoderTellStatus -+gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, - FLAC__uint64 * position, void *client_data); --static FLAC__SeekableStreamDecoderLengthStatus --gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, -+static FLAC__StreamDecoderLengthStatus -+gst_flac_dec_length (const FLAC__StreamDecoder * decoder, - FLAC__uint64 * length, void *client_data); --static FLAC__bool gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, -+static FLAC__bool gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, - void *client_data); - static FLAC__StreamDecoderReadStatus - gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, -- FLAC__byte buffer[], unsigned *bytes, void *client_data); -+ FLAC__byte buffer[], size_t *bytes, void *client_data); - static FLAC__StreamDecoderWriteStatus --gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, -+gst_flac_dec_write_seekable (const FLAC__StreamDecoder * decoder, - const FLAC__Frame * frame, - const FLAC__int32 * const buffer[], void *client_data); - static FLAC__StreamDecoderWriteStatus -@@ -119,14 +119,14 @@ gst_flac_dec_write_stream (const FLAC__StreamDecoder * - const FLAC__Frame * frame, - const FLAC__int32 * const buffer[], void *client_data); - static void gst_flac_dec_metadata_callback_seekable (const -- FLAC__SeekableStreamDecoder * decoder, -+ FLAC__StreamDecoder * decoder, - const FLAC__StreamMetadata * metadata, void *client_data); - static void gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * - decoder, const FLAC__StreamMetadata * metadata, void *client_data); - static void gst_flac_dec_metadata_callback (GstFlacDec * flacdec, - const FLAC__StreamMetadata * metadata); - static void gst_flac_dec_error_callback_seekable (const -- FLAC__SeekableStreamDecoder * decoder, -+ FLAC__StreamDecoder * decoder, - FLAC__StreamDecoderErrorStatus status, void *client_data); - static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * - decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); -@@ -212,7 +212,7 @@ static void - gst_flac_dec_reset_decoders (GstFlacDec * flacdec) - { - if (flacdec->seekable_decoder) { -- FLAC__seekable_stream_decoder_delete (flacdec->seekable_decoder); -+ FLAC__stream_decoder_delete (flacdec->seekable_decoder); - flacdec->seekable_decoder = NULL; - } - -@@ -238,27 +238,10 @@ gst_flac_dec_setup_seekable_decoder (GstFlacDec * dec) - { - gst_flac_dec_reset_decoders (dec); - -- dec->seekable_decoder = FLAC__seekable_stream_decoder_new (); -+ dec->seekable_decoder = FLAC__stream_decoder_new (); - -- FLAC__seekable_stream_decoder_set_read_callback (dec->seekable_decoder, -- gst_flac_dec_read_seekable); -- FLAC__seekable_stream_decoder_set_seek_callback (dec->seekable_decoder, -- gst_flac_dec_seek); -- FLAC__seekable_stream_decoder_set_tell_callback (dec->seekable_decoder, -- gst_flac_dec_tell); -- FLAC__seekable_stream_decoder_set_length_callback (dec->seekable_decoder, -- gst_flac_dec_length); -- FLAC__seekable_stream_decoder_set_eof_callback (dec->seekable_decoder, -- gst_flac_dec_eof); -- FLAC__seekable_stream_decoder_set_write_callback (dec->seekable_decoder, -- gst_flac_dec_write_seekable); -- FLAC__seekable_stream_decoder_set_metadata_respond (dec->seekable_decoder, -+ FLAC__stream_decoder_set_metadata_respond (dec->seekable_decoder, - FLAC__METADATA_TYPE_VORBIS_COMMENT); -- FLAC__seekable_stream_decoder_set_metadata_callback (dec->seekable_decoder, -- gst_flac_dec_metadata_callback_seekable); -- FLAC__seekable_stream_decoder_set_error_callback (dec->seekable_decoder, -- gst_flac_dec_error_callback_seekable); -- FLAC__seekable_stream_decoder_set_client_data (dec->seekable_decoder, dec); - } - - static void -@@ -270,17 +253,8 @@ gst_flac_dec_setup_stream_decoder (GstFlacDec * dec) - - dec->stream_decoder = FLAC__stream_decoder_new (); - -- FLAC__stream_decoder_set_read_callback (dec->stream_decoder, -- gst_flac_dec_read_stream); -- FLAC__stream_decoder_set_write_callback (dec->stream_decoder, -- gst_flac_dec_write_stream); - FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder, - FLAC__METADATA_TYPE_VORBIS_COMMENT); -- FLAC__stream_decoder_set_metadata_callback (dec->stream_decoder, -- gst_flac_dec_metadata_callback_stream); -- FLAC__stream_decoder_set_error_callback (dec->stream_decoder, -- gst_flac_dec_error_callback_stream); -- FLAC__stream_decoder_set_client_data (dec->stream_decoder, dec); - } - - static void -@@ -545,7 +519,7 @@ gst_flac_dec_metadata_callback (GstFlacDec * flacdec, - } - - static void --gst_flac_dec_metadata_callback_seekable (const FLAC__SeekableStreamDecoder * d, -+gst_flac_dec_metadata_callback_seekable (const FLAC__StreamDecoder * d, - const FLAC__StreamMetadata * metadata, void *client_data) - { - GstFlacDec *dec = GST_FLAC_DEC (client_data); -@@ -588,7 +562,7 @@ gst_flac_dec_error_callback (GstFlacDec * dec, - } - - static void --gst_flac_dec_error_callback_seekable (const FLAC__SeekableStreamDecoder * d, -+gst_flac_dec_error_callback_seekable (const FLAC__StreamDecoder * d, - FLAC__StreamDecoderErrorStatus status, void *client_data) - { - gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); -@@ -601,8 +575,8 @@ gst_flac_dec_error_callback_stream (const FLAC__Stream - gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); - } - --static FLAC__SeekableStreamDecoderSeekStatus --gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, -+static FLAC__StreamDecoderSeekStatus -+gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, - FLAC__uint64 position, void *client_data) - { - GstFlacDec *flacdec; -@@ -612,11 +586,11 @@ gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * - GST_DEBUG ("seek %" G_GINT64_FORMAT, position); - flacdec->offset = position; - -- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK; -+ return FLAC__STREAM_DECODER_SEEK_STATUS_OK; - } - --static FLAC__SeekableStreamDecoderTellStatus --gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, -+static FLAC__StreamDecoderTellStatus -+gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, - FLAC__uint64 * position, void *client_data) - { - GstFlacDec *flacdec; -@@ -627,11 +601,11 @@ gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * - - GST_DEBUG ("tell %" G_GINT64_FORMAT, *position); - -- return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; -+ return FLAC__STREAM_DECODER_TELL_STATUS_OK; - } - --static FLAC__SeekableStreamDecoderLengthStatus --gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, -+static FLAC__StreamDecoderLengthStatus -+gst_flac_dec_length (const FLAC__StreamDecoder * decoder, - FLAC__uint64 * length, void *client_data) - { - GstFlacDec *flacdec; -@@ -642,21 +616,21 @@ gst_flac_dec_length (const FLAC__SeekableStreamDecoder - flacdec = GST_FLAC_DEC (client_data); - - if (!(peer = gst_pad_get_peer (flacdec->sinkpad))) -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; - gst_pad_query_duration (peer, &fmt, &len); - gst_object_unref (peer); - if (fmt != GST_FORMAT_BYTES || len == -1) -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; - - *length = len; - - GST_DEBUG ("length %" G_GINT64_FORMAT, *length); - -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK; - } - - static FLAC__bool --gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, -+gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, - void *client_data) - { - GstFlacDec *flacdec; -@@ -685,9 +659,9 @@ gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * - return ret; - } - --static FLAC__SeekableStreamDecoderReadStatus --gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, -- FLAC__byte buffer[], unsigned *bytes, void *client_data) -+static FLAC__StreamDecoderReadStatus -+gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, -+ FLAC__byte buffer[], size_t *bytes, void *client_data) - { - GstFlacDec *flacdec; - GstBuffer *buf; -@@ -696,7 +670,7 @@ gst_flac_dec_read_seekable (const FLAC__SeekableStream - - if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, - &buf) != GST_FLOW_OK) -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; -+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; - - GST_DEBUG ("Read %d bytes at %" G_GUINT64_FORMAT, - GST_BUFFER_SIZE (buf), flacdec->offset); -@@ -705,12 +679,12 @@ gst_flac_dec_read_seekable (const FLAC__SeekableStream - gst_buffer_unref (buf); - flacdec->offset += *bytes; - -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; -+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; - } - - static FLAC__StreamDecoderReadStatus - gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, -- FLAC__byte buffer[], unsigned *bytes, void *client_data) -+ FLAC__byte buffer[], size_t *bytes, void *client_data) - { - GstFlacDec *dec = GST_FLAC_DEC (client_data); - guint len; -@@ -881,7 +855,7 @@ done: - } - - static FLAC__StreamDecoderWriteStatus --gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, -+gst_flac_dec_write_seekable (const FLAC__StreamDecoder * decoder, - const FLAC__Frame * frame, - const FLAC__int32 * const buffer[], void *client_data) - { -@@ -900,7 +874,7 @@ static void - gst_flac_dec_loop (GstPad * sinkpad) - { - GstFlacDec *flacdec; -- FLAC__SeekableStreamDecoderState s; -+ FLAC__StreamDecoderState s; - - flacdec = GST_FLAC_DEC (GST_OBJECT_PARENT (sinkpad)); - -@@ -908,10 +882,13 @@ gst_flac_dec_loop (GstPad * sinkpad) - - if (flacdec->init) { - GST_DEBUG_OBJECT (flacdec, "initializing decoder"); -- s = FLAC__seekable_stream_decoder_init (flacdec->seekable_decoder); -- if (s != FLAC__SEEKABLE_STREAM_DECODER_OK) -+ s = FLAC__stream_decoder_init_stream (flacdec->seekable_decoder, -+ gst_flac_dec_read_seekable, gst_flac_dec_seek, gst_flac_dec_tell, -+ gst_flac_dec_length, gst_flac_dec_eof, gst_flac_dec_write_seekable, -+ gst_flac_dec_metadata_callback_seekable, -+ gst_flac_dec_error_callback_seekable, flacdec); -+ if (s != FLAC__STREAM_DECODER_INIT_STATUS_OK) - goto analyze_state; -- /* FLAC__seekable_stream_decoder_process_metadata (flacdec->seekable_decoder); */ - flacdec->init = FALSE; - } - -@@ -920,15 +897,17 @@ gst_flac_dec_loop (GstPad * sinkpad) - flacdec->last_flow = GST_FLOW_OK; - - GST_LOG_OBJECT (flacdec, "processing single"); -- FLAC__seekable_stream_decoder_process_single (flacdec->seekable_decoder); -+ FLAC__stream_decoder_process_single (flacdec->seekable_decoder); - - analyze_state: - - GST_LOG_OBJECT (flacdec, "done processing, checking encoder state"); -- s = FLAC__seekable_stream_decoder_get_state (flacdec->seekable_decoder); -+ s = FLAC__stream_decoder_get_state (flacdec->seekable_decoder); - switch (s) { -- case FLAC__SEEKABLE_STREAM_DECODER_OK: -- case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:{ -+ case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA: -+ case FLAC__STREAM_DECODER_READ_METADATA: -+ case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC: -+ case FLAC__STREAM_DECODER_READ_FRAME:{ - GST_DEBUG_OBJECT (flacdec, "everything ok"); - - if (flacdec->last_flow != GST_FLOW_OK && -@@ -956,9 +935,9 @@ analyze_state: - return; - } - -- case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM:{ -+ case FLAC__STREAM_DECODER_END_OF_STREAM:{ - GST_DEBUG_OBJECT (flacdec, "EOS"); -- FLAC__seekable_stream_decoder_reset (flacdec->seekable_decoder); -+ FLAC__stream_decoder_reset (flacdec->seekable_decoder); - - if ((flacdec->segment.flags & GST_SEEK_FLAG_SEGMENT) != 0) { - if (flacdec->segment.duration > 0) { -@@ -972,18 +951,16 @@ analyze_state: - goto eos_and_pause; - } - -- case FLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR: -- case FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR: -- case FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR: -- case FLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR: -- case FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED: -- case FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK: -- case FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED: -+ case FLAC__STREAM_DECODER_OGG_ERROR: -+ case FLAC__STREAM_DECODER_SEEK_ERROR: -+ case FLAC__STREAM_DECODER_ABORTED: -+ case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: -+ case FLAC__STREAM_DECODER_UNINITIALIZED: - default:{ - /* fixme: this error sucks -- should try to figure out when/if an more - specific error was already sent via the callback */ - GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, (NULL), -- ("%s", FLAC__SeekableStreamDecoderStateString[s])); -+ ("%s", FLAC__StreamDecoderStateString[s])); - goto eos_and_pause; - } - } -@@ -1113,7 +1090,10 @@ gst_flac_dec_chain (GstPad * pad, GstBuffer * buf) - - if (dec->init) { - GST_DEBUG_OBJECT (dec, "initializing decoder"); -- s = FLAC__stream_decoder_init (dec->stream_decoder); -+ s = FLAC__stream_decoder_init_stream (dec->stream_decoder, -+ gst_flac_dec_read_stream, NULL, NULL, NULL, NULL, -+ gst_flac_dec_write_stream, gst_flac_dec_metadata_callback_stream, -+ gst_flac_dec_error_callback_stream, dec); - if (s != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { - GST_ELEMENT_ERROR (GST_ELEMENT (dec), LIBRARY, INIT, (NULL), (NULL)); - return GST_FLOW_ERROR; -@@ -1598,7 +1578,7 @@ gst_flac_dec_handle_seek_event (GstFlacDec * flacdec, - flacdec->seeking = TRUE; - - seek_ok = -- FLAC__seekable_stream_decoder_seek_absolute (flacdec->seekable_decoder, -+ FLAC__stream_decoder_seek_absolute (flacdec->seekable_decoder, - segment.start); - - flacdec->seeking = FALSE; diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h Tue Sep 18 20:33:25 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ -$OpenBSD: patch-ext_flac_gstflacdec_h,v 1.1 2007/09/18 18:33:25 naddy Exp $ ---- ext/flac/gstflacdec.h.orig Mon Sep 17 19:57:31 2007 -+++ ext/flac/gstflacdec.h Mon Sep 17 19:57:46 2007 -@@ -41,7 +41,7 @@ typedef struct _GstFlacDecClass GstFlacDecClass; - struct _GstFlacDec { - GstElement element; - -- FLAC__SeekableStreamDecoder *seekable_decoder; /* for pull-based operation */ -+ FLAC__StreamDecoder *seekable_decoder; /* for pull-based operation */ - - FLAC__StreamDecoder *stream_decoder; /* for chain-based operation */ - GstAdapter *adapter; diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c Tue Sep 18 20:33:25 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c Thu Jan 1 01:00:00 1970 @@ -1,334 +0,0 @@ -$OpenBSD: patch-ext_flac_gstflacenc_c,v 1.1 2007/09/18 18:33:25 naddy Exp $ ---- ext/flac/gstflacenc.c.orig Mon Sep 17 22:36:42 2007 -+++ ext/flac/gstflacenc.c Mon Sep 17 23:01:14 2007 -@@ -109,14 +109,14 @@ static GstStateChangeReturn gst_flac_enc_change_state - GstStateChange transition); - - static FLAC__StreamEncoderWriteStatus --gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, -- const FLAC__byte buffer[], unsigned bytes, -+gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder, -+ const FLAC__byte buffer[], size_t bytes, - unsigned samples, unsigned current_frame, void *client_data); --static FLAC__SeekableStreamEncoderSeekStatus --gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, -+static FLAC__StreamEncoderSeekStatus -+gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder, - FLAC__uint64 absolute_byte_offset, void *client_data); --static FLAC__SeekableStreamEncoderTellStatus --gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, -+static FLAC__StreamEncoderTellStatus -+gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder, - FLAC__uint64 * absolute_byte_offset, void *client_data); - - typedef struct -@@ -302,7 +302,7 @@ gst_flac_enc_init (GstFlacEnc * flacenc, GstFlacEncCla - gst_pad_use_fixed_caps (flacenc->srcpad); - gst_element_add_pad (GST_ELEMENT (flacenc), flacenc->srcpad); - -- flacenc->encoder = FLAC__seekable_stream_encoder_new (); -+ flacenc->encoder = FLAC__stream_encoder_new (); - - flacenc->offset = 0; - flacenc->samples_written = 0; -@@ -315,7 +315,7 @@ gst_flac_enc_finalize (GObject * object) - { - GstFlacEnc *flacenc = GST_FLAC_ENC (object); - -- FLAC__seekable_stream_encoder_delete (flacenc->encoder); -+ FLAC__stream_encoder_delete (flacenc->encoder); - - G_OBJECT_CLASS (parent_class)->finalize (object); - } -@@ -360,7 +360,7 @@ gst_flac_enc_set_metadata (GstFlacEnc * flacenc) - FLAC__metadata_object_new (FLAC__METADATA_TYPE_VORBIS_COMMENT); - gst_tag_list_foreach (copy, add_one_tag, flacenc); - -- if (FLAC__seekable_stream_encoder_set_metadata (flacenc->encoder, -+ if (FLAC__stream_encoder_set_metadata (flacenc->encoder, - flacenc->meta, 1) != true) - g_warning ("Dude, i'm already initialized!"); - gst_tag_list_free (copy); -@@ -371,13 +371,13 @@ gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * cap - { - GstFlacEnc *flacenc; - GstStructure *structure; -- FLAC__SeekableStreamEncoderState state; -+ FLAC__StreamEncoderState state; - - /* takes a ref on flacenc */ - flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad)); - -- if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != -- FLAC__SEEKABLE_STREAM_ENCODER_UNINITIALIZED) -+ if (FLAC__stream_encoder_get_state (flacenc->encoder) != -+ FLAC__STREAM_ENCODER_UNINITIALIZED) - goto encoder_already_initialized; - - structure = gst_caps_get_structure (caps, 0); -@@ -397,26 +397,19 @@ gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * cap - - gst_caps_unref (caps); - -- FLAC__seekable_stream_encoder_set_bits_per_sample (flacenc->encoder, -+ FLAC__stream_encoder_set_bits_per_sample (flacenc->encoder, - flacenc->depth); -- FLAC__seekable_stream_encoder_set_sample_rate (flacenc->encoder, -+ FLAC__stream_encoder_set_sample_rate (flacenc->encoder, - flacenc->sample_rate); -- FLAC__seekable_stream_encoder_set_channels (flacenc->encoder, -+ FLAC__stream_encoder_set_channels (flacenc->encoder, - flacenc->channels); - -- FLAC__seekable_stream_encoder_set_write_callback (flacenc->encoder, -- gst_flac_enc_write_callback); -- FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder, -- gst_flac_enc_seek_callback); -- FLAC__seekable_stream_encoder_set_tell_callback (flacenc->encoder, -- gst_flac_enc_tell_callback); -- -- FLAC__seekable_stream_encoder_set_client_data (flacenc->encoder, flacenc); -- - gst_flac_enc_set_metadata (flacenc); - -- state = FLAC__seekable_stream_encoder_init (flacenc->encoder); -- if (state != FLAC__STREAM_ENCODER_OK) -+ state = FLAC__stream_encoder_init_stream (flacenc->encoder, -+ gst_flac_enc_write_callback, gst_flac_enc_seek_callback, -+ gst_flac_enc_tell_callback, NULL, flacenc); -+ if (state != FLAC__STREAM_ENCODER_INIT_STATUS_OK) - goto failed_to_initialize; - - gst_object_unref (flacenc); -@@ -453,9 +446,9 @@ gst_flac_enc_update_quality (GstFlacEnc * flacenc, gin - - #define DO_UPDATE(name, val, str) \ - G_STMT_START { \ -- if (FLAC__seekable_stream_encoder_get_##name (flacenc->encoder) != \ -+ if (FLAC__stream_encoder_get_##name (flacenc->encoder) != \ - flacenc_params[quality].val) { \ -- FLAC__seekable_stream_encoder_set_##name (flacenc->encoder, \ -+ FLAC__stream_encoder_set_##name (flacenc->encoder, \ - flacenc_params[quality].val); \ - g_object_notify (G_OBJECT (flacenc), str); \ - } \ -@@ -490,8 +483,8 @@ gst_flac_enc_update_quality (GstFlacEnc * flacenc, gin - return TRUE; - } - --static FLAC__SeekableStreamEncoderSeekStatus --gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, -+static FLAC__StreamEncoderSeekStatus -+gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder, - FLAC__uint64 absolute_byte_offset, void *client_data) - { - GstFlacEnc *flacenc; -@@ -501,7 +494,7 @@ gst_flac_enc_seek_callback (const FLAC__SeekableStream - flacenc = GST_FLAC_ENC (client_data); - - if (flacenc->stopped) -- return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK; - - event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES, - absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0); -@@ -525,12 +518,12 @@ gst_flac_enc_seek_callback (const FLAC__SeekableStream - - flacenc->offset = absolute_byte_offset; - -- return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK; - } - - static FLAC__StreamEncoderWriteStatus --gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, -- const FLAC__byte buffer[], unsigned bytes, -+gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder, -+ const FLAC__byte buffer[], size_t bytes, - unsigned samples, unsigned current_frame, void *client_data) - { - GstFlowReturn ret; -@@ -577,15 +570,15 @@ gst_flac_enc_write_callback (const FLAC__SeekableStrea - return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; - } - --static FLAC__SeekableStreamEncoderTellStatus --gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, -+static FLAC__StreamEncoderTellStatus -+gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder, - FLAC__uint64 * absolute_byte_offset, void *client_data) - { - GstFlacEnc *flacenc = GST_FLAC_ENC (client_data); - - *absolute_byte_offset = flacenc->offset; - -- return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK; -+ return FLAC__STREAM_ENCODER_TELL_STATUS_OK; - } - - static gboolean -@@ -629,7 +622,7 @@ gst_flac_enc_sink_event (GstPad * pad, GstEvent * even - break; - } - case GST_EVENT_EOS: -- FLAC__seekable_stream_encoder_finish (flacenc->encoder); -+ FLAC__stream_encoder_finish (flacenc->encoder); - ret = gst_pad_event_default (pad, event); - break; - case GST_EVENT_TAG: -@@ -686,7 +679,7 @@ gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer) - - gst_buffer_unref (buffer); - -- res = FLAC__seekable_stream_encoder_process_interleaved (flacenc->encoder, -+ res = FLAC__stream_encoder_process_interleaved (flacenc->encoder, - (const FLAC__int32 *) data, samples / flacenc->channels); - - g_free (data); -@@ -712,51 +705,51 @@ gst_flac_enc_set_property (GObject * object, guint pro - gst_flac_enc_update_quality (this, g_value_get_enum (value)); - break; - case PROP_STREAMABLE_SUBSET: -- FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder, -+ FLAC__stream_encoder_set_streamable_subset (this->encoder, - g_value_get_boolean (value)); - break; - case PROP_MID_SIDE_STEREO: -- FLAC__seekable_stream_encoder_set_do_mid_side_stereo (this->encoder, -+ FLAC__stream_encoder_set_do_mid_side_stereo (this->encoder, - g_value_get_boolean (value)); - break; - case PROP_LOOSE_MID_SIDE_STEREO: -- FLAC__seekable_stream_encoder_set_loose_mid_side_stereo (this->encoder, -+ FLAC__stream_encoder_set_loose_mid_side_stereo (this->encoder, - g_value_get_boolean (value)); - break; - case PROP_BLOCKSIZE: -- FLAC__seekable_stream_encoder_set_blocksize (this->encoder, -+ FLAC__stream_encoder_set_blocksize (this->encoder, - g_value_get_uint (value)); - break; - case PROP_MAX_LPC_ORDER: -- FLAC__seekable_stream_encoder_set_max_lpc_order (this->encoder, -+ FLAC__stream_encoder_set_max_lpc_order (this->encoder, - g_value_get_uint (value)); - break; - case PROP_QLP_COEFF_PRECISION: -- FLAC__seekable_stream_encoder_set_qlp_coeff_precision (this->encoder, -+ FLAC__stream_encoder_set_qlp_coeff_precision (this->encoder, - g_value_get_uint (value)); - break; - case PROP_QLP_COEFF_PREC_SEARCH: -- FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search (this->encoder, -+ FLAC__stream_encoder_set_do_qlp_coeff_prec_search (this->encoder, - g_value_get_boolean (value)); - break; - case PROP_ESCAPE_CODING: -- FLAC__seekable_stream_encoder_set_do_escape_coding (this->encoder, -+ FLAC__stream_encoder_set_do_escape_coding (this->encoder, - g_value_get_boolean (value)); - break; - case PROP_EXHAUSTIVE_MODEL_SEARCH: -- FLAC__seekable_stream_encoder_set_do_exhaustive_model_search (this-> -+ FLAC__stream_encoder_set_do_exhaustive_model_search (this-> - encoder, g_value_get_boolean (value)); - break; - case PROP_MIN_RESIDUAL_PARTITION_ORDER: -- FLAC__seekable_stream_encoder_set_min_residual_partition_order (this-> -+ FLAC__stream_encoder_set_min_residual_partition_order (this-> - encoder, g_value_get_uint (value)); - break; - case PROP_MAX_RESIDUAL_PARTITION_ORDER: -- FLAC__seekable_stream_encoder_set_max_residual_partition_order (this-> -+ FLAC__stream_encoder_set_max_residual_partition_order (this-> - encoder, g_value_get_uint (value)); - break; - case PROP_RICE_PARAMETER_SEARCH_DIST: -- FLAC__seekable_stream_encoder_set_rice_parameter_search_dist (this-> -+ FLAC__stream_encoder_set_rice_parameter_search_dist (this-> - encoder, g_value_get_uint (value)); - break; - default: -@@ -781,57 +774,57 @@ gst_flac_enc_get_property (GObject * object, guint pro - break; - case PROP_STREAMABLE_SUBSET: - g_value_set_boolean (value, -- FLAC__seekable_stream_encoder_get_streamable_subset (this->encoder)); -+ FLAC__stream_encoder_get_streamable_subset (this->encoder)); - break; - case PROP_MID_SIDE_STEREO: - g_value_set_boolean (value, -- FLAC__seekable_stream_encoder_get_do_mid_side_stereo (this->encoder)); -+ FLAC__stream_encoder_get_do_mid_side_stereo (this->encoder)); - break; - case PROP_LOOSE_MID_SIDE_STEREO: - g_value_set_boolean (value, -- FLAC__seekable_stream_encoder_get_loose_mid_side_stereo (this-> -+ FLAC__stream_encoder_get_loose_mid_side_stereo (this-> - encoder)); - break; - case PROP_BLOCKSIZE: - g_value_set_uint (value, -- FLAC__seekable_stream_encoder_get_blocksize (this->encoder)); -+ FLAC__stream_encoder_get_blocksize (this->encoder)); - break; - case PROP_MAX_LPC_ORDER: - g_value_set_uint (value, -- FLAC__seekable_stream_encoder_get_max_lpc_order (this->encoder)); -+ FLAC__stream_encoder_get_max_lpc_order (this->encoder)); - break; - case PROP_QLP_COEFF_PRECISION: - g_value_set_uint (value, -- FLAC__seekable_stream_encoder_get_qlp_coeff_precision (this-> -+ FLAC__stream_encoder_get_qlp_coeff_precision (this-> - encoder)); - break; - case PROP_QLP_COEFF_PREC_SEARCH: - g_value_set_boolean (value, -- FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search (this-> -+ FLAC__stream_encoder_get_do_qlp_coeff_prec_search (this-> - encoder)); - break; - case PROP_ESCAPE_CODING: - g_value_set_boolean (value, -- FLAC__seekable_stream_encoder_get_do_escape_coding (this->encoder)); -+ FLAC__stream_encoder_get_do_escape_coding (this->encoder)); - break; - case PROP_EXHAUSTIVE_MODEL_SEARCH: - g_value_set_boolean (value, -- FLAC__seekable_stream_encoder_get_do_exhaustive_model_search (this-> -+ FLAC__stream_encoder_get_do_exhaustive_model_search (this-> - encoder)); - break; - case PROP_MIN_RESIDUAL_PARTITION_ORDER: - g_value_set_uint (value, -- FLAC__seekable_stream_encoder_get_min_residual_partition_order (this-> -+ FLAC__stream_encoder_get_min_residual_partition_order (this-> - encoder)); - break; - case PROP_MAX_RESIDUAL_PARTITION_ORDER: - g_value_set_uint (value, -- FLAC__seekable_stream_encoder_get_max_residual_partition_order (this-> -+ FLAC__stream_encoder_get_max_residual_partition_order (this-> - encoder)); - break; - case PROP_RICE_PARAMETER_SEARCH_DIST: - g_value_set_uint (value, -- FLAC__seekable_stream_encoder_get_rice_parameter_search_dist (this-> -+ FLAC__stream_encoder_get_rice_parameter_search_dist (this-> - encoder)); - break; - default: -@@ -864,10 +857,10 @@ gst_flac_enc_change_state (GstElement * element, GstSt - case GST_STATE_CHANGE_PLAYING_TO_PAUSED: - break; - case GST_STATE_CHANGE_PAUSED_TO_READY: -- if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != -+ if (FLAC__stream_encoder_get_state (flacenc->encoder) != - FLAC__STREAM_ENCODER_UNINITIALIZED) { - flacenc->stopped = TRUE; -- FLAC__seekable_stream_encoder_finish (flacenc->encoder); -+ FLAC__stream_encoder_finish (flacenc->encoder); - } - flacenc->offset = 0; - flacenc->samples_written = 0; diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h Tue Sep 18 20:33:25 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h Thu Jan 1 01:00:00 1970 @@ -1,12 +0,0 @@ -$OpenBSD: patch-ext_flac_gstflacenc_h,v 1.1 2007/09/18 18:33:25 naddy Exp $ ---- ext/flac/gstflacenc.h.orig Mon Sep 17 19:57:02 2007 -+++ ext/flac/gstflacenc.h Mon Sep 17 19:57:18 2007 -@@ -54,7 +54,7 @@ struct _GstFlacEnc { - gboolean stopped; - FLAC__int32 *data; - -- FLAC__SeekableStreamEncoder *encoder; -+ FLAC__StreamEncoder *encoder; - FLAC__StreamMetadata **meta; - - GstTagList * tags; diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in Mon Jan 8 18:37:27 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in Thu Mar 13 19:42:09 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-sys_oss_Makefile_in,v 1.1.1.1 2007/01/08 17:37:27 espie Exp $ ---- sys/oss/Makefile.in.orig Mon Jan 8 17:00:35 2007 -+++ sys/oss/Makefile.in Mon Jan 8 17:02:15 2007 -@@ -492,7 +492,8 @@ libgstossaudio_la_LIBADD = \ +--- sys/oss/Makefile.in.orig Wed Feb 20 23:09:52 2008 ++++ sys/oss/Makefile.in Thu Mar 13 19:30:56 2008 +@@ -519,7 +519,8 @@ libgstossaudio_la_LIBADD = \ $(GST_PLUGINS_BASE_LIBS) \ -lgstinterfaces-$(GST_MAJORMINOR) \ -lgstaudio-$(GST_MAJORMINOR) \ diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c Thu Feb 14 19:52:00 2008 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c Thu Mar 13 19:42:09 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-sys_oss_gstosshelper_c,v 1.1 2008/02/14 18:52:00 ajacoutot Exp $ ---- sys/oss/gstosshelper.c.orig Thu Feb 14 09:28:31 2008 -+++ sys/oss/gstosshelper.c Thu Feb 14 09:29:52 2008 -@@ -253,6 +253,12 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe) +--- sys/oss/gstosshelper.c.orig Sat Dec 8 17:47:33 2007 ++++ sys/oss/gstosshelper.c Thu Mar 13 19:30:33 2008 +@@ -254,6 +254,12 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe) * driver is seriously buggy, and probably doesn't work with other * media libraries/apps. */ probe->min = gst_oss_helper_rate_check_rate (probe, 8000); diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c Sun Sep 16 20:15:23 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c Thu Mar 13 19:42:09 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-sys_oss_gstosssink_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ ---- sys/oss/gstosssink.c.orig Tue Oct 17 16:37:49 2006 -+++ sys/oss/gstosssink.c Sun Sep 16 20:09:41 2007 -@@ -118,7 +118,7 @@ enum +--- sys/oss/gstosssink.c.orig Fri Dec 7 21:07:49 2007 ++++ sys/oss/gstosssink.c Thu Mar 13 19:30:33 2008 +@@ -120,7 +120,7 @@ enum LAST_SIGNAL }; @@ -10,7 +10,7 @@ enum { PROP_0, -@@ -219,7 +219,7 @@ gst_oss_sink_class_init (GstOssSinkClass * klass) +@@ -221,7 +221,7 @@ gst_oss_sink_class_init (GstOssSinkClass * klass) g_object_class_install_property (gobject_class, PROP_DEVICE, g_param_spec_string ("device", "Device", diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c Sun Sep 16 20:15:23 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c Thu Mar 13 19:42:09 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-sys_oss_gstosssrc_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ ---- sys/oss/gstosssrc.c.orig Wed Aug 16 12:22:31 2006 -+++ sys/oss/gstosssrc.c Sun Sep 16 20:09:41 2007 -@@ -76,7 +76,7 @@ GST_ELEMENT_DETAILS ("Audio Source (OSS)", +--- sys/oss/gstosssrc.c.orig Fri Dec 7 21:07:49 2007 ++++ sys/oss/gstosssrc.c Thu Mar 13 19:30:33 2008 +@@ -78,7 +78,7 @@ GST_ELEMENT_DETAILS ("Audio Source (OSS)", "Capture from a sound card via OSS", "Erik Walthinsen <omega@...>, " "Wim Taymans <wim@...>"); @@ -10,7 +10,7 @@ #define DEFAULT_DEVICE_NAME "" enum -@@ -175,7 +175,7 @@ gst_oss_src_class_init (GstOssSrcClass * klass) +@@ -180,7 +180,7 @@ gst_oss_src_class_init (GstOssSrcClass * klass) g_object_class_install_property (gobject_class, PROP_DEVICE, g_param_spec_string ("device", "Device", diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c Thu Mar 13 21:36:24 2008 @@ -0,0 +1,451 @@ +$OpenBSD$ +--- sys/sunaudio/gstsunaudio.c.orig Thu Mar 13 21:35:21 2008 ++++ sys/sunaudio/gstsunaudio.c Mon Apr 16 23:29:40 2007 +@@ -1,9 +1,7 @@ + /* +- * GStreamer - SunAudio source ++ * GStreamer - SunAudio plugin + * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@...> + * +- * gstsunaudiosrc.c: +- * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either +@@ -20,413 +18,45 @@ + * Boston, MA 02111-1307, USA. + */ + +-/** +- * SECTION:element-sunaudiosrc +- * +- * <refsect2> +- * <para> +- * sunaudiosrc is an audio source designed to work with the Sun Audio +- * interface available in Solaris. +- * </para> +- * <title>Example launch line</title> +- * <para> +- * <programlisting> +- * +- * gst-launch sunaudiosrc ! filesink location=outfile +- * </programlisting> +- * </para> +- * </refsect2> +- */ +- + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + +-#include <fcntl.h> +-#include <string.h> +-#include <unistd.h> +-#include <stropts.h> +-#include <sys/mixer.h> ++#include "gst/gst-i18n-plugin.h" + ++#include "gstsunaudiomixer.h" ++#include "gstsunaudiosink.h" + #include "gstsunaudiosrc.h" + +-GST_DEBUG_CATEGORY_EXTERN (sunaudio_debug); +-#define GST_CAT_DEFAULT sunaudio_debug ++extern gchar *__gst_oss_plugin_dir; + +-static GstElementDetails plugin_details = +-GST_ELEMENT_DETAILS ("Sun Audio Source", +- "Source/Audio", +- "Audio source for Sun Audio devices", +- "Brian Cameron <brian.cameron@...>"); ++GST_DEBUG_CATEGORY (sunaudio_debug); + +-static void gst_sunaudiosrc_base_init (gpointer g_class); +-static void gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass); +-static void gst_sunaudiosrc_init (GstSunAudioSrc * sunaudiosrc, +- GstSunAudioSrcClass * g_class); +-static void gst_sunaudiosrc_dispose (GObject * object); +- +-static void gst_sunaudiosrc_set_property (GObject * object, guint prop_id, +- const GValue * value, GParamSpec * pspec); +-static void gst_sunaudiosrc_get_property (GObject * object, guint prop_id, +- GValue * value, GParamSpec * pspec); +- +-static GstCaps *gst_sunaudiosrc_getcaps (GstBaseSrc * bsrc); +- +-static gboolean gst_sunaudiosrc_open (GstAudioSrc * asrc); +-static gboolean gst_sunaudiosrc_close (GstAudioSrc * asrc); +-static gboolean gst_sunaudiosrc_prepare (GstAudioSrc * asrc, +- GstRingBufferSpec * spec); +-static gboolean gst_sunaudiosrc_unprepare (GstAudioSrc * asrc); +-static guint gst_sunaudiosrc_read (GstAudioSrc * asrc, gpointer data, +- guint length); +-static guint gst_sunaudiosrc_delay (GstAudioSrc * asrc); +-static void gst_sunaudiosrc_reset (GstAudioSrc * asrc); +- +-#define DEFAULT_DEVICE "/dev/audio" +- +-enum +-{ +- PROP_0, +- PROP_DEVICE +-}; +- +-GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioSrc, gst_sunaudiosrc, +- GstAudioSrc, GST_TYPE_AUDIO_SRC, GstMixer, GST_TYPE_MIXER, gst_sunaudiosrc); +- +-GST_IMPLEMENT_SUNAUDIO_MIXER_CTRL_METHODS (GstSunAudioSrc, gst_sunaudiosrc); +- +-static GstStaticPadTemplate gst_sunaudiosrc_factory = +-GST_STATIC_PAD_TEMPLATE ("src", +- GST_PAD_SRC, +- GST_PAD_ALWAYS, +- GST_STATIC_CAPS ("audio/x-raw-int, " +- "endianness = (int) BYTE_ORDER, " +- "signed = (boolean) TRUE, " "width = (int) 16, " "depth = (int) 16, " +- /* [5510,48000] seems to be a Solaris limit */ +- "rate = (int) [ 5510, 48000 ], " "channels = (int) [ 1, 2 ]") +- ); +- +-static void +-gst_sunaudiosrc_dispose (GObject * object) +-{ +- G_OBJECT_CLASS (parent_class)->dispose (object); +-} +- +-static void +-gst_sunaudiosrc_base_init (gpointer g_class) +-{ +- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); +- +- gst_element_class_add_pad_template (element_class, +- gst_static_pad_template_get (&gst_sunaudiosrc_factory)); +- gst_element_class_set_details (element_class, &plugin_details); +-} +- +-static void +-gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass) +-{ +- GObjectClass *gobject_class; +- GstElementClass *gstelement_class; +- GstBaseSrcClass *gstbasesrc_class; +- GstBaseAudioSrcClass *gstbaseaudiosrc_class; +- GstAudioSrcClass *gstaudiosrc_class; +- +- gobject_class = (GObjectClass *) klass; +- gstelement_class = (GstElementClass *) klass; +- gstbasesrc_class = (GstBaseSrcClass *) klass; +- gstbaseaudiosrc_class = (GstBaseAudioSrcClass *) klass; +- gstaudiosrc_class = (GstAudioSrcClass *) klass; +- +- gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_dispose); +- gobject_class->get_property = +- GST_DEBUG_FUNCPTR (gst_sunaudiosrc_get_property); +- gobject_class->set_property = +- GST_DEBUG_FUNCPTR (gst_sunaudiosrc_set_property); +- +- gstbasesrc_class->get_caps = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_getcaps); +- +- gstaudiosrc_class->open = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_open); +- gstaudiosrc_class->prepare = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_prepare); +- gstaudiosrc_class->unprepare = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_unprepare); +- gstaudiosrc_class->close = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_close); +- gstaudiosrc_class->read = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_read); +- gstaudiosrc_class->delay = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_delay); +- gstaudiosrc_class->reset = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_reset); +- +- g_object_class_install_property (gobject_class, PROP_DEVICE, +- g_param_spec_string ("device", "Device", +- "SunAudio device (usually /dev/audio)", DEFAULT_DEVICE, +- G_PARAM_READWRITE)); +-} +- +-static void +-gst_sunaudiosrc_init (GstSunAudioSrc * sunaudiosrc, +- GstSunAudioSrcClass * g_class) +-{ +- const char *audiodev; +- +- GST_DEBUG_OBJECT (sunaudiosrc, "initializing sunaudiosrc"); +- +- sunaudiosrc->fd = -1; +- +- audiodev = g_getenv ("AUDIODEV"); +- if (audiodev == NULL) +- audiodev = DEFAULT_DEVICE; +- sunaudiosrc->device = g_strdup (audiodev); +-} +- +-static void +-gst_sunaudiosrc_set_property (GObject * object, guint prop_id, +- const GValue * value, GParamSpec * pspec) +-{ +- GstSunAudioSrc *sunaudiosrc; +- +- sunaudiosrc = GST_SUNAUDIO_SRC (object); +- +- switch (prop_id) { +- case PROP_DEVICE: +- if (sunaudiosrc->device) +- g_free (sunaudiosrc->device); +- sunaudiosrc->device = g_value_dup_string (value); +- break; +- default: +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +- break; +- } +-} +- +-static void +-gst_sunaudiosrc_get_property (GObject * object, guint prop_id, +- GValue * value, GParamSpec * pspec) +-{ +- GstSunAudioSrc *sunaudiosrc; +- +- sunaudiosrc = GST_SUNAUDIO_SRC (object); +- +- switch (prop_id) { +- case PROP_DEVICE: +- g_value_set_string (value, sunaudiosrc->device); +- break; +- default: +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); +- break; +- } +-} +- +-static GstCaps * +-gst_sunaudiosrc_getcaps (GstBaseSrc * bsrc) +-{ +- GstPadTemplate *pad_template; +- GstCaps *caps = NULL; +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (bsrc); +- +- GST_DEBUG_OBJECT (sunaudiosrc, "getcaps called"); +- +- pad_template = gst_static_pad_template_get (&gst_sunaudiosrc_factory); +- caps = gst_caps_copy (gst_pad_template_get_caps (pad_template)); +- +- gst_object_unref (pad_template); +- +- return caps; +-} +- + static gboolean +-gst_sunaudiosrc_open (GstAudioSrc * asrc) ++plugin_init (GstPlugin * plugin) + { +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); +- int fd, ret; +- +- fd = open (sunaudiosrc->device, O_RDONLY); +- +- if (fd == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, OPEN_READ, (NULL), +- ("can't open connection to Sun Audio device %s", sunaudiosrc->device)); +- ++ if (!gst_element_register (plugin, "sunaudiomixer", GST_RANK_NONE, ++ GST_TYPE_SUNAUDIO_MIXER) || ++ !gst_element_register (plugin, "sunaudiosink", GST_RANK_SECONDARY, ++ GST_TYPE_SUNAUDIO_SINK) || ++ !gst_element_register (plugin, "sunaudiosrc", GST_RANK_SECONDARY, ++ GST_TYPE_SUNAUDIO_SRC)) { + return FALSE; + } + +- sunaudiosrc->fd = fd; ++ GST_DEBUG_CATEGORY_INIT (sunaudio_debug, "sunaudio", 0, "sunaudio elements"); + +- ret = ioctl (fd, AUDIO_GETDEV, &sunaudiosrc->dev); +- if (ret == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- return FALSE; +- } ++#ifdef ENABLE_NLS ++ setlocale (LC_ALL, ""); ++ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); ++#endif /* ENABLE_NLS */ + +- GST_DEBUG_OBJECT (sunaudiosrc, "name %s", sunaudiosrc->dev.name); +- GST_DEBUG_OBJECT (sunaudiosrc, "version %s", sunaudiosrc->dev.version); +- GST_DEBUG_OBJECT (sunaudiosrc, "config %s", sunaudiosrc->dev.config); +- +- ret = ioctl (fd, AUDIO_GETINFO, &sunaudiosrc->info); +- if (ret == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- return FALSE; +- } +- +- GST_DEBUG_OBJECT (sunaudiosrc, "monitor_gain %d", +- sunaudiosrc->info.monitor_gain); +- GST_DEBUG_OBJECT (sunaudiosrc, "output_muted %d", +- sunaudiosrc->info.output_muted); +- GST_DEBUG_OBJECT (sunaudiosrc, "hw_features %08x", +- sunaudiosrc->info.hw_features); +- GST_DEBUG_OBJECT (sunaudiosrc, "sw_features %08x", +- sunaudiosrc->info.sw_features); +- GST_DEBUG_OBJECT (sunaudiosrc, "sw_features_enabled %08x", +- sunaudiosrc->info.sw_features_enabled); +- +- if (!sunaudiosrc->mixer) { +- const char *audiodev; +- +- audiodev = g_getenv ("AUDIODEV"); +- if (audiodev == NULL) { +- sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new ("/dev/audioctl"); +- } else { +- gchar *device = g_strdup_printf ("%sctl", audiodev); +- +- sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new (device); +- g_free (device); +- } +- } +- + return TRUE; + } + +-static gboolean +-gst_sunaudiosrc_close (GstAudioSrc * asrc) +-{ +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); +- +- close (sunaudiosrc->fd); +- sunaudiosrc->fd = -1; +- +- if (sunaudiosrc->mixer) { +- gst_sunaudiomixer_ctrl_free (sunaudiosrc->mixer); +- sunaudiosrc->mixer = NULL; +- } +- +- return TRUE; +-} +- +-static gboolean +-gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec) +-{ +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); +- audio_info_t ainfo; +- int ret; +- int ctrl_fd = -1; +- int ports; +- +- ret = ioctl (sunaudiosrc->fd, AUDIO_GETINFO, &ainfo); +- if (ret == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- return FALSE; +- } +- +- if (spec->width != 16) +- return FALSE; +- +- AUDIO_INITINFO (&ainfo); +- +- ainfo.record.sample_rate = spec->rate; +- ainfo.record.precision = spec->width; +- ainfo.record.channels = spec->channels; +- ainfo.record.encoding = AUDIO_ENCODING_LINEAR; +- ainfo.record.buffer_size = spec->buffer_time; +- +- GstSunAudioMixerCtrl *mixer = sunaudiosrc->mixer; +- struct audio_info audioinfo; +- +- if (ioctl (mixer->mixer_fd, AUDIO_GETINFO, &audioinfo) < 0) { +- g_warning ("Error getting audio device volume"); +- } +- ainfo.record.port = audioinfo.record.port; +- ainfo.record.gain = audioinfo.record.gain; +- ainfo.record.balance = audioinfo.record.balance; +- +- spec->segsize = 128; +- spec->segtotal = spec->buffer_time / 128; +- +- spec->silence_sample[0] = 0; +- spec->silence_sample[1] = 0; +- spec->silence_sample[2] = 0; +- spec->silence_sample[3] = 0; +- +- ret = ioctl (sunaudiosrc->fd, AUDIO_SETINFO, &ainfo); +- if (ret == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- return FALSE; +- } +- +- +- ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); +- +- return TRUE; +-} +- +-static gboolean +-gst_sunaudiosrc_unprepare (GstAudioSrc * asrc) +-{ +- return TRUE; +-} +- +-static guint +-gst_sunaudiosrc_read (GstAudioSrc * asrc, gpointer data, guint length) +-{ +- return read (GST_SUNAUDIO_SRC (asrc)->fd, data, length); +-} +- +-static guint +-gst_sunaudiosrc_delay (GstAudioSrc * asrc) +-{ +- return 0; +-} +- +-static void +-gst_sunaudiosrc_reset (GstAudioSrc * asrc) +-{ +- /* Get current values */ +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); +- audio_info_t ainfo; +- int ret; +- +- ret = ioctl (sunaudiosrc->fd, AUDIO_GETINFO, &ainfo); +- if (ret == -1) { +- /* +- * Should never happen, but if we couldn't getinfo, then no point +- * trying to setinfo +- */ +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- return; +- } +- +- /* +- * Pause the audio - so audio stops playing immediately rather than +- * waiting for the ringbuffer to empty. +- */ +- ainfo.record.pause = !NULL; +- ret = ioctl (sunaudiosrc->fd, AUDIO_SETINFO, &ainfo); +- if (ret == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- } +- +- /* Flush the audio */ +- ret = ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); +- if (ret == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- } +- +- /* unpause the audio */ +- ainfo.record.pause = NULL; +- ret = ioctl (sunaudiosrc->fd, AUDIO_SETINFO, &ainfo); +- if (ret == -1) { +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", +- strerror (errno))); +- } +-} ++GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, ++ GST_VERSION_MINOR, ++ "sunaudio", ++ "Sun Audio support for GStreamer", ++ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c Sun Sep 16 20:15:23 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c Thu Mar 13 21:32:48 2008 @@ -1,7 +1,24 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ ---- sys/sunaudio/gstsunaudiomixerctrl.c.orig Sat Dec 16 14:51:48 2006 -+++ sys/sunaudio/gstsunaudiomixerctrl.c Sun Sep 16 20:09:41 2007 -@@ -235,20 +235,10 @@ gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtr +--- sys/sunaudio/gstsunaudiomixerctrl.c.orig Fri Jan 11 22:08:59 2008 ++++ sys/sunaudio/gstsunaudiomixerctrl.c Thu Mar 13 21:32:46 2008 +@@ -29,7 +29,6 @@ + #include <string.h> + #include <errno.h> + #include <sys/ioctl.h> +-#include <sys/mixer.h> + + #include <gst/gst-i18n-plugin.h> + +@@ -61,8 +60,6 @@ gst_sunaudiomixer_ctrl_open (GstSunAudioMixerCtrl * mi + + return FALSE; + } +- /* Try to set the multiple open flag if we can, but ignore errors */ +- ioctl (mixer->mixer_fd, AUDIO_MIXER_MULTIPLE_OPEN); + + mixer->mixer_fd = fd; + return TRUE; +@@ -238,20 +235,10 @@ gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtr } } @@ -23,7 +40,18 @@ } void -@@ -337,11 +327,6 @@ gst_sunaudiomixer_ctrl_set_mute (GstSunAudioMixerCtrl +@@ -263,10 +250,8 @@ gst_sunaudiomixer_ctrl_set_volume (GstSunAudioMixerCtr + gint l_real_gain; + gint r_real_gain; + float ratio; +- gchar buf[100]; + struct audio_info audioinfo; + GstSunAudioMixerTrack *sunaudiotrack = GST_SUNAUDIO_MIXER_TRACK (track); +- gint temp[2]; + + l_real_gain = volumes[0]; + r_real_gain = volumes[1]; +@@ -340,11 +325,6 @@ gst_sunaudiomixer_ctrl_set_mute (GstSunAudioMixerCtrl switch (sunaudiotrack->track_num) { case GST_SUNAUDIO_TRACK_OUTPUT: diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h Wed Jan 10 00:22:56 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h Thu Mar 13 19:42:08 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_h,v 1.1 2007/01/09 23:22:56 espie Exp $ ---- sys/sunaudio/gstsunaudiomixerctrl.h.orig Tue Jan 9 23:18:47 2007 -+++ sys/sunaudio/gstsunaudiomixerctrl.h Tue Jan 9 23:19:06 2007 -@@ -19,6 +19,8 @@ +--- sys/sunaudio/gstsunaudiomixerctrl.h.orig Mon Apr 16 23:29:40 2007 ++++ sys/sunaudio/gstsunaudiomixerctrl.h Thu Mar 13 19:30:33 2008 +@@ -20,6 +20,8 @@ #ifndef __GST_SUNAUDIO_MIXER_CTRL_H #define __GST_SUNAUDIO_MIXER_CTRL_H diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c Sun Sep 16 20:15:23 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c Thu Mar 13 21:17:07 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ ---- sys/sunaudio/gstsunaudiosink.c.orig Sat Dec 16 14:51:48 2006 -+++ sys/sunaudio/gstsunaudiosink.c Sun Sep 16 20:09:41 2007 -@@ -42,7 +42,6 @@ +--- sys/sunaudio/gstsunaudiosink.c.orig Mon Apr 16 23:29:40 2007 ++++ sys/sunaudio/gstsunaudiosink.c Thu Mar 13 21:17:01 2008 +@@ -43,7 +43,6 @@ #include <fcntl.h> #include <string.h> @@ -9,7 +9,28 @@ #include <unistd.h> #include <sys/mman.h> -@@ -623,7 +622,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) +@@ -205,7 +204,6 @@ gst_sunaudiosink_class_init (GstSunAudioSinkClass * kl + static void + gst_sunaudiosink_init (GstSunAudioSink * sunaudiosink) + { +- GstBaseAudioSink *ba_sink = GST_BASE_AUDIO_SINK (sunaudiosink); + const char *audiodev; + + GST_DEBUG_OBJECT (sunaudiosink, "initializing sunaudiosink"); +@@ -319,12 +317,6 @@ gst_sunaudiosink_open (GstAudioSink * asink) + sunaudiosink->info.monitor_gain); + GST_DEBUG_OBJECT (sunaudiosink, "output_muted %d", + sunaudiosink->info.output_muted); +- GST_DEBUG_OBJECT (sunaudiosink, "hw_features %08x", +- sunaudiosink->info.hw_features); +- GST_DEBUG_OBJECT (sunaudiosink, "sw_features %08x", +- sunaudiosink->info.sw_features); +- GST_DEBUG_OBJECT (sunaudiosink, "sw_features_enabled %08x", +- sunaudiosink->info.sw_features_enabled); + + return TRUE; + +@@ -624,7 +616,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) } /* Flush the audio */ @@ -18,7 +39,7 @@ if (ret == -1) { GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s", strerror (errno))); -@@ -638,7 +637,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) +@@ -639,7 +631,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) g_cond_signal (sunaudiosink->sleep_cond); diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h Wed Jan 10 00:22:56 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h Thu Mar 13 19:42:09 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-sys_sunaudio_gstsunaudiosink_h,v 1.1 2007/01/09 23:22:56 espie Exp $ ---- sys/sunaudio/gstsunaudiosink.h.orig Tue Jan 9 23:20:19 2007 -+++ sys/sunaudio/gstsunaudiosink.h Tue Jan 9 23:20:32 2007 -@@ -23,6 +23,8 @@ +--- sys/sunaudio/gstsunaudiosink.h.orig Mon Apr 16 23:29:40 2007 ++++ sys/sunaudio/gstsunaudiosink.h Thu Mar 13 19:30:33 2008 +@@ -25,6 +25,8 @@ #ifndef __GST_SUNAUDIO_SINK_H__ #define __GST_SUNAUDIO_SINK_H__ diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c Sun Sep 16 20:15:23 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c Thu Jan 1 01:00:00 1970 @@ -1,41 +0,0 @@ -$OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ ---- sys/sunaudio/gstsunaudiosrc.c.orig Sat Dec 16 14:51:48 2006 -+++ sys/sunaudio/gstsunaudiosrc.c Sun Sep 16 20:09:41 2007 -@@ -45,8 +45,6 @@ - #include <fcntl.h> - #include <string.h> - #include <unistd.h> --#include <stropts.h> --#include <sys/mixer.h> - - #include "gstsunaudiosrc.h" - -@@ -248,9 +246,8 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc) - int fd, ret, err; - - fd = open (sunaudiosrc->device, O_RDONLY); -- err = ioctl (fd, AUDIO_MIXER_MULTIPLE_OPEN); - -- if (fd == -1 || err == -1) { -+ if (fd == -1) { - GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, OPEN_READ, (NULL), - ("can't open connection to Sun Audio device %s", sunaudiosrc->device)); - -@@ -375,7 +372,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBu - } - - -- ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); -+ ioctl (sunaudiosrc->fd, AUDIO_FLUSH); - - return TRUE; - } -@@ -429,7 +426,7 @@ gst_sunaudiosrc_reset (GstAudioSrc * asrc) - } - - /* Flush the audio */ -- ret = ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); -+ ret = ioctl (sunaudiosrc->fd, AUDIO_FLUSH); - if (ret == -1) { - GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", - strerror (errno))); diff -urN multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main --- multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main Fri Jan 12 00:14:11 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main Thu Mar 13 21:48:22 2008 @@ -23,8 +23,12 @@ lib/gstreamer-${VERSION}/libgstefence.so lib/gstreamer-${VERSION}/libgsteffectv.la lib/gstreamer-${VERSION}/libgsteffectv.so +lib/gstreamer-${VERSION}/libgstequalizer.la +lib/gstreamer-${VERSION}/libgstequalizer.so lib/gstreamer-${VERSION}/libgstflxdec.la lib/gstreamer-${VERSION}/libgstflxdec.so +lib/gstreamer-${VERSION}/libgstgamma.la +lib/gstreamer-${VERSION}/libgstgamma.so lib/gstreamer-${VERSION}/libgstgoom.la lib/gstreamer-${VERSION}/libgstgoom.so lib/gstreamer-${VERSION}/libgsticydemux.la @@ -37,18 +41,24 @@ lib/gstreamer-${VERSION}/libgstmatroska.so lib/gstreamer-${VERSION}/libgstmulaw.la lib/gstreamer-${VERSION}/libgstmulaw.so +lib/gstreamer-${VERSION}/libgstmultifile.la +lib/gstreamer-${VERSION}/libgstmultifile.so lib/gstreamer-${VERSION}/libgstmultipart.la lib/gstreamer-${VERSION}/libgstmultipart.so lib/gstreamer-${VERSION}/libgstnavigationtest.la lib/gstreamer-${VERSION}/libgstnavigationtest.so lib/gstreamer-${VERSION}/libgstossaudio.la lib/gstreamer-${VERSION}/libgstossaudio.so +lib/gstreamer-${VERSION}/libgstqtdemux.la +lib/gstreamer-${VERSION}/libgstqtdemux.so lib/gstreamer-${VERSION}/libgstrtp.la lib/gstreamer-${VERSION}/libgstrtp.so lib/gstreamer-${VERSION}/libgstrtsp.la lib/gstreamer-${VERSION}/libgstrtsp.so lib/gstreamer-${VERSION}/libgstsmpte.la lib/gstreamer-${VERSION}/libgstsmpte.so +lib/gstreamer-${VERSION}/libgstspectrum.la +lib/gstreamer-${VERSION}/libgstspectrum.so @comment lib/gstreamer-${VERSION}/libgstsunaudio.la @comment lib/gstreamer-${VERSION}/libgstsunaudio.so lib/gstreamer-${VERSION}/libgstudp.la @@ -57,6 +67,8 @@ lib/gstreamer-${VERSION}/libgstvideobalance.so lib/gstreamer-${VERSION}/libgstvideobox.la lib/gstreamer-${VERSION}/libgstvideobox.so +lib/gstreamer-${VERSION}/libgstvideocrop.la +lib/gstreamer-${VERSION}/libgstvideocrop.so lib/gstreamer-${VERSION}/libgstvideoflip.la lib/gstreamer-${VERSION}/libgstvideoflip.so lib/gstreamer-${VERSION}/libgstvideomixer.la @@ -69,15 +81,26 @@ lib/gstreamer-${VERSION}/libgstximagesrc.so share/locale/af/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/az/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/bg/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/cs/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/da/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/en_GB/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/es/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/eu/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/fi/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/hu/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/it/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/ja/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/nb/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/nl/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/or/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/pl/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/sk/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/sq/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/sr/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/sv/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/uk/LC_MESSAGES/gst-plugins-good-${VERSION}.mo share/locale/vi/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/zh_HK/LC_MESSAGES/gst-plugins-good-${VERSION}.mo +share/locale/zh_TW/LC_MESSAGES/gst-plugins-good-${VERSION}.mo diff -urN multimedia/gstreamer-0.10/plugins-ugly/Makefile mystuff/multimedia/gstreamer-0.10/plugins-ugly/Makefile --- multimedia/gstreamer-0.10/plugins-ugly/Makefile Mon Oct 8 10:22:41 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/Makefile Fri Mar 14 15:18:18 2008 @@ -8,15 +8,15 @@ COMMENT-mpeg2= multimedia framework - mpeg2 plugin COMMENT-dvdread= multimedia framework - dvdread plugin -V= 0.10.5 +V= 0.10.7 DISTNAME= gst-plugins-ugly-$V -PKGNAME-main= gstreamer-plugins-ugly-$Vp0 -PKGNAME-sidplay= gstreamer-sidplay-$Vp1 -PKGNAME-a52= gstreamer-a52-$Vp0 -PKGNAME-mad= gstreamer-mad-$Vp0 -PKGNAME-lame= gstreamer-lame-$Vp0 -PKGNAME-mpeg2= gstreamer-mpeg2-$Vp0 -PKGNAME-dvdread= gstreamer-dvdread-$Vp0 +PKGNAME-main= gstreamer-plugins-ugly-$V +PKGNAME-sidplay= gstreamer-sidplay-$V +PKGNAME-a52= gstreamer-a52-$V +PKGNAME-mad= gstreamer-mad-$V +PKGNAME-lame= gstreamer-lame-$V +PKGNAME-mpeg2= gstreamer-mpeg2-$V +PKGNAME-dvdread= gstreamer-dvdread-$V MULTI_PACKAGES= -main -sidplay -lame -mad -a52 -mpeg2 -dvdread PERMIT_PACKAGE_CDROM= Patent issues @@ -25,17 +25,15 @@ MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-ugly/} -MODULES= devel/gettext - WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ - xml2 m z + xml2 m z pcre LIB_DEPENDS= gstreamer-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core RUN_DEPENDS= ::${BUILD_PKGPATH} WANTLIB-main= ${WANTLIB} LIB_DEPENDS-main= ${LIB_DEPENDS} \ gstriff-0.10::multimedia/gstreamer-0.10/plugins-base \ - gstbase-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core + gstbase-0.10,gstrtsp-0.10,gstsdp-0.10,gsttag-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core RUN_DEPENDS-main= @@ -49,9 +47,10 @@ gstbase-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ a52::audio/liba52 -WANTLIB-mad= ${WANTLIB} +WANTLIB-mad= ${WANTLIB} \ + gstaudio-0.10 gstinterfaces-0.10 LIB_DEPENDS-mad= ${LIB_DEPENDS} \ - gsttag-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ + gstbase-0.10,gsttag-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ id3tag::audio/libid3tag \ mad::audio/libmad @@ -60,7 +59,7 @@ mp3lame::audio/lame WANTLIB-mpeg2= ${WANTLIB} \ - X11 Xext Xv + X11 Xext Xv Xau Xdmcp LIB_DEPENDS-mpeg2= ${LIB_DEPENDS} \ mpeg2::graphics/libmpeg2 diff -urN multimedia/gstreamer-0.10/plugins-ugly/distinfo mystuff/multimedia/gstreamer-0.10/plugins-ugly/distinfo --- multimedia/gstreamer-0.10/plugins-ugly/distinfo Thu Apr 5 18:20:07 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/distinfo Fri Mar 14 14:47:27 2008 @@ -1,5 +1,5 @@ -MD5 (gst-plugins-ugly-0.10.5.tar.bz2) = LmvzXryyq1CLQ+86ruh4rQ== -RMD160 (gst-plugins-ugly-0.10.5.tar.bz2) = j2dmyjjM62fK2XZ9ZysUJv1WxPk= -SHA1 (gst-plugins-ugly-0.10.5.tar.bz2) = BN/xGUdFsbR4RbksPEXlUdhbMgI= -SHA256 (gst-plugins-ugly-0.10.5.tar.bz2) = 863mHokNK9LVtfGyfbpEuawxJS9osaWJq5RPEIbCgq4= -SIZE (gst-plugins-ugly-0.10.5.tar.bz2) = 744261 +MD5 (gst-plugins-ugly-0.10.7.tar.bz2) = z/T1UTjRIVLPWAo+5xwlGQ== +RMD160 (gst-plugins-ugly-0.10.7.tar.bz2) = 6xj90S/JgJ3eoBN9XWQbumd3W/4= +SHA1 (gst-plugins-ugly-0.10.7.tar.bz2) = oe7Zhezm2rV6K08x7xRNlewCSvs= +SHA256 (gst-plugins-ugly-0.10.7.tar.bz2) = VWuiQHK9sy7laK3Ggtaa3RJB13k2vJVj5QzblTCXvjU= +SIZE (gst-plugins-ugly-0.10.7.tar.bz2) = 868172 diff -urN multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c --- multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c Fri Jan 12 00:06:14 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c Fri Mar 14 14:54:18 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-ext_dvdread_dvdreadsrc_c,v 1.1 2007/01/11 23:06:14 espie Exp $ ---- ext/dvdread/dvdreadsrc.c.orig Fri Jan 12 00:04:31 2007 -+++ ext/dvdread/dvdreadsrc.c Fri Jan 12 00:05:13 2007 -@@ -128,7 +128,7 @@ gst_dvd_read_src_init (GstDvdReadSrc * s +--- ext/dvdread/dvdreadsrc.c.orig Mon Feb 18 16:49:58 2008 ++++ ext/dvdread/dvdreadsrc.c Fri Mar 14 14:47:50 2008 +@@ -128,7 +128,7 @@ gst_dvd_read_src_init (GstDvdReadSrc * src, GstDvdRead src->vmg_file = NULL; src->dvd_title = NULL; @@ -10,7 +10,7 @@ src->last_uri = NULL; src->new_seek = TRUE; src->new_cell = TRUE; -@@ -944,7 +944,7 @@ gst_dvd_read_src_set_property (GObject * +@@ -955,7 +955,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) { diff -urN multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c --- multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c Thu Jan 1 01:00:00 1970 +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c Fri Mar 14 14:55:00 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- ext/lame/gstlame.c.orig Fri Mar 14 14:51:44 2008 ++++ ext/lame/gstlame.c Fri Mar 14 14:54:56 2008 +@@ -578,7 +578,7 @@ zero_output_rate: + setup_failed: + { + GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS, +- (_("Failed to configure LAME encoder. Check your encoding parameters.")), NULL); ++ ("Failed to configure LAME encoder. Check your encoding parameters."), (NULL)); + return FALSE; + } + } diff -urN multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in --- multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in Thu Jan 11 01:23:26 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in Fri Mar 14 14:54:18 2008 @@ -1,7 +1,7 @@ $OpenBSD: patch-ext_sidplay_Makefile_in,v 1.1 2007/01/11 00:23:26 espie Exp $ ---- ext/sidplay/Makefile.in.orig Wed Dec 13 21:45:46 2006 -+++ ext/sidplay/Makefile.in Thu Jan 11 01:16:35 2007 -@@ -280,7 +280,7 @@ RANLIB = @RANLIB@ +--- ext/sidplay/Makefile.in.orig Thu Feb 21 00:36:39 2008 ++++ ext/sidplay/Makefile.in Fri Mar 14 14:48:08 2008 +@@ -293,7 +293,7 @@ SED = @SED@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@ diff -urN multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main --- multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main Wed Jan 10 03:14:04 2007 +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main Fri Mar 14 14:57:13 2008 @@ -15,15 +15,23 @@ lib/gstreamer-${VERSION}/libgstrmdemux.so 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/cs/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo +share/locale/da/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/fi/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo share/locale/hu/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo share/locale/it/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/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/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 diff -urN multimedia/gstreamer-0.10/py-gstreamer/Makefile mystuff/multimedia/gstreamer-0.10/py-gstreamer/Makefile --- multimedia/gstreamer-0.10/py-gstreamer/Makefile Tue Jan 22 09:53:41 2008 +++ mystuff/multimedia/gstreamer-0.10/py-gstreamer/Makefile Fri Mar 14 15:19:18 2008 @@ -2,7 +2,7 @@ COMMENT= Python bindings for gstreamer -V= 0.10.9 +V= 0.10.10 DISTNAME= gst-python-$V PKGNAME= py-gstreamer-$V @@ -14,12 +14,10 @@ gstdataprotocol-0.10 gstnet-0.10 gstreamer-0.10 gthread-2.0 \ m pcre xml2 z -MODULES= devel/gettext - BUILD_DEPENDS= ::x11/py-gtk2 RUN_DEPENDS= ::x11/py-gtk2 \ :py-libxml-*:textproc/libxml,-python -LIB_DEPENDS= gstinterfaces-0.10::multimedia/gstreamer-0.10/plugins-base +LIB_DEPENDS= gstpbutils-0.10,gstinterfaces-0.10::multimedia/gstreamer-0.10/plugins-base REGRESS_DEPENDS=::multimedia/gstreamer-0.10/plugins-good diff -urN multimedia/gstreamer-0.10/py-gstreamer/distinfo mystuff/multimedia/gstreamer-0.10/py-gstreamer/distinfo --- multimedia/gstreamer-0.10/py-gstreamer/distinfo Tue Jan 22 09:53:41 2008 +++ mystuff/multimedia/gstreamer-0.10/py-gstreamer/distinfo Fri Mar 14 15:05:06 2008 @@ -1,5 +1,5 @@ -MD5 (gst-python-0.10.9.tar.bz2) = gH4U6NBYRFUko04Hm7gwSA== -RMD160 (gst-python-0.10.9.tar.bz2) = xYxM9eu6e/UtvIpt4dg0YFAWZlE= -SHA1 (gst-python-0.10.9.tar.bz2) = S6gDOjtNEoBCWNucTPCmM2fMlZI= -SHA256 (gst-python-0.10.9.tar.bz2) = nATHxQN0v1jFzIwwQA0nON8/tD0Fa9xEHTPUzp+z5LQ= -SIZE (gst-python-0.10.9.tar.bz2) = 447963 +MD5 (gst-python-0.10.10.tar.bz2) = YYPWHkNLXTTyMiSKNVcWJw== +RMD160 (gst-python-0.10.10.tar.bz2) = HpLrVtaKC1FMLFfLDsAZSH3h/FM= +SHA1 (gst-python-0.10.10.tar.bz2) = rXNmVYHrIjgK7bjKSqlbJx37PcE= +SHA256 (gst-python-0.10.10.tar.bz2) = yHV1OmzM1Ap59YJOpexR7kYVpPIhA+St/GoCIb9hXY4= +SIZE (gst-python-0.10.10.tar.bz2) = 468099 diff -urN multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST mystuff/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST --- multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST Tue Jan 22 09:53:41 2008 +++ mystuff/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST Fri Mar 14 15:07:34 2008 @@ -31,6 +31,8 @@ lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/utils.pyo lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/interfaces.la lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/interfaces.so +lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/pbutils.la +lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/pbutils.so lib/python${MODPY_VERSION}/site-packages/pygst.pth lib/python${MODPY_VERSION}/site-packages/pygst.py lib/python${MODPY_VERSION}/site-packages/pygst.pyc @@ -42,6 +44,7 @@ share/gst-python/${VERSION}/defs/gst-extrafuncs.defs share/gst-python/${VERSION}/defs/gst-types.defs share/gst-python/${VERSION}/defs/libs.defs +share/gst-python/${VERSION}/defs/pbutils.defs share/gst-python/${VERSION}/examples/ share/gst-python/${VERSION}/examples/audio-controller.py share/gst-python/${VERSION}/examples/audioconcat.py [rhythmbox.diff] diff -urN audio/rhythmbox/Makefile mystuff/audio/rhythmbox/Makefile --- audio/rhythmbox/Makefile Wed Dec 19 08:31:15 2007 +++ mystuff/audio/rhythmbox/Makefile Fri Mar 14 17:04:10 2008 @@ -1,16 +1,15 @@ # $OpenBSD: Makefile,v 1.17 2007/12/19 07:31:15 ajacoutot Exp $ -BROKEN= needs an update to 0.11.x (and working totem) - COMMENT= Music Management Application -DISTNAME= rhythmbox-0.8.8 -PKGNAME= ${DISTNAME}p6 +DISTNAME= rhythmbox-0.11.4 CATEGORIES= audio +SHARED_LIBS= rhythmbox-core 0.0 + HOMEPAGE= http://www.rhythmbox.org -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.8/} +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.11/} # LGPL PERMIT_PACKAGE_CDROM= Yes @@ -18,7 +17,7 @@ PERMIT_DISTFILES_CDROM= Yes PERMIT_DISTFILES_FTP= Yes WANTLIB= ICE SM X11 Xau Xdmcp Xrender \ - c crypto expat fontconfig freetype pthread m ssl z \ + c crypto fontconfig freetype pthread m ssl z \ ORBit-2 ORBitCosNaming-2 art_lgpl_2.>=5 atk-1.0 \ audiofile bonobo-2 bonobo-activation.>=4.0 bonoboui-2 \ esd.>=2 gconf-2 glade-2.0 jpeg popt xml2 \ @@ -26,34 +25,55 @@ pango-1.0 pangocairo-1.0 pangoft2-1.0 \ gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \ gnome-2 gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \ - gstcontrol-0.8.>=5.0 gstreamer-0.8.>=5.0 cairo glitz png + cairo glitz png Xcomposite Xcursor Xdamage Xext Xfixes \ + Xi Xinerama Xrandr asn1 com_err dbus-1 dbus-glib-1 \ + gailutil gssapi gstbase-0.10 gstpbutils-0.10 \ + gstinterfaces-0.10 gstreamer-0.10 gstcontroller-0.10 \ + krb5 pcre util camel-1.2 db edataserver-1.2 nspr4 nss3 \ + plc4 plds4 smime3 softokn3 soup-2.2 ssl3 neon -MODULES= devel/gettext +MODULES= devel/gettext \ + lang/python -BUILD_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \ - :p5-XML-Parser-*:textproc/p5-XML-Parser \ - :gstreamer-gnome-0.8.*:devel/gstreamer-plugins,-gnome -LIB_DEPENDS= gstgconf-0.8::devel/gstreamer-plugins \ - gnomeui-2::x11/gnome/libgnomeui +BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \ + :gstreamer-gnome-0.10.*:multimedia/gstreamer-0.10/plugins-base,-gnome +LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ + python2.5.>=0::lang/python/2.5 \ + totem-plparser.>=11::devel/totem-pl-parser \ + musicbrainz3.>=5::audio/libmusicbrainz \ + sexy.>=0::x11/libsexy \ + notify.>=2::devel/libnotify \ + gnome-media-profiles.>=0::x11/gnome/media \ + howl.>=0::net/howl RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ - :scrollkeeper-*:textproc/scrollkeeper \ - :gstreamer-flac-0.8.*:devel/gstreamer-plugins,-flac \ - :gstreamer-gnome-0.8.*:devel/gstreamer-plugins,-gnome \ - :gstreamer-mad-0.8.*:devel/gstreamer-plugins,-mad \ - :gstreamer-ogg-0.8.*:devel/gstreamer-plugins,-ogg \ - :gstreamer-vorbis-0.8.*:devel/gstreamer-plugins,-vorbis + :gstreamer-flac-0.10.*:multimedia/gstreamer-0.10/plugins-good,-flac \ + :gstreamer-gnome-0.10.*:multimedia/gstreamer-0.10/plugins-base,-gnome \ + :gstreamer-mad-0.10.*:multimedia/gstreamer-0.10/plugins-ugly,-mad \ + :gstreamer-ogg-0.10.*:multimedia/gstreamer-0.10/plugins-base,-ogg \ + :gstreamer-vorbis-0.10.*:multimedia/gstreamer-0.10/plugins-base,-vorbis \ + :gstreamer-confelements-0.10.*:multimedia/gstreamer-0.10/plugins-good,-gconf \ + :gstreamer-ffmpeg-0.10.*:multimedia/gstreamer-0.10/ffmpeg \ + :py-gnome-*:x11/gnome/py-gnome \ + :gnome-icon-theme-*:x11/gnome/icon-theme USE_X11= Yes USE_GMAKE= Yes USE_LIBTOOL= Yes CONFIGURE_STYLE= gnu -CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/rhythmbox/ -CONFIGURE_ARGS+= --disable-schemas-install -CONFIGURE_ARGS+= --enable-nautilus-menu +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ + --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/rhythmbox/ \ + --disable-schemas-install \ + --enable-nautilus-menu \ + --disable-scrollkeeper \ + --without-cd-burning \ + --without-hal \ + --with-mdns=howl + CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib" -post-patch: - @ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update +post-install: + @echo If somes icons are missing, add gtk-icon-theme-name = "gnome" + @echo in your ~/.gtkrc-2.0 .include <bsd.port.mk> diff -urN audio/rhythmbox/distinfo mystuff/audio/rhythmbox/distinfo --- audio/rhythmbox/distinfo Thu Apr 5 17:37:44 2007 +++ mystuff/audio/rhythmbox/distinfo Sun Mar 9 20:54:28 2008 @@ -1,5 +1,5 @@ -MD5 (rhythmbox-0.8.8.tar.gz) = O5uRjSfdROgBkulV+Ko8yw== -RMD160 (rhythmbox-0.8.8.tar.gz) = f+6bWIsdM2Iz7+LIwivIfw3wovA= -SHA1 (rhythmbox-0.8.8.tar.gz) = ea0XzARlr8t+6zRsPFQBFojnQLU= -SHA256 (rhythmbox-0.8.8.tar.gz) = sjcuVqNoCCYu+7oIW4HxhuCEUvgPjmLkDiF+KxzAJ4s= -SIZE (rhythmbox-0.8.8.tar.gz) = 3003728 +MD5 (rhythmbox-0.11.4.tar.gz) = HAwYQ+be+GrZJxixugyunQ== +RMD160 (rhythmbox-0.11.4.tar.gz) = bdmcOQ2/uQXK4djK0UI//vFZ9xU= +SHA1 (rhythmbox-0.11.4.tar.gz) = eE8tdvC2+/RlmEY7mWY/rKqLhi0= +SHA256 (rhythmbox-0.11.4.tar.gz) = EtVxp4Q9iaKlweEtnP2nlZbAw5bXa085RZRhnx6rKso= +SIZE (rhythmbox-0.11.4.tar.gz) = 5905561 diff -urN audio/rhythmbox/patches/CVS/Entries mystuff/audio/rhythmbox/patches/CVS/Entries --- audio/rhythmbox/patches/CVS/Entries Thu Mar 6 11:59:24 2008 +++ mystuff/audio/rhythmbox/patches/CVS/Entries Thu Jan 1 01:00:00 1970 @@ -1,2 +0,0 @@ -/patch-configure/1.2/Wed Nov 16 06:39:23 2005// -D diff -urN audio/rhythmbox/patches/CVS/Repository mystuff/audio/rhythmbox/patches/CVS/Repository --- audio/rhythmbox/patches/CVS/Repository Thu Mar 6 11:59:24 2008 +++ mystuff/audio/rhythmbox/patches/CVS/Repository Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -ports/audio/rhythmbox/patches diff -urN audio/rhythmbox/patches/CVS/Root mystuff/audio/rhythmbox/patches/CVS/Root --- audio/rhythmbox/patches/CVS/Root Thu Mar 6 11:59:24 2008 +++ mystuff/audio/rhythmbox/patches/CVS/Root Thu Jan 1 01:00:00 1970 @@ -1 +0,0 @@ -/cvs diff -urN audio/rhythmbox/patches/patch-bindings_python_Makefile_in mystuff/audio/rhythmbox/patches/patch-bindings_python_Makefile_in --- audio/rhythmbox/patches/patch-bindings_python_Makefile_in Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-bindings_python_Makefile_in Sun Mar 9 20:59:44 2008 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- bindings/python/Makefile.in.orig Thu Dec 20 13:05:02 2007 ++++ bindings/python/Makefile.in Sun Mar 9 20:54:34 2008 +@@ -351,7 +351,8 @@ rb_la_LDFLAGS = \ + rb_la_LIBADD = \ + $(PYTHON_LIBS) \ + $(PYTHON_EXTRA_LIBS) \ +- $(PYGTK_LIBS) ++ $(PYGTK_LIBS) \ ++ $(top_srcdir)/sources/libsources.la + + + rb_la_CFLAGS = \ diff -urN audio/rhythmbox/patches/patch-configure mystuff/audio/rhythmbox/patches/patch-configure --- audio/rhythmbox/patches/patch-configure Wed Nov 16 07:39:23 2005 +++ mystuff/audio/rhythmbox/patches/patch-configure Sun Mar 9 20:59:45 2008 @@ -1,55 +1,65 @@ -$OpenBSD: patch-configure,v 1.2 2005/11/16 06:39:23 marcm Exp $ ---- configure.orig Tue Oct 5 11:11:28 2004 -+++ configure Thu Aug 18 18:09:33 2005 -@@ -9017,7 +9017,7 @@ nto-qnx*) - openbsd*) - version_type=sunos - need_lib_prefix=no -- need_version=yes -+ need_version=no - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' - shlibpath_var=LD_LIBRARY_PATH -@@ -20864,7 +20864,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l +$OpenBSD$ +--- configure.orig Thu Dec 20 12:57:54 2007 ++++ configure Sun Mar 9 20:59:39 2008 +@@ -12576,7 +12576,7 @@ GNOME_MEDIA_PROFILES_REQS=2.8 + GNOME_VFS_REQS=2.8.0 + LIBNOTIFY_REQS=0.3.2 + LIBGPOD_REQS=0.4 +-MUSICBRAINZ_REQS=2.1.0 ++MUSICBRAINZ_REQS=3.0.0 + NCB_MIN_REQS=2.9.0 + TOTEM_PLPARSER_REQS=2.21.4 + VALA_REQS=0.0.8 +@@ -15682,12 +15682,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_MUSICBRAINZ_CFLAGS="$MUSICBRAINZ_CFLAGS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz3 >= \$MUSICBRAINZ_REQS\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS") 2>&5 ac_status=$? echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then -- have_fwrite_unlocked=yes -+ have_fwrite_unlocked=no + (exit $ac_status); }; then +- pkg_cv_MUSICBRAINZ_CFLAGS=`$PKG_CONFIG --cflags "libmusicbrainz >= $MUSICBRAINZ_REQS" 2>/dev/null` ++ pkg_cv_MUSICBRAINZ_CFLAGS=`$PKG_CONFIG --cflags "libmusicbrainz3 >= $MUSICBRAINZ_REQS" 2>/dev/null` else - echo "$as_me: failed program was:" >&5 - sed 's/^/| /' conftest.$ac_ext >&5 -@@ -21827,15 +21827,9 @@ fi - if test "x$GST_INSPECT" != "x"; then - echo "$as_me:$LINENO: checking GStreamer element gnomevfssrc" >&5 - echo $ECHO_N "checking GStreamer element gnomevfssrc... $ECHO_C" >&6 -- if $GST_INSPECT gnomevfssrc > /dev/null 2> /dev/null ; then - echo "$as_me:$LINENO: result: found." >&5 - echo "${ECHO_T}found." >&6 - -- else -- echo "$as_me:$LINENO: result: not found." >&5 --echo "${ECHO_T}not found." >&6 -- missing_gst_elements="$missing_gst_elements gnomevfssrc" -- fi - fi - - -@@ -22243,7 +22237,7 @@ echo $ECHO_N "checking ID3TAG_LIBS... $E - echo "${ECHO_T}$ID3TAG_LIBS" >&6 + pkg_failed=yes + fi +@@ -15700,12 +15700,12 @@ if test -n "$PKG_CONFIG"; then + pkg_cv_MUSICBRAINZ_LIBS="$MUSICBRAINZ_LIBS" + else + if test -n "$PKG_CONFIG" && \ +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\"") >&5 +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz333 >= \$MUSICBRAINZ_REQS\"") >&5 ++ ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS") 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- pkg_cv_MUSICBRAINZ_LIBS=`$PKG_CONFIG --libs "libmusicbrainz >= $MUSICBRAINZ_REQS" 2>/dev/null` ++ pkg_cv_MUSICBRAINZ_LIBS=`$PKG_CONFIG --libs "libmusicbrainz3 >= $MUSICBRAINZ_REQS" 2>/dev/null` + else + pkg_failed=yes + fi +@@ -15724,9 +15724,9 @@ else + _pkg_short_errors_supported=no + fi + if test $_pkg_short_errors_supported = yes; then +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` ++ MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS"` else - ID3TAG_CFLAGS="" -- ID3TAG_LIBS="" -+ ID3TAG_LIBS="-lid3tag" - ## If we have a custom action on failure, don't print errors, but - ## do set a variable so people can do so. - ID3TAG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "id3tag >= 0.15.0b"` -@@ -22261,7 +22255,7 @@ echo "${ECHO_T}$ID3TAG_LIBS" >&6 - if test $succeeded = yes; then - enable_mp3=yes - else -- enable_mp3=no -+ enable_mp3=yes - fi +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` ++ MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS"` + fi + # Put the nasty error message in config.log where it belongs + echo "$MUSICBRAINZ_PKG_ERRORS" >&5 +@@ -19296,7 +19296,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else - if test x"$enable_mp3" = xno; then +- for am_cv_pathless_PYTHON in python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 : ; do ++ for am_cv_pathless_PYTHON in python2.5 python2.4 python2.3 : ; do + if test "$am_cv_pathless_PYTHON" = : ; then + { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 + echo "$as_me: error: no suitable Python interpreter found" >&2;} diff -urN audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c mystuff/audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c --- audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c Sat Mar 8 21:07:13 2008 @@ -0,0 +1,13 @@ +$OpenBSD$ +--- metadata/rb-metadata-dbus-client.c.orig Sat Mar 8 21:04:48 2008 ++++ metadata/rb-metadata-dbus-client.c Sat Mar 8 21:07:05 2008 +@@ -51,8 +51,7 @@ + #include <glib/gi18n.h> + + #include <unistd.h> +-#include <sys/types.h> +-#include <sys/signal.h> ++#include <signal.h> + #include <sys/wait.h> + #include <string.h> + #include <stdlib.h> diff -urN audio/rhythmbox/patches/patch-metadata_test-metadata_c mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c --- audio/rhythmbox/patches/patch-metadata_test-metadata_c Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c Sun Mar 9 21:02:02 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- metadata/test-metadata.c.orig Thu Nov 15 13:08:20 2007 ++++ metadata/test-metadata.c Sun Mar 9 21:01:56 2008 +@@ -83,7 +83,7 @@ load_metadata_cb (gpointer file) + if (uri[0] == '/') { + uri = g_filename_to_uri (uri, NULL, NULL); + } else { +- char buf[600]; ++ char buf[1024]; + if (getcwd (buf, sizeof (buf)) != NULL) { + char *filename; + diff -urN audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig --- audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig Sat Mar 8 21:10:30 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- metadata/test-metadata.c.orig Sat Mar 8 21:09:16 2008 ++++ metadata/test-metadata.c Sat Mar 8 21:10:20 2008 +@@ -81,7 +81,7 @@ load_metadata_cb (gpointer file) + if (uri[0] == '/') { + uri = g_strdup_printf ("file://%s", uri); + } else { +- char buf[600]; ++ char buf[1024]; + if (getcwd (buf, sizeof (buf)) != NULL) + uri = g_strdup_printf ("file://%s/%s", buf, uri); + } diff -urN audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c --- audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c Sun Mar 9 20:59:44 2008 @@ -0,0 +1,21 @@ +$OpenBSD$ +--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Mon Dec 17 10:26:53 2007 ++++ plugins/audioscrobbler/rb-audioscrobbler.c Sun Mar 9 20:54:34 2008 +@@ -840,7 +840,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler * + } + + if (time (NULL) < audioscrobbler->priv->handshake_next) { +- rb_debug ("Too soon; time=%lu, handshake_next=%lu", ++ rb_debug ("Too soon; time=%d, handshake_next=%d", + time (NULL), + audioscrobbler->priv->handshake_next); + return FALSE; +@@ -950,7 +950,7 @@ rb_audioscrobbler_build_authentication_data (RBAudiosc + + time(&now); + if (now < audioscrobbler->priv->submit_next) { +- rb_debug ("Too soon (next submission in %ld seconds)", ++ rb_debug ("Too soon (next submission in %d seconds)", + audioscrobbler->priv->submit_next - now); + return NULL; + } diff -urN audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c --- audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c Sun Mar 9 20:59:44 2008 @@ -0,0 +1,12 @@ +$OpenBSD$ +--- plugins/audioscrobbler/rb-lastfm-gst-src.c.orig Tue Jun 19 13:38:41 2007 ++++ plugins/audioscrobbler/rb-lastfm-gst-src.c Sun Mar 9 20:54:34 2008 +@@ -108,7 +108,7 @@ rb_lastfm_src_pad_probe_cb (GstPad *pad, GstBuffer *bu + char *s; + static char sync[5] = "SYNC"; + +- s = memmem (data, GST_BUFFER_SIZE (buffer), sync, 4); ++ s = strstr (data, sync); + if (s != NULL) { + GstMessage *msg; + GstStructure *s; diff -urN audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c --- audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c Sun Mar 9 20:59:43 2008 @@ -0,0 +1,66 @@ +$OpenBSD$ +--- plugins/daap/rb-daap-src.c.orig Sun Jun 17 13:56:21 2007 ++++ plugins/daap/rb-daap-src.c Sun Mar 9 20:54:34 2008 +@@ -290,7 +290,7 @@ rb_daap_src_write (RBDAAPSrc *src, const guchar *buf, + bytes_written += wrote; + } + +- GST_DEBUG_OBJECT (src, "wrote %d bytes succesfully", bytes_written); ++ GST_DEBUG_OBJECT (src, "wrote %zu bytes succesfully", bytes_written); + return bytes_written; + } + +@@ -304,7 +304,7 @@ rb_daap_src_read (RBDAAPSrc *src, guchar *buf, size_t + if (bytes_read > src->buffer_size) + bytes_read = src->buffer_size; + +- GST_DEBUG_OBJECT (src, "reading %d bytes from buffer", bytes_read); ++ GST_DEBUG_OBJECT (src, "reading %zu bytes from buffer", bytes_read); + memcpy (buf, src->buffer, bytes_read); + src->buffer += bytes_read; + src->buffer_size -= bytes_read; +@@ -328,7 +328,7 @@ rb_daap_src_read (RBDAAPSrc *src, guchar *buf, size_t + bytes_read += ret; + } + +- GST_DEBUG_OBJECT (src, "read %d bytes succesfully", bytes_read); ++ GST_DEBUG_OBJECT (src, "read %zu bytes succesfully", bytes_read); + return bytes_read; + } + +@@ -380,7 +380,7 @@ rb_daap_src_read_chunk_size (RBDAAPSrc *src, gboolean + return FALSE; + } + +- GST_DEBUG_OBJECT (src, "got HTTP chunk size %lu", *chunk_size); ++ GST_DEBUG_OBJECT (src, "got HTTP chunk size %li", (long int)*chunk_size); + return TRUE; + } else if (isxdigit (ch)) { + chunk_buf[i++] = ch; +@@ -578,7 +578,7 @@ rb_daap_src_open (RBDAAPSrc *src) + src->chunked = TRUE; + } else { + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), +- ("Unknown HTTP transfer encoding \"%s\"", val->data)); ++ ("Unknown HTTP transfer encoding \"%s\"", (gchar *)val->data)); + } + } else { + src->chunked = FALSE; +@@ -588,7 +588,7 @@ rb_daap_src_open (RBDAAPSrc *src) + src->size = strtoul ((char *)val->data, &e, 10); + if (e == val->data) { + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), +- ("Couldn't read HTTP content length \"%s\"", val->data)); ++ ("Couldn't read HTTP content length \"%s\"", (gchar *)val->data)); + ok = FALSE; + } + } else { +@@ -693,7 +693,7 @@ rb_daap_src_create (GstPushSrc *psrc, GstBuffer **outb + + buf = gst_buffer_new_and_alloc (readsize); + +- GST_LOG_OBJECT (src, "Reading %d bytes", readsize); ++ GST_LOG_OBJECT (src, "Reading %zu bytes", readsize); + readsize = rb_daap_src_read (src, GST_BUFFER_DATA (buf), readsize); + if (readsize < 0) { + GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), GST_ERROR_SYSTEM); diff -urN audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h --- audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h Sun Mar 9 18:46:41 2008 @@ -0,0 +1,14 @@ +$OpenBSD$ +--- plugins/daap/rb-daap-src.h.orig Sat Mar 8 17:34:27 2008 ++++ plugins/daap/rb-daap-src.h Sat Mar 8 17:35:22 2008 +@@ -25,6 +25,10 @@ + #include <glib.h> + #include <gst/gstelement.h> + ++#ifndef MSG_NOSIGNAL ++#define MSG_NOSIGNAL 0 ++#endif ++ + G_BEGIN_DECLS + + GType rb_daap_src_get_type (void); diff -urN audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h mystuff/audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h --- audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h Thu Jan 1 01:00:00 1970 +++ mystuff/audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h Sat Mar 8 16:47:45 2008 @@ -0,0 +1,11 @@ +$OpenBSD$ +--- podcast/rb-podcast-parse.h.orig Sat Mar 8 16:42:20 2008 ++++ podcast/rb-podcast-parse.h Sat Mar 8 16:47:29 2008 +@@ -23,6 +23,7 @@ + #define RB_PODCAST_PARSE_H + + #include <glib.h> ++#include <inttypes.h> + + typedef struct + { diff -urN audio/rhythmbox/pkg/PFRAG.shared mystuff/audio/rhythmbox/pkg/PFRAG.shared --- audio/rhythmbox/pkg/PFRAG.shared Wed Dec 22 07:17:28 2004 +++ mystuff/audio/rhythmbox/pkg/PFRAG.shared Thu Jan 1 01:00:00 1970 @@ -1,2 +0,0 @@ -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $ -lib/bonobo/librb-nautilus-context-menu.so diff -urN audio/rhythmbox/pkg/PLIST mystuff/audio/rhythmbox/pkg/PLIST --- audio/rhythmbox/pkg/PLIST Wed Dec 19 08:31:15 2007 +++ mystuff/audio/rhythmbox/pkg/PLIST Fri Mar 14 16:54:17 2008 @@ -1,224 +1,555 @@ -@comment $OpenBSD: PLIST,v 1.4 2007/12/19 07:31:15 ajacoutot Exp $ +@comment $OpenBSD$ bin/rhythmbox -lib/bonobo/ -lib/bonobo/librb-nautilus-context-menu.a -lib/bonobo/librb-nautilus-context-menu.la -lib/bonobo/servers/ -lib/bonobo/servers/GNOME_Rhythmbox.server -lib/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server -lib/pkgconfig/rhythmbox.pc -share/application-registry/ -share/application-registry/rhythmbox.applications -share/applications/ +bin/rhythmbox-client +lib/librhythmbox-core.a +lib/librhythmbox-core.la +@lib lib/librhythmbox-core.so.${LIBrhythmbox-core_VERSION} +lib/rhythmbox/ +lib/rhythmbox/plugins/ +lib/rhythmbox/plugins/artdisplay/ +lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py +lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc +lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo +lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py +lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc +lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo +lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py +lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc +lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo +lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.py +lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.pyc +lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.pyo +lib/rhythmbox/plugins/artdisplay/__init__.py +lib/rhythmbox/plugins/artdisplay/__init__.pyc +lib/rhythmbox/plugins/artdisplay/__init__.pyo +lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin +lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg +lib/rhythmbox/plugins/audioscrobbler/ +lib/rhythmbox/plugins/audioscrobbler/as-icon.png +lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-prefs.glade +lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-ui.xml +lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin +lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a +lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la +lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so +lib/rhythmbox/plugins/daap/ +lib/rhythmbox/plugins/daap/daap-prefs.glade +lib/rhythmbox/plugins/daap/daap-ui.xml +lib/rhythmbox/plugins/daap/daap.rb-plugin +lib/rhythmbox/plugins/daap/libdaap.a +lib/rhythmbox/plugins/daap/libdaap.la +lib/rhythmbox/plugins/daap/libdaap.so +lib/rhythmbox/plugins/generic-player/ +lib/rhythmbox/plugins/generic-player/generic-player-ui.xml +lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin +lib/rhythmbox/plugins/generic-player/libgeneric-player.a +lib/rhythmbox/plugins/generic-player/libgeneric-player.la +lib/rhythmbox/plugins/generic-player/libgeneric-player.so +lib/rhythmbox/plugins/iradio/ +lib/rhythmbox/plugins/iradio/iradio-initial.pls +lib/rhythmbox/plugins/iradio/iradio-ui.xml +lib/rhythmbox/plugins/iradio/iradio.rb-plugin +lib/rhythmbox/plugins/iradio/libiradio.a +lib/rhythmbox/plugins/iradio/libiradio.la +lib/rhythmbox/plugins/iradio/libiradio.so +lib/rhythmbox/plugins/iradio/station-properties.glade +lib/rhythmbox/plugins/jamendo/ +lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.py +lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.pyc +lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.pyo +lib/rhythmbox/plugins/jamendo/JamendoSaxHandler.py +lib/rhythmbox/plugins/jamendo/JamendoSaxHandler.pyc +lib/rhythmbox/plugins/jamendo/JamendoSaxHandler.pyo +lib/rhythmbox/plugins/jamendo/JamendoSource.py +lib/rhythmbox/plugins/jamendo/JamendoSource.pyc +lib/rhythmbox/plugins/jamendo/JamendoSource.pyo +lib/rhythmbox/plugins/jamendo/__init__.py +lib/rhythmbox/plugins/jamendo/__init__.pyc +lib/rhythmbox/plugins/jamendo/__init__.pyo +lib/rhythmbox/plugins/jamendo/jamendo-loading.glade +lib/rhythmbox/plugins/jamendo/jamendo-prefs.glade +lib/rhythmbox/plugins/jamendo/jamendo.rb-plugin +lib/rhythmbox/plugins/jamendo/jamendo_logo.png +lib/rhythmbox/plugins/jamendo/jamendo_logo_medium.png +lib/rhythmbox/plugins/lyrics/ +lib/rhythmbox/plugins/lyrics/AstrawebParser.py +lib/rhythmbox/plugins/lyrics/AstrawebParser.pyc +lib/rhythmbox/plugins/lyrics/AstrawebParser.pyo +lib/rhythmbox/plugins/lyrics/LeoslyricsParser.py +lib/rhythmbox/plugins/lyrics/LeoslyricsParser.pyc +lib/rhythmbox/plugins/lyrics/LeoslyricsParser.pyo +lib/rhythmbox/plugins/lyrics/LyrcParser.py +lib/rhythmbox/plugins/lyrics/LyrcParser.pyc +lib/rhythmbox/plugins/lyrics/LyrcParser.pyo +lib/rhythmbox/plugins/lyrics/LyricWikiParser.py +lib/rhythmbox/plugins/lyrics/LyricWikiParser.pyc +lib/rhythmbox/plugins/lyrics/LyricWikiParser.pyo +lib/rhythmbox/plugins/lyrics/LyricsConfigureDialog.py +lib/rhythmbox/plugins/lyrics/LyricsConfigureDialog.pyc +lib/rhythmbox/plugins/lyrics/LyricsConfigureDialog.pyo +lib/rhythmbox/plugins/lyrics/LyricsParse.py +lib/rhythmbox/plugins/lyrics/LyricsParse.pyc +lib/rhythmbox/plugins/lyrics/LyricsParse.pyo +lib/rhythmbox/plugins/lyrics/WinampcnParser.py +lib/rhythmbox/plugins/lyrics/WinampcnParser.pyc +lib/rhythmbox/plugins/lyrics/WinampcnParser.pyo +lib/rhythmbox/plugins/lyrics/__init__.py +lib/rhythmbox/plugins/lyrics/__init__.pyc +lib/rhythmbox/plugins/lyrics/__init__.pyo +lib/rhythmbox/plugins/lyrics/lyrics-prefs.glade +lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin +lib/rhythmbox/plugins/magnatune/ +lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.py +lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.pyc +lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.pyo +lib/rhythmbox/plugins/magnatune/MagnatuneSource.py +lib/rhythmbox/plugins/magnatune/MagnatuneSource.pyc +lib/rhythmbox/plugins/magnatune/MagnatuneSource.pyo +lib/rhythmbox/plugins/magnatune/TrackListHandler.py +lib/rhythmbox/plugins/magnatune/TrackListHandler.pyc +lib/rhythmbox/plugins/magnatune/TrackListHandler.pyo +lib/rhythmbox/plugins/magnatune/__init__.py +lib/rhythmbox/plugins/magnatune/__init__.pyc +lib/rhythmbox/plugins/magnatune/__init__.pyo +lib/rhythmbox/plugins/magnatune/magnatune-loading.glade +lib/rhythmbox/plugins/magnatune/magnatune-prefs.glade +lib/rhythmbox/plugins/magnatune/magnatune-purchase.glade +lib/rhythmbox/plugins/magnatune/magnatune.rb-plugin +lib/rhythmbox/plugins/magnatune/magnatune_logo_color_small.png +lib/rhythmbox/plugins/magnatune/magnatune_logo_color_tiny.png +lib/rhythmbox/plugins/mmkeys/ +lib/rhythmbox/plugins/mmkeys/libmmkeys.a +lib/rhythmbox/plugins/mmkeys/libmmkeys.la +lib/rhythmbox/plugins/mmkeys/libmmkeys.so +lib/rhythmbox/plugins/mmkeys/mmkeys.rb-plugin +lib/rhythmbox/plugins/power-manager/ +lib/rhythmbox/plugins/power-manager/libpower-manager.a +lib/rhythmbox/plugins/power-manager/libpower-manager.la +lib/rhythmbox/plugins/power-manager/libpower-manager.so +lib/rhythmbox/plugins/power-manager/power-manager.rb-plugin +lib/rhythmbox/plugins/python-console/ +lib/rhythmbox/plugins/python-console/pythonconsole.py +lib/rhythmbox/plugins/python-console/pythonconsole.pyc +lib/rhythmbox/plugins/python-console/pythonconsole.pyo +lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin +lib/rhythmbox/plugins/rb/ +lib/rhythmbox/plugins/rb/Coroutine.py +lib/rhythmbox/plugins/rb/Coroutine.pyc +lib/rhythmbox/plugins/rb/Coroutine.pyo +lib/rhythmbox/plugins/rb/Loader.py +lib/rhythmbox/plugins/rb/Loader.pyc +lib/rhythmbox/plugins/rb/Loader.pyo +lib/rhythmbox/plugins/rb/__init__.py +lib/rhythmbox/plugins/rb/__init__.pyc +lib/rhythmbox/plugins/rb/__init__.pyo +lib/rhythmbox/plugins/upnp_coherence/ +lib/rhythmbox/plugins/upnp_coherence/MediaStore.py +lib/rhythmbox/plugins/upnp_coherence/MediaStore.pyc +lib/rhythmbox/plugins/upnp_coherence/MediaStore.pyo +lib/rhythmbox/plugins/upnp_coherence/UpnpSource.py +lib/rhythmbox/plugins/upnp_coherence/UpnpSource.pyc +lib/rhythmbox/plugins/upnp_coherence/UpnpSource.pyo +lib/rhythmbox/plugins/upnp_coherence/__init__.py +lib/rhythmbox/plugins/upnp_coherence/__init__.pyc +lib/rhythmbox/plugins/upnp_coherence/__init__.pyo +lib/rhythmbox/plugins/upnp_coherence/coherence.rb-plugin +lib/rhythmbox/plugins/visualizer/ +lib/rhythmbox/plugins/visualizer/libvisualizer.a +lib/rhythmbox/plugins/visualizer/libvisualizer.la +lib/rhythmbox/plugins/visualizer/libvisualizer.so +lib/rhythmbox/plugins/visualizer/rb-visualizer-glue.h +lib/rhythmbox/plugins/visualizer/visualizer-controls.glade +lib/rhythmbox/plugins/visualizer/visualizer-ui.xml +lib/rhythmbox/plugins/visualizer/visualizer.rb-plugin +libexec/rhythmbox-metadata share/applications/rhythmbox.desktop +share/dbus-1/services/org.gnome.Rhythmbox.service share/gnome/ -share/gnome-2.0/ -share/gnome-2.0/ui/ -share/gnome-2.0/ui/rhythmbox-ui.xml share/gnome/help/ share/gnome/help/rhythmbox/ share/gnome/help/rhythmbox/C/ -share/gnome/help/rhythmbox/C/authors.xml share/gnome/help/rhythmbox/C/fdl-appendix.xml share/gnome/help/rhythmbox/C/figures/ -share/gnome/help/rhythmbox/C/figures/rb-adv.png -share/gnome/help/rhythmbox/C/figures/rb-asst-finish.png -share/gnome/help/rhythmbox/C/figures/rb-asst-library.png -share/gnome/help/rhythmbox/C/figures/rb-asst-start.png -share/gnome/help/rhythmbox/C/figures/rb-basic.png -share/gnome/help/rhythmbox/C/figures/rb-browser.png -share/gnome/help/rhythmbox/C/figures/rb-context-menu.png -share/gnome/help/rhythmbox/C/figures/rb-empty.png -share/gnome/help/rhythmbox/C/figures/rb-full-play.png -share/gnome/help/rhythmbox/C/figures/rb-group-auto.png -share/gnome/help/rhythmbox/C/figures/rb-group-create.png -share/gnome/help/rhythmbox/C/figures/rb-group.png -share/gnome/help/rhythmbox/C/figures/rb-imported.png -share/gnome/help/rhythmbox/C/figures/rb-iradio-add.png -share/gnome/help/rhythmbox/C/figures/rb-iradio.png -share/gnome/help/rhythmbox/C/figures/rb-nextprev.png -share/gnome/help/rhythmbox/C/figures/rb-nobrowse-play.png +share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png share/gnome/help/rhythmbox/C/figures/rb-notification-area-menu.png -share/gnome/help/rhythmbox/C/figures/rb-notification-area.png -share/gnome/help/rhythmbox/C/figures/rb-player.png -share/gnome/help/rhythmbox/C/figures/rb-prefs-general.png -share/gnome/help/rhythmbox/C/figures/rb-prefs-ipod.png -share/gnome/help/rhythmbox/C/figures/rb-prefs-library.png -share/gnome/help/rhythmbox/C/figures/rb-prefs.png -share/gnome/help/rhythmbox/C/figures/rb-repeat.png -share/gnome/help/rhythmbox/C/figures/rb-search.png -share/gnome/help/rhythmbox/C/figures/rb-shuffle.png -share/gnome/help/rhythmbox/C/figures/rb-sidebar.png -share/gnome/help/rhythmbox/C/figures/rb-stats.png +share/gnome/help/rhythmbox/C/figures/rb-notification-window.png +share/gnome/help/rhythmbox/C/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/C/figures/rb-podcast-main.png share/gnome/help/rhythmbox/C/figures/rb-statusbar.png -share/gnome/help/rhythmbox/C/figures/rb-toolbar-editor.png +share/gnome/help/rhythmbox/C/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/C/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/C/figures/rb-toolbar-shuffle.png share/gnome/help/rhythmbox/C/figures/rb-toolbar.png share/gnome/help/rhythmbox/C/figures/rb-volume-changer.png -share/gnome/help/rhythmbox/C/figures/rb-volume-mute.png share/gnome/help/rhythmbox/C/figures/rb-window-small.png share/gnome/help/rhythmbox/C/figures/rb-window.png -share/gnome/help/rhythmbox/C/figures/rhythmbox-group.png -share/gnome/help/rhythmbox/C/figures/rhythmbox-tray-icon.png share/gnome/help/rhythmbox/C/legal.xml -share/gnome/help/rhythmbox/C/quick-reference.xml share/gnome/help/rhythmbox/C/rhythmbox.xml -share/gnome/help/rhythmbox/C/user-guide.xml -share/gnome/help/rhythmbox/ja/ -share/gnome/help/rhythmbox/ja/authors.xml -share/gnome/help/rhythmbox/ja/fdl-appendix.xml -share/gnome/help/rhythmbox/ja/figures/ -share/gnome/help/rhythmbox/ja/figures/rb-adv.png -share/gnome/help/rhythmbox/ja/figures/rb-basic.png -share/gnome/help/rhythmbox/ja/figures/rb-browser.png -share/gnome/help/rhythmbox/ja/figures/rb-context-menu.png -share/gnome/help/rhythmbox/ja/figures/rb-iradio-add.png -share/gnome/help/rhythmbox/ja/figures/rb-iradio.png -share/gnome/help/rhythmbox/ja/figures/rb-nextprev.png -share/gnome/help/rhythmbox/ja/figures/rb-notification-area-menu.png -share/gnome/help/rhythmbox/ja/figures/rb-notification-area.png -share/gnome/help/rhythmbox/ja/figures/rb-player.png -share/gnome/help/rhythmbox/ja/figures/rb-prefs-general.png -share/gnome/help/rhythmbox/ja/figures/rb-prefs-library.png -share/gnome/help/rhythmbox/ja/figures/rb-repeat.png -share/gnome/help/rhythmbox/ja/figures/rb-search.png -share/gnome/help/rhythmbox/ja/figures/rb-shuffle.png -share/gnome/help/rhythmbox/ja/figures/rb-sidebar.png -share/gnome/help/rhythmbox/ja/figures/rb-stats.png -share/gnome/help/rhythmbox/ja/figures/rb-volume-changer.png -share/gnome/help/rhythmbox/ja/figures/rb-window.png -share/gnome/help/rhythmbox/ja/legal.xml -share/gnome/help/rhythmbox/ja/quick-reference.xml -share/gnome/help/rhythmbox/ja/rhythmbox.xml -share/gnome/help/rhythmbox/ja/user-guide.xml -share/idl/ -share/idl/Rhythmbox.idl +share/gnome/help/rhythmbox/de/ +share/gnome/help/rhythmbox/de/figures/ +share/gnome/help/rhythmbox/de/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/de/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/de/figures/rb-notification-window.png +share/gnome/help/rhythmbox/de/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/de/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/de/figures/rb-statusbar.png +share/gnome/help/rhythmbox/de/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/de/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/de/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/de/figures/rb-toolbar.png +share/gnome/help/rhythmbox/de/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/de/figures/rb-window-small.png +share/gnome/help/rhythmbox/de/figures/rb-window.png +share/gnome/help/rhythmbox/de/rhythmbox.xml +share/gnome/help/rhythmbox/el/ +share/gnome/help/rhythmbox/el/figures/ +share/gnome/help/rhythmbox/el/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/el/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/el/figures/rb-notification-window.png +share/gnome/help/rhythmbox/el/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/el/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/el/figures/rb-statusbar.png +share/gnome/help/rhythmbox/el/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/el/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/el/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/el/figures/rb-toolbar.png +share/gnome/help/rhythmbox/el/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/el/figures/rb-window-small.png +share/gnome/help/rhythmbox/el/figures/rb-window.png +share/gnome/help/rhythmbox/el/rhythmbox.xml +share/gnome/help/rhythmbox/es/ +share/gnome/help/rhythmbox/es/figures/ +share/gnome/help/rhythmbox/es/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/es/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/es/figures/rb-notification-window.png +share/gnome/help/rhythmbox/es/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/es/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/es/figures/rb-statusbar.png +share/gnome/help/rhythmbox/es/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/es/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/es/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/es/figures/rb-toolbar.png +share/gnome/help/rhythmbox/es/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/es/figures/rb-window-small.png +share/gnome/help/rhythmbox/es/figures/rb-window.png +share/gnome/help/rhythmbox/es/rhythmbox.xml +share/gnome/help/rhythmbox/fr/ +share/gnome/help/rhythmbox/fr/figures/ +share/gnome/help/rhythmbox/fr/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/fr/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/fr/figures/rb-notification-window.png +share/gnome/help/rhythmbox/fr/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/fr/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/fr/figures/rb-statusbar.png +share/gnome/help/rhythmbox/fr/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/fr/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/fr/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/fr/figures/rb-toolbar.png +share/gnome/help/rhythmbox/fr/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/fr/figures/rb-window-small.png +share/gnome/help/rhythmbox/fr/figures/rb-window.png +share/gnome/help/rhythmbox/fr/rhythmbox.xml +share/gnome/help/rhythmbox/it/ +share/gnome/help/rhythmbox/it/figures/ +share/gnome/help/rhythmbox/it/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/it/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/it/figures/rb-notification-window.png +share/gnome/help/rhythmbox/it/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/it/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/it/figures/rb-statusbar.png +share/gnome/help/rhythmbox/it/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/it/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/it/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/it/figures/rb-toolbar.png +share/gnome/help/rhythmbox/it/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/it/figures/rb-window-small.png +share/gnome/help/rhythmbox/it/figures/rb-window.png +share/gnome/help/rhythmbox/it/rhythmbox.xml +share/gnome/help/rhythmbox/oc/ +share/gnome/help/rhythmbox/oc/figures/ +share/gnome/help/rhythmbox/oc/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/oc/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/oc/figures/rb-notification-window.png +share/gnome/help/rhythmbox/oc/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/oc/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/oc/figures/rb-statusbar.png +share/gnome/help/rhythmbox/oc/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/oc/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/oc/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/oc/figures/rb-toolbar.png +share/gnome/help/rhythmbox/oc/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/oc/figures/rb-window-small.png +share/gnome/help/rhythmbox/oc/figures/rb-window.png +share/gnome/help/rhythmbox/oc/rhythmbox.xml +share/gnome/help/rhythmbox/ru/ +share/gnome/help/rhythmbox/ru/figures/ +share/gnome/help/rhythmbox/ru/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/ru/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/ru/figures/rb-notification-window.png +share/gnome/help/rhythmbox/ru/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/ru/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/ru/figures/rb-statusbar.png +share/gnome/help/rhythmbox/ru/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/ru/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/ru/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/ru/figures/rb-toolbar.png +share/gnome/help/rhythmbox/ru/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/ru/figures/rb-window-small.png +share/gnome/help/rhythmbox/ru/figures/rb-window.png +share/gnome/help/rhythmbox/ru/rhythmbox.xml +share/gnome/help/rhythmbox/sv/ +share/gnome/help/rhythmbox/sv/figures/ +share/gnome/help/rhythmbox/sv/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/sv/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/sv/figures/rb-notification-window.png +share/gnome/help/rhythmbox/sv/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/sv/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/sv/figures/rb-statusbar.png +share/gnome/help/rhythmbox/sv/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/sv/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/sv/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/sv/figures/rb-toolbar.png +share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/sv/figures/rb-window-small.png +share/gnome/help/rhythmbox/sv/figures/rb-window.png +share/gnome/help/rhythmbox/sv/rhythmbox.xml +share/gnome/help/rhythmbox/zh_CN/ +share/gnome/help/rhythmbox/zh_CN/figures/ +share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-area-menu.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-window.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-zone.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-podcast-main.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-statusbar.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-prevplaynext.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-repeat.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-shuffle.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png +share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png +share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml +share/gtk-doc/html/rhythmbox/ +share/gtk-doc/html/rhythmbox/ch01.html +share/gtk-doc/html/rhythmbox/ch02.html +share/gtk-doc/html/rhythmbox/ch03.html +share/gtk-doc/html/rhythmbox/ch04.html +share/gtk-doc/html/rhythmbox/ch05.html +share/gtk-doc/html/rhythmbox/ch06.html +share/gtk-doc/html/rhythmbox/ch07.html +share/gtk-doc/html/rhythmbox/home.png +share/gtk-doc/html/rhythmbox/index.html +share/gtk-doc/html/rhythmbox/index.sgml +share/gtk-doc/html/rhythmbox/left.png +share/gtk-doc/html/rhythmbox/rhythmbox-RBCellRendererPixbuf.html +share/gtk-doc/html/rhythmbox/rhythmbox-RBSource.html +share/gtk-doc/html/rhythmbox/rhythmbox-eel-gconf-extensions.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-cell-renderer-rating.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-debug.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-dialog.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-druid.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-entry-view.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-enums.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-file-helpers.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-glade-helpers.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-header.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-history.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-library-source.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-metadata.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-linear-loop.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-linear.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-by-age-and-rating.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-by-age.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-by-rating.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-equal-weights.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-shuffle.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-player.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-playlist-manager.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-playlist-source-recorder.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-playlist-source.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-preferences.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-property-view.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-query-creator.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-rating-helper.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-rating.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-search-entry.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell-clipboard.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell-player.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell-preferences.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-song-display-box.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-song-info.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-source-header.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-sourcelist-model.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-sourcelist.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-statusbar.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-stock-icons.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-string-helpers.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-tray-icon.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-tree-dnd.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-tree-model-sort.html +share/gtk-doc/html/rhythmbox/rhythmbox-rb-util.html +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb-property-model.html +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb-query-model.html +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb-tree.html +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb.html +share/gtk-doc/html/rhythmbox/rhythmbox.devhelp +share/gtk-doc/html/rhythmbox/rhythmbox.devhelp2 +share/gtk-doc/html/rhythmbox/right.png +share/gtk-doc/html/rhythmbox/style.css +share/gtk-doc/html/rhythmbox/up.png +share/icons/hicolor/16x16/apps/rhythmbox.png +share/icons/hicolor/22x22/apps/rhythmbox.png +share/icons/hicolor/32x32/apps/rhythmbox.png +share/icons/hicolor/48x48/apps/rhythmbox.png +share/icons/hicolor/scalable/apps/rhythmbox.svg share/locale/am/LC_MESSAGES/rhythmbox.mo -share/locale/ar/ -share/locale/ar/LC_MESSAGES/ share/locale/ar/LC_MESSAGES/rhythmbox.mo share/locale/az/LC_MESSAGES/rhythmbox.mo share/locale/be/LC_MESSAGES/rhythmbox.mo +share/locale/be@latin/LC_MESSAGES/rhythmbox.mo share/locale/bg/LC_MESSAGES/rhythmbox.mo share/locale/ca/LC_MESSAGES/rhythmbox.mo share/locale/cs/LC_MESSAGES/rhythmbox.mo -share/locale/cy/ -share/locale/cy/LC_MESSAGES/ share/locale/cy/LC_MESSAGES/rhythmbox.mo share/locale/da/LC_MESSAGES/rhythmbox.mo share/locale/de/LC_MESSAGES/rhythmbox.mo +share/locale/dz/LC_MESSAGES/rhythmbox.mo share/locale/el/LC_MESSAGES/rhythmbox.mo -share/locale/en_CA/ -share/locale/en_CA/LC_MESSAGES/ share/locale/en_CA/LC_MESSAGES/rhythmbox.mo -share/locale/en_GB/ -share/locale/en_GB/LC_MESSAGES/ share/locale/en_GB/LC_MESSAGES/rhythmbox.mo share/locale/es/LC_MESSAGES/rhythmbox.mo share/locale/et/LC_MESSAGES/rhythmbox.mo -share/locale/eu/ -share/locale/eu/LC_MESSAGES/ share/locale/eu/LC_MESSAGES/rhythmbox.mo share/locale/fi/LC_MESSAGES/rhythmbox.mo share/locale/fr/LC_MESSAGES/rhythmbox.mo share/locale/ga/LC_MESSAGES/rhythmbox.mo +share/locale/gl/LC_MESSAGES/rhythmbox.mo share/locale/he/LC_MESSAGES/rhythmbox.mo +share/locale/hi/LC_MESSAGES/rhythmbox.mo share/locale/hr/LC_MESSAGES/rhythmbox.mo share/locale/hu/LC_MESSAGES/rhythmbox.mo share/locale/id/LC_MESSAGES/rhythmbox.mo -share/locale/is/ -share/locale/is/LC_MESSAGES/ share/locale/is/LC_MESSAGES/rhythmbox.mo share/locale/it/LC_MESSAGES/rhythmbox.mo share/locale/ja/LC_MESSAGES/rhythmbox.mo share/locale/ko/LC_MESSAGES/rhythmbox.mo -share/locale/lt/ -share/locale/lt/LC_MESSAGES/ share/locale/lt/LC_MESSAGES/rhythmbox.mo share/locale/lv/LC_MESSAGES/rhythmbox.mo -share/locale/mn/ -share/locale/mn/LC_MESSAGES/ +share/locale/mk/LC_MESSAGES/rhythmbox.mo +share/locale/ml/LC_MESSAGES/rhythmbox.mo share/locale/mn/LC_MESSAGES/rhythmbox.mo -share/locale/ms/ -share/locale/ms/LC_MESSAGES/ share/locale/ms/LC_MESSAGES/rhythmbox.mo share/locale/nb/LC_MESSAGES/rhythmbox.mo +share/locale/ne/LC_MESSAGES/rhythmbox.mo share/locale/nl/LC_MESSAGES/rhythmbox.mo -share/locale/no/LC_MESSAGES/rhythmbox.mo -share/locale/pa/ -share/locale/pa/LC_MESSAGES/ +share/locale/oc/LC_MESSAGES/rhythmbox.mo share/locale/pa/LC_MESSAGES/rhythmbox.mo share/locale/pl/LC_MESSAGES/rhythmbox.mo share/locale/pt/LC_MESSAGES/rhythmbox.mo share/locale/pt_BR/LC_MESSAGES/rhythmbox.mo share/locale/ro/LC_MESSAGES/rhythmbox.mo share/locale/ru/LC_MESSAGES/rhythmbox.mo +share/locale/rw/LC_MESSAGES/rhythmbox.mo share/locale/sk/LC_MESSAGES/rhythmbox.mo share/locale/sr/LC_MESSAGES/rhythmbox.mo share/locale/sr@Latn/LC_MESSAGES/rhythmbox.mo share/locale/sv/LC_MESSAGES/rhythmbox.mo +share/locale/th/LC_MESSAGES/rhythmbox.mo share/locale/tr/LC_MESSAGES/rhythmbox.mo share/locale/uk/LC_MESSAGES/rhythmbox.mo share/locale/vi/LC_MESSAGES/rhythmbox.mo share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo +share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo -share/mime-info/ -share/mime-info/rhythmbox.keys share/omf/rhythmbox/ share/omf/rhythmbox/rhythmbox-C.omf -share/omf/rhythmbox/rhythmbox-ja.omf -share/pixmaps/ -share/pixmaps/rhythmbox.png +share/omf/rhythmbox/rhythmbox-de.omf +share/omf/rhythmbox/rhythmbox-el.omf +share/omf/rhythmbox/rhythmbox-es.omf +share/omf/rhythmbox/rhythmbox-fr.omf +share/omf/rhythmbox/rhythmbox-it.omf +share/omf/rhythmbox/rhythmbox-oc.omf +share/omf/rhythmbox/rhythmbox-ru.omf +share/omf/rhythmbox/rhythmbox-sv.omf +share/omf/rhythmbox/rhythmbox-zh_CN.omf share/rhythmbox/ -share/rhythmbox/art/ -share/rhythmbox/art/about-logo.png -share/rhythmbox/art/rhythmbox-album.png -share/rhythmbox/art/rhythmbox-audiocd.png -share/rhythmbox/art/rhythmbox-automatic-playlist.png -share/rhythmbox/art/rhythmbox-dnd.png -share/rhythmbox/art/rhythmbox-ipod.png -share/rhythmbox/art/rhythmbox-iradio.png -share/rhythmbox/art/rhythmbox-library.png -share/rhythmbox/art/rhythmbox-next.png -share/rhythmbox/art/rhythmbox-no-star.png -share/rhythmbox/art/rhythmbox-pause.png -share/rhythmbox/art/rhythmbox-paused.png -share/rhythmbox/art/rhythmbox-play.png -share/rhythmbox/art/rhythmbox-playing.png -share/rhythmbox/art/rhythmbox-playlist-menu.png -share/rhythmbox/art/rhythmbox-playlist.png -share/rhythmbox/art/rhythmbox-previous.png -share/rhythmbox/art/rhythmbox-repeat.png -share/rhythmbox/art/rhythmbox-rewind.png -share/rhythmbox/art/rhythmbox-set-star.png -share/rhythmbox/art/rhythmbox-shuffle.png -share/rhythmbox/art/rhythmbox-stop.png -share/rhythmbox/art/rhythmbox-tray-icon.png -share/rhythmbox/art/rhythmbox-unset-star.png -share/rhythmbox/art/rhythmbox-visuals.png -share/rhythmbox/art/rhythmbox-volume-max.png -share/rhythmbox/art/rhythmbox-volume-medium.png -share/rhythmbox/art/rhythmbox-volume-min.png -share/rhythmbox/art/rhythmbox-volume-mute.png -share/rhythmbox/art/rhythmbox-volume-zero.png share/rhythmbox/glade/ share/rhythmbox/glade/create-playlist.glade -share/rhythmbox/glade/druid.glade share/rhythmbox/glade/general-prefs.glade share/rhythmbox/glade/library-prefs.glade -share/rhythmbox/glade/load-failure.glade +share/rhythmbox/glade/playback-prefs.glade +share/rhythmbox/glade/playlist-save.glade +share/rhythmbox/glade/plugins.glade +share/rhythmbox/glade/podcast-feed-properties.glade +share/rhythmbox/glade/podcast-prefs.glade +share/rhythmbox/glade/podcast-properties.glade share/rhythmbox/glade/song-info-multiple.glade share/rhythmbox/glade/song-info.glade -share/rhythmbox/glade/station-new.glade -share/rhythmbox/glade/station-properties.glade +share/rhythmbox/glade/uri-new.glade share/rhythmbox/glade/uri.glade -share/rhythmbox/iradio-initial.pls -@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/rhythmbox/*.schemas > /dev/null -share/schemas/ +share/rhythmbox/icons/ +share/rhythmbox/icons/hicolor/ +share/rhythmbox/icons/hicolor/16x16/ +share/rhythmbox/icons/hicolor/16x16/actions/ +share/rhythmbox/icons/hicolor/16x16/actions/internet-radio-new.png +share/rhythmbox/icons/hicolor/16x16/actions/media-eject.png +share/rhythmbox/icons/hicolor/16x16/actions/playlist-automatic-new.png +share/rhythmbox/icons/hicolor/16x16/actions/playlist-new.png +share/rhythmbox/icons/hicolor/16x16/actions/podcast-new.png +share/rhythmbox/icons/hicolor/16x16/places/ +share/rhythmbox/icons/hicolor/16x16/places/library-internet-radio.png +share/rhythmbox/icons/hicolor/16x16/places/library-podcast.png +share/rhythmbox/icons/hicolor/16x16/places/playlist-automatic.png +share/rhythmbox/icons/hicolor/16x16/places/playlist.png +share/rhythmbox/icons/hicolor/16x16/status/ +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-no-star.png +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-notplaying.png +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-set-star.png +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-unset-star.png +share/rhythmbox/icons/hicolor/22x22/ +share/rhythmbox/icons/hicolor/22x22/actions/ +share/rhythmbox/icons/hicolor/22x22/actions/internet-radio-new.png +share/rhythmbox/icons/hicolor/22x22/actions/playlist-automatic-new.png +share/rhythmbox/icons/hicolor/22x22/actions/playlist-new.png +share/rhythmbox/icons/hicolor/22x22/actions/podcast-new.png +share/rhythmbox/icons/hicolor/22x22/actions/visualization.png +share/rhythmbox/icons/hicolor/22x22/places/ +share/rhythmbox/icons/hicolor/22x22/places/library-internet-radio.png +share/rhythmbox/icons/hicolor/22x22/places/library-podcast.png +share/rhythmbox/icons/hicolor/22x22/places/playlist-automatic.png +share/rhythmbox/icons/hicolor/22x22/places/playlist.png +share/rhythmbox/icons/hicolor/22x22/status/ +share/rhythmbox/icons/hicolor/22x22/status/rhythmbox-notplaying.png +share/rhythmbox/icons/hicolor/24x24/ +share/rhythmbox/icons/hicolor/24x24/places/ +share/rhythmbox/icons/hicolor/24x24/places/jamendo.png +share/rhythmbox/icons/hicolor/24x24/places/magnatune.png +share/rhythmbox/icons/hicolor/32x32/ +share/rhythmbox/icons/hicolor/32x32/actions/ +share/rhythmbox/icons/hicolor/32x32/actions/internet-radio-new.png +share/rhythmbox/icons/hicolor/32x32/actions/playlist-automatic-new.png +share/rhythmbox/icons/hicolor/32x32/actions/playlist-new.png +share/rhythmbox/icons/hicolor/32x32/places/ +share/rhythmbox/icons/hicolor/32x32/places/library-internet-radio.png +share/rhythmbox/icons/hicolor/32x32/places/playlist-automatic.png +share/rhythmbox/icons/hicolor/32x32/places/playlist.png +share/rhythmbox/icons/hicolor/32x32/status/ +share/rhythmbox/icons/hicolor/32x32/status/rhythmbox-notplaying.png +share/rhythmbox/icons/hicolor/scalable/ +share/rhythmbox/icons/hicolor/scalable/actions/ +share/rhythmbox/icons/hicolor/scalable/actions/internet-radio-new.svg +share/rhythmbox/icons/hicolor/scalable/actions/playlist-automatic-new.svg +share/rhythmbox/icons/hicolor/scalable/actions/playlist-new.svg +share/rhythmbox/icons/hicolor/scalable/places/ +share/rhythmbox/icons/hicolor/scalable/places/library-internet-radio.svg +share/rhythmbox/icons/hicolor/scalable/places/playlist-automatic.svg +share/rhythmbox/icons/hicolor/scalable/places/playlist.svg +share/rhythmbox/icons/hicolor/scalable/status/ +share/rhythmbox/icons/hicolor/scalable/status/rhythmbox-notplaying.svg +share/rhythmbox/playlists.xml +share/rhythmbox/rhythmbox-ui.xml share/schemas/rhythmbox/ share/schemas/rhythmbox/rhythmbox.schemas -@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/rhythmbox/*.schemas > /dev/null -@exec %D/bin/scrollkeeper-update -q -@unexec %D/bin/scrollkeeper-update -q -@exec %D/bin/update-desktop-database -@unexec %D/bin/update-desktop-database -%%SHARED%% |
|
|
Re: [update] Gstreamer-0.10 & RhythmboxOn Sat, Mar 15, 2008 at 08:11:04PM +0100, OUSADOU Azwaw wrote:
> Hi all, > > I have updated rhythmbox and gstreamer. It's works in i386. Rhythmbox require > totem-pl-parser & libmusicbrainz to build. > > Thanks, > BSDManiak hi, thanks for these updates, i will look into these diffs/ports very soon as i'm working on gnome 2.22 atm. cheers, jasper > diff -urN multimedia/gstreamer-0.10/Makefile.inc mystuff/multimedia/gstreamer-0.10/Makefile.inc > --- multimedia/gstreamer-0.10/Makefile.inc Wed Jan 10 00:22:56 2007 > +++ mystuff/multimedia/gstreamer-0.10/Makefile.inc Fri Mar 14 15:17:46 2008 > @@ -1,4 +1,4 @@ > -# $OpenBSD: Makefile.inc,v 1.3 2007/01/09 23:22:56 espie Exp $ > +#$OpenBSD: Makefile.inc,v 1.3 2007/01/09 23:22:56 espie Exp $ > > CATEGORIES?= multimedia devel > > @@ -21,11 +21,12 @@ > USE_LIBTOOL?= Yes > LIBTOOL_FLAGS?= --tag=disable-static > > -MODULES+= lang/python > +MODULES+= lang/python \ > + devel/gettext > > BUILD_DEPENDS+= :bison-*:devel/bison > > -AUTOCONF_VERSION?= 2.60 > +AUTOCONF_VERSION= 2.61 > CONFIGURE_STYLE?= autoconf > > CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ > @@ -33,7 +34,6 @@ > --with-cachedir=/var/db/gstreamer-${VERSION} \ > --disable-debug \ > --disable-valgrind \ > - --disable-static \ > # --enable-gtk-doc > > CONFIGURE_ENV+= CPPFLAGS="-I${LOCALBASE}/include \ > diff -urN multimedia/gstreamer-0.10/core/Makefile mystuff/multimedia/gstreamer-0.10/core/Makefile > --- multimedia/gstreamer-0.10/core/Makefile Mon Oct 8 10:22:41 2007 > +++ mystuff/multimedia/gstreamer-0.10/core/Makefile Fri Mar 14 15:18:30 2008 > @@ -3,10 +3,10 @@ > COMMENT-main= streaming media framework - core > COMMENT-frontend= streaming media framework - frontend commands > > -V= 0.10.12 > +V= 0.10.17 > > -PKGNAME-main= gstreamer-$Vp0 > -PKGNAME-frontend= gstreamer-frontend-$Vp0 > +PKGNAME-main= gstreamer-$V > +PKGNAME-frontend= gstreamer-frontend-$V > > DISTNAME= gstreamer-$V > > @@ -19,12 +19,14 @@ > MASTER_SITES= ${MASTER_SITE_GST:=gstreamer/} > > MULTI_PACKAGES= -main -frontend > -WANTLIB= c m pthread z > -MODULES= devel/gettext > +WANTLIB= c pcre iconv > +WANTLIB-main= ${WANTLIB} m pthread z > +WANTLIB-frontend= ${WANTLIB} > > -LIB_DEPENDS= glib-2.0.>=200.0,gmodule-2.0.>=200.0,gobject-2.0.>=200.0,gthread-2.0.>=200.0::devel/glib2 \ > - xml2.>=6::textproc/libxml > - > -CONFIGURE_ARGS= --disable-gst-debug > +LIB_DEPENDS= glib-2.0.>=200.0::devel/glib2 > +LIB_DEPENDS-main= gmodule-2.0.>=200.0,gobject-2.0.>=200.0,gthread-2.0.>=200.0::devel/glib2 \ > + xml2.>=6::textproc/libxml \ > + ${LIB_DEPENDS} > +LIB_DEPENDS-frontend= ${LIB_DEPENDS} > > .include <bsd.port.mk> > diff -urN multimedia/gstreamer-0.10/core/distinfo mystuff/multimedia/gstreamer-0.10/core/distinfo > --- multimedia/gstreamer-0.10/core/distinfo Thu Apr 5 18:20:06 2007 > +++ mystuff/multimedia/gstreamer-0.10/core/distinfo Sun Mar 9 15:36:36 2008 > @@ -1,5 +1,5 @@ > -MD5 (gstreamer-0.10.12.tar.bz2) = 060bXyZasb1pVAX+omMXpA== > -RMD160 (gstreamer-0.10.12.tar.bz2) = cTCULTzByNoZplle1LaxlGDGSz8= > -SHA1 (gstreamer-0.10.12.tar.bz2) = fj63zQzAb0niQRD4oBG3OAFK5G0= > -SHA256 (gstreamer-0.10.12.tar.bz2) = zZedD1AJaEk2VtNUmDCw5GoKEI6WS1bJA2AnnogExuk= > -SIZE (gstreamer-0.10.12.tar.bz2) = 1841766 > +MD5 (gstreamer-0.10.17.tar.bz2) = MjJBbqb86rYoI21np9CkSg== > +RMD160 (gstreamer-0.10.17.tar.bz2) = A3m+Dk37Sw5TXDCT4QuNAqktD68= > +SHA1 (gstreamer-0.10.17.tar.bz2) = xjIDSwnLUNmphjAgkdIHxKy2Mhg= > +SHA256 (gstreamer-0.10.17.tar.bz2) = RChi3JPnNKpY8TvPORTcekDT+ijwriFSyARXQ43DVpw= > +SIZE (gstreamer-0.10.17.tar.bz2) = 2167909 > diff -urN multimedia/gstreamer-0.10/core/patches/CVS/Entries mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Entries > --- multimedia/gstreamer-0.10/core/patches/CVS/Entries Thu Mar 6 12:01:42 2008 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Entries Thu Jan 1 01:00:00 1970 > @@ -1,4 +0,0 @@ > -/patch-common_m4_as-libtool_m4/1.1/Mon Jan 8 17:39:53 2007// > -/patch-common_m4_as-python_m4/1.1/Mon Jan 8 17:39:53 2007// > -/patch-common_m4_gettext_m4/1.2/Sat Mar 17 21:35:31 2007// > -D > diff -urN multimedia/gstreamer-0.10/core/patches/CVS/Repository mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Repository > --- multimedia/gstreamer-0.10/core/patches/CVS/Repository Thu Mar 6 12:01:42 2008 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Repository Thu Jan 1 01:00:00 1970 > @@ -1 +0,0 @@ > -ports/multimedia/gstreamer-0.10/core/patches > diff -urN multimedia/gstreamer-0.10/core/patches/CVS/Root mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Root > --- multimedia/gstreamer-0.10/core/patches/CVS/Root Thu Mar 6 12:01:42 2008 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/CVS/Root Thu Jan 1 01:00:00 1970 > @@ -1 +0,0 @@ > -/cvs > diff -urN multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 > --- multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 Mon Jan 8 18:39:53 2007 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_as-libtool_m4 Thu Jan 1 01:00:00 1970 > @@ -1,14 +0,0 @@ > -$OpenBSD: patch-common_m4_as-libtool_m4,v 1.1 2007/01/08 17:39:53 espie Exp $ > ---- common/m4/as-libtool.m4.orig Mon Jan 8 13:57:26 2007 > -+++ common/m4/as-libtool.m4 Mon Jan 8 13:57:31 2007 > -@@ -35,10 +35,6 @@ AC_DEFUN([AS_LIBTOOL], > - AC_SUBST([$1]_LIBVERSION) > - > - [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -version-info $[$1]_LIBVERSION" > -- if test ! -z "[$5]" > -- then > -- [$1]_LT_LDFLAGS="$[$1]_LT_LDFLAGS -release [$5]" > -- fi > - AC_SUBST([$1]_LT_LDFLAGS) > - > - AC_LIBTOOL_DLOPEN > diff -urN multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 > --- multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 Sat Mar 17 22:35:31 2007 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-common_m4_gettext_m4 Thu Jan 1 01:00:00 1970 > @@ -1,17 +0,0 @@ > -$OpenBSD: patch-common_m4_gettext_m4,v 1.2 2007/03/17 21:35:31 espie Exp $ > ---- common/m4/gettext.m4.orig Thu Nov 30 23:25:12 2006 > -+++ common/m4/gettext.m4 Sat Mar 17 11:59:13 2007 > -@@ -315,8 +315,12 @@ return (int) gettext ("")]ifelse([$2], [need-ngettext] > - ]) > - > - dnl For backward compatibility. Some Makefiles may be using this. > -- INTLLIBS="$LIBINTL" > -+ INTLLIBS="$LTLIBINTL" > - AC_SUBST(INTLLIBS) > -+ > -+ dnl Let's cheat > -+ LIBICONV="$LTLIBICONV" > -+ LIBINTL="$LTLIBINTL" > - > - dnl Make all documented variables known to autoconf. > - AC_SUBST(LIBINTL) > diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in > --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_controller_Makefile_in Sun Mar 9 17:27:26 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- tests/examples/controller/Makefile.in.orig Wed Jan 30 14:04:51 2008 > ++++ tests/examples/controller/Makefile.in Sun Mar 9 17:27:23 2008 > +@@ -92,7 +92,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ > + $(AM_CFLAGS) $(CFLAGS) > + CCLD = $(CC) > + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ > ++ -L$(top_builddir)/libs/gst/controller/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ > + SOURCES = audio-example.c > + DIST_SOURCES = audio-example.c > + ETAGS = etags > diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in > --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_manual_Makefile_in Sun Mar 9 17:29:52 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- tests/examples/manual/Makefile.in.orig Sun Mar 9 17:29:13 2008 > ++++ tests/examples/manual/Makefile.in Sun Mar 9 17:29:48 2008 > +@@ -166,7 +166,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ > + $(AM_CFLAGS) $(CFLAGS) > + CCLD = $(CC) > + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ > ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ > + SOURCES = bin.c decodebin.c dynamic.c elementcreate.c elementfactory.c \ > + elementget.c elementlink.c elementmake.c fakesrc.c ghostpad.c \ > + helloworld.c init.c pad.c playbin.c query.c typefind.c \ > diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in > --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_metadata_Makefile_in Sun Mar 9 17:32:25 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- tests/examples/metadata/Makefile.in.orig Sun Mar 9 17:31:24 2008 > ++++ tests/examples/metadata/Makefile.in Sun Mar 9 17:32:22 2008 > +@@ -92,7 +92,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ > + $(AM_CFLAGS) $(CFLAGS) > + CCLD = $(CC) > + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ > ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ > + SOURCES = read-metadata.c > + DIST_SOURCES = read-metadata.c > + ETAGS = etags > diff -urN multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in > --- multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tests_examples_xml_Makefile_in Sun Mar 9 17:33:58 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- tests/examples/xml/Makefile.in.orig Sun Mar 9 17:33:20 2008 > ++++ tests/examples/xml/Makefile.in Sun Mar 9 17:33:52 2008 > +@@ -95,7 +95,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ > + $(AM_CFLAGS) $(CFLAGS) > + CCLD = $(CC) > + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ > ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ > + SOURCES = createxml.c runxml.c > + DIST_SOURCES = createxml.c runxml.c > + ETAGS = etags > diff -urN multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in mystuff/multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in > --- multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/core/patches/patch-tools_Makefile_in Sun Mar 9 17:11:48 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- tools/Makefile.in.orig Sun Mar 9 17:04:33 2008 > ++++ tools/Makefile.in Sun Mar 9 17:06:00 2008 > +@@ -167,7 +167,7 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $ > + $(AM_CFLAGS) $(CFLAGS) > + CCLD = $(CC) > + LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \ > +- $(AM_LDFLAGS) $(LDFLAGS) -o $@ > ++ -L$(top_builddir)/gst/.libs $(AM_LDFLAGS) $(LDFLAGS) -o $@ > + SOURCES = $(gst_feedback_SOURCES) $(gst_inspect_SOURCES) \ > + $(gst_inspect_@GST_MAJORMINOR@_SOURCES) $(gst_launch_SOURCES) \ > + $(gst_launch_@GST_MAJORMINOR@_SOURCES) $(gst_typefind_SOURCES) \ > diff -urN multimedia/gstreamer-0.10/core/pkg/PLIST-frontend mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-frontend > --- multimedia/gstreamer-0.10/core/pkg/PLIST-frontend Mon Jan 8 18:39:53 2007 > +++ mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-frontend Sun Mar 9 15:02:16 2008 > @@ -4,4 +4,3 @@ > bin/gst-launch > bin/gst-typefind > bin/gst-xmlinspect > -bin/gst-xmllaunch > diff -urN multimedia/gstreamer-0.10/core/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-main > --- multimedia/gstreamer-0.10/core/pkg/PLIST-main Tue Jan 9 21:00:23 2007 > +++ mystuff/multimedia/gstreamer-0.10/core/pkg/PLIST-main Sun Mar 9 17:36:06 2008 > @@ -6,6 +6,7 @@ > bin/gst-launch-${VERSION} > bin/gst-typefind-${VERSION} > bin/gst-xmlinspect-${VERSION} > +bin/gst-xmllaunch > bin/gst-xmllaunch-${VERSION} > include/gstreamer-${VERSION}/ > include/gstreamer-${VERSION}/gst/ > @@ -20,6 +21,9 @@ > include/gstreamer-${VERSION}/gst/base/gsttypefindhelper.h > include/gstreamer-${VERSION}/gst/controller/ > include/gstreamer-${VERSION}/gst/controller/gstcontroller.h > +include/gstreamer-${VERSION}/gst/controller/gstcontrolsource.h > +include/gstreamer-${VERSION}/gst/controller/gstinterpolationcontrolsource.h > +include/gstreamer-${VERSION}/gst/controller/gstlfocontrolsource.h > include/gstreamer-${VERSION}/gst/dataprotocol/ > include/gstreamer-${VERSION}/gst/dataprotocol/dataprotocol.h > include/gstreamer-${VERSION}/gst/glib-compat.h > @@ -32,6 +36,7 @@ > include/gstreamer-${VERSION}/gst/gstclock.h > include/gstreamer-${VERSION}/gst/gstcompat.h > include/gstreamer-${VERSION}/gst/gstconfig.h > +include/gstreamer-${VERSION}/gst/gstdebugutils.h > include/gstreamer-${VERSION}/gst/gstelement.h > include/gstreamer-${VERSION}/gst/gstelementfactory.h > include/gstreamer-${VERSION}/gst/gstenumtypes.h > @@ -52,6 +57,7 @@ > include/gstreamer-${VERSION}/gst/gstobject.h > include/gstreamer-${VERSION}/gst/gstpad.h > include/gstreamer-${VERSION}/gst/gstpadtemplate.h > +include/gstreamer-${VERSION}/gst/gstparamspecs.h > include/gstreamer-${VERSION}/gst/gstparse.h > include/gstreamer-${VERSION}/gst/gstpipeline.h > include/gstreamer-${VERSION}/gst/gstplugin.h > @@ -104,20 +110,33 @@ > @man man/man1/gst-xmlinspect-${VERSION}.1 > @man man/man1/gst-xmllaunch-${VERSION}.1 > share/aclocal/gst-element-check-${VERSION}.m4 > +share/gtk-doc/ > +share/gtk-doc/html/ > +share/gtk-doc/html/gstreamer-${VERSION}/ > +share/gtk-doc/html/gstreamer-libs-${VERSION}/ > +share/gtk-doc/html/gstreamer-plugins-${VERSION}/ > share/locale/af/ > share/locale/af/LC_MESSAGES/ > share/locale/af/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/az/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/be/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/bg/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/ca/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/cs/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/da/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/de/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/en_GB/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/es/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/fi/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/fr/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/hu/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/it/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/nb/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/nl/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/pl/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/ru/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/rw/LC_MESSAGES/gstreamer-${VERSION}.mo > +share/locale/sk/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/sq/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/sr/LC_MESSAGES/gstreamer-${VERSION}.mo > share/locale/sv/LC_MESSAGES/gstreamer-${VERSION}.mo > diff -urN multimedia/gstreamer-0.10/ffmpeg/Makefile mystuff/multimedia/gstreamer-0.10/ffmpeg/Makefile > --- multimedia/gstreamer-0.10/ffmpeg/Makefile Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/Makefile Fri Mar 14 17:05:00 2008 > @@ -0,0 +1,19 @@ > +# $OpenBSD: Makefile,v 1.1.1.1 2008/01/22 08:53:41 ajacoutot Exp $ > + > +COMMENT= ffmpeg plugin for gstreamer > + > +V= 0.10.3 > +DISTNAME= gst-ffmpeg-$V > +PKGNAME= gstreamer-ffmpeg-$V > + > +HOMEPAGE= http://gstreamer.freedesktop.org/modules/gst-ffmpeg.html > + > +MASTER_SITES= ${MASTER_SITE_GST:=gst-ffmpeg/} > + > +WANTLIB+= m z glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ > + pcre xml2 > +LIB_DEPENDS+= gstreamer-0.10,gstbase-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ > + gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base \ > + oil-0.3::devel/liboil > + > +.include <bsd.port.mk> > diff -urN multimedia/gstreamer-0.10/ffmpeg/distinfo mystuff/multimedia/gstreamer-0.10/ffmpeg/distinfo > --- multimedia/gstreamer-0.10/ffmpeg/distinfo Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/distinfo Fri Mar 14 15:20:35 2008 > @@ -0,0 +1,5 @@ > +MD5 (gst-ffmpeg-0.10.3.tar.bz2) = wH/S2gg1mJ/E6uKRy8BfCQ== > +RMD160 (gst-ffmpeg-0.10.3.tar.bz2) = ClbiyJb7FNAAxzTHW9X2SjWi78M= > +SHA1 (gst-ffmpeg-0.10.3.tar.bz2) = 3UDMOPdYFBLl4j0r9AHMZsm6H1U= > +SHA256 (gst-ffmpeg-0.10.3.tar.bz2) = uFiZrBx5LbLhLXBjxFwMZjjcjMI006xnhrc5zGSGQ58= > +SIZE (gst-ffmpeg-0.10.3.tar.bz2) = 2529034 > diff -urN multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 mystuff/multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 > --- multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/patches/patch-common_m4_as-python_m4 Fri Mar 14 15:30:58 2008 > @@ -0,0 +1,13 @@ > +$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 16:16:19 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)], > + [ > diff -urN multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR > --- multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/DESCR Fri Mar 14 15:49:48 2008 > @@ -0,0 +1,3 @@ > +GStreamer FFmpeg plug-in contains one plugin with a set of elements > +using the FFmpeg library code. It contains most popular decoders as > +well as very fast colorspace conversion elements. > diff -urN multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST > --- multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/ffmpeg/pkg/PLIST Fri Mar 14 15:48:57 2008 > @@ -0,0 +1,6 @@ > +@comment $OpenBSD$ > +lib/gstreamer-${VERSION}/ > +lib/gstreamer-${VERSION}/libgstffmpeg.la > +lib/gstreamer-${VERSION}/libgstffmpeg.so > +lib/gstreamer-${VERSION}/libgstpostproc.la > +lib/gstreamer-${VERSION}/libgstpostproc.so > diff -urN multimedia/gstreamer-0.10/plugins-bad/Makefile mystuff/multimedia/gstreamer-0.10/plugins-bad/Makefile > --- multimedia/gstreamer-0.10/plugins-bad/Makefile Mon Oct 8 10:22:41 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/Makefile Fri Mar 14 15:18:46 2008 > @@ -6,47 +6,48 @@ > COMMENT-faac= multimedia framework - faac plugin > COMMENT-faad= multimedia framework - faad plugin > COMMENT-xvid= multimedia framework - xvid plugin > -COMMENT-sdl= multimedia framework - sdl plugin > COMMENT-bz2= multimedia framework - bz2 plugin > COMMENT-gsm= multimedia framework - gsm plugin > COMMENT-ladspa= multimedia framework - ladspa plugin > COMMENT-neon= multimedia framework - neon plugin > COMMENT-swf= multimedia framework - flash plugin > +COMMENT-sdl= multimedia framework - sdl plugin > > -V= 0.10.4 > +V= 0.10.6 > DISTNAME= gst-plugins-bad-$V > -PKGNAME-main= gstreamer-plugins-bad-$Vp0 > -PKGNAME-tremor= gstreamer-tremor-$Vp0 > -PKGNAME-musepack= gstreamer-musepack-$Vp0 > -PKGNAME-faac= gstreamer-faac-$Vp0 > -PKGNAME-faad= gstreamer-faad-$Vp0 > -PKGNAME-xvid= gstreamer-xvid-$Vp0 > -PKGNAME-sdl= gstreamer-sdl-$Vp0 > -PKGNAME-bz2= gstreamer-bz2-$Vp0 > -PKGNAME-gsm= gstreamer-gsm-$Vp0 > -PKGNAME-ladspa= gstreamer-ladspa-$Vp0 > -PKGNAME-neon= gstreamer-neon-$Vp0 > -PKGNAME-swf= gstreamer-flash-$Vp0 > -MULTI_PACKAGES= -main -tremor -musepack -faac -faad -xvid -sdl -bz2 \ > - -gsm -ladspa > +PKGNAME-main= gstreamer-plugins-bad-$V > +PKGNAME-tremor= gstreamer-tremor-$V > +PKGNAME-musepack= gstreamer-musepack-$V > +PKGNAME-faac= gstreamer-faac-$V > +PKGNAME-faad= gstreamer-faad-$V > +PKGNAME-xvid= gstreamer-xvid-$V > +PKGNAME-bz2= gstreamer-bz2-$V > +PKGNAME-gsm= gstreamer-gsm-$V > +PKGNAME-ladspa= gstreamer-ladspa-$V > +PKGNAME-neon= gstreamer-neon-$V > +PKGNAME-swf= gstreamer-flash-$V > +PKGNAME-sdl= gstreamer-sdl-$V > +MULTI_PACKAGES= -main -tremor -musepack -faac -faad -xvid -bz2 \ > + -gsm -ladspa -sdl > > +SHARED_LIBS= gstapp-0.10 0.0 > + > MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-bad/} > -MODULES= devel/gettext > > WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 xml2 \ > - z m > + z m pcre > LIB_DEPENDS= gstreamer-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core > RUN_DEPENDS= ::${BUILD_PKGPATH} > > WANTLIB-main= ${WANTLIB} \ > - GL ICE SM X11 stdc++ \ > - gstbase-0.10 gstcontroller-0.10 > + stdc++ gstbase-0.10 gstcontroller-0.10 > > LIB_DEPENDS-main= ${LIB_DEPENDS} \ > - gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10::multimedia/gstreamer-0.10/plugins-base > + exif.>=12::graphics/libexif \ > + gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10,gstriff-0.10,gstnetbuffer-0.10,gstpbutils-0.10,gstrtp-0.10,gsttag-0.10,gstsdp-0.10::multimedia/gstreamer-0.10/plugins-base > > -RUN_DEPENDS-main= > - > +RUN_DEPENDS-main= > + > WANTLIB-tremor= ${WANTLIB} \ > gstbase-0.10 > > @@ -78,12 +79,6 @@ > LIB_DEPENDS-xvid= ${LIB_DEPENDS} \ > xvidcore::multimedia/xvidcore > > -WANTLIB-sdl= ${WANTLIB} \ > - X11 Xext gstbase-0.10 usbhid > -LIB_DEPENDS-sdl= ${LIB_DEPENDS} \ > - gstaudio-0.10,gstinterfaces-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base \ > - SDL::devel/sdl > - > WANTLIB-bz2= ${WANTLIB} \ > gstbase-0.10 > LIB_DEPENDS-bz2= ${LIB_DEPENDS} \ > @@ -99,6 +94,7 @@ > > WANTLIB-ladspa= ${WANTLIB} \ > gstbase-0.10 > + > LIB_DEPENDS-ladspa= ${LIB_DEPENDS} \ > gstaudio-0.10,gstinterfaces-0.10::multimedia/gstreamer-0.10/plugins-base > > @@ -110,6 +106,13 @@ > > LIB_DEPENDS-swf= ${LIB_DEPENDS} > > +WANTLIB-sdl= ${WANTLIB} \ > + X11 Xau Xdmcp Xext Xrandr Xrender gstaudio-0.10 gstinterfaces-0.10 \ > + gstvideo-0.10 usbhid gstbase-0.10 gstreamer-0.10 iconv > + > +LIB_DEPENDS-sdl= ${LIB_DEPENDS} \ > + SDL::devel/sdl > + > CONFIGURE_ARGS= --disable-cdaudio > > CONFIGURE_ARGS+= --disable-alsa \ > @@ -119,7 +122,6 @@ > --disable-dts \ > --disable-jack \ > --disable-libmms \ > - --disable-musicbrainz \ > --disable-soundtouch \ > --disable-spc \ > --disable-theoradec \ > diff -urN multimedia/gstreamer-0.10/plugins-bad/distinfo mystuff/multimedia/gstreamer-0.10/plugins-bad/distinfo > --- multimedia/gstreamer-0.10/plugins-bad/distinfo Thu Apr 5 18:20:07 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/distinfo Mon Mar 10 13:25:18 2008 > @@ -1,5 +1,5 @@ > -MD5 (gst-plugins-bad-0.10.4.tar.bz2) = Llc5XN9yczR3+zKPH6PwUw== > -RMD160 (gst-plugins-bad-0.10.4.tar.bz2) = 1Z54x1lMlLweWapYQa/kJAJHEL0= > -SHA1 (gst-plugins-bad-0.10.4.tar.bz2) = bnP2Es/XJnWx5bXrN4uWILYtSUY= > -SHA256 (gst-plugins-bad-0.10.4.tar.bz2) = JAuaJf8RbqxkV+pggTKR9sd/98Fn1b8+w9kLutMdoc4= > -SIZE (gst-plugins-bad-0.10.4.tar.bz2) = 1231000 > +MD5 (gst-plugins-bad-0.10.6.tar.bz2) = +0eDiqDM71JoPOpdiTZAUw== > +RMD160 (gst-plugins-bad-0.10.6.tar.bz2) = EFUDGXrCd7ZXdvwyNQPALNh3OxM= > +SHA1 (gst-plugins-bad-0.10.6.tar.bz2) = c0F+TcOpFz7qPkV0JZcnIksNjGU= > +SHA256 (gst-plugins-bad-0.10.6.tar.bz2) = xwLas007Mw7AbZFakak32tsKk6ziW76OM3Ij3bg07+Y= > +SIZE (gst-plugins-bad-0.10.6.tar.bz2) = 1776962 > diff -urN multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac mystuff/multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac > --- multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac Sat Apr 7 17:54:06 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/patches/patch-configure_ac Thu Jan 1 01:00:00 1970 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-configure_ac,v 1.1 2007/04/07 15:54:06 espie Exp $ > ---- configure.ac.orig Sat Apr 7 17:25:58 2007 > -+++ configure.ac Sat Apr 7 17:26:53 2007 > -@@ -235,7 +235,7 @@ GST_CHECK_X > - save_CPPFLAGS="$CPPFLAGS" > - save_LIBS="$LIBS" > - CPPFLAGS="$CPPFLAGS $X_CFLAGS" > --LIBS="$LIBS $X_LIBS" > -+LIBS="$LIBS $X_LIBS -lm" > - GST_CHECK_FEATURE(OPENGL, [Open GL], glsink, [ > - GST_CHECK_LIBHEADER(GL, GL, glTexImage2D,, > - GL/gl.h, HAVE_OPENGL="yes", HAVE_OPENGL="no") > diff -urN multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main > --- multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main Thu Jan 11 19:12:36 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-main Wed Mar 12 18:51:00 2008 > @@ -1,55 +1,98 @@ > @comment $OpenBSD: PLIST-main,v 1.1.1.1 2007/01/11 18:12:36 espie Exp $ > +include/gstreamer-${VERSION}/gst/app/ > +include/gstreamer-${VERSION}/gst/app/gstappbuffer.h > +include/gstreamer-${VERSION}/gst/app/gstappsink.h > +include/gstreamer-${VERSION}/gst/app/gstappsrc.h > +lib/gstreamer-${VERSION}/libgstapp.la > +lib/gstreamer-${VERSION}/libgstapp.so > +lib/gstreamer-${VERSION}/libgstbayer.la > +lib/gstreamer-${VERSION}/libgstbayer.so > lib/gstreamer-${VERSION}/libgstcdxaparse.la > lib/gstreamer-${VERSION}/libgstcdxaparse.so > lib/gstreamer-${VERSION}/libgstdeinterlace.la > lib/gstreamer-${VERSION}/libgstdeinterlace.so > +lib/gstreamer-${VERSION}/libgstdvdspu.la > +lib/gstreamer-${VERSION}/libgstdvdspu.so > +lib/gstreamer-${VERSION}/libgstfestival.la > +lib/gstreamer-${VERSION}/libgstfestival.so > lib/gstreamer-${VERSION}/libgstfilter.la > lib/gstreamer-${VERSION}/libgstfilter.so > +lib/gstreamer-${VERSION}/libgstflvdemux.la > +lib/gstreamer-${VERSION}/libgstflvdemux.so > lib/gstreamer-${VERSION}/libgstfreeze.la > lib/gstreamer-${VERSION}/libgstfreeze.so > -lib/gstreamer-${VERSION}/libgstglimagesink.la > -lib/gstreamer-${VERSION}/libgstglimagesink.so > lib/gstreamer-${VERSION}/libgsth264parse.la > lib/gstreamer-${VERSION}/libgsth264parse.so > +lib/gstreamer-${VERSION}/libgstinterleave.la > +lib/gstreamer-${VERSION}/libgstinterleave.so > +lib/gstreamer-${VERSION}/libgstmetadata.la > +lib/gstreamer-${VERSION}/libgstmetadata.so > lib/gstreamer-${VERSION}/libgstmodplug.la > lib/gstreamer-${VERSION}/libgstmodplug.so > -lib/gstreamer-${VERSION}/libgstmultifile.la > -lib/gstreamer-${VERSION}/libgstmultifile.so > +lib/gstreamer-${VERSION}/libgstmpeg4videoparse.la > +lib/gstreamer-${VERSION}/libgstmpeg4videoparse.so > +lib/gstreamer-${VERSION}/libgstmpegtsparse.la > +lib/gstreamer-${VERSION}/libgstmpegtsparse.so > +lib/gstreamer-${VERSION}/libgstmpegvideoparse.la > +lib/gstreamer-${VERSION}/libgstmpegvideoparse.so > +lib/gstreamer-${VERSION}/libgstmve.la > +lib/gstreamer-${VERSION}/libgstmve.so > lib/gstreamer-${VERSION}/libgstnsf.la > lib/gstreamer-${VERSION}/libgstnsf.so > lib/gstreamer-${VERSION}/libgstnuvdemux.la > lib/gstreamer-${VERSION}/libgstnuvdemux.so > -lib/gstreamer-${VERSION}/libgstqtdemux.la > -lib/gstreamer-${VERSION}/libgstqtdemux.so > +lib/gstreamer-${VERSION}/libgstrawparse.la > +lib/gstreamer-${VERSION}/libgstrawparse.so > +lib/gstreamer-${VERSION}/libgstreal.la > +lib/gstreamer-${VERSION}/libgstreal.so > lib/gstreamer-${VERSION}/libgstreplaygain.la > lib/gstreamer-${VERSION}/libgstreplaygain.so > lib/gstreamer-${VERSION}/libgstrfbsrc.la > lib/gstreamer-${VERSION}/libgstrfbsrc.so > -lib/gstreamer-${VERSION}/libgstspectrum.la > -lib/gstreamer-${VERSION}/libgstspectrum.so > +lib/gstreamer-${VERSION}/libgstrtpmanager.la > +lib/gstreamer-${VERSION}/libgstrtpmanager.so > +lib/gstreamer-${VERSION}/libgstsdpelem.la > +lib/gstreamer-${VERSION}/libgstsdpelem.so > +lib/gstreamer-${VERSION}/libgstselector.la > +lib/gstreamer-${VERSION}/libgstselector.so > lib/gstreamer-${VERSION}/libgstspeed.la > lib/gstreamer-${VERSION}/libgstspeed.so > +lib/gstreamer-${VERSION}/libgstspeexresample.la > +lib/gstreamer-${VERSION}/libgstspeexresample.so > +lib/gstreamer-${VERSION}/libgststereo.la > +lib/gstreamer-${VERSION}/libgststereo.so > lib/gstreamer-${VERSION}/libgsttta.la > lib/gstreamer-${VERSION}/libgsttta.so > -lib/gstreamer-${VERSION}/libgstvideocrop.la > -lib/gstreamer-${VERSION}/libgstvideocrop.so > -lib/gstreamer-${VERSION}/libgstvideoparse.la > -lib/gstreamer-${VERSION}/libgstvideoparse.so > -lib/gstreamer-${VERSION}/libgstxingheader.la > -lib/gstreamer-${VERSION}/libgstxingheader.so > +lib/gstreamer-${VERSION}/libgstvideosignal.la > +lib/gstreamer-${VERSION}/libgstvideosignal.so > +lib/gstreamer-${VERSION}/libgstvmnc.la > +lib/gstreamer-${VERSION}/libgstvmnc.so > lib/gstreamer-${VERSION}/libgsty4menc.la > lib/gstreamer-${VERSION}/libgsty4menc.so > +lib/libgstapp-${VERSION}.la > +@lib lib/libgstapp-${VERSION}.so.${LIBgstapp-0.10_VERSION} > 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 > share/locale/cs/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/da/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/en_GB/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/es/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/fi/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/hu/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/it/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/ky/ > +share/locale/ky/LC_MESSAGES/ > +share/locale/ky/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/nb/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/nl/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/or/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/pl/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/pt_BR/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/sk/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/sq/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/sr/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/sv/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/uk/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > share/locale/vi/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > +share/locale/zh_CN/LC_MESSAGES/gst-plugins-bad-${VERSION}.mo > diff -urN multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon > --- multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-neon Wed Mar 12 18:51:28 2008 > @@ -0,0 +1,2 @@ > +lib/gstreamer-${VERSION}/libgstneonhttpsrc.la > +lib/gstreamer-${VERSION}/libgstneonhttpsrc.so > diff -urN multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl > --- multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl Sat Jan 13 12:23:38 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-bad/pkg/PLIST-sdl Wed Mar 12 18:32:27 2008 > @@ -1,5 +1,5 @@ > @comment $OpenBSD: PLIST-sdl,v 1.1 2007/01/13 11:23:38 espie Exp $ > @option no-default-conflict > @conflict gstreamer-sdl->=0.10 > -lib/gstreamer-${VERSION}/libgstsdlvideosink.la > -lib/gstreamer-${VERSION}/libgstsdlvideosink.so > +lib/gstreamer-${VERSION}/libgstsdl.la > +lib/gstreamer-${VERSION}/libgstsdl.so > diff -urN multimedia/gstreamer-0.10/plugins-base/Makefile mystuff/multimedia/gstreamer-0.10/plugins-base/Makefile > --- multimedia/gstreamer-0.10/plugins-base/Makefile Mon Oct 8 10:22:41 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-base/Makefile Fri Mar 14 15:18:51 2008 > @@ -8,48 +8,49 @@ > COMMENT-theora= multimedia framework - theora plugin > COMMENT-pango= multimedia framework - pango renderer > > -V= 0.10.12 > +V= 0.10.17 > DISTNAME= gst-plugins-base-$V > -PKGNAME-main= gstreamer-plugins-base-$Vp0 > -PKGNAME-gnome= gstreamer-gnome-$Vp1 > -PKGNAME-cdda= gstreamer-cdda-$Vp0 > -PKGNAME-ogg= gstreamer-ogg-$Vp0 > -PKGNAME-theora= gstreamer-theora-$Vp0 > -PKGNAME-vorbis= gstreamer-vorbis-$Vp0 > -PKGNAME-pango= gstreamer-pango-$Vp0 > +PKGNAME-main= gstreamer-plugins-base-$V > +PKGNAME-gnome= gstreamer-gnome-$V > +PKGNAME-cdda= gstreamer-cdda-$V > +PKGNAME-ogg= gstreamer-ogg-$V > +PKGNAME-theora= gstreamer-theora-$V > +PKGNAME-vorbis= gstreamer-vorbis-$V > +PKGNAME-pango= gstreamer-pango-$V > MULTI_PACKAGES= -main -gnome -cdda -ogg -theora -vorbis -pango > > -SHARED_LIBS += gstinterfaces-0.10 0.1 # .8.0 > -SHARED_LIBS += gsttag-0.10 0.1 # .8.0 > -SHARED_LIBS += gstaudio-0.10 0.1 # .8.0 > -SHARED_LIBS += gstcdda-0.10 0.1 # .8.0 > -SHARED_LIBS += gstnetbuffer-0.10 0.1 # .8.0 > -SHARED_LIBS += gstpbutils-0.10 0.0 # .8.0 > -SHARED_LIBS += gstriff-0.10 0.1 # .8.0 > -SHARED_LIBS += gstrtp-0.10 0.1 # .8.0 > -SHARED_LIBS += gstvideo-0.10 0.1 # .8.0 > +SHARED_LIBS += gstinterfaces-0.10 0.1 # .8.0 > +SHARED_LIBS += gsttag-0.10 0.1 # .8.0 > +SHARED_LIBS += gstaudio-0.10 0.1 # .8.0 > +SHARED_LIBS += gstcdda-0.10 0.1 # .8.0 > +SHARED_LIBS += gstnetbuffer-0.10 0.1 # .8.0 > +SHARED_LIBS += gstpbutils-0.10 0.0 # .8.0 > +SHARED_LIBS += gstriff-0.10 0.1 # .8.0 > +SHARED_LIBS += gstrtp-0.10 0.1 # .8.0 > +SHARED_LIBS += gstvideo-0.10 0.1 # .8.0 > +SHARED_LIBS += gstfft-0.10 12.0 > +SHARED_LIBS += gstrtsp-0.10 12.0 > +SHARED_LIBS += gstsdp-0.10 12.0 > > MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-base/} > -MODULES= devel/gettext > > RUN_DEPENDS= ::${BUILD_PKGPATH} > WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 xml2 \ > - z m > + z m pcre > LIB_DEPENDS= gstreamer-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ > > WANTLIB-main= ${WANTLIB} \ > - Xv X11 ICE SM Xext \ > + Xau Xdmcp Xv X11 ICE SM Xext \ > gstdataprotocol-0.10 gstcontroller-0.10 gstbase-0.10 > LIB_DEPENDS-main= ${LIB_DEPENDS} \ > oil-0.3::devel/liboil > RUN_DEPENDS-main= > > WANTLIB-gnome= ${WANTLIB} \ > - ORBit-2 ORBitCosNaming-2 crypto gconf-2 ssl \ > - gstbase-0.10 > + ORBit-2 crypto gconf-2 ssl \ > + gstbase-0.10 dbus-1 dbus-glib-1 util > LIB_DEPENDS-gnome= ${LIB_DEPENDS} \ > - popt::devel/popt \ > - bonobo-2.>=1,bonobo-activation.>=5::x11/gnome/libbonobo \ > + gsttag-0.10::${BUILD_PKGPATH} \ > gnomevfs-2::x11/gnome/vfs2 > > WANTLIB-cdda= ${WANTLIB} \ > @@ -67,7 +68,7 @@ > WANTLIB-theora= ${WANTLIB} \ > ogg > LIB_DEPENDS-theora= ${LIB_DEPENDS} \ > - gsttag-0.10::${BUILD_PKGPATH} \ > + gsttag-0.10,gstbase-0.10::${BUILD_PKGPATH} \ > theora::multimedia/libtheora > > WANTLIB-vorbis= ${WANTLIB} \ > @@ -77,7 +78,7 @@ > vorbis,vorbisenc::audio/libvorbis > > WANTLIB-pango= ${WANTLIB} \ > - X11 fontconfig freetype \ > + X11 fontconfig freetype Xau Xdmcp \ > gstbase-0.10 > LIB_DEPENDS-pango= ${LIB_DEPENDS} \ > pango-1.0,pangoft2-1.0::devel/pango > diff -urN multimedia/gstreamer-0.10/plugins-base/distinfo mystuff/multimedia/gstreamer-0.10/plugins-base/distinfo > --- multimedia/gstreamer-0.10/plugins-base/distinfo Thu Apr 5 18:20:07 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-base/distinfo Mon Mar 10 13:42:51 2008 > @@ -1,5 +1,5 @@ > -MD5 (gst-plugins-base-0.10.12.tar.bz2) = DuNUVaTrUHvPv81E2eFdHg== > -RMD160 (gst-plugins-base-0.10.12.tar.bz2) = MKuJyyKw5ZZ0mmUe6oZCHHK6BCU= > -SHA1 (gst-plugins-base-0.10.12.tar.bz2) = syNYm2fw7jeQ1pNBvi5UWHDQoOk= > -SHA256 (gst-plugins-base-0.10.12.tar.bz2) = uIqFshSZvQZKUxo7XQauae4CWtX4i26G7UryRVCSR+4= > -SIZE (gst-plugins-base-0.10.12.tar.bz2) = 1460658 > +MD5 (gst-plugins-base-0.10.17.tar.bz2) = FRtmIo4Iqwx2AXEwMPscPw== > +RMD160 (gst-plugins-base-0.10.17.tar.bz2) = D84hURdovsxqT3RNUzNb/+hK+/k= > +SHA1 (gst-plugins-base-0.10.17.tar.bz2) = oRh9aG6ryYDNKP+mEOAm6IVVB+c= > +SHA256 (gst-plugins-base-0.10.17.tar.bz2) = +Cz9VmnHVnJvUD3eWTbi++KWljEJXw78QN8frhp09w0= > +SIZE (gst-plugins-base-0.10.17.tar.bz2) = 1849092 > Binary files multimedia/gstreamer-0.10/plugins-base/perl.core and mystuff/multimedia/gstreamer-0.10/plugins-base/perl.core differ > diff -urN multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main > --- multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main Sat Mar 17 22:35:31 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-base/pkg/PLIST-main Mon Mar 10 13:55:51 2008 > @@ -12,6 +12,12 @@ > include/gstreamer-${VERSION}/gst/audio/mixerutils.h > include/gstreamer-${VERSION}/gst/audio/multichannel-enumtypes.h > include/gstreamer-${VERSION}/gst/audio/multichannel.h > +include/gstreamer-${VERSION}/gst/fft/ > +include/gstreamer-${VERSION}/gst/fft/gstfft.h > +include/gstreamer-${VERSION}/gst/fft/gstfftf32.h > +include/gstreamer-${VERSION}/gst/fft/gstfftf64.h > +include/gstreamer-${VERSION}/gst/fft/gstffts16.h > +include/gstreamer-${VERSION}/gst/fft/gstffts32.h > include/gstreamer-${VERSION}/gst/floatcast/ > include/gstreamer-${VERSION}/gst/floatcast/floatcast.h > include/gstreamer-${VERSION}/gst/interfaces/ > @@ -34,6 +40,7 @@ > include/gstreamer-${VERSION}/gst/pbutils/descriptions.h > include/gstreamer-${VERSION}/gst/pbutils/install-plugins.h > include/gstreamer-${VERSION}/gst/pbutils/missing-plugins.h > +include/gstreamer-${VERSION}/gst/pbutils/pbutils-enumtypes.h > include/gstreamer-${VERSION}/gst/pbutils/pbutils.h > include/gstreamer-${VERSION}/gst/riff/ > include/gstreamer-${VERSION}/gst/riff/riff-ids.h > @@ -43,8 +50,24 @@ > include/gstreamer-${VERSION}/gst/rtp/gstbasertpaudiopayload.h > include/gstreamer-${VERSION}/gst/rtp/gstbasertpdepayload.h > include/gstreamer-${VERSION}/gst/rtp/gstbasertppayload.h > +include/gstreamer-${VERSION}/gst/rtp/gstrtcpbuffer.h > include/gstreamer-${VERSION}/gst/rtp/gstrtpbuffer.h > +include/gstreamer-${VERSION}/gst/rtp/gstrtppayloads.h > +include/gstreamer-${VERSION}/gst/rtsp/ > +include/gstreamer-${VERSION}/gst/rtsp/gstrtsp-enumtypes.h > +include/gstreamer-${VERSION}/gst/rtsp/gstrtspbase64.h > +include/gstreamer-${VERSION}/gst/rtsp/gstrtspconnection.h > +include/gstreamer-${VERSION}/gst/rtsp/gstrtspdefs.h > +include/gstreamer-${VERSION}/gst/rtsp/gstrtspextension.h > +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/sdp/ > +include/gstreamer-${VERSION}/gst/sdp/gstsdp.h > +include/gstreamer-${VERSION}/gst/sdp/gstsdpmessage.h > include/gstreamer-${VERSION}/gst/tag/ > +include/gstreamer-${VERSION}/gst/tag/gsttagdemux.h > include/gstreamer-${VERSION}/gst/tag/tag.h > include/gstreamer-${VERSION}/gst/video/ > include/gstreamer-${VERSION}/gst/video/gstvideofilter.h > @@ -70,6 +93,8 @@ > lib/gstreamer-${VERSION}/libgstgdp.so > lib/gstreamer-${VERSION}/libgstplaybin.la > lib/gstreamer-${VERSION}/libgstplaybin.so > +lib/gstreamer-${VERSION}/libgstqueue2.la > +lib/gstreamer-${VERSION}/libgstqueue2.so > lib/gstreamer-${VERSION}/libgstsubparse.la > lib/gstreamer-${VERSION}/libgstsubparse.so > lib/gstreamer-${VERSION}/libgsttcp.la > @@ -90,6 +115,8 @@ > lib/gstreamer-${VERSION}/libgstxvimagesink.so > lib/libgstaudio-${VERSION}.la > @lib lib/libgstaudio-${VERSION}.so.${LIBgstaudio-0.10_VERSION} > +lib/libgstfft-${VERSION}.la > +@lib lib/libgstfft-${VERSION}.so.${LIBgstfft-0.10_VERSION} > lib/libgstinterfaces-${VERSION}.la > @lib lib/libgstinterfaces-${VERSION}.so.${LIBgstinterfaces-0.10_VERSION} > lib/libgstnetbuffer-${VERSION}.la > @@ -100,24 +127,52 @@ > @lib lib/libgstriff-${VERSION}.so.${LIBgstriff-0.10_VERSION} > lib/libgstrtp-${VERSION}.la > @lib lib/libgstrtp-${VERSION}.so.${LIBgstrtp-0.10_VERSION} > +lib/libgstrtsp-${VERSION}.la > +@lib lib/libgstrtsp-${VERSION}.so.${LIBgstrtsp-0.10_VERSION} > +lib/libgstsdp-${VERSION}.la > +@lib lib/libgstsdp-${VERSION}.so.${LIBgstsdp-0.10_VERSION} > lib/libgsttag-${VERSION}.la > @lib lib/libgsttag-${VERSION}.so.${LIBgsttag-0.10_VERSION} > lib/libgstvideo-${VERSION}.la > @lib lib/libgstvideo-${VERSION}.so.${LIBgstvideo-0.10_VERSION} > +lib/pkgconfig/gstreamer-audio-${VERSION}.pc > +lib/pkgconfig/gstreamer-cdda-${VERSION}.pc > +lib/pkgconfig/gstreamer-fft-${VERSION}.pc > +lib/pkgconfig/gstreamer-floatcast-${VERSION}.pc > +lib/pkgconfig/gstreamer-interfaces-${VERSION}.pc > +lib/pkgconfig/gstreamer-netbuffer-${VERSION}.pc > +lib/pkgconfig/gstreamer-pbutils-${VERSION}.pc > lib/pkgconfig/gstreamer-plugins-base-${VERSION}.pc > +lib/pkgconfig/gstreamer-riff-${VERSION}.pc > +lib/pkgconfig/gstreamer-rtp-${VERSION}.pc > +lib/pkgconfig/gstreamer-rtsp-${VERSION}.pc > +lib/pkgconfig/gstreamer-sdp-${VERSION}.pc > +lib/pkgconfig/gstreamer-tag-${VERSION}.pc > +lib/pkgconfig/gstreamer-video-${VERSION}.pc > +man/cat3f/ > @man man/man1/gst-visualise-${VERSION}.1 > +man/man3f/ > +share/gtk-doc/html/gst-plugins-base-libs-${VERSION}/ > share/locale/af/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/az/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/bg/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/ca/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/cs/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/da/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/de/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/en_GB/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/es/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/fi/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/hu/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/it/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/nb/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/nl/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/or/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/pl/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/sk/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/sq/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/sr/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/sv/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/uk/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > share/locale/vi/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > +share/locale/zh_CN/LC_MESSAGES/gst-plugins-base-${VERSION}.mo > diff -urN multimedia/gstreamer-0.10/plugins-good/Makefile mystuff/multimedia/gstreamer-0.10/plugins-good/Makefile > --- multimedia/gstreamer-0.10/plugins-good/Makefile Thu Feb 14 19:51:59 2008 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/Makefile Fri Mar 14 15:18:57 2008 > @@ -15,22 +15,22 @@ > COMMENT-caca= multimedia framework - libcaca plugin > COMMENT-shout= multimedia framework - shoutcast plugin > > -V= 0.10.5 > +V= 0.10.7 > DISTNAME= gst-plugins-good-$V > -PKGNAME-main= gstreamer-plugins-good-$Vp2 > -PKGNAME-aalib= gstreamer-aalib-$Vp2 > -PKGNAME-cairo= gstreamer-cairo-$Vp3 > -PKGNAME-gconf= gstreamer-confelements-$Vp3 > -PKGNAME-esd= gstreamer-esd-$Vp1 > -PKGNAME-flac= gstreamer-flac-$Vp2 > -PKGNAME-speex= gstreamer-speex-$Vp1 > -PKGNAME-taglib= gstreamer-taglib-$Vp1 > -PKGNAME-dv= gstreamer-dv-$Vp1 > -PKGNAME-jpeg= gstreamer-jpeg-$Vp1 > -PKGNAME-png= gstreamer-png-$Vp1 > -PKGNAME-gdk= gstreamer-gdk-pixbuf-$Vp3 > -PKGNAME-caca= gstreamer-libcaca-$Vp2 > -PKGNAME-shout= gstreamer-shoutcast-$Vp1 > +PKGNAME-main= gstreamer-plugins-good-$V > +PKGNAME-aalib= gstreamer-aalib-$V > +PKGNAME-cairo= gstreamer-cairo-$V > +PKGNAME-gconf= gstreamer-confelements-$V > +PKGNAME-esd= gstreamer-esd-$V > +PKGNAME-flac= gstreamer-flac-$V > +PKGNAME-speex= gstreamer-speex-$V > +PKGNAME-taglib= gstreamer-taglib-$V > +PKGNAME-dv= gstreamer-dv-$V > +PKGNAME-jpeg= gstreamer-jpeg-$V > +PKGNAME-png= gstreamer-png-$V > +PKGNAME-gdk= gstreamer-gdk-pixbuf-$V > +PKGNAME-caca= gstreamer-libcaca-$V > +PKGNAME-shout= gstreamer-shoutcast-$V > > > MULTI_PACKAGES= -main -aalib -cairo -gconf -esd -flac -speex \ > @@ -40,7 +40,6 @@ > MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-good/} > > USE_X11= Yes > -MODULES= devel/gettext > > RUN_DEPENDS= ::${BUILD_PKGPATH} > WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ > @@ -52,7 +51,7 @@ > gstcontroller-0.10 gstbase-0.10 Xau Xdmcp > LIB_DEPENDS-main= ${LIB_DEPENDS} \ > oil-0.3::devel/liboil \ > - gstaudio-0.10,gstinterfaces-0.10,gstnetbuffer-0.10,gstriff-0.10,gstrtp-0.10,gsttag-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base > + gstfft-0.10,gstrtsp-0.10,gstsdp-0.10,gstaudio-0.10,gstinterfaces-0.10,gstnetbuffer-0.10,gstriff-0.10,gstrtp-0.10,gsttag-0.10,gstvideo-0.10::multimedia/gstreamer-0.10/plugins-base > RUN_DEPENDS-main= > > WANTLIB-aalib= ${WANTLIB} \ > @@ -62,7 +61,7 @@ > > WANTLIB-cairo= ${WANTLIB} \ > X11 Xau Xdmcp Xrender fontconfig freetype \ > - glitz png gstbase-0.10 expat > + glitz png gstbase-0.10 > LIB_DEPENDS-cairo= ${LIB_DEPENDS} \ > cairo::graphics/cairo > > @@ -96,6 +95,7 @@ > stdc++ > > LIB_DEPENDS-taglib= ${LIB_DEPENDS} \ > + gstbase-0.10::multimedia/gstreamer-0.10/core \ > gsttag-0.10::multimedia/gstreamer-0.10/plugins-base \ > tag::audio/taglib > > @@ -120,7 +120,7 @@ > X11 Xcomposite Xdamage Xext Xrender atk-1.0 \ > cairo fontconfig freetype glitz pango-1.0 \ > pangocairo-1.0 pangoft2-1.0 png gstbase-0.10 \ > - Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr expat > + Xau Xcursor Xdmcp Xfixes Xi Xinerama Xrandr > > LIB_DEPENDS-gdk= ${LIB_DEPENDS} \ > gdk_pixbuf-2.0,gtk-x11-2.0,gdk-x11-2.0::x11/gtk+2 > diff -urN multimedia/gstreamer-0.10/plugins-good/distinfo mystuff/multimedia/gstreamer-0.10/plugins-good/distinfo > --- multimedia/gstreamer-0.10/plugins-good/distinfo Thu Apr 5 18:20:07 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/distinfo Thu Mar 13 18:44:24 2008 > @@ -1,5 +1,5 @@ > -MD5 (gst-plugins-good-0.10.5.tar.bz2) = xF/JrOn+tNPfMtoKbSYthA== > -RMD160 (gst-plugins-good-0.10.5.tar.bz2) = k9CzGlxUxYGF9zoL9bAiPN8Sytc= > -SHA1 (gst-plugins-good-0.10.5.tar.bz2) = Ib30LEARKdG44Bmx1SAPWw0jdVc= > -SHA256 (gst-plugins-good-0.10.5.tar.bz2) = 3PVqSbj8DbFphb8TPUCF2EYCoZwVrLeYkKwBLXz5+WI= > -SIZE (gst-plugins-good-0.10.5.tar.bz2) = 1356388 > +MD5 (gst-plugins-good-0.10.7.tar.bz2) = 4C1ymyJFH3VBSidFauXBag== > +RMD160 (gst-plugins-good-0.10.7.tar.bz2) = bO5ShG/IgoaTidLzLbzmffRQS80= > +SHA1 (gst-plugins-good-0.10.7.tar.bz2) = s5PpClA3gfvJhLHr0HEt3d51QKU= > +SHA256 (gst-plugins-good-0.10.7.tar.bz2) = nhLFinlOYcASS30jnq5zHUrEhjpPwoFHIC04EcO8450= > +SIZE (gst-plugins-good-0.10.7.tar.bz2) = 1746120 > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 Thu Feb 14 19:52:00 2008 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-common_m4_gst-default_m4 Thu Mar 13 19:42:10 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-common_m4_gst-default_m4,v 1.1 2008/02/14 18:52:00 ajacoutot Exp $ > ---- common/m4/gst-default.m4.orig Thu Feb 14 09:39:16 2008 > -+++ common/m4/gst-default.m4 Thu Feb 14 09:43:41 2008 > -@@ -25,6 +25,11 @@ AC_DEFUN([GST_DEFAULT_ELEMENTS], > +--- common/m4/gst-default.m4.orig Wed Feb 28 20:24:38 2007 > ++++ common/m4/gst-default.m4 Thu Mar 13 19:30:33 2008 > +@@ -25,6 +25,11 @@ AC_DEFUN([AG_GST_DEFAULT_ELEMENTS], > DEFAULT_AUDIOSRC="osxaudiosrc" > DEFAULT_VIDEOSINK="osxvideosink" > ;; > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac Tue Sep 18 20:33:25 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-configure_ac Thu Mar 13 19:42:10 2008 > @@ -1,30 +1,21 @@ > -$OpenBSD: patch-configure_ac,v 1.3 2007/09/18 18:33:25 naddy Exp $ > ---- configure.ac.orig Thu Dec 21 15:20:44 2006 > -+++ configure.ac Mon Sep 17 19:44:32 2007 > -@@ -551,16 +551,7 @@ GST_CHECK_FEATURE(ESD, [ESounD sound daemon], esdsink, > - dnl *** FLAC *** > - translit(dnm, m, l) AM_CONDITIONAL(USE_FLAC, true) > - GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [ > -- GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__seekable_stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm") > -- dnl API change in FLAC 1.1.1, so require that... > -- dnl (this check will also fail with FLAC 1.1.3 which changed API again > -- dnl and with which our plugin does not compile or work yet) > -- if test x$HAVE_FLAC = xyes; then > -- AC_CHECK_DECL(FLAC__SEEKABLE_STREAM_ENCODER_TELL_ERROR, > -- HAVE_FLAC="yes", HAVE_FLAC="no", [ > --#include <FLAC/seekable_stream_encoder.h> > -- ]) > -- fi > -+ GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__stream_encoder_new, -logg -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -logg -lm") > - AC_SUBST(FLAC_LIBS) > +$OpenBSD$ > +--- configure.ac.orig Wed Feb 20 23:09:26 2008 > ++++ configure.ac Thu Mar 13 19:42:01 2008 > +@@ -690,7 +690,7 @@ AG_GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac > ]) > - > -@@ -632,7 +623,7 @@ GST_CHECK_FEATURE(LIBDV, [libdv DV demuxer/decoder], d > + else > + AG_GST_CHECK_FEATURE(FLAC, [FLAC lossless audio], flac, [ > +- AG_GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__stream_encoder_new, -lm, FLAC/all.h, FLAC_LIBS="-lFLAC -lm") > ++ AG_GST_CHECK_LIBHEADER(FLAC, FLAC, FLAC__stream_encoder_new, -lm -logg, FLAC/all.h, FLAC_LIBS="-lFLAC -lm -logg") > + dnl API change in FLAC 1.1.3, so require that... > + if test x$HAVE_FLAC = xyes; then > + AC_CHECK_DECL(FLAC__STREAM_ENCODER_TELL_STATUS_ERROR, > +@@ -770,7 +770,7 @@ AG_GST_CHECK_FEATURE(LIBDV, [libdv DV demuxer/decoder] > dnl *** libpng *** > translit(dnm, m, l) AM_CONDITIONAL(USE_LIBPNG, true) > - GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [ > -- GST_PKG_CHECK_MODULES(LIBPNG, libpng12) > -+ GST_PKG_CHECK_MODULES(LIBPNG, libpng) > + AG_GST_CHECK_FEATURE(LIBPNG, [Portable Network Graphics library], png, [ > +- AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng12) > ++ AG_GST_PKG_CHECK_MODULES(LIBPNG, libpng) > ]) > > dnl *** dv1394 *** > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c Tue Sep 18 20:33:25 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_c Thu Jan 1 01:00:00 1970 > @@ -1,352 +0,0 @@ > -$OpenBSD: patch-ext_flac_gstflacdec_c,v 1.1 2007/09/18 18:33:25 naddy Exp $ > ---- ext/flac/gstflacdec.c.orig Mon Sep 17 19:59:07 2007 > -+++ ext/flac/gstflacdec.c Mon Sep 17 22:08:10 2007 > -@@ -93,25 +93,25 @@ static void gst_flac_dec_reset_decoders (GstFlacDec * > - static void gst_flac_dec_setup_seekable_decoder (GstFlacDec * flacdec); > - static void gst_flac_dec_setup_stream_decoder (GstFlacDec * flacdec); > - > --static FLAC__SeekableStreamDecoderReadStatus > --gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, > -- FLAC__byte buffer[], unsigned *bytes, void *client_data); > --static FLAC__SeekableStreamDecoderSeekStatus > --gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, > -+static FLAC__StreamDecoderReadStatus > -+gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, > -+ FLAC__byte buffer[], size_t *bytes, void *client_data); > -+static FLAC__StreamDecoderSeekStatus > -+gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, > - FLAC__uint64 position, void *client_data); > --static FLAC__SeekableStreamDecoderTellStatus > --gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, > -+static FLAC__StreamDecoderTellStatus > -+gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, > - FLAC__uint64 * position, void *client_data); > --static FLAC__SeekableStreamDecoderLengthStatus > --gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, > -+static FLAC__StreamDecoderLengthStatus > -+gst_flac_dec_length (const FLAC__StreamDecoder * decoder, > - FLAC__uint64 * length, void *client_data); > --static FLAC__bool gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, > -+static FLAC__bool gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, > - void *client_data); > - static FLAC__StreamDecoderReadStatus > - gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, > -- FLAC__byte buffer[], unsigned *bytes, void *client_data); > -+ FLAC__byte buffer[], size_t *bytes, void *client_data); > - static FLAC__StreamDecoderWriteStatus > --gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, > -+gst_flac_dec_write_seekable (const FLAC__StreamDecoder * decoder, > - const FLAC__Frame * frame, > - const FLAC__int32 * const buffer[], void *client_data); > - static FLAC__StreamDecoderWriteStatus > -@@ -119,14 +119,14 @@ gst_flac_dec_write_stream (const FLAC__StreamDecoder * > - const FLAC__Frame * frame, > - const FLAC__int32 * const buffer[], void *client_data); > - static void gst_flac_dec_metadata_callback_seekable (const > -- FLAC__SeekableStreamDecoder * decoder, > -+ FLAC__StreamDecoder * decoder, > - const FLAC__StreamMetadata * metadata, void *client_data); > - static void gst_flac_dec_metadata_callback_stream (const FLAC__StreamDecoder * > - decoder, const FLAC__StreamMetadata * metadata, void *client_data); > - static void gst_flac_dec_metadata_callback (GstFlacDec * flacdec, > - const FLAC__StreamMetadata * metadata); > - static void gst_flac_dec_error_callback_seekable (const > -- FLAC__SeekableStreamDecoder * decoder, > -+ FLAC__StreamDecoder * decoder, > - FLAC__StreamDecoderErrorStatus status, void *client_data); > - static void gst_flac_dec_error_callback_stream (const FLAC__StreamDecoder * > - decoder, FLAC__StreamDecoderErrorStatus status, void *client_data); > -@@ -212,7 +212,7 @@ static void > - gst_flac_dec_reset_decoders (GstFlacDec * flacdec) > - { > - if (flacdec->seekable_decoder) { > -- FLAC__seekable_stream_decoder_delete (flacdec->seekable_decoder); > -+ FLAC__stream_decoder_delete (flacdec->seekable_decoder); > - flacdec->seekable_decoder = NULL; > - } > - > -@@ -238,27 +238,10 @@ gst_flac_dec_setup_seekable_decoder (GstFlacDec * dec) > - { > - gst_flac_dec_reset_decoders (dec); > - > -- dec->seekable_decoder = FLAC__seekable_stream_decoder_new (); > -+ dec->seekable_decoder = FLAC__stream_decoder_new (); > - > -- FLAC__seekable_stream_decoder_set_read_callback (dec->seekable_decoder, > -- gst_flac_dec_read_seekable); > -- FLAC__seekable_stream_decoder_set_seek_callback (dec->seekable_decoder, > -- gst_flac_dec_seek); > -- FLAC__seekable_stream_decoder_set_tell_callback (dec->seekable_decoder, > -- gst_flac_dec_tell); > -- FLAC__seekable_stream_decoder_set_length_callback (dec->seekable_decoder, > -- gst_flac_dec_length); > -- FLAC__seekable_stream_decoder_set_eof_callback (dec->seekable_decoder, > -- gst_flac_dec_eof); > -- FLAC__seekable_stream_decoder_set_write_callback (dec->seekable_decoder, > -- gst_flac_dec_write_seekable); > -- FLAC__seekable_stream_decoder_set_metadata_respond (dec->seekable_decoder, > -+ FLAC__stream_decoder_set_metadata_respond (dec->seekable_decoder, > - FLAC__METADATA_TYPE_VORBIS_COMMENT); > -- FLAC__seekable_stream_decoder_set_metadata_callback (dec->seekable_decoder, > -- gst_flac_dec_metadata_callback_seekable); > -- FLAC__seekable_stream_decoder_set_error_callback (dec->seekable_decoder, > -- gst_flac_dec_error_callback_seekable); > -- FLAC__seekable_stream_decoder_set_client_data (dec->seekable_decoder, dec); > - } > - > - static void > -@@ -270,17 +253,8 @@ gst_flac_dec_setup_stream_decoder (GstFlacDec * dec) > - > - dec->stream_decoder = FLAC__stream_decoder_new (); > - > -- FLAC__stream_decoder_set_read_callback (dec->stream_decoder, > -- gst_flac_dec_read_stream); > -- FLAC__stream_decoder_set_write_callback (dec->stream_decoder, > -- gst_flac_dec_write_stream); > - FLAC__stream_decoder_set_metadata_respond (dec->stream_decoder, > - FLAC__METADATA_TYPE_VORBIS_COMMENT); > -- FLAC__stream_decoder_set_metadata_callback (dec->stream_decoder, > -- gst_flac_dec_metadata_callback_stream); > -- FLAC__stream_decoder_set_error_callback (dec->stream_decoder, > -- gst_flac_dec_error_callback_stream); > -- FLAC__stream_decoder_set_client_data (dec->stream_decoder, dec); > - } > - > - static void > -@@ -545,7 +519,7 @@ gst_flac_dec_metadata_callback (GstFlacDec * flacdec, > - } > - > - static void > --gst_flac_dec_metadata_callback_seekable (const FLAC__SeekableStreamDecoder * d, > -+gst_flac_dec_metadata_callback_seekable (const FLAC__StreamDecoder * d, > - const FLAC__StreamMetadata * metadata, void *client_data) > - { > - GstFlacDec *dec = GST_FLAC_DEC (client_data); > -@@ -588,7 +562,7 @@ gst_flac_dec_error_callback (GstFlacDec * dec, > - } > - > - static void > --gst_flac_dec_error_callback_seekable (const FLAC__SeekableStreamDecoder * d, > -+gst_flac_dec_error_callback_seekable (const FLAC__StreamDecoder * d, > - FLAC__StreamDecoderErrorStatus status, void *client_data) > - { > - gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); > -@@ -601,8 +575,8 @@ gst_flac_dec_error_callback_stream (const FLAC__Stream > - gst_flac_dec_error_callback (GST_FLAC_DEC (client_data), status); > - } > - > --static FLAC__SeekableStreamDecoderSeekStatus > --gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * decoder, > -+static FLAC__StreamDecoderSeekStatus > -+gst_flac_dec_seek (const FLAC__StreamDecoder * decoder, > - FLAC__uint64 position, void *client_data) > - { > - GstFlacDec *flacdec; > -@@ -612,11 +586,11 @@ gst_flac_dec_seek (const FLAC__SeekableStreamDecoder * > - GST_DEBUG ("seek %" G_GINT64_FORMAT, position); > - flacdec->offset = position; > - > -- return FLAC__SEEKABLE_STREAM_DECODER_SEEK_STATUS_OK; > -+ return FLAC__STREAM_DECODER_SEEK_STATUS_OK; > - } > - > --static FLAC__SeekableStreamDecoderTellStatus > --gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * decoder, > -+static FLAC__StreamDecoderTellStatus > -+gst_flac_dec_tell (const FLAC__StreamDecoder * decoder, > - FLAC__uint64 * position, void *client_data) > - { > - GstFlacDec *flacdec; > -@@ -627,11 +601,11 @@ gst_flac_dec_tell (const FLAC__SeekableStreamDecoder * > - > - GST_DEBUG ("tell %" G_GINT64_FORMAT, *position); > - > -- return FLAC__SEEKABLE_STREAM_DECODER_TELL_STATUS_OK; > -+ return FLAC__STREAM_DECODER_TELL_STATUS_OK; > - } > - > --static FLAC__SeekableStreamDecoderLengthStatus > --gst_flac_dec_length (const FLAC__SeekableStreamDecoder * decoder, > -+static FLAC__StreamDecoderLengthStatus > -+gst_flac_dec_length (const FLAC__StreamDecoder * decoder, > - FLAC__uint64 * length, void *client_data) > - { > - GstFlacDec *flacdec; > -@@ -642,21 +616,21 @@ gst_flac_dec_length (const FLAC__SeekableStreamDecoder > - flacdec = GST_FLAC_DEC (client_data); > - > - if (!(peer = gst_pad_get_peer (flacdec->sinkpad))) > -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; > -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; > - gst_pad_query_duration (peer, &fmt, &len); > - gst_object_unref (peer); > - if (fmt != GST_FORMAT_BYTES || len == -1) > -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_ERROR; > -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_ERROR; > - > - *length = len; > - > - GST_DEBUG ("length %" G_GINT64_FORMAT, *length); > - > -- return FLAC__SEEKABLE_STREAM_DECODER_LENGTH_STATUS_OK; > -+ return FLAC__STREAM_DECODER_LENGTH_STATUS_OK; > - } > - > - static FLAC__bool > --gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * decoder, > -+gst_flac_dec_eof (const FLAC__StreamDecoder * decoder, > - void *client_data) > - { > - GstFlacDec *flacdec; > -@@ -685,9 +659,9 @@ gst_flac_dec_eof (const FLAC__SeekableStreamDecoder * > - return ret; > - } > - > --static FLAC__SeekableStreamDecoderReadStatus > --gst_flac_dec_read_seekable (const FLAC__SeekableStreamDecoder * decoder, > -- FLAC__byte buffer[], unsigned *bytes, void *client_data) > -+static FLAC__StreamDecoderReadStatus > -+gst_flac_dec_read_seekable (const FLAC__StreamDecoder * decoder, > -+ FLAC__byte buffer[], size_t *bytes, void *client_data) > - { > - GstFlacDec *flacdec; > - GstBuffer *buf; > -@@ -696,7 +670,7 @@ gst_flac_dec_read_seekable (const FLAC__SeekableStream > - > - if (gst_pad_pull_range (flacdec->sinkpad, flacdec->offset, *bytes, > - &buf) != GST_FLOW_OK) > -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_ERROR; > -+ return FLAC__STREAM_DECODER_READ_STATUS_ABORT; > - > - GST_DEBUG ("Read %d bytes at %" G_GUINT64_FORMAT, > - GST_BUFFER_SIZE (buf), flacdec->offset); > -@@ -705,12 +679,12 @@ gst_flac_dec_read_seekable (const FLAC__SeekableStream > - gst_buffer_unref (buf); > - flacdec->offset += *bytes; > - > -- return FLAC__SEEKABLE_STREAM_DECODER_READ_STATUS_OK; > -+ return FLAC__STREAM_DECODER_READ_STATUS_CONTINUE; > - } > - > - static FLAC__StreamDecoderReadStatus > - gst_flac_dec_read_stream (const FLAC__StreamDecoder * decoder, > -- FLAC__byte buffer[], unsigned *bytes, void *client_data) > -+ FLAC__byte buffer[], size_t *bytes, void *client_data) > - { > - GstFlacDec *dec = GST_FLAC_DEC (client_data); > - guint len; > -@@ -881,7 +855,7 @@ done: > - } > - > - static FLAC__StreamDecoderWriteStatus > --gst_flac_dec_write_seekable (const FLAC__SeekableStreamDecoder * decoder, > -+gst_flac_dec_write_seekable (const FLAC__StreamDecoder * decoder, > - const FLAC__Frame * frame, > - const FLAC__int32 * const buffer[], void *client_data) > - { > -@@ -900,7 +874,7 @@ static void > - gst_flac_dec_loop (GstPad * sinkpad) > - { > - GstFlacDec *flacdec; > -- FLAC__SeekableStreamDecoderState s; > -+ FLAC__StreamDecoderState s; > - > - flacdec = GST_FLAC_DEC (GST_OBJECT_PARENT (sinkpad)); > - > -@@ -908,10 +882,13 @@ gst_flac_dec_loop (GstPad * sinkpad) > - > - if (flacdec->init) { > - GST_DEBUG_OBJECT (flacdec, "initializing decoder"); > -- s = FLAC__seekable_stream_decoder_init (flacdec->seekable_decoder); > -- if (s != FLAC__SEEKABLE_STREAM_DECODER_OK) > -+ s = FLAC__stream_decoder_init_stream (flacdec->seekable_decoder, > -+ gst_flac_dec_read_seekable, gst_flac_dec_seek, gst_flac_dec_tell, > -+ gst_flac_dec_length, gst_flac_dec_eof, gst_flac_dec_write_seekable, > -+ gst_flac_dec_metadata_callback_seekable, > -+ gst_flac_dec_error_callback_seekable, flacdec); > -+ if (s != FLAC__STREAM_DECODER_INIT_STATUS_OK) > - goto analyze_state; > -- /* FLAC__seekable_stream_decoder_process_metadata (flacdec->seekable_decoder); */ > - flacdec->init = FALSE; > - } > - > -@@ -920,15 +897,17 @@ gst_flac_dec_loop (GstPad * sinkpad) > - flacdec->last_flow = GST_FLOW_OK; > - > - GST_LOG_OBJECT (flacdec, "processing single"); > -- FLAC__seekable_stream_decoder_process_single (flacdec->seekable_decoder); > -+ FLAC__stream_decoder_process_single (flacdec->seekable_decoder); > - > - analyze_state: > - > - GST_LOG_OBJECT (flacdec, "done processing, checking encoder state"); > -- s = FLAC__seekable_stream_decoder_get_state (flacdec->seekable_decoder); > -+ s = FLAC__stream_decoder_get_state (flacdec->seekable_decoder); > - switch (s) { > -- case FLAC__SEEKABLE_STREAM_DECODER_OK: > -- case FLAC__SEEKABLE_STREAM_DECODER_SEEKING:{ > -+ case FLAC__STREAM_DECODER_SEARCH_FOR_METADATA: > -+ case FLAC__STREAM_DECODER_READ_METADATA: > -+ case FLAC__STREAM_DECODER_SEARCH_FOR_FRAME_SYNC: > -+ case FLAC__STREAM_DECODER_READ_FRAME:{ > - GST_DEBUG_OBJECT (flacdec, "everything ok"); > - > - if (flacdec->last_flow != GST_FLOW_OK && > -@@ -956,9 +935,9 @@ analyze_state: > - return; > - } > - > -- case FLAC__SEEKABLE_STREAM_DECODER_END_OF_STREAM:{ > -+ case FLAC__STREAM_DECODER_END_OF_STREAM:{ > - GST_DEBUG_OBJECT (flacdec, "EOS"); > -- FLAC__seekable_stream_decoder_reset (flacdec->seekable_decoder); > -+ FLAC__stream_decoder_reset (flacdec->seekable_decoder); > - > - if ((flacdec->segment.flags & GST_SEEK_FLAG_SEGMENT) != 0) { > - if (flacdec->segment.duration > 0) { > -@@ -972,18 +951,16 @@ analyze_state: > - goto eos_and_pause; > - } > - > -- case FLAC__SEEKABLE_STREAM_DECODER_MEMORY_ALLOCATION_ERROR: > -- case FLAC__SEEKABLE_STREAM_DECODER_STREAM_DECODER_ERROR: > -- case FLAC__SEEKABLE_STREAM_DECODER_READ_ERROR: > -- case FLAC__SEEKABLE_STREAM_DECODER_SEEK_ERROR: > -- case FLAC__SEEKABLE_STREAM_DECODER_ALREADY_INITIALIZED: > -- case FLAC__SEEKABLE_STREAM_DECODER_INVALID_CALLBACK: > -- case FLAC__SEEKABLE_STREAM_DECODER_UNINITIALIZED: > -+ case FLAC__STREAM_DECODER_OGG_ERROR: > -+ case FLAC__STREAM_DECODER_SEEK_ERROR: > -+ case FLAC__STREAM_DECODER_ABORTED: > -+ case FLAC__STREAM_DECODER_MEMORY_ALLOCATION_ERROR: > -+ case FLAC__STREAM_DECODER_UNINITIALIZED: > - default:{ > - /* fixme: this error sucks -- should try to figure out when/if an more > - specific error was already sent via the callback */ > - GST_ELEMENT_ERROR (flacdec, STREAM, DECODE, (NULL), > -- ("%s", FLAC__SeekableStreamDecoderStateString[s])); > -+ ("%s", FLAC__StreamDecoderStateString[s])); > - goto eos_and_pause; > - } > - } > -@@ -1113,7 +1090,10 @@ gst_flac_dec_chain (GstPad * pad, GstBuffer * buf) > - > - if (dec->init) { > - GST_DEBUG_OBJECT (dec, "initializing decoder"); > -- s = FLAC__stream_decoder_init (dec->stream_decoder); > -+ s = FLAC__stream_decoder_init_stream (dec->stream_decoder, > -+ gst_flac_dec_read_stream, NULL, NULL, NULL, NULL, > -+ gst_flac_dec_write_stream, gst_flac_dec_metadata_callback_stream, > -+ gst_flac_dec_error_callback_stream, dec); > - if (s != FLAC__STREAM_DECODER_SEARCH_FOR_METADATA) { > - GST_ELEMENT_ERROR (GST_ELEMENT (dec), LIBRARY, INIT, (NULL), (NULL)); > - return GST_FLOW_ERROR; > -@@ -1598,7 +1578,7 @@ gst_flac_dec_handle_seek_event (GstFlacDec * flacdec, > - flacdec->seeking = TRUE; > - > - seek_ok = > -- FLAC__seekable_stream_decoder_seek_absolute (flacdec->seekable_decoder, > -+ FLAC__stream_decoder_seek_absolute (flacdec->seekable_decoder, > - segment.start); > - > - flacdec->seeking = FALSE; > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h Tue Sep 18 20:33:25 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacdec_h Thu Jan 1 01:00:00 1970 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-ext_flac_gstflacdec_h,v 1.1 2007/09/18 18:33:25 naddy Exp $ > ---- ext/flac/gstflacdec.h.orig Mon Sep 17 19:57:31 2007 > -+++ ext/flac/gstflacdec.h Mon Sep 17 19:57:46 2007 > -@@ -41,7 +41,7 @@ typedef struct _GstFlacDecClass GstFlacDecClass; > - struct _GstFlacDec { > - GstElement element; > - > -- FLAC__SeekableStreamDecoder *seekable_decoder; /* for pull-based operation */ > -+ FLAC__StreamDecoder *seekable_decoder; /* for pull-based operation */ > - > - FLAC__StreamDecoder *stream_decoder; /* for chain-based operation */ > - GstAdapter *adapter; > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c Tue Sep 18 20:33:25 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_c Thu Jan 1 01:00:00 1970 > @@ -1,334 +0,0 @@ > -$OpenBSD: patch-ext_flac_gstflacenc_c,v 1.1 2007/09/18 18:33:25 naddy Exp $ > ---- ext/flac/gstflacenc.c.orig Mon Sep 17 22:36:42 2007 > -+++ ext/flac/gstflacenc.c Mon Sep 17 23:01:14 2007 > -@@ -109,14 +109,14 @@ static GstStateChangeReturn gst_flac_enc_change_state > - GstStateChange transition); > - > - static FLAC__StreamEncoderWriteStatus > --gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, > -- const FLAC__byte buffer[], unsigned bytes, > -+gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder, > -+ const FLAC__byte buffer[], size_t bytes, > - unsigned samples, unsigned current_frame, void *client_data); > --static FLAC__SeekableStreamEncoderSeekStatus > --gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, > -+static FLAC__StreamEncoderSeekStatus > -+gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder, > - FLAC__uint64 absolute_byte_offset, void *client_data); > --static FLAC__SeekableStreamEncoderTellStatus > --gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, > -+static FLAC__StreamEncoderTellStatus > -+gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder, > - FLAC__uint64 * absolute_byte_offset, void *client_data); > - > - typedef struct > -@@ -302,7 +302,7 @@ gst_flac_enc_init (GstFlacEnc * flacenc, GstFlacEncCla > - gst_pad_use_fixed_caps (flacenc->srcpad); > - gst_element_add_pad (GST_ELEMENT (flacenc), flacenc->srcpad); > - > -- flacenc->encoder = FLAC__seekable_stream_encoder_new (); > -+ flacenc->encoder = FLAC__stream_encoder_new (); > - > - flacenc->offset = 0; > - flacenc->samples_written = 0; > -@@ -315,7 +315,7 @@ gst_flac_enc_finalize (GObject * object) > - { > - GstFlacEnc *flacenc = GST_FLAC_ENC (object); > - > -- FLAC__seekable_stream_encoder_delete (flacenc->encoder); > -+ FLAC__stream_encoder_delete (flacenc->encoder); > - > - G_OBJECT_CLASS (parent_class)->finalize (object); > - } > -@@ -360,7 +360,7 @@ gst_flac_enc_set_metadata (GstFlacEnc * flacenc) > - FLAC__metadata_object_new (FLAC__METADATA_TYPE_VORBIS_COMMENT); > - gst_tag_list_foreach (copy, add_one_tag, flacenc); > - > -- if (FLAC__seekable_stream_encoder_set_metadata (flacenc->encoder, > -+ if (FLAC__stream_encoder_set_metadata (flacenc->encoder, > - flacenc->meta, 1) != true) > - g_warning ("Dude, i'm already initialized!"); > - gst_tag_list_free (copy); > -@@ -371,13 +371,13 @@ gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * cap > - { > - GstFlacEnc *flacenc; > - GstStructure *structure; > -- FLAC__SeekableStreamEncoderState state; > -+ FLAC__StreamEncoderState state; > - > - /* takes a ref on flacenc */ > - flacenc = GST_FLAC_ENC (gst_pad_get_parent (pad)); > - > -- if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != > -- FLAC__SEEKABLE_STREAM_ENCODER_UNINITIALIZED) > -+ if (FLAC__stream_encoder_get_state (flacenc->encoder) != > -+ FLAC__STREAM_ENCODER_UNINITIALIZED) > - goto encoder_already_initialized; > - > - structure = gst_caps_get_structure (caps, 0); > -@@ -397,26 +397,19 @@ gst_flac_enc_sink_setcaps (GstPad * pad, GstCaps * cap > - > - gst_caps_unref (caps); > - > -- FLAC__seekable_stream_encoder_set_bits_per_sample (flacenc->encoder, > -+ FLAC__stream_encoder_set_bits_per_sample (flacenc->encoder, > - flacenc->depth); > -- FLAC__seekable_stream_encoder_set_sample_rate (flacenc->encoder, > -+ FLAC__stream_encoder_set_sample_rate (flacenc->encoder, > - flacenc->sample_rate); > -- FLAC__seekable_stream_encoder_set_channels (flacenc->encoder, > -+ FLAC__stream_encoder_set_channels (flacenc->encoder, > - flacenc->channels); > - > -- FLAC__seekable_stream_encoder_set_write_callback (flacenc->encoder, > -- gst_flac_enc_write_callback); > -- FLAC__seekable_stream_encoder_set_seek_callback (flacenc->encoder, > -- gst_flac_enc_seek_callback); > -- FLAC__seekable_stream_encoder_set_tell_callback (flacenc->encoder, > -- gst_flac_enc_tell_callback); > -- > -- FLAC__seekable_stream_encoder_set_client_data (flacenc->encoder, flacenc); > -- > - gst_flac_enc_set_metadata (flacenc); > - > -- state = FLAC__seekable_stream_encoder_init (flacenc->encoder); > -- if (state != FLAC__STREAM_ENCODER_OK) > -+ state = FLAC__stream_encoder_init_stream (flacenc->encoder, > -+ gst_flac_enc_write_callback, gst_flac_enc_seek_callback, > -+ gst_flac_enc_tell_callback, NULL, flacenc); > -+ if (state != FLAC__STREAM_ENCODER_INIT_STATUS_OK) > - goto failed_to_initialize; > - > - gst_object_unref (flacenc); > -@@ -453,9 +446,9 @@ gst_flac_enc_update_quality (GstFlacEnc * flacenc, gin > - > - #define DO_UPDATE(name, val, str) \ > - G_STMT_START { \ > -- if (FLAC__seekable_stream_encoder_get_##name (flacenc->encoder) != \ > -+ if (FLAC__stream_encoder_get_##name (flacenc->encoder) != \ > - flacenc_params[quality].val) { \ > -- FLAC__seekable_stream_encoder_set_##name (flacenc->encoder, \ > -+ FLAC__stream_encoder_set_##name (flacenc->encoder, \ > - flacenc_params[quality].val); \ > - g_object_notify (G_OBJECT (flacenc), str); \ > - } \ > -@@ -490,8 +483,8 @@ gst_flac_enc_update_quality (GstFlacEnc * flacenc, gin > - return TRUE; > - } > - > --static FLAC__SeekableStreamEncoderSeekStatus > --gst_flac_enc_seek_callback (const FLAC__SeekableStreamEncoder * encoder, > -+static FLAC__StreamEncoderSeekStatus > -+gst_flac_enc_seek_callback (const FLAC__StreamEncoder * encoder, > - FLAC__uint64 absolute_byte_offset, void *client_data) > - { > - GstFlacEnc *flacenc; > -@@ -501,7 +494,7 @@ gst_flac_enc_seek_callback (const FLAC__SeekableStream > - flacenc = GST_FLAC_ENC (client_data); > - > - if (flacenc->stopped) > -- return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; > -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK; > - > - event = gst_event_new_new_segment (TRUE, 1.0, GST_FORMAT_BYTES, > - absolute_byte_offset, GST_BUFFER_OFFSET_NONE, 0); > -@@ -525,12 +518,12 @@ gst_flac_enc_seek_callback (const FLAC__SeekableStream > - > - flacenc->offset = absolute_byte_offset; > - > -- return FLAC__SEEKABLE_STREAM_ENCODER_SEEK_STATUS_OK; > -+ return FLAC__STREAM_ENCODER_SEEK_STATUS_OK; > - } > - > - static FLAC__StreamEncoderWriteStatus > --gst_flac_enc_write_callback (const FLAC__SeekableStreamEncoder * encoder, > -- const FLAC__byte buffer[], unsigned bytes, > -+gst_flac_enc_write_callback (const FLAC__StreamEncoder * encoder, > -+ const FLAC__byte buffer[], size_t bytes, > - unsigned samples, unsigned current_frame, void *client_data) > - { > - GstFlowReturn ret; > -@@ -577,15 +570,15 @@ gst_flac_enc_write_callback (const FLAC__SeekableStrea > - return FLAC__STREAM_ENCODER_WRITE_STATUS_OK; > - } > - > --static FLAC__SeekableStreamEncoderTellStatus > --gst_flac_enc_tell_callback (const FLAC__SeekableStreamEncoder * encoder, > -+static FLAC__StreamEncoderTellStatus > -+gst_flac_enc_tell_callback (const FLAC__StreamEncoder * encoder, > - FLAC__uint64 * absolute_byte_offset, void *client_data) > - { > - GstFlacEnc *flacenc = GST_FLAC_ENC (client_data); > - > - *absolute_byte_offset = flacenc->offset; > - > -- return FLAC__SEEKABLE_STREAM_ENCODER_TELL_STATUS_OK; > -+ return FLAC__STREAM_ENCODER_TELL_STATUS_OK; > - } > - > - static gboolean > -@@ -629,7 +622,7 @@ gst_flac_enc_sink_event (GstPad * pad, GstEvent * even > - break; > - } > - case GST_EVENT_EOS: > -- FLAC__seekable_stream_encoder_finish (flacenc->encoder); > -+ FLAC__stream_encoder_finish (flacenc->encoder); > - ret = gst_pad_event_default (pad, event); > - break; > - case GST_EVENT_TAG: > -@@ -686,7 +679,7 @@ gst_flac_enc_chain (GstPad * pad, GstBuffer * buffer) > - > - gst_buffer_unref (buffer); > - > -- res = FLAC__seekable_stream_encoder_process_interleaved (flacenc->encoder, > -+ res = FLAC__stream_encoder_process_interleaved (flacenc->encoder, > - (const FLAC__int32 *) data, samples / flacenc->channels); > - > - g_free (data); > -@@ -712,51 +705,51 @@ gst_flac_enc_set_property (GObject * object, guint pro > - gst_flac_enc_update_quality (this, g_value_get_enum (value)); > - break; > - case PROP_STREAMABLE_SUBSET: > -- FLAC__seekable_stream_encoder_set_streamable_subset (this->encoder, > -+ FLAC__stream_encoder_set_streamable_subset (this->encoder, > - g_value_get_boolean (value)); > - break; > - case PROP_MID_SIDE_STEREO: > -- FLAC__seekable_stream_encoder_set_do_mid_side_stereo (this->encoder, > -+ FLAC__stream_encoder_set_do_mid_side_stereo (this->encoder, > - g_value_get_boolean (value)); > - break; > - case PROP_LOOSE_MID_SIDE_STEREO: > -- FLAC__seekable_stream_encoder_set_loose_mid_side_stereo (this->encoder, > -+ FLAC__stream_encoder_set_loose_mid_side_stereo (this->encoder, > - g_value_get_boolean (value)); > - break; > - case PROP_BLOCKSIZE: > -- FLAC__seekable_stream_encoder_set_blocksize (this->encoder, > -+ FLAC__stream_encoder_set_blocksize (this->encoder, > - g_value_get_uint (value)); > - break; > - case PROP_MAX_LPC_ORDER: > -- FLAC__seekable_stream_encoder_set_max_lpc_order (this->encoder, > -+ FLAC__stream_encoder_set_max_lpc_order (this->encoder, > - g_value_get_uint (value)); > - break; > - case PROP_QLP_COEFF_PRECISION: > -- FLAC__seekable_stream_encoder_set_qlp_coeff_precision (this->encoder, > -+ FLAC__stream_encoder_set_qlp_coeff_precision (this->encoder, > - g_value_get_uint (value)); > - break; > - case PROP_QLP_COEFF_PREC_SEARCH: > -- FLAC__seekable_stream_encoder_set_do_qlp_coeff_prec_search (this->encoder, > -+ FLAC__stream_encoder_set_do_qlp_coeff_prec_search (this->encoder, > - g_value_get_boolean (value)); > - break; > - case PROP_ESCAPE_CODING: > -- FLAC__seekable_stream_encoder_set_do_escape_coding (this->encoder, > -+ FLAC__stream_encoder_set_do_escape_coding (this->encoder, > - g_value_get_boolean (value)); > - break; > - case PROP_EXHAUSTIVE_MODEL_SEARCH: > -- FLAC__seekable_stream_encoder_set_do_exhaustive_model_search (this-> > -+ FLAC__stream_encoder_set_do_exhaustive_model_search (this-> > - encoder, g_value_get_boolean (value)); > - break; > - case PROP_MIN_RESIDUAL_PARTITION_ORDER: > -- FLAC__seekable_stream_encoder_set_min_residual_partition_order (this-> > -+ FLAC__stream_encoder_set_min_residual_partition_order (this-> > - encoder, g_value_get_uint (value)); > - break; > - case PROP_MAX_RESIDUAL_PARTITION_ORDER: > -- FLAC__seekable_stream_encoder_set_max_residual_partition_order (this-> > -+ FLAC__stream_encoder_set_max_residual_partition_order (this-> > - encoder, g_value_get_uint (value)); > - break; > - case PROP_RICE_PARAMETER_SEARCH_DIST: > -- FLAC__seekable_stream_encoder_set_rice_parameter_search_dist (this-> > -+ FLAC__stream_encoder_set_rice_parameter_search_dist (this-> > - encoder, g_value_get_uint (value)); > - break; > - default: > -@@ -781,57 +774,57 @@ gst_flac_enc_get_property (GObject * object, guint pro > - break; > - case PROP_STREAMABLE_SUBSET: > - g_value_set_boolean (value, > -- FLAC__seekable_stream_encoder_get_streamable_subset (this->encoder)); > -+ FLAC__stream_encoder_get_streamable_subset (this->encoder)); > - break; > - case PROP_MID_SIDE_STEREO: > - g_value_set_boolean (value, > -- FLAC__seekable_stream_encoder_get_do_mid_side_stereo (this->encoder)); > -+ FLAC__stream_encoder_get_do_mid_side_stereo (this->encoder)); > - break; > - case PROP_LOOSE_MID_SIDE_STEREO: > - g_value_set_boolean (value, > -- FLAC__seekable_stream_encoder_get_loose_mid_side_stereo (this-> > -+ FLAC__stream_encoder_get_loose_mid_side_stereo (this-> > - encoder)); > - break; > - case PROP_BLOCKSIZE: > - g_value_set_uint (value, > -- FLAC__seekable_stream_encoder_get_blocksize (this->encoder)); > -+ FLAC__stream_encoder_get_blocksize (this->encoder)); > - break; > - case PROP_MAX_LPC_ORDER: > - g_value_set_uint (value, > -- FLAC__seekable_stream_encoder_get_max_lpc_order (this->encoder)); > -+ FLAC__stream_encoder_get_max_lpc_order (this->encoder)); > - break; > - case PROP_QLP_COEFF_PRECISION: > - g_value_set_uint (value, > -- FLAC__seekable_stream_encoder_get_qlp_coeff_precision (this-> > -+ FLAC__stream_encoder_get_qlp_coeff_precision (this-> > - encoder)); > - break; > - case PROP_QLP_COEFF_PREC_SEARCH: > - g_value_set_boolean (value, > -- FLAC__seekable_stream_encoder_get_do_qlp_coeff_prec_search (this-> > -+ FLAC__stream_encoder_get_do_qlp_coeff_prec_search (this-> > - encoder)); > - break; > - case PROP_ESCAPE_CODING: > - g_value_set_boolean (value, > -- FLAC__seekable_stream_encoder_get_do_escape_coding (this->encoder)); > -+ FLAC__stream_encoder_get_do_escape_coding (this->encoder)); > - break; > - case PROP_EXHAUSTIVE_MODEL_SEARCH: > - g_value_set_boolean (value, > -- FLAC__seekable_stream_encoder_get_do_exhaustive_model_search (this-> > -+ FLAC__stream_encoder_get_do_exhaustive_model_search (this-> > - encoder)); > - break; > - case PROP_MIN_RESIDUAL_PARTITION_ORDER: > - g_value_set_uint (value, > -- FLAC__seekable_stream_encoder_get_min_residual_partition_order (this-> > -+ FLAC__stream_encoder_get_min_residual_partition_order (this-> > - encoder)); > - break; > - case PROP_MAX_RESIDUAL_PARTITION_ORDER: > - g_value_set_uint (value, > -- FLAC__seekable_stream_encoder_get_max_residual_partition_order (this-> > -+ FLAC__stream_encoder_get_max_residual_partition_order (this-> > - encoder)); > - break; > - case PROP_RICE_PARAMETER_SEARCH_DIST: > - g_value_set_uint (value, > -- FLAC__seekable_stream_encoder_get_rice_parameter_search_dist (this-> > -+ FLAC__stream_encoder_get_rice_parameter_search_dist (this-> > - encoder)); > - break; > - default: > -@@ -864,10 +857,10 @@ gst_flac_enc_change_state (GstElement * element, GstSt > - case GST_STATE_CHANGE_PLAYING_TO_PAUSED: > - break; > - case GST_STATE_CHANGE_PAUSED_TO_READY: > -- if (FLAC__seekable_stream_encoder_get_state (flacenc->encoder) != > -+ if (FLAC__stream_encoder_get_state (flacenc->encoder) != > - FLAC__STREAM_ENCODER_UNINITIALIZED) { > - flacenc->stopped = TRUE; > -- FLAC__seekable_stream_encoder_finish (flacenc->encoder); > -+ FLAC__stream_encoder_finish (flacenc->encoder); > - } > - flacenc->offset = 0; > - flacenc->samples_written = 0; > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h Tue Sep 18 20:33:25 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-ext_flac_gstflacenc_h Thu Jan 1 01:00:00 1970 > @@ -1,12 +0,0 @@ > -$OpenBSD: patch-ext_flac_gstflacenc_h,v 1.1 2007/09/18 18:33:25 naddy Exp $ > ---- ext/flac/gstflacenc.h.orig Mon Sep 17 19:57:02 2007 > -+++ ext/flac/gstflacenc.h Mon Sep 17 19:57:18 2007 > -@@ -54,7 +54,7 @@ struct _GstFlacEnc { > - gboolean stopped; > - FLAC__int32 *data; > - > -- FLAC__SeekableStreamEncoder *encoder; > -+ FLAC__StreamEncoder *encoder; > - FLAC__StreamMetadata **meta; > - > - GstTagList * tags; > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in Mon Jan 8 18:37:27 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_Makefile_in Thu Mar 13 19:42:09 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sys_oss_Makefile_in,v 1.1.1.1 2007/01/08 17:37:27 espie Exp $ > ---- sys/oss/Makefile.in.orig Mon Jan 8 17:00:35 2007 > -+++ sys/oss/Makefile.in Mon Jan 8 17:02:15 2007 > -@@ -492,7 +492,8 @@ libgstossaudio_la_LIBADD = \ > +--- sys/oss/Makefile.in.orig Wed Feb 20 23:09:52 2008 > ++++ sys/oss/Makefile.in Thu Mar 13 19:30:56 2008 > +@@ -519,7 +519,8 @@ libgstossaudio_la_LIBADD = \ > $(GST_PLUGINS_BASE_LIBS) \ > -lgstinterfaces-$(GST_MAJORMINOR) \ > -lgstaudio-$(GST_MAJORMINOR) \ > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c Thu Feb 14 19:52:00 2008 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosshelper_c Thu Mar 13 19:42:09 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sys_oss_gstosshelper_c,v 1.1 2008/02/14 18:52:00 ajacoutot Exp $ > ---- sys/oss/gstosshelper.c.orig Thu Feb 14 09:28:31 2008 > -+++ sys/oss/gstosshelper.c Thu Feb 14 09:29:52 2008 > -@@ -253,6 +253,12 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe) > +--- sys/oss/gstosshelper.c.orig Sat Dec 8 17:47:33 2007 > ++++ sys/oss/gstosshelper.c Thu Mar 13 19:30:33 2008 > +@@ -254,6 +254,12 @@ gst_oss_helper_rate_probe_check (GstOssProbe * probe) > * driver is seriously buggy, and probably doesn't work with other > * media libraries/apps. */ > probe->min = gst_oss_helper_rate_check_rate (probe, 8000); > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c Sun Sep 16 20:15:23 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssink_c Thu Mar 13 19:42:09 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sys_oss_gstosssink_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ > ---- sys/oss/gstosssink.c.orig Tue Oct 17 16:37:49 2006 > -+++ sys/oss/gstosssink.c Sun Sep 16 20:09:41 2007 > -@@ -118,7 +118,7 @@ enum > +--- sys/oss/gstosssink.c.orig Fri Dec 7 21:07:49 2007 > ++++ sys/oss/gstosssink.c Thu Mar 13 19:30:33 2008 > +@@ -120,7 +120,7 @@ enum > LAST_SIGNAL > }; > > @@ -10,7 +10,7 @@ > enum > { > PROP_0, > -@@ -219,7 +219,7 @@ gst_oss_sink_class_init (GstOssSinkClass * klass) > +@@ -221,7 +221,7 @@ gst_oss_sink_class_init (GstOssSinkClass * klass) > > g_object_class_install_property (gobject_class, PROP_DEVICE, > g_param_spec_string ("device", "Device", > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c Sun Sep 16 20:15:23 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_oss_gstosssrc_c Thu Mar 13 19:42:09 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sys_oss_gstosssrc_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ > ---- sys/oss/gstosssrc.c.orig Wed Aug 16 12:22:31 2006 > -+++ sys/oss/gstosssrc.c Sun Sep 16 20:09:41 2007 > -@@ -76,7 +76,7 @@ GST_ELEMENT_DETAILS ("Audio Source (OSS)", > +--- sys/oss/gstosssrc.c.orig Fri Dec 7 21:07:49 2007 > ++++ sys/oss/gstosssrc.c Thu Mar 13 19:30:33 2008 > +@@ -78,7 +78,7 @@ GST_ELEMENT_DETAILS ("Audio Source (OSS)", > "Capture from a sound card via OSS", > "Erik Walthinsen <omega@...>, " "Wim Taymans <wim@...>"); > > @@ -10,7 +10,7 @@ > #define DEFAULT_DEVICE_NAME "" > > enum > -@@ -175,7 +175,7 @@ gst_oss_src_class_init (GstOssSrcClass * klass) > +@@ -180,7 +180,7 @@ gst_oss_src_class_init (GstOssSrcClass * klass) > > g_object_class_install_property (gobject_class, PROP_DEVICE, > g_param_spec_string ("device", "Device", > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudio_c Thu Mar 13 21:36:24 2008 > @@ -0,0 +1,451 @@ > +$OpenBSD$ > +--- sys/sunaudio/gstsunaudio.c.orig Thu Mar 13 21:35:21 2008 > ++++ sys/sunaudio/gstsunaudio.c Mon Apr 16 23:29:40 2007 > +@@ -1,9 +1,7 @@ > + /* > +- * GStreamer - SunAudio source > ++ * GStreamer - SunAudio plugin > + * Copyright (C) 2005,2006 Brian Cameron <brian.cameron@...> > + * > +- * gstsunaudiosrc.c: > +- * > + * This library is free software; you can redistribute it and/or > + * modify it under the terms of the GNU Library General Public > + * License as published by the Free Software Foundation; either > +@@ -20,413 +18,45 @@ > + * Boston, MA 02111-1307, USA. > + */ > + > +-/** > +- * SECTION:element-sunaudiosrc > +- * > +- * <refsect2> > +- * <para> > +- * sunaudiosrc is an audio source designed to work with the Sun Audio > +- * interface available in Solaris. > +- * </para> > +- * <title>Example launch line</title> > +- * <para> > +- * <programlisting> > +- * > +- * gst-launch sunaudiosrc ! filesink location=outfile > +- * </programlisting> > +- * </para> > +- * </refsect2> > +- */ > +- > + #ifdef HAVE_CONFIG_H > + #include "config.h" > + #endif > + > +-#include <fcntl.h> > +-#include <string.h> > +-#include <unistd.h> > +-#include <stropts.h> > +-#include <sys/mixer.h> > ++#include "gst/gst-i18n-plugin.h" > + > ++#include "gstsunaudiomixer.h" > ++#include "gstsunaudiosink.h" > + #include "gstsunaudiosrc.h" > + > +-GST_DEBUG_CATEGORY_EXTERN (sunaudio_debug); > +-#define GST_CAT_DEFAULT sunaudio_debug > ++extern gchar *__gst_oss_plugin_dir; > + > +-static GstElementDetails plugin_details = > +-GST_ELEMENT_DETAILS ("Sun Audio Source", > +- "Source/Audio", > +- "Audio source for Sun Audio devices", > +- "Brian Cameron <brian.cameron@...>"); > ++GST_DEBUG_CATEGORY (sunaudio_debug); > + > +-static void gst_sunaudiosrc_base_init (gpointer g_class); > +-static void gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass); > +-static void gst_sunaudiosrc_init (GstSunAudioSrc * sunaudiosrc, > +- GstSunAudioSrcClass * g_class); > +-static void gst_sunaudiosrc_dispose (GObject * object); > +- > +-static void gst_sunaudiosrc_set_property (GObject * object, guint prop_id, > +- const GValue * value, GParamSpec * pspec); > +-static void gst_sunaudiosrc_get_property (GObject * object, guint prop_id, > +- GValue * value, GParamSpec * pspec); > +- > +-static GstCaps *gst_sunaudiosrc_getcaps (GstBaseSrc * bsrc); > +- > +-static gboolean gst_sunaudiosrc_open (GstAudioSrc * asrc); > +-static gboolean gst_sunaudiosrc_close (GstAudioSrc * asrc); > +-static gboolean gst_sunaudiosrc_prepare (GstAudioSrc * asrc, > +- GstRingBufferSpec * spec); > +-static gboolean gst_sunaudiosrc_unprepare (GstAudioSrc * asrc); > +-static guint gst_sunaudiosrc_read (GstAudioSrc * asrc, gpointer data, > +- guint length); > +-static guint gst_sunaudiosrc_delay (GstAudioSrc * asrc); > +-static void gst_sunaudiosrc_reset (GstAudioSrc * asrc); > +- > +-#define DEFAULT_DEVICE "/dev/audio" > +- > +-enum > +-{ > +- PROP_0, > +- PROP_DEVICE > +-}; > +- > +-GST_BOILERPLATE_WITH_INTERFACE (GstSunAudioSrc, gst_sunaudiosrc, > +- GstAudioSrc, GST_TYPE_AUDIO_SRC, GstMixer, GST_TYPE_MIXER, gst_sunaudiosrc); > +- > +-GST_IMPLEMENT_SUNAUDIO_MIXER_CTRL_METHODS (GstSunAudioSrc, gst_sunaudiosrc); > +- > +-static GstStaticPadTemplate gst_sunaudiosrc_factory = > +-GST_STATIC_PAD_TEMPLATE ("src", > +- GST_PAD_SRC, > +- GST_PAD_ALWAYS, > +- GST_STATIC_CAPS ("audio/x-raw-int, " > +- "endianness = (int) BYTE_ORDER, " > +- "signed = (boolean) TRUE, " "width = (int) 16, " "depth = (int) 16, " > +- /* [5510,48000] seems to be a Solaris limit */ > +- "rate = (int) [ 5510, 48000 ], " "channels = (int) [ 1, 2 ]") > +- ); > +- > +-static void > +-gst_sunaudiosrc_dispose (GObject * object) > +-{ > +- G_OBJECT_CLASS (parent_class)->dispose (object); > +-} > +- > +-static void > +-gst_sunaudiosrc_base_init (gpointer g_class) > +-{ > +- GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); > +- > +- gst_element_class_add_pad_template (element_class, > +- gst_static_pad_template_get (&gst_sunaudiosrc_factory)); > +- gst_element_class_set_details (element_class, &plugin_details); > +-} > +- > +-static void > +-gst_sunaudiosrc_class_init (GstSunAudioSrcClass * klass) > +-{ > +- GObjectClass *gobject_class; > +- GstElementClass *gstelement_class; > +- GstBaseSrcClass *gstbasesrc_class; > +- GstBaseAudioSrcClass *gstbaseaudiosrc_class; > +- GstAudioSrcClass *gstaudiosrc_class; > +- > +- gobject_class = (GObjectClass *) klass; > +- gstelement_class = (GstElementClass *) klass; > +- gstbasesrc_class = (GstBaseSrcClass *) klass; > +- gstbaseaudiosrc_class = (GstBaseAudioSrcClass *) klass; > +- gstaudiosrc_class = (GstAudioSrcClass *) klass; > +- > +- gobject_class->dispose = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_dispose); > +- gobject_class->get_property = > +- GST_DEBUG_FUNCPTR (gst_sunaudiosrc_get_property); > +- gobject_class->set_property = > +- GST_DEBUG_FUNCPTR (gst_sunaudiosrc_set_property); > +- > +- gstbasesrc_class->get_caps = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_getcaps); > +- > +- gstaudiosrc_class->open = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_open); > +- gstaudiosrc_class->prepare = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_prepare); > +- gstaudiosrc_class->unprepare = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_unprepare); > +- gstaudiosrc_class->close = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_close); > +- gstaudiosrc_class->read = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_read); > +- gstaudiosrc_class->delay = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_delay); > +- gstaudiosrc_class->reset = GST_DEBUG_FUNCPTR (gst_sunaudiosrc_reset); > +- > +- g_object_class_install_property (gobject_class, PROP_DEVICE, > +- g_param_spec_string ("device", "Device", > +- "SunAudio device (usually /dev/audio)", DEFAULT_DEVICE, > +- G_PARAM_READWRITE)); > +-} > +- > +-static void > +-gst_sunaudiosrc_init (GstSunAudioSrc * sunaudiosrc, > +- GstSunAudioSrcClass * g_class) > +-{ > +- const char *audiodev; > +- > +- GST_DEBUG_OBJECT (sunaudiosrc, "initializing sunaudiosrc"); > +- > +- sunaudiosrc->fd = -1; > +- > +- audiodev = g_getenv ("AUDIODEV"); > +- if (audiodev == NULL) > +- audiodev = DEFAULT_DEVICE; > +- sunaudiosrc->device = g_strdup (audiodev); > +-} > +- > +-static void > +-gst_sunaudiosrc_set_property (GObject * object, guint prop_id, > +- const GValue * value, GParamSpec * pspec) > +-{ > +- GstSunAudioSrc *sunaudiosrc; > +- > +- sunaudiosrc = GST_SUNAUDIO_SRC (object); > +- > +- switch (prop_id) { > +- case PROP_DEVICE: > +- if (sunaudiosrc->device) > +- g_free (sunaudiosrc->device); > +- sunaudiosrc->device = g_value_dup_string (value); > +- break; > +- default: > +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); > +- break; > +- } > +-} > +- > +-static void > +-gst_sunaudiosrc_get_property (GObject * object, guint prop_id, > +- GValue * value, GParamSpec * pspec) > +-{ > +- GstSunAudioSrc *sunaudiosrc; > +- > +- sunaudiosrc = GST_SUNAUDIO_SRC (object); > +- > +- switch (prop_id) { > +- case PROP_DEVICE: > +- g_value_set_string (value, sunaudiosrc->device); > +- break; > +- default: > +- G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec); > +- break; > +- } > +-} > +- > +-static GstCaps * > +-gst_sunaudiosrc_getcaps (GstBaseSrc * bsrc) > +-{ > +- GstPadTemplate *pad_template; > +- GstCaps *caps = NULL; > +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (bsrc); > +- > +- GST_DEBUG_OBJECT (sunaudiosrc, "getcaps called"); > +- > +- pad_template = gst_static_pad_template_get (&gst_sunaudiosrc_factory); > +- caps = gst_caps_copy (gst_pad_template_get_caps (pad_template)); > +- > +- gst_object_unref (pad_template); > +- > +- return caps; > +-} > +- > + static gboolean > +-gst_sunaudiosrc_open (GstAudioSrc * asrc) > ++plugin_init (GstPlugin * plugin) > + { > +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); > +- int fd, ret; > +- > +- fd = open (sunaudiosrc->device, O_RDONLY); > +- > +- if (fd == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, OPEN_READ, (NULL), > +- ("can't open connection to Sun Audio device %s", sunaudiosrc->device)); > +- > ++ if (!gst_element_register (plugin, "sunaudiomixer", GST_RANK_NONE, > ++ GST_TYPE_SUNAUDIO_MIXER) || > ++ !gst_element_register (plugin, "sunaudiosink", GST_RANK_SECONDARY, > ++ GST_TYPE_SUNAUDIO_SINK) || > ++ !gst_element_register (plugin, "sunaudiosrc", GST_RANK_SECONDARY, > ++ GST_TYPE_SUNAUDIO_SRC)) { > + return FALSE; > + } > + > +- sunaudiosrc->fd = fd; > ++ GST_DEBUG_CATEGORY_INIT (sunaudio_debug, "sunaudio", 0, "sunaudio elements"); > + > +- ret = ioctl (fd, AUDIO_GETDEV, &sunaudiosrc->dev); > +- if (ret == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- return FALSE; > +- } > ++#ifdef ENABLE_NLS > ++ setlocale (LC_ALL, ""); > ++ bindtextdomain (GETTEXT_PACKAGE, LOCALEDIR); > ++ bind_textdomain_codeset (GETTEXT_PACKAGE, "UTF-8"); > ++#endif /* ENABLE_NLS */ > + > +- GST_DEBUG_OBJECT (sunaudiosrc, "name %s", sunaudiosrc->dev.name); > +- GST_DEBUG_OBJECT (sunaudiosrc, "version %s", sunaudiosrc->dev.version); > +- GST_DEBUG_OBJECT (sunaudiosrc, "config %s", sunaudiosrc->dev.config); > +- > +- ret = ioctl (fd, AUDIO_GETINFO, &sunaudiosrc->info); > +- if (ret == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- return FALSE; > +- } > +- > +- GST_DEBUG_OBJECT (sunaudiosrc, "monitor_gain %d", > +- sunaudiosrc->info.monitor_gain); > +- GST_DEBUG_OBJECT (sunaudiosrc, "output_muted %d", > +- sunaudiosrc->info.output_muted); > +- GST_DEBUG_OBJECT (sunaudiosrc, "hw_features %08x", > +- sunaudiosrc->info.hw_features); > +- GST_DEBUG_OBJECT (sunaudiosrc, "sw_features %08x", > +- sunaudiosrc->info.sw_features); > +- GST_DEBUG_OBJECT (sunaudiosrc, "sw_features_enabled %08x", > +- sunaudiosrc->info.sw_features_enabled); > +- > +- if (!sunaudiosrc->mixer) { > +- const char *audiodev; > +- > +- audiodev = g_getenv ("AUDIODEV"); > +- if (audiodev == NULL) { > +- sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new ("/dev/audioctl"); > +- } else { > +- gchar *device = g_strdup_printf ("%sctl", audiodev); > +- > +- sunaudiosrc->mixer = gst_sunaudiomixer_ctrl_new (device); > +- g_free (device); > +- } > +- } > +- > + return TRUE; > + } > + > +-static gboolean > +-gst_sunaudiosrc_close (GstAudioSrc * asrc) > +-{ > +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); > +- > +- close (sunaudiosrc->fd); > +- sunaudiosrc->fd = -1; > +- > +- if (sunaudiosrc->mixer) { > +- gst_sunaudiomixer_ctrl_free (sunaudiosrc->mixer); > +- sunaudiosrc->mixer = NULL; > +- } > +- > +- return TRUE; > +-} > +- > +-static gboolean > +-gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec) > +-{ > +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); > +- audio_info_t ainfo; > +- int ret; > +- int ctrl_fd = -1; > +- int ports; > +- > +- ret = ioctl (sunaudiosrc->fd, AUDIO_GETINFO, &ainfo); > +- if (ret == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- return FALSE; > +- } > +- > +- if (spec->width != 16) > +- return FALSE; > +- > +- AUDIO_INITINFO (&ainfo); > +- > +- ainfo.record.sample_rate = spec->rate; > +- ainfo.record.precision = spec->width; > +- ainfo.record.channels = spec->channels; > +- ainfo.record.encoding = AUDIO_ENCODING_LINEAR; > +- ainfo.record.buffer_size = spec->buffer_time; > +- > +- GstSunAudioMixerCtrl *mixer = sunaudiosrc->mixer; > +- struct audio_info audioinfo; > +- > +- if (ioctl (mixer->mixer_fd, AUDIO_GETINFO, &audioinfo) < 0) { > +- g_warning ("Error getting audio device volume"); > +- } > +- ainfo.record.port = audioinfo.record.port; > +- ainfo.record.gain = audioinfo.record.gain; > +- ainfo.record.balance = audioinfo.record.balance; > +- > +- spec->segsize = 128; > +- spec->segtotal = spec->buffer_time / 128; > +- > +- spec->silence_sample[0] = 0; > +- spec->silence_sample[1] = 0; > +- spec->silence_sample[2] = 0; > +- spec->silence_sample[3] = 0; > +- > +- ret = ioctl (sunaudiosrc->fd, AUDIO_SETINFO, &ainfo); > +- if (ret == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- return FALSE; > +- } > +- > +- > +- ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); > +- > +- return TRUE; > +-} > +- > +-static gboolean > +-gst_sunaudiosrc_unprepare (GstAudioSrc * asrc) > +-{ > +- return TRUE; > +-} > +- > +-static guint > +-gst_sunaudiosrc_read (GstAudioSrc * asrc, gpointer data, guint length) > +-{ > +- return read (GST_SUNAUDIO_SRC (asrc)->fd, data, length); > +-} > +- > +-static guint > +-gst_sunaudiosrc_delay (GstAudioSrc * asrc) > +-{ > +- return 0; > +-} > +- > +-static void > +-gst_sunaudiosrc_reset (GstAudioSrc * asrc) > +-{ > +- /* Get current values */ > +- GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIO_SRC (asrc); > +- audio_info_t ainfo; > +- int ret; > +- > +- ret = ioctl (sunaudiosrc->fd, AUDIO_GETINFO, &ainfo); > +- if (ret == -1) { > +- /* > +- * Should never happen, but if we couldn't getinfo, then no point > +- * trying to setinfo > +- */ > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- return; > +- } > +- > +- /* > +- * Pause the audio - so audio stops playing immediately rather than > +- * waiting for the ringbuffer to empty. > +- */ > +- ainfo.record.pause = !NULL; > +- ret = ioctl (sunaudiosrc->fd, AUDIO_SETINFO, &ainfo); > +- if (ret == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- } > +- > +- /* Flush the audio */ > +- ret = ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); > +- if (ret == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- } > +- > +- /* unpause the audio */ > +- ainfo.record.pause = NULL; > +- ret = ioctl (sunaudiosrc->fd, AUDIO_SETINFO, &ainfo); > +- if (ret == -1) { > +- GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > +- strerror (errno))); > +- } > +-} > ++GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, > ++ GST_VERSION_MINOR, > ++ "sunaudio", > ++ "Sun Audio support for GStreamer", > ++ plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c Sun Sep 16 20:15:23 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_c Thu Mar 13 21:32:48 2008 > @@ -1,7 +1,24 @@ > $OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ > ---- sys/sunaudio/gstsunaudiomixerctrl.c.orig Sat Dec 16 14:51:48 2006 > -+++ sys/sunaudio/gstsunaudiomixerctrl.c Sun Sep 16 20:09:41 2007 > -@@ -235,20 +235,10 @@ gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtr > +--- sys/sunaudio/gstsunaudiomixerctrl.c.orig Fri Jan 11 22:08:59 2008 > ++++ sys/sunaudio/gstsunaudiomixerctrl.c Thu Mar 13 21:32:46 2008 > +@@ -29,7 +29,6 @@ > + #include <string.h> > + #include <errno.h> > + #include <sys/ioctl.h> > +-#include <sys/mixer.h> > + > + #include <gst/gst-i18n-plugin.h> > + > +@@ -61,8 +60,6 @@ gst_sunaudiomixer_ctrl_open (GstSunAudioMixerCtrl * mi > + > + return FALSE; > + } > +- /* Try to set the multiple open flag if we can, but ignore errors */ > +- ioctl (mixer->mixer_fd, AUDIO_MIXER_MULTIPLE_OPEN); > + > + mixer->mixer_fd = fd; > + return TRUE; > +@@ -238,20 +235,10 @@ gst_sunaudiomixer_ctrl_get_volume (GstSunAudioMixerCtr > } > } > > @@ -23,7 +40,18 @@ > } > > void > -@@ -337,11 +327,6 @@ gst_sunaudiomixer_ctrl_set_mute (GstSunAudioMixerCtrl > +@@ -263,10 +250,8 @@ gst_sunaudiomixer_ctrl_set_volume (GstSunAudioMixerCtr > + gint l_real_gain; > + gint r_real_gain; > + float ratio; > +- gchar buf[100]; > + struct audio_info audioinfo; > + GstSunAudioMixerTrack *sunaudiotrack = GST_SUNAUDIO_MIXER_TRACK (track); > +- gint temp[2]; > + > + l_real_gain = volumes[0]; > + r_real_gain = volumes[1]; > +@@ -340,11 +325,6 @@ gst_sunaudiomixer_ctrl_set_mute (GstSunAudioMixerCtrl > > switch (sunaudiotrack->track_num) { > case GST_SUNAUDIO_TRACK_OUTPUT: > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h Wed Jan 10 00:22:56 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiomixerctrl_h Thu Mar 13 19:42:08 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sys_sunaudio_gstsunaudiomixerctrl_h,v 1.1 2007/01/09 23:22:56 espie Exp $ > ---- sys/sunaudio/gstsunaudiomixerctrl.h.orig Tue Jan 9 23:18:47 2007 > -+++ sys/sunaudio/gstsunaudiomixerctrl.h Tue Jan 9 23:19:06 2007 > -@@ -19,6 +19,8 @@ > +--- sys/sunaudio/gstsunaudiomixerctrl.h.orig Mon Apr 16 23:29:40 2007 > ++++ sys/sunaudio/gstsunaudiomixerctrl.h Thu Mar 13 19:30:33 2008 > +@@ -20,6 +20,8 @@ > #ifndef __GST_SUNAUDIO_MIXER_CTRL_H > #define __GST_SUNAUDIO_MIXER_CTRL_H > > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c Sun Sep 16 20:15:23 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_c Thu Mar 13 21:17:07 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sys_sunaudio_gstsunaudiosink_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ > ---- sys/sunaudio/gstsunaudiosink.c.orig Sat Dec 16 14:51:48 2006 > -+++ sys/sunaudio/gstsunaudiosink.c Sun Sep 16 20:09:41 2007 > -@@ -42,7 +42,6 @@ > +--- sys/sunaudio/gstsunaudiosink.c.orig Mon Apr 16 23:29:40 2007 > ++++ sys/sunaudio/gstsunaudiosink.c Thu Mar 13 21:17:01 2008 > +@@ -43,7 +43,6 @@ > > #include <fcntl.h> > #include <string.h> > @@ -9,7 +9,28 @@ > #include <unistd.h> > #include <sys/mman.h> > > -@@ -623,7 +622,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) > +@@ -205,7 +204,6 @@ gst_sunaudiosink_class_init (GstSunAudioSinkClass * kl > + static void > + gst_sunaudiosink_init (GstSunAudioSink * sunaudiosink) > + { > +- GstBaseAudioSink *ba_sink = GST_BASE_AUDIO_SINK (sunaudiosink); > + const char *audiodev; > + > + GST_DEBUG_OBJECT (sunaudiosink, "initializing sunaudiosink"); > +@@ -319,12 +317,6 @@ gst_sunaudiosink_open (GstAudioSink * asink) > + sunaudiosink->info.monitor_gain); > + GST_DEBUG_OBJECT (sunaudiosink, "output_muted %d", > + sunaudiosink->info.output_muted); > +- GST_DEBUG_OBJECT (sunaudiosink, "hw_features %08x", > +- sunaudiosink->info.hw_features); > +- GST_DEBUG_OBJECT (sunaudiosink, "sw_features %08x", > +- sunaudiosink->info.sw_features); > +- GST_DEBUG_OBJECT (sunaudiosink, "sw_features_enabled %08x", > +- sunaudiosink->info.sw_features_enabled); > + > + return TRUE; > + > +@@ -624,7 +616,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) > } > > /* Flush the audio */ > @@ -18,7 +39,7 @@ > if (ret == -1) { > GST_ELEMENT_ERROR (sunaudiosink, RESOURCE, SETTINGS, (NULL), ("%s", > strerror (errno))); > -@@ -638,7 +637,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) > +@@ -639,7 +631,7 @@ gst_sunaudiosink_reset (GstAudioSink * asink) > > g_cond_signal (sunaudiosink->sleep_cond); > > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h Wed Jan 10 00:22:56 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosink_h Thu Mar 13 19:42:09 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-sys_sunaudio_gstsunaudiosink_h,v 1.1 2007/01/09 23:22:56 espie Exp $ > ---- sys/sunaudio/gstsunaudiosink.h.orig Tue Jan 9 23:20:19 2007 > -+++ sys/sunaudio/gstsunaudiosink.h Tue Jan 9 23:20:32 2007 > -@@ -23,6 +23,8 @@ > +--- sys/sunaudio/gstsunaudiosink.h.orig Mon Apr 16 23:29:40 2007 > ++++ sys/sunaudio/gstsunaudiosink.h Thu Mar 13 19:30:33 2008 > +@@ -25,6 +25,8 @@ > #ifndef __GST_SUNAUDIO_SINK_H__ > #define __GST_SUNAUDIO_SINK_H__ > > diff -urN multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c > --- multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c Sun Sep 16 20:15:23 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/patches/patch-sys_sunaudio_gstsunaudiosrc_c Thu Jan 1 01:00:00 1970 > @@ -1,41 +0,0 @@ > -$OpenBSD: patch-sys_sunaudio_gstsunaudiosrc_c,v 1.2 2007/09/16 18:15:23 naddy Exp $ > ---- sys/sunaudio/gstsunaudiosrc.c.orig Sat Dec 16 14:51:48 2006 > -+++ sys/sunaudio/gstsunaudiosrc.c Sun Sep 16 20:09:41 2007 > -@@ -45,8 +45,6 @@ > - #include <fcntl.h> > - #include <string.h> > - #include <unistd.h> > --#include <stropts.h> > --#include <sys/mixer.h> > - > - #include "gstsunaudiosrc.h" > - > -@@ -248,9 +246,8 @@ gst_sunaudiosrc_open (GstAudioSrc * asrc) > - int fd, ret, err; > - > - fd = open (sunaudiosrc->device, O_RDONLY); > -- err = ioctl (fd, AUDIO_MIXER_MULTIPLE_OPEN); > - > -- if (fd == -1 || err == -1) { > -+ if (fd == -1) { > - GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, OPEN_READ, (NULL), > - ("can't open connection to Sun Audio device %s", sunaudiosrc->device)); > - > -@@ -375,7 +372,7 @@ gst_sunaudiosrc_prepare (GstAudioSrc * asrc, GstRingBu > - } > - > - > -- ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); > -+ ioctl (sunaudiosrc->fd, AUDIO_FLUSH); > - > - return TRUE; > - } > -@@ -429,7 +426,7 @@ gst_sunaudiosrc_reset (GstAudioSrc * asrc) > - } > - > - /* Flush the audio */ > -- ret = ioctl (sunaudiosrc->fd, I_FLUSH, FLUSHR); > -+ ret = ioctl (sunaudiosrc->fd, AUDIO_FLUSH); > - if (ret == -1) { > - GST_ELEMENT_ERROR (sunaudiosrc, RESOURCE, SETTINGS, (NULL), ("%s", > - strerror (errno))); > diff -urN multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main > --- multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main Fri Jan 12 00:14:11 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-good/pkg/PLIST-main Thu Mar 13 21:48:22 2008 > @@ -23,8 +23,12 @@ > lib/gstreamer-${VERSION}/libgstefence.so > lib/gstreamer-${VERSION}/libgsteffectv.la > lib/gstreamer-${VERSION}/libgsteffectv.so > +lib/gstreamer-${VERSION}/libgstequalizer.la > +lib/gstreamer-${VERSION}/libgstequalizer.so > lib/gstreamer-${VERSION}/libgstflxdec.la > lib/gstreamer-${VERSION}/libgstflxdec.so > +lib/gstreamer-${VERSION}/libgstgamma.la > +lib/gstreamer-${VERSION}/libgstgamma.so > lib/gstreamer-${VERSION}/libgstgoom.la > lib/gstreamer-${VERSION}/libgstgoom.so > lib/gstreamer-${VERSION}/libgsticydemux.la > @@ -37,18 +41,24 @@ > lib/gstreamer-${VERSION}/libgstmatroska.so > lib/gstreamer-${VERSION}/libgstmulaw.la > lib/gstreamer-${VERSION}/libgstmulaw.so > +lib/gstreamer-${VERSION}/libgstmultifile.la > +lib/gstreamer-${VERSION}/libgstmultifile.so > lib/gstreamer-${VERSION}/libgstmultipart.la > lib/gstreamer-${VERSION}/libgstmultipart.so > lib/gstreamer-${VERSION}/libgstnavigationtest.la > lib/gstreamer-${VERSION}/libgstnavigationtest.so > lib/gstreamer-${VERSION}/libgstossaudio.la > lib/gstreamer-${VERSION}/libgstossaudio.so > +lib/gstreamer-${VERSION}/libgstqtdemux.la > +lib/gstreamer-${VERSION}/libgstqtdemux.so > lib/gstreamer-${VERSION}/libgstrtp.la > lib/gstreamer-${VERSION}/libgstrtp.so > lib/gstreamer-${VERSION}/libgstrtsp.la > lib/gstreamer-${VERSION}/libgstrtsp.so > lib/gstreamer-${VERSION}/libgstsmpte.la > lib/gstreamer-${VERSION}/libgstsmpte.so > +lib/gstreamer-${VERSION}/libgstspectrum.la > +lib/gstreamer-${VERSION}/libgstspectrum.so > @comment lib/gstreamer-${VERSION}/libgstsunaudio.la > @comment lib/gstreamer-${VERSION}/libgstsunaudio.so > lib/gstreamer-${VERSION}/libgstudp.la > @@ -57,6 +67,8 @@ > lib/gstreamer-${VERSION}/libgstvideobalance.so > lib/gstreamer-${VERSION}/libgstvideobox.la > lib/gstreamer-${VERSION}/libgstvideobox.so > +lib/gstreamer-${VERSION}/libgstvideocrop.la > +lib/gstreamer-${VERSION}/libgstvideocrop.so > lib/gstreamer-${VERSION}/libgstvideoflip.la > lib/gstreamer-${VERSION}/libgstvideoflip.so > lib/gstreamer-${VERSION}/libgstvideomixer.la > @@ -69,15 +81,26 @@ > lib/gstreamer-${VERSION}/libgstximagesrc.so > share/locale/af/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/az/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/bg/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/cs/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/da/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/en_GB/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/es/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/eu/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/fi/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/hu/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/it/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/ja/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/nb/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/nl/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/or/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/pl/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/sk/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/sq/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/sr/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/sv/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/uk/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > share/locale/vi/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/zh_CN/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/zh_HK/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > +share/locale/zh_TW/LC_MESSAGES/gst-plugins-good-${VERSION}.mo > diff -urN multimedia/gstreamer-0.10/plugins-ugly/Makefile mystuff/multimedia/gstreamer-0.10/plugins-ugly/Makefile > --- multimedia/gstreamer-0.10/plugins-ugly/Makefile Mon Oct 8 10:22:41 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/Makefile Fri Mar 14 15:18:18 2008 > @@ -8,15 +8,15 @@ > COMMENT-mpeg2= multimedia framework - mpeg2 plugin > COMMENT-dvdread= multimedia framework - dvdread plugin > > -V= 0.10.5 > +V= 0.10.7 > DISTNAME= gst-plugins-ugly-$V > -PKGNAME-main= gstreamer-plugins-ugly-$Vp0 > -PKGNAME-sidplay= gstreamer-sidplay-$Vp1 > -PKGNAME-a52= gstreamer-a52-$Vp0 > -PKGNAME-mad= gstreamer-mad-$Vp0 > -PKGNAME-lame= gstreamer-lame-$Vp0 > -PKGNAME-mpeg2= gstreamer-mpeg2-$Vp0 > -PKGNAME-dvdread= gstreamer-dvdread-$Vp0 > +PKGNAME-main= gstreamer-plugins-ugly-$V > +PKGNAME-sidplay= gstreamer-sidplay-$V > +PKGNAME-a52= gstreamer-a52-$V > +PKGNAME-mad= gstreamer-mad-$V > +PKGNAME-lame= gstreamer-lame-$V > +PKGNAME-mpeg2= gstreamer-mpeg2-$V > +PKGNAME-dvdread= gstreamer-dvdread-$V > MULTI_PACKAGES= -main -sidplay -lame -mad -a52 -mpeg2 -dvdread > > PERMIT_PACKAGE_CDROM= Patent issues > @@ -25,17 +25,15 @@ > > MASTER_SITES= ${MASTER_SITE_GST:=gst-plugins-ugly/} > > -MODULES= devel/gettext > - > WANTLIB= glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0 \ > - xml2 m z > + xml2 m z pcre > LIB_DEPENDS= gstreamer-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core > RUN_DEPENDS= ::${BUILD_PKGPATH} > > WANTLIB-main= ${WANTLIB} > LIB_DEPENDS-main= ${LIB_DEPENDS} \ > gstriff-0.10::multimedia/gstreamer-0.10/plugins-base \ > - gstbase-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core > + gstbase-0.10,gstrtsp-0.10,gstsdp-0.10,gsttag-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core > RUN_DEPENDS-main= > > > @@ -49,9 +47,10 @@ > gstbase-0.10,gstaudio-0.10,gstinterfaces-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ > a52::audio/liba52 > > -WANTLIB-mad= ${WANTLIB} > +WANTLIB-mad= ${WANTLIB} \ > + gstaudio-0.10 gstinterfaces-0.10 > LIB_DEPENDS-mad= ${LIB_DEPENDS} \ > - gsttag-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ > + gstbase-0.10,gsttag-0.10:gstreamer->=0.10:multimedia/gstreamer-0.10/core \ > id3tag::audio/libid3tag \ > mad::audio/libmad > > @@ -60,7 +59,7 @@ > mp3lame::audio/lame > > WANTLIB-mpeg2= ${WANTLIB} \ > - X11 Xext Xv > + X11 Xext Xv Xau Xdmcp > LIB_DEPENDS-mpeg2= ${LIB_DEPENDS} \ > mpeg2::graphics/libmpeg2 > > diff -urN multimedia/gstreamer-0.10/plugins-ugly/distinfo mystuff/multimedia/gstreamer-0.10/plugins-ugly/distinfo > --- multimedia/gstreamer-0.10/plugins-ugly/distinfo Thu Apr 5 18:20:07 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/distinfo Fri Mar 14 14:47:27 2008 > @@ -1,5 +1,5 @@ > -MD5 (gst-plugins-ugly-0.10.5.tar.bz2) = LmvzXryyq1CLQ+86ruh4rQ== > -RMD160 (gst-plugins-ugly-0.10.5.tar.bz2) = j2dmyjjM62fK2XZ9ZysUJv1WxPk= > -SHA1 (gst-plugins-ugly-0.10.5.tar.bz2) = BN/xGUdFsbR4RbksPEXlUdhbMgI= > -SHA256 (gst-plugins-ugly-0.10.5.tar.bz2) = 863mHokNK9LVtfGyfbpEuawxJS9osaWJq5RPEIbCgq4= > -SIZE (gst-plugins-ugly-0.10.5.tar.bz2) = 744261 > +MD5 (gst-plugins-ugly-0.10.7.tar.bz2) = z/T1UTjRIVLPWAo+5xwlGQ== > +RMD160 (gst-plugins-ugly-0.10.7.tar.bz2) = 6xj90S/JgJ3eoBN9XWQbumd3W/4= > +SHA1 (gst-plugins-ugly-0.10.7.tar.bz2) = oe7Zhezm2rV6K08x7xRNlewCSvs= > +SHA256 (gst-plugins-ugly-0.10.7.tar.bz2) = VWuiQHK9sy7laK3Ggtaa3RJB13k2vJVj5QzblTCXvjU= > +SIZE (gst-plugins-ugly-0.10.7.tar.bz2) = 868172 > diff -urN multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c > --- multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c Fri Jan 12 00:06:14 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_dvdread_dvdreadsrc_c Fri Mar 14 14:54:18 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-ext_dvdread_dvdreadsrc_c,v 1.1 2007/01/11 23:06:14 espie Exp $ > ---- ext/dvdread/dvdreadsrc.c.orig Fri Jan 12 00:04:31 2007 > -+++ ext/dvdread/dvdreadsrc.c Fri Jan 12 00:05:13 2007 > -@@ -128,7 +128,7 @@ gst_dvd_read_src_init (GstDvdReadSrc * s > +--- ext/dvdread/dvdreadsrc.c.orig Mon Feb 18 16:49:58 2008 > ++++ ext/dvdread/dvdreadsrc.c Fri Mar 14 14:47:50 2008 > +@@ -128,7 +128,7 @@ gst_dvd_read_src_init (GstDvdReadSrc * src, GstDvdRead > src->vmg_file = NULL; > src->dvd_title = NULL; > > @@ -10,7 +10,7 @@ > src->last_uri = NULL; > src->new_seek = TRUE; > src->new_cell = TRUE; > -@@ -944,7 +944,7 @@ gst_dvd_read_src_set_property (GObject * > +@@ -955,7 +955,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) { > diff -urN multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c > --- multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c Thu Jan 1 01:00:00 1970 > +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_lame_gstlame_c Fri Mar 14 14:55:00 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- ext/lame/gstlame.c.orig Fri Mar 14 14:51:44 2008 > ++++ ext/lame/gstlame.c Fri Mar 14 14:54:56 2008 > +@@ -578,7 +578,7 @@ zero_output_rate: > + setup_failed: > + { > + GST_ELEMENT_ERROR (lame, LIBRARY, SETTINGS, > +- (_("Failed to configure LAME encoder. Check your encoding parameters.")), NULL); > ++ ("Failed to configure LAME encoder. Check your encoding parameters."), (NULL)); > + return FALSE; > + } > + } > diff -urN multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in > --- multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in Thu Jan 11 01:23:26 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/patches/patch-ext_sidplay_Makefile_in Fri Mar 14 14:54:18 2008 > @@ -1,7 +1,7 @@ > $OpenBSD: patch-ext_sidplay_Makefile_in,v 1.1 2007/01/11 00:23:26 espie Exp $ > ---- ext/sidplay/Makefile.in.orig Wed Dec 13 21:45:46 2006 > -+++ ext/sidplay/Makefile.in Thu Jan 11 01:16:35 2007 > -@@ -280,7 +280,7 @@ RANLIB = @RANLIB@ > +--- ext/sidplay/Makefile.in.orig Thu Feb 21 00:36:39 2008 > ++++ ext/sidplay/Makefile.in Fri Mar 14 14:48:08 2008 > +@@ -293,7 +293,7 @@ SED = @SED@ > SET_MAKE = @SET_MAKE@ > SHELL = @SHELL@ > SIDPLAY_CFLAGS = @SIDPLAY_CFLAGS@ > diff -urN multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main mystuff/multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main > --- multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main Wed Jan 10 03:14:04 2007 > +++ mystuff/multimedia/gstreamer-0.10/plugins-ugly/pkg/PLIST-main Fri Mar 14 14:57:13 2008 > @@ -15,15 +15,23 @@ > lib/gstreamer-${VERSION}/libgstrmdemux.so > 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/cs/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo > +share/locale/da/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/fi/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo > share/locale/hu/LC_MESSAGES/gst-plugins-ugly-${VERSION}.mo > share/locale/it/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/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/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 > diff -urN multimedia/gstreamer-0.10/py-gstreamer/Makefile mystuff/multimedia/gstreamer-0.10/py-gstreamer/Makefile > --- multimedia/gstreamer-0.10/py-gstreamer/Makefile Tue Jan 22 09:53:41 2008 > +++ mystuff/multimedia/gstreamer-0.10/py-gstreamer/Makefile Fri Mar 14 15:19:18 2008 > @@ -2,7 +2,7 @@ > > COMMENT= Python bindings for gstreamer > > -V= 0.10.9 > +V= 0.10.10 > DISTNAME= gst-python-$V > PKGNAME= py-gstreamer-$V > > @@ -14,12 +14,10 @@ > gstdataprotocol-0.10 gstnet-0.10 gstreamer-0.10 gthread-2.0 \ > m pcre xml2 z > > -MODULES= devel/gettext > - > BUILD_DEPENDS= ::x11/py-gtk2 > RUN_DEPENDS= ::x11/py-gtk2 \ > :py-libxml-*:textproc/libxml,-python > -LIB_DEPENDS= gstinterfaces-0.10::multimedia/gstreamer-0.10/plugins-base > +LIB_DEPENDS= gstpbutils-0.10,gstinterfaces-0.10::multimedia/gstreamer-0.10/plugins-base > > REGRESS_DEPENDS=::multimedia/gstreamer-0.10/plugins-good > > diff -urN multimedia/gstreamer-0.10/py-gstreamer/distinfo mystuff/multimedia/gstreamer-0.10/py-gstreamer/distinfo > --- multimedia/gstreamer-0.10/py-gstreamer/distinfo Tue Jan 22 09:53:41 2008 > +++ mystuff/multimedia/gstreamer-0.10/py-gstreamer/distinfo Fri Mar 14 15:05:06 2008 > @@ -1,5 +1,5 @@ > -MD5 (gst-python-0.10.9.tar.bz2) = gH4U6NBYRFUko04Hm7gwSA== > -RMD160 (gst-python-0.10.9.tar.bz2) = xYxM9eu6e/UtvIpt4dg0YFAWZlE= > -SHA1 (gst-python-0.10.9.tar.bz2) = S6gDOjtNEoBCWNucTPCmM2fMlZI= > -SHA256 (gst-python-0.10.9.tar.bz2) = nATHxQN0v1jFzIwwQA0nON8/tD0Fa9xEHTPUzp+z5LQ= > -SIZE (gst-python-0.10.9.tar.bz2) = 447963 > +MD5 (gst-python-0.10.10.tar.bz2) = YYPWHkNLXTTyMiSKNVcWJw== > +RMD160 (gst-python-0.10.10.tar.bz2) = HpLrVtaKC1FMLFfLDsAZSH3h/FM= > +SHA1 (gst-python-0.10.10.tar.bz2) = rXNmVYHrIjgK7bjKSqlbJx37PcE= > +SHA256 (gst-python-0.10.10.tar.bz2) = yHV1OmzM1Ap59YJOpexR7kYVpPIhA+St/GoCIb9hXY4= > +SIZE (gst-python-0.10.10.tar.bz2) = 468099 > diff -urN multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST mystuff/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST > --- multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST Tue Jan 22 09:53:41 2008 > +++ mystuff/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST Fri Mar 14 15:07:34 2008 > @@ -31,6 +31,8 @@ > lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/utils.pyo > lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/interfaces.la > lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/interfaces.so > +lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/pbutils.la > +lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/pbutils.so > lib/python${MODPY_VERSION}/site-packages/pygst.pth > lib/python${MODPY_VERSION}/site-packages/pygst.py > lib/python${MODPY_VERSION}/site-packages/pygst.pyc > @@ -42,6 +44,7 @@ > share/gst-python/${VERSION}/defs/gst-extrafuncs.defs > share/gst-python/${VERSION}/defs/gst-types.defs > share/gst-python/${VERSION}/defs/libs.defs > +share/gst-python/${VERSION}/defs/pbutils.defs > share/gst-python/${VERSION}/examples/ > share/gst-python/${VERSION}/examples/audio-controller.py > share/gst-python/${VERSION}/examples/audioconcat.py > diff -urN audio/rhythmbox/Makefile mystuff/audio/rhythmbox/Makefile > --- audio/rhythmbox/Makefile Wed Dec 19 08:31:15 2007 > +++ mystuff/audio/rhythmbox/Makefile Fri Mar 14 17:04:10 2008 > @@ -1,16 +1,15 @@ > # $OpenBSD: Makefile,v 1.17 2007/12/19 07:31:15 ajacoutot Exp $ > > -BROKEN= needs an update to 0.11.x (and working totem) > - > COMMENT= Music Management Application > > -DISTNAME= rhythmbox-0.8.8 > -PKGNAME= ${DISTNAME}p6 > +DISTNAME= rhythmbox-0.11.4 > CATEGORIES= audio > > +SHARED_LIBS= rhythmbox-core 0.0 > + > HOMEPAGE= http://www.rhythmbox.org > > -MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.8/} > +MASTER_SITES= ${MASTER_SITE_GNOME:=sources/rhythmbox/0.11/} > > # LGPL > PERMIT_PACKAGE_CDROM= Yes > @@ -18,7 +17,7 @@ > PERMIT_DISTFILES_CDROM= Yes > PERMIT_DISTFILES_FTP= Yes > WANTLIB= ICE SM X11 Xau Xdmcp Xrender \ > - c crypto expat fontconfig freetype pthread m ssl z \ > + c crypto fontconfig freetype pthread m ssl z \ > ORBit-2 ORBitCosNaming-2 art_lgpl_2.>=5 atk-1.0 \ > audiofile bonobo-2 bonobo-activation.>=4.0 bonoboui-2 \ > esd.>=2 gconf-2 glade-2.0 jpeg popt xml2 \ > @@ -26,34 +25,55 @@ > pango-1.0 pangocairo-1.0 pangoft2-1.0 \ > gdk-x11-2.0 gdk_pixbuf-2.0 gtk-x11-2.0 \ > gnome-2 gnome-keyring gnomecanvas-2 gnomeui-2 gnomevfs-2 \ > - gstcontrol-0.8.>=5.0 gstreamer-0.8.>=5.0 cairo glitz png > + cairo glitz png Xcomposite Xcursor Xdamage Xext Xfixes \ > + Xi Xinerama Xrandr asn1 com_err dbus-1 dbus-glib-1 \ > + gailutil gssapi gstbase-0.10 gstpbutils-0.10 \ > + gstinterfaces-0.10 gstreamer-0.10 gstcontroller-0.10 \ > + krb5 pcre util camel-1.2 db edataserver-1.2 nspr4 nss3 \ > + plc4 plds4 smime3 softokn3 soup-2.2 ssl3 neon > > -MODULES= devel/gettext > +MODULES= devel/gettext \ > + lang/python > > -BUILD_DEPENDS= :scrollkeeper-*:textproc/scrollkeeper \ > - :p5-XML-Parser-*:textproc/p5-XML-Parser \ > - :gstreamer-gnome-0.8.*:devel/gstreamer-plugins,-gnome > -LIB_DEPENDS= gstgconf-0.8::devel/gstreamer-plugins \ > - gnomeui-2::x11/gnome/libgnomeui > +BUILD_DEPENDS= :p5-XML-Parser-*:textproc/p5-XML-Parser \ > + :gstreamer-gnome-0.10.*:multimedia/gstreamer-0.10/plugins-base,-gnome > +LIB_DEPENDS= gnomeui-2::x11/gnome/libgnomeui \ > + python2.5.>=0::lang/python/2.5 \ > + totem-plparser.>=11::devel/totem-pl-parser \ > + musicbrainz3.>=5::audio/libmusicbrainz \ > + sexy.>=0::x11/libsexy \ > + notify.>=2::devel/libnotify \ > + gnome-media-profiles.>=0::x11/gnome/media \ > + howl.>=0::net/howl > RUN_DEPENDS= :desktop-file-utils-*:devel/desktop-file-utils \ > - :scrollkeeper-*:textproc/scrollkeeper \ > - :gstreamer-flac-0.8.*:devel/gstreamer-plugins,-flac \ > - :gstreamer-gnome-0.8.*:devel/gstreamer-plugins,-gnome \ > - :gstreamer-mad-0.8.*:devel/gstreamer-plugins,-mad \ > - :gstreamer-ogg-0.8.*:devel/gstreamer-plugins,-ogg \ > - :gstreamer-vorbis-0.8.*:devel/gstreamer-plugins,-vorbis > + :gstreamer-flac-0.10.*:multimedia/gstreamer-0.10/plugins-good,-flac \ > + :gstreamer-gnome-0.10.*:multimedia/gstreamer-0.10/plugins-base,-gnome \ > + :gstreamer-mad-0.10.*:multimedia/gstreamer-0.10/plugins-ugly,-mad \ > + :gstreamer-ogg-0.10.*:multimedia/gstreamer-0.10/plugins-base,-ogg \ > + :gstreamer-vorbis-0.10.*:multimedia/gstreamer-0.10/plugins-base,-vorbis \ > + :gstreamer-confelements-0.10.*:multimedia/gstreamer-0.10/plugins-good,-gconf \ > + :gstreamer-ffmpeg-0.10.*:multimedia/gstreamer-0.10/ffmpeg \ > + :py-gnome-*:x11/gnome/py-gnome \ > + :gnome-icon-theme-*:x11/gnome/icon-theme > > USE_X11= Yes > USE_GMAKE= Yes > USE_LIBTOOL= Yes > CONFIGURE_STYLE= gnu > -CONFIGURE_ARGS+= --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/rhythmbox/ > -CONFIGURE_ARGS+= --disable-schemas-install > -CONFIGURE_ARGS+= --enable-nautilus-menu > +CONFIGURE_ARGS+= ${CONFIGURE_SHARED} \ > + --with-gconf-schema-file-dir=${LOCALBASE}/share/schemas/rhythmbox/ \ > + --disable-schemas-install \ > + --enable-nautilus-menu \ > + --disable-scrollkeeper \ > + --without-cd-burning \ > + --without-hal \ > + --with-mdns=howl > + > CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \ > LDFLAGS="-L${LOCALBASE}/lib" > > -post-patch: > - @ln -s /usr/bin/true ${WRKDIR}/bin/scrollkeeper-update > +post-install: > + @echo If somes icons are missing, add gtk-icon-theme-name = "gnome" > + @echo in your ~/.gtkrc-2.0 > > .include <bsd.port.mk> > diff -urN audio/rhythmbox/distinfo mystuff/audio/rhythmbox/distinfo > --- audio/rhythmbox/distinfo Thu Apr 5 17:37:44 2007 > +++ mystuff/audio/rhythmbox/distinfo Sun Mar 9 20:54:28 2008 > @@ -1,5 +1,5 @@ > -MD5 (rhythmbox-0.8.8.tar.gz) = O5uRjSfdROgBkulV+Ko8yw== > -RMD160 (rhythmbox-0.8.8.tar.gz) = f+6bWIsdM2Iz7+LIwivIfw3wovA= > -SHA1 (rhythmbox-0.8.8.tar.gz) = ea0XzARlr8t+6zRsPFQBFojnQLU= > -SHA256 (rhythmbox-0.8.8.tar.gz) = sjcuVqNoCCYu+7oIW4HxhuCEUvgPjmLkDiF+KxzAJ4s= > -SIZE (rhythmbox-0.8.8.tar.gz) = 3003728 > +MD5 (rhythmbox-0.11.4.tar.gz) = HAwYQ+be+GrZJxixugyunQ== > +RMD160 (rhythmbox-0.11.4.tar.gz) = bdmcOQ2/uQXK4djK0UI//vFZ9xU= > +SHA1 (rhythmbox-0.11.4.tar.gz) = eE8tdvC2+/RlmEY7mWY/rKqLhi0= > +SHA256 (rhythmbox-0.11.4.tar.gz) = EtVxp4Q9iaKlweEtnP2nlZbAw5bXa085RZRhnx6rKso= > +SIZE (rhythmbox-0.11.4.tar.gz) = 5905561 > diff -urN audio/rhythmbox/patches/CVS/Entries mystuff/audio/rhythmbox/patches/CVS/Entries > --- audio/rhythmbox/patches/CVS/Entries Thu Mar 6 11:59:24 2008 > +++ mystuff/audio/rhythmbox/patches/CVS/Entries Thu Jan 1 01:00:00 1970 > @@ -1,2 +0,0 @@ > -/patch-configure/1.2/Wed Nov 16 06:39:23 2005// > -D > diff -urN audio/rhythmbox/patches/CVS/Repository mystuff/audio/rhythmbox/patches/CVS/Repository > --- audio/rhythmbox/patches/CVS/Repository Thu Mar 6 11:59:24 2008 > +++ mystuff/audio/rhythmbox/patches/CVS/Repository Thu Jan 1 01:00:00 1970 > @@ -1 +0,0 @@ > -ports/audio/rhythmbox/patches > diff -urN audio/rhythmbox/patches/CVS/Root mystuff/audio/rhythmbox/patches/CVS/Root > --- audio/rhythmbox/patches/CVS/Root Thu Mar 6 11:59:24 2008 > +++ mystuff/audio/rhythmbox/patches/CVS/Root Thu Jan 1 01:00:00 1970 > @@ -1 +0,0 @@ > -/cvs > diff -urN audio/rhythmbox/patches/patch-bindings_python_Makefile_in mystuff/audio/rhythmbox/patches/patch-bindings_python_Makefile_in > --- audio/rhythmbox/patches/patch-bindings_python_Makefile_in Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-bindings_python_Makefile_in Sun Mar 9 20:59:44 2008 > @@ -0,0 +1,13 @@ > +$OpenBSD$ > +--- bindings/python/Makefile.in.orig Thu Dec 20 13:05:02 2007 > ++++ bindings/python/Makefile.in Sun Mar 9 20:54:34 2008 > +@@ -351,7 +351,8 @@ rb_la_LDFLAGS = \ > + rb_la_LIBADD = \ > + $(PYTHON_LIBS) \ > + $(PYTHON_EXTRA_LIBS) \ > +- $(PYGTK_LIBS) > ++ $(PYGTK_LIBS) \ > ++ $(top_srcdir)/sources/libsources.la > + > + > + rb_la_CFLAGS = \ > diff -urN audio/rhythmbox/patches/patch-configure mystuff/audio/rhythmbox/patches/patch-configure > --- audio/rhythmbox/patches/patch-configure Wed Nov 16 07:39:23 2005 > +++ mystuff/audio/rhythmbox/patches/patch-configure Sun Mar 9 20:59:45 2008 > @@ -1,55 +1,65 @@ > -$OpenBSD: patch-configure,v 1.2 2005/11/16 06:39:23 marcm Exp $ > ---- configure.orig Tue Oct 5 11:11:28 2004 > -+++ configure Thu Aug 18 18:09:33 2005 > -@@ -9017,7 +9017,7 @@ nto-qnx*) > - openbsd*) > - version_type=sunos > - need_lib_prefix=no > -- need_version=yes > -+ need_version=no > - library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix' > - finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir' > - shlibpath_var=LD_LIBRARY_PATH > -@@ -20864,7 +20864,7 @@ if { (eval echo "$as_me:$LINENO: \"$ac_l > +$OpenBSD$ > +--- configure.orig Thu Dec 20 12:57:54 2007 > ++++ configure Sun Mar 9 20:59:39 2008 > +@@ -12576,7 +12576,7 @@ GNOME_MEDIA_PROFILES_REQS=2.8 > + GNOME_VFS_REQS=2.8.0 > + LIBNOTIFY_REQS=0.3.2 > + LIBGPOD_REQS=0.4 > +-MUSICBRAINZ_REQS=2.1.0 > ++MUSICBRAINZ_REQS=3.0.0 > + NCB_MIN_REQS=2.9.0 > + TOTEM_PLPARSER_REQS=2.21.4 > + VALA_REQS=0.0.8 > +@@ -15682,12 +15682,12 @@ if test -n "$PKG_CONFIG"; then > + pkg_cv_MUSICBRAINZ_CFLAGS="$MUSICBRAINZ_CFLAGS" > + else > + if test -n "$PKG_CONFIG" && \ > +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\"") >&5 > +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 > ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz3 >= \$MUSICBRAINZ_REQS\"") >&5 > ++ ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS") 2>&5 > ac_status=$? > echo "$as_me:$LINENO: \$? = $ac_status" >&5 > - (exit $ac_status); }; }; then > -- have_fwrite_unlocked=yes > -+ have_fwrite_unlocked=no > + (exit $ac_status); }; then > +- pkg_cv_MUSICBRAINZ_CFLAGS=`$PKG_CONFIG --cflags "libmusicbrainz >= $MUSICBRAINZ_REQS" 2>/dev/null` > ++ pkg_cv_MUSICBRAINZ_CFLAGS=`$PKG_CONFIG --cflags "libmusicbrainz3 >= $MUSICBRAINZ_REQS" 2>/dev/null` > else > - echo "$as_me: failed program was:" >&5 > - sed 's/^/| /' conftest.$ac_ext >&5 > -@@ -21827,15 +21827,9 @@ fi > - if test "x$GST_INSPECT" != "x"; then > - echo "$as_me:$LINENO: checking GStreamer element gnomevfssrc" >&5 > - echo $ECHO_N "checking GStreamer element gnomevfssrc... $ECHO_C" >&6 > -- if $GST_INSPECT gnomevfssrc > /dev/null 2> /dev/null ; then > - echo "$as_me:$LINENO: result: found." >&5 > - echo "${ECHO_T}found." >&6 > - > -- else > -- echo "$as_me:$LINENO: result: not found." >&5 > --echo "${ECHO_T}not found." >&6 > -- missing_gst_elements="$missing_gst_elements gnomevfssrc" > -- fi > - fi > - > - > -@@ -22243,7 +22237,7 @@ echo $ECHO_N "checking ID3TAG_LIBS... $E > - echo "${ECHO_T}$ID3TAG_LIBS" >&6 > + pkg_failed=yes > + fi > +@@ -15700,12 +15700,12 @@ if test -n "$PKG_CONFIG"; then > + pkg_cv_MUSICBRAINZ_LIBS="$MUSICBRAINZ_LIBS" > + else > + if test -n "$PKG_CONFIG" && \ > +- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz >= \$MUSICBRAINZ_REQS\"") >&5 > +- ($PKG_CONFIG --exists --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS") 2>&5 > ++ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"libmusicbrainz333 >= \$MUSICBRAINZ_REQS\"") >&5 > ++ ($PKG_CONFIG --exists --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS") 2>&5 > + ac_status=$? > + echo "$as_me:$LINENO: \$? = $ac_status" >&5 > + (exit $ac_status); }; then > +- pkg_cv_MUSICBRAINZ_LIBS=`$PKG_CONFIG --libs "libmusicbrainz >= $MUSICBRAINZ_REQS" 2>/dev/null` > ++ pkg_cv_MUSICBRAINZ_LIBS=`$PKG_CONFIG --libs "libmusicbrainz3 >= $MUSICBRAINZ_REQS" 2>/dev/null` > + else > + pkg_failed=yes > + fi > +@@ -15724,9 +15724,9 @@ else > + _pkg_short_errors_supported=no > + fi > + if test $_pkg_short_errors_supported = yes; then > +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` > ++ MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS"` > else > - ID3TAG_CFLAGS="" > -- ID3TAG_LIBS="" > -+ ID3TAG_LIBS="-lid3tag" > - ## If we have a custom action on failure, don't print errors, but > - ## do set a variable so people can do so. > - ID3TAG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "id3tag >= 0.15.0b"` > -@@ -22261,7 +22255,7 @@ echo "${ECHO_T}$ID3TAG_LIBS" >&6 > - if test $succeeded = yes; then > - enable_mp3=yes > - else > -- enable_mp3=no > -+ enable_mp3=yes > - fi > +- MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmusicbrainz >= $MUSICBRAINZ_REQS"` > ++ MUSICBRAINZ_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libmusicbrainz3 >= $MUSICBRAINZ_REQS"` > + fi > + # Put the nasty error message in config.log where it belongs > + echo "$MUSICBRAINZ_PKG_ERRORS" >&5 > +@@ -19296,7 +19296,7 @@ if test "${am_cv_pathless_PYTHON+set}" = set; then > + echo $ECHO_N "(cached) $ECHO_C" >&6 > + else > > - if test x"$enable_mp3" = xno; then > +- for am_cv_pathless_PYTHON in python python2 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 : ; do > ++ for am_cv_pathless_PYTHON in python2.5 python2.4 python2.3 : ; do > + if test "$am_cv_pathless_PYTHON" = : ; then > + { { echo "$as_me:$LINENO: error: no suitable Python interpreter found" >&5 > + echo "$as_me: error: no suitable Python interpreter found" >&2;} > diff -urN audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c mystuff/audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c > --- audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-metadata_rb-metadata-dbus-client_c Sat Mar 8 21:07:13 2008 > @@ -0,0 +1,13 @@ > +$OpenBSD$ > +--- metadata/rb-metadata-dbus-client.c.orig Sat Mar 8 21:04:48 2008 > ++++ metadata/rb-metadata-dbus-client.c Sat Mar 8 21:07:05 2008 > +@@ -51,8 +51,7 @@ > + #include <glib/gi18n.h> > + > + #include <unistd.h> > +-#include <sys/types.h> > +-#include <sys/signal.h> > ++#include <signal.h> > + #include <sys/wait.h> > + #include <string.h> > + #include <stdlib.h> > diff -urN audio/rhythmbox/patches/patch-metadata_test-metadata_c mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c > --- audio/rhythmbox/patches/patch-metadata_test-metadata_c Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c Sun Mar 9 21:02:02 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- metadata/test-metadata.c.orig Thu Nov 15 13:08:20 2007 > ++++ metadata/test-metadata.c Sun Mar 9 21:01:56 2008 > +@@ -83,7 +83,7 @@ load_metadata_cb (gpointer file) > + if (uri[0] == '/') { > + uri = g_filename_to_uri (uri, NULL, NULL); > + } else { > +- char buf[600]; > ++ char buf[1024]; > + if (getcwd (buf, sizeof (buf)) != NULL) { > + char *filename; > + > diff -urN audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig > --- audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-metadata_test-metadata_c.orig Sat Mar 8 21:10:30 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- metadata/test-metadata.c.orig Sat Mar 8 21:09:16 2008 > ++++ metadata/test-metadata.c Sat Mar 8 21:10:20 2008 > +@@ -81,7 +81,7 @@ load_metadata_cb (gpointer file) > + if (uri[0] == '/') { > + uri = g_strdup_printf ("file://%s", uri); > + } else { > +- char buf[600]; > ++ char buf[1024]; > + if (getcwd (buf, sizeof (buf)) != NULL) > + uri = g_strdup_printf ("file://%s/%s", buf, uri); > + } > diff -urN audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c > --- audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-audioscrobbler_c Sun Mar 9 20:59:44 2008 > @@ -0,0 +1,21 @@ > +$OpenBSD$ > +--- plugins/audioscrobbler/rb-audioscrobbler.c.orig Mon Dec 17 10:26:53 2007 > ++++ plugins/audioscrobbler/rb-audioscrobbler.c Sun Mar 9 20:54:34 2008 > +@@ -840,7 +840,7 @@ rb_audioscrobbler_should_handshake (RBAudioscrobbler * > + } > + > + if (time (NULL) < audioscrobbler->priv->handshake_next) { > +- rb_debug ("Too soon; time=%lu, handshake_next=%lu", > ++ rb_debug ("Too soon; time=%d, handshake_next=%d", > + time (NULL), > + audioscrobbler->priv->handshake_next); > + return FALSE; > +@@ -950,7 +950,7 @@ rb_audioscrobbler_build_authentication_data (RBAudiosc > + > + time(&now); > + if (now < audioscrobbler->priv->submit_next) { > +- rb_debug ("Too soon (next submission in %ld seconds)", > ++ rb_debug ("Too soon (next submission in %d seconds)", > + audioscrobbler->priv->submit_next - now); > + return NULL; > + } > diff -urN audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c > --- audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-plugins_audioscrobbler_rb-lastfm-gst-src_c Sun Mar 9 20:59:44 2008 > @@ -0,0 +1,12 @@ > +$OpenBSD$ > +--- plugins/audioscrobbler/rb-lastfm-gst-src.c.orig Tue Jun 19 13:38:41 2007 > ++++ plugins/audioscrobbler/rb-lastfm-gst-src.c Sun Mar 9 20:54:34 2008 > +@@ -108,7 +108,7 @@ rb_lastfm_src_pad_probe_cb (GstPad *pad, GstBuffer *bu > + char *s; > + static char sync[5] = "SYNC"; > + > +- s = memmem (data, GST_BUFFER_SIZE (buffer), sync, 4); > ++ s = strstr (data, sync); > + if (s != NULL) { > + GstMessage *msg; > + GstStructure *s; > diff -urN audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c > --- audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_c Sun Mar 9 20:59:43 2008 > @@ -0,0 +1,66 @@ > +$OpenBSD$ > +--- plugins/daap/rb-daap-src.c.orig Sun Jun 17 13:56:21 2007 > ++++ plugins/daap/rb-daap-src.c Sun Mar 9 20:54:34 2008 > +@@ -290,7 +290,7 @@ rb_daap_src_write (RBDAAPSrc *src, const guchar *buf, > + bytes_written += wrote; > + } > + > +- GST_DEBUG_OBJECT (src, "wrote %d bytes succesfully", bytes_written); > ++ GST_DEBUG_OBJECT (src, "wrote %zu bytes succesfully", bytes_written); > + return bytes_written; > + } > + > +@@ -304,7 +304,7 @@ rb_daap_src_read (RBDAAPSrc *src, guchar *buf, size_t > + if (bytes_read > src->buffer_size) > + bytes_read = src->buffer_size; > + > +- GST_DEBUG_OBJECT (src, "reading %d bytes from buffer", bytes_read); > ++ GST_DEBUG_OBJECT (src, "reading %zu bytes from buffer", bytes_read); > + memcpy (buf, src->buffer, bytes_read); > + src->buffer += bytes_read; > + src->buffer_size -= bytes_read; > +@@ -328,7 +328,7 @@ rb_daap_src_read (RBDAAPSrc *src, guchar *buf, size_t > + bytes_read += ret; > + } > + > +- GST_DEBUG_OBJECT (src, "read %d bytes succesfully", bytes_read); > ++ GST_DEBUG_OBJECT (src, "read %zu bytes succesfully", bytes_read); > + return bytes_read; > + } > + > +@@ -380,7 +380,7 @@ rb_daap_src_read_chunk_size (RBDAAPSrc *src, gboolean > + return FALSE; > + } > + > +- GST_DEBUG_OBJECT (src, "got HTTP chunk size %lu", *chunk_size); > ++ GST_DEBUG_OBJECT (src, "got HTTP chunk size %li", (long int)*chunk_size); > + return TRUE; > + } else if (isxdigit (ch)) { > + chunk_buf[i++] = ch; > +@@ -578,7 +578,7 @@ rb_daap_src_open (RBDAAPSrc *src) > + src->chunked = TRUE; > + } else { > + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), > +- ("Unknown HTTP transfer encoding \"%s\"", val->data)); > ++ ("Unknown HTTP transfer encoding \"%s\"", (gchar *)val->data)); > + } > + } else { > + src->chunked = FALSE; > +@@ -588,7 +588,7 @@ rb_daap_src_open (RBDAAPSrc *src) > + src->size = strtoul ((char *)val->data, &e, 10); > + if (e == val->data) { > + GST_ELEMENT_ERROR (src, RESOURCE, OPEN_READ, (NULL), > +- ("Couldn't read HTTP content length \"%s\"", val->data)); > ++ ("Couldn't read HTTP content length \"%s\"", (gchar *)val->data)); > + ok = FALSE; > + } > + } else { > +@@ -693,7 +693,7 @@ rb_daap_src_create (GstPushSrc *psrc, GstBuffer **outb > + > + buf = gst_buffer_new_and_alloc (readsize); > + > +- GST_LOG_OBJECT (src, "Reading %d bytes", readsize); > ++ GST_LOG_OBJECT (src, "Reading %zu bytes", readsize); > + readsize = rb_daap_src_read (src, GST_BUFFER_DATA (buf), readsize); > + if (readsize < 0) { > + GST_ELEMENT_ERROR (src, RESOURCE, READ, (NULL), GST_ERROR_SYSTEM); > diff -urN audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h > --- audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-plugins_daap_rb-daap-src_h Sun Mar 9 18:46:41 2008 > @@ -0,0 +1,14 @@ > +$OpenBSD$ > +--- plugins/daap/rb-daap-src.h.orig Sat Mar 8 17:34:27 2008 > ++++ plugins/daap/rb-daap-src.h Sat Mar 8 17:35:22 2008 > +@@ -25,6 +25,10 @@ > + #include <glib.h> > + #include <gst/gstelement.h> > + > ++#ifndef MSG_NOSIGNAL > ++#define MSG_NOSIGNAL 0 > ++#endif > ++ > + G_BEGIN_DECLS > + > + GType rb_daap_src_get_type (void); > diff -urN audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h mystuff/audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h > --- audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h Thu Jan 1 01:00:00 1970 > +++ mystuff/audio/rhythmbox/patches/patch-podcast_rb-podcast-parse_h Sat Mar 8 16:47:45 2008 > @@ -0,0 +1,11 @@ > +$OpenBSD$ > +--- podcast/rb-podcast-parse.h.orig Sat Mar 8 16:42:20 2008 > ++++ podcast/rb-podcast-parse.h Sat Mar 8 16:47:29 2008 > +@@ -23,6 +23,7 @@ > + #define RB_PODCAST_PARSE_H > + > + #include <glib.h> > ++#include <inttypes.h> > + > + typedef struct > + { > diff -urN audio/rhythmbox/pkg/PFRAG.shared mystuff/audio/rhythmbox/pkg/PFRAG.shared > --- audio/rhythmbox/pkg/PFRAG.shared Wed Dec 22 07:17:28 2004 > +++ mystuff/audio/rhythmbox/pkg/PFRAG.shared Thu Jan 1 01:00:00 1970 > @@ -1,2 +0,0 @@ > -@comment $OpenBSD: PFRAG.shared,v 1.1.1.1 2004/12/22 06:17:28 marcm Exp $ > -lib/bonobo/librb-nautilus-context-menu.so > diff -urN audio/rhythmbox/pkg/PLIST mystuff/audio/rhythmbox/pkg/PLIST > --- audio/rhythmbox/pkg/PLIST Wed Dec 19 08:31:15 2007 > +++ mystuff/audio/rhythmbox/pkg/PLIST Fri Mar 14 16:54:17 2008 > @@ -1,224 +1,555 @@ > -@comment $OpenBSD: PLIST,v 1.4 2007/12/19 07:31:15 ajacoutot Exp $ > +@comment $OpenBSD$ > bin/rhythmbox > -lib/bonobo/ > -lib/bonobo/librb-nautilus-context-menu.a > -lib/bonobo/librb-nautilus-context-menu.la > -lib/bonobo/servers/ > -lib/bonobo/servers/GNOME_Rhythmbox.server > -lib/bonobo/servers/Rhythmbox_Nautilus_Context_Menu.server > -lib/pkgconfig/rhythmbox.pc > -share/application-registry/ > -share/application-registry/rhythmbox.applications > -share/applications/ > +bin/rhythmbox-client > +lib/librhythmbox-core.a > +lib/librhythmbox-core.la > +@lib lib/librhythmbox-core.so.${LIBrhythmbox-core_VERSION} > +lib/rhythmbox/ > +lib/rhythmbox/plugins/ > +lib/rhythmbox/plugins/artdisplay/ > +lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.py > +lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyc > +lib/rhythmbox/plugins/artdisplay/AmazonCoverArtSearch.pyo > +lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.py > +lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyc > +lib/rhythmbox/plugins/artdisplay/CoverArtDatabase.pyo > +lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.py > +lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyc > +lib/rhythmbox/plugins/artdisplay/LocalCoverArtSearch.pyo > +lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.py > +lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.pyc > +lib/rhythmbox/plugins/artdisplay/PodcastCoverArtSearch.pyo > +lib/rhythmbox/plugins/artdisplay/__init__.py > +lib/rhythmbox/plugins/artdisplay/__init__.pyc > +lib/rhythmbox/plugins/artdisplay/__init__.pyo > +lib/rhythmbox/plugins/artdisplay/artdisplay.rb-plugin > +lib/rhythmbox/plugins/artdisplay/rhythmbox-missing-artwork.svg > +lib/rhythmbox/plugins/audioscrobbler/ > +lib/rhythmbox/plugins/audioscrobbler/as-icon.png > +lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-prefs.glade > +lib/rhythmbox/plugins/audioscrobbler/audioscrobbler-ui.xml > +lib/rhythmbox/plugins/audioscrobbler/audioscrobbler.rb-plugin > +lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.a > +lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.la > +lib/rhythmbox/plugins/audioscrobbler/libaudioscrobbler.so > +lib/rhythmbox/plugins/daap/ > +lib/rhythmbox/plugins/daap/daap-prefs.glade > +lib/rhythmbox/plugins/daap/daap-ui.xml > +lib/rhythmbox/plugins/daap/daap.rb-plugin > +lib/rhythmbox/plugins/daap/libdaap.a > +lib/rhythmbox/plugins/daap/libdaap.la > +lib/rhythmbox/plugins/daap/libdaap.so > +lib/rhythmbox/plugins/generic-player/ > +lib/rhythmbox/plugins/generic-player/generic-player-ui.xml > +lib/rhythmbox/plugins/generic-player/generic-player.rb-plugin > +lib/rhythmbox/plugins/generic-player/libgeneric-player.a > +lib/rhythmbox/plugins/generic-player/libgeneric-player.la > +lib/rhythmbox/plugins/generic-player/libgeneric-player.so > +lib/rhythmbox/plugins/iradio/ > +lib/rhythmbox/plugins/iradio/iradio-initial.pls > +lib/rhythmbox/plugins/iradio/iradio-ui.xml > +lib/rhythmbox/plugins/iradio/iradio.rb-plugin > +lib/rhythmbox/plugins/iradio/libiradio.a > +lib/rhythmbox/plugins/iradio/libiradio.la > +lib/rhythmbox/plugins/iradio/libiradio.so > +lib/rhythmbox/plugins/iradio/station-properties.glade > +lib/rhythmbox/plugins/jamendo/ > +lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.py > +lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.pyc > +lib/rhythmbox/plugins/jamendo/JamendoConfigureDialog.pyo > +lib/rhythmbox/plugins/jamendo/JamendoSaxHandler.py > +lib/rhythmbox/plugins/jamendo/JamendoSaxHandler.pyc > +lib/rhythmbox/plugins/jamendo/JamendoSaxHandler.pyo > +lib/rhythmbox/plugins/jamendo/JamendoSource.py > +lib/rhythmbox/plugins/jamendo/JamendoSource.pyc > +lib/rhythmbox/plugins/jamendo/JamendoSource.pyo > +lib/rhythmbox/plugins/jamendo/__init__.py > +lib/rhythmbox/plugins/jamendo/__init__.pyc > +lib/rhythmbox/plugins/jamendo/__init__.pyo > +lib/rhythmbox/plugins/jamendo/jamendo-loading.glade > +lib/rhythmbox/plugins/jamendo/jamendo-prefs.glade > +lib/rhythmbox/plugins/jamendo/jamendo.rb-plugin > +lib/rhythmbox/plugins/jamendo/jamendo_logo.png > +lib/rhythmbox/plugins/jamendo/jamendo_logo_medium.png > +lib/rhythmbox/plugins/lyrics/ > +lib/rhythmbox/plugins/lyrics/AstrawebParser.py > +lib/rhythmbox/plugins/lyrics/AstrawebParser.pyc > +lib/rhythmbox/plugins/lyrics/AstrawebParser.pyo > +lib/rhythmbox/plugins/lyrics/LeoslyricsParser.py > +lib/rhythmbox/plugins/lyrics/LeoslyricsParser.pyc > +lib/rhythmbox/plugins/lyrics/LeoslyricsParser.pyo > +lib/rhythmbox/plugins/lyrics/LyrcParser.py > +lib/rhythmbox/plugins/lyrics/LyrcParser.pyc > +lib/rhythmbox/plugins/lyrics/LyrcParser.pyo > +lib/rhythmbox/plugins/lyrics/LyricWikiParser.py > +lib/rhythmbox/plugins/lyrics/LyricWikiParser.pyc > +lib/rhythmbox/plugins/lyrics/LyricWikiParser.pyo > +lib/rhythmbox/plugins/lyrics/LyricsConfigureDialog.py > +lib/rhythmbox/plugins/lyrics/LyricsConfigureDialog.pyc > +lib/rhythmbox/plugins/lyrics/LyricsConfigureDialog.pyo > +lib/rhythmbox/plugins/lyrics/LyricsParse.py > +lib/rhythmbox/plugins/lyrics/LyricsParse.pyc > +lib/rhythmbox/plugins/lyrics/LyricsParse.pyo > +lib/rhythmbox/plugins/lyrics/WinampcnParser.py > +lib/rhythmbox/plugins/lyrics/WinampcnParser.pyc > +lib/rhythmbox/plugins/lyrics/WinampcnParser.pyo > +lib/rhythmbox/plugins/lyrics/__init__.py > +lib/rhythmbox/plugins/lyrics/__init__.pyc > +lib/rhythmbox/plugins/lyrics/__init__.pyo > +lib/rhythmbox/plugins/lyrics/lyrics-prefs.glade > +lib/rhythmbox/plugins/lyrics/lyrics.rb-plugin > +lib/rhythmbox/plugins/magnatune/ > +lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.py > +lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.pyc > +lib/rhythmbox/plugins/magnatune/BuyAlbumHandler.pyo > +lib/rhythmbox/plugins/magnatune/MagnatuneSource.py > +lib/rhythmbox/plugins/magnatune/MagnatuneSource.pyc > +lib/rhythmbox/plugins/magnatune/MagnatuneSource.pyo > +lib/rhythmbox/plugins/magnatune/TrackListHandler.py > +lib/rhythmbox/plugins/magnatune/TrackListHandler.pyc > +lib/rhythmbox/plugins/magnatune/TrackListHandler.pyo > +lib/rhythmbox/plugins/magnatune/__init__.py > +lib/rhythmbox/plugins/magnatune/__init__.pyc > +lib/rhythmbox/plugins/magnatune/__init__.pyo > +lib/rhythmbox/plugins/magnatune/magnatune-loading.glade > +lib/rhythmbox/plugins/magnatune/magnatune-prefs.glade > +lib/rhythmbox/plugins/magnatune/magnatune-purchase.glade > +lib/rhythmbox/plugins/magnatune/magnatune.rb-plugin > +lib/rhythmbox/plugins/magnatune/magnatune_logo_color_small.png > +lib/rhythmbox/plugins/magnatune/magnatune_logo_color_tiny.png > +lib/rhythmbox/plugins/mmkeys/ > +lib/rhythmbox/plugins/mmkeys/libmmkeys.a > +lib/rhythmbox/plugins/mmkeys/libmmkeys.la > +lib/rhythmbox/plugins/mmkeys/libmmkeys.so > +lib/rhythmbox/plugins/mmkeys/mmkeys.rb-plugin > +lib/rhythmbox/plugins/power-manager/ > +lib/rhythmbox/plugins/power-manager/libpower-manager.a > +lib/rhythmbox/plugins/power-manager/libpower-manager.la > +lib/rhythmbox/plugins/power-manager/libpower-manager.so > +lib/rhythmbox/plugins/power-manager/power-manager.rb-plugin > +lib/rhythmbox/plugins/python-console/ > +lib/rhythmbox/plugins/python-console/pythonconsole.py > +lib/rhythmbox/plugins/python-console/pythonconsole.pyc > +lib/rhythmbox/plugins/python-console/pythonconsole.pyo > +lib/rhythmbox/plugins/python-console/pythonconsole.rb-plugin > +lib/rhythmbox/plugins/rb/ > +lib/rhythmbox/plugins/rb/Coroutine.py > +lib/rhythmbox/plugins/rb/Coroutine.pyc > +lib/rhythmbox/plugins/rb/Coroutine.pyo > +lib/rhythmbox/plugins/rb/Loader.py > +lib/rhythmbox/plugins/rb/Loader.pyc > +lib/rhythmbox/plugins/rb/Loader.pyo > +lib/rhythmbox/plugins/rb/__init__.py > +lib/rhythmbox/plugins/rb/__init__.pyc > +lib/rhythmbox/plugins/rb/__init__.pyo > +lib/rhythmbox/plugins/upnp_coherence/ > +lib/rhythmbox/plugins/upnp_coherence/MediaStore.py > +lib/rhythmbox/plugins/upnp_coherence/MediaStore.pyc > +lib/rhythmbox/plugins/upnp_coherence/MediaStore.pyo > +lib/rhythmbox/plugins/upnp_coherence/UpnpSource.py > +lib/rhythmbox/plugins/upnp_coherence/UpnpSource.pyc > +lib/rhythmbox/plugins/upnp_coherence/UpnpSource.pyo > +lib/rhythmbox/plugins/upnp_coherence/__init__.py > +lib/rhythmbox/plugins/upnp_coherence/__init__.pyc > +lib/rhythmbox/plugins/upnp_coherence/__init__.pyo > +lib/rhythmbox/plugins/upnp_coherence/coherence.rb-plugin > +lib/rhythmbox/plugins/visualizer/ > +lib/rhythmbox/plugins/visualizer/libvisualizer.a > +lib/rhythmbox/plugins/visualizer/libvisualizer.la > +lib/rhythmbox/plugins/visualizer/libvisualizer.so > +lib/rhythmbox/plugins/visualizer/rb-visualizer-glue.h > +lib/rhythmbox/plugins/visualizer/visualizer-controls.glade > +lib/rhythmbox/plugins/visualizer/visualizer-ui.xml > +lib/rhythmbox/plugins/visualizer/visualizer.rb-plugin > +libexec/rhythmbox-metadata > share/applications/rhythmbox.desktop > +share/dbus-1/services/org.gnome.Rhythmbox.service > share/gnome/ > -share/gnome-2.0/ > -share/gnome-2.0/ui/ > -share/gnome-2.0/ui/rhythmbox-ui.xml > share/gnome/help/ > share/gnome/help/rhythmbox/ > share/gnome/help/rhythmbox/C/ > -share/gnome/help/rhythmbox/C/authors.xml > share/gnome/help/rhythmbox/C/fdl-appendix.xml > share/gnome/help/rhythmbox/C/figures/ > -share/gnome/help/rhythmbox/C/figures/rb-adv.png > -share/gnome/help/rhythmbox/C/figures/rb-asst-finish.png > -share/gnome/help/rhythmbox/C/figures/rb-asst-library.png > -share/gnome/help/rhythmbox/C/figures/rb-asst-start.png > -share/gnome/help/rhythmbox/C/figures/rb-basic.png > -share/gnome/help/rhythmbox/C/figures/rb-browser.png > -share/gnome/help/rhythmbox/C/figures/rb-context-menu.png > -share/gnome/help/rhythmbox/C/figures/rb-empty.png > -share/gnome/help/rhythmbox/C/figures/rb-full-play.png > -share/gnome/help/rhythmbox/C/figures/rb-group-auto.png > -share/gnome/help/rhythmbox/C/figures/rb-group-create.png > -share/gnome/help/rhythmbox/C/figures/rb-group.png > -share/gnome/help/rhythmbox/C/figures/rb-imported.png > -share/gnome/help/rhythmbox/C/figures/rb-iradio-add.png > -share/gnome/help/rhythmbox/C/figures/rb-iradio.png > -share/gnome/help/rhythmbox/C/figures/rb-nextprev.png > -share/gnome/help/rhythmbox/C/figures/rb-nobrowse-play.png > +share/gnome/help/rhythmbox/C/figures/rb-iradio-main.png > share/gnome/help/rhythmbox/C/figures/rb-notification-area-menu.png > -share/gnome/help/rhythmbox/C/figures/rb-notification-area.png > -share/gnome/help/rhythmbox/C/figures/rb-player.png > -share/gnome/help/rhythmbox/C/figures/rb-prefs-general.png > -share/gnome/help/rhythmbox/C/figures/rb-prefs-ipod.png > -share/gnome/help/rhythmbox/C/figures/rb-prefs-library.png > -share/gnome/help/rhythmbox/C/figures/rb-prefs.png > -share/gnome/help/rhythmbox/C/figures/rb-repeat.png > -share/gnome/help/rhythmbox/C/figures/rb-search.png > -share/gnome/help/rhythmbox/C/figures/rb-shuffle.png > -share/gnome/help/rhythmbox/C/figures/rb-sidebar.png > -share/gnome/help/rhythmbox/C/figures/rb-stats.png > +share/gnome/help/rhythmbox/C/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/C/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/C/figures/rb-podcast-main.png > share/gnome/help/rhythmbox/C/figures/rb-statusbar.png > -share/gnome/help/rhythmbox/C/figures/rb-toolbar-editor.png > +share/gnome/help/rhythmbox/C/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/C/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/C/figures/rb-toolbar-shuffle.png > share/gnome/help/rhythmbox/C/figures/rb-toolbar.png > share/gnome/help/rhythmbox/C/figures/rb-volume-changer.png > -share/gnome/help/rhythmbox/C/figures/rb-volume-mute.png > share/gnome/help/rhythmbox/C/figures/rb-window-small.png > share/gnome/help/rhythmbox/C/figures/rb-window.png > -share/gnome/help/rhythmbox/C/figures/rhythmbox-group.png > -share/gnome/help/rhythmbox/C/figures/rhythmbox-tray-icon.png > share/gnome/help/rhythmbox/C/legal.xml > -share/gnome/help/rhythmbox/C/quick-reference.xml > share/gnome/help/rhythmbox/C/rhythmbox.xml > -share/gnome/help/rhythmbox/C/user-guide.xml > -share/gnome/help/rhythmbox/ja/ > -share/gnome/help/rhythmbox/ja/authors.xml > -share/gnome/help/rhythmbox/ja/fdl-appendix.xml > -share/gnome/help/rhythmbox/ja/figures/ > -share/gnome/help/rhythmbox/ja/figures/rb-adv.png > -share/gnome/help/rhythmbox/ja/figures/rb-basic.png > -share/gnome/help/rhythmbox/ja/figures/rb-browser.png > -share/gnome/help/rhythmbox/ja/figures/rb-context-menu.png > -share/gnome/help/rhythmbox/ja/figures/rb-iradio-add.png > -share/gnome/help/rhythmbox/ja/figures/rb-iradio.png > -share/gnome/help/rhythmbox/ja/figures/rb-nextprev.png > -share/gnome/help/rhythmbox/ja/figures/rb-notification-area-menu.png > -share/gnome/help/rhythmbox/ja/figures/rb-notification-area.png > -share/gnome/help/rhythmbox/ja/figures/rb-player.png > -share/gnome/help/rhythmbox/ja/figures/rb-prefs-general.png > -share/gnome/help/rhythmbox/ja/figures/rb-prefs-library.png > -share/gnome/help/rhythmbox/ja/figures/rb-repeat.png > -share/gnome/help/rhythmbox/ja/figures/rb-search.png > -share/gnome/help/rhythmbox/ja/figures/rb-shuffle.png > -share/gnome/help/rhythmbox/ja/figures/rb-sidebar.png > -share/gnome/help/rhythmbox/ja/figures/rb-stats.png > -share/gnome/help/rhythmbox/ja/figures/rb-volume-changer.png > -share/gnome/help/rhythmbox/ja/figures/rb-window.png > -share/gnome/help/rhythmbox/ja/legal.xml > -share/gnome/help/rhythmbox/ja/quick-reference.xml > -share/gnome/help/rhythmbox/ja/rhythmbox.xml > -share/gnome/help/rhythmbox/ja/user-guide.xml > -share/idl/ > -share/idl/Rhythmbox.idl > +share/gnome/help/rhythmbox/de/ > +share/gnome/help/rhythmbox/de/figures/ > +share/gnome/help/rhythmbox/de/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/de/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/de/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/de/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/de/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/de/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/de/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/de/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/de/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/de/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/de/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/de/figures/rb-window-small.png > +share/gnome/help/rhythmbox/de/figures/rb-window.png > +share/gnome/help/rhythmbox/de/rhythmbox.xml > +share/gnome/help/rhythmbox/el/ > +share/gnome/help/rhythmbox/el/figures/ > +share/gnome/help/rhythmbox/el/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/el/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/el/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/el/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/el/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/el/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/el/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/el/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/el/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/el/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/el/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/el/figures/rb-window-small.png > +share/gnome/help/rhythmbox/el/figures/rb-window.png > +share/gnome/help/rhythmbox/el/rhythmbox.xml > +share/gnome/help/rhythmbox/es/ > +share/gnome/help/rhythmbox/es/figures/ > +share/gnome/help/rhythmbox/es/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/es/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/es/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/es/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/es/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/es/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/es/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/es/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/es/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/es/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/es/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/es/figures/rb-window-small.png > +share/gnome/help/rhythmbox/es/figures/rb-window.png > +share/gnome/help/rhythmbox/es/rhythmbox.xml > +share/gnome/help/rhythmbox/fr/ > +share/gnome/help/rhythmbox/fr/figures/ > +share/gnome/help/rhythmbox/fr/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/fr/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/fr/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/fr/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/fr/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/fr/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/fr/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/fr/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/fr/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/fr/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/fr/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/fr/figures/rb-window-small.png > +share/gnome/help/rhythmbox/fr/figures/rb-window.png > +share/gnome/help/rhythmbox/fr/rhythmbox.xml > +share/gnome/help/rhythmbox/it/ > +share/gnome/help/rhythmbox/it/figures/ > +share/gnome/help/rhythmbox/it/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/it/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/it/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/it/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/it/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/it/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/it/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/it/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/it/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/it/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/it/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/it/figures/rb-window-small.png > +share/gnome/help/rhythmbox/it/figures/rb-window.png > +share/gnome/help/rhythmbox/it/rhythmbox.xml > +share/gnome/help/rhythmbox/oc/ > +share/gnome/help/rhythmbox/oc/figures/ > +share/gnome/help/rhythmbox/oc/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/oc/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/oc/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/oc/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/oc/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/oc/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/oc/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/oc/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/oc/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/oc/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/oc/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/oc/figures/rb-window-small.png > +share/gnome/help/rhythmbox/oc/figures/rb-window.png > +share/gnome/help/rhythmbox/oc/rhythmbox.xml > +share/gnome/help/rhythmbox/ru/ > +share/gnome/help/rhythmbox/ru/figures/ > +share/gnome/help/rhythmbox/ru/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/ru/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/ru/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/ru/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/ru/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/ru/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/ru/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/ru/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/ru/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/ru/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/ru/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/ru/figures/rb-window-small.png > +share/gnome/help/rhythmbox/ru/figures/rb-window.png > +share/gnome/help/rhythmbox/ru/rhythmbox.xml > +share/gnome/help/rhythmbox/sv/ > +share/gnome/help/rhythmbox/sv/figures/ > +share/gnome/help/rhythmbox/sv/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/sv/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/sv/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/sv/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/sv/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/sv/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/sv/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/sv/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/sv/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/sv/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/sv/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/sv/figures/rb-window-small.png > +share/gnome/help/rhythmbox/sv/figures/rb-window.png > +share/gnome/help/rhythmbox/sv/rhythmbox.xml > +share/gnome/help/rhythmbox/zh_CN/ > +share/gnome/help/rhythmbox/zh_CN/figures/ > +share/gnome/help/rhythmbox/zh_CN/figures/rb-iradio-main.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-area-menu.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-window.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-notification-zone.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-podcast-main.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-statusbar.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-prevplaynext.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-repeat.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar-shuffle.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-toolbar.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-volume-changer.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-window-small.png > +share/gnome/help/rhythmbox/zh_CN/figures/rb-window.png > +share/gnome/help/rhythmbox/zh_CN/rhythmbox.xml > +share/gtk-doc/html/rhythmbox/ > +share/gtk-doc/html/rhythmbox/ch01.html > +share/gtk-doc/html/rhythmbox/ch02.html > +share/gtk-doc/html/rhythmbox/ch03.html > +share/gtk-doc/html/rhythmbox/ch04.html > +share/gtk-doc/html/rhythmbox/ch05.html > +share/gtk-doc/html/rhythmbox/ch06.html > +share/gtk-doc/html/rhythmbox/ch07.html > +share/gtk-doc/html/rhythmbox/home.png > +share/gtk-doc/html/rhythmbox/index.html > +share/gtk-doc/html/rhythmbox/index.sgml > +share/gtk-doc/html/rhythmbox/left.png > +share/gtk-doc/html/rhythmbox/rhythmbox-RBCellRendererPixbuf.html > +share/gtk-doc/html/rhythmbox/rhythmbox-RBSource.html > +share/gtk-doc/html/rhythmbox/rhythmbox-eel-gconf-extensions.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-cell-renderer-rating.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-debug.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-dialog.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-druid.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-entry-view.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-enums.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-file-helpers.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-glade-helpers.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-header.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-history.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-library-source.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-metadata.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-linear-loop.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-linear.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-by-age-and-rating.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-by-age.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-by-rating.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random-equal-weights.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-random.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order-shuffle.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-play-order.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-player.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-playlist-manager.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-playlist-source-recorder.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-playlist-source.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-preferences.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-property-view.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-query-creator.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-rating-helper.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-rating.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-search-entry.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell-clipboard.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell-player.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell-preferences.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-shell.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-song-display-box.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-song-info.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-source-header.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-sourcelist-model.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-sourcelist.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-statusbar.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-stock-icons.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-string-helpers.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-tray-icon.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-tree-dnd.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-tree-model-sort.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rb-util.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb-property-model.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb-query-model.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb-tree.html > +share/gtk-doc/html/rhythmbox/rhythmbox-rhythmdb.html > +share/gtk-doc/html/rhythmbox/rhythmbox.devhelp > +share/gtk-doc/html/rhythmbox/rhythmbox.devhelp2 > +share/gtk-doc/html/rhythmbox/right.png > +share/gtk-doc/html/rhythmbox/style.css > +share/gtk-doc/html/rhythmbox/up.png > +share/icons/hicolor/16x16/apps/rhythmbox.png > +share/icons/hicolor/22x22/apps/rhythmbox.png > +share/icons/hicolor/32x32/apps/rhythmbox.png > +share/icons/hicolor/48x48/apps/rhythmbox.png > +share/icons/hicolor/scalable/apps/rhythmbox.svg > share/locale/am/LC_MESSAGES/rhythmbox.mo > -share/locale/ar/ > -share/locale/ar/LC_MESSAGES/ > share/locale/ar/LC_MESSAGES/rhythmbox.mo > share/locale/az/LC_MESSAGES/rhythmbox.mo > share/locale/be/LC_MESSAGES/rhythmbox.mo > +share/locale/be@latin/LC_MESSAGES/rhythmbox.mo > share/locale/bg/LC_MESSAGES/rhythmbox.mo > share/locale/ca/LC_MESSAGES/rhythmbox.mo > share/locale/cs/LC_MESSAGES/rhythmbox.mo > -share/locale/cy/ > -share/locale/cy/LC_MESSAGES/ > share/locale/cy/LC_MESSAGES/rhythmbox.mo > share/locale/da/LC_MESSAGES/rhythmbox.mo > share/locale/de/LC_MESSAGES/rhythmbox.mo > +share/locale/dz/LC_MESSAGES/rhythmbox.mo > share/locale/el/LC_MESSAGES/rhythmbox.mo > -share/locale/en_CA/ > -share/locale/en_CA/LC_MESSAGES/ > share/locale/en_CA/LC_MESSAGES/rhythmbox.mo > -share/locale/en_GB/ > -share/locale/en_GB/LC_MESSAGES/ > share/locale/en_GB/LC_MESSAGES/rhythmbox.mo > share/locale/es/LC_MESSAGES/rhythmbox.mo > share/locale/et/LC_MESSAGES/rhythmbox.mo > -share/locale/eu/ > -share/locale/eu/LC_MESSAGES/ > share/locale/eu/LC_MESSAGES/rhythmbox.mo > share/locale/fi/LC_MESSAGES/rhythmbox.mo > share/locale/fr/LC_MESSAGES/rhythmbox.mo > share/locale/ga/LC_MESSAGES/rhythmbox.mo > +share/locale/gl/LC_MESSAGES/rhythmbox.mo > share/locale/he/LC_MESSAGES/rhythmbox.mo > +share/locale/hi/LC_MESSAGES/rhythmbox.mo > share/locale/hr/LC_MESSAGES/rhythmbox.mo > share/locale/hu/LC_MESSAGES/rhythmbox.mo > share/locale/id/LC_MESSAGES/rhythmbox.mo > -share/locale/is/ > -share/locale/is/LC_MESSAGES/ > share/locale/is/LC_MESSAGES/rhythmbox.mo > share/locale/it/LC_MESSAGES/rhythmbox.mo > share/locale/ja/LC_MESSAGES/rhythmbox.mo > share/locale/ko/LC_MESSAGES/rhythmbox.mo > -share/locale/lt/ > -share/locale/lt/LC_MESSAGES/ > share/locale/lt/LC_MESSAGES/rhythmbox.mo > share/locale/lv/LC_MESSAGES/rhythmbox.mo > -share/locale/mn/ > -share/locale/mn/LC_MESSAGES/ > +share/locale/mk/LC_MESSAGES/rhythmbox.mo > +share/locale/ml/LC_MESSAGES/rhythmbox.mo > share/locale/mn/LC_MESSAGES/rhythmbox.mo > -share/locale/ms/ > -share/locale/ms/LC_MESSAGES/ > share/locale/ms/LC_MESSAGES/rhythmbox.mo > share/locale/nb/LC_MESSAGES/rhythmbox.mo > +share/locale/ne/LC_MESSAGES/rhythmbox.mo > share/locale/nl/LC_MESSAGES/rhythmbox.mo > -share/locale/no/LC_MESSAGES/rhythmbox.mo > -share/locale/pa/ > -share/locale/pa/LC_MESSAGES/ > +share/locale/oc/LC_MESSAGES/rhythmbox.mo > share/locale/pa/LC_MESSAGES/rhythmbox.mo > share/locale/pl/LC_MESSAGES/rhythmbox.mo > share/locale/pt/LC_MESSAGES/rhythmbox.mo > share/locale/pt_BR/LC_MESSAGES/rhythmbox.mo > share/locale/ro/LC_MESSAGES/rhythmbox.mo > share/locale/ru/LC_MESSAGES/rhythmbox.mo > +share/locale/rw/LC_MESSAGES/rhythmbox.mo > share/locale/sk/LC_MESSAGES/rhythmbox.mo > share/locale/sr/LC_MESSAGES/rhythmbox.mo > share/locale/sr@Latn/LC_MESSAGES/rhythmbox.mo > share/locale/sv/LC_MESSAGES/rhythmbox.mo > +share/locale/th/LC_MESSAGES/rhythmbox.mo > share/locale/tr/LC_MESSAGES/rhythmbox.mo > share/locale/uk/LC_MESSAGES/rhythmbox.mo > share/locale/vi/LC_MESSAGES/rhythmbox.mo > share/locale/zh_CN/LC_MESSAGES/rhythmbox.mo > +share/locale/zh_HK/LC_MESSAGES/rhythmbox.mo > share/locale/zh_TW/LC_MESSAGES/rhythmbox.mo > -share/mime-info/ > -share/mime-info/rhythmbox.keys > share/omf/rhythmbox/ > share/omf/rhythmbox/rhythmbox-C.omf > -share/omf/rhythmbox/rhythmbox-ja.omf > -share/pixmaps/ > -share/pixmaps/rhythmbox.png > +share/omf/rhythmbox/rhythmbox-de.omf > +share/omf/rhythmbox/rhythmbox-el.omf > +share/omf/rhythmbox/rhythmbox-es.omf > +share/omf/rhythmbox/rhythmbox-fr.omf > +share/omf/rhythmbox/rhythmbox-it.omf > +share/omf/rhythmbox/rhythmbox-oc.omf > +share/omf/rhythmbox/rhythmbox-ru.omf > +share/omf/rhythmbox/rhythmbox-sv.omf > +share/omf/rhythmbox/rhythmbox-zh_CN.omf > share/rhythmbox/ > -share/rhythmbox/art/ > -share/rhythmbox/art/about-logo.png > -share/rhythmbox/art/rhythmbox-album.png > -share/rhythmbox/art/rhythmbox-audiocd.png > -share/rhythmbox/art/rhythmbox-automatic-playlist.png > -share/rhythmbox/art/rhythmbox-dnd.png > -share/rhythmbox/art/rhythmbox-ipod.png > -share/rhythmbox/art/rhythmbox-iradio.png > -share/rhythmbox/art/rhythmbox-library.png > -share/rhythmbox/art/rhythmbox-next.png > -share/rhythmbox/art/rhythmbox-no-star.png > -share/rhythmbox/art/rhythmbox-pause.png > -share/rhythmbox/art/rhythmbox-paused.png > -share/rhythmbox/art/rhythmbox-play.png > -share/rhythmbox/art/rhythmbox-playing.png > -share/rhythmbox/art/rhythmbox-playlist-menu.png > -share/rhythmbox/art/rhythmbox-playlist.png > -share/rhythmbox/art/rhythmbox-previous.png > -share/rhythmbox/art/rhythmbox-repeat.png > -share/rhythmbox/art/rhythmbox-rewind.png > -share/rhythmbox/art/rhythmbox-set-star.png > -share/rhythmbox/art/rhythmbox-shuffle.png > -share/rhythmbox/art/rhythmbox-stop.png > -share/rhythmbox/art/rhythmbox-tray-icon.png > -share/rhythmbox/art/rhythmbox-unset-star.png > -share/rhythmbox/art/rhythmbox-visuals.png > -share/rhythmbox/art/rhythmbox-volume-max.png > -share/rhythmbox/art/rhythmbox-volume-medium.png > -share/rhythmbox/art/rhythmbox-volume-min.png > -share/rhythmbox/art/rhythmbox-volume-mute.png > -share/rhythmbox/art/rhythmbox-volume-zero.png > share/rhythmbox/glade/ > share/rhythmbox/glade/create-playlist.glade > -share/rhythmbox/glade/druid.glade > share/rhythmbox/glade/general-prefs.glade > share/rhythmbox/glade/library-prefs.glade > -share/rhythmbox/glade/load-failure.glade > +share/rhythmbox/glade/playback-prefs.glade > +share/rhythmbox/glade/playlist-save.glade > +share/rhythmbox/glade/plugins.glade > +share/rhythmbox/glade/podcast-feed-properties.glade > +share/rhythmbox/glade/podcast-prefs.glade > +share/rhythmbox/glade/podcast-properties.glade > share/rhythmbox/glade/song-info-multiple.glade > share/rhythmbox/glade/song-info.glade > -share/rhythmbox/glade/station-new.glade > -share/rhythmbox/glade/station-properties.glade > +share/rhythmbox/glade/uri-new.glade > share/rhythmbox/glade/uri.glade > -share/rhythmbox/iradio-initial.pls > -@unexec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-uninstall-rule %D/share/schemas/rhythmbox/*.schemas > /dev/null > -share/schemas/ > +share/rhythmbox/icons/ > +share/rhythmbox/icons/hicolor/ > +share/rhythmbox/icons/hicolor/16x16/ > +share/rhythmbox/icons/hicolor/16x16/actions/ > +share/rhythmbox/icons/hicolor/16x16/actions/internet-radio-new.png > +share/rhythmbox/icons/hicolor/16x16/actions/media-eject.png > +share/rhythmbox/icons/hicolor/16x16/actions/playlist-automatic-new.png > +share/rhythmbox/icons/hicolor/16x16/actions/playlist-new.png > +share/rhythmbox/icons/hicolor/16x16/actions/podcast-new.png > +share/rhythmbox/icons/hicolor/16x16/places/ > +share/rhythmbox/icons/hicolor/16x16/places/library-internet-radio.png > +share/rhythmbox/icons/hicolor/16x16/places/library-podcast.png > +share/rhythmbox/icons/hicolor/16x16/places/playlist-automatic.png > +share/rhythmbox/icons/hicolor/16x16/places/playlist.png > +share/rhythmbox/icons/hicolor/16x16/status/ > +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-no-star.png > +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-notplaying.png > +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-set-star.png > +share/rhythmbox/icons/hicolor/16x16/status/rhythmbox-unset-star.png > +share/rhythmbox/icons/hicolor/22x22/ > +share/rhythmbox/icons/hicolor/22x22/actions/ > +share/rhythmbox/icons/hicolor/22x22/actions/internet-radio-new.png > +share/rhythmbox/icons/hicolor/22x22/actions/playlist-automatic-new.png > +share/rhythmbox/icons/hicolor/22x22/actions/playlist-new.png > +share/rhythmbox/icons/hicolor/22x22/actions/podcast-new.png > +share/rhythmbox/icons/hicolor/22x22/actions/visualization.png > +share/rhythmbox/icons/hicolor/22x22/places/ > +share/rhythmbox/icons/hicolor/22x22/places/library-internet-radio.png > +share/rhythmbox/icons/hicolor/22x22/places/library-podcast.png > +share/rhythmbox/icons/hicolor/22x22/places/playlist-automatic.png > +share/rhythmbox/icons/hicolor/22x22/places/playlist.png > +share/rhythmbox/icons/hicolor/22x22/status/ > +share/rhythmbox/icons/hicolor/22x22/status/rhythmbox-notplaying.png > +share/rhythmbox/icons/hicolor/24x24/ > +share/rhythmbox/icons/hicolor/24x24/places/ > +share/rhythmbox/icons/hicolor/24x24/places/jamendo.png > +share/rhythmbox/icons/hicolor/24x24/places/magnatune.png > +share/rhythmbox/icons/hicolor/32x32/ > +share/rhythmbox/icons/hicolor/32x32/actions/ > +share/rhythmbox/icons/hicolor/32x32/actions/internet-radio-new.png > +share/rhythmbox/icons/hicolor/32x32/actions/playlist-automatic-new.png > +share/rhythmbox/icons/hicolor/32x32/actions/playlist-new.png > +share/rhythmbox/icons/hicolor/32x32/places/ > +share/rhythmbox/icons/hicolor/32x32/places/library-internet-radio.png > +share/rhythmbox/icons/hicolor/32x32/places/playlist-automatic.png > +share/rhythmbox/icons/hicolor/32x32/places/playlist.png > +share/rhythmbox/icons/hicolor/32x32/status/ > +share/rhythmbox/icons/hicolor/32x32/status/rhythmbox-notplaying.png > +share/rhythmbox/icons/hicolor/scalable/ > +share/rhythmbox/icons/hicolor/scalable/actions/ > +share/rhythmbox/icons/hicolor/scalable/actions/internet-radio-new.svg > +share/rhythmbox/icons/hicolor/scalable/actions/playlist-automatic-new.svg > +share/rhythmbox/icons/hicolor/scalable/actions/playlist-new.svg > +share/rhythmbox/icons/hicolor/scalable/places/ > +share/rhythmbox/icons/hicolor/scalable/places/library-internet-radio.svg > +share/rhythmbox/icons/hicolor/scalable/places/playlist-automatic.svg > +share/rhythmbox/icons/hicolor/scalable/places/playlist.svg > +share/rhythmbox/icons/hicolor/scalable/status/ > +share/rhythmbox/icons/hicolor/scalable/status/rhythmbox-notplaying.svg > +share/rhythmbox/playlists.xml > +share/rhythmbox/rhythmbox-ui.xml > share/schemas/rhythmbox/ > share/schemas/rhythmbox/rhythmbox.schemas > -@exec GCONF_CONFIG_SOURCE=`%D/bin/gconftool-2 --get-default-source` %D/bin/gconftool-2 --makefile-install-rule %D/share/schemas/rhythmbox/*.schemas > /dev/null > -@exec %D/bin/scrollkeeper-update -q > -@unexec %D/bin/scrollkeeper-update -q > -@exec %D/bin/update-desktop-database > -@unexec %D/bin/update-desktop-database > -%%SHARED%% -- "The good life is one inspired by love and guided by knowledge." -- Bertrand Russel |
| Free embeddable forum powered by Nabble | Forum Help |