diff options
Diffstat (limited to 'package/gdk-pixbuf')
| -rw-r--r-- | package/gdk-pixbuf/Makefile | 38 | ||||
| -rw-r--r-- | package/gdk-pixbuf/patches/patch-Makefile_in | 11 |
2 files changed, 26 insertions, 23 deletions
diff --git a/package/gdk-pixbuf/Makefile b/package/gdk-pixbuf/Makefile index 1d4df4dfd..c47c5c131 100644 --- a/package/gdk-pixbuf/Makefile +++ b/package/gdk-pixbuf/Makefile @@ -4,14 +4,15 @@ include $(ADK_TOPDIR)/rules.mk PKG_NAME:= gdk-pixbuf -PKG_VERSION:= 2.34.0 -PKG_EXTRAVER:= 2.34 +PKG_VERSION:= 2.42.12 +PKG_EXTRAVER:= 2.42 PKG_RELEASE:= 1 -PKG_HASH:= d55e5b383ee219bd0e23bf6ed4427d56a7db5379729a6e3e0a0e0eba9a8d8879 +PKG_HASH:= b9505b3445b9a7e48ced34760c3bcb73e966df3ac94c95a148cb669ab748e3c7 PKG_DESCR:= image loading and pixel buffer manipulation library PKG_SECTION:= libs/image -PKG_BUILDDEP:= libjpeg-turbo libtiff -HOST_BUILDDEP:= glib-host libffi-host +PKG_DEPENDS:= libjpeg-turbo libtiff glib libpng +PKG_BUILDDEP:= libjpeg-turbo libtiff glib libpng gdk-pixbuf-host +HOST_BUILDDEP:= glib-host libffi-host libpng-host libjpeg-turbo-host PKG_NEEDS:= c++ PKG_SITES:= $(MASTER_SITE_GNOME:=gdk-pixbuf/$(PKG_EXTRAVER)/) PKG_OPTS:= dev @@ -22,13 +23,26 @@ include $(ADK_TOPDIR)/mk/package.mk $(eval $(call HOST_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE))) $(eval $(call PKG_template,GDK_PIXBUF,gdk-pixbuf,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION),$(PKG_OPTS))) -HOST_STYLE:= auto -HOST_LDFLAGS+= -lffi -lz -ldl -lresolv -liconv -lmount -HOST_CONFIGURE_ARGS+= --disable-glibtest \ - --without-libjpeg \ - --without-libpng \ - --without-libtiff -CONFIGURE_ENV+= gio_can_sniff=no +WRKBUILD= $(WRKDIR)/$(PKG_NAME)-obj + +HOST_LDFLAGS+= -lpng -ljpeg +HOST_STYLE:= meson +HOST_INSTALL_STYLE:= meson + +CONFIG_STYLE:= meson +BUILD_STYLE:= meson +INSTALL_STYLE:= meson + +HOST_MESON_FLAGS:= -Dgio_sniffing=false \ + -Dtests=false \ + -Dinstalled_tests=false \ + -Dintrospection=disabled \ + -Dman=false \ + --default-library=static +MESON_FLAGS:= -Dgio_sniffing=false \ + -Dtests=false \ + -Dinstalled_tests=false \ + -Dman=false gdk-pixbuf-install: $(INSTALL_DIR) $(IDIR_GDK_PIXBUF)/usr/lib/gdk-pixbuf-2.0/2.10.0/loaders/ diff --git a/package/gdk-pixbuf/patches/patch-Makefile_in b/package/gdk-pixbuf/patches/patch-Makefile_in deleted file mode 100644 index dc5e3a98f..000000000 --- a/package/gdk-pixbuf/patches/patch-Makefile_in +++ /dev/null @@ -1,11 +0,0 @@ ---- gdk-pixbuf-2.34.0.orig/Makefile.in 2016-03-24 20:17:33.000000000 +0100 -+++ gdk-pixbuf-2.34.0/Makefile.in 2016-04-04 01:04:57.039201579 +0200 -@@ -448,7 +448,7 @@ target_alias = @target_alias@ - top_build_prefix = @top_build_prefix@ - top_builddir = @top_builddir@ - top_srcdir = @top_srcdir@ --SUBDIRS = gdk-pixbuf po docs tests contrib build -+SUBDIRS = gdk-pixbuf contrib build - EXTRA_DIST = \ - config.h.win32 \ - glib-tap.mk \ |