backport 16616 and 16617

extras/contrib/src/Makefile

@@ -177,9 +177,9 @@ else
 	.FLAC .speex .faad .faac .lame .ebml  .matroska .ffmpeg .dvdcss \
 	.live .goom2k4 .caca .mod .x264  .xml .twolame \
 	.png .gpg-error .gcrypt .gnutls .mpcdec \
-	.dvdnav .dvbpsi .wxwidgets .dirac \
+	.dvdnav .dvbpsi .wxwidgets .dirac .SDL_image \
 	.dx_headers .dshow_headers .aclocal .gecko-win32 .unicows .libdca
-#	.SDL_image  .daap .cddb .cdio .vcdimager .portaudio 
+#	.daap .cddb .cdio .vcdimager .portaudio 
   else
 
    ifdef HAVE_WINCE
@@ -310,11 +310,11 @@ endif
 # autoconf
 # ***************************************************************************
 
-autoconf-$(AUTOCONF_VERSION).tar.gz:
+autoconf-$(AUTOCONF_VERSION).tar.bz2:
 	$(WGET) $(AUTOCONF_URL)
 
-autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
-	$(EXTRACT_GZ)
+autoconf: autoconf-$(AUTOCONF_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
 
 .autoconf: autoconf
 	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
@@ -322,7 +322,7 @@ autoconf: autoconf-$(AUTOCONF_VERSION).tar.gz
 
 CLEAN_FILE += .autoconf
 CLEAN_PKG += autoconf
-DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz
+DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.bz2
 
 # ***************************************************************************
 # libtool
@@ -1704,20 +1704,15 @@ DISTCLEAN_PKG += jpeg-$(JPEG_VERSION).tar.gz
 
 tiff-$(TIFF_VERSION).tar.gz:
 	$(WGET) $(TIFF_URL)
-	mv tiff-$(TIFF_VERSION)-tar.gz $@
 
 tiff: tiff-$(TIFF_VERSION).tar.gz 
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/tiff.patch
-ifneq ($(HOST),$(BUILD))
-	patch -p 0 < Patches/tiff-cross.patch
-endif
 
 .tiff: tiff
 ifdef HAVE_WIN32
-	(cd $<;  ./configure  --noninteractive --target=$(HOST) --with-CC=$(HOST)-gcc --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no  && make -C libtiff && make -C libtiff install)
+	(cd $<;  ./configure --host=$(HOST) --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) && make -C port && make -C libtiff && make -C libtiff install)
 else
-	(cd $<; ./configure --noninteractive --with-DIR_BIN=$(PREFIX)/bin --with-DIR_LIB=$(PREFIX)/lib --with-DIR_INC=$(PREFIX)/include --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no && make -C libtiff && make -C libtiff install)
+	(cd $<; ./configure --with-CFLAGS="$(CFLAGS)" --with-JPEG=no --with-ZIP=no --prefix=$(PREFIX) && make -C port && make -C libtiff && make -C libtiff install)
 endif
 	touch $@
 
@@ -1734,10 +1729,9 @@ SDL-$(SDL_VERSION).tar.gz:
 
 SDL: SDL-$(SDL_VERSION).tar.gz 
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/SDL.patch
 
 .SDL: SDL
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --disable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-audio --disable-video-x11 --disable-video-aalib --disable-video-dga --disable-video-fbcon --disable-video-directfb --disable-video-ggi --disable-video-svga --disable-directx --enable-joystick --disable-cdrom --disable-threads --disable-sdl-dlopen CFLAGS="$(CFLAGS)" && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -1757,7 +1751,7 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 	patch -p 0 < Patches/SDL_image.patch
 
 .SDL_image: SDL_image .SDL .png .jpeg .tiff
-	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-tif CFLAGS="$(CFLAGS)" && make && make install)
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-tif --disable-sdltest CFLAGS="$(CFLAGS)" && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 

extras/contrib/src/Patches/tiff-cross.patch

-diff -Naur tiff/libtiff/Makefile.in tiff-new/libtiff/Makefile.in
---- tiff/libtiff/Makefile.in	1996-04-30 00:16:21.000000000 +0200
-+++ tiff-new/libtiff/Makefile.in	2005-08-31 20:06:07.000000000 +0200
-@@ -206,9 +206,9 @@
- 
- ALPHA	= @ALPHAFILE@
- VERSION	= @VERSIONFILE@
--
-+# Gruick hard code gcc if we crosscompile
- version.h: ${VERSION} ${ALPHA} ${SRCDIR}/mkversion.c
--	${CC} -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c
-+	gcc -o mkversion ${CFLAGS} ${SRCDIR}/mkversion.c
- 	rm -f version.h; ./mkversion -v ${VERSION} -a ${ALPHA} version.h
- tif_version.o: version.h
- 
-@@ -217,8 +217,10 @@
- # are generated by the mkg3states program.  On systems without
- # make these rules have to be manually carried out.
- #
-+#Gruikk. hard code gcc when we cross-compile
-+#
- tif_fax3sm.c: ${SRCDIR}/mkg3states.c ${SRCDIR}/tif_fax3.h
--	${CC} -o mkg3states ${CFLAGS} ${SRCDIR}/mkg3states.c
-+	gcc -o mkg3states ${CFLAGS} ${SRCDIR}/mkg3states.c
- 	rm -f tif_fax3sm.c; ./mkg3states -c const tif_fax3sm.c
- 
- tif_aux.o: ${SRCDIR}/tif_aux.c

extras/contrib/src/packages.mak

@@ -31,7 +31,7 @@ PERL_URL=http://ftp.funet.fi/pub/CPAN/src/perl-$(PERL_VERSION).tar.gz
 # Autoconf > 2.57 doesn't work ok on BeOS. Don't ask why.
 # we have to use a newer though, because bootstrap won't work otherwise
 AUTOCONF_VERSION=2.59
-AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
+AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.bz2
 LIBTOOL_VERSION=1.5.6
 LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
 AUTOMAKE_VERSION=1.9.6
@@ -139,11 +139,11 @@ X264_VERSION=20050609
 X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz
 JPEG_VERSION=6b
 JPEG_URL=$(VIDEOLAN)/contrib/jpeg-$(JPEG_VERSION).tar.gz
-TIFF_VERSION=v3.4
-TIFF_URL=ftp://ftp.sgi.com/graphics/tiff/tiff-$(TIFF_VERSION)-tar.gz
-SDL_VERSION=1.2.8
+TIFF_VERSION=3.8.2
+TIFF_URL=ftp://ftp.remotesensing.org/pub/libtiff/tiff-$(TIFF_VERSION).tar.gz
+SDL_VERSION=1.2.11
 SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
-SDL_IMAGE_VERSION=1.2.4
+SDL_IMAGE_VERSION=1.2.5
 SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 MUSE_VERSION=1.2.2
 #MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2