diff options
| author | Mark Brand <mabrand@mabrand.nl> | 2011-12-22 13:33:30 (GMT) |
|---|---|---|
| committer | Mark Brand <mabrand@mabrand.nl> | 2011-12-22 13:33:30 (GMT) |
| commit | 0980bf4b87b4a5a6108f6a9e77dddb7e15d3de4e (patch) | |
| tree | 2eb218773b49191c9fdbbc06eeeb233c187f3cbc | |
| parent | cb15333a3d06a03a363658af275bdde273660cb9 (diff) | |
| download | mxe-0980bf4b87b4a5a6108f6a9e77dddb7e15d3de4e.zip mxe-0980bf4b87b4a5a6108f6a9e77dddb7e15d3de4e.tar.gz mxe-0980bf4b87b4a5a6108f6a9e77dddb7e15d3de4e.tar.bz2 | |
package tiff: fix lzma support
| -rw-r--r-- | src/tiff-1-fixes.patch | 28 | ||||
| -rw-r--r-- | src/tiff.mk | 3 |
2 files changed, 30 insertions, 1 deletions
diff --git a/src/tiff-1-fixes.patch b/src/tiff-1-fixes.patch new file mode 100644 index 0000000..1175f5c --- /dev/null +++ b/src/tiff-1-fixes.patch @@ -0,0 +1,28 @@ +This file is part of mingw-cross-env. +See doc/index.html for further information. + +Contains ad hoc patches for cross building. + +From 584c7cdb78b5e7a5b15525c0ec28984ea949a9e8 Mon Sep 17 00:00:00 2001 +From: mingw-cross-env +Date: Thu, 22 Dec 2011 14:00:35 +0100 +Subject: [PATCH] add missing lzma to Libs.private for pkg-config + +taken from: +http://old.nabble.com/-PATCH--add-missing-lzma-to-Libs.private-for-pkg-config-td33023671.html + +diff --git a/configure.ac b/configure.ac +index fa23704..da8e6a5 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -720,6 +720,7 @@ fi + if test "$HAVE_LZMA" = "yes" ; then + AC_DEFINE(LZMA_SUPPORT,1,[Support LZMA2 compression]) + LIBS="-llzma $LIBS" ++ tiff_libs_private="-llzma ${tiff_libs_private}" + + if test "$HAVE_RPATH" = "yes" -a "x$with_lzma_lib_dir" != "x" ; then + LIBDIR="-R $with_lzma_lib_dir $LIBDIR" +-- +1.7.8 + diff --git a/src/tiff.mk b/src/tiff.mk index c30dc34..45b3167 100644 --- a/src/tiff.mk +++ b/src/tiff.mk @@ -11,7 +11,7 @@ $(PKG)_FILE := tiff-$($(PKG)_VERSION).tar.gz $(PKG)_WEBSITE := http://www.remotesensing.org/libtiff/ $(PKG)_URL := http://download.osgeo.org/libtiff/$($(PKG)_FILE) $(PKG)_URL_2 := ftp://ftp.remotesensing.org/libtiff/$($(PKG)_FILE) -$(PKG)_DEPS := gcc zlib jpeg +$(PKG)_DEPS := gcc zlib jpeg xz define $(PKG)_UPDATE wget -q -O- 'http://www.remotesensing.org/libtiff/' | \ @@ -20,6 +20,7 @@ define $(PKG)_UPDATE endef define $(PKG)_BUILD + cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \ |