[vlc-commits] contrib: disable png code in SDL_image

[Rafaël Carré]

vlc | branch: master | Rafaël Carré <funman at videolan.org> | Sat Nov 19 17:35:17 2011 -0500| [cb84f9ac0fa0d0236a5c462e58261590b1b5068c] | committer: Rafaël Carré

contrib: disable png code in SDL_image

we already have a png decoder

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

 contrib/src/SDL_image/pkg-config.patch |    2 +-
 contrib/src/SDL_image/rules.mak        |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/contrib/src/SDL_image/pkg-config.patch b/contrib/src/SDL_image/pkg-config.patch
index 8cbb35b..b5d1d23 100644
--- a/contrib/src/SDL_image/pkg-config.patch
+++ b/contrib/src/SDL_image/pkg-config.patch
@@ -4,6 +4,6 @@
  Version: @VERSION@
  Requires: sdl >= @SDL_VERSION@
  Libs: -L${libdir} -lSDL_image
-+Libs.private:  -ljpeg -ltiff -lpng -lz
++Libs.private:  -ljpeg -ltiff
  Cflags: -I${includedir}/SDL
  
diff --git a/contrib/src/SDL_image/rules.mak b/contrib/src/SDL_image/rules.mak
index dae8ab3..6eef179 100644
--- a/contrib/src/SDL_image/rules.mak
+++ b/contrib/src/SDL_image/rules.mak
@@ -19,10 +19,10 @@ SDL_image: SDL_image-$(SDL_IMAGE_VERSION).tar.gz .sum-SDL_image
 	$(APPLY) $(SRC)/SDL_image/pkg-config.patch
 	$(MOVE)
 
-DEPS_SDL_image = png $(DEPS_png) jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
+DEPS_SDL_image = jpeg $(DEPS_jpeg) tiff $(DEPS_tiff) \
 	sdl $(DEPS_sdl)
 
 .SDL_image: SDL_image
-	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest
+	cd $< && $(HOSTVARS) ./configure $(HOSTCONF) --enable-tif --disable-sdltest --disable-png
 	cd $< && $(MAKE) install
 	touch $@