From 247b6a3754c2c50318e2a73d79981ba0e9cb560b Mon Sep 17 00:00:00 2001 From: Martin Jansa Date: Wed, 28 Nov 2012 15:59:48 +0100 Subject: gstreamer, gst-plugins*: fix localdata * all gst* packages were producing LC_MESSAGES/.mo instead of LC_MESSAGES/gst*.mo and it was leading to file conflicts between gst* packages too * for more details see http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html * buildhistory diff, confirms issue fixed https://github.com/shr-distribution/buildhistory/commit/f2c0888c0e08dfb33cc0cdf384621fc499d4ac04 * Thanks to Enrico for simplier solution (From OE-Core rev: f50e2984d9411a059b86d6c158e9416fceb84c3d) Signed-off-by: Martin Jansa Signed-off-by: Richard Purdie --- meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb') diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb index 4ca44290da..90b1982aab 100644 --- a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb +++ b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605 \ file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" DEPENDS = "glib-2.0 libxml2 bison-native flex-native" -PR = "r1" +PR = "r2" SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ file://check_fix.patch \ @@ -23,6 +23,13 @@ inherit autotools pkgconfig gettext GSTREAMER_DEBUG ?= "--disable-debug" EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_DEBUG}" +# apply gstreamer hack after Makefile.in.in in source is replaced by our version from +# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed +# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html +oe_runconf_prepend() { + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in +} + #do_compile_prepend () { # mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ #} -- cgit v1.2.3-54-g00ecf