* extras/contrib/src/Makefile, extras/contrib/src/Patches/zlib.patch: added zlib...

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index ff04540f8617255e0744cefec4a90d7c0027f7bc..3fe111609aa1abb0c920c4432ee5563a2c17d2ec 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -141,11 +141,11 @@ else
 
    ifdef HAVE_WINCE
 
-   all: .dvbpsi .ffmpeg
+   all: .dvbpsi .zlib .ffmpeg
    else
 
 # Standard Linux or other UNIX-like systems
-   all: .iconv .intl .freetype .fribidi .zlib\
+   all: .iconv .intl .freetype .fribidi .zlib \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .dts .matroska .ffmpeg .dvdcss \
        .live .goom2k4 .caca .mod .x264  .xml .twolame\
@@ -832,7 +832,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
 #      patch -p 0 < Patches/ffmpeg.patch
 
 ifdef HAVE_WINCE
-.ffmpeg: ffmpeg
+.ffmpeg: ffmpeg .zlib
 else
 .ffmpeg: ffmpeg .faac .lame
 endif
@@ -1243,9 +1243,10 @@ zlib-$(ZLIB_VERSION).tar.gz:
 
 zlib: zlib-$(ZLIB_VERSION).tar.gz
        $(EXTRACT_GZ)
+       patch -p 0 < Patches/zlib.patch
 
 .zlib: zlib
-       (cd zlib; $(HOSTCC2) ./configure  --prefix=$(PREFIX) && make && make  install)
+       (cd zlib; $(HOSTCC2) ./configure  --prefix=$(PREFIX) && make install)
        $(INSTALL_NAME)
        touch $@
 

diff --git a/extras/contrib/src/Patches/zlib.patch b/extras/contrib/src/Patches/zlib.patch
new file mode 100644 (file)
index 0000000..ad579a1
--- /dev/null
+++ b/extras/contrib/src/Patches/zlib.patch
@@ -0,0 +1,13 @@
+--- 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));