diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2015-11-05 22:26:08 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-11-25 08:08:12 +0000 |
commit | ced8d49955f5142f604a8e7e9bd6d1c70ae4a290 (patch) | |
tree | 92d030c65867593151261dd26033d6b9211935f8 /meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | |
parent | 918c77365faa72c2aa58c26ea04e893af9b59a0a (diff) | |
download | poky-ced8d49955f5142f604a8e7e9bd6d1c70ae4a290.tar.gz |
gdk-pixbuf: Upgrade 2.30.8 -> 2.32.1
Remove a backported patch.
(From OE-Core rev: d19d221ca77ff5cfbe92cf8234b2f4f35dd07329)
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb')
-rw-r--r-- | meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb | 112 |
1 files changed, 0 insertions, 112 deletions
diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb deleted file mode 100644 index 68f3850fb7..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.30.8.bb +++ /dev/null | |||
@@ -1,112 +0,0 @@ | |||
1 | SUMMARY = "Image loading library for GTK+" | ||
2 | HOMEPAGE = "http://www.gtk.org/" | ||
3 | BUGTRACKER = "https://bugzilla.gnome.org/" | ||
4 | |||
5 | LICENSE = "LGPLv2" | ||
6 | LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7 \ | ||
7 | file://gdk-pixbuf/gdk-pixbuf.h;endline=26;md5=72b39da7cbdde2e665329fef618e1d6b" | ||
8 | |||
9 | SECTION = "libs" | ||
10 | |||
11 | DEPENDS = "glib-2.0" | ||
12 | |||
13 | MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" | ||
14 | |||
15 | SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ | ||
16 | file://hardcoded_libtool.patch \ | ||
17 | file://extending-libinstall-dependencies.patch \ | ||
18 | file://run-ptest \ | ||
19 | file://fatal-loader.patch \ | ||
20 | file://0001-pixops-Be-more-careful-about-integer-overflow.patch \ | ||
21 | " | ||
22 | |||
23 | SRC_URI[md5sum] = "4fed0d54432f1b69fc6e66e608bd5542" | ||
24 | SRC_URI[sha256sum] = "4853830616113db4435837992c0aebd94cbb993c44dc55063cee7f72a7bef8be" | ||
25 | |||
26 | inherit autotools pkgconfig gettext pixbufcache ptest-gnome | ||
27 | |||
28 | LIBV = "2.10.0" | ||
29 | |||
30 | GDK_PIXBUF_LOADERS ?= "png jpeg" | ||
31 | |||
32 | PACKAGECONFIG ??= "${GDK_PIXBUF_LOADERS}" | ||
33 | PACKAGECONFIG_linuxstdbase = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} ${GDK_PIXBUF_LOADERS}" | ||
34 | PACKAGECONFIG_class-native = "${GDK_PIXBUF_LOADERS}" | ||
35 | |||
36 | PACKAGECONFIG[png] = "--with-libpng,--without-libpng,libpng" | ||
37 | PACKAGECONFIG[jpeg] = "--with-libjpeg,--without-libjpeg,jpeg" | ||
38 | PACKAGECONFIG[tiff] = "--with-libtiff,--without-libtiff,tiff" | ||
39 | PACKAGECONFIG[jpeg2000] = "--with-libjasper,--without-libjasper,jasper" | ||
40 | |||
41 | # Use GIO to sniff image format instead of trying all loaders | ||
42 | PACKAGECONFIG[gio-sniff] = "--enable-gio-sniffing,--disable-gio-sniffing,,shared-mime-info" | ||
43 | PACKAGECONFIG[x11] = "--with-x11,--without-x11,virtual/libx11" | ||
44 | |||
45 | EXTRA_OECONF = "--disable-introspection" | ||
46 | |||
47 | PACKAGES =+ "${PN}-xlib" | ||
48 | |||
49 | FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}" | ||
50 | ALLOW_EMPTY_${PN}-xlib = "1" | ||
51 | |||
52 | FILES_${PN} = "${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ | ||
53 | ${libdir}/lib*.so.*" | ||
54 | |||
55 | FILES_${PN}-dev += " \ | ||
56 | ${bindir}/gdk-pixbuf-csource \ | ||
57 | ${bindir}/gdk-pixbuf-pixdata \ | ||
58 | ${includedir}/* \ | ||
59 | ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/*.la \ | ||
60 | " | ||
61 | |||
62 | FILES_${PN}-dbg += " \ | ||
63 | ${libdir}/.debug/* \ | ||
64 | ${libdir}/gdk-pixbuf-2.0/.debug/* \ | ||
65 | ${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders/.debug/* \ | ||
66 | " | ||
67 | |||
68 | PACKAGES_DYNAMIC += "^gdk-pixbuf-loader-.*" | ||
69 | PACKAGES_DYNAMIC_class-native = "" | ||
70 | |||
71 | python populate_packages_prepend () { | ||
72 | postinst_pixbufloader = d.getVar("postinst_pixbufloader", True) | ||
73 | |||
74 | loaders_root = d.expand('${libdir}/gdk-pixbuf-2.0/${LIBV}/loaders') | ||
75 | |||
76 | packages = ' '.join(do_split_packages(d, loaders_root, '^libpixbufloader-(.*)\.so$', 'gdk-pixbuf-loader-%s', 'GDK pixbuf loader for %s')) | ||
77 | d.setVar('PIXBUF_PACKAGES', packages) | ||
78 | |||
79 | # The test suite exercises all the loaders, so ensure they are all | ||
80 | # dependencies of the ptest package. | ||
81 | d.appendVar("RDEPENDS_gdk-pixbuf-ptest", " " + packages) | ||
82 | } | ||
83 | |||
84 | do_install_append() { | ||
85 | # Move gdk-pixbuf-query-loaders into libdir so it is always available | ||
86 | # in multilib builds. | ||
87 | mv ${D}/${bindir}/gdk-pixbuf-query-loaders ${D}/${libdir}/gdk-pixbuf-2.0/ | ||
88 | } | ||
89 | |||
90 | do_install_append_class-native() { | ||
91 | find ${D}${libdir} -name "libpixbufloader-*.la" -exec rm \{\} \; | ||
92 | |||
93 | create_wrapper ${D}/${bindir}/gdk-pixbuf-csource \ | ||
94 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | ||
95 | |||
96 | create_wrapper ${D}/${bindir}/gdk-pixbuf-pixdata \ | ||
97 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache | ||
98 | |||
99 | create_wrapper ${D}/${libdir}/gdk-pixbuf-2.0/gdk-pixbuf-query-loaders \ | ||
100 | GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders.cache \ | ||
101 | GDK_PIXBUF_MODULEDIR=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/loaders | ||
102 | } | ||
103 | BBCLASSEXTEND = "native" | ||
104 | |||
105 | SSTATEPREINSTFUNCS_append_class-native = " gdkpixbuf_sstate_preinst" | ||
106 | SYSROOT_PREPROCESS_FUNCS_append_class-native = " gdkpixbuf_sstate_preinst" | ||
107 | |||
108 | gdkpixbuf_sstate_preinst() { | ||
109 | if [ "${BB_CURRENTTASK}" = "populate_sysroot" ]; then | ||
110 | rm -rf ${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/${LIBV}/* | ||
111 | fi | ||
112 | } | ||