Sophie

Sophie

distrib > Mandriva > 2008.0 > x86_64 > media > main-backports-src > by-pkgid > 87a42a23b0fc38518529c0a06bf5331e > files > 3

argyllcms-0.70-0.1.Beta8.1mdv2008.0.src.rpm

--- argyllcms-0.70/numlib/numsup.c.build	2007-10-20 03:53:26.000000000 +0200
+++ argyllcms-0.70/numlib/numsup.c	2007-12-10 17:13:45.000000000 +0100
@@ -5,6 +5,7 @@
 #include <stdlib.h>
 #include <math.h>
 #include <string.h>
+#include <limits.h>
 #if defined (NT)
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
--- argyllcms-0.70/numlib/Jamfile.build	2007-10-20 03:53:25.000000000 +0200
+++ argyllcms-0.70/numlib/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -3,7 +3,7 @@
 
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
 #CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
 
--- argyllcms-0.70/Jambase.build	2007-10-20 03:53:25.000000000 +0200
+++ argyllcms-0.70/Jambase	2007-12-10 17:13:45.000000000 +0100
@@ -259,7 +259,7 @@ if $(UNIX)
 	FILEMODE		default = 644 ;
 	FORTRAN			default = f77 ;
 	FORTRANFLAGS	default = ;
-#   HAVE_TIFF		default = 1 ;
+	HAVE_TIFF		default = 1 ;
 	HDRS			default = ;
 	INSTALL			default = install -c ;
 	LEX				default = lex ;
--- argyllcms-0.70/plot/Jamfile.build	2007-10-20 03:53:53.000000000 +0200
+++ argyllcms-0.70/plot/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -6,11 +6,11 @@ CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optim
 LINKFLAGS	+= $(LINKDEBUGFLAG) ;
 
 if $(UNIX) && $(OS) != MACOSX {
-	WinDir = /usr/X11R6 ;
+	WinDir = /usr ;
 	LibWinH = $(WinDir)/include ;
-	LibWinD = $(WinDir)/lib ;
+	LibWinD = ;
 	LibWin = ;
-	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
+	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp -lm ;
 }
 
 # PLOT library
--- argyllcms-0.70/cgats/Jamfile.build	2007-12-10 17:13:57.000000000 +0100
+++ argyllcms-0.70/cgats/Jamfile	2007-12-10 17:14:04.000000000 +0100
@@ -3,7 +3,7 @@
 
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
 #CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;
 
 #if stdio is not wanted in icclib:
 #CCFLAGS	+= $(DEFFLAG)SEPARATE_STD ;
--- argyllcms-0.70/rspl/Jamfile.build	2007-10-20 03:53:56.000000000 +0200
+++ argyllcms-0.70/rspl/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -16,9 +16,9 @@ if $(UNIX) {
 	LINKFLAGS += -framework IOKit ;
 	LINKFLAGS += -framework CoreFoundation ;
   } else {
-	WinDir = /usr/X11R6 ;
+	WinDir = /usr ;
 	LibWinH = $(WinDir)/include/X11 ;
-	LibWinD = $(WinDir)/lib ;
+	LibWinD = ;
 	LibWin = ;
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
   }
@@ -28,12 +28,13 @@ SCAT = scat ;	# Use thps scattered inter
 
 if $(HAVE_TIFF) {	# Alternate TIFF library
 	TIFFLIB = ;
-	TIFFINC = ;
+	TIFFINC = /usr/include ;
 	LINKLIBS on c1$(SUFEXE)
 				c1df$(SUFEXE)
 				c1i$(SUFEXE)
 				t2d$(SUFEXE)
 				t2dfw$(SUFEXE)
+				t2ddf$(SUFEXE)
 				t3d$(SUFEXE)
 				t3ddf$(SUFEXE)
 				tnd$(SUFEXE)
--- argyllcms-0.70/gamut/Jamfile.build	2007-10-20 03:53:57.000000000 +0200
+++ argyllcms-0.70/gamut/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -6,7 +6,7 @@
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
 #CCFLAGS	+= $(CCDEBUGFLAG) ;		# Debugging flags
 #CCFLAGS		+= $(CCHEAPDEBUG) ;		# Heap Debugging flags
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;      # Link with debug info
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;      # Link with debug info
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
 
--- argyllcms-0.70/xicc/Jamfile.build	2007-10-20 03:53:58.000000000 +0200
+++ argyllcms-0.70/xicc/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -12,9 +12,9 @@ if $(UNIX) {
 	LINKFLAGS += -framework IOKit ;
 	LINKFLAGS += -framework CoreFoundation ;
   } else {
-	WinDir = /usr/X11R6 ;
+	WinDir = /usr ;
 	LibWinH = $(WinDir)/include/X11 ;
-	LibWinD = $(WinDir)/lib ;
+	LibWinD = ;
 	LibWin = ;
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
   }
@@ -23,7 +23,9 @@ if $(UNIX) {
 if $(HAVE_TIFF) {	# Alternate TIFF library
 	TIFFLIB = ;
 	TIFFINC = ;
-	LINKLIBS on tiffgamut$(SUFEXE) = $(LINKLIBS) -ltiff ;
+	LINKLIBS on tiffgamut$(SUFEXE)
+	            cam02plot$(SUFEXE) = $(LINKLIBS) -ltiff ;
+
 } else {
 	TIFFLIB = ../tiff/libtiff.lib ;
 	TIFFINC = ../tiff ;
--- argyllcms-0.70/spectro/Jamfile.build	2007-10-20 03:54:00.000000000 +0200
+++ argyllcms-0.70/spectro/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -17,7 +17,7 @@ if $(NT) {
 
 if $(UNIX) {
 	IOFILE = unixio.c pollem.c ;
-	LIBUSB = ../libusb ;
+#	LIBUSB = ../libusb ;
 }
 
 if $(UNIX) {
@@ -25,11 +25,11 @@ if $(UNIX) {
 	LINKFLAGS += -framework IOKit ;
 	LINKFLAGS += -framework CoreFoundation ;
   } else {
-	WinDir = /usr/X11R6 ;
+	WinDir = /usr ;
 	LibWinH = $(WinDir)/include ;
-	LibWinD = $(WinDir)/lib ;
+	LibWinD =  ;
 	LibWin = ;
-	LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl ;
+	LINKFLAGS += -L$(LibWinD) -lX11 -lXext -lXxf86vm -lXinerama -lXau -lXdmcp -lXss -ldl -lm -lusb ;
   }
 }
 
--- argyllcms-0.70/imdi/Jamfile.build	2007-10-20 03:54:03.000000000 +0200
+++ argyllcms-0.70/imdi/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -5,14 +5,16 @@
 CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optimisation on
 #CCFLAGS	    += $(CCDEBUGFLAG) ;		# Debugging flags
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
-LINKFLAGS	+= $(LINKDEBUGFLAG) ;	# Link debugging flags
+LINKFLAGS	+= -lm $(LINKDEBUGFLAG) ;	# Link debugging flags
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
 #CCFLAGS	+= $(CCHEAPDEBUG) ;		# Heap Debugging flags
 
 if $(HAVE_TIFF) {	# Alternate TIFF library
 	TIFFLIB = ;
 	TIFFINC = ;
-	LINKLIBS on cctiff$(SUFEXE) = -ltiff $(LINKLIBS) ;
+	LINKLIBS on cctiff$(SUFEXE)
+	            cctiffo$(SUFEXE)
+	            greytiff$(SUFEXE)	= -ltiff $(LINKLIBS) ;
 } else {
 	TIFFLIB = ../tiff/libtiff.lib ;
 	TIFFINC = ../tiff ;
--- argyllcms-0.70/target/Jamfile.build	2007-10-20 03:54:05.000000000 +0200
+++ argyllcms-0.70/target/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -14,9 +14,9 @@ if $(UNIX) {
 	LINKFLAGS += -framework IOKit ;
 	LINKFLAGS += -framework CoreFoundation ;
   } else {
-	WinDir = /usr/X11R6 ;
+	WinDir = /usr ;
 	LibWinH = $(WinDir)/include/X11 ;
-	LibWinD = $(WinDir)/lib ;
+	LibWinD = ;
 	LibWin = ;
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
   }
--- argyllcms-0.70/profile/Jamfile.build	2007-10-20 03:54:08.000000000 +0200
+++ argyllcms-0.70/profile/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -11,9 +11,9 @@ if $(UNIX) {
 	LINKFLAGS += -framework IOKit ;
 	LINKFLAGS += -framework CoreFoundation ;
   } else {
-	WinDir = /usr/X11R6 ;
+	WinDir = /usr ;
 	LibWinH = $(WinDir)/include/X11 ;
-	LibWinD = $(WinDir)/lib ;
+	LibWinD = ;
 	LibWin = ;
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
   }
--- argyllcms-0.70/link/Jamfile.build	2007-10-20 03:54:10.000000000 +0200
+++ argyllcms-0.70/link/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -10,9 +10,9 @@ CCFLAGS 	+= $(CCOPTFLAG) ;		# Turn optim
 LINKFLAGS	+= $(LINKDEBUGFLAG) ;	# Link debugging flags
 
 if $(UNIX) && $(OS) != MACOSX {
-	WinDir = /usr/X11R6 ;
+	WinDir = /usr ;
 	LibWinH = $(WinDir)/include/X11 ;
-	LibWinD = $(WinDir)/lib ;
+	LibWinD = ;
 	LibWin = ;
 	LINKFLAGS += -L$(LibWinD) -lX11 -lXau -lXdmcp ;
 }
--- argyllcms-0.70/render/Jamfile.build	2007-10-20 03:54:11.000000000 +0200
+++ argyllcms-0.70/render/Jamfile	2007-12-10 17:13:45.000000000 +0100
@@ -10,6 +10,16 @@ LINKFLAGS	+= $(LINKDEBUGFLAG) ;      # L
 #CCFLAGS 	+= $(CCPROFFLAG) ;		# Profile flags
 #LINKFLAGS	+= $(LINKPROFFLAG) ;    # Profile flags
 
+if $(HAVE_TIFF) {	# Alternate TIFF library
+	TIFFLIB = ;
+	TIFFINC = ;
+	LINKLIBS on timage$(SUFEXE) = $(LINKLIBS) -ltiff ;
+
+} else {
+	TIFFLIB = ../tiff/libtiff.lib ;
+	TIFFINC = ../tiff ;
+}
+
 #Products
 Libraries = librender ;
 Executables = timage ;
@@ -22,11 +32,11 @@ InstallBin $(DOTDOT)$(SLASH)bin : $(Exec
 
 # 2D Rendering library
 Library librender.lib : render.c ;
-ObjectHdrs render$(SUFOBJ) : ../h ../numlib ../tiff ;
+ObjectHdrs render$(SUFOBJ) : ../h ../numlib $(TIFFINC) ;
 
 Main timage : timage.c ;
-ObjectHdrs timage$(SUFOBJ) : ../h ../numlib ../tiff ;
-LinkLibraries timage : librender.lib ../numlib/libnum.lib ../tiff/libtiff.lib ;
+ObjectHdrs timage$(SUFOBJ) : ../h ../numlib $(TIFFINC) ;
+LinkLibraries timage : librender.lib ../numlib/libnum.lib $(TIFFLIB) ;
 
 if $(BUILD_JUNK) {
 
--- argyllcms-0.70/makeall.ksh.build	2007-10-20 03:53:25.000000000 +0200
+++ argyllcms-0.70/makeall.ksh	2007-12-10 17:13:45.000000000 +0100
@@ -18,6 +18,6 @@ if [ X$OS != "XWindows_NT" ] ; then
 fi
 for i in `cat blddirs`
 do
-(echo ------------; echo $i; echo ----------; cd $i; jam -f../Jambase -j${NUMBER_OF_PROCESSORS:-1}; cd ..; echo)
-#(echo ------------; echo $i; echo ----------; cd $i; jam -f../Jambase ; cd ..; echo)
+#(echo ------------; echo $i; echo ----------; cd $i; jam -f../Jambase -j${NUMBER_OF_PROCESSORS:-1}; cd ..; echo)
+(echo ------------; echo $i; echo ----------; cd $i; jam -f../Jambase ; cd ..; echo)
 done

Perl :: Catalyst :: PostgreSQL :: RPM Valid HTML 4.01 Transitional