locale data broken in gstreamer

locale data broken in gstreamer

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 1732 bytes --]

In last rebuild from scratch I've noticed couple of weird locale data:

Collected errors:
 * check_data_file_clashes: Package gst-plugins-base-locale-en-gb wants
 * to install file /usr/share/locale/en_GB/LC_MESSAGES/.mo
        But that file is already provided by package  * gstreamer-locale-en-gb
 * check_data_file_clashes: Package gst-plugins-base-locale-cs wants to
 * install file /usr/share/locale/cs/LC_MESSAGES/.mo
        But that file is already provided by package  * gstreamer-locale-cs

All gstreamer and gst-plugins-base locales package just .mo file.

from log.do_install:
make[1]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/gstreamer-0.10.36/po'
installing af.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/af/LC_MESSAGES/.mo
installing az.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/az/LC_MESSAGES/.mo
installing be.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/be/LC_MESSAGES/.mo

They are installed to $(DOMAIN).mo
gstreamer-0.10.36/po/Makefile.in.in:$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
gstreamer-0.10.36/po/Makefile.in.in:echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \

and DOMAIN should be set to GETTEXT_PACKAGE (gstreamer-0.10)
./gstreamer-0.10.36/po/Makevars:DOMAIN = $(GETTEXT_PACKAGE)
./gstreamer-0.10.36/po/Makefile:DOMAIN = $(GETTEXT_PACKAGE)

Anyone else seen this, any idea why it fails now? gst* recipes weren't changed lately IIRC, 
so maybe some change in gettext which can break more recipes?

Cheers,

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: locale data broken in gstreamer

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3674 bytes --]

On Tue, Nov 27, 2012 at 07:23:06PM +0100, Martin Jansa wrote:
> In last rebuild from scratch I've noticed couple of weird locale data:
> 
> Collected errors:
>  * check_data_file_clashes: Package gst-plugins-base-locale-en-gb wants
>  * to install file /usr/share/locale/en_GB/LC_MESSAGES/.mo
>         But that file is already provided by package  * gstreamer-locale-en-gb
>  * check_data_file_clashes: Package gst-plugins-base-locale-cs wants to
>  * install file /usr/share/locale/cs/LC_MESSAGES/.mo
>         But that file is already provided by package  * gstreamer-locale-cs
> 
> All gstreamer and gst-plugins-base locales package just .mo file.
> 
> from log.do_install:
> make[1]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/gstreamer-0.10.36/po'
> installing af.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/af/LC_MESSAGES/.mo
> installing az.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/az/LC_MESSAGES/.mo
> installing be.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/be/LC_MESSAGES/.mo
> 
> They are installed to $(DOMAIN).mo
> gstreamer-0.10.36/po/Makefile.in.in:$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
> gstreamer-0.10.36/po/Makefile.in.in:echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
> 
> and DOMAIN should be set to GETTEXT_PACKAGE (gstreamer-0.10)
> ./gstreamer-0.10.36/po/Makevars:DOMAIN = $(GETTEXT_PACKAGE)
> ./gstreamer-0.10.36/po/Makefile:DOMAIN = $(GETTEXT_PACKAGE)
> 
> Anyone else seen this, any idea why it fails now? gst* recipes weren't changed lately IIRC, 
> so maybe some change in gettext which can break more recipes?

buildhistory shows that it got broken around Oct 21

Maybe someone with OEBasicHash can pinpoint it better?

$ git show -1 47613e04c950dee281bf4531ef3fb3b71a90c906 | grep gst-plugins-base-locale-en-gb -A 11
diff --git a/packages/armv4t-oe-linux-gnueabi/gst-plugins-base/gst-plugins-base-locale-en-gb/latest b/packages/armv4t-oe-linux-gnueabi/gst-plugins-base/gst-plugins-base-locale-en-gb/latest
index 74a76ae..ebcab7f 100644
--- a/packages/armv4t-oe-linux-gnueabi/gst-plugins-base/gst-plugins-base-locale-en-gb/latest
+++ b/packages/armv4t-oe-linux-gnueabi/gst-plugins-base/gst-plugins-base-locale-en-gb/latest
@@ -1,7 +1,7 @@
 PV = 0.10.36
 PR = r5
-RDEPENDS = gst-plugins-base virtual-locale-en-gb
-RRECOMMENDS = 
+RDEPENDS = 
+RRECOMMENDS = gst-plugins-base virtual-locale-en-gb
 PKGSIZE = 1165
 FILES = /usr/share/locale/en_GB
-FILELIST = /usr/share/locale/en_GB/LC_MESSAGES/gst-plugins-base-0.10.mo
+FILELIST = /usr/share/locale/en_GB/LC_MESSAGES/.mo
$ git show -1 47613e04c950dee281bf4531ef3fb3b71a90c906 | grep gstreamer-locale-en-gb -A 11
diff --git a/packages/armv4t-oe-linux-gnueabi/gstreamer/gstreamer-locale-en-gb/latest b/packages/armv4t-oe-linux-gnueabi/gstreamer/gstreamer-locale-en-gb/latest
index fffca5a..3affa1a 100644
--- a/packages/armv4t-oe-linux-gnueabi/gstreamer/gstreamer-locale-en-gb/latest
+++ b/packages/armv4t-oe-linux-gnueabi/gstreamer/gstreamer-locale-en-gb/latest
@@ -1,7 +1,7 @@
 PV = 0.10.36
 PR = r1
-RDEPENDS = gstreamer virtual-locale-en-gb
-RRECOMMENDS = 
+RDEPENDS = 
+RRECOMMENDS = gstreamer virtual-locale-en-gb
 PKGSIZE = 12518
 FILES = /usr/share/locale/en_GB
-FILELIST = /usr/share/locale/en_GB/LC_MESSAGES/gstreamer-0.10.mo
+FILELIST = /usr/share/locale/en_GB/LC_MESSAGES/.mo

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: locale data broken in gstreamer

[Mark Hatle]

On 11/27/12 12:23 PM, Martin Jansa wrote:
> In last rebuild from scratch I've noticed couple of weird locale data:

Paul E and I just observed this as well...  My build machine is an -old- FC13 
machine..  system we found it on was x86.

--Mark

> Collected errors:
>   * check_data_file_clashes: Package gst-plugins-base-locale-en-gb wants
>   * to install file /usr/share/locale/en_GB/LC_MESSAGES/.mo
>          But that file is already provided by package  * gstreamer-locale-en-gb
>   * check_data_file_clashes: Package gst-plugins-base-locale-cs wants to
>   * install file /usr/share/locale/cs/LC_MESSAGES/.mo
>          But that file is already provided by package  * gstreamer-locale-cs
>
> All gstreamer and gst-plugins-base locales package just .mo file.
>
> from log.do_install:
> make[1]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/gstreamer-0.10.36/po'
> installing af.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/af/LC_MESSAGES/.mo
> installing az.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/az/LC_MESSAGES/.mo
> installing be.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/be/LC_MESSAGES/.mo
>
> They are installed to $(DOMAIN).mo
> gstreamer-0.10.36/po/Makefile.in.in:$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
> gstreamer-0.10.36/po/Makefile.in.in:echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
>
> and DOMAIN should be set to GETTEXT_PACKAGE (gstreamer-0.10)
> ./gstreamer-0.10.36/po/Makevars:DOMAIN = $(GETTEXT_PACKAGE)
> ./gstreamer-0.10.36/po/Makefile:DOMAIN = $(GETTEXT_PACKAGE)
>
> Anyone else seen this, any idea why it fails now? gst* recipes weren't changed lately IIRC,
> so maybe some change in gettext which can break more recipes?
>
> Cheers,
>
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>

Re: locale data broken in gstreamer

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2747 bytes --]

On Tue, Nov 27, 2012 at 12:44:21PM -0600, Mark Hatle wrote:
> On 11/27/12 12:23 PM, Martin Jansa wrote:
> > In last rebuild from scratch I've noticed couple of weird locale data:
> 
> Paul E and I just observed this as well...  My build machine is an -old- FC13 
> machine..  system we found it on was x86.

Mine is bleading edge gentoo x86_64 and system gettext wasn't changed
too (using sys-devel/gettext-0.18.1.1-r2 since Apr 2011)

Cheers,

> 
> --Mark
> 
> > Collected errors:
> >   * check_data_file_clashes: Package gst-plugins-base-locale-en-gb wants
> >   * to install file /usr/share/locale/en_GB/LC_MESSAGES/.mo
> >          But that file is already provided by package  * gstreamer-locale-en-gb
> >   * check_data_file_clashes: Package gst-plugins-base-locale-cs wants to
> >   * install file /usr/share/locale/cs/LC_MESSAGES/.mo
> >          But that file is already provided by package  * gstreamer-locale-cs
> >
> > All gstreamer and gst-plugins-base locales package just .mo file.
> >
> > from log.do_install:
> > make[1]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/gstreamer-0.10.36/po'
> > installing af.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/af/LC_MESSAGES/.mo
> > installing az.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/az/LC_MESSAGES/.mo
> > installing be.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/be/LC_MESSAGES/.mo
> >
> > They are installed to $(DOMAIN).mo
> > gstreamer-0.10.36/po/Makefile.in.in:$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
> > gstreamer-0.10.36/po/Makefile.in.in:echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
> >
> > and DOMAIN should be set to GETTEXT_PACKAGE (gstreamer-0.10)
> > ./gstreamer-0.10.36/po/Makevars:DOMAIN = $(GETTEXT_PACKAGE)
> > ./gstreamer-0.10.36/po/Makefile:DOMAIN = $(GETTEXT_PACKAGE)
> >
> > Anyone else seen this, any idea why it fails now? gst* recipes weren't changed lately IIRC,
> > so maybe some change in gettext which can break more recipes?
> >
> > Cheers,
> >
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: locale data broken in gstreamer

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 3809 bytes --]

On Tue, Nov 27, 2012 at 12:44:21PM -0600, Mark Hatle wrote:
> On 11/27/12 12:23 PM, Martin Jansa wrote:
> > In last rebuild from scratch I've noticed couple of weird locale data:
> 
> Paul E and I just observed this as well...  My build machine is an -old- FC13 
> machine..  system we found it on was x86.

OK, the issue is triggered by:

commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
Author: Richard Purdie <richard.purdie@linuxfoundation.org>
Date:   Thu Oct 11 08:43:01 2012 +0000

    autotools.bbclass: Fix gettext macro versions issues

Especially this part:
-if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
-     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
+if [ -d ${S}/po/ ]; then
+     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/

And it influences gst* because they are hacking their po/Makefile.in.in in autogen.sh by this patch
http://cgit.freedesktop.org/gstreamer/common/commit/gettext.patch?id=c81ad072c76522175cbddead96d6f3c448068d67

RP: do you remember why you removed "-e ${S}/po/Makefile.in.in" check?
I guess it was because it can be from older gettext version (in gstreamer 
case 0.17 instead of our 0.18)

Is there some way to inject Makefile.in.in modification between this 
gettext modifications and running autoreconf/configure? I don't see any 
in run.do_configure, but I guess there is cleaner solution for upstream 
to use.

As work around we can replace DOMAIN setting in po/Makevars in all gst* packages.

Cheers,
> 
> --Mark
> 
> > Collected errors:
> >   * check_data_file_clashes: Package gst-plugins-base-locale-en-gb wants
> >   * to install file /usr/share/locale/en_GB/LC_MESSAGES/.mo
> >          But that file is already provided by package  * gstreamer-locale-en-gb
> >   * check_data_file_clashes: Package gst-plugins-base-locale-cs wants to
> >   * install file /usr/share/locale/cs/LC_MESSAGES/.mo
> >          But that file is already provided by package  * gstreamer-locale-cs
> >
> > All gstreamer and gst-plugins-base locales package just .mo file.
> >
> > from log.do_install:
> > make[1]: Entering directory `/OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/gstreamer-0.10.36/po'
> > installing af.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/af/LC_MESSAGES/.mo
> > installing az.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/az/LC_MESSAGES/.mo
> > installing be.gmo as /OE/shr-core/tmp-eglibc/work/armv4t-oe-linux-gnueabi/gstreamer/0.10.36-r1/image/usr/share/locale/be/LC_MESSAGES/.mo
> >
> > They are installed to $(DOMAIN).mo
> > gstreamer-0.10.36/po/Makefile.in.in:$(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \
> > gstreamer-0.10.36/po/Makefile.in.in:echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \
> >
> > and DOMAIN should be set to GETTEXT_PACKAGE (gstreamer-0.10)
> > ./gstreamer-0.10.36/po/Makevars:DOMAIN = $(GETTEXT_PACKAGE)
> > ./gstreamer-0.10.36/po/Makefile:DOMAIN = $(GETTEXT_PACKAGE)
> >
> > Anyone else seen this, any idea why it fails now? gst* recipes weren't changed lately IIRC,
> > so maybe some change in gettext which can break more recipes?
> >
> > Cheers,
> >
> >
> >
> > _______________________________________________
> > Openembedded-core mailing list
> > Openembedded-core@lists.openembedded.org
> > http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
> >
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: locale data broken in gstreamer

[Richard Purdie]

On Wed, 2012-11-28 at 09:57 +0100, Martin Jansa wrote:
> On Tue, Nov 27, 2012 at 12:44:21PM -0600, Mark Hatle wrote:
> > On 11/27/12 12:23 PM, Martin Jansa wrote:
> > > In last rebuild from scratch I've noticed couple of weird locale data:
> > 
> > Paul E and I just observed this as well...  My build machine is an -old- FC13 
> > machine..  system we found it on was x86.
> 
> OK, the issue is triggered by:
> 
> commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
> Author: Richard Purdie <richard.purdie@linuxfoundation.org>
> Date:   Thu Oct 11 08:43:01 2012 +0000
> 
>     autotools.bbclass: Fix gettext macro versions issues
> 
> Especially this part:
> -if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
> -     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> +if [ -d ${S}/po/ ]; then
> +     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> 
> And it influences gst* because they are hacking their po/Makefile.in.in in autogen.sh by this patch
> http://cgit.freedesktop.org/gstreamer/common/commit/gettext.patch?id=c81ad072c76522175cbddead96d6f3c448068d67
> 
> RP: do you remember why you removed "-e ${S}/po/Makefile.in.in" check?
> I guess it was because it can be from older gettext version (in gstreamer 
> case 0.17 instead of our 0.18)

Right, we have to ensure the file is the 0.18 version, whether it exists
already or not otherwise we get version mismatch issues.

> Is there some way to inject Makefile.in.in modification between this 
> gettext modifications and running autoreconf/configure? I don't see any 
> in run.do_configure, but I guess there is cleaner solution for upstream 
> to use.
> 
> As work around we can replace DOMAIN setting in po/Makevars in all gst* packages.

I don't quite understand what you mean here? 

We probably will have to hack/patch this somehow though, maybe adding a
hook so we can do what you describe above...

Cheers,

Richard

Re: locale data broken in gstreamer

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 2447 bytes --]

On Wed, Nov 28, 2012 at 09:06:00AM +0000, Richard Purdie wrote:
> On Wed, 2012-11-28 at 09:57 +0100, Martin Jansa wrote:
> > On Tue, Nov 27, 2012 at 12:44:21PM -0600, Mark Hatle wrote:
> > > On 11/27/12 12:23 PM, Martin Jansa wrote:
> > > > In last rebuild from scratch I've noticed couple of weird locale data:
> > > 
> > > Paul E and I just observed this as well...  My build machine is an -old- FC13 
> > > machine..  system we found it on was x86.
> > 
> > OK, the issue is triggered by:
> > 
> > commit 841ea3c1c18e50e77fccbd5f44d6a79a50913b67
> > Author: Richard Purdie <richard.purdie@linuxfoundation.org>
> > Date:   Thu Oct 11 08:43:01 2012 +0000
> > 
> >     autotools.bbclass: Fix gettext macro versions issues
> > 
> > Especially this part:
> > -if [ -d ${S}/po/ -a ! -e ${S}/po/Makefile.in.in ]; then
> > -     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> > +if [ -d ${S}/po/ ]; then
> > +     cp ${STAGING_DATADIR}/gettext/po/Makefile.in.in ${S}/po/
> > 
> > And it influences gst* because they are hacking their po/Makefile.in.in in autogen.sh by this patch
> > http://cgit.freedesktop.org/gstreamer/common/commit/gettext.patch?id=c81ad072c76522175cbddead96d6f3c448068d67
> > 
> > RP: do you remember why you removed "-e ${S}/po/Makefile.in.in" check?
> > I guess it was because it can be from older gettext version (in gstreamer 
> > case 0.17 instead of our 0.18)
> 
> Right, we have to ensure the file is the 0.18 version, whether it exists
> already or not otherwise we get version mismatch issues.
> 
> > Is there some way to inject Makefile.in.in modification between this 
> > gettext modifications and running autoreconf/configure? I don't see any 
> > in run.do_configure, but I guess there is cleaner solution for upstream 
> > to use.
> > 
> > As work around we can replace DOMAIN setting in po/Makevars in all gst* packages.
> 
> I don't quite understand what you mean here? 

po/Makevars in gst* is using:
DOMAIN = $(GETTEXT_PACKAGE)
we can call 
sed 's/$(GETTEXT_PACKAGE)/gstreamer-0.10/g' ${S}/po/Makevars
in do_configure_prepend

Or read correct "gstreamer-0.10" value from something so it's not
hardcoded in recipe.

Other option is to include the same hack in our Makefile.in.in
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
if we test that this does not break some other packages.

Cheers,

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

Re: locale data broken in gstreamer

[Enrico Scholz]

Martin Jansa <martin.jansa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
writes:

> Other option is to include the same hack in our Makefile.in.in
> GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
> if we test that this does not break some other packages.

oe_runconf_prepend() {
    sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' po/Makefile.in.in
}

seems to work too (at least for gst-plugins-good)



Enrico

Re: locale data broken in gstreamer

[Martin Jansa]

[-- Attachment #1: Type: text/plain, Size: 996 bytes --]

On Wed, Nov 28, 2012 at 02:56:26PM +0100, Enrico Scholz wrote:
> Martin Jansa <martin.jansa-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>
> writes:
> 
> > Other option is to include the same hack in our Makefile.in.in
> > GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
> > if we test that this does not break some other packages.
> 
> oe_runconf_prepend() {
>     sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' po/Makefile.in.in
> }

Ah interesting I was expecting that we need to do this before
autoreconf, but if this works then it looks like easiers solution.

I'll try to add this to all gst* package and rebuild image.

Thanks,

> 
> seems to work too (at least for gst-plugins-good)
> 
> 
> 
> Enrico
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa@gmail.com

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 205 bytes --]

[PATCH] gstreamer, gst-plugins*: fix localdata

[Martin Jansa]

* 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

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 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 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 \
 
 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 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 \
 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 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 \
                     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 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 \
                     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 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
 
 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 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 \
                     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/
 #}
-- 
1.8.0