contrib: disable png code in SDL_image

we already have a png decoder

diff --git a/contrib/src/SDL_image/pkg-config.patch b/contrib/src/SDL_image/pkg-config.patch
index 8cbb35b435f67a54b1bac65e573e0cc31d59f70c..b5d1d23ee63e8948d74c7ac454b241affc56f3b5 100644 (file)
--- 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 dae8ab37c5428d67216a6c8510780ecae59aa7ea..6eef179ad0d11e294d090953f226307fe0310379 100644 (file)
--- 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 $@