diff options
| -rw-r--r-- | packages/freetype/freetype-2.3.6/.mtn2git_empty | 0 | ||||
| -rw-r--r-- | packages/freetype/freetype-2.3.6/fix-configure.patch | 13 | ||||
| -rw-r--r-- | packages/freetype/freetype_2.3.6.bb | 11 | ||||
| -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 |
5 files changed, 45 insertions, 8 deletions
diff --git a/packages/freetype/freetype-2.3.6/.mtn2git_empty b/packages/freetype/freetype-2.3.6/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 --- /dev/null +++ b/packages/freetype/freetype-2.3.6/.mtn2git_empty diff --git a/packages/freetype/freetype-2.3.6/fix-configure.patch b/packages/freetype/freetype-2.3.6/fix-configure.patch new file mode 100644 index 0000000000..ecd96738d4 --- /dev/null +++ b/packages/freetype/freetype-2.3.6/fix-configure.patch @@ -0,0 +1,13 @@ +Index: freetype-2.3.6/builds/unix/configure.ac +=================================================================== +--- freetype-2.3.6.orig/builds/unix/configure.ac ++++ freetype-2.3.6/builds/unix/configure.ac +@@ -506,8 +506,6 @@ AC_SUBST([FT2_EXTRA_LIBS]) + AC_SUBST([SYSTEM_ZLIB]) + + +-LT_INIT(win32-dll) +- + AC_SUBST([hardcode_libdir_flag_spec]) + AC_SUBST([wl]) + AC_SUBST([build_libtool_libs]) diff --git a/packages/freetype/freetype_2.3.6.bb b/packages/freetype/freetype_2.3.6.bb index 1333997775..516354ad23 100644 --- a/packages/freetype/freetype_2.3.6.bb +++ b/packages/freetype/freetype_2.3.6.bb @@ -3,15 +3,16 @@ SECTION = "libs" LICENSE = "freetype" PR = "r0" -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ - file://no-hardcode.patch;patch=1 \ - " - +SRC_URI = "\ + ${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://no-hardcode.patch;patch=1 \ + file://fix-configure.patch;patch=1 \ +" S = "${WORKDIR}/freetype-${PV}" inherit autotools pkgconfig binconfig -LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" +LIBTOOL = "${HOST_SYS}-libtool" EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" EXTRA_OECONF = "--without-zlib" 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" + |