packages: xv/xv-PLD.patch - reworked for jumbopatch
evil
evil at pld-linux.org
Fri Jan 15 19:01:55 CET 2010
Author: evil Date: Fri Jan 15 18:01:55 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- reworked for jumbopatch
---- Files affected:
packages/xv:
xv-PLD.patch (1.3 -> 1.4)
---- Diffs:
================================================================
Index: packages/xv/xv-PLD.patch
diff -u packages/xv/xv-PLD.patch:1.3 packages/xv/xv-PLD.patch:1.4
--- packages/xv/xv-PLD.patch:1.3 Wed Oct 18 23:54:28 2006
+++ packages/xv/xv-PLD.patch Fri Jan 15 19:01:50 2010
@@ -1,137 +1,149 @@
-diff -urN xv-3.10a.orig/Makefile xv-3.10a/Makefile
---- xv-3.10a.orig/Makefile Fri Oct 15 17:27:01 1999
-+++ xv-3.10a/Makefile Fri Oct 15 17:36:01 1999
+--- xv-3.10a/Makefile.orig 2010-01-15 17:46:37.795696149 +0100
++++ xv-3.10a/Makefile 2010-01-15 17:45:30.765696388 +0100
@@ -1,7 +1,7 @@
# Makefile for xv
# your C compiler (and options) of choice
-CC = cc
+CC = gcc
- # CC = gcc -ansi
-
- # use this if you're using 'cc' on a DEC Alpha (OSF/1) or MIPS (Ultrix) system:
-@@ -14,7 +14,7 @@
+ #CC = gcc -ansi
+ # note that -ansi kills __USE_MISC (gcc 2.95.3), which, at least on Linux,
+ # determines whether stdlib.h includes prototypes for mktemp(), random(), etc.
+@@ -18,7 +18,7 @@
# -Wuninitialized -Wparentheses
--CCOPTS = -O
+-CCOPTS = -O
+CCOPTS = $(RPM_OPT_FLAGS)
-
-
- ### NOTE: Sun running OpenWindows:
-@@ -45,45 +45,49 @@
- ### if, for whatever reason, you're unable to get the JPEG library to compile
- ### on your machine, *COMMENT OUT* the following lines
+ #
+ # these are the usual optimization and warning options for gcc; all such
+ # warnings but one (mktemp() use) have been eliminated (at least on Linux):
+@@ -56,7 +56,7 @@
+ ### NOTE: Users of old K&R compilers (i.e., any version not supporting C89
+ ### string concatenation, such as "fub" "ar" => "fubar") should update
+ ### xvtext.c:1831 (or thereabouts) if either PREFIX or DOCDIR changes:
+-PREFIX = /usr/local
++PREFIX = /usr
+ BINDIR = $(PREFIX)/bin
+ MANDIR = $(PREFIX)/share/man/man1
+ MANSUF = 1
+@@ -87,17 +87,17 @@
+ TIFF = -DDOTIFF -DUSE_TILED_TIFF_BOTLEFT_FIX
+ ###
+ #TIFFDIR = tiff
+-TIFFDIR = /usr
++#TIFFDIR = /usr
+ #TIFFDIR = /usr/local
+ #TIFFDIR = ../../libtiff
+ ###
+-TIFFINC = -I$(TIFFDIR)/include
++#TIFFINC = -I$(TIFFDIR)/include
+ #TIFFINC = -I$(TIFFDIR)
+ ###
+ ### libtiff 3.5 and up may be compiled with zlib and libjpeg, but the
+ ### dependency is properly handled in LIBS line ~247 lines below
###
--JPEG = -DDOJPEG
--JPEGDIR = jpeg
--JPEGINC = -I$(JPEGDIR)
--JPEGLIB = $(JPEGDIR)/libjpeg.a
--$(JPEGDIR)/jconfig.h:
-- cd $(JPEGDIR) ; ./configure CC='$(CC)'
--$(JPEGLIB): $(JPEGDIR)/jconfig.h
-- cd $(JPEGDIR) ; make
-+JPEG = -DDOJPEG
-+#JPEGDIR = jpeg
-+#JPEGINC = -I$(JPEGDIR)
-+#JPEGLIB = $(JPEGDIR)/libjpeg.a
-+#$(JPEGDIR)/jconfig.h:
-+# cd $(JPEGDIR) ; ./configure CC='$(CC)'
-+#$(JPEGLIB): $(JPEGDIR)/jconfig.h
-+# cd $(JPEGDIR) ; make
+-TIFFLIB = -L$(TIFFDIR)/lib -ltiff
++TIFFLIB = -ltiff
+ #TIFFLIB = $(TIFFDIR)/lib/libtiff.a
+ #TIFFLIB = -L$(TIFFDIR) -ltiff
+ #TIFFLIB = $(TIFFDIR)/libtiff.a
+@@ -117,25 +117,13 @@
+ ###
+ JPEG = -DDOJPEG
+ #JPEGDIR = jpeg
+-JPEGDIR = /usr
+-#JPEGDIR = /usr/local
+-#JPEGDIR = ../../libjpeg
+-#JPEGDIR = /usr/sfw
+-###
+-JPEGINC = -I$(JPEGDIR)/include
+ #JPEGINC = -I$(JPEGDIR)
+-###
+-JPEGLIB = -L$(JPEGDIR)/lib -ljpeg
+-#JPEGLIB = -L$(JPEGDIR) -ljpeg
+ #JPEGLIB = $(JPEGDIR)/libjpeg.a
+-###
+-### this is intended to build the ancient version (5a) that's included in the
+-### "jpeg" subdir of XV, not an arbitrary copy of libjpeg:
+-###
+ #$(JPEGDIR)/jconfig.h:
+ # cd $(JPEGDIR) ; ./configure CC='$(CC)'
+ #$(JPEGLIB): $(JPEGDIR)/jconfig.h
+ # cd $(JPEGDIR) ; make
+JPEGLIB = -ljpeg
###
- ### if, for whatever reason, you're unable to get the PNG library to compile
+@@ -143,14 +131,14 @@
### on your machine, *COMMENT OUT* the following lines
###
--PNG = -DDOPNG
--PNGDIR = /usr/local/src/libpng
--PNGINC = -I$(PNGDIR)
--PNGLIB = -L$(PNGDIR) -lpng
-+PNG = -DDOPNG
-+#PNGDIR = /usr/local/src/libpng
-+#PNGINC = -I$(PNGDIR)
-+#PNGLIB = -L$(PNGDIR) -lpng
+ PNG = -DDOPNG
+-PNGDIR = /usr
++#PNGDIR = /usr
+ #PNGDIR = /usr/local
+ #PNGDIR = ../../libpng
+ ###
+-PNGINC = -I$(PNGDIR)/include
++#PNGINC = -I$(PNGDIR)/include
+ #PNGINC = -I$(PNGDIR)
+ ###
+-PNGLIB = -L$(PNGDIR)/lib -lpng
+PNGLIB = -lpng
+ #PNGLIB = -L$(PNGDIR) -lpng
+ #PNGLIB = $(PNGDIR)/libpng.a
-
- ###
- ### if, for whatever reason, you're unable to get the PNG library to compile
- ### on your machine, *COMMENT OUT* the following lines
+@@ -160,14 +148,14 @@
+ ### (newer versions of) the TIFF library to compile on your machine, *COMMENT
+ ### OUT* the following lines
+ ###
+-ZLIBDIR = /usr
++#ZLIBDIR = /usr
+ #ZLIBDIR = /usr/local
+ #ZLIBDIR = ../../zlib
+ ###
+-ZLIBINC = -I$(ZLIBDIR)/include
++#ZLIBINC = -I$(ZLIBDIR)/include
+ #ZLIBINC = -I$(ZLIBDIR)
###
--ZLIBDIR = /usr/local/src/zlib
--ZLIBINC = -I$(ZLIBDIR)
--ZLIBLIB = -L$(ZLIBDIR) -lz
-+#ZLIBDIR = /usr/local/src/zlib
-+#ZLIBINC = -I$(ZLIBDIR)
-+#ZLIBLIB = -L$(ZLIBDIR) -lz
+-ZLIBLIB = -L$(ZLIBDIR)/lib -lz
+ZLIBLIB = -lz
+ #ZLIBLIB = -L$(ZLIBDIR) -lz
+ #ZLIBLIB = $(ZLIBDIR)/libz.a
-
+@@ -179,13 +167,13 @@
+ JP2K = -DDOJP2K
###
- ### if, for whatever reason, you're unable to get the TIFF library to compile
- ### on your machine, *COMMENT OUT* the following lines
+ #JP2KDIR = ../../jasper
+-JP2KDIR = /usr/local/lib
++#JP2KDIR = /usr/local/lib
###
--TIFF = -DDOTIFF
--TIFFDIR = tiff
--TIFFINC = -I$(TIFFDIR)
--TIFFLIB = $(TIFFDIR)/libtiff.a
--$(TIFFLIB):
-- ( cd $(TIFFDIR) ; make CC='$(CC)' )
-+TIFF = -DDOTIFF
-+#TIFFDIR = tiff
-+#TIFFINC = -I$(TIFFDIR)
-+#TIFFLIB = $(TIFFDIR)/libtiff.a
-+#$(TIFFLIB):
-+# ( cd $(TIFFDIR) ; make CC='$(CC)' )
-+TIFFLIB = -ltiff
+ #JP2KINC = -I$(JP2KDIR)
+-JP2KINC = -I/usr/local/include
++#JP2KINC = -I/usr/local/include
+ ###
+-#JP2KLIB = -L$(JP2KDIR) -ljasper
+-JP2KLIB = $(JP2KDIR)/libjasper.a
++JP2KLIB = -ljasper
++#JP2KLIB = $(JP2KDIR)/libjasper.a
###
-@@ -121,7 +125,7 @@
+@@ -236,7 +224,7 @@
- ### for LINUX, uncomment the following line
--#MCHN = -DLINUX
+ ### for Linux, uncomment one of the following lines:
+-#MCHN = -DLINUX -L/usr/X11R6/lib
+MCHN = -DLINUX
+ #MCHN = -DLINUX -L/usr/X11R6/lib64
- # For SCO 1.1 (UNIX 3.2v2) machines, uncomment the following:
-@@ -207,7 +211,7 @@
- $(NODIRENT) $(VPRINTF) $(TIMERS) $(UNIX) $(BSDTYPES) $(RAND) \
- $(DXWM) $(MCHN) $(PNG) $(PNGINC) $(ZLIBINC)
+@@ -342,7 +330,7 @@
+ -DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\"
--LIBS = -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm
-+LIBS = $(LDFLAGS) -lX11 $(JPEGLIB) $(TIFFLIB) $(PNGLIB) $(ZLIBLIB) -lm
+ ### remove -lm for BeOS:
+-LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L/usr/X11R6/lib -lX11 -lm
++LIBS = $(LDFLAGS) $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lX11 -lm
+ #LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -lX11
OBJS = xv.o xvevent.o xvroot.o xvmisc.o xvimage.o xvcolor.o xvsmooth.o \
- xv24to8.o xvgif.o xvpm.o xvinfo.o xvctrl.o xvscrl.o xvalg.o \
-@@ -226,10 +230,10 @@
-
-
-
--all: $(JPEGLIB) $(TIFFLIB) xv bggen vdcomp xcmap xvpictoppm
-+all: xv bggen vdcomp xcmap xvpictoppm
-
-
--xv: $(OBJS) $(JPEGLIB) $(TIFFLIB)
-+xv: $(OBJS)
- $(CC) -o xv $(CFLAGS) $(OBJS) $(LIBS)
-
- bggen: bggen.c
-diff -urN xv-3.10a.orig/xv.h xv-3.10a/xv.h
---- xv-3.10a.orig/xv.h Fri Oct 15 17:27:01 1999
-+++ xv-3.10a/xv.h Fri Oct 15 17:33:35 1999
-@@ -115,10 +115,6 @@
-
- #ifndef VMS
- # include <errno.h>
-- extern int errno; /* SHOULD be in errno.h, but often isn't */
--# ifndef __NetBSD__
-- extern char *sys_errlist[]; /* this too... */
--# endif
- #endif
-
-
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xv/xv-PLD.patch?r1=1.3&r2=1.4&f=u
More information about the pld-cvs-commit
mailing list