Use new libmpeg2

Kudoz to sam and Meuuh

diff --git a/extras/contrib/src/Distributions/darwin.mak b/extras/contrib/src/Distributions/darwin.mak
index c87f6c6d916d0b6c55668798519e8077cb6250e9..81ec87b6ec11ad5f9184d6e326de46e03eaf5149 100644 (file)
--- a/extras/contrib/src/Distributions/darwin.mak
+++ b/extras/contrib/src/Distributions/darwin.mak
@@ -1,6 +1,6 @@
 # Darwin rules
 download-all: autoconf gnumake automake libtool gettext pkgconfig freetype2 \
-    fribidi a52dec mpeg2dec libid3tag libmad libogg libvorbis libtheora flac \
+    fribidi a52dec libmpeg2 libid3tag libmad libogg libvorbis libtheora flac \
     speex libshout faad2 faac lame twolame libebml libmatroska ffmpeg libdca \
     libdvdcss libdvdread libdvdnav libdvbpsi live libcaca libmodplug xml asa \
     jpeg tiff SDL zlib libpng libgpg-error libgcrypt opencdk gnutls \

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 26d5be0f9a5497b885146cd4700ba06c7240a844..4e463ca17ab9440c83368ecbc41132219f0657ef 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -560,25 +560,25 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 #      cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
 #      (cd $@; ./bootstrap)
 
-mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-       $(WGET) $(MPEG2DEC_URL)
+libmpeg2-$(LIBMPEG2_VERSION).tar.gz:
+       $(WGET) $(LIBMPEG2_URL)
 
 # It is easier to use bootstrapped versions...
 #mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
 #      $(WGET) $(MPEG2DEC_SNAPSHOT)
 #      mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
 
-mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
+libmpeg2: libmpeg2-$(LIBMPEG2_VERSION).tar.gz
        $(EXTRACT_GZ)
 
-.mpeg2: mpeg2dec
+.mpeg2: libmpeg2
        (cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-sdl && cd libmpeg2 && make && make install && cd ../include && make && make install)
        touch $@
 
 CLEAN_FILE += .mpeg2
-CLEAN_PKG += mpeg2dec
+CLEAN_PKG += libmpeg2
 #DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz
-DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
+DISTCLEAN_PKG += libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 
 # ***************************************************************************
 # libid3tag

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 1ac692be0aa5cf871309566ed2ed59ed0b9772c0..26488155a2e26c44d27364fce4f91055e87a9a20 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -62,11 +62,8 @@ 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
-MPEG2DEC_VERSION=0.4.1
-MPEG2DEC_DATE=20050802
-MPEG2DEC_CVSROOT=:pserver:anonymous@cvs.libmpeg2.sourceforge.net:/cvsroot/libmpeg2
-MPEG2DEC_SNAPSHOT=$(VIDEOLAN)/testing/contrib/mpeg2dec-$(MPEG2DEC_DATE).tar.gz
-MPEG2DEC_URL=$(VIDEOLAN)/testing/contrib/mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
+LIBMPEG2_VERSION=0.5.0
+LIBMPEG2_URL=$(VIDEOLAN)/testing/contrib/libmpeg2-$(LIBMPEG2_VERSION).tar.gz
 LIBID3TAG_VERSION=0.15.1b
 LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b