NetCube-Systems-Austria/kumquat-buildroot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91b16fbbf9
kumquat-buildroot/package/gdk-pixbuf/gdk-pixbuf.mk

80 lines
2.4 KiB
Makefile
Raw Normal View History

Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
#
# gdk-pixbuf
#
Normalize separator size to 80 Signed-off-by: Alexandre Belloni <alexandre.belloni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-06 01:53:30 +02:00
################################################################################
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
gdk-pixbuf: bump to version 2.34.0 Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-03-25 18:35:34 +01:00
GDK_PIXBUF_VERSION_MAJOR = 2.34
GDK_PIXBUF_VERSION = $(GDK_PIXBUF_VERSION_MAJOR).0
gdk-pixbuf: bump version The 2.26 series needs glib >= 2.31. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2012-04-08 08:24:25 +02:00
GDK_PIXBUF_SOURCE = gdk-pixbuf-$(GDK_PIXBUF_VERSION).tar.xz
package: unification of name <pkg>_VERSION_MAJOR variable Currently there are two different names of the major version variable: <PKG>_MAJOR_VERSION and <PKG>_VERSION_MAJOR This patch unifies them to <PKG>_VERSION_MAJOR Signed-off-by: Jerzy Grzegorek <jerzy.grzegorek@trzebnica.net> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2013-12-02 09:00:02 +01:00
GDK_PIXBUF_SITE = http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(GDK_PIXBUF_VERSION_MAJOR)
gdk-pixbuf: add license info Signed-off-by: Danomi Manchego <danomimanchego123@gmail.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2013-06-03 18:03:34 +02:00
GDK_PIXBUF_LICENSE = LGPLv2+
GDK_PIXBUF_LICENSE_FILES = COPYING
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
GDK_PIXBUF_INSTALL_STAGING = YES
gdk-pixbuf: create loader cache at build time Create the gdk pixbuf loaders cache file at build time rather than run time, since the root filesytem can be read-only. We also didn't cater for systemd-based systems, so this solves two issues at once. The only side-effect is that we must now pull host-gdk-pixbuf into target gdk-pixbuf dependencies, but generally users will have gdk-pixbuf selected if they use libgtk2/3 which already pull in host-gdk-pixbuf. And remove initscript correspondingly. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-23 22:17:49 +01:00
GDK_PIXBUF_DEPENDENCIES = \
host-gdk-pixbuf host-libglib2 host-pkgconf \
gdk-pixbuf: readd libglib2 dependency It was accidentaly dropped in the loaders cache rework, shame on me. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-03-25 18:35:33 +01:00
libglib2 $(if $(BR2_ENABLE_LOCALE),,libiconv)
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
GDK_PIXBUF_CONF_ENV = \
ac_cv_path_GLIB_GENMARSHAL=$(LIBGLIB2_HOST_BINARY) \
gio_can_sniff=no
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
GDK_PIXBUF_CONF_OPTS = --disable-glibtest
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
ifneq ($(BR2_PACKAGE_LIBPNG),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
GDK_PIXBUF_CONF_OPTS += --without-libpng
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
else
GDK_PIXBUF_DEPENDENCIES += libpng
endif
ifneq ($(BR2_PACKAGE_JPEG),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
GDK_PIXBUF_CONF_OPTS += --without-libjpeg
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
else
GDK_PIXBUF_DEPENDENCIES += jpeg
endif
ifneq ($(BR2_PACKAGE_TIFF),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
GDK_PIXBUF_CONF_OPTS += --without-libtiff
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
else
gdk-pixbuf: fix static build with libtiff Fixes: http://autobuild.buildroot.net/results/ce6/ce61d5aaf5dfdda92fcecb08a30b6093926d6f01/ http://autobuild.buildroot.net/results/76b/76b550da06fe547716f089e46d96a1406043268a/ Signed-off-by: Baruch Siach <baruch@tkos.co.il> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-05-22 06:29:51 +02:00
GDK_PIXBUF_DEPENDENCIES += tiff host-pkgconf
GDK_PIXBUF_CONF_ENV += \
packages: use backtick instead of $(shell ...) make function It is often difficult to know exactly when make will expand the variable, and usually it can only be expanded after the dependencies have been built (e.g. pkg-config or the .pc file). Using a backtick instead makes it very clear that it will be expanded only while executing the command. This change is useful for two cases: 1. The per-package staging (and host) directory will be created as part of the configure step, so any $(shell ...) variable that is used in the configure step will fail because the directory doesn't exist yet. 2. 'make printvars' evaluates the variables it prints. It will therefore trigger a lot of errors from missing .pc files and others. The backticks, on the other hand, are not expanded, so with this change the output of 'make printvars' becomes clean again. This commit contains only the easy changes: replace $(shell ...) with `...`, and also replace ' with " where needed. Follow-up commits will tackle the more complicated cases that need additional explanation. After this change, the following instances of $(shell ...) will remain: - All assignments that use := - All variables that are used in make conditionals (which don't expand the backticks). - All variables that only refer to system executables and make variables that don't change. - The calls to check-host-* in dependencies.mk, because it is eval'ed. [Original patch by Fabio Porcedda, but extended quite a bit by Arnout.] Signed-off-by: Fabio Porcedda <fabio.porcedda@gmail.com> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2015-07-12 16:35:26 +02:00
LIBS="`$(PKG_CONFIG_HOST_BINARY) --libs libtiff-4`"
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
endif
gdk-pixbuf: build x11 support, if appropriate If libX11 is available, then gdk-pixbuf can be built with X11 support. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-09 13:00:09 +02:00
ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y)
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
GDK_PIXBUF_CONF_OPTS += --with-x11
gdk-pixbuf: build x11 support, if appropriate If libX11 is available, then gdk-pixbuf can be built with X11 support. Signed-off-by: Simon Dawson <spdawson@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-08-09 13:00:09 +02:00
GDK_PIXBUF_DEPENDENCIES += xlib_libX11
endif
gdk-pixbuf: create loader cache at build time Create the gdk pixbuf loaders cache file at build time rather than run time, since the root filesytem can be read-only. We also didn't cater for systemd-based systems, so this solves two issues at once. The only side-effect is that we must now pull host-gdk-pixbuf into target gdk-pixbuf dependencies, but generally users will have gdk-pixbuf selected if they use libgtk2/3 which already pull in host-gdk-pixbuf. And remove initscript correspondingly. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-23 22:17:49 +01:00
# 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 target directory names
# we need to sanitize (strip) them.
gdk-pixbuf: don't update cache for static-only There won't be any need/files to scan for. Fixes: http://autobuild.buildroot.net/results/5a7/5a7c158c8c2e49d5ca3b11ef3190cf0edd812ec5/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-03-25 18:35:32 +01:00
ifeq ($(BR2_STATIC_LIBS),)
gdk-pixbuf: create loader cache at build time Create the gdk pixbuf loaders cache file at build time rather than run time, since the root filesytem can be read-only. We also didn't cater for systemd-based systems, so this solves two issues at once. The only side-effect is that we must now pull host-gdk-pixbuf into target gdk-pixbuf dependencies, but generally users will have gdk-pixbuf selected if they use libgtk2/3 which already pull in host-gdk-pixbuf. And remove initscript correspondingly. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-23 22:17:49 +01:00
define GDK_PIXBUF_UPDATE_CACHE
GDK_PIXBUF_MODULEDIR=$(TARGET_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,$(TARGET_DIR),,g" \
$(TARGET_DIR)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache
gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-04 09:18:57 +01:00
endef
gdk-pixbuf: create loader cache at build time Create the gdk pixbuf loaders cache file at build time rather than run time, since the root filesytem can be read-only. We also didn't cater for systemd-based systems, so this solves two issues at once. The only side-effect is that we must now pull host-gdk-pixbuf into target gdk-pixbuf dependencies, but generally users will have gdk-pixbuf selected if they use libgtk2/3 which already pull in host-gdk-pixbuf. And remove initscript correspondingly. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2016-03-23 22:17:49 +01:00
GDK_PIXBUF_POST_INSTALL_TARGET_HOOKS += GDK_PIXBUF_UPDATE_CACHE
gdk-pixbuf: don't update cache for static-only There won't be any need/files to scan for. Fixes: http://autobuild.buildroot.net/results/5a7/5a7c158c8c2e49d5ca3b11ef3190cf0edd812ec5/ Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2016-03-25 18:35:32 +01:00
endif
gdk-pixbuf/libgtk2: move gdk-pixbuf loader cache setup script Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com> Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
2010-11-04 09:18:57 +01:00
gdk-pixbuf: security bump to version 2.32.1 CVE-2015-4491 already fixed in the release so drop patch. Fixes a heap overflow with a gif file and a heap overflow and DoS with a tga file. CVEs not assigned yet. Tests disabled since they fail to build properly on uClibc toolchains. Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2015-10-05 21:52:36 +02:00
# Tests don't build correctly with uClibc
define GDK_PIXBUF_DISABLE_TESTS
$(SED) 's/ tests//' $(@D)/Makefile.in
endef
GDK_PIXBUF_POST_PATCH_HOOKS += GDK_PIXBUF_DISABLE_TESTS
all packages: rename XXXTARGETS to xxx-package Also remove the redundant $(call ...). This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS))/$(eval $(generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS))/$(eval $(autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS))/$(eval $(cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-03 00:07:32 +02:00
$(eval $(autotools-package))
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
packages: rename FOO_CONF_OPT into FOO_CONF_OPTS To be consistent with the recent change of FOO_MAKE_OPT into FOO_MAKE_OPTS, make the same change for FOO_CONF_OPT. Sed command used: find * -type f | xargs sed -i 's#_CONF_OPT\>#&S#g' Signed-off-by: Thomas De Schampheleire <thomas.de.schampheleire@gmail.com> Reviewed-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2014-09-27 21:32:44 +02:00
HOST_GDK_PIXBUF_CONF_OPTS = \
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
--without-libjpeg \
--without-libtiff
gdk-pixbuf: host variant needs pkgconfig and libglib2 just like target variant Fixes: http://autobuild.buildroot.net/results/576/576d110cb02a8bc655e227bd949bb58ae39c2e38/ http://autobuild.buildroot.net/results/c48/c487a1fff7c74218a31024074aa2fd6255b6d09f/ http://autobuild.buildroot.net/results/b28/b282b7e7a9e3e5a8334d593be9092746509d4702/ http://autobuild.buildroot.net/results/dee/dee288268d81cc19fe685b32d68036b596af260e/ And many more. Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
2014-11-07 09:04:17 +01:00
HOST_GDK_PIXBUF_DEPENDENCIES = host-libpng host-pkgconf host-libglib2
package: add gdk-pixbuf package (splitted out from GTK+) Signed-off-by: Lionel Landwerlin <llandwerlin@gmail.com>
2010-10-18 15:21:52 +02:00
all packages: use new host-xxx-package macros This is a purely mechanical change, performed with find package linux toolchain boot -name \*.mk | \ xargs sed -i -e 's/$(eval $(call GENTARGETS,host))/$(eval $(host-generic-package))/' \ -e 's/$(eval $(call AUTOTARGETS,host))/$(eval $(host-autotools-package))/' \ -e 's/$(eval $(call CMAKETARGETS,host))/$(eval $(host-cmake-package))/' Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
2012-07-03 00:06:54 +02:00
$(eval $(host-autotools-package))
Reference in New Issue Copy Permalink