Backport [17184]. use the release for mpeg2 and recent version of speex,...

Backport [17184]. use the release for mpeg2 and recent version of speex, libcdio and vcd. Closes #791

extras/contrib/src/Makefile

@@ -534,17 +534,16 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz
 #	cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec
 #	(cd $@; ./bootstrap)
 
-#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-#	$(WGET) $(MPEG2DEC_URL)
+mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
+	$(WGET) $(MPEG2DEC_URL)
 
 # It is easier to use bootstrapped versions...
-mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
-	$(WGET) $(MPEG2DEC_SNAPSHOT)
-	mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
+#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz:
+#	$(WGET) $(MPEG2DEC_SNAPSHOT)
+#	mv mpeg2dec-$(MPEG2DEC_DATE).tar.gz $@
 
 mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/mpeg2dec.patch
 
 .mpeg2: mpeg2dec
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-sdl && cd libmpeg2 && make && make install && cd ../include && make && make install)
@@ -1296,7 +1295,7 @@ libcdio: libcdio-$(CDIO_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .cdio: libcdio
-	(cd $<; ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
+	(cd $<; sed -e 's%@ENABLE_CPP_TRUE@SUBDIRS = C++%@ENABLE_CPP_TRUE@SUBDIRS = %' -i.orig example/Makefile.in && ./configure --prefix=$(PREFIX) --without-vcdinfo --disable-shared && make && make install)
 	touch $@
 
 CLEAN_FILE += .cdio

extras/contrib/src/Patches/mpeg2dec.patch

-diff -ruN mpeg2dec.orig/libmpeg2/cpu_accel.c mpeg2dec/libmpeg2/cpu_accel.c
---- mpeg2dec.orig/libmpeg2/cpu_accel.c	2004-04-10 07:51:44.000000000 +0200
-+++ mpeg2dec/libmpeg2/cpu_accel.c	2005-04-08 23:45:11.000000000 +0200
-@@ -145,7 +145,7 @@
- #endif /* ACCEL_DETECT && (ARCH_PPC || ARCH_SPARC) */
- 
- #ifdef ARCH_PPC
--static inline uint32_t arch_accel (uint32_t accel)
-+static uint32_t arch_accel (uint32_t accel)
- {
- #ifdef ACCEL_DETECT
-     if ((accel & (MPEG2_ACCEL_PPC_ALTIVEC | MPEG2_ACCEL_DETECT)) ==

extras/contrib/src/Patches/speex.patch

-diff -ruN speex-1.1.12/libspeex/kiss_fft.h speex/libspeex/kiss_fft.h
---- speex-1.1.12/libspeex/kiss_fft.h	2005-12-22 12:14:33.000000000 +0100
-+++ speex/libspeex/kiss_fft.h	2006-07-26 15:38:39.000000000 +0200
-@@ -5,7 +5,7 @@
- #include <stdio.h>
- #include <math.h>
- #include <memory.h>
--#include <malloc.h>
-+//#include <malloc.h>
- 
- #ifdef __cplusplus
- extern "C" {
-diff -ruN speex-1.1.12/libspeex/stack_alloc.h speex/libspeex/stack_alloc.h
---- speex-1.1.12/libspeex/stack_alloc.h	2006-01-31 23:25:10.000000000 +0100
-+++ speex/libspeex/stack_alloc.h	2006-07-26 15:38:04.000000000 +0200
-@@ -109,7 +109,7 @@
- 
- #endif
- 
--#if defined(VAR_ARRAYS)
-+#if defined(VAR_ARRAYS)  && !( defined(__GNUC__) && __GNUC__ < 3 )
- #define VARDECL(var) 
- #define ALLOC(var, size, type) type var[size]
- #elif defined(USE_ALLOCA)
 diff -ruN speex-1.1.12/Makefile.am speex/Makefile.am
 --- speex-1.1.12/Makefile.am	2005-11-23 12:42:56.000000000 +0100
 +++ speex/Makefile.am	2006-07-26 15:38:04.000000000 +0200

extras/contrib/src/packages.mak

@@ -48,10 +48,11 @@ FRIBIDI_VERSION=0.10.4
 FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
 A52DEC_VERSION=0.7.4
 A52DEC_URL=$(VIDEOLAN)/testing/contrib/a52dec-$(A52DEC_VERSION).tar.gz
-MPEG2DEC_VERSION=0.4.1-cvs
+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
 LIBID3TAG_VERSION=0.15.1b
 LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz
 LIBMAD_VERSION=0.15.1b
@@ -65,7 +66,7 @@ THEORA_VERSION=1.0alpha7
 THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
 FLAC_VERSION=1.1.2
 FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
-SPEEX_VERSION=1.1.12
+SPEEX_VERSION=1.2beta1
 SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
 SHOUT_VERSION=2.2.2
 SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
@@ -113,9 +114,9 @@ MASH_VERSION=5.2
 MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
 CDDB_VERSION=1.2.1
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.bz2
-VCDIMAGER_VERSION=0.7.21
+VCDIMAGER_VERSION=0.7.23
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
-CDIO_VERSION=0.72
+CDIO_VERSION=0.77
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 PNG_VERSION=1.2.12
 PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2