* [PATCH] gstreamer: Fix plugin builds
@ 2012-11-29 13:06 Gary Thomas
2012-11-29 13:26 ` Martin Jansa
0 siblings, 1 reply; 3+ messages in thread
From: Gary Thomas @ 2012-11-29 13:06 UTC (permalink / raw)
To: openembedded-core
Not all gstreamer plugins have localized documentation trees.
The commit
commit f50e2984d9411a059b86d6c158e9416fceb84c3d
Author: Martin Jansa <martin.jansa@gmail.com>
Date: Wed Nov 28 15:59:48 2012 +0100
breaks the build for such packages because the file "po/Makefile.in.in"
is not present.
This change allows building without the po/ subdirectory.
Signed-off-by: Gary Thomas <gary@mlbassoc.com>
---
meta/recipes-multimedia/gstreamer/gst-plugins.inc | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
index 07b26a3..fc9567a 100644
--- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
+++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
@@ -23,5 +23,7 @@ PACKAGES_DYNAMIC += "^${PN}-.*"
# ${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
+ if [ -e ${S}/po/Makefile.in.in ]; then
+ sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
+ fi
}
--
1.7.9.5
^ permalink raw reply related [flat|nested] 3+ messages in thread* Re: [PATCH] gstreamer: Fix plugin builds
2012-11-29 13:06 [PATCH] gstreamer: Fix plugin builds Gary Thomas
@ 2012-11-29 13:26 ` Martin Jansa
2012-11-29 13:33 ` Gary Thomas
0 siblings, 1 reply; 3+ messages in thread
From: Martin Jansa @ 2012-11-29 13:26 UTC (permalink / raw)
To: Gary Thomas; +Cc: openembedded-core
[-- Attachment #1: Type: text/plain, Size: 2505 bytes --]
On Thu, Nov 29, 2012 at 06:06:09AM -0700, Gary Thomas wrote:
> Not all gstreamer plugins have localized documentation trees.
This change looks good, just curious, which plugins recipe does not have
po subdirectory?
Something outside oe-core? Because all 4 included in oe-core worked fine:
meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb:require gst-plugins.inc
meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb:require gst-plugins.inc
meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb:require gst-plugins.inc
meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb:require gst-plugins.inc
Cheers,
>
> The commit
> commit f50e2984d9411a059b86d6c158e9416fceb84c3d
> Author: Martin Jansa <martin.jansa@gmail.com>
> Date: Wed Nov 28 15:59:48 2012 +0100
> breaks the build for such packages because the file "po/Makefile.in.in"
> is not present.
>
> This change allows building without the po/ subdirectory.
>
> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
> ---
> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 4 +++-
> 1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> index 07b26a3..fc9567a 100644
> --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
> @@ -23,5 +23,7 @@ PACKAGES_DYNAMIC += "^${PN}-.*"
> # ${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
> + if [ -e ${S}/po/Makefile.in.in ]; then
> + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
> + fi
> }
> --
> 1.7.9.5
>
>
> _______________________________________________
> 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 --]
^ permalink raw reply [flat|nested] 3+ messages in thread* Re: [PATCH] gstreamer: Fix plugin builds
2012-11-29 13:26 ` Martin Jansa
@ 2012-11-29 13:33 ` Gary Thomas
0 siblings, 0 replies; 3+ messages in thread
From: Gary Thomas @ 2012-11-29 13:33 UTC (permalink / raw)
To: Martin Jansa; +Cc: openembedded-core
On 2012-11-29 06:26, Martin Jansa wrote:
> On Thu, Nov 29, 2012 at 06:06:09AM -0700, Gary Thomas wrote:
>> Not all gstreamer plugins have localized documentation trees.
>
> This change looks good, just curious, which plugins recipe does not have
> po subdirectory?
>
> Something outside oe-core? Because all 4 included in oe-core worked fine:
> meta/recipes-multimedia/gstreamer/gst-plugins-bad_0.10.23.bb:require gst-plugins.inc
> meta/recipes-multimedia/gstreamer/gst-plugins-base_0.10.36.bb:require gst-plugins.inc
> meta/recipes-multimedia/gstreamer/gst-plugins-good_0.10.31.bb:require gst-plugins.inc
> meta/recipes-multimedia/gstreamer/gst-plugins-ugly_0.10.19.bb:require gst-plugins.inc
Yes, this is for a plugin I'm working on for meta-ti (gst-plugin-ducati)
>>
>> The commit
>> commit f50e2984d9411a059b86d6c158e9416fceb84c3d
>> Author: Martin Jansa <martin.jansa@gmail.com>
>> Date: Wed Nov 28 15:59:48 2012 +0100
>> breaks the build for such packages because the file "po/Makefile.in.in"
>> is not present.
>>
>> This change allows building without the po/ subdirectory.
>>
>> Signed-off-by: Gary Thomas <gary@mlbassoc.com>
>> ---
>> meta/recipes-multimedia/gstreamer/gst-plugins.inc | 4 +++-
>> 1 file changed, 3 insertions(+), 1 deletion(-)
>>
>> diff --git a/meta/recipes-multimedia/gstreamer/gst-plugins.inc b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
>> index 07b26a3..fc9567a 100644
>> --- a/meta/recipes-multimedia/gstreamer/gst-plugins.inc
>> +++ b/meta/recipes-multimedia/gstreamer/gst-plugins.inc
>> @@ -23,5 +23,7 @@ PACKAGES_DYNAMIC += "^${PN}-.*"
>> # ${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
>> + if [ -e ${S}/po/Makefile.in.in ]; then
>> + sed -i -e "1a\\" -e 'GETTEXT_PACKAGE = @GETTEXT_PACKAGE@' ${S}/po/Makefile.in.in
>> + fi
>> }
>> --
>> 1.7.9.5
>>
>>
>> _______________________________________________
>> Openembedded-core mailing list
>> Openembedded-core@lists.openembedded.org
>> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
--
------------------------------------------------------------
Gary Thomas | Consulting for the
MLB Associates | Embedded world
------------------------------------------------------------
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2012-11-29 13:47 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-29 13:06 [PATCH] gstreamer: Fix plugin builds Gary Thomas
2012-11-29 13:26 ` Martin Jansa
2012-11-29 13:33 ` Gary Thomas
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox