[vlc-commits] contrib: SDL_image: fix OSX build

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Tue Nov 22 22:18:10 2011 -0500| [ffb010c05f4e5a06d93427389c21e133c895410c] | committer: Rafaël Carré

contrib: SDL_image: fix OSX build

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ffb010c05f4e5a06d93427389c21e133c895410c
---

 contrib/TODO                          |    3 ---
 contrib/src/SDL_image/SDL_image.patch |   32 ++++++++++++++++++++++++--------
 2 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/contrib/TODO b/contrib/TODO
index 9e2f48d..87eaeaa 100644
--- a/contrib/TODO
+++ b/contrib/TODO
@@ -2,9 +2,6 @@ binary package downloading/extraction (prebuilt contribs)
 
 ### Missing software for MacOSX
 
-SDL_image fails to build : Undefined symbols (missing OpenGL framework?)
-    => we used r4444 of their SVN on OSX (only) for undocumented reasons
-
 # These 3 are binary framework downloads : no source code is used
 BGHUDAppKit
 Growl           -- last free version: 1.3.0: http://code.google.com/p/growl/source/list http://itunes.apple.com/us/app/growl/id467939042
diff --git a/contrib/src/SDL_image/SDL_image.patch b/contrib/src/SDL_image/SDL_image.patch
index 9a871a9..7e27041 100644
--- a/contrib/src/SDL_image/SDL_image.patch
+++ b/contrib/src/SDL_image/SDL_image.patch
@@ -1,7 +1,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 @@
+--- SDL_image/Makefile.am.orig	2009-11-08 05:55:32.000000000 -0500
++++ SDL_image/Makefile.am	2011-11-22 22:17:14.234702385 -0500
+@@ -47,7 +47,6 @@
  else
  libSDL_image_la_LDFLAGS = 	\
  	-no-undefined		\
@@ -9,10 +8,27 @@ diff -ruN SDL_image/Makefile.am SDL_image_new/Makefile.am
  	-version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
  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 @@
+@@ -58,7 +57,7 @@
+ %.o : %.rc
+ 	$(WINDRES) $< $@
+ 
+-noinst_PROGRAMS = showimage
++#noinst_PROGRAMS = showimage
+ 
+ showimage_LDADD = libSDL_image.la
+ 
+--- SDL_image/Makefile.in.orig	2009-11-12 01:42:10.000000000 -0500
++++ SDL_image/Makefile.in	2011-11-22 22:17:10.714684927 -0500
+@@ -41,7 +41,7 @@
+ host_triplet = @host@
+ @USE_VERSION_RC_FALSE at libSDL_image_la_DEPENDENCIES =  \
+ @USE_VERSION_RC_FALSE@	$(am__DEPENDENCIES_1)
+-noinst_PROGRAMS = showimage$(EXEEXT)
++#noinst_PROGRAMS = showimage$(EXEEXT)
+ subdir = .
+ DIST_COMMON = README $(am__configure_deps) \
+ 	$(libSDL_imageinclude_HEADERS) $(srcdir)/Makefile.am \
+@@ -297,12 +297,10 @@
  
  @USE_VERSION_RC_FALSE at libSDL_image_la_LDFLAGS = \
  @USE_VERSION_RC_FALSE@	-no-undefined		\