diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-15 18:49:09 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-15 18:51:13 +0100 |
commit | cf0db01c551413449dbffe09fa14e161c9a7fd36 (patch) | |
tree | c11d874e388e5fca5bdeabd5b6e2006b5d42cf13 | |
parent | 441623224b73c82b4140aa9015823eb91a417cdc (diff) | |
download | poky-cf0db01c551413449dbffe09fa14e161c9a7fd36.tar.gz |
gdk-pixbuf: Allow empty -xlib package
There are things that depend on the -xlib package. There are two
possible ways to fix this, either recommend them instead of depending
on them, or allow the package to be empty. I'm doing the latter
since its a bit cleaner and less invasive.
This library is a bit pointless which is why there is little point
in adding the x dependency in the non-lsb case. If it becomes widly
used we can rethink this.
(From OE-Core rev: 7d49da7389b5bb0e74d9000b002ebf0bc554e85b)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb index d57817e82a..e8c559e164 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.24.1.bb | |||
@@ -19,7 +19,7 @@ SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${ | |||
19 | SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" | 19 | SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412" |
20 | SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" | 20 | SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1" |
21 | 21 | ||
22 | PR = "r2" | 22 | PR = "r3" |
23 | 23 | ||
24 | inherit autotools pkgconfig gettext | 24 | inherit autotools pkgconfig gettext |
25 | 25 | ||
@@ -37,6 +37,7 @@ X11DEPENDS_linuxstdbase = "${@base_contains('DISTRO_FEATURES', 'x11', '--with-x1 | |||
37 | PACKAGES =+ "${PN}-xlib" | 37 | PACKAGES =+ "${PN}-xlib" |
38 | 38 | ||
39 | FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" | 39 | FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" |
40 | ALLOW_EMPTY_${PN}-xlib = "1" | ||
40 | 41 | ||
41 | FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ | 42 | FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \ |
42 | ${libdir}/lib*.so.*" | 43 | ${libdir}/lib*.so.*" |