[Restricted-changes] r174 - dists/trunk/xv/debian/patches

[fabian-guest at alioth.debian.org]

Author: fabian-guest
Date: 2008-02-27 12:24:38 +0000 (Wed, 27 Feb 2008)
New Revision: 174

Added:
   dists/trunk/xv/debian/patches/05-cflags-ldflags.dpatch
Log:
XV patch got lost...


Added: dists/trunk/xv/debian/patches/05-cflags-ldflags.dpatch
===================================================================
--- dists/trunk/xv/debian/patches/05-cflags-ldflags.dpatch	                        (rev 0)
+++ dists/trunk/xv/debian/patches/05-cflags-ldflags.dpatch	2008-02-27 12:24:38 UTC (rev 174)
@@ -0,0 +1,104 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 05-cflags-ldflags.dpatch by  <fabian at vfrodo>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad xv-3.10a~/Makefile xv-3.10a/Makefile
+--- xv-3.10a~/Makefile	2008-02-27 11:36:56.000000000 +0100
++++ xv-3.10a/Makefile	2008-02-27 11:39:16.000000000 +0100
+@@ -18,29 +18,29 @@
+ #       -Wuninitialized -Wparentheses
+ 
+ 
+-CCOPTS = -O
++CFLAGS = -O
+ #
+ # these are the usual optimization and warning options for gcc; all such
+ # warnings but one (mktemp() use) have been eliminated (at least on Linux):
+-#CCOPTS = -O3 -Wall
++#CFLAGS = -O3 -Wall
+ #
+ # slightly more warnings... older code often made non-const pointers to
+ # static strings (nothing should blow up unless something tries to write
+ # to them):
+-#CCOPTS = -O3 -Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wnested-externs
++#CFLAGS = -O3 -Wall -Wpointer-arith -Wcast-align -Wwrite-strings -Wnested-externs
+ #
+ # for the next step up in gcc noise, try adding -W (but note that it adds a
+ # huge number of unused-parameter and signed/unsigned comparison warnings):
+-#CCOPTS = -O3 -Wall -W
++#CFLAGS = -O3 -Wall -W
+ 
+ ### NOTE: Sun running OpenWindows:
+ ### if you're using a SUN running OPENWINDOWS, you need to add these two
+-### options to the CCOPTS line, so it finds the libs and include files
++### options to the ALL_CFLAGS line, so it finds the libs and include files
+ ###   -L/usr/openwin/lib -I/usr/openwin/include
+ ###
+ ### In general, if your X11 include files and libX11.a library aren't in the
+ ### 'standard' places in which the C compiler looks, you should add '-L' and
+-### '-I' options on the CCOPTS line to tell the compiler where said files are.
++### '-I' options on the ALL_CFLAGS line to tell the compiler where said files are.
+ 
+ 
+ # older Unixen don't support the -p option, but its lack may mean installation
+@@ -106,7 +106,7 @@
+ ### included in the "tiff" subdir of XV, not an arbitrary copy of libtiff:
+ ###
+ #$(TIFFLIB):
+-#	( cd $(TIFFDIR) ; make CC='$(CC)' COPTS='$(CCOPTS) $(MCHN)' )
++#	( cd $(TIFFDIR) ; make CC='$(CC)' CFLAGS='$(CFLAGS) $(MCHN)' )
+ 
+ 
+ ###
+@@ -335,11 +335,12 @@
+ 
+ 
+ 
+-CFLAGS = $(CCOPTS) $(PNG) $(PNGINC) $(ZLIBINC) $(JPEG) $(JPEGINC) \
++ALL_CFLAGS = $(PNG) $(PNGINC) $(ZLIBINC) $(JPEG) $(JPEGINC) \
+ 	$(TIFF) $(TIFFINC) $(PDS) $(JP2K) $(JP2KINC) $(TVL10N) $(MGCSFX) \
+ 	$(UNIX) $(BSDTYPES) $(RAND) $(MALLOC) $(DXWM) $(MCHN) $(NODIRENT) \
+ 	$(VPRINTF) $(TIMERS) -DDOCDIR=\"$(DOCDIR)\" \
+-	-DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\"
++	-DSYSCONFDIR=\"$(SYSCONFDIR)\" -DXVEXECPATH=\"$(LIBDIR)\" \
++	$(CFLAGS)
+ 
+ ### remove -lm for BeOS:
+ LIBS = $(TIFFLIB) $(JPEGLIB) $(PNGLIB) $(ZLIBLIB) $(JP2KLIB) -L/usr/X11R6/lib -lX11 -lm
+@@ -359,7 +360,7 @@
+ 
+ 
+ 
+-.c.o:	; $(CC) $(CFLAGS) -c $*.c
++.c.o:	; $(CC) $(ALL_CFLAGS) -c $*.c
+ 
+ 
+ 
+@@ -369,19 +370,19 @@
+ 
+ #xv: $(OBJS) $(JPEGLIB) $(TIFFLIB)
+ xv: $(OBJS)
+-	$(CC) -o xv $(CFLAGS) $(OBJS) $(LIBS)
++	$(CC) -o xv $(ALL_CFLAGS) $(OBJS) $(LDFLAGS) $(LIBS)
+ 
+ bggen: bggen.c
+-	$(CC) $(CFLAGS) -o bggen bggen.c $(LIBS)
++	$(CC) $(ALL_CFLAGS) -o bggen bggen.c $(LDFLAGS) $(LIBS)
+ 
+ vdcomp: vdcomp.c
+-	$(CC) $(CFLAGS) -o vdcomp vdcomp.c
++	$(CC) $(ALL_CFLAGS) -o vdcomp vdcomp.c
+ 
+ xcmap:  xcmap.c
+-	$(CC) $(CFLAGS) -o xcmap xcmap.c $(LIBS)
++	$(CC) $(ALL_CFLAGS) -o xcmap xcmap.c $(LDFLAGS) $(LIBS)
+ 
+ xvpictoppm:  xvpictoppm.c
+-	$(CC) $(CFLAGS) -o xvpictoppm xvpictoppm.c
++	$(CC) $(ALL_CFLAGS) -o xvpictoppm xvpictoppm.c
+ 
+ 
+ 


Property changes on: dists/trunk/xv/debian/patches/05-cflags-ldflags.dpatch
___________________________________________________________________
Name: svn:executable
   + *