diff options
| -rw-r--r-- | multimedia/gstreamer0.10/Makefile | 7 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/PLIST | 8 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/distinfo | 12 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/patches/patch-ac | 8 | ||||
| -rw-r--r-- | multimedia/gstreamer0.10/patches/patch-ad | 8 |
5 files changed, 26 insertions, 17 deletions
diff --git a/multimedia/gstreamer0.10/Makefile b/multimedia/gstreamer0.10/Makefile index 4c4252c3e5c..905da38ff5f 100644 --- a/multimedia/gstreamer0.10/Makefile +++ b/multimedia/gstreamer0.10/Makefile @@ -1,7 +1,7 @@ -# $NetBSD: Makefile,v 1.32 2009/10/22 09:42:51 drochner Exp $ +# $NetBSD: Makefile,v 1.33 2010/02/16 13:07:05 drochner Exp $ # -DISTNAME= gstreamer-0.10.25 +DISTNAME= gstreamer-0.10.26 PKGNAME= ${DISTNAME:S/gstreamer/gstreamer0.10/} CATEGORIES= multimedia gnome MASTER_SITES= http://gstreamer.freedesktop.org/src/gstreamer/ @@ -18,6 +18,9 @@ USE_PKGLOCALEDIR= yes USE_LIBTOOL= yes USE_TOOLS+= bison flex gmake perl pkg-config +# queue2 moved from gst-plugins-base to here +CONFLICTS+= gst-plugins0.10-base<0.10.26 + CONFIGURE_ARGS+= --disable-examples CONFIGURE_ARGS+= --disable-tests CONFIGURE_ENV+= ac_cv_path_PYTHON=${TRUE:Q} diff --git a/multimedia/gstreamer0.10/PLIST b/multimedia/gstreamer0.10/PLIST index 8e7819e1c98..1647dc9442c 100644 --- a/multimedia/gstreamer0.10/PLIST +++ b/multimedia/gstreamer0.10/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.19 2009/10/21 16:39:38 drochner Exp $ +@comment $NetBSD: PLIST,v 1.20 2010/02/16 13:07:05 drochner Exp $ bin/gst-feedback-0.10 bin/gst-inspect-0.10 bin/gst-launch-0.10 @@ -11,6 +11,7 @@ include/gstreamer-0.10/gst/base/gstbasesrc.h include/gstreamer-0.10/gst/base/gstbasetransform.h include/gstreamer-0.10/gst/base/gstbitreader.h include/gstreamer-0.10/gst/base/gstbytereader.h +include/gstreamer-0.10/gst/base/gstbytewriter.h include/gstreamer-0.10/gst/base/gstcollectpads.h include/gstreamer-0.10/gst/base/gstdataqueue.h include/gstreamer-0.10/gst/base/gstpushsrc.h @@ -98,6 +99,7 @@ ${PLIST.gstcheck}lib/pkgconfig/gstreamer-check-0.10.pc lib/pkgconfig/gstreamer-controller-0.10.pc lib/pkgconfig/gstreamer-dataprotocol-0.10.pc lib/pkgconfig/gstreamer-net-0.10.pc +libexec/gstreamer-0.10/gst-plugin-scanner man/man1/gst-feedback-0.10.1 man/man1/gst-inspect-0.10.1 man/man1/gst-launch-0.10.1 @@ -129,6 +131,7 @@ share/gtk-doc/html/gstreamer-0.10/GstTask.html share/gtk-doc/html/gstreamer-0.10/GstTaskPool.html share/gtk-doc/html/gstreamer-0.10/GstTypeFindFactory.html share/gtk-doc/html/gstreamer-0.10/GstXML.html +share/gtk-doc/html/gstreamer-0.10/annotation-glossary.html share/gtk-doc/html/gstreamer-0.10/api-index-deprecated.html share/gtk-doc/html/gstreamer-0.10/api-index-full.html share/gtk-doc/html/gstreamer-0.10/gst-building.html @@ -197,10 +200,12 @@ share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-0.10.devhelp2 share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstBitReader.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstBufferStraw.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstByteReader.html +share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstByteWriter.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstCheck.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstControllerGObject.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstDataQueue.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstNetTimePacket.html +share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstStreamConsistency.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-GstTypeFindHelper.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs-gstdataprotocol.html share/gtk-doc/html/gstreamer-libs-0.10/gstreamer-libs.html @@ -228,6 +233,7 @@ share/gtk-doc/html/gstreamer-plugins-0.10/gstreamer-plugins-multiqueue.html share/gtk-doc/html/gstreamer-plugins-0.10/gstreamer-plugins-plugin-coreelements.html share/gtk-doc/html/gstreamer-plugins-0.10/gstreamer-plugins-plugin-coreindexers.html share/gtk-doc/html/gstreamer-plugins-0.10/gstreamer-plugins-queue.html +share/gtk-doc/html/gstreamer-plugins-0.10/gstreamer-plugins-queue2.html share/gtk-doc/html/gstreamer-plugins-0.10/gstreamer-plugins-tee.html share/gtk-doc/html/gstreamer-plugins-0.10/gstreamer-plugins-typefind.html share/gtk-doc/html/gstreamer-plugins-0.10/home.png diff --git a/multimedia/gstreamer0.10/distinfo b/multimedia/gstreamer0.10/distinfo index ad13ecd8169..448f3a62665 100644 --- a/multimedia/gstreamer0.10/distinfo +++ b/multimedia/gstreamer0.10/distinfo @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.22 2009/10/21 16:39:38 drochner Exp $ +$NetBSD: distinfo,v 1.23 2010/02/16 13:07:05 drochner Exp $ -SHA1 (gstreamer-0.10.25.tar.bz2) = e3cda2dcac9dbbfc2e61ba79fcd3bff1313dc7f4 -RMD160 (gstreamer-0.10.25.tar.bz2) = 79f0d117f46d4138acb35fac6594a7aeba4c4a7e -Size (gstreamer-0.10.25.tar.bz2) = 3045572 bytes +SHA1 (gstreamer-0.10.26.tar.bz2) = 868dccf7d2a844af88fd2fcf05c92822285fd9ab +RMD160 (gstreamer-0.10.26.tar.bz2) = 96329c7a87c6d8ab0534d9c596854125ede98bf3 +Size (gstreamer-0.10.26.tar.bz2) = 3165732 bytes SHA1 (patch-aa) = bc10562292a005ec43d64401964eddf50d9aa1d5 -SHA1 (patch-ac) = 9008a73a998c93724cd404b0b1c4f64921d37024 -SHA1 (patch-ad) = e37dcc2de746d7b2cf3c97acd5a55325640822c4 +SHA1 (patch-ac) = 2a5200eafbf8682bab6fa6b0d008c7d972024644 +SHA1 (patch-ad) = 1035de6f5c770ee53cf48892a29fcae33112a898 diff --git a/multimedia/gstreamer0.10/patches/patch-ac b/multimedia/gstreamer0.10/patches/patch-ac index 8a99f3cdf90..ddb0c70813a 100644 --- a/multimedia/gstreamer0.10/patches/patch-ac +++ b/multimedia/gstreamer0.10/patches/patch-ac @@ -1,8 +1,8 @@ -$NetBSD: patch-ac,v 1.8 2009/05/25 15:59:21 drochner Exp $ +$NetBSD: patch-ac,v 1.9 2010/02/16 13:07:05 drochner Exp $ ---- configure.orig 2009-05-10 22:26:37.000000000 +0200 +--- configure.orig 2010-02-10 14:29:29.000000000 +0000 +++ configure -@@ -24878,7 +24878,7 @@ rm -f core conftest.err conftest.$ac_obj +@@ -19702,7 +19702,7 @@ rm -f core conftest.err conftest.$ac_obj $as_echo "$flag_ok" >&6; } @@ -10,4 +10,4 @@ $NetBSD: patch-ac,v 1.8 2009/05/25 15:59:21 drochner Exp $ + if test "x$ERROR_CFLAGS" = "x" then - { $as_echo "$as_me:$LINENO: checking to see if compiler understands -errwarn=%all" >&5 + { $as_echo "$as_me:${as_lineno-$LINENO}: checking to see if compiler understands -errwarn=%all" >&5 diff --git a/multimedia/gstreamer0.10/patches/patch-ad b/multimedia/gstreamer0.10/patches/patch-ad index 67a902aa269..0839ffe7534 100644 --- a/multimedia/gstreamer0.10/patches/patch-ad +++ b/multimedia/gstreamer0.10/patches/patch-ad @@ -1,9 +1,9 @@ -$NetBSD: patch-ad,v 1.2 2007/06/08 12:57:00 wiz Exp $ +$NetBSD: patch-ad,v 1.3 2010/02/16 13:07:05 drochner Exp $ ---- tests/check/Makefile.in.orig 2007-06-05 11:32:26.000000000 +0000 +--- tests/check/Makefile.in.orig 2010-02-10 14:29:34.000000000 +0000 +++ tests/check/Makefile.in -@@ -93,8 +93,8 @@ CONFIG_HEADER = $(top_builddir)/config.h - CONFIG_CLEAN_FILES = +@@ -106,8 +106,8 @@ CONFIG_CLEAN_FILES = + CONFIG_CLEAN_VPATH_FILES = @GST_DISABLE_LOADSAVE_FALSE@am__EXEEXT_1 = gst/gstxml$(EXEEXT) @GST_DISABLE_PARSE_FALSE@am__EXEEXT_2 = pipelines/simple-launch-lines$(EXEEXT) \ -@GST_DISABLE_PARSE_FALSE@ pipelines/cleanup$(EXEEXT) \ |