Author: qboosh Date: Fri Jul 21 08:55:21 2006 GMT
Module: SOURCES Tag: HEAD
---- Log message:
- updated for 1.0.20
---- Files affected:
SOURCES:
libpng1-SONAME.patch (1.4 -> 1.5) , libpng1-libdirfix.patch (1.1 -> 1.2)
---- Diffs:
================================================================
Index: SOURCES/libpng1-SONAME.patch
diff -u SOURCES/libpng1-SONAME.patch:1.4 SOURCES/libpng1-SONAME.patch:1.5
--- SOURCES/libpng1-SONAME.patch:1.4 Sat Dec 4 16:51:01 2004
+++ SOURCES/libpng1-SONAME.patch Fri Jul 21 10:55:16 2006
@@ -1,17 +1,17 @@
---- libpng-1.0.17/scripts/makefile.linux.orig 2004-10-15 13:34:40.000000000
+0200
-+++ libpng-1.0.17/scripts/makefile.linux 2004-10-15 13:40:18.000000000
+0200
-@@ -3,8 +3,8 @@
- # Copyright (C) 1996, 1997 Andreas Dilger
+--- libpng-1.0.20/scripts/makefile.linux.orig 2006-07-21 10:38:38.364440000
+0200
++++ libpng-1.0.20/scripts/makefile.linux 2006-07-21 10:46:22.724440000
+0200
+@@ -4,8 +4,8 @@
# For conditions of distribution and use, see copyright notice in png.h
+ # Library name:
-LIBNAME = libpng10
-PNGMAJ = 0
+LIBNAME = libpng
+PNGMAJ = 2
- PNGMIN = 1.0.18
+ PNGMIN = 1.0.20
PNGVER = $(PNGMAJ).$(PNGMIN)
-@@ -34,7 +34,7 @@
+@@ -50,7 +50,7 @@
CFLAGS= $(OPT_FLAGS) -Wall -funroll-loops \
$(ALIGN) # $(WARNMORE) -DPNG_DEBUG=5
@@ -19,91 +19,96 @@
+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng -lz -lm
LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
- RANLIB=ranlib
-@@ -97,14 +97,13 @@
- 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.2.$(PNGMIN): $(OBJSDLL)
-- $(CC) -shared -Wl,-soname,libpng.so.2 \
-- -o libpng.so.2.$(PNGMIN) \
-- $(OBJSDLL)
-+libpng10.so.0.$(PNGMIN): $(LIBNAME).so.$(PNGVER)
+ INCPATH=$(prefix)/include
+@@ -110,12 +110,16 @@
+ $(LN_SF) $(LIBSOVER) $(LIBSOMAJ)
+
+ $(LIBSOVER): $(OBJSDLL)
+- $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(OBJSDLL)
++ $(CC) -shared -Wl,-soname,$(LIBSOMAJ) -o $(LIBSOVER) $(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
- pngtest: pngtest.o $(LIBNAME).so
+ $(OLDSOVER): $(OBJSDLL)
+ $(CC) -shared -Wl,-soname,$(OLDSOMAJ) \
+ -o $(OLDSOVER) \
+- $(OBJSDLL)
++ $(OBJSDLL) -lz -lm
+
+ pngtest: pngtest.o $(LIBSO)
$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)
-@@ -124,43 +123,42 @@
+@@ -135,43 +139,42 @@
install-headers: png.h pngconf.h
- [EMAIL PROTECTED] [ ! -d $(DI) ]; then mkdir $(DI); fi
-- [EMAIL PROTECTED] [ ! -d $(DI)/$(LIBNAME) ]; then mkdir
$(DI)/$(LIBNAME); fi
+ [EMAIL PROTECTED] [ ! -d $(DI) ]; then $(MKDIR_P) $(DI); fi
+- [EMAIL PROTECTED] [ ! -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
-+ [EMAIL PROTECTED] [ ! -d $(DI)/libpng10 ]; then mkdir $(DI)/libpng10; fi
++ [EMAIL PROTECTED] [ ! -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
- -@/bin/rm -f $(DI)/png.h $(DI)/pngconf.h
- -@/bin/rm -f $(DI)/libpng
-- (cd $(DI); ln -sf $(LIBNAME) libpng; ln -sf $(LIBNAME)/* .)
-+ (cd $(DI); ln -sf libpng10 libpng; ln -sf libpng10/* .)
+ [EMAIL PROTECTED](RM_F) $(DI)/png.h $(DI)/pngconf.h
+ [EMAIL PROTECTED](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
- [EMAIL PROTECTED] [ ! -d $(DL) ]; then mkdir $(DL); fi
+ [EMAIL PROTECTED] [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
cp libpng.a $(DL)/$(LIBNAME).a
chmod 644 $(DL)/$(LIBNAME).a
-- -@/bin/rm -f $(DL)/libpng.a
-- (cd $(DL); ln -sf $(LIBNAME).a libpng.a)
-+ -@/bin/rm -f $(DL)/libpng10.a
-+ (cd $(DL); ln -sf $(LIBNAME).a libpng10.a)
+- [EMAIL PROTECTED](RM_F) $(DL)/libpng.a
+- (cd $(DL); $(LN_SF) $(LIBNAME).a libpng.a)
++ [EMAIL PROTECTED](RM_F) $(DL)/libpng10.a
++ (cd $(DL); $(LN_SF) $(LIBNAME).a libpng10.a)
- install-shared: install-headers $(LIBNAME).so.$(PNGVER) libpng.pc \
-- libpng.so.2.$(PNGMIN)
+ install-shared: install-headers $(LIBSOVER) libpng.pc \
+- $(OLDSOVER)
+ libpng10.so.0.$(PNGMIN)
- [EMAIL PROTECTED] [ ! -d $(DL) ]; then mkdir $(DL); fi
- -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGVER)* $(DL)/$(LIBNAME).so
-- -@/bin/rm -f $(DL)/$(LIBNAME).so.$(PNGMAJ)
-- -@/bin/rm -f $(DL)/libpng.so
-- -@/bin/rm -f $(DL)/libpng.so.2
-- -@/bin/rm -f $(DL)/libpng.so.2.$(PNGMIN)*
-+ -@/bin/rm -f $(DL)/libpng10.so
-+ -@/bin/rm -f $(DL)/libpng10.so.0
-+ -@/bin/rm -f $(DL)/libpng10.so.0.$(PNGMIN)*
- cp $(LIBNAME).so.$(PNGVER) $(DL)
- cp libpng.so.2.$(PNGMIN) $(DL)
- chmod 755 $(DL)/$(LIBNAME).so.$(PNGVER)
-- chmod 755 $(DL)/libpng.so.2.$(PNGMIN)
+ [EMAIL PROTECTED] [ ! -d $(DL) ]; then $(MKDIR_P) $(DL); fi
+ [EMAIL PROTECTED](RM_F) $(DL)/$(LIBSOVER)* $(DL)/$(LIBSO)
+ [EMAIL PROTECTED](RM_F) $(DL)/$(LIBSOMAJ)
+- [EMAIL PROTECTED](RM_F) $(DL)/$(OLDSO)
+- [EMAIL PROTECTED](RM_F) $(DL)/$(OLDSOMAJ)
+- [EMAIL PROTECTED](RM_F) $(DL)/$(OLDSOVER)*
++ [EMAIL PROTECTED](RM_F) $(DL)/libpng10.so
++ [EMAIL PROTECTED](RM_F) $(DL)/libpng10.so.0
++ [EMAIL PROTECTED](RM_F) $(DL)/libpng10.so.0.$(PNGMIN)*
+ cp $(LIBSOVER) $(DL)
+- cp $(OLDSOVER) $(DL)
+ chmod 755 $(DL)/$(LIBSOVER)
+- chmod 755 $(DL)/$(OLDSOVER)
(cd $(DL); \
-- ln -sf libpng.so.2.$(PNGMIN) libpng.so.2; \
-- ln -sf libpng.so.2 libpng.so; \
+- $(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 $(LIBNAME).so.$(PNGVER) $(LIBNAME).so.$(PNGMAJ); \
- ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so)
- [EMAIL PROTECTED] [ ! -d $(DL)/pkgconfig ]; then mkdir $(DL)/pkgconfig;
fi
- -@/bin/rm -f $(DL)/pkgconfig/$(LIBNAME).pc
-- -@/bin/rm -f $(DL)/pkgconfig/libpng.pc
-+ -@/bin/rm -f $(DL)/pkgconfig/libpng10.pc
+ $(LN_SF) $(LIBSOVER) $(LIBSOMAJ); \
+ $(LN_SF) $(LIBSOMAJ) $(LIBSO))
+ [EMAIL PROTECTED] [ ! -d $(DL)/pkgconfig ]; then $(MKDIR_P)
$(DL)/pkgconfig; fi
+ [EMAIL PROTECTED](RM_F) $(DL)/pkgconfig/$(LIBNAME).pc
+- [EMAIL PROTECTED](RM_F) $(DL)/pkgconfig/libpng.pc
++ [EMAIL PROTECTED](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)
+- (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
- [EMAIL PROTECTED] [ ! -d $(DM) ]; then mkdir $(DM); fi
-@@ -179,7 +177,7 @@
- -@/bin/rm -f $(DB)/$(LIBNAME)-config
+ [EMAIL PROTECTED] [ ! -d $(DM) ]; then $(MKDIR_P) $(DM); fi
+@@ -186,11 +189,11 @@
+
+ install-config: libpng-config
+ [EMAIL PROTECTED] [ ! -d $(DB) ]; then $(MKDIR_P) $(DB); fi
+- [EMAIL PROTECTED](RM_F) $(DB)/libpng-config
++ [EMAIL PROTECTED](RM_F) $(DB)/libpng10-config
+ [EMAIL PROTECTED](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)
+- (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
================================================================
Index: SOURCES/libpng1-libdirfix.patch
diff -u SOURCES/libpng1-libdirfix.patch:1.1 SOURCES/libpng1-libdirfix.patch:1.2
--- SOURCES/libpng1-libdirfix.patch:1.1 Thu Jul 8 22:32:03 2004
+++ SOURCES/libpng1-libdirfix.patch Fri Jul 21 10:55:16 2006
@@ -5,7 +5,7 @@
libpng.pc:
- cat scripts/libpng.pc.in | sed -e [EMAIL PROTECTED]@!$(prefix)! >
libpng.pc
-+ cat scripts/libpng.pc.in | sed -e [EMAIL PROTECTED]@!$(prefix)! -e
[EMAIL PROTECTED]@!$(LIBPATH)! > libpng.pc
++ cat scripts/libpng.pc.in | sed -e [EMAIL PROTECTED]@!$(prefix)! -e
[EMAIL PROTECTED]@!$(exec_prefix)! -e [EMAIL PROTECTED]@!$(LIBPATH)! -e [EMAIL
PROTECTED]@!$(INCPATH)! > libpng.pc
$(LIBNAME).so: $(LIBNAME).so.$(PNGMAJ)
ln -sf $(LIBNAME).so.$(PNGMAJ) $(LIBNAME).so
@@ -16,18 +16,7 @@
libpng.pc:
- cat scripts/libpng.pc.in | sed -e [EMAIL PROTECTED]@!$(prefix)! >
libpng.pc
-+ cat scripts/libpng.pc.in | sed -e [EMAIL PROTECTED]@!$(prefix)! -e
[EMAIL PROTECTED]@!$(LIBPATH)! > libpng.pc
++ cat scripts/libpng.pc.in | sed -e [EMAIL PROTECTED]@!$(prefix)! -e
[EMAIL PROTECTED]@!$(exec_prefix)! -e [EMAIL PROTECTED]@!$(LIBPATH)! -e [EMAIL
PROTECTED]@!$(INCPATH)! > 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 @@
-
- [EMAIL PROTECTED]@
- exec_prefix=${prefix}
--libdir=${exec_prefix}/lib
[EMAIL PROTECTED]@
- includedir=${exec_prefix}/include
-
- Name: libpng12
================================================================
---- CVS-web:
http://cvs.pld-linux.org/SOURCES/libpng1-SONAME.patch?r1=1.4&r2=1.5&f=u
http://cvs.pld-linux.org/SOURCES/libpng1-libdirfix.patch?r1=1.1&r2=1.2&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
