From 915bff0e42cc2a6431ee474cdd69a75f9a40cf3009517098a39a5c5b45e140ed Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 9 Jul 2022 13:02:37 +0000 Subject: [PATCH 1/2] - Update to release 2.6.0 OBS-URL: https://build.opensuse.org/package/show/games/SDL2_image?expand=0&rev=30 --- CVE-2019-13616.patch | 15 --------------- SDL2_image-2.0.5.tar.gz | 3 --- SDL2_image-2.6.0.tar.gz | 3 +++ SDL2_image.changes | 17 +++++++++++++++++ SDL2_image.spec | 20 +++++++++++--------- 5 files changed, 31 insertions(+), 27 deletions(-) delete mode 100644 CVE-2019-13616.patch delete mode 100644 SDL2_image-2.0.5.tar.gz create mode 100644 SDL2_image-2.6.0.tar.gz diff --git a/CVE-2019-13616.patch b/CVE-2019-13616.patch deleted file mode 100644 index eb11b02..0000000 --- a/CVE-2019-13616.patch +++ /dev/null @@ -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; diff --git a/SDL2_image-2.0.5.tar.gz b/SDL2_image-2.0.5.tar.gz deleted file mode 100644 index 7853a8f..0000000 --- a/SDL2_image-2.0.5.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0 -size 11736518 diff --git a/SDL2_image-2.6.0.tar.gz b/SDL2_image-2.6.0.tar.gz new file mode 100644 index 0000000..0c04631 --- /dev/null +++ b/SDL2_image-2.6.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:611c862f40de3b883393aabaa8d6df350aa3ae4814d65030972e402edae85aaa +size 9811760 diff --git a/SDL2_image.changes b/SDL2_image.changes index d2eed4f..972237f 100644 --- a/SDL2_image.changes +++ b/SDL2_image.changes @@ -1,3 +1,20 @@ +------------------------------------------------------------------- +Fri Jul 8 20:20:20 UTC 2022 - Jan Engelhardt + +- 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) + ------------------------------------------------------------------- Fri Aug 23 14:04:59 UTC 2019 - Michael Gorse diff --git a/SDL2_image.spec b/SDL2_image.spec index 4ec81cf..720413f 100644 --- a/SDL2_image.spec +++ b/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,8 @@ 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 @@ -69,9 +68,11 @@ dos2unix *.txt rm -rf external %build -%configure --disable-png-shared --disable-jpg-shared --disable-tif-shared \ - --disable-webp-shared --disable-static -make %{?_smp_mflags} +# --disable-*-shared: Link, rather than dlopen. +# +%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 %doc CHANGES.txt README.txt %_includedir/SDL2/ %_libdir/libSDL2_image.so -%_libdir/pkgconfig/SDL2_image.pc +%_libdir/cmake/ +%_libdir/pkgconfig/*.pc %changelog From 9d6ad20e17524bacf399637fcafa94873819db70fcf8cf727bbf50b0b09745cb Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Sat, 9 Jul 2022 13:13:09 +0000 Subject: [PATCH 2/2] - Rename -devel subpackage based on SRPM name - Drop baselibs.conf (no SDL2_ttf-dependent Tumbleweed packages themselves have baselibs). OBS-URL: https://build.opensuse.org/package/show/games/SDL2_image?expand=0&rev=31 --- SDL2_image.changes | 3 +++ SDL2_image.spec | 10 +++++----- baselibs.conf | 6 ------ 3 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 baselibs.conf diff --git a/SDL2_image.changes b/SDL2_image.changes index 972237f..9691aa0 100644 --- a/SDL2_image.changes +++ b/SDL2_image.changes @@ -14,6 +14,9 @@ Fri Jul 8 20:20:20 UTC 2022 - Jan Engelhardt * 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 diff --git a/SDL2_image.spec b/SDL2_image.spec index 720413f..a6a27aa 100644 --- a/SDL2_image.spec +++ b/SDL2_image.spec @@ -27,7 +27,6 @@ URL: https://libsdl.org/projects/SDL_image/ #Hg-Clone: http://hg.libsdl.org/SDL_image/ Source: https://github.com/libsdl-org/SDL_image/releases/download/release-%version/SDL2_image-%version.tar.gz -Source2: baselibs.conf BuildRequires: dos2unix BuildRequires: libjpeg-devel BuildRequires: libtiff-devel @@ -51,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. @@ -85,7 +85,7 @@ rm -f "%buildroot/%_libdir"/*.la %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 diff --git a/baselibs.conf b/baselibs.conf deleted file mode 100644 index 9fb02b1..0000000 --- a/baselibs.conf +++ /dev/null @@ -1,6 +0,0 @@ -libSDL2_image-2_0-0 - provides "SDL2_image- = " - obsoletes "SDL2_image- <= " -libSDL2_image-devel - requires -libSDL2_image- - requires "libSDL2_image-2_0-0- = "