SOURCES: libpng1-SONAME.patch, libpng1-opt.patch - updated for 1.0.26
qboosh
qboosh at pld-linux.org
Sat May 19 13:08:41 CEST 2007
Author: qboosh Date: Sat May 19 11:08:41 2007 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.0.26
---- Files affected:
SOURCES:
libpng1-SONAME.patch (1.10 -> 1.11) , libpng1-opt.patch (1.2 -> 1.3)
---- Diffs:
================================================================
Index: SOURCES/libpng1-SONAME.patch
diff -u SOURCES/libpng1-SONAME.patch:1.10 SOURCES/libpng1-SONAME.patch:1.11
--- SOURCES/libpng1-SONAME.patch:1.10 Sun Apr 8 14:00:35 2007
+++ SOURCES/libpng1-SONAME.patch Sat May 19 13:08:35 2007
@@ -1,5 +1,5 @@
---- libpng-1.0.24/scripts/makefile.linux.orig 2007-04-08 13:54:37.348265617 +0200
-+++ libpng-1.0.24/scripts/makefile.linux 2007-04-08 13:57:05.259531415 +0200
+--- libpng-1.0.26/scripts/makefile.linux.orig 2007-04-08 13:54:37.348265617 +0200
++++ libpng-1.0.26/scripts/makefile.linux 2007-04-08 13:57:05.259531415 +0200
@@ -4,8 +4,8 @@
# For conditions of distribution and use, see copyright notice in png.h
@@ -8,7 +8,7 @@
-PNGMAJ = 0
+LIBNAME = libpng
+PNGMAJ = 2
- PNGMIN = 1.0.24
+ PNGMIN = 1.0.26
PNGVER = $(PNGMAJ).$(PNGMIN)
@@ -50,7 +50,7 @@
@@ -16,7 +16,7 @@
$(ALIGN) # $(WARNMORE) -DPNG_DEBUG=5
-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm
-+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
++LDFLAGS=-L. -lpng -lz -lm
LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
INCPATH=$(prefix)/include
@@ -99,6 +99,122 @@
install-man: libpng.3 libpngpf.3 png.5
- at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
@@ -186,11 +189,11 @@
+
+ install-config: libpng-config
+ - at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+- -@$(RM_F) $(DB)/libpng-config
++ -@$(RM_F) $(DB)/libpng10-config
+ -@$(RM_F) $(DB)/$(LIBNAME)-config
+ cp libpng-config $(DB)/$(LIBNAME)-config
+ chmod 755 $(DB)/$(LIBNAME)-config
+- (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng-config)
++ (cd $(DB); $(LN_SF) $(LIBNAME)-config libpng10-config)
+
+ install: install-static install-shared install-man install-config
+
+--- libpng-1.0.26/scripts/makefile.gcmmx.orig 2007-05-19 10:21:21.888169000 +0200
++++ libpng-1.0.26/scripts/makefile.gcmmx 2007-05-19 10:54:10.808371613 +0200
+@@ -14,8 +14,8 @@
+ # the background! Context switches between MMX and FPU are expensive.
+
+ # Library name:
+-LIBNAME = libpng10
+-PNGMAJ = 0
++LIBNAME = libpng
++PNGMAJ = 2
+ PNGMIN = 1.0.26
+ PNGVER = $(PNGMAJ).$(PNGMIN)
+
+@@ -72,8 +72,8 @@
+ # -m486 -malign-double -ffast-math \
+ # $(ALIGN) -funroll-loops -funroll-all-loops -fomit-frame-pointer
+
+-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng10 -lz -lm
+-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
++LDFLAGS=-L. -lpng -lz -lm
++LDFLAGS_A=libpng.a -lz -lm
+
+
+ INCPATH=$(prefix)/include
+@@ -142,12 +142,16 @@
+ $(LIBSOVER): $(OBJSDLL)
+ $(CC) -shared -Wl,-soname,$(LIBSOMAJ) \
+ -o $(LIBSOVER) \
+- $(OBJSDLL)
++ $(OBJSDLL) -lz -lm
++
++libpng10.so.0.$(PNGMIN): $(LIBSOMAJ)
++ ln -sf $(LIBNAME).so.$(PNGVER) libpng10.so.0.$(PNGMIN)
++ ln -sf libpng10.so.0.$(PNGMIN) libpng10.so.0
+
+ $(OLDSOVER): $(OBJSDLL)
+ $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
+ -o $(OLDSOVER) \
+- $(OBJSDLL)
++ $(OBJSDLL) -lz -lm
+
+ pngtest: pngtest.o $(LIBSO)
+ $(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
+@@ -167,43 +171,42 @@
+
+ install-headers: png.h pngconf.h
+ - at if [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+- - at if [ ! -d $(DI)/$(LIBNAME) ]; then $(MKDIR_P) $(DI)/$(LIBNAME); fi
+- cp png.h pngconf.h $(DI)/$(LIBNAME)
+- chmod 644 $(DI)/$(LIBNAME)/png.h $(DI)/$(LIBNAME)/pngconf.h
++ - at if [ ! -d $(DI)/libpng10 ]; then $(MKDIR_P) $(DI)/libpng10; fi
++ cp png.h pngconf.h $(DI)/libpng10
++ chmod 644 $(DI)/libpng10/png.h $(DI)/libpng10/pngconf.h
+ -@$(RM_F) $(DI)/png.h $(DI)/pngconf.h
+ -@$(RM_F) $(DI)/libpng
+- (cd $(DI); $(LN_SF) $(LIBNAME) libpng; $(LN_SF) $(LIBNAME)/* .)
++ (cd $(DI); $(LN_SF) libpng10 libpng; $(LN_SF) libpng10/* .)
+
+ install-static: install-headers libpng.a
+ - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+ cp libpng.a $(DL)/$(LIBNAME).a
+ chmod 644 $(DL)/$(LIBNAME).a
+- -@$(RM_F) $(DL)/libpng.a
+- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
++ -@$(RM_F) $(DL)/libpng10.a
++ (cd $(DL); $(LN_SF) $(LIBNAME).a libpng10.a)
+
+ install-shared: install-headers $(LIBSOVER) libpng.pc \
+- $(OLDSOVER)
++ libpng10.so.0.$(PNGMIN)
+ - at if [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+ -@$(RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
+ -@$(RM_F) $(DL)/$(LIBSOMAJ)
+- -@$(RM_F) $(DL)/$(OLDSO)
+- -@$(RM_F) $(DL)/$(OLDSOMAJ)
+- -@$(RM_F) $(DL)/$(OLDSOVER)*
++ -@$(RM_F) $(DL)/libpng10.so
++ -@$(RM_F) $(DL)/libpng10.so.0
++ -@$(RM_F) $(DL)/libpng10.so.$(PNGMIN)*
+ cp $(LIBSOVER) $(DL)
+- cp $(OLDSOVER) $(DL)
+ chmod 755 $(DL)/$(LIBSOVER)
+- chmod 755 $(DL)/$(OLDSOVER)
+ (cd $(DL); \
+- $(LN_SF) $(OLDSOVER) $(OLDSOMAJ); \
+- $(LN_SF) $(OLDSOMAJ) $(OLDSO); \
++ ln -sf $(LIBNAME).so.$(PNGVER) libpng10.so.0.$(PNGMIN); \
++ ln -sf libpng10.so.0.$(PNGMIN) libpng10.so.0; \
++ ln -sf libpng10.so.0 libpng10.so; \
+ $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
+ $(LN_SF) $(LIBSOMAJ) $(LIBSO))
+ - at if [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P) $(DL)/pkgconfig; fi
+ -@$(RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
+- -@$(RM_F) $(DL)/pkgconfig/libpng.pc
++ -@$(RM_F) $(DL)/pkgconfig/libpng10.pc
+ cp libpng.pc $(DL)/pkgconfig/$(LIBNAME).pc
+ chmod 644 $(DL)/pkgconfig/$(LIBNAME).pc
+- (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng.pc)
++ (cd $(DL)/pkgconfig; $(LN_SF) $(LIBNAME).pc libpng10.pc)
+
+ install-man: libpng.3 libpngpf.3 png.5
+ - at if [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+@@ -218,11 +221,11 @@
install-config: libpng-config
- at if [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
================================================================
Index: SOURCES/libpng1-opt.patch
diff -u SOURCES/libpng1-opt.patch:1.2 SOURCES/libpng1-opt.patch:1.3
--- SOURCES/libpng1-opt.patch:1.2 Fri Jul 19 21:30:13 2002
+++ SOURCES/libpng1-opt.patch Sat May 19 13:08:36 2007
@@ -1,16 +1,5 @@
--- libpng-1.0.14/scripts/makefile.gcmmx.orig Mon Jul 8 02:48:02 2002
+++ libpng-1.0.14/scripts/makefile.gcmmx Thu Jul 18 19:59:47 2002
-@@ -28,8 +28,8 @@
- # Where the zlib library and include files are located.
- #ZLIBLIB=/usr/local/lib
- #ZLIBINC=/usr/local/include
--ZLIBLIB=../zlib
--ZLIBINC=../zlib
-+ZLIBLIB=/usr/lib
-+ZLIBINC=
-
- ALIGN=
- # for i386:
@@ -44,8 +44,8 @@
# Remove -DPNG_THREAD_UNSAFE_OK if you need thread safety
### for generic gcc:
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/libpng1-SONAME.patch?r1=1.10&r2=1.11&f=u
http://cvs.pld-linux.org/SOURCES/libpng1-opt.patch?r1=1.2&r2=1.3&f=u
More information about the pld-cvs-commit
mailing list