extras/contrib/src: clean up Makefile & packages.mak
authorRafaël Carré <funman@videolan.org>
Fri, 14 Sep 2007 00:26:12 +0000 (00:26 +0000)
committerRafaël Carré <funman@videolan.org>
Fri, 14 Sep 2007 00:26:12 +0000 (00:26 +0000)
Makes it clear that subversion is required for ffmpeg & tremor
Removes obsolete libraries from the list

extras/contrib/src/Makefile
extras/contrib/src/packages.mak

index 9337491..fc79b4d 100644 (file)
@@ -304,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)
@@ -319,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
 # ***************************************************************************
@@ -462,7 +464,6 @@ endif
        $(INSTALL_NAME)
        touch $@
 
-
 CLEAN_FILE += .fontconfig
 CLEAN_PKG += fontconfig
 DISTCLEAN_PKG += fontconfig-$(FONTCONFIG_VERSION).tar.gz
@@ -583,7 +584,6 @@ CLEAN_FILE += .id3tag
 CLEAN_PKG += libid3tag
 DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz
 
-
 # ***************************************************************************
 # lua
 # ***************************************************************************
@@ -721,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
@@ -734,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
@@ -743,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
@@ -950,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
@@ -989,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
@@ -1005,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)
@@ -1023,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
@@ -1044,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
@@ -1078,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
 # ***************************************************************************
@@ -1345,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
@@ -1434,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
 # ***************************************************************************
@@ -1483,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)
@@ -1495,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
@@ -1517,7 +1462,6 @@ CLEAN_FILE += .zlib
 CLEAN_PKG += zlib
 DISTCLEAN_PKG += zlib-$(ZLIB_VERSION).tar.gz
 
-
 # ***************************************************************************
 # PortAudio 
 # ***************************************************************************
@@ -1540,7 +1484,6 @@ CLEAN_FILE += .portaudio
 CLEAN_PKG += portaudio
 DISTCLEAN_PKG += pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 
-
 # ***************************************************************************
 # xml
 # ***************************************************************************
@@ -1569,7 +1512,6 @@ CLEAN_FILE += .xml
 CLEAN_PKG += xml
 DISTCLEAN_PKG += libxml2-$(XML_VERSION).tar.gz
 
-
 # ***************************************************************************
 # twolame
 # ***************************************************************************
@@ -2201,6 +2143,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)
@@ -2215,7 +2164,7 @@ pthreads: pthreads-w32-$(PTHREADS_VERSION)-release.tar.gz
 
 
 # ***************************************************************************
-# Some cleansing
+# Some cleaning
 # ***************************************************************************
 
 clean-dots: FORCE
@@ -2232,4 +2181,8 @@ clean-svn:
 
 distclean: clean-src
 
+# ***************************************************************************
+# Download all the sources and package unversionned copies of subversion trees
+# ***************************************************************************
+
 source: $(SOURCE) $(DISTCLEAN_PKG)
index aa1c3bb..f10e6de 100644 (file)
@@ -92,8 +92,6 @@ FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
 FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
 LIBDVDCSS_VERSION=1.2.9
 LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
-#LIBDVDREAD_VERSION=20041028
-#LIBDVDREAD_URL=$(VIDEOLAN)/contrib/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
 LIBDVDNAV_VERSION=20050211
 LIBDVDNAV_URL=$(VIDEOLAN)/testing/contrib/libdvdnav-$(LIBDVDNAV_VERSION).tar.bz2
 LIBDVBPSI_VERSION=0.1.5
@@ -118,8 +116,6 @@ LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$
 LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk
 MODPLUG_VERSION=0.8
 MODPLUG_URL=$(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
-#MASH_VERSION=5.2
-#MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
 CDDB_VERSION=1.3.0
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.bz2
 VCDIMAGER_VERSION=0.7.23
@@ -130,10 +126,8 @@ PNG_VERSION=1.2.18
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
 GPGERROR_VERSION=1.5
 GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
-#GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
 GCRYPT_VERSION=1.2.3
 GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
-#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GNUTLS_VERSION=1.6.3
 GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
 DAAP_VERSION=0.4.0