From 1ffca5cad1b75c0a723fb870bcee5e43967f9dfa Mon Sep 17 00:00:00 2001 From: ajacoutot Date: Sun, 29 Nov 2009 09:18:42 +0000 Subject: [PATCH] Major update to py-gstreamer-0.10.17. Months (years?) of changes, refer to the source for changelog. tested on a bulk by jasper@ feedback and sparc64+macppc testing from landry@ "commitski" jasper, ok landry@ --- .../gstreamer-0.10/py-gstreamer/Makefile | 16 ++++++++------ .../gstreamer-0.10/py-gstreamer/distinfo | 10 ++++----- .../py-gstreamer/patches/patch-configure | 12 ++++++++++ .../patches/patch-gst___init___py | 22 ++++++++++--------- .../patches/patch-testsuite_test_interface_py | 19 ++++++++-------- .../gstreamer-0.10/py-gstreamer/pkg/PLIST | 21 +++++++++++++----- 6 files changed, 63 insertions(+), 37 deletions(-) create mode 100644 multimedia/gstreamer-0.10/py-gstreamer/patches/patch-configure diff --git a/multimedia/gstreamer-0.10/py-gstreamer/Makefile b/multimedia/gstreamer-0.10/py-gstreamer/Makefile index caf186fd1ca..d19a219044c 100644 --- a/multimedia/gstreamer-0.10/py-gstreamer/Makefile +++ b/multimedia/gstreamer-0.10/py-gstreamer/Makefile @@ -1,10 +1,10 @@ -# $OpenBSD: Makefile,v 1.5 2009/04/11 14:37:21 ajacoutot Exp $ +# $OpenBSD: Makefile,v 1.6 2009/11/29 09:18:42 ajacoutot Exp $ -COMMENT = Python bindings for gstreamer +COMMENT = Python bindings for GStreamer -V = 0.10.11 +V = 0.10.17 DISTNAME = gst-python-$V -PKGNAME = py-gstreamer-$Vp2 +PKGNAME = py-gstreamer-$V HOMEPAGE = http://gstreamer.freedesktop.org/modules/gst-python.html @@ -13,14 +13,16 @@ MASTER_SITES = ${MASTER_SITE_GST:=gst-python/} WANTLIB = glib-2.0 gmodule-2.0 gobject-2.0 gstbase-0.10 \ gstcontroller-0.10 gstdataprotocol-0.10 gstnet-0.10 \ gstreamer-0.10 gthread-2.0 gstpbutils-0.10 \ - m pcre xml2 z + m pcre xml2 z util -MODULES = devel/gettext +MODULES = devel/gettext \ + lang/python BUILD_DEPENDS = ::x11/py-gtk2 RUN_DEPENDS = ::x11/py-gtk2 \ :py-libxml-*:textproc/libxml,-python -LIB_DEPENDS = gstinterfaces-0.10::$P/plugins-base +LIB_DEPENDS = gstinterfaces-0.10,gstaudio-0.10,gsttag-0.10,gstvideo-0.10::$P/plugins-base \ + ${MODPY_LIB_DEPENDS} REGRESS_DEPENDS = ::$P/plugins-good diff --git a/multimedia/gstreamer-0.10/py-gstreamer/distinfo b/multimedia/gstreamer-0.10/py-gstreamer/distinfo index 61e890b9e09..5f21462c084 100644 --- a/multimedia/gstreamer-0.10/py-gstreamer/distinfo +++ b/multimedia/gstreamer-0.10/py-gstreamer/distinfo @@ -1,5 +1,5 @@ -MD5 (gst-python-0.10.11.tar.bz2) = NXEFl0zA/Nxuq7pEZFIWig== -RMD160 (gst-python-0.10.11.tar.bz2) = pFVYC9AZXFkTiASCj+KJ1RQgkfw= -SHA1 (gst-python-0.10.11.tar.bz2) = VytsLkBWKGDtu5Z/7DL76SUucrM= -SHA256 (gst-python-0.10.11.tar.bz2) = lG0S9dqiJovPXqK8wdFMygxYqHBAU5MXUnTJv08uuec= -SIZE (gst-python-0.10.11.tar.bz2) = 469359 +MD5 (gst-python-0.10.17.tar.bz2) = OZh1PeZQDujBjOFFbfQ99g== +RMD160 (gst-python-0.10.17.tar.bz2) = hywUKOS2W8LHKg6tD0TZm45n2F4= +SHA1 (gst-python-0.10.17.tar.bz2) = uE/12we2ch5821Nfd8o507WdE5I= +SHA256 (gst-python-0.10.17.tar.bz2) = cM74ObQp3OoMrjQtJLwuDl3q4B6QKohY4sfddqckzek= +SIZE (gst-python-0.10.17.tar.bz2) = 582600 diff --git a/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-configure b/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-configure new file mode 100644 index 00000000000..b622c9db3f6 --- /dev/null +++ b/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-configure @@ -0,0 +1,12 @@ +$OpenBSD: patch-configure,v 1.1 2009/11/29 09:18:42 ajacoutot Exp $ +--- configure.orig Tue Nov 24 11:04:30 2009 ++++ configure Tue Nov 24 11:04:54 2009 +@@ -15061,7 +15061,7 @@ fi + { $as_echo "$as_me:$LINENO: checking for libraries required to embed python" >&5 + $as_echo_n "checking for libraries required to embed python... " >&6; } + py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"` +-PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION}" ++PYTHON_LIBS="-L${py_prefix}/lib -lpython${PYTHON_VERSION} -pthread -lm -lutil" + PYTHON_LIB_LOC="${py_prefix}/lib" + + diff --git a/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-gst___init___py b/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-gst___init___py index b1adc9452dc..680221a20e8 100644 --- a/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-gst___init___py +++ b/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-gst___init___py @@ -1,19 +1,21 @@ -$OpenBSD: patch-gst___init___py,v 1.1.1.1 2008/01/22 08:53:41 ajacoutot Exp $ ---- gst/__init__.py.orig Thu Jun 14 21:14:12 2007 -+++ gst/__init__.py Mon Jan 21 11:06:21 2008 -@@ -122,13 +122,13 @@ class Fraction(Value): - import sys - dlsave = sys.getdlopenflags() +$OpenBSD: patch-gst___init___py,v 1.2 2009/11/29 09:18:42 ajacoutot Exp $ +--- gst/__init__.py.orig Tue Nov 24 10:57:32 2009 ++++ gst/__init__.py Tue Nov 24 10:58:07 2009 +@@ -156,7 +156,7 @@ class Fraction(Value): + try: + dlsave = sys.getdlopenflags() - from DLFCN import RTLD_GLOBAL, RTLD_LAZY + from dl import RTLD_GLOBAL, RTLD_LAZY - except ImportError: + except AttributeError: + # windows doesn't have sys.getdlopenflags() RTLD_GLOBAL = -1 +@@ -166,7 +166,7 @@ except ImportError: RTLD_LAZY = -1 import os osname = os.uname()[0] - if osname == 'Linux' or osname == 'SunOS' or osname == 'FreeBSD': + if osname == 'Linux' or osname == 'SunOS' or osname == 'FreeBSD' or osname == 'OpenBSD': - RTLD_GLOBAL = 0x100 - RTLD_LAZY = 0x1 - elif osname == 'Darwin': + machinename = os.uname()[4] + if machinename == 'mips' or machinename == 'mips64': + RTLD_GLOBAL = 0x4 diff --git a/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-testsuite_test_interface_py b/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-testsuite_test_interface_py index 43e83f612a7..d9f07bcb74e 100644 --- a/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-testsuite_test_interface_py +++ b/multimedia/gstreamer-0.10/py-gstreamer/patches/patch-testsuite_test_interface_py @@ -1,12 +1,11 @@ -$OpenBSD: patch-testsuite_test_interface_py,v 1.1.1.1 2008/01/22 08:53:41 ajacoutot Exp $ ---- testsuite/test_interface.py.orig Mon Jan 21 12:13:23 2008 -+++ testsuite/test_interface.py Mon Jan 21 12:13:31 2008 -@@ -46,7 +46,7 @@ class FunctionCall(TestCase): - class MixerTest(TestCase): - def setUp(self): - TestCase.setUp(self) -- self.mixer = gst.element_factory_make('alsasrc', '') -+ self.mixer = gst.element_factory_make('osssrc', '') - assert self.mixer +$OpenBSD: patch-testsuite_test_interface_py,v 1.2 2009/11/29 09:18:42 ajacoutot Exp $ +--- testsuite/test_interface.py.orig Tue Nov 24 11:12:11 2009 ++++ testsuite/test_interface.py Tue Nov 24 11:12:19 2009 +@@ -59,7 +59,6 @@ class MixerTest(TestCase): + self.mixer = amix.create() + else: + self.mixer = None +- assert self.mixer def tearDown(self): + del self.mixer diff --git a/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST b/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST index c9f936f54fa..8488fa87a04 100644 --- a/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST +++ b/multimedia/gstreamer-0.10/py-gstreamer/pkg/PLIST @@ -1,12 +1,16 @@ -@comment $OpenBSD: PLIST,v 1.3 2009/04/11 14:37:21 ajacoutot Exp $ +@comment $OpenBSD: PLIST,v 1.4 2009/11/29 09:18:42 ajacoutot Exp $ +@comment lib/gstreamer-${VERSION}/libgstpython.la +lib/gstreamer-${VERSION}/libgstpython.so lib/pkgconfig/gst-python-${VERSION}.pc lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/ lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/ lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/__init__.py lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/__init__.pyc lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/__init__.pyo -lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/_gst.la +@comment lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/_gst.la lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/_gst.so +@comment lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/audio.la +lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/audio.so lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/ lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/__init__.py lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/__init__.pyc @@ -29,11 +33,15 @@ lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/sources.pyo lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/utils.py lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/utils.pyc lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/extend/utils.pyo -lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/interfaces.la +@comment 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 +@comment 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/gstoption.la +@comment lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/tag.la +lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/tag.so +@comment lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/video.la +lib/python${MODPY_VERSION}/site-packages/gst-${VERSION}/gst/video.so +@comment lib/python${MODPY_VERSION}/site-packages/gstoption.la lib/python${MODPY_VERSION}/site-packages/gstoption.so lib/python${MODPY_VERSION}/site-packages/pygst.pth lib/python${MODPY_VERSION}/site-packages/pygst.py @@ -42,11 +50,14 @@ lib/python${MODPY_VERSION}/site-packages/pygst.pyo share/gst-python/ share/gst-python/${VERSION}/ share/gst-python/${VERSION}/defs/ +share/gst-python/${VERSION}/defs/audio.defs share/gst-python/${VERSION}/defs/base.defs 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}/defs/tag.defs +share/gst-python/${VERSION}/defs/video.defs share/gst-python/${VERSION}/examples/ share/gst-python/${VERSION}/examples/audio-controller.py share/gst-python/${VERSION}/examples/audioconcat.py