SOURCES: libpng-libdirfix.patch, libpng-norpath.patch, libpng-reve...

qboosh qboosh at pld-linux.org
Mon Apr 17 02:22:06 CEST 2006 

Author: qboosh                       Date: Mon Apr 17 00:22:06 2006 GMT
Module: SOURCES                       Tag: HEAD
---- Log message:
- updated for 1.2.9

---- Files affected:
SOURCES:
   libpng-libdirfix.patch (1.2 -> 1.3) , libpng-norpath.patch (1.1 -> 1.2) , libpng-revert.patch (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SOURCES/libpng-libdirfix.patch
diff -u SOURCES/libpng-libdirfix.patch:1.2 SOURCES/libpng-libdirfix.patch:1.3
--- SOURCES/libpng-libdirfix.patch:1.2	Fri Dec 26 22:15:28 2003
+++ SOURCES/libpng-libdirfix.patch	Mon Apr 17 02:22:00 2006
@@ -1,33 +1,40 @@
---- libpng-1.2.2/scripts/makefile.linux.libdirfix	2003-02-24 19:32:51.000000000 -0500
-+++ libpng-1.2.2/scripts/makefile.linux	2003-02-24 19:33:26.000000000 -0500
+--- libpng-1.2.9/scripts/makefile.linux.libdirfix	2003-02-24 19:32:51.000000000 -0500
++++ libpng-1.2.9/scripts/makefile.linux	2003-02-24 19:33:26.000000000 -0500
+@@ -29,7 +29,7 @@
+ # libpng12/png.h and libpng12/pngconf.h
+ # Prefix must be a full pathname.
+ prefix=/usr/local
+-exec_prefix=$prefix
++exec_prefix=$(prefix)
+ 
+ # Where the zlib library and include files are located.
+ #ZLIBLIB=/usr/local/lib
 @@ -60,7 +60,7 @@
  	$(RANLIB) $@
  
  libpng.pc:
 -	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
-+	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! -e s\!@LIBPATH@!$(LIBPATH)! > libpng.pc
++	cat scripts/libpng.pc.in | sed -e "s, at prefix@,$(prefix),;s, at exec_prefix@,$(exec_prefix),;s, at libdir@,$(LIBPATH),;s, at includedir@,$(INCPATH),;s, at PNGLIB_VERSION@,$(PNGMIN),;s, at PNGLIB_MAJOR@,12," > libpng.pc
  
  $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
  	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
---- libpng-1.2.2/scripts/makefile.gcmmx.libdirfix	2003-02-24 19:32:51.000000000 -0500
-+++ libpng-1.2.2/scripts/makefile.gcmmx	2003-02-24 19:33:26.000000000 -0500
+--- libpng-1.2.9/scripts/makefile.gcmmx.libdirfix	2003-02-24 19:32:51.000000000 -0500
++++ libpng-1.2.9/scripts/makefile.gcmmx	2003-02-24 19:33:26.000000000 -0500
+@@ -40,7 +40,7 @@
+ # libpng12/png.h and libpng12/pngconf.h
+ # Prefix must be a full pathname.
+ prefix=/usr/local
+-exec_prefix=$prefix
++exec_prefix=$(prefix)
+ 
+ # Where the zlib library and include files are located.
+ #ZLIBLIB=/usr/local/lib
 @@ -60,7 +60,7 @@
  	$(RANLIB) $@
  
  libpng.pc:
 -	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! > libpng.pc
-+	cat scripts/libpng.pc.in | sed -e s\!@PREFIX@!$(prefix)! -e s\!@LIBPATH@!$(LIBPATH)! > libpng.pc
++	cat scripts/libpng.pc.in | sed -e "s, at prefix@,$(prefix),;s, at exec_prefix@,$(exec_prefix),;s, at libdir@,$(LIBPATH),;s, at includedir@,$(INCPATH),;s, at PNGLIB_VERSION@,$(PNGMIN),;s, at PNGLIB_MAJOR@,12," > libpng.pc
  
  $(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
  	ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
---- libpng-1.2.2/scripts/libpng.pc.in.libdirfix	2003-02-24 19:31:45.000000000 -0500
-+++ libpng-1.2.2/scripts/libpng.pc.in	2003-02-24 19:31:53.000000000 -0500
-@@ -1,7 +1,7 @@
- 
- prefix=@PREFIX@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
-+libdir=@LIBPATH@
- includedir=${exec_prefix}/include
- 
- Name: libpng12

================================================================
Index: SOURCES/libpng-norpath.patch
diff -u SOURCES/libpng-norpath.patch:1.1 SOURCES/libpng-norpath.patch:1.2
--- SOURCES/libpng-norpath.patch:1.1	Mon Apr 21 03:11:10 2003
+++ SOURCES/libpng-norpath.patch	Mon Apr 17 02:22:01 2006
@@ -1,6 +1,6 @@
---- libpng-1.2.5/scripts/makefile.gcmmx.orig	2003-04-21 02:18:40.000000000 +0200
-+++ libpng-1.2.5/scripts/makefile.gcmmx	2003-04-21 02:32:00.000000000 +0200
-@@ -55,8 +55,8 @@
+--- libpng-1.2.9/scripts/makefile.gcmmx.orig	2006-04-17 01:12:53.813611500 +0200
++++ libpng-1.2.9/scripts/makefile.gcmmx	2006-04-17 01:13:47.872990000 +0200
+@@ -72,8 +72,8 @@
  #	-m486 -malign-double -ffast-math \
  #	$(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer 
  
@@ -9,9 +9,9 @@
 +LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 +LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
  
- RANLIB=ranlib
- #RANLIB=echo
-@@ -107,7 +107,7 @@
+ 
+ INCPATH=$(prefix)/include
+@@ -122,7 +122,7 @@
  	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
  	echo cppflags=\"-DPNG_THREAD_UNSAFE_OK -DPNG_USE_PNGGCCRD\"; \
  	echo L_opts=\"-L$(LIBPATH)\"; \
@@ -20,18 +20,18 @@
  	echo libs=\"-lpng12 -lz -lm\"; \
  	cat scripts/libpng-config-body.in ) > libpng-config
  	chmod +x libpng-config
-@@ -213,7 +213,7 @@
+@@ -239,7 +239,7 @@
  test-installed:
  	$(CC) -I$(ZLIBINC) \
- 	   `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+ 	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
 -	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
 +	   -L$(ZLIBLIB) \
- 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
+ 	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
  	./pngtesti pngtest.png
  
---- libpng-1.2.5/scripts/makefile.linux.orig	2003-04-21 02:18:40.000000000 +0200
-+++ libpng-1.2.5/scripts/makefile.linux	2003-04-21 02:32:24.000000000 +0200
-@@ -34,8 +34,8 @@
+--- libpng-1.2.9/scripts/makefile.linux.orig	2006-04-17 01:12:53.813611500 +0200
++++ libpng-1.2.9/scripts/makefile.linux	2006-04-17 01:14:15.322705500 +0200
+@@ -50,8 +50,8 @@
  CFLAGS=-I$(ZLIBINC) -Wall $(OPT_FLAGS) -funroll-loops \
  	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
  
@@ -40,9 +40,9 @@
 +LDFLAGS=-L. -L$(ZLIBLIB) -lpng12 -lz -lm
 +LDFLAGS_A=-L$(ZLIBLIB) libpng.a -lz -lm
  
- RANLIB=ranlib
- #RANLIB=echo
-@@ -85,7 +85,7 @@
+ INCPATH=$(prefix)/include
+ LIBPATH=$(exec_prefix)/lib
+@@ -98,7 +98,7 @@
  	echo prefix=\"$(prefix)\"; \
  	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
  	echo L_opts=\"-L$(LIBPATH)\"; \
@@ -51,12 +51,12 @@
  	echo libs=\"-lpng12 -lz -lm\"; \
  	cat scripts/libpng-config-body.in ) > libpng-config
  	chmod +x libpng-config
-@@ -185,7 +185,7 @@
+@@ -207,7 +207,7 @@
  test-installed:
  	$(CC) -I$(ZLIBINC) \
- 	   `$(BINPATH)/libpng12-config --cflags` pngtest.c \
+ 	   `$(BINPATH)/$(LIBNAME)-config --cflags` pngtest.c \
 -	   -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) \
 +	   -L$(ZLIBLIB) \
- 	   -o pngtesti `$(BINPATH)/libpng12-config --ldflags`
+ 	   -o pngtesti `$(BINPATH)/$(LIBNAME)-config --ldflags`
  	./pngtesti pngtest.png
  

================================================================
Index: SOURCES/libpng-revert.patch
diff -u SOURCES/libpng-revert.patch:1.1 SOURCES/libpng-revert.patch:1.2
--- SOURCES/libpng-revert.patch:1.1	Sat Oct 12 01:42:10 2002
+++ SOURCES/libpng-revert.patch	Mon Apr 17 02:22:01 2006
@@ -1,66 +1,80 @@
-diff -Nur libpng-1.2.5.orig/scripts/makefile.gcmmx libpng-1.2.5/scripts/makefile.gcmmx
---- libpng-1.2.5.orig/scripts/makefile.gcmmx	Sat Oct 12 01:00:37 2002
-+++ libpng-1.2.5/scripts/makefile.gcmmx	Sat Oct 12 01:05:56 2002
-@@ -125,14 +125,12 @@
- 	ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
- 
- $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
--	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
-+	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \
- 	-o $(LIBNAME).so.$(PNGVER) \
- 	$(OBJSDLL)
- 
--libpng.so.3.$(PNGMIN): $(OBJSDLL)
--	$(CC) -shared -Wl,-soname,libpng.so.3 \
--	-o libpng.so.3.$(PNGMIN) \
+--- libpng-1.2.9/scripts/makefile.gcmmx.orig	2006-04-17 00:49:57.995628250 +0200
++++ libpng-1.2.9/scripts/makefile.gcmmx	2006-04-17 01:12:02.910430250 +0200
+@@ -24,8 +24,8 @@
+ LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
+ LIBSOVER=$(LIBNAME).so.$(PNGVER)
+ OLDSO=libpng.so
+-OLDSOMAJ=libpng.so.0
+-OLDSOVER=libpng.so.0.$(PNGMIN)
++OLDSOMAJ=libpng.so.3
++OLDSOVER=libpng.so.3.$(PNGMIN)
+ 
+ # Utilities:
+ CC = gcc
+@@ -142,12 +142,10 @@
+ $(LIBSOVER): $(OBJSDLL)
+ 	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) \
+ 	-o $(LIBSOVER) \
 -	$(OBJSDLL)
-+libpng.so.3.$(PNGMIN): $(LIBNAME).so.$(PNGVER)
-+	ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN)
++	$(OBJSDLL) -lz -lm
  
- pngtest: pngtest.o $(LIBNAME).so
+-$(OLDSOVER): $(OBJSDLL)
+-	$(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
+-	-o $(OLDSOVER) \
+-	$(OBJSDLL)
++$(OLDSOVER): $(LIBSOVER)
++	$(LN_SF) $(LIBSOVER) $(OLDSOVER)
+ 
+ pngtest: pngtest.o $(LIBSO)
  	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-@@ -174,10 +172,9 @@
- 	-@/bin/rm -f $(DL)/libpng.so.3
- 	-@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
- 	cp $(LIBNAME).so.$(PNGVER) $(DL)
--	cp libpng.so.3.$(PNGMIN) $(DL)
- 	chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
--	chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+@@ -190,9 +188,8 @@
+ 	-@$(RM_F) $(DL)/$(OLDSOMAJ)
+ 	-@$(RM_F) $(DL)/$(OLDSOVER)*
+ 	cp $(LIBSOVER) $(DL)
+-	cp $(OLDSOVER) $(DL)
++	$(LN_SF) $(LIBSOVER) $(DL)/$(OLDSOVER)
+ 	chmod 755 $(DL)/$(LIBSOVER)
+-	chmod 755 $(DL)/$(OLDSOVER)
  	(cd $(DL); \
-+	ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
- 	ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- 	ln -sf libpng.so.3 libpng.so; \
- 	ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
-diff -Nur libpng-1.2.5.orig/scripts/makefile.linux libpng-1.2.5/scripts/makefile.linux
---- libpng-1.2.5.orig/scripts/makefile.linux	Sat Oct 12 01:00:37 2002
-+++ libpng-1.2.5/scripts/makefile.linux	Sat Oct 12 01:05:55 2002
-@@ -97,14 +97,12 @@
- 	ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ)
- 
- $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
--	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
-+	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) -lz -lm \
- 	-o $(LIBNAME).so.$(PNGVER) \
- 	$(OBJSDLL)
- 
--libpng.so.3.$(PNGMIN): $(OBJSDLL)
--	$(CC) -shared -Wl,-soname,libpng.so.3 \
--	-o libpng.so.3.$(PNGMIN) \
+ 	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
+ 	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
+--- libpng-1.2.9/scripts/makefile.linux.orig	2006-04-17 00:49:57.999628500 +0200
++++ libpng-1.2.9/scripts/makefile.linux	2006-04-17 01:12:01.098317000 +0200
+@@ -14,8 +14,8 @@
+ LIBSOMAJ=$(LIBNAME).so.$(PNGMAJ)
+ LIBSOVER=$(LIBNAME).so.$(PNGVER)
+ OLDSO=libpng.so
+-OLDSOMAJ=libpng.so.0
+-OLDSOVER=libpng.so.0.$(PNGMIN)
++OLDSOMAJ=libpng.so.3
++OLDSOVER=libpng.so.3.$(PNGMIN)
+ 
+ # Utilities:
+ AR_RC=ar rc
+@@ -110,12 +110,10 @@
+ 	$(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
+ 
+ $(LIBSOVER): $(OBJSDLL)
+-	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)
++	$(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL) -lz -m
+ 
+-$(OLDSOVER): $(OBJSDLL)
+-	$(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
+-	-o $(OLDSOVER) \
 -	$(OBJSDLL)
-+libpng.so.3.$(PNGMIN): $(LIBNAME).so.$(PNGVER)
-+	ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN)
++$(OLDSOVER): $(LIBSOVER)
++	$(LN_SF) $(LIBSOVER) $(OLDSOVER)
  
- pngtest: pngtest.o $(LIBNAME).so
+ pngtest: pngtest.o $(LIBSO)
  	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-@@ -146,10 +144,9 @@
- 	-@/bin/rm -f $(DL)/libpng.so.3
- 	-@/bin/rm -f $(DL)/libpng.so.3.$(PNGMIN)*
- 	cp $(LIBNAME).so.$(PNGVER) $(DL)
--	cp libpng.so.3.$(PNGMIN) $(DL)
- 	chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
--	chmod 755 $(DL)/libpng.so.3.$(PNGMIN)
+@@ -158,9 +156,8 @@
+ 	-@$(RM_F) $(DL)/$(OLDSOMAJ)
+ 	-@$(RM_F) $(DL)/$(OLDSOVER)*
+ 	cp $(LIBSOVER) $(DL)
+-	cp $(OLDSOVER) $(DL)
++	$(LN_SF) $(LIBSOVER) $(DL)/$(OLDSOVER)
+ 	chmod 755 $(DL)/$(LIBSOVER)
+-	chmod 755 $(DL)/$(OLDSOVER)
  	(cd $(DL); \
-+	ln -sf $(LIBNAME).so.$(PNGVER) libpng.so.3.$(PNGMIN); \
- 	ln -sf libpng.so.3.$(PNGMIN) libpng.so.3; \
- 	ln -sf libpng.so.3 libpng.so; \
- 	ln -sf $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
+ 	$(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
+ 	$(LN_SF) $(OLDSOMAJ) $(OLDSO); \
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SOURCES/libpng-libdirfix.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/SOURCES/libpng-norpath.patch?r1=1.1&r2=1.2&f=u
    http://cvs.pld-linux.org/SOURCES/libpng-revert.patch?r1=1.1&r2=1.2&f=u

More information about the pld-cvs-commit mailing list