contribs: Reverts [22188] for the goom patch, and use the included m4 files

[vlc] / extras / contrib / src / Makefile

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 5bb7ddb4132667024778ad99fd5b09872bf50751..b55d08cba46d4bef9467dca3937af96ba4ea153b 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -71,6 +71,10 @@ endif
 ifneq ($(AR),)
 HOSTCC+= AR="$(AR)"
 endif
+ifneq ($(STRIP),)
+HOSTCC+= STRIP="$(STRIP)"
+endif
+
 
 # Define ranlib on non-cross compilation setups
 ifeq ($(RANLIB),)
@@ -300,6 +304,8 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
 
 CLEAN_PKG += libtool
 DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz
+CLEAN_FILE += .libtool
+
 endif
 
 ifeq ($(BUILD),i586-pc-beos)
@@ -315,10 +321,10 @@ libtool: libtool-$(LIBTOOL_VERSION).tar.gz
 
 CLEAN_PKG += libtool
 DISTCLEAN_PKG += libtool-$(LIBTOOL_VERSION).tar.gz
-endif
-
 CLEAN_FILE += .libtool
 
+endif
+
 # ***************************************************************************
 # automake
 # ***************************************************************************
@@ -458,7 +464,6 @@ endif
        $(INSTALL_NAME)
        touch $@
 
-
 CLEAN_FILE += .fontconfig
 CLEAN_PKG += fontconfig
 DISTCLEAN_PKG += fontconfig-$(FONTCONFIG_VERSION).tar.gz
@@ -579,7 +584,6 @@ CLEAN_FILE += .id3tag
 CLEAN_PKG += libid3tag
 DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz
 
-
 # ***************************************************************************
 # lua
 # ***************************************************************************
@@ -717,6 +721,8 @@ tremor:
        (cd $@; rm -f ogg.h && echo "#include <ogg/ogg.h>" > ogg.h && rm -f os_types.h && echo "#include <ogg/os_types.h>" > os_types.h && ./autogen.sh)
 else
 tremor-$(TREMOR_VERSION).tar.bz2:
+       echo "tremor snapshot does not exist, you MUST use subversion !"
+       exit -1
        $(WGET) $(TREMOR_URL)
 
 tremor: tremor-$(TREMOR_VERSION).tar.bz2
@@ -730,8 +736,6 @@ endif
 
 ifdef SVN
 tremor-source: tremor
-       cd tremor;   find . -depth -iname ".svn" -exec rm -rf {} \;
-       cd ..;
        tar cfvz tremor-$(DATE).tar.gz tremor
 
 SOURCE += tremor-source
@@ -739,7 +743,7 @@ endif
 
 CLEAN_FILE += .tremor
 CLEAN_PKG += tremor
-#DISTCLEAN_PKG += tremor-$(TREMOR_VERSION).tar.gz
+#DISTCLEAN_PKG += tremor-$(TREMOR_VERSION).tar.bz2 #no tremor snapshot
 
 # ***************************************************************************
 # theora
@@ -779,10 +783,10 @@ libshout: libshout-$(SHOUT_VERSION).tar.gz
        $(EXTRACT_GZ)
 ifdef HAVE_WIN32
        patch -p0 < Patches/libshout-win32.patch
-       (cd $@; aclocal && automake)
+       (cd $@; autoreconf && automake)
 endif
   
-.shout: libshout .theora .ogg .speex
+.shout: libshout .theora .ogg .speex .vorbis
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) &&  make && make install )
        $(INSTALL_NAME)
        touch $@
@@ -946,8 +950,6 @@ endif
 
 ifdef SVN
 libebml-source: libebml
-       cd libebml;   find . -depth -iname ".svn" -exec rm -rf {} \;
-       cd ..;
        tar cfvz  libebml-$(DATE).tar.gz libebml
 SOURCE += libebml-source       
 endif
@@ -985,14 +987,11 @@ endif
 
 ifdef SVN
 libmatroska-source: libmatroska
-       cd libmatroska;    find . -depth -iname ".svn" -exec rm -rf {} \;
-       cd ..;
        tar cfvz libmatroska-$(DATE).tar.gz libmatroska
 
 SOURCE += libmatroska-source
 endif
 
-
 CLEAN_FILE += .matroska
 CLEAN_PKG += libmatroska
 DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
@@ -1001,6 +1000,7 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 # ffmpeg
 # ***************************************************************************
 
+ifdef SVN
 ffmpeg:
        $(SVN) export $(FFMPEG_SVN)  ffmpeg
        (cd "$@" && patch -p0 < ../Patches/ffmpeg-svn-swscale-pc.patch)
@@ -1019,12 +1019,15 @@ ifdef HAVE_UCLIBC
        patch -p0 < Patches/ffmpeg-svn-grab.patch
 endif
 
+else
 ffmpeg-$(FFMPEG_VERSION).tar.gz:
+       echo "ffmpeg snapshot is too old, you MUST use subversion !"
+       exit -1
        $(WGET) $(FFMPEG_URL)
 
-#ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
-#      $(EXTRACT_GZ)
-#      patch -p0 < Patches/ffmpeg.patch
+ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
+       $(EXTRACT_GZ)
+endif
 
 ifdef HAVE_WINCE
 .ffmpeg: ffmpeg .zlib
@@ -1040,8 +1043,6 @@ endif
 
 ifdef SVN
 ffmpeg-source: ffmpeg
-       cd ffmpeg;   find . -depth -iname ".svn" -exec rm -rf {} \;
-       cd ..;
        tar cfvz ffmpeg-$(DATE).tar.gz ffmpeg
 
 SOURCE += ffmpeg-source
@@ -1074,46 +1075,15 @@ endif
 
 ifdef SVN
 libdvdcss-source: libdvdcss
-       cd libmatroska;   find . -depth -iname ".svn" -exec rm -rf {} \;
-       cd ..;
        tar cfvz libdvdcss-$(DATE).tar.gz libdvdcss
 
 SOURCE += libdvdcss-source
 endif
 
-
 CLEAN_FILE += .dvdcss
 CLEAN_PKG += libdvdcss
 DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 
-# ***************************************************************************
-# libdvdread: We use dvdnav's dvdread
-# ***************************************************************************
-
-#libdvdread-$(LIBDVDREAD_VERSION).tar.bz2:
-#      $(WGET) $(LIBDVDREAD_URL)
-
-#libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
-#      $(EXTRACT_BZ2)
-#      patch  -p 0 < Patches/libdvdread.patch
-#ifdef HAVE_WIN32
-#      if automake-1.4 --version >/dev/null 2>&1; then \
-#              echo "Please get rid of your automake 1.4"; \
-#              rm -rf $@ \
-#              exit 1; \
-#      fi
-#      (cd libdvdread; patch -p0 < ../Patches/libdvdread-20041028-win32.patch; ./bootstrap)
-#endif
-
-#.dvdread: libdvdread .dvdcss
-#      (cd libdvdread; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
-#      $(INSTALL_NAME)
-#      touch $@
-
-#CLEAN_FILE += .dvdread
-#CLEAN_PKG += libdvdread
-#DISTCLEAN_PKG += libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
-
 # ***************************************************************************
 # dummy dvdread to trigger the INSTALL_NAME script
 # ***************************************************************************
@@ -1167,7 +1137,7 @@ libdvbpsi: libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 
 CLEAN_FILE += .dvbpsi
 CLEAN_PKG += libdvbpsi
-DISTCLEAN_PKG += libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+DISTCLEAN_PKG += libdvbpsi4-$(LIBDVBPSI_VERSION).tar.gz
 
 # ***************************************************************************
 # live
@@ -1186,7 +1156,7 @@ ifdef HAVE_DARWIN_OS
        patch -p0 < Patches/live-osx.patch
 endif
        patch -p0 < Patches/live-starttime.patch
-       patch -p0 < Patches/live-config.patch
+       patch -Np0 < Patches/live-config.patch
 ifdef HAVE_UCLIBC
        patch -p0 < Patches/live-noapps.patch
 endif
@@ -1257,7 +1227,7 @@ endif
 ifdef HAVE_DARWIN_OS
        (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
 else
-       (cd $< && rm -f configure; autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
+       (cd $< && rm -f configure; aclocal -Im4/ && automake --add-missing && autoconf configure.in > configure && $(HOSTCC) sh ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --disable-glibtest --disable-gtktest && make && make install)
 endif
        touch $@
 
@@ -1341,8 +1311,6 @@ endif
 
 ifdef SVN
 x264-source: x264
-       cd x264;   find . -depth -iname ".svn" -exec rm -rf {} \;
-       cd ..;
        tar cfvz x264-$(DATE).tar.gz x264
 
 SOURCE += x264-source
@@ -1430,24 +1398,6 @@ CLEAN_FILE += .cdio
 CLEAN_PKG += libcdio
 DISTCLEAN_PKG += libcdio-$(CDIO_VERSION).tar.gz
 
-# ***************************************************************************
-# OpenMash
-# ***************************************************************************
-#
-#mash-src-$(MASH_VERSION).tar.gz:
-#      $(WGET) $(MASH_URL)
-#
-#mash-code: mash-src-$(MASH_VERSION).tar.gz
-#      $(EXTRACT_GZ)
-#
-#.mash: mash-code
-#      (cd $<; ./configure && make)
-#      touch $@
-#
-#CLEAN_FILE += .mash
-#CLEAN_PKG += mash-code
-#DISTCLEAN_PKG += mash-src-$(MASH_VERSION).tar.gz
-
 # ***************************************************************************
 # wxWidgets
 # ***************************************************************************
@@ -1479,7 +1429,6 @@ qt4-$(QT4_VERSION)-win32-bin.tar.gz:
 qt4: qt4-$(QT4_VERSION)-win32-bin.tar.gz
        $(EXTRACT_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)
 ifeq ($(BUILD),i686-pc-cygwin)
@@ -1491,7 +1440,7 @@ endif
 
 CLEAN_FILE += .qt4
 CLEAN_PKG += qt4
-#DISTCLEAN_PKG += qt4-$(QT4_VERSION).tar.gz
+DISTCLEAN_PKG += qt4-$(QT4_VERSION)-win32-bin.tar.gz
 
 # ***************************************************************************
 # zlib
@@ -1513,7 +1462,6 @@ CLEAN_FILE += .zlib
 CLEAN_PKG += zlib
 DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz
 
-
 # ***************************************************************************
 # PortAudio 
 # ***************************************************************************
@@ -1536,7 +1484,6 @@ CLEAN_FILE += .portaudio
 CLEAN_PKG += portaudio
 DISTCLEAN_PKG += pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 
-
 # ***************************************************************************
 # xml
 # ***************************************************************************
@@ -1555,6 +1502,9 @@ ifdef HAVE_UCLIBC
 endif
 
 .xml: xml
+ifdef HAVE_WIN32
+       (cd xml; aclocal && automake && autoreconf)
+endif
        (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)
 ifndef HAVE_DARWIN_OS
        $(INSTALL_NAME)
@@ -1565,7 +1515,6 @@ CLEAN_FILE += .xml
 CLEAN_PKG += xml
 DISTCLEAN_PKG += libxml2-$(XML_VERSION).tar.gz
 
-
 # ***************************************************************************
 # twolame
 # ***************************************************************************
@@ -2197,6 +2146,13 @@ taglib: taglib-$(TAGLIB_VERSION).tar.gz
        $(INSTALL_NAME)
        touch $@
 
+CLEAN_FILE += .tag
+CLEAN_PKG += taglib
+DISTCLEAN_PKG += taglib-$(TAGLIB_VERSION).tar.gz
+
+# ***************************************************************************
+# pthreads for win32
+# ***************************************************************************
 
 pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz:
        $(WGET) $(PTHREADS_URL)
@@ -2209,9 +2165,26 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
        $(INSTALL_NAME)
        touch $@
 
+# ***************************************************************************
+# ncurses library (with wide chars support)
+# ***************************************************************************
+
+ncurses-$(NCURSES_VERSION).tar.gz:
+       $(WGET) $(NCURSES_URL)
+
+ncurses: ncurses-$(NCURSES_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.ncurses: ncurses
+       (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-debug --enable-widec --without-develop --without-shared && make && make install)
+       touch $@
+
+CLEAN_FILE += .ncurses
+CLEAN_PKG += ncurses
+DISTCLEAN_PKG += ncurses-$(NCURSES_VERSION).tar.gz
 
 # ***************************************************************************
-# Some cleansing
+# Some cleaning
 # ***************************************************************************
 
 clean-dots: FORCE
@@ -2228,4 +2201,8 @@ clean-svn:
 
 distclean: clean-src
 
+# ***************************************************************************
+# Download all the sources and package unversionned copies of subversion trees
+# ***************************************************************************
+
 source: $(SOURCE) $(DISTCLEAN_PKG)