Fix incorrect hash size limit

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 3073de72a292b0ce5027b2560fecd12b4e1ed977..9809feeb632e9d8e52e5e57ef8a9bcbf79c80300 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -101,12 +101,12 @@ ifneq ($(BUILD),$(HOST))
     #
     ifndef HAVE_CYGWIN
         # We are REALLY cross compiling
-        FFMPEGCONF=--cross-prefix=$(HOST)-
+        FFMPEGCONF=--cross-prefix=$(HOST)- --cross-compile
         X264CONF=--crosscompile=$(HOST)
-           PTHREADSCONF="CROSS=$(HOST)-"
+        PTHREADSCONF="CROSS=$(HOST)-"
     else
         # We are compiling for MinGW on Cygwin
-           PTHREADSCONF=$(HOSTCC)
+        PTHREADSCONF=$(HOSTCC)
     endif
 endif
 
@@ -121,8 +121,18 @@ endif
 ifdef HAVE_WINCE
 HOSTCONF+= --without-pic --disable-shared
 FFMPEGCONF+= --enable-mingwce --cpu=armv4l --disable-debug --disable-encoders --disable-muxers --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols
+endif
+
+ifdef HAVE_UCLIBC
+ifdef HAVE_BIGENDIAN
+FFMPEGCONF+= --arch=armeb
+else
+FFMPEGCONF+= --arch=armv4l
+endif
+FFMPEGCONF+= --enable-small --disable-debug --disable-encoders --disable-muxers --disable-demuxer=mpegts --disable-v4l --disable-v4l2 --disable-bktr --disable-dv1394 --disable-mpegaudio-hp --disable-decoder=snow --disable-decoder=vc9 --disable-decoder=wmv3 --disable-decoder=vorbis --disable-decoder=dvdsub --disable-decoder=dvbsub --disable-protocols --disable-encoders
+FFMPEG_CFLAGS += -DHAVE_LRINTF --std=c99
 else
-FFMPEGCONF+= --enable-libmp3lame --enable-libfaac
+FFMPEGCONF+= --enable-libmp3lame --enable-libfaac --enable-liba52
 endif
 
 ifdef HAVE_BEOS
@@ -157,7 +167,7 @@ FORCE:
 
 define EXTRACT_GZ
        rm -rf $@ || true
-       tar xzf $< --exclude='[*?:<>\|]' 
+       gunzip -c $< | tar xf - --exclude='[*?:<>\|]' 
        mv $(patsubst %.tar.gz,%,$(patsubst %.tgz,%,$(notdir $<))) $@ || true
        touch $@
 endef
@@ -363,7 +373,7 @@ endif
 ifdef HAVE_WIN32
        ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-relocatable --with-iconv-prefix=$(PREFIX) --disable-java --disable-native-java)
 else
-       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java)
+       ( cd $< && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-java --disable-native-java --without-emacs)
 endif
 ifeq ($(BUILD),i586-pc-beos)
 # The ugliest kludge ever - so libtool correctly links shared libraries
@@ -379,7 +389,7 @@ else
 endif
 # Work around another non-sense of autoconf.
 ifdef HAVE_WIN32
-       (cd ../include; sed -i.orig '311 c #if !1' libintl.h)
+       (cd ../include; sed -i.orig '311 c #if 0' libintl.h)
 endif
        $(INSTALL_NAME)
        touch $@
@@ -400,6 +410,7 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/libiconv.patch
 endif
+       patch -p0 < Patches/libiconv-autoconf-uclibc.patch
 
 ifdef HAVE_DARWIN_OS
 .iconv:
@@ -442,15 +453,19 @@ DISTCLEAN_PKG += freetype-$(FREETYPE2_VERSION).tar.gz
 # fribidi
 # ***************************************************************************
 
-fribidi-$(FRIBIDI_VERSION).tar.gz:
+fribidi-$(FRIBIDI_VERSION).tar.bz2:
        $(WGET) $(FRIBIDI_URL)
 
-fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
-       $(EXTRACT_GZ)
+fribidi: fribidi-$(FRIBIDI_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        patch -p0 < Patches/fribidi.patch.real
 ifdef HAVE_WIN32
        patch -p0 <Patches/fribidi-win32.patch
 endif
+ifdef HAVE_UCLIBC
+       patch -p0 < Patches/fribidi-uclibc.patch
+endif
+
 .fribidi: fribidi .iconv
        (cd $<; rm -f configure; ./bootstrap && $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX)  && make && make install)
        $(INSTALL_NAME)
@@ -458,7 +473,7 @@ endif
 
 CLEAN_FILE += .fribidi
 CLEAN_PKG += fribidi
-DISTCLEAN_PKG += fribidi-$(FRIBIDI_VERSION).tar.gz
+DISTCLEAN_PKG += fribidi-$(FRIBIDI_VERSION).tar.bz2
 
 # ***************************************************************************
 # liba52
@@ -908,6 +923,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 ffmpeg:
        $(SVN) export $(FFMPEG_SVN)  ffmpeg
        (cd "$@" && patch -p1 < ../Patches/ffmpeg-svn-nofile.patch)
+       (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch)
 ifeq ($(HOST),i586-pc-beos)
        (cd $@; patch -p0 < ../Patches/ffmpeg-svn-beos.patch)
 endif
@@ -917,6 +933,11 @@ endif
 ifdef HAVE_BEOS
        (cd $@; patch -p0 < ../Patches/ffmpeg-alignment.patch)
 endif
+ifdef HAVE_UCLIBC
+       patch -p0 < Patches/ffmpeg-svn-uclibc.patch
+       patch -p0 < Patches/ffmpeg-svn-internal-define.patch
+       patch -p0 < Patches/ffmpeg-svn-grab.patch
+endif
 
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
        $(WGET) $(FFMPEG_URL)
@@ -928,9 +949,13 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
 else
+ifdef HAVE_UCLIBC
+.ffmpeg: ffmpeg
+else
 .ffmpeg: ffmpeg .faac .lame
 endif
-       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-network --enable-liba52 --disable-ffplay && make && make install-libs install-headers)
+endif
+       (cd $<; $(HOSTCC) ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) $(FFMPEG_CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-pp --disable-vhook --disable-ffserver --disable-ffmpeg --disable-network --disable-ffplay && make && make install-libs install-headers)
        touch $@
 
 ifdef SVN
@@ -1082,6 +1107,9 @@ ifdef HAVE_DARWIN_OS
 endif
        patch -p0 < Patches/live-starttime.patch
        patch -p0 < Patches/live-config.patch
+ifdef HAVE_UCLIBC
+       patch -p0 < Patches/live-noapps.patch
+endif
 
 .live: live
 ifdef HAVE_WIN32 
@@ -1095,9 +1123,15 @@ ifdef HAVE_DARWIN_OS
        (cd $<; ./genMakefiles macosx && make)
 else
        (cd $<; sed -e 's/=/= EXTRA_CPPFLAGS/' -e 's%EXTRA_CPPFLAGS%-I/include%' -i.orig groupsock/Makefile.head)
+ifdef HAVE_UCLIBC
+ifdef HAVE_BIGENDIAN
+       (cd $<; ./genMakefiles armeb-uclibc && make $(HOSTCC))
+endif
+else
        (cd $<; ./genMakefiles linux && make $(HOSTCC))
 endif
 endif
+endif
 endif
        touch $@
 
@@ -1181,25 +1215,19 @@ DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz
 # libdca
 # ***************************************************************************
 
-libdca:
-       $(SVN) export $(LIBDCA_SVN) libdca
-       (cd $@; ./bootstrap)
+libdca-$(LIBDCA_VERSION).tar.bz2:
+       $(WGET) $(LIBDCA_URL)
+
+libdca: libdca-$(LIBDCA_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
 
-.libdca: libdca
+.dca: libdca
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
        touch $@
 
-ifdef SVN
-libdca-source: libdca
-       cd libdca;   find . -depth -iname ".svn" -exec rm -rf {} \;
-       cd ..;
-       tar cfvz libdca-$(DATE).tar.gz libdca
-
-SOURCE += libdca-source
-endif
-
-CLEAN_FILE += .libdca
+CLEAN_FILE += .dca
 CLEAN_PKG += libdca
+DISTCLEAN_PKG += libdca-$(LIBDCA_VERSION).tar.bz2
 
 # ***************************************************************************
 # libx264
@@ -1377,7 +1405,12 @@ qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz
 
 
 .qt4: qt4
-       (cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib;cp bin/rcc bin/uic bin/moc $(PREFIX)/bin)
+       (cd qt4;mkdir -p $(PREFIX)/bin; mkdir -p $(PREFIX)/include;mkdir -p $(PREFIX)/lib/pkgconfig;rm -f $(PREFIX)/lib/pkgconfig/Qt*; sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtCore.pc.in > $(PREFIX)/lib/pkgconfig/QtCore.pc;sed 's,@@PREFIX@@,$(PREFIX),' lib/pkgconfig/QtGui.pc.in > $(PREFIX)/lib/pkgconfig/QtGui.pc;cp -r include/* $(PREFIX)/include;cp lib/*a $(PREFIX)/lib)
+ifeq ($(BUILD),i686-pc-cygwin)
+       (cd qt4;cp bin/*.exe $(PREFIX)/bin)
+else
+       (cd qt4;cp bin/* $(PREFIX)/bin)
+endif
        touch $@
 
 CLEAN_FILE += .qt4
@@ -1441,6 +1474,9 @@ ifdef HAVE_WIN32
        patch -p0 < Patches/xml2-win32.patch
        rm -f xml/aclocal.m4
 endif
+ifdef HAVE_UCLIBC
+       patch -p0 < Patches/xml2-uclibc.patch
+endif
 
 .xml: xml
        (cd xml; CFLAGS="-DLIBXML_STATIC" $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-minimal --with-catalog --with-reader --with-tree --with-push --with-xptr --with-valid --with-xpath --with-xinclude --with-sax1 --without-zlib --without-iconv --without-http --without-ftp && make && make install)
@@ -1562,12 +1598,12 @@ libraw1394: libraw1394-$(LIBRAW1394_VERSION).tar.gz
        $(EXTRACT_GZ)
 #endif
 
-.libraw1394: libraw1394
+.raw1394: libraw1394
        (cd $<; ./configure --prefix=$(PREFIX) && make && make DESTDIR=$(PRFIX) install)
 #      sed 's/^typedef u_int8_t  byte_t;/\/* typedef u_int8_t  byte_t;\*\//'
        touch $@
        
-CLEAN_file += .libraw1394
+CLEAN_file += .raw1394
 CLEAN_PKG += libraw1394
 DISTCLEAN_PKG += libraw1394-$(LIBRAW1394_VERSION).tar.gz
 
@@ -1593,23 +1629,22 @@ libdc1394: libdc1394-$(LIBDC1394_VERSION).tar.gz
        $(EXTRACT_GZ)
 #endif
 
-.libdc1394: libdc1394
+.dc1394: libdc1394
        (cd $<; ./configure --prefix=$(PREFIX) && \
         patch -p1 < ../Patches/libdc1394-noexamples.patch && \
         make && make DESTDIR=$(PRFIX) install)
        touch $@
        
-CLEAN_file += .libdc1394
+CLEAN_file += .dc1394
 CLEAN_PKG += libdc1394
 DISTCLEAN_PKG += libdc1394-$(LIBDC1394_VERSION).tar.gz
 
 # ***************************************************************************
-libgpg-error-$(GPGERROR_VERSION).tar.gz:
+libgpg-error-$(GPGERROR_VERSION).tar.bz2:
        $(WGET) $(GPGERROR_URL)
 
-libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.gz
-       $(EXTRACT_GZ)
-       patch -p0 < Patches/libgpg-error.patch
+libgpg-error: libgpg-error-$(GPGERROR_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
 ifdef HAVE_WIN32
        patch -p0 < Patches/libgpg-error-win32.patch
 endif
@@ -1624,7 +1659,7 @@ endif
 
 CLEAN_FILE += .gpg-error
 CLEAN_PKG += libgpg-error
-DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.gz
+DISTCLEAN_PKG += libgpg-error-$(GPGERROR_VERSION).tar.bz2
 
 # ***************************************************************************
 # libgcrypt
@@ -1729,11 +1764,11 @@ libIDL-$(LIBIDL_VERSION).tar.gz:
 libIDL: libIDL-$(LIBIDL_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.libidl: libIDL
+.IDL: libIDL
        (cd $<; ./configure --prefix=$(PREFIX) --host=powerpc-apple-macos && make && make install )
        touch $@
 
-CLEAN_FILE += .libidl
+CLEAN_FILE += .IDL
 CLEAN_PKG += libIDL
 DISTCLEAN_PKG += libIDL-$(LIBIDL_VERSION).tar.gz
 
@@ -1890,7 +1925,7 @@ libmpcdec-$(MUSE_VERSION).tar.bz2:
 mpcdec: libmpcdec-$(MUSE_VERSION).tar.bz2 
        $(EXTRACT_BZ2)
        patch -p0 < Patches/mpcdec.patch
-       (cd $@; ./autogen.sh)
+       (cd $@; autoreconf -vif)
 
 .mpcdec: mpcdec
 ifdef HAVE_WIN32 
@@ -2109,6 +2144,9 @@ clean: clean-dots
 clean-src: clean
        rm -rf $(DISTCLEAN_PKG)
 
+clean-svn:
+       rm -rf ffmpeg tremor libebml libmatroska x264 libdca
+
 distclean: clean-src
 
 source: $(SOURCE) $(DISTCLEAN_PKG)