stage 4 package updates

[hdw-linux/hdw-linux.git] / packages / multimedia / libpng / makefile.linux.patch

diff --git a/packages/multimedia/libpng/makefile.linux.patch b/packages/multimedia/libpng/makefile.linux.patch
index 66df703..fa89243 100644 (file)
--- a/packages/multimedia/libpng/makefile.linux.patch
+++ b/packages/multimedia/libpng/makefile.linux.patch
@@ -1,19 +1,47 @@
---- old/scripts/makefile.linux.orig    Wed Aug 21 20:30:34 2002
-+++ new/scripts/makefile.linux Wed Aug 21 20:34:25 2002
-@@ -13,13 +13,13 @@
- # where "make install" puts libpng12.a, libpng12.so*,
- # libpng12/png.h and libpng12/pngconf.h
- # Prefix must be a full pathname.
--prefix=/usr/local
-+prefix=/usr
+--- 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
  
- # 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=/usr/include
+-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)
  
- ALIGN=
- # for i386:
+ 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)