gdk-pixbuf: update to upstream version 2.26.5

(From OE-Core rev: efe02ada3602d032629c26431173d5801c9e5af3)

Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Marko Lindqvist 2012-12-14 13:44:20 +02:00 committed by Richard Purdie
parent 606561953a
commit 062604e9df
5 changed files with 5 additions and 26 deletions

View File

@ -1,21 +0,0 @@
Pick up ${NM} from the environment.
Upstream-Status: Pending
https://bugzilla.gnome.org/show_bug.cgi?id=671516
Signed-off-by: James Limbouris <james@digitalmatter.com.au>
Index: gdk-pixbuf-2.24.0/configure.ac
===================================================================
diff -uNr gdk-pixbuf-2.24.0/configure.ac gdk-pixbuf-2.24.0.mod/configure.ac
--- gdk-pixbuf-2.24.0/configure.ac 2011-08-27 11:27:52.000000000 +0800
+++ gdk-pixbuf-2.24.0.mod/configure.ac 2012-02-28 14:48:36.481126410 +0800
@@ -147,7 +147,7 @@
AC_SYS_LARGEFILE
AM_PROG_AS
-AC_PATH_PROG(NM, nm, nm)
+AC_CHECK_TOOLS(NM, [$NM nm], nm)
AC_MSG_CHECKING([for some Win32 platform])
AS_CASE(["$host"],

View File

@ -11,17 +11,16 @@ SECTION = "libs"
DEPENDS = "libpng glib-2.0 jpeg"
DEPENDS_append_linuxstdbase = " virtual/libx11"
SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.24/gdk-pixbuf-${PV}.tar.xz \
file://configure_nm.patch \
SRC_URI = "http://ftp.acc.umu.se/pub/GNOME/sources/gdk-pixbuf/2.26/gdk-pixbuf-${PV}.tar.xz \
file://hardcoded_libtool.patch \
file://configure_fix.patch \
file://extending-libinstall-dependencies.patch \
"
SRC_URI[md5sum] = "72f39b34b20f68148c1609bd27415412"
SRC_URI[sha256sum] = "da7a3f00db360913716368e19e336402755cafa93769f3cfa28a969303e4bee1"
SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0"
SRC_URI[sha256sum] = "77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84"
PR = "r7"
PR = "r0"
inherit autotools pkgconfig gettext
@ -43,6 +42,7 @@ FILES_${PN}-xlib = "${libdir}/*pixbuf_xlib*${SOLIBS}"
ALLOW_EMPTY_${PN}-xlib = "1"
FILES_${PN} = "${bindir}/gdk-pixbuf-query-loaders \
${bindir}/gdk-pixbuf-pixdata \
${libdir}/lib*.so.*"
FILES_${PN}-dev += " \