File argyllcms-fixbuild.patch of Package argyllcms

Overview Repositories Revisions Requests Users Attributes Meta

File argyllcms-fixbuild.patch of Package argyllcms

diff -up Argyll_V1.4.0/Jamtop.fixbuild Argyll_V1.4.0/Jamtop
--- Argyll_V1.4.0/Jamtop.fixbuild	2012-06-22 14:00:29.139451312 +0200
+++ Argyll_V1.4.0/Jamtop	2012-05-11 01:57:54.000000000 +0200
@@ -67,6 +67,8 @@ if $(UNIX) {
 				LibWinD = /usr/lib/x86_64-linux-gnu ;
 			} else if [ GLOB /usr/lib64 : libX11.so ] {
 				LibWinD = /usr/lib64 ;
+			} else if [ GLOB /usr/lib : libX11.so ] {
+				LibWinD = /usr/lib ;
 			} else {
 				ECHO Unable to locate the 64 bit X11 library files ;
 			}
@@ -91,9 +93,9 @@ if $(UNIX) {
 # See if we have a system TIFF library.
 if ! $(BUILTIN_TIFF) && $(UNIX) {
 	if [ GLOB /usr/include : tiffio.h ]  {
-		if  ! $(HOST64) && ( [ GLOB /usr/lib : libtiff.so ] || [ GLOB /usr/lib : libtiff.a ] )
-		 ||   $(HOST64) && ( [ GLOB /usr/lib64 : libtiff.so ] || [ GLOB /usr/lib64 : libtiff.a ] )
-		 ||   $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libtiff.a ] ) {
+		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 ] {
 			echo "Using system TIFF library" ;
 			TIFFLIB = ;
 			TIFFINC = ;
@@ -105,7 +107,7 @@ if ! $(BUILTIN_TIFF) && $(UNIX) {
 
 # If nothing else, use Argyll supplied TIFF library
 if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
-	echo "Using built in TIFF library" ;
+	echo "Using Argyll TIFF library" ;
 	TIFFLIB = ../tiff/libtiff.lib ;
 	TIFFINC = ../tiff ;
 }
@@ -113,13 +115,13 @@ if ! $(HAVE_TIFF) || $(BUILTIN_TIFF) {
 # See if we have a system JPEG library.
 if ! $(BUILTIN_JPEG) && $(UNIX) {
 	if [ GLOB /usr/include : jpeglib.h ]  {
-		if  ! $(HOST64) && ( [ GLOB /usr/lib : libjpg.so ] || [ GLOB /usr/lib : libjpg.a ] )
-		 ||   $(HOST64) && ( [ GLOB /usr/lib64 : libjpg.so ] || [ GLOB /usr/lib64 : libjpg.a ] )
-		 ||   $(HOST64) && ( [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.so ] || [ GLOB /usr/lib/x86_64-linux-gnu : libjpg.a ] ) {
+		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 ] {
 			echo "Using system JPEG library" ;
 			JPEGLIB = ;
 			JPEGINC = ;
-			LINKFLAGS += $(LINKFLAG)tiff ;
+			LINKFLAGS += $(LINKFLAG)jpeg ;
 			HAVE_JPEG = true ;
 		}
 	}
@@ -127,8 +129,8 @@ if ! $(BUILTIN_JPEG) && $(UNIX) {
 
 # If nothing else, use Argyll supplied JPEG library
 if ! $(HAVE_JPEG) || $(BUILTIN_JPEG) {
-	echo "Using built in JPEG library" ;
-	JPEGLIB = ../jpg/libjpg.lib ;
+	echo "Using Argyll JPEG library" ;
+	JPEGLIB = ../jpg/libjpeg.lib ;
 	JPEGINC = ../jpg ;
 }

Places

File argyllcms-fixbuild.patch of Package argyllcms

Places