diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch deleted file mode 100644 index 2e7d5afe8f..0000000000 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/pngversion.patch +++ /dev/null @@ -1,23 +0,0 @@ -We now have libpng 1.6. If we build libpng12 as well as libpng 1.6, the 1.2 version gets -preferred which is not desirable and does not give deterministic builds. - -We really do want to use libpng since the item in DEPENDS will provide this so -manipulate the search list so the one we DEPEND on gets chosen. - -RP 2013/4/13 - -Upstream-Status: Pending [worth discussing at least] - -Index: gdk-pixbuf-2.26.5/configure.ac -=================================================================== ---- gdk-pixbuf-2.26.5.orig/configure.ac 2013-03-26 15:45:16.594820303 +0000 -+++ gdk-pixbuf-2.26.5/configure.ac 2013-04-13 10:15:19.241433789 +0000 -@@ -588,7 +588,7 @@ - - dnl Test for libpng - if test x$with_libpng != xno && test -z "$LIBPNG"; then -- for l in libpng15 libpng14 libpng12 libpng13 libpng10 libpng ; do -+ for l in libpng libpng15 libpng14 libpng12 libpng13 libpng10 ; do - AC_MSG_CHECKING(for $l) - if $PKG_CONFIG --exists $l ; then - AC_MSG_RESULT(yes) diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch similarity index 100% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/configure_fix.patch rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/configure_fix.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch similarity index 100% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/extending-libinstall-dependencies.patch rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/extending-libinstall-dependencies.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch similarity index 100% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf-2.26.5/hardcoded_libtool.patch rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf/hardcoded_libtool.patch diff --git a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.1.bb similarity index 89% rename from meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb rename to meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.1.bb index b85bbaf58c..4bf2eb6921 100644 --- a/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.26.5.bb +++ b/meta/recipes-gnome/gdk-pixbuf/gdk-pixbuf_2.28.1.bb @@ -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.26/gdk-pixbuf-${PV}.tar.xz \ +MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" + +SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ file://hardcoded_libtool.patch \ file://configure_fix.patch \ file://extending-libinstall-dependencies.patch \ - file://pngversion.patch \ " -SRC_URI[md5sum] = "339329e6d619ee3e1cb93979111b04c0" -SRC_URI[sha256sum] = "77696fd163bca95a130a1883dbd78d0ae4d782de2fc85a9a38556d13681f5c84" - -PR = "r1" +SRC_URI[md5sum] = "5c71cce316d08c559fc5970aa60754ab" +SRC_URI[sha256sum] = "bea0b743fdb5c3c8e23210f73623ec5f18f9ead2522942897fe739d80b50c2bb" inherit autotools pkgconfig gettext pixbufcache