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/gst-plugins-bad_0.10.23.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb | 2 +- meta/recipes-multimedia/gstreamer/gst-plugins.inc | 6 ++++++ meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb | 9 ++++++++- 6 files changed, 18 insertions(+), 5 deletions(-) diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb index a277417661..7a398d0cee 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \ DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg curl" -PR = "r2" +PR = "r3" inherit gettext 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 2648864b97..462c54d816 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 @@ -15,7 +15,7 @@ SRC_URI += "file://gst-plugins-base-tremor.patch \ SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976" -PR = "r6" +PR = "r7" inherit gettext diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb index 59bde5bfc1..70d1e4f271 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" -PR = "r7" +PR = "r8" PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb index a9da76e574..9fd71fcd64 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb +++ b/meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb @@ -8,7 +8,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a6f89e2100d9b6cdffcea4f398e37343 \ file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" -PR = "r2" +PR = "r3" inherit gettext diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc index 8799a91fc4..07b26a3a65 100644 --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc @@ -19,3 +19,9 @@ require gst-plugins-package.inc PACKAGES_DYNAMIC += "^${PN}-.*" +# 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 +} 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