Patchwork [2/2] gst-plugins-bad: disable librsvg when x11 is disabled

login
register
mail settings
Submitter Rogerio Nunes
Date April 3, 2013, 12:34 a.m.
Message ID <1364949284-32569-2-git-send-email-ronunes@gmail.com>
Download mbox | patch
Permalink /patch/47307/
State Accepted
Commit 022cc0d3f0f7468428d708c27dbc561f619ee841
Headers show

Comments

Rogerio Nunes - April 3, 2013, 12:34 a.m.
librsvg depends on gtk+, which in turn does not support framebuffer
as backend in current version (2.15.24). This patch disables librsvg
when x11 is not in the distro.

Signed-off-by: Rogerio Nunes <ronunes@gmail.com>
---
 .../gstreamer/gst-plugins-bad_0.10.23.bb           |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)
Ross Burton - April 3, 2013, 11:30 a.m.
On 3 April 2013 01:34, Rogerio Nunes <ronunes@gmail.com> wrote:
> librsvg depends on gtk+, which in turn does not support framebuffer
> as backend in current version (2.15.24). This patch disables librsvg
> when x11 is not in the distro.

One of my plans is to make every optional dependency a packageconfig
option in the long term, so feel free to do the rest whilst you're
there! :)

Ross
Otavio Salvador - April 3, 2013, 11:57 a.m.
On Wed, Apr 3, 2013 at 8:30 AM, Burton, Ross <ross.burton@intel.com> wrote:
> On 3 April 2013 01:34, Rogerio Nunes <ronunes@gmail.com> wrote:
>> librsvg depends on gtk+, which in turn does not support framebuffer
>> as backend in current version (2.15.24). This patch disables librsvg
>> when x11 is not in the distro.
>
> One of my plans is to make every optional dependency a packageconfig
> option in the long term, so feel free to do the rest whilst you're
> there! :)

I agree with the longterm goal but let's not hold this until the goal
is accomplished. This fixes a real issue and delay it won't help.

--
Otavio Salvador                             O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854              http://projetos.ossystems.com.br
Rogerio Nunes - April 3, 2013, 1:49 p.m.
On Wed, Apr 3, 2013 at 7:57 AM, Otavio Salvador <otavio@ossystems.com.br>wrote:

> On Wed, Apr 3, 2013 at 8:30 AM, Burton, Ross <ross.burton@intel.com>
> wrote:
> > On 3 April 2013 01:34, Rogerio Nunes <ronunes@gmail.com> wrote:
> >> librsvg depends on gtk+, which in turn does not support framebuffer
> >> as backend in current version (2.15.24). This patch disables librsvg
> >> when x11 is not in the distro.
> >
> > One of my plans is to make every optional dependency a packageconfig
> > option in the long term, so feel free to do the rest whilst you're
> > there! :)
>
> I agree with the longterm goal but let's not hold this until the goal
> is accomplished. This fixes a real issue and delay it won't help.


I agree with both. This is a real issue and I like the long term plan.
Hope I can help to execute it :)

Patch

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 9039f97..eb289c7 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
@@ -6,9 +6,9 @@  LIC_FILES_CHKSUM = "file://COPYING;md5=0636e73ff0215e8d672dc4c32c317bb3 \
                     file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605 \
                     file://gst/tta/crc32.h;beginline=12;endline=29;md5=71a904d99ce7ae0c1cf129891b98145c"
 
-DEPENDS += "gst-plugins-base tremor librsvg curl"
+DEPENDS += "gst-plugins-base tremor curl"
 
-PR = "r3"
+PR = "r4"
 
 inherit gettext
 
@@ -16,6 +16,9 @@  EXTRA_OECONF += "--disable-examples --disable-experimental --disable-sdl --disab
                  --with-plugins=wavpack,ivorbis,mpegvideoparse --disable-vdpau --disable-apexsink \
                  --disable-orc"
 
+PACKAGECONFIG ??= "${@base_contains('DISTRO_FEATURES', 'x11', 'librsvg', '', d)}"
+PACKAGECONFIG[librsvg] = "--enable-librsvg,--disable-librsvg,librsvg,"
+
 ARM_INSTRUCTION_SET = "arm"
 
 do_configure_prepend() {