summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <martin.jansa@gmail.com>2012-11-28 14:59:48 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2012-11-28 15:25:33 (GMT)
commit247b6a3754c2c50318e2a73d79981ba0e9cb560b (patch)
treef10577a3868ce51935c9483e58c36268d1ae9bcc
parentf931aeb72e4bcc2c8138d9f1b55b1aea86e13b67 (diff)
downloadpoky-1.4_M1.tar.gz
gstreamer, gst-plugins*: fix localdata1.4_M1.rc11.4_M1.final1.4_M1
* 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 <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb2
-rw-r--r--meta/recipes-multimedia/gstreamer/gst-plugins.inc6
-rw-r--r--meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb9
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 a277417..7a398d0 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 \
8 8
9DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg curl" 9DEPENDS += "gst-plugins-base libmusicbrainz tremor librsvg curl"
10 10
11PR = "r2" 11PR = "r3"
12 12
13inherit gettext 13inherit gettext
14 14
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 2648864..462c54d 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 \
15SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a" 15SRC_URI[md5sum] = "776c73883e567f67b9c4a2847d8d041a"
16SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976" 16SRC_URI[sha256sum] = "2cd3b0fa8e9b595db8f514ef7c2bdbcd639a0d63d154c00f8c9b609321f49976"
17 17
18PR = "r6" 18PR = "r7"
19 19
20inherit gettext 20inherit gettext
21 21
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 59bde5b..70d1e4f 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 \
5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \ 5 file://common/coverage/coverage-report.pl;beginline=2;endline=17;md5=622921ffad8cb18ab906c56052788a3f \
6 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe" 6 file://gst/replaygain/rganalysis.c;beginline=1;endline=23;md5=b60ebefd5b2f5a8e0cab6bfee391a5fe"
7 7
8PR = "r7" 8PR = "r8"
9 9
10PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}" 10PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)}"
11PACKAGECONFIG[pulseaudio] = "--enable-pulse,--disable-pulse,pulseaudio" 11PACKAGECONFIG[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 a9da76e..9fd71fc 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 \
8 file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9" 8 file://gst/mpegstream/gstmpegparse.h;beginline=1;endline=18;md5=ff65467b0c53cdfa98d0684c1bc240a9"
9 9
10DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame" 10DEPENDS += "gst-plugins-base libid3tag libmad mpeg2dec liba52 lame"
11PR = "r2" 11PR = "r3"
12 12
13inherit gettext 13inherit gettext
14 14
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index 8799a91..07b26a3 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
19 19
20PACKAGES_DYNAMIC += "^${PN}-.*" 20PACKAGES_DYNAMIC += "^${PN}-.*"
21 21
22# apply gstreamer hack after Makefile.in.in in source is replaced by our version from
23# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
24# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html
25oe_runconf_prepend() {
26 sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
27}
diff --git a/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb b/meta/recipes-multimedia/gstreamer/gstreamer_0.10.36.bb
index 4ca4429..90b1982 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 \
9 file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4" 9 file://gst/gst.h;beginline=1;endline=21;md5=8e5fe5e87d33a04479fde862e238eaa4"
10DEPENDS = "glib-2.0 libxml2 bison-native flex-native" 10DEPENDS = "glib-2.0 libxml2 bison-native flex-native"
11 11
12PR = "r1" 12PR = "r2"
13 13
14SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \ 14SRC_URI = "http://gstreamer.freedesktop.org/src/gstreamer/gstreamer-${PV}.tar.bz2 \
15 file://check_fix.patch \ 15 file://check_fix.patch \
@@ -23,6 +23,13 @@ inherit autotools pkgconfig gettext
23GSTREAMER_DEBUG ?= "--disable-debug" 23GSTREAMER_DEBUG ?= "--disable-debug"
24EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_DEBUG}" 24EXTRA_OECONF = "--disable-docs-build --disable-dependency-tracking --with-check=no --disable-examples --disable-tests --disable-valgrind ${GSTREAMER_DEBUG}"
25 25
26# apply gstreamer hack after Makefile.in.in in source is replaced by our version from
27# ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in, but before configure is executed
28# http://lists.linuxtogo.org/pipermail/openembedded-core/2012-November/032233.html
29oe_runconf_prepend() {
30 sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
31}
32
26#do_compile_prepend () { 33#do_compile_prepend () {
27# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/ 34# mv ${WORKDIR}/gstregistrybinary.[ch] ${S}/gst/
28#} 35#}