diff options
Diffstat (limited to 'debian/patches/15_jam.patch')
| -rw-r--r-- | debian/patches/15_jam.patch | 155 |
1 files changed, 143 insertions, 12 deletions
diff --git a/debian/patches/15_jam.patch b/debian/patches/15_jam.patch index 08ca67a..b8014ef 100644 --- a/debian/patches/15_jam.patch +++ b/debian/patches/15_jam.patch @@ -1,33 +1,99 @@ Description: Add multiarch support to jam files Author: Jörg Frings Fürst <debian@jff-webhosting.net> Forwarded: http://www.freelists.org/post/argyllcms/Some-buildsystem-issues -Last-Update: 2014-09-14 +Last-Update: 2014-09-25 --- This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ Index: trunk/Jamtop =================================================================== ---- trunk.orig/Jamtop 2014-09-07 20:15:02.520225484 +0200 -+++ trunk/Jamtop 2014-09-07 20:15:43.909089670 +0200 -@@ -109,12 +109,16 @@ +--- trunk.orig/Jamtop 2014-09-25 11:10:18.768548869 +0200 ++++ trunk/Jamtop 2014-09-25 11:17:03.696933742 +0200 +@@ -109,12 +109,80 @@ # See if we have a system TIFF library. if ! $(BUILTIN_TIFF) && $(UNIX) { - if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] { -+ if [ GLOB /usr/include : tiffio.h ] || [ GLOB /usr/local/include : tiffio.h ] +- if [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ] +- || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ] ++ if [ GLOB /usr/include : tiffio.h ] ++ || [ GLOB /usr/local/include : tiffio.h ] + || [ GLOB /usr/include/x86_64-linux-gnu : tiffio.h ] -+ || [ GLOB /usr/include/i386-linux-gnu : tiffio.h ] { - if [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ] - || [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ] ++ || [ GLOB /usr/include/i386-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/aarch64-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/arm-linux-gnueabi : tiffio.h ] ++ || [ GLOB /usr/include/arm-linux-gnueabihf : tiffio.h ] ++ || [ GLOB /usr/include/i386-gnu : tiffio.h ] ++ || [ GLOB /usr/include/x86_64-kfreebsd-gnu : tiffio.h ] ++ || [ GLOB /usr/include/i386-kfreebsd-gnu : tiffio.h ] ++ || [ GLOB /usr/include/mips-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/mipsel-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/powerpc-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/powerpc64le-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/s390x-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/sparc-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/alpha-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/hppa-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/m68k-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/powerpc-linux-gnuspe : tiffio.h ] ++ || [ GLOB /usr/include/sh4-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/sparc64-linux-gnu : tiffio.h ] ++ || [ GLOB /usr/include/x86_64-linux-gnux32 : tiffio.h ] ++ || [ GLOB /usr/include/powerpc64-linux-gnu : tiffio.h ] { ++ if [ GLOB /usr/lib : libtiff.so ] ++ || [ GLOB /usr/lib : libtiff.a ] ++ || [ GLOB /usr/lib64 : libtiff.so ] ++ || [ GLOB /usr/lib64 : libtiff.a ] || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ] - || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { + || [ GLOB /usr/lib/i386-linux-gnu : libtiff.so ] + || [ GLOB /usr/lib/i386-linux-gnu : libtiff.a ] -+ || [ GLOB /usr/local/lib : libtiff.so ] || [ GLOB /usr/local/lib : libtiff.a ] { ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libtiff.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libtiff.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libtiff.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libtiff.a ] ++ || [ GLOB /usr/lib/i386-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/i386-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libtiff.a ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libtiff.so ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libtiff.a ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libtiff.so ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libtiff.a ] ++ || [ GLOB /usr/local/lib : libtiff.so ] ++ || [ GLOB /usr/local/lib : libtiff.a ] { echo "Using system TIFF library" ; TIFFLIB = ; TIFFINC = ; -@@ -124,6 +128,7 @@ +@@ -124,6 +192,7 @@ } } @@ -35,10 +101,75 @@ Index: trunk/Jamtop # If nothing else, use Argyll supplied TIFF library if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) { echo "Using Argyll TIFF library" ; +@@ -133,12 +202,58 @@ + + # See if we have a system JPEG library. + if ! $(BUILTIN_JPEG) && $(UNIX) { +- if [ GLOB /usr/include : jpeglib.h ] || [ GLOB /usr/local/include : jpeglib.h ] { +- if [ GLOB /usr/lib : libjpeg.so ] || [ GLOB /usr/lib : libjpeg.a ] +- || [ GLOB /usr/lib64 : libjpeg.so ] || [ GLOB /usr/lib64 : libjpeg.a ] +- || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] +- || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] +- || [ GLOB /usr/local/lib : libjpeg.so ] || [ GLOB /usr/local/lib : libjpeg.a ] { ++ if [ GLOB /usr/include : jpeglib.h ] ++ || [ GLOB /usr/local/include : jpeglib.h ] { ++ if [ GLOB /usr/lib : libjpeg.so ] ++ || [ GLOB /usr/lib : libjpeg.a ] ++ || [ GLOB /usr/lib64 : libjpeg.so ] ++ || [ GLOB /usr/lib64 : libjpeg.a ] ++ || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/x86_64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/i386-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/i386-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/aarch64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libjpeg.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabi : libjpeg.a ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libjpeg.so ] ++ || [ GLOB /usr/lib/arm-linux-gnueabihf : libjpeg.a ] ++ || [ GLOB /usr/lib/i386-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/i386-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/x86_64-kfreebsd-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/i386-kfreebsd-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/mips-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/mipsel-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc64le-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/s390x-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/sparc-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/alpha-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/hppa-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/m68k-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc-linux-gnuspe : libjpeg.a ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/sh4-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/sparc64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libjpeg.so ] ++ || [ GLOB /usr/lib/x86_64-linux-gnux32 : libjpeg.a ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libjpeg.so ] ++ || [ GLOB /usr/lib/powerpc64-linux-gnu : libjpeg.a ] ++ || [ GLOB /usr/local/lib : libjpeg.so ] ++ || [ GLOB /usr/local/lib : libjpeg.a ] { + echo "Using system JPEG library" ; + JPEGLIB = ; + JPEGINC = ; Index: trunk/Jambase =================================================================== ---- trunk.orig/Jambase 2014-09-07 20:15:02.520225484 +0200 -+++ trunk/Jambase 2014-09-07 20:15:02.512225317 +0200 +--- trunk.orig/Jambase 2014-09-25 11:10:18.768548869 +0200 ++++ trunk/Jambase 2014-09-25 11:10:18.768548869 +0200 @@ -880,7 +880,7 @@ # UNIX defaults |