Quellenupdate:

* tcpdump/glibc/wget/libpng/vlan/expect/vim Programmupdate: * libpng 1.2.8 --> 1.2.12 * dnsmasq 2.22 --> 2.33 Geandert: * Packager fuer Pakfire angepasst. (Namen mit Unterstrich) * Squid mit 2 Patches versehen. * Konsolentyp: xterm-color Hinzugefuegt: * Subversion 1.3.1 * IPTraf 3.0.0 git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@250 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
2026-05-11 01:38:25 +02:00 · 2006-08-19 11:04:41 +00:00
parent 97520ed5c2
commit 7a98bae5d3
24 changed files with 693 additions and 148 deletions
--- a/src/patches/libpng-1.2.12-no-asm.patch
+++ b/src/patches/libpng-1.2.12-no-asm.patch
@@ -0,0 +1,62 @@
+backport from current 1.4 beta's to handle the bug where the
+PNG_NO_ASSEMBLER_CODE define is not exported properly
+
+http://bugs.gentoo.org/136346
+
+--- libpng-1.2.12/configure.ac
+++ libpng-1.2.12/configure.ac
+@@ -62,15 +62,12 @@
+ AC_TRY_COMPILE(
+   [#include "pnggccrd.c"],
+   [return 0;],
+-  LIBPNG_DEFINES=,
+-  LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG\ -DPNG_NO_ASSEMBLER_CODE)
+-if test "$LIBPNG_DEFINES"; then
+-    AC_MSG_RESULT(no)
+-else
+-    AC_MSG_RESULT(yes)
+-    LIBPNG_DEFINES=-DPNG_CONFIGURE_LIBPNG
+-fi
+  [LIBPNG_NO_ASSEMBLER=yes; LIBPNG_DEFINES=""],
+  [LIBPNG_NO_ASSEMBLER=no ; LIBPNG_DEFINES="-DPNG_NO_ASSEMBLER_CODE=1"])
+LIBPNG_DEFINES="$LIBPNG_DEFINES -DPNG_CONFIGURE_LIBPNG"
+AC_MSG_RESULT($LIBPNG_NO_ASSEMBLER)
+ AC_SUBST(LIBPNG_DEFINES)
+AM_CONDITIONAL(LIBPNG_NO_ASSEMBLER, test "x$LIBPNG_NO_ASSEMBLER" = "xno")
+ 
+ AC_MSG_CHECKING([if libraries can be versioned])
+ GLD=`$LD --help < /dev/null 2>/dev/null | grep version-script`
+--- libpng-1.2.12/Makefile.am
+++ libpng-1.2.12/Makefile.am
+@@ -87,6 +87,14 @@
+ 
+ CLEANFILES= pngout.png libpng12.pc libpng12-config libpng.vers libpng.sym
+
+pngconf.h: pngconf.h.in
+	sed "/Makefile-supplied defines go here:/q" pngconf.h.in > pngconf.h.tmp
+if LIBPNG_NO_ASSEMBLER
+	echo "#define PNG_NO_ASSEMBLER_CODE 1" >> pngconf.h.tmp
+endif
+	sed "1,/Makefile-supplied defines go here:/d" pngconf.h.in >> pngconf.h.tmp
+	mv pngconf.h.tmp pngconf.h
+
+ $(PNGLIB_BASENAME).pc: libpng.pc
+ 	cp libpng.pc $@
+ 
+--- libpng-1.2.12/pngconf.h
+++ libpng-1.2.12/pngconf.h
+@@ -19,6 +19,13 @@
+ 
+ #define PNG_1_2_X
+ 
+/* Backported no-assembler fix from libpng-1.4.0beta8 */
+
+/* Makefile-supplied defines go here: */
+/* End of Makefile-supplied defines. */
+
+/* End of backported no-assembler fix */
+
+ /* 
+  * PNG_USER_CONFIG has to be defined on the compiler command line. This
+  * includes the resource compiler for Windows DLL configurations.
+
--- a/src/patches/libpng-1.2.8-link_to_proper_libs-1.patch
+++ b/src/patches/libpng-1.2.8-link_to_proper_libs-1.patch
@@ -1,58 +0,0 @@
-Submitted By: Bruce Dubbs <bdubbs@linuxfromscratch.org>
-Date: 2004-08-05
-Initial Package Version: 1.2.6
-Origin: http://blfs-bugs.linuxfromscratch.org/show_bug.cgi?id=644
-Description: libpng is not linked against libz and libm. This causes
-             problems for packages that try to link against libpng
-             without including "-lz -lm" in the linker flags.
-
-$LastChangedBy: igor $
-$Date: 2005/02/27 15:23:07 $
-
--- libpng-1.2.8/scripts/libpng.pc.in.orig	2005-01-04 14:06:54.182100728 +0000
-+++ libpng-1.2.8/scripts/libpng.pc.in	2005-01-04 14:07:19.108311368 +0000
-@@ -7,5 +7,5 @@
- Name: libpng12
- Description: Loads and saves PNG files
- Version: 1.2.8
-Libs: -L${libdir} -lpng12 -lz -lm
-+Libs: -L${libdir} -lpng12
- Cflags: -I${includedir}/libpng12
--- libpng-1.2.8/scripts/makefile.linux.orig	2005-01-04 14:07:37.875458328 +0000
-+++ libpng-1.2.8/scripts/makefile.linux	2005-01-04 14:11:03.918135080 +0000
-@@ -34,8 +34,9 @@
- CFLAGS=-I$(ZLIBINC) -Wall -O3 -funroll-loops \
- 	$(ALIGN) # $(WARNMORE) -g -DPNG_DEBUG=5
- 
-LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12 -lz -lm
-LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a -lz -lm
-+LIBS=-lz -lm
-+LDFLAGS=-L. -Wl,-rpath,. -L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) -lpng12
-+LDFLAGS_A=-L$(ZLIBLIB) -Wl,-rpath,$(ZLIBLIB) libpng.a $(LIBS)
- 
- RANLIB=ranlib
- #RANLIB=echo
-@@ -86,7 +87,7 @@
- 	echo I_opts=\"-I$(INCPATH)/$(LIBNAME)\"; \
- 	echo L_opts=\"-L$(LIBPATH)\"; \
- 	echo R_opts=\"-Wl,-rpath,$(LIBPATH)\"; \
-	echo libs=\"-lpng12 -lz -lm\"; \
-+	echo libs=\"-lpng12\"; \
- 	cat scripts/libpng-config-body.in ) > libpng-config
- 	chmod +x libpng-config
- 
-@@ -99,12 +100,12 @@
- $(LIBNAME).so.$(PNGVER): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,$(LIBNAME).so.$(PNGMAJ) \
- 	-o $(LIBNAME).so.$(PNGVER) \
-	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- libpng.so.3.$(PNGMIN): $(OBJSDLL)
- 	$(CC) -shared -Wl,-soname,libpng.so.3 \
- 	-o libpng.so.3.$(PNGMIN) \
-	$(OBJSDLL)
-+	$(OBJSDLL) $(LIBS)
- 
- pngtest: pngtest.o $(LIBNAME).so
- 	$(CC) -o pngtest $(CFLAGS) pngtest.o $(LDFLAGS)