2 files changed, 9 insertions, 13 deletions

diff --git a/meta/packages/python/python-gst/python-path.patch b/meta/packages/python/python-gst/python-path.patch
index 465d5b180a..af5badd4d9 100644
--- a/meta/packages/python/python-gst/python-path.patch
+++ b/meta/packages/python/python-gst/python-path.patch
@@ -1,8 +1,8 @@
-Index: gst-python-0.10.7/acinclude.m4
+Index: gst-python-0.10.18/acinclude.m4
 ===================================================================
---- gst-python-0.10.7.orig/acinclude.m4 2007-03-02 14:10:28.652128590 +0100
-+++ gst-python-0.10.7/acinclude.m4      2007-03-02 14:41:00.106728708 +0100
-@@ -43,12 +43,19 @@
+--- gst-python-0.10.18.orig/acinclude.m4
++++ gst-python-0.10.18/acinclude.m4
+@@ -43,6 +43,12 @@ AC_DEFUN([AM_CHECK_PYTHON_HEADERS],
  [AC_REQUIRE([AM_PATH_PYTHON])
  AC_MSG_CHECKING(for headers required to compile python extensions)
  dnl deduce PYTHON_INCLUDES
@@ -14,9 +14,10 @@ Index: gst-python-0.10.7/acinclude.m4
 +else
  py_prefix=`$PYTHON -c "import sys; print sys.prefix"`
  py_exec_prefix=`$PYTHON -c "import sys; print sys.exec_prefix"`
- PYTHON_INCLUDES="-I${py_prefix}/include/python${PYTHON_VERSION}"
- if test "$py_prefix" != "$py_exec_prefix"; then
-   PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+ if $PYTHON-config --help 2>/dev/null; then
+@@ -53,6 +59,7 @@ else
+     PYTHON_INCLUDES="$PYTHON_INCLUDES -I${py_exec_prefix}/include/python${PYTHON_VERSION}"
+   fi
  fi
 +fi
  AC_SUBST(PYTHON_INCLUDES)
diff --git a/meta/packages/python/python-gst_0.10.8.bb b/meta/packages/python/python-gst_0.10.18.bb
index 59fae113d3..9de07b3c4f 100644
--- a/meta/packages/python/python-gst_0.10.8.bb
+++ b/meta/packages/python/python-gst_0.10.18.bb
@@ -5,18 +5,13 @@ DEPENDS = "gstreamer gst-plugins-base python-pygobject"
 PR = "ml1"
 
 SRC_URI = "http://gstreamer.freedesktop.org/src/gst-python/gst-python-${PV}.tar.bz2 \
-           file://python-path.patch;patch=1"
+           file://python-path.patch"
 S = "${WORKDIR}/gst-python-${PV}"
 
 inherit autotools distutils-base pkgconfig
 
 EXTRA_OECONF += "--with-python-includes=${STAGING_INCDIR}/../"
 
-do_configure_prepend() {
-    install -d ${S}/m4
-    install -m 0644 ${S}/common/m4/*.m4 ${S}/m4/
-}
-
 FILES_${PN} += "${datadir}/gst-python"
 FILES_${PN}-dev += "${datadir}/gst-python/0.10/defs"
 FILES_${PN}-dbg += "${libdir}/${PYTHON_DIR}/site-packages/gst-0.10/gst/.debug/"