Mercurial > mxe-octave
changeset 2186:c088abec064f
package tiff: fix lzma support
| author | Mark Brand <mabrand@mabrand.nl> |
|---|---|
| date | Thu, 22 Dec 2011 14:33:30 +0100 |
| parents | 93f6f20bf30d |
| children | ef78e05a821e |
| files | src/tiff-1-fixes.patch src/tiff.mk |
| diffstat | 2 files changed, 30 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/tiff-1-fixes.patch Thu Dec 22 14:33:30 2011 +0100 @@ -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 +
--- a/src/tiff.mk Thu Dec 22 12:57:59 2011 +0100 +++ b/src/tiff.mk Thu Dec 22 14:33:30 2011 +0100 @@ -11,7 +11,7 @@ $(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 @@ endef define $(PKG)_BUILD + cd '$(1)' && ./autogen.sh cd '$(1)' && ./configure \ --host='$(TARGET)' \ --disable-shared \