diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-06-13 18:38:48 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-06-13 18:38:48 +0000 |
| commit | c2ecee68b3cf7a30ffb34756dbaa888e76a36fe9 (patch) | |
| tree | 359177acef9ccf4844f249758ff14c81da67abcd /packages/python | |
| parent | 61b3dd67bad9d7ed1c27f30a9d9eafb03034b77f (diff) | |
| parent | 9a2c8e90f77325a2b21f41d7ac83a0f040167349 (diff) | |
merge of 'aac87a2141ed5dcc6cf1e3015a21d15463f3d048'
and 'c407c3e3af9b704a138bada2e0b7c565f8c293be'
Diffstat (limited to 'packages/python')
| -rw-r--r-- | packages/python/python-gst/import-gobject-instead-of-pygtk.patch | 19 | ||||
| -rw-r--r-- | packages/python/python-gst_0.10.10.bb | 10 |
2 files changed, 26 insertions, 3 deletions
diff --git a/packages/python/python-gst/import-gobject-instead-of-pygtk.patch b/packages/python/python-gst/import-gobject-instead-of-pygtk.patch new file mode 100644 index 0000000000..b4dafa1cea --- /dev/null +++ b/packages/python/python-gst/import-gobject-instead-of-pygtk.patch @@ -0,0 +1,19 @@ +Index: gst-python-0.10.10/gst/__init__.py +=================================================================== +--- gst-python-0.10.10.orig/gst/__init__.py ++++ gst-python-0.10.10/gst/__init__.py +@@ -28,13 +28,8 @@ try: + except: + pass + +-import sys ++import sys, gobject + +-# we always require 2.0 of pygtk; so if pygtk is not imported anywhere +-# yet, we import pygtk here and .require +-if 'gobject' not in sys.modules: +- import pygtk +- pygtk.require('2.0') + + class Value: + def __init__(self, type): diff --git a/packages/python/python-gst_0.10.10.bb b/packages/python/python-gst_0.10.10.bb index 59cc6ad268..ea2b10095a 100644 --- a/packages/python/python-gst_0.10.10.bb +++ b/packages/python/python-gst_0.10.10.bb @@ -2,10 +2,13 @@ DESCRIPTION = "Python Gstreamer bindings" SECTION = "devel/python" LICENSE = "LGPL" DEPENDS = "gstreamer gst-plugins-base python-pygobject" -PR = "ml1" +PR = "ml2" -SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ - file://python-path.patch;patch=1" +SRC_URI = "\ + http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \ + file://python-path.patch;patch=1 \ + file://import-gobject-instead-of-pygtk.patch;patch=1 \ +" S = "${WORKDIR}/gst-python-${PV}" inherit autotools distutils-base pkgconfig @@ -30,3 +33,4 @@ FILES_${PN}-dev += "\ " FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/" FILES_${PN}-examples = "${datadir}/gst-python/0.10/examples" + |