Contribs: SDL_image and SDL are up-to-date now, (1.2.12 and 1.2.6), patch for SDL_ima...

diff --git a/extras/contrib/src/Patches/SDL_image.patch b/extras/contrib/src/Patches/SDL_image.patch
index 023d900b550143e0376cd17a17164357d2dd1718..9a871a9a46ea63ff5c9e74b8c6ce42d3c151fac6 100644 (file)
--- a/extras/contrib/src/Patches/SDL_image.patch
+++ b/extras/contrib/src/Patches/SDL_image.patch
@@ -1,22 +1,27 @@
-diff -ru SDL_image.old/Makefile.am SDL_image/Makefile.am
---- SDL_image.old/Makefile.am  2004-12-16 05:41:01.000000000 +0100
-+++ SDL_image/Makefile.am      2005-08-02 19:29:18.000000000 +0200
-@@ -32,7 +32,6 @@
- 
+diff -ruN SDL_image/Makefile.am SDL_image_new/Makefile.am
+--- SDL_image/Makefile.am      2007-07-21 07:26:34.000000000 +0200
++++ SDL_image_new/Makefile.am  2007-08-04 12:08:51.000000000 +0200
+@@ -44,7 +44,6 @@
+ else
  libSDL_image_la_LDFLAGS =     \
        -no-undefined           \
 -      -release $(LT_RELEASE)  \
        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
- libSDL_image_la_LIBADD = @IMG_LIBS@
+ libSDL_image_la_LIBADD = $(IMG_LIBS)
+ endif
+diff -ruN SDL_image/Makefile.in SDL_image_new/Makefile.in
+--- SDL_image/Makefile.in      2007-07-21 07:27:57.000000000 +0200
++++ SDL_image_new/Makefile.in  2007-08-04 12:12:00.000000000 +0200
+@@ -260,12 +260,10 @@
  
-diff -ru SDL_image.old/Makefile.in SDL_image/Makefile.in
---- SDL_image.old/Makefile.in  2004-12-16 07:32:18.000000000 +0100
-+++ SDL_image/Makefile.in      2005-08-02 19:29:27.000000000 +0200
-@@ -255,7 +255,6 @@
+ @USE_VERSION_RC_FALSE@libSDL_image_la_LDFLAGS = \
+ @USE_VERSION_RC_FALSE@        -no-undefined           \
+-@USE_VERSION_RC_FALSE@        -release $(LT_RELEASE)  \
+ @USE_VERSION_RC_FALSE@        -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  
- libSDL_image_la_LDFLAGS = \
-       -no-undefined           \
--      -release $(LT_RELEASE)  \
-       -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
+ @USE_VERSION_RC_TRUE@libSDL_image_la_LDFLAGS = \
+ @USE_VERSION_RC_TRUE@ -no-undefined           \
+-@USE_VERSION_RC_TRUE@ -release $(LT_RELEASE)  \
+ @USE_VERSION_RC_TRUE@ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -Wl,version.o
  
- libSDL_image_la_LIBADD = @IMG_LIBS@
+ @USE_VERSION_RC_FALSE@libSDL_image_la_LIBADD = $(IMG_LIBS)

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 980b6844e20469708d0f5905f0cca2438613f012..5ff52b57a19e8d6e0605cb450eff8d52fa3b5ca6 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -155,10 +155,10 @@ JPEG_URL=$(VIDEOLAN)/contrib/jpeg-$(JPEG_VERSION).tar.gz
 TIFF_VERSION=3.8.2
 #TIFF_URL=ftp://ftp.remotesensing.org/libtiff/tiff-$(TIFF_VERSION).tar.gz
 TIFF_URL=http://dl.maptools.org/dl/libtiff/tiff-$(TIFF_VERSION).tar.gz
-SDL_VERSION=1.2.11
-SDL_URL=$(SF)/libsdl/SDL-$(SDL_VERSION).tar.gz
-SDL_IMAGE_VERSION=1.2.5
-SDL_IMAGE_URL=$(SF)/libsdl/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
+SDL_VERSION=1.2.12
+SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
+SDL_IMAGE_VERSION=1.2.6
+SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
 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