SDL2_image: updated to 2.0.4

2.0.4:
* Fixed memory issues in the XCF loader
* Fixed a number of security issues, including TALOS-2018-0645

4 files changed, 22 insertions, 28 deletions

diff --git a/graphics/SDL2_image/Makefile b/graphics/SDL2_image/Makefile
index b8e0fd1e66e..82039b3393c 100644
--- a/graphics/SDL2_image/Makefile
+++ b/graphics/SDL2_image/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2018/06/24 10:29:32 adam Exp $
+# $NetBSD: Makefile,v 1.11 2018/11/01 21:10:22 adam Exp $
 
-DISTNAME=	SDL2_image-2.0.3
+DISTNAME=	SDL2_image-2.0.4
 CATEGORIES=	graphics devel
 MASTER_SITES=	http://www.libsdl.org/projects/SDL_image/release/
 
diff --git a/graphics/SDL2_image/distinfo b/graphics/SDL2_image/distinfo
index 5b4194b0453..8b852be4e3b 100644
--- a/graphics/SDL2_image/distinfo
+++ b/graphics/SDL2_image/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.4 2018/06/24 10:29:32 adam Exp $
+$NetBSD: distinfo,v 1.5 2018/11/01 21:10:22 adam Exp $
 
-SHA1 (SDL2_image-2.0.3.tar.gz) = 024560bea385e36db68dd935e7053edfe4598b4e
-RMD160 (SDL2_image-2.0.3.tar.gz) = 76d3c9eaf2c993ff97953a396f277198258c767a
-SHA512 (SDL2_image-2.0.3.tar.gz) = 869cf3485cc850a91dc1d7f0023f0497bc7bbfd63e721365358b19d19d4da850e52667731d0e5ec80f4a11d7687aa6cfbdd5ceaec956af0e7f5567e87535977a
-Size (SDL2_image-2.0.3.tar.gz) = 8685512 bytes
-SHA1 (patch-Makefile.in) = dbe3c8578e6b2be2ab1ed82c170817417f30e021
-SHA1 (patch-configure) = db88780d385e4bbf8416f9ff01bf30e9ad09bba5
+SHA1 (SDL2_image-2.0.4.tar.gz) = aed0c6e5feb5ae933410c150d33c319000ea4cfd
+RMD160 (SDL2_image-2.0.4.tar.gz) = 38f41a706fd9e6cce11f7e5c13fc58c02d6878cc
+SHA512 (SDL2_image-2.0.4.tar.gz) = 7320a5c9111908d402fbb0c12a49eb359a6db645c0c86839793ebb1a5b75eaca7c85eb96851f3a0b4a68a2f06363c8189555afd4f1048a4a41447370eddd7e6a
+Size (SDL2_image-2.0.4.tar.gz) = 11682695 bytes
+SHA1 (patch-configure) = fe18749571cdf44e0a66f7716b35b45dbb6ae203
diff --git a/graphics/SDL2_image/patches/patch-Makefile.in b/graphics/SDL2_image/patches/patch-Makefile.in
deleted file mode 100644
index 32b926044d1..00000000000
--- a/graphics/SDL2_image/patches/patch-Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-Makefile.in,v 1.1 2014/03/31 10:10:14 adam Exp $
-
-Explicitly tell libtool the compiler type.
-
---- Makefile.in.orig	2014-03-21 08:02:25.000000000 +0000
-+++ Makefile.in
-@@ -124,7 +124,7 @@ AM_V_lt = $(am__v_lt_@AM_V@)
- am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
- am__v_lt_0 = --silent
- am__v_lt_1 = 
--libSDL2_image_la_LINK = $(LIBTOOL) $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
-+libSDL2_image_la_LINK = $(LIBTOOL) --tag CC $(AM_V_lt) $(AM_LIBTOOLFLAGS) \
- 	$(LIBTOOLFLAGS) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) \
- 	$(OBJCFLAGS) $(libSDL2_image_la_LDFLAGS) $(LDFLAGS) -o $@
- PROGRAMS = $(noinst_PROGRAMS)
diff --git a/graphics/SDL2_image/patches/patch-configure b/graphics/SDL2_image/patches/patch-configure
index dd41e0b9d7a..76d9a7d6f69 100644
--- a/graphics/SDL2_image/patches/patch-configure
+++ b/graphics/SDL2_image/patches/patch-configure
@@ -1,14 +1,24 @@
-$NetBSD: patch-configure,v 1.2 2016/05/05 11:12:14 wiz Exp $
+$NetBSD: patch-configure,v 1.3 2018/11/01 21:10:22 adam Exp $
 
 Add frameworks required to link under OS X.
+Use absolute paths for dlopen(); don't expect users set LD_LIBRARY_PATH.
 
---- configure.orig	2016-01-03 05:52:28.000000000 +0000
+--- configure.orig	2018-10-31 14:59:01.000000000 +0000
 +++ configure
-@@ -12024,6 +12024,7 @@ fi
- 
+@@ -12198,6 +12198,7 @@ $as_echo_n "checking for ImageIO support
+ $as_echo "$enable_imageio" >&6; }
          if test x$enable_imageio = xyes; then
              IMG_LIBS="-Wl,-framework,ApplicationServices -lobjc $IMG_LIBS"
 +            IMG_LIBS="-Wl,-framework,Cocoa -Wl,-framework,Carbon -Wl,-framework,IOKit -Wl,-framework,ForceFeedback $IMG_LIBS"
          else
              CFLAGS="$CFLAGS -DSDL_IMAGE_USE_COMMON_BACKEND"
          fi
+@@ -12233,7 +12234,7 @@ find_lib()
+         host_lib_path="/usr/$base_libdir /usr/local/$base_libdir"
+     fi
+     for path in $env_lib_path $gcc_bin_path $gcc_lib_path $host_lib_path; do
+-        lib=`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' -e 's,.*/,,' | sort | tail -1`
++        lib=`ls -- $path/$1 2>/dev/null | sed -e '/\.so\..*\./d' | sort | tail -1`
+         if test x$lib != x; then
+             echo $lib
+             return