From 1ce3b9ea4853c6ebcf09fa8ec56a15d7837462db Mon Sep 17 00:00:00 2001 From: Tim Schumacher Date: Sun, 21 Aug 2022 15:41:03 +0200 Subject: [PATCH] Ports/SDL2_image: Update to 2.6.2 --- Ports/AvailablePorts.md | 2 +- Ports/SDL2_image/package.sh | 11 +++++------ ...nable-shared-library-support-for-SerenityOS.patch | 12 ++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/Ports/AvailablePorts.md b/Ports/AvailablePorts.md index 3ee6ab969d6..96c7cc45506 100644 --- a/Ports/AvailablePorts.md +++ b/Ports/AvailablePorts.md @@ -215,7 +215,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n | [`SDL2`](SDL2/) | Simple DirectMedia Layer (SDL2) | 2.24.0 | https://github.com/libsdl-org/SDL | | [`SDL2-GNUBoy`](SDL2-GNUBoy/) | SDL2 GNUBoy | 1.2.1 | https://github.com/AlexOberhofer/SDL2-GNUBoy | | [`SDL2_gfx`](SDL2_gfx/) | SDL2\_gfx (Graphics primitives add-on for SDL2) | 1.0.4 | https://sourceforge.net/projects/sdl2gfx/ | -| [`SDL2_image`](SDL2_image/) | SDL2\_image (Image loading add-on for SDL2) | 2.0.5 | https://www.libsdl.org/projects/SDL_image/ | +| [`SDL2_image`](SDL2_image/) | SDL2\_image (Image loading add-on for SDL2) | 2.6.2 | https://github.com/libsdl-org/SDL_image | | [`SDL2_mixer`](SDL2_mixer/) | SDL2\_mixer (audio mixer add-on for SDL2) | 2.0.4 | https://www.libsdl.org/projects/SDL_mixer/ | | [`SDL2_net`](SDL2_net/) | SDL2\_net (network add-on for SDL2) | 2.0.1 | https://www.libsdl.org/projects/SDL_net/ | | [`SDL2_sound`](SDL2_sound/) | SDL2\_sound (Abstract soundfile decoder add-on for SDL2) | | https://github.com/icculus/SDL_sound | diff --git a/Ports/SDL2_image/package.sh b/Ports/SDL2_image/package.sh index 91d04a5cb25..6a2875f6021 100755 --- a/Ports/SDL2_image/package.sh +++ b/Ports/SDL2_image/package.sh @@ -1,11 +1,10 @@ #!/usr/bin/env -S bash ../.port_include.sh -port=SDL2_image -useconfigure=true -use_fresh_config_sub=true -version=2.0.5 +port='SDL2_image' +useconfigure='true' +version='2.6.2' depends=("SDL2" "libpng" "libjpeg" "libtiff") -files="https://www.libsdl.org/projects/SDL_image/release/SDL2_image-${version}.tar.gz SDL_image-${version}.tar.gz bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0" -auth_type=sha256 +files="https://github.com/libsdl-org/SDL_image/releases/download/release-${version}/SDL2_image-${version}.tar.gz SDL2_image-${version}.tar.gz 48355fb4d8d00bac639cd1c4f4a7661c4afef2c212af60b340e06b7059814777" +auth_type='sha256' configure() { run ./configure \ diff --git a/Ports/SDL2_image/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch b/Ports/SDL2_image/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch index 7b5eda721d2..474b9100e0f 100644 --- a/Ports/SDL2_image/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch +++ b/Ports/SDL2_image/patches/0001-libtool-Enable-shared-library-support-for-SerenityOS.patch @@ -17,11 +17,11 @@ static library into a shared library. 1 file changed, 23 insertions(+) diff --git a/configure b/configure -index 7eb305d..4299214 100755 +index 75f4d1e..6d3ee95 100755 --- a/configure +++ b/configure -@@ -4601,6 +4601,10 @@ sysv4 | sysv4.3*) - tpf*) +@@ -5276,6 +5276,10 @@ tpf*) + os2*) lt_cv_deplibs_check_method=pass_all ;; + @@ -31,7 +31,7 @@ index 7eb305d..4299214 100755 esac fi -@@ -7389,6 +7393,10 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } +@@ -7949,6 +7953,10 @@ printf %s "checking for $compiler option to produce PIC... " >&6; } lt_prog_compiler_static='-Bstatic' ;; @@ -42,7 +42,7 @@ index 7eb305d..4299214 100755 *) lt_prog_compiler_can_build_shared=no ;; -@@ -8625,6 +8633,10 @@ rm -f core conftest.err conftest.$ac_objext \ +@@ -9237,6 +9245,10 @@ rm -f core conftest.err conftest.$ac_objext conftest.beam \ hardcode_shlibpath_var=no ;; @@ -53,7 +53,7 @@ index 7eb305d..4299214 100755 *) ld_shlibs=no ;; -@@ -9527,6 +9539,17 @@ uts4*) +@@ -10162,6 +10174,17 @@ uts4*) shlibpath_var=LD_LIBRARY_PATH ;;