Contrib: update zlib to 1.2.5

And patch it again and again...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ce4574d2090fa392aa61ef33bf69264168ef5efd..0d488e8cb11e9d35e0e0f7d802690c2578850abf 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1112,7 +1112,7 @@ else
 ifdef HAVE_UCLIBC
 .ffmpeg: ffmpeg
 else
-.ffmpeg: ffmpeg .lame .gsm .libvpx
+.ffmpeg: ffmpeg .lame .gsm .libvpx .zlib
 endif
 endif
        (cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DHAVE_STDINT_H" --extra-ldflags="$(LDFLAGS)" $(FFMPEGCONF) --disable-shared --enable-static && make && make install-libs install-headers)
@@ -1614,10 +1614,11 @@ zlib-$(ZLIB_VERSION).tar.gz:
 
 zlib: zlib-$(ZLIB_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p0 < Patches/zlib.patch
+       patch -p0 < Patches/zlib-wince.patch
+       patch -p0 < Patches/zlib-static.patch
 
 .zlib: zlib
-       (cd zlib; $(HOSTCC2) ./configure --prefix=$(PREFIX) && make install)
+       (cd zlib; $(HOSTCC) ./configure --prefix=$(PREFIX) --static && make install)
        $(INSTALL_NAME)
        touch $@
 

diff --git a/extras/contrib/src/Patches/zlib-static.patch b/extras/contrib/src/Patches/zlib-static.patch
new file mode 100644 (file)
index 0000000..c85f4a7
--- /dev/null
+++ b/extras/contrib/src/Patches/zlib-static.patch
@@ -0,0 +1,11 @@
+--- zlib/Makefile.in   2010-04-20 06:12:21.000000000 +0200
++++ zlib.new/Makefile.in       2010-06-08 14:02:43.000000000 +0200
+@@ -168,7 +168,7 @@
+       -@if [ ! -d $(DESTDIR)$(man3dir)      ]; then mkdir -p $(DESTDIR)$(man3dir); fi
+       -@if [ ! -d $(DESTDIR)$(pkgconfigdir) ]; then mkdir -p $(DESTDIR)$(pkgconfigdir); fi
+       cp $(STATICLIB) $(DESTDIR)$(libdir)
+-      cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir)
++      cp $(SHAREDLIBV) $(DESTDIR)$(sharedlibdir) || true >/dev/null 2>&1
+       cd $(DESTDIR)$(libdir); chmod u=rw,go=r $(STATICLIB)
+       -@(cd $(DESTDIR)$(libdir); $(RANLIB) libz.a || true) >/dev/null 2>&1
+       -@cd $(DESTDIR)$(sharedlibdir); if test "$(SHAREDLIBV)" -a -f $(SHAREDLIBV); then \

diff --git a/extras/contrib/src/Patches/zlib-wince.patch b/extras/contrib/src/Patches/zlib-wince.patch
new file mode 100644 (file)
index 0000000..e9bffb9
--- /dev/null
+++ b/extras/contrib/src/Patches/zlib-wince.patch
@@ -0,0 +1,13 @@
+--- zlib/zutil.h       2010-04-18 21:29:24.000000000 +0200
++++ zlib.new/zutil.h   2010-06-08 13:53:03.000000000 +0200
+@@ -153,6 +153,10 @@
+ #  endif
+ #endif
+ 
++#if defined(_WIN32_WCE)
++#    define fdopen(fd,mode) NULL /* No fdopen() */
++#endif
++
+ #if defined(__BORLANDC__)
+   #pragma warn -8004
+   #pragma warn -8008

diff --git a/extras/contrib/src/Patches/zlib.patch b/extras/contrib/src/Patches/zlib.patch
deleted file mode 100644 (file)
index d2b07b0..0000000
--- a/extras/contrib/src/Patches/zlib.patch
+++ /dev/null
@@ -1,26 +0,0 @@
---- zlib/gzio.c        2005-07-11 21:31:48.000000000 +0100
-+++ zlib/gzio.c        2005-11-22 22:26:26.000000000 +0000
-@@ -35,6 +35,10 @@
-    FILE *fdopen(int, const char *);
- #endif
- 
-+#ifdef UNDER_CE
-+#   define fdopen(fd, fmode) 0
-+#endif
-+
- #ifndef STDC
- extern voidp  malloc OF((uInt size));
- extern void   free   OF((voidpf ptr));
-===================================================================
---- zlib/zutil.h       2005-11-27 20:05:31.000000000 +0000
-+++ zlib/zutil.h       2005-11-27 20:06:16.000000000 +0000
-@@ -36,6 +36,9 @@
- #else
- #  ifndef _WIN32_WCE
- #    include <errno.h>
-+#  else
-+#    define errno z_errno
-+     extern int errno;
- #  endif
- #endif
- 

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 5dd45377b3e0ddec5c9ef9840d59bba1039d7dca..2cf11cd7efd49d9b0a7e97d9b1d91a743838cfc6 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -178,7 +178,7 @@ QT4_MAC_VERSION=4.5.2
 QT4_MAC_URL=http://get.qtsoftware.com/qt/source/qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
 QT4T_VERSION=4.3.2
 QT4T_URL=ftp://ftp.trolltech.com/pub/qt/source/qt-win-opensource-$(QT4T_VERSION)-mingw.exe
-ZLIB_VERSION=1.2.3
+ZLIB_VERSION=1.2.5
 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
 XML_VERSION=2.7.7
 #XML_URL=$(CONTRIB_VIDEOLAN)/libxml2-$(XML_VERSION).tar.gz