summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAndreas Oberritter <obi@opendreambox.org>2012-04-05 00:28:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-04-06 01:12:45 +0100
commitf4e27505b4b50138be45cbe2fe472109224f7918 (patch)
tree76adec67b4051badfead443341e64ccf95b515f5 /meta
parentd103dae12b75c9c18f5cc164facc7fe52a37e667 (diff)
downloadpoky-f4e27505b4b50138be45cbe2fe472109224f7918.tar.gz
gst-plugins-base: fix build of subparse plugin
* Fixes the following configure error by prefixing PKG_CONFIG_SYSROOT_DIR: | grep: /usr/include/gstreamer-0.10/gst/gstconfig.h: No such file or directory (From OE-Core rev: 3c77f7a3bbd47d33dd7cac7ba536675357991c5f) Signed-off-by: Andreas Oberritter <obi@opendreambox.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch27
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb5
2 files changed, 30 insertions, 2 deletions
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
new file mode 100644
index 0000000000..b8602c80d7
--- /dev/null
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base-0.10.36/configure.ac-fix-subparse-plugin.patch
@@ -0,0 +1,27 @@
1Upstream-Status: Submitted [similar patch by other author, bugzilla]
2Bugtracker-URL: https://bugzilla.gnome.org/show_bug.cgi?id=663600
3
4Prepend PKG_CONFIG_SYSROOT to includedir, so configure doesn't
5search for gstconfig.h in /usr/include.
6
7Signed-off-by: Andreas Oberritter <obi@opendreambox.org>
8---
9 configure.ac | 2 +-
10 1 files changed, 1 insertions(+), 1 deletions(-)
11
12diff --git a/configure.ac b/configure.ac
13index 1901bcf..460fb0a 100644
14--- a/configure.ac
15+++ b/configure.ac
16@@ -435,7 +435,7 @@ AG_GST_CHECK_PLUGIN(volume)
17 dnl check for gstreamer core features (subsystems)
18 dnl FIXME: this assumes srcdir == builddir for uninstalled setups
19 GST_CONFIGPATH=`$PKG_CONFIG --variable=includedir gstreamer-0.10`"/gst/gstconfig.h"
20-AG_GST_PARSE_SUBSYSTEM_DISABLES($GST_CONFIGPATH)
21+AG_GST_PARSE_SUBSYSTEM_DISABLES($PKG_CONFIG_SYSROOT_DIR$GST_CONFIGPATH)
22 AM_CONDITIONAL(USE_XML, test $GST_DISABLE_XML != "1")
23
24 dnl disable plug-ins that require libxml2's HTML support if it is not available
25--
261.7.5.4
27
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
index 549982952d..da4a726d55 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb
@@ -9,12 +9,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
9DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}" 9DEPENDS += "${@base_contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxv', '', d)}"
10DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor" 10DEPENDS += "alsa-lib freetype liboil libogg libvorbis libtheora avahi util-linux tremor"
11 11
12SRC_URI += " file://gst-plugins-base-tremor.patch" 12SRC_URI += "file://gst-plugins-base-tremor.patch \
13 file://configure.ac-fix-subparse-plugin.patch"
13 14
14SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" 15SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a"
15SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976" 16SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976"
16 17
17PR = "r2" 18PR = "r3"
18 19
19inherit gettext 20inherit gettext
20 21