Commit 94762fed authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files

Update the libpng patches

parent c73a3a69
# ***************************************************************************
#***************************************************************************
# src/Makefile : Dearchive and compile all files necessary
# ***************************************************************************
# Copyright (C) 2003 - 2006 the VideoLAN team
......@@ -1356,7 +1356,7 @@ zlib: zlib-$(ZLIB_VERSION).tar.gz
patch -p 0 < Patches/zlib.patch
.zlib: zlib
(cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install)
(cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install)
$(INSTALL_NAME)
touch $@
......@@ -1447,7 +1447,10 @@ ifdef HAVE_WIN32
else
(cat Patches/libpng-osx.patch | sed -e 's%??PREFIX??%$(PREFIX)%' -e 's%??EXTRA_CFLAGS??%$(EXTRA_CFLAGS)%' -e 's%??EXTRA_LDFLAGS??%$(EXTRA_LDFLAGS)%' | patch -p0)
endif
(patch -p 0 < Patches/libpng-1.2.8-makefile.patch)
(patch -p 0 < Patches/libpng-makefile.patch)
ifeq ($(HOST),i686-apple-darwin8)
(patch -p 0 < Patches/libpng-darwin-mactel.patch)
endif
.png: libpng
ifdef HAVE_DARWIN_OS
......
diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng-1.2.12b/scripts/makefile.darwin
--- libpng/scripts/makefile.darwin 2006-06-27 22:22:40.000000000 +0200
+++ libpng/scripts/makefile.darwin 2006-07-27 09:57:03.000000000 +0200
@@ -63,7 +63,7 @@
OBJS = png.o pngset.o pngget.o pngrutil.o pngtrans.o pngwutil.o \
pngread.o pngrio.o pngwio.o pngwrite.o pngrtran.o \
- pngwtran.o pngmem.o pngerror.o pngpread.o
+ pngwtran.o pngmem.o pngerror.o pngpread.o pnggccrd.o
OBJSDLL = $(OBJS:.o=.pic.o)
@@ -226,5 +226,6 @@
pngwtran.o pngwtran.pic.o: png.h pngconf.h
pngwutil.o pngwutil.pic.o: png.h pngconf.h
pngpread.o pngpread.pic.o: png.h pngconf.h
+pnggccrd.o pnggccrd.pic.o: png.h pngconf.h
pngtest.o: png.h pngconf.h
diff -ruN libpng-1.2.12/scripts/makefile.darwin libpng/scripts/makefile.darwin
--- libpng-1.2.12/scripts/makefile.darwin 2006-06-27 22:22:40.000000000 +0200
+++ libpng/scripts/makefile.darwin 2006-07-25 13:28:44.000000000 +0200
@@ -7,7 +7,7 @@
+++ libpng/scripts/makefile.darwin 2006-07-27 12:07:18.000000000 +0200
@@ -7,14 +7,14 @@
# For conditions of distribution and use, see copyright notice in png.h
# where "make install" puts libpng.a, libpng12.dylib, png.h and pngconf.h
......@@ -9,6 +10,17 @@
exec_prefix=$(prefix)
# 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
+#ZLIBLIB=../zlib
+#ZLIBINC=../zlib
# Library name:
LIBNAME = libpng12
@@ -38,8 +38,8 @@
RANLIB=ranlib
RM_F=/bin/rm -f
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment