Contrib cleanup

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 38301b8ec58585418b8dcfd02df7db21dd6a4b90..67c3a453aabfc5e59bc7a7885ae2bb8a2b4d87c8 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -294,9 +294,6 @@ cmake-$(CMAKE_VERSION).tar.gz:
 cmake: cmake-$(CMAKE_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-#cmake:
-#      cvs -d :pserver:anonymous:cmake@www.cmake.org:/cvsroot/CMake co -d cmake CMake
-
 .cmake: cmake
        (cd $<; ./configure --prefix=$(PREFIX) && make && make install)
        touch $@
@@ -502,11 +499,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
        $(EXTRACT_GZ)
 
 .freetype: freetype2
-ifdef HAVE_CYGWIN
-       (cd $<; ./configure --target=$(HOST) --disable-pic --disable-shared --prefix=$(PREFIX) && make && make install)
-else
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
-endif
        $(INSTALL_NAME)
        touch $@
 
@@ -1141,8 +1134,6 @@ DISTCLEAN_PKG += libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 # ***************************************************************************
 # libdvdread: We use dvdnav's dvdread
 # ***************************************************************************
-
-
 libdvdread:
        $(SVN) co $(LIBDVDREAD_SVN)  libdvdread
        (cd $@; patch  -p 0 < ../Patches/libdvdread.patch)

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 96fc163694810e9ad5f9fb73da3d7d26cf032bd6..bd435b3395caf4b0b39498a06d694990f8446e00 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -44,15 +44,15 @@ LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOMAKE_VERSION=1.11
 AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
 PKGCFG_VERSION=0.20
-PKGCFG_URL=$(VIDEOLAN)/testing/contrib/pkg-config-$(PKGCFG_VERSION).tar.gz
+PKGCFG_URL=$(CONTRIB_VIDEOLAN)/pkg-config-$(PKGCFG_VERSION).tar.gz
 #PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkg-config-$(PKGCFG_VERSION).tar.gz
 LIBICONV_VERSION=1.13.1
 LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
-LIBICONVMAC_URL=$(VIDEOLAN)/testing/contrib/libiconv-snowleopard.tar.bz2
+LIBICONVMAC_URL=$(CONTRIB_VIDEOLAN)/libiconv-snowleopard.tar.bz2
 GETTEXT_VERSION=0.17
 GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
 FONTCONFIG_VERSION=2.7.3
-FONTCONFIG_URL=$(VIDEOLAN)/testing/contrib/fontconfig-$(FONTCONFIG_VERSION).tar.gz
+FONTCONFIG_URL=$(CONTRIB_VIDEOLAN)/fontconfig-$(FONTCONFIG_VERSION).tar.gz
 #FONTCONFIG_URL=http://fontconfig.org/release/fontconfig-$(FONTCONFIG_VERSION).tar.gz
 FREETYPE2_VERSION=2.3.11
 FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
@@ -60,23 +60,23 @@ FRIBIDI_VERSION=0.19.2
 FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
 #FRIBIDI_URL=ftp://ftp.videolan.org/pub/testing/contrib/fribidi-$(FRIBIDI_VERSION).tar.bz2
 A52DEC_VERSION=0.7.4
-A52DEC_URL=$(VIDEOLAN)/testing/contrib/a52dec-$(A52DEC_VERSION).tar.gz
+A52DEC_URL=$(CONTRIB_VIDEOLAN)/a52dec-$(A52DEC_VERSION).tar.gz
 LIBMPEG2_VERSION=0.5.1
 LIBMPEG2_URL=http://libmpeg2.sourceforge.net/files/libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 LIBID3TAG_VERSION=0.15.1b
-LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz
+LIBID3TAG_URL=$(CONTRIB_VIDEOLAN)/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
-LIBMAD_URL=$(VIDEOLAN)/testing/contrib/libmad-$(LIBMAD_VERSION).tar.gz
+LIBMAD_URL=$(CONTRIB_VIDEOLAN)/libmad-$(LIBMAD_VERSION).tar.gz
 OGG_VERSION=1.1.4
 OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
-#GG_URL=$(VIDEOLAN)/testing/contrib/libogg-$(OGG_VERSION).tar.gz
+#GG_URL=$(CONTRIB_VIDEOLAN)/libogg-$(OGG_VERSION).tar.gz
 OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
 VORBIS_VERSION=1.2.3
 VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
-#VORBIS_URL=$(VIDEOLAN)/testing/contrib/libvorbis-$(VORBIS_VERSION).tar.gz
+#VORBIS_URL=$(CONTRIB_VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
 THEORA_VERSION=1.1.0
 THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
-#THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
+#THEORA_URL=$(CONTRIB_VIDEOLAN)/libtheora-$(THEORA_VERSION).tar.bz2
 FLAC_VERSION=1.2.1
 FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
 SPEEX_VERSION=1.2rc1
@@ -85,16 +85,16 @@ SHOUT_VERSION=2.2.2
 SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
 FAAD2_VERSION=2.7
 FAAD2_URL=$(SF)/faac/faad2-$(FAAD2_VERSION).tar.gz
-#FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
+#FAAD2_URL=$(CONTRIB_VIDEOLAN)/faad2-$(FAAD2_VERSION).tar.bz2
 FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
 LAME_VERSION=398-2
 LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
 LIBEBML_VERSION=0.7.8
 LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
-#LIBEBML_URL=$(VIDEOLAN)/testing/contrib/libebml-$(LIBEBML_VERSION).tar.bz2
+#LIBEBML_URL=$(CONTRIB_VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
 LIBMATROSKA_VERSION=0.8.1
 #LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
-LIBMATROSKA_URL=$(VIDEOLAN)/testing/contrib/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
+LIBMATROSKA_URL=$(CONTRIB_VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 FFMPEG_VERSION=0.4.8
 FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
 FFMPEG_SVN=svn://svn.ffmpeg.org/ffmpeg/trunk
@@ -112,10 +112,10 @@ LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi5-$(LIBDVBPSI_
 LIVEDOTCOM_VERSION=latest
 LIVEDOTCOM_URL=http://live555.com/liveMedia/public/live555-$(LIVEDOTCOM_VERSION).tar.gz
 GOOM2k4_VERSION=2k4-0
-GOOM2k4_URL=$(VIDEOLAN)/testing/contrib/goom-$(GOOM2k4_VERSION)-src.tar.gz
+GOOM2k4_URL=$(CONTRIB_VIDEOLAN)/goom-$(GOOM2k4_VERSION)-src.tar.gz
 #GOOM2k4_URL=$(SF)/goom/goom-$(GOOM2k4_VERSION)-src.tar.gz
 LIBCACA_VERSION=0.99.beta16
-#LIBCACA_URL=$(VIDEOLAN)/testing/contrib/libcaca-$(LIBCACA_VERSION).tar.gz
+#LIBCACA_URL=$(CONTRIB_VIDEOLAN)/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBCACA_URL=http://caca.zoy.org/files/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDCA_VERSION=0.0.5
 LIBDCA_URL=ftp://ftp.videolan.org/pub/videolan/libdca/$(LIBDCA_VERSION)/libdca-$(LIBDCA_VERSION).tar.bz2
@@ -141,10 +141,10 @@ CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.2.40
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
 GPGERROR_VERSION=1.7
-#GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.bz2
+#GPGERROR_URL=$(CONTRIB_VIDEOLAN)/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GPGERROR_URL=ftp://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.bz2
 GCRYPT_VERSION=1.4.4
-#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
+#GCRYPT_URL=$(CONTRIB_VIDEOLAN)/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GCRYPT_URL=ftp://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
 GNUTLS_VERSION=2.8.5
 GNUTLS_URL=http://ftp.gnu.org/pub/gnu/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
@@ -156,7 +156,7 @@ GLIB_VERSION=2.20.4
 GLIB_URL=http://ftp.gnome.org/pub/gnome/sources/glib/2.20/glib-$(GLIB_VERSION).tar.bz2
 LIBIDL_VERSION=0.8.12
 LIBIDL_URL=http://ftp.gnome.org/pub/gnome/sources/libIDL/0.8/libIDL-$(LIBIDL_VERSION).tar.bz2
-GECKO_SDK_MAC_URL=$(VIDEOLAN)/testing/contrib/gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
+GECKO_SDK_MAC_URL=$(CONTRIB_VIDEOLAN)/gecko-sdk-ppc-macosx10.2-1.7.5.tar.gz
 GECKO_SDK_WIN32_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla1.8b1/gecko-sdk-i586-pc-msvc-1.8b1.zip
 LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/libIDL-0.6.3-win32-bin.zip
 GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/glib-19990228.zip
@@ -165,7 +165,7 @@ MOZILLA_URL=http://releases.mozilla.org/pub/mozilla.org/firefox/releases/$(MOZIL
 TWOLAME_VERSION=0.3.12
 TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
 X264_VERSION=20050609
-X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz
+X264_URL=$(CONTRIB_VIDEOLAN)/x264-$(X264_VERSION).tar.gz
 JPEG_VERSION=7
 JPEG_URL=$(VIDEOLAN)/contrib/jpegsrc.v$(JPEG_VERSION).tar.gz
 TIFF_VERSION=3.9.2
@@ -179,7 +179,7 @@ MUSE_VERSION=1.2.6
 MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 #MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
 QT4_VERSION=4.4.3
-QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-win32-bin.tar.bz2
+QT4_URL=$(CONTRIB_VIDEOLAN)/qt4-$(QT4_VERSION)-win32-bin.tar.bz2
 QT4_MAC_VERSION=4.5.2
 QT4_MAC_URL=http://get.qtsoftware.com/qt/source/qt-mac-opensource-src-$(QT4_MAC_VERSION).tar.gz
 QT4T_VERSION=4.3.2
@@ -187,18 +187,18 @@ QT4T_URL=ftp://ftp.trolltech.com/pub/qt/source/qt-win-opensource-$(QT4T_VERSION)
 ZLIB_VERSION=1.2.3
 ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
 XML_VERSION=2.7.6
-#XML_URL=$(VIDEOLAN)/testing/contrib/libxml2-$(XML_VERSION).tar.gz
+#XML_URL=$(CONTRIB_VIDEOLAN)/libxml2-$(XML_VERSION).tar.gz
 XML_URL=http://xmlsoft.org/sources/libxml2-$(XML_VERSION).tar.gz
 DIRAC_VERSION=1.0.2
 DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_VERSION).tar.gz
-DX_HEADERS_URL=$(VIDEOLAN)/testing/contrib/win32-dx7headers.tgz
+DX_HEADERS_URL=$(CONTRIB_VIDEOLAN)/win32-dx7headers.tgz
 DSHOW_HEADERS_URL=$(VIDEOLAN)/contrib/dshow-headers.tgz
 PORTAUDIO_VERSION=19
 PORTAUDIO_URL=http://www.portaudio.com/archives/pa_snapshot_v$(PORTAUDIO_VERSION).tar.gz
 CLINKCC_VERSION=171
 CLINKCC_URL=$(SF)/clinkcc/clinkcc$(CLINKCC_VERSION).tar.gz
 UPNP_VERSION=1.6.6
-UPNP_URL=$(VIDEOLAN)/testing/contrib/libupnp-$(UPNP_VERSION).tar.bz2
+UPNP_URL=$(CONTRIB_VIDEOLAN)/libupnp-$(UPNP_VERSION).tar.bz2
 EXPAT_VERSION=2.0.0
 EXPAT_URL=$(SF)/expat/expat-$(EXPAT_VERSION).tar.gz
 PTHREADS_VERSION=2-8-0
@@ -211,13 +211,13 @@ LUA_VERSION=5.1
 LUA_URL=http://www.lua.org/ftp/lua-$(LUA_VERSION).tar.gz
 NCURSES_VERSION=5.6
 NCURSES_URL=$(GNU)/ncurses/ncurses-$(NCURSES_VERSION).tar.gz
-ASA_URL=$(VIDEOLAN)/testing/contrib/asa.git.tar.gz
+ASA_URL=$(CONTRIB_VIDEOLAN)/asa.git.tar.gz
 PCRE_VERSION=8.00
 PCRE_URL=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-$(PCRE_VERSION).tar.bz2
 FLUID_VERSION=1.0.8
 FLUID_URL=http://download.savannah.gnu.org/releases/fluid/fluidsynth-$(FLUID_VERSION).tar.gz
 YASM_VERSION=0.7.2
-#YASM_URL=$(VIDEOLAN)/testing/contrib/yasm-$(YASM_VERSION).tar.gz
+#YASM_URL=$(CONTRIB_VIDEOLAN)/yasm-$(YASM_VERSION).tar.gz
 YASM_URL=http://www.tortall.net/projects/yasm/releases/yasm-$(YASM_VERSION).tar.gz
 KATE_VERSION=0.3.0
 KATE_URL=http://libkate.googlecode.com/files/libkate-$(KATE_VERSION).tar.gz
@@ -226,7 +226,7 @@ TIGER_URL=http://libtiger.googlecode.com/files/libtiger-$(TIGER_VERSION).tar.gz
 OIL_VERSION=0.3.16
 OIL_URL=http://liboil.freedesktop.org/download/liboil-$(OIL_VERSION).tar.gz
 SCHROED_VERSION=1.0.8
-SCHROED_URL=$(VIDEOLAN)/testing/contrib/schroedinger-$(SCHROED_VERSION).tar.gz
+SCHROED_URL=$(CONTRIB_VIDEOLAN)/schroedinger-$(SCHROED_VERSION).tar.gz
 #SCHROED_URL=http://www.diracvideo.org/download/schroedinger/schroedinger-$(SCHROED_VERSION).tar.gz
 ASS_VERSION=0.9.8
 ASS_URL=http://libass.googlecode.com/files/libass-$(ASS_VERSION).tar.bz2
@@ -235,7 +235,7 @@ GSM_VERSION=1.0.12
 GSM_URL=http://user.cs.tu-berlin.de/~jutta/gsm/gsm-$(GSM_VERSION).tar.gz
 SPARKLE_VERSION=1.5b6-vlc
 #SPARKLE_URL=http://sparkle.andymatuschak.org/files/Sparkle%20$(SPARKLE_VERSION).zip
-SPARKLE_URL=$(VIDEOLAN)/testing/contrib/Sparkle-$(SPARKLE_VERSION).zip
+SPARKLE_URL=$(CONTRIB_VIDEOLAN)/Sparkle-$(SPARKLE_VERSION).zip
 XCB_VERSION=1.2
 XCB_URL=http://xcb.freedesktop.org/dist/
 XCB_UTIL_VERSION=0.2