Update buidlroot to version 2016.08.1
This commit is contained in:
@@ -1,19 +0,0 @@
|
||||
#!/bin/sh
|
||||
#
|
||||
# run gdk-pixbuf-query-loaders if needed
|
||||
|
||||
FILE=/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
|
||||
case "$1" in
|
||||
start|"")
|
||||
if [ ! -f "$FILE" ] ; then
|
||||
/usr/bin/gdk-pixbuf-query-loaders --update-cache
|
||||
fi
|
||||
;;
|
||||
stop)
|
||||
;;
|
||||
*)
|
||||
echo "Usage: $0 {start|stop}" >&2
|
||||
exit 1
|
||||
;;
|
||||
esac
|
||||
@@ -1,2 +1,2 @@
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.32/gdk-pixbuf-2.32.3.sha256sum
|
||||
sha256 2b6771f1ac72f687a8971e59810b8dc658e65e7d3086bd2e676e618fd541d031 gdk-pixbuf-2.32.3.tar.xz
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/2.34/gdk-pixbuf-2.34.0.sha256sum
|
||||
sha256 d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 gdk-pixbuf-2.34.0.tar.xz
|
||||
|
||||
@@ -4,13 +4,17 @@
|
||||
#
|
||||
################################################################################
|
||||
|
||||
GDK_PIXBUF_VERSION_MAJOR = 2.32
|
||||
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).3
|
||||
GDK_PIXBUF_VERSION_MAJOR = 2.34
|
||||
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).0
|
||||
GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
|
||||
GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
|
||||
GDK_PIXBUF_LICENSE = LGPLv2+
|
||||
GDK_PIXBUF_LICENSE_FILES = COPYING
|
||||
GDK_PIXBUF_INSTALL_STAGING = YES
|
||||
GDK_PIXBUF_DEPENDENCIES = \
|
||||
host-gdk-pixbuf host-libglib2 host-pkgconf \
|
||||
libglib2 $(if $(BR2_ENABLE_LOCALE),,libiconv)
|
||||
HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2
|
||||
|
||||
GDK_PIXBUF_CONF_ENV = \
|
||||
ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \
|
||||
@@ -25,17 +29,21 @@ GDK_PIXBUF_DEPENDENCIES += libpng
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_JPEG),y)
|
||||
HOST_GDK_PIXBUF_CONF_OPTS += --without-libjpeg
|
||||
GDK_PIXBUF_CONF_OPTS += --without-libjpeg
|
||||
else
|
||||
GDK_PIXBUF_DEPENDENCIES += jpeg
|
||||
HOST_GDK_PIXBUF_DEPENDENCIES += host-libjpeg
|
||||
endif
|
||||
|
||||
ifneq ($(BR2_PACKAGE_TIFF),y)
|
||||
GDK_PIXBUF_CONF_OPTS += --without-libtiff
|
||||
HOST_GDK_PIXBUF_CONF_OPTS += --without-libtiff
|
||||
else
|
||||
GDK_PIXBUF_DEPENDENCIES += tiff host-pkgconf
|
||||
GDK_PIXBUF_DEPENDENCIES += tiff
|
||||
GDK_PIXBUF_CONF_ENV += \
|
||||
LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"
|
||||
HOST_GDK_PIXBUF_DEPENDENCIES += host-tiff
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
|
||||
@@ -43,14 +51,21 @@ GDK_PIXBUF_CONF_OPTS += --with-x11
|
||||
GDK_PIXBUF_DEPENDENCIES += xlib_libX11
|
||||
endif
|
||||
|
||||
GDK_PIXBUF_DEPENDENCIES += \
|
||||
$(if $(BR2_ENABLE_LOCALE),,libiconv) \
|
||||
host-pkgconf libglib2
|
||||
|
||||
define GDK_PIXBUF_INSTALL_INIT_SYSV
|
||||
$(INSTALL) -m 755 -D package/gdk-pixbuf/S26gdk-pixbuf \
|
||||
$(TARGET_DIR)/etc/init.d/S26gdk-pixbuf
|
||||
# gdk-pixbuf requires the loaders.cache file populated to work properly
|
||||
# Rather than doing so at runtime, since the fs can be read-only, do so
|
||||
# here after building and installing to target.
|
||||
# And since the cache file will contain absolute host directory names we
|
||||
# need to sanitize (strip) them.
|
||||
ifeq ($(BR2_STATIC_LIBS),)
|
||||
define GDK_PIXBUF_UPDATE_CACHE
|
||||
GDK_PIXBUF_MODULEDIR=$(HOST_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders \
|
||||
$(HOST_DIR)/usr/bin/gdk-pixbuf-query-loaders \
|
||||
> $(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
$(SED) "s,$(HOST_DIR),,g" \
|
||||
$(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
|
||||
endef
|
||||
GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE
|
||||
endif
|
||||
|
||||
# Tests don't build correctly with uClibc
|
||||
define GDK_PIXBUF_DISABLE_TESTS
|
||||
@@ -59,11 +74,4 @@ endef
|
||||
GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS
|
||||
|
||||
$(eval $(autotools-package))
|
||||
|
||||
HOST_GDK_PIXBUF_CONF_OPTS = \
|
||||
--without-libjpeg \
|
||||
--without-libtiff
|
||||
|
||||
HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2
|
||||
|
||||
$(eval $(host-autotools-package))
|
||||
|
||||
Reference in New Issue
Block a user