Accepting request 988088 from games

- Update to release 2.6.0

OBS-URL: https://build.opensuse.org/request/show/988088
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/SDL2_image?expand=0&rev=12

CVE-2019-13616.patch

@@ -1,15 +0,0 @@
-diff -r f1baffa48926 -r ba45f00879ba IMG_bmp.c
---- a/IMG_bmp.c	Tue Jul 30 10:16:02 2019 -0700
-+++ b/IMG_bmp.c	Tue Jul 30 11:00:12 2019 -0700
-@@ -351,6 +351,11 @@
-             SDL_RWseek(src, (biSize - headerSize), RW_SEEK_CUR);
-         }
-     }
-+    if (biWidth <= 0 || biHeight == 0) {
-+        IMG_SetError("BMP file with bad dimensions (%dx%d)", biWidth, biHeight);
-+        was_error = SDL_TRUE;
-+        goto done;
-+    }
-     if (biHeight < 0) {
-         topDown = SDL_TRUE;
-         biHeight = -biHeight;

SDL2_image-2.0.5.tar.gz

@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0
-size 11736518

SDL2_image-2.6.0.tar.gz

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:611c862f40de3b883393aabaa8d6df350aa3ae4814d65030972e402edae85aaa
+size 9811760

SDL2_image.changes

@@ -1,3 +1,23 @@
+-------------------------------------------------------------------
+Fri Jul  8 20:20:20 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to release 2.6.0
+  * Added stb_image as the default backend for JPG and PNG images loading.
+    To use libpng and libjpg instead, configure using --disable-stb-image
+  * Added IMG_LoadSizedSVG_RW()
+  * Added support for AVIF images (https://github.com/AOMediaCodec/libavif [github.com])
+  * Added IMG_ReadXPMFromArrayToRGB888()
+  * Added support for JXL images (https://jpegxl.info/ [jpegxl.info])
+  * Added support for QOI images (https://qoiformat.org/ [qoiformat.org])
+  * Fixed XCF regression introduced in 2.0.5
+  * Added support for loading animated GIFs
+  * LoadBMP() now loads files using SDL2
+  * Allow using libwebpdecoder instead libwebp
+- Remove CVE-2019-13616.patch (merged)
+- Rename -devel subpackage based on SRPM name
+- Drop baselibs.conf (no SDL2_ttf-dependent Tumbleweed packages
+  themselves have baselibs).
+
 -------------------------------------------------------------------
 Fri Aug 23 14:04:59 UTC 2019 - Michael Gorse <mgorse@suse.com>
 

SDL2_image.spec

@@ -1,7 +1,7 @@
 #
 # spec file for package SDL2_image
 #
-# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2022 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -18,7 +18,7 @@
 
 Name:           SDL2_image
 %define lname	libSDL2_image-2_0-0
-Version:        2.0.5
+Version:        2.6.0
 Release:        0
 Summary:        Simple DirectMedia Layer 2 image loading library
 License:        Zlib
@@ -26,9 +26,7 @@ Group:          Development/Libraries/X11
 URL:            https://libsdl.org/projects/SDL_image/
 
 #Hg-Clone:	http://hg.libsdl.org/SDL_image/
-Source:         https://libsdl.org/projects/SDL_image/release/%name-%version.tar.gz
+Source:         https://github.com/libsdl-org/SDL_image/releases/download/release-%version/SDL2_image-%version.tar.gz
-Source2:        baselibs.conf
-Patch1:         CVE-2019-13616.patch
 BuildRequires:  dos2unix
 BuildRequires:  libjpeg-devel
 BuildRequires:  libtiff-devel
@@ -52,13 +50,14 @@ This is a simple library to load images of various formats as SDL
 surfaces. This library supports the BMP, PPM, PCX, GIF, JPEG, PNG,
 TIFF and WEBP formats.
 
-%package -n libSDL2_image-devel
+%package devel
 Summary:        Development files for the SDL2 image loader library
 Group:          Development/Libraries/X11
 Requires:       %lname = %version
-Provides:       SDL2_image-devel = %version-%release
+Obsoletes:      libSDL2_image-devel < %version-%release
+Provides:       libSDL2_image-devel = %version-%release
 
-%description -n libSDL2_image-devel
+%description devel
 This is a simple library to load images of various formats as SDL
 surfaces. This library supports the BMP, PPM, PCX, GIF, JPEG, PNG,
 TIFF and WEBP formats.
@@ -69,9 +68,11 @@ dos2unix *.txt
 rm -rf external
 
 %build
-%configure --disable-png-shared --disable-jpg-shared --disable-tif-shared \
+# --disable-*-shared: Link, rather than dlopen.
-	--disable-webp-shared --disable-static
+#
-make %{?_smp_mflags}
+%configure --disable-stb-image --disable-png-shared --disable-jpg-shared \
+	--disable-tif-shared --disable-webp-shared --disable-static
+%make_build
 
 %install
 %make_install
@@ -81,13 +82,14 @@ rm -f "%buildroot/%_libdir"/*.la
 %postun -n %lname -p /sbin/ldconfig
 
 %files -n %lname
-%license COPYING.txt
+%license LICENSE.txt
 %_libdir/libSDL2_image-2*.so.*
 
-%files -n libSDL2_image-devel
+%files devel
 %doc CHANGES.txt README.txt
 %_includedir/SDL2/
 %_libdir/libSDL2_image.so
-%_libdir/pkgconfig/SDL2_image.pc
+%_libdir/cmake/
+%_libdir/pkgconfig/*.pc
 
 %changelog

baselibs.conf

@@ -1,6 +0,0 @@
-libSDL2_image-2_0-0
-  provides "SDL2_image-<targettype> = <version>"
-  obsoletes "SDL2_image-<targettype> <= <version>"
-libSDL2_image-devel
-  requires -libSDL2_image-<targettype>
-  requires "libSDL2_image-2_0-0-<targettype> = <version>"