vlc | branch: master | Jean-Baptiste Kempf <[email protected]> | Mon Jul 4 02:40:34 2011 +0200| [aa6fdc1cb16ef477bbaa8d319c6870061f9b7105] | committer: Jean-Baptiste Kempf
Contribs: add zlib Same, not libav* enabled > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=aa6fdc1cb16ef477bbaa8d319c6870061f9b7105 --- contrib/src/zlib/SHA512SUMS | 1 + contrib/src/zlib/rules.mak | 22 ++++++++++++++++++++++ contrib/src/zlib/zlib-static.patch | 11 +++++++++++ contrib/src/zlib/zlib-wince.patch | 13 +++++++++++++ 4 files changed, 47 insertions(+), 0 deletions(-) diff --git a/contrib/src/zlib/SHA512SUMS b/contrib/src/zlib/SHA512SUMS new file mode 100644 index 0000000..c119f1a --- /dev/null +++ b/contrib/src/zlib/SHA512SUMS @@ -0,0 +1 @@ +83ce467787903b7e90ece203aaea0be42174b9cf4a9aa16fe3f72925a4993b549d50154dec4cc76b4cb1aa0b7b966118772aca3d73efa0601167256ff7ce7a12 zlib-1.2.5.tar.gz diff --git a/contrib/src/zlib/rules.mak b/contrib/src/zlib/rules.mak new file mode 100644 index 0000000..426847d --- /dev/null +++ b/contrib/src/zlib/rules.mak @@ -0,0 +1,22 @@ +# ZLIB +ZLIB_VERSION := 1.2.5 +ZLIB_URL := $(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz + +PKGS += zlib + +$(TARBALLS)/zlib-$(ZLIB_VERSION).tar.gz: + $(call download,$(ZLIB_URL)) + +.sum-zlib: zlib-$(ZLIB_VERSION).tar.gz + +zlib: zlib-$(ZLIB_VERSION).tar.gz .sum-zlib + $(UNPACK) + $(APPLY) $(SRC)/zlib/zlib-wince.patch + $(APPLY) $(SRC)/zlib/zlib-static.patch + $(MOVE) + +.zlib: zlib + #$(RECONF) + cd $< && $(HOSTVARS) ./configure --prefix=$(PREFIX) --static + cd $< && $(MAKE) install + touch $@ diff --git a/contrib/src/zlib/zlib-static.patch b/contrib/src/zlib/zlib-static.patch new file mode 100644 index 0000000..c85f4a7 --- /dev/null +++ b/contrib/src/zlib/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/contrib/src/zlib/zlib-wince.patch b/contrib/src/zlib/zlib-wince.patch new file mode 100644 index 0000000..e9bffb9 --- /dev/null +++ b/contrib/src/zlib/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 _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
