diff src/gdk-pixbuf.mk @ 3165:e19ca43b6edd

[MSVC] enable Gdk-Pixbuf compilation (and bump version to 2.28.2)
author Michael Goffioul <michael.goffioul@gmail.com>
date Mon, 22 Jul 2013 11:50:11 -0400
parents 5ef49fb3299d
children 13be64f9f16d
line wrap: on
line diff
--- a/src/gdk-pixbuf.mk	Sun Jul 21 23:33:12 2013 -0400
+++ b/src/gdk-pixbuf.mk	Mon Jul 22 11:50:11 2013 -0400
@@ -3,11 +3,14 @@
 
 PKG             := gdk-pixbuf
 $(PKG)_IGNORE   :=
-$(PKG)_CHECKSUM := 434dfac552fff8bc77bc2dca0e6ed8c268f8880d
+$(PKG)_CHECKSUM := 9876d0a20f592f8fb2a52d4a86ec43d607661beb
 $(PKG)_SUBDIR   := gdk-pixbuf-$($(PKG)_VERSION)
 $(PKG)_FILE     := gdk-pixbuf-$($(PKG)_VERSION).tar.xz
 $(PKG)_URL      := http://ftp.gnome.org/pub/gnome/sources/gdk-pixbuf/$(call SHORT_PKG_VERSION,$(PKG))/$($(PKG)_FILE)
-$(PKG)_DEPS     := glib libpng jpeg tiff jasper libiconv
+$(PKG)_DEPS     := glib libpng jasper libiconv
+ifneq ($(MXE_SYSTEM),msvc)
+    $(PKG)_DEPS += jpeg tiff
+endif
 
 define $(PKG)_UPDATE
     $(WGET) -q -O- 'http://git.gnome.org/browse/gdk-pixbuf/refs/tags' | \
@@ -17,14 +20,22 @@
     head -1
 endef
 
+$(PKG)_EXTRA_CONFIGURE_OPTIONS :=
+ifneq ($(MXE_SYSTEM),msvc)
+    $(PKG)_EXTRA_CONFIGURE_OPTIONS += --without-gdiplus
+endif
+
 define $(PKG)_BUILD
-    cd '$(1)' && autoreconf && ./configure \
+    cd '$(1)' && autoreconf -I '$(HOST_PREFIX)/share/aclocal' && ./configure \
         $(HOST_AND_BUILD_CONFIGURE_OPTIONS) \
         $(ENABLE_SHARED_OR_STATIC) \
         --prefix='$(HOST_PREFIX)' \
         --disable-modules \
         --with-included-loaders \
-        --without-gdiplus \
-        LIBS="`'$(MXE_PKG_CONFIG)' --libs libtiff-4`"
+        --with-libjasper \
+        $($(PKG)_EXTRA_CONFIGURE_OPTIONS) \
+	PKG_CONFIG='$(MXE_PKG_CONFIG)' \
+	PKG_CONFIG_PATH='$(HOST_LIBDIR)/pkgconfig' \
+	&& $(CONFIGURE_POST_HOOK)
     $(MAKE) -C '$(1)' -j '$(JOBS)' install
 endef