commit c9d9b5f831eb35d9b1a1f8b04ecaf0ab67d4d7c9
Author: Jan Palus <[email protected]>
Date: Wed Dec 6 11:34:30 2023 +0100
up to 2.8.0
SDL2_image.spec | 12 +++++-------
relax-soname-pattern.patch | 48 ----------------------------------------------
2 files changed, 5 insertions(+), 55 deletions(-)
---
diff --git a/SDL2_image.spec b/SDL2_image.spec
index 2a8acd2..69dc93d 100644
--- a/SDL2_image.spec
+++ b/SDL2_image.spec
@@ -8,19 +8,18 @@ Summary: Simple DirectMedia Layer 2 - Sample Image
Loading Library
Summary(pl.UTF-8): Przykładowa biblioteka do ładowania obrazków dla SDL2
Summary(pt_BR.UTF-8): Simple DirectMedia Layer 2 - Biblioteca exemplo para
carga de Imagens
Name: SDL2_image
-Version: 2.6.3
-Release: 2
+Version: 2.8.0
+Release: 1
License: Zlib-like
Group: Libraries
Source0:
https://github.com/libsdl-org/SDL_image/releases/download/release-%{version}/%{name}-%{version}.tar.gz
-# Source0-md5: 191c3eb49cc2dce30abff81398a92e81
+# Source0-md5: 7af4d39a5e6579715a996fd0dbd4b910
Patch0: %{name}-libjpeg.patch
-Patch1: relax-soname-pattern.patch
URL: https://github.com/libsdl-org/SDL_image
BuildRequires: SDL2-devel >= 2.0.9
BuildRequires: autoconf
BuildRequires: automake
-%{?with_avif:BuildRequires: libavif-devel}
+%{?with_avif:BuildRequires: libavif-devel >= 0.9.3}
BuildRequires: libjpeg-devel >= 8
%{?with_jxl:BuildRequires: libjxl-devel}
BuildRequires: libpng-devel >= 2:1.6.0
@@ -30,7 +29,7 @@ BuildRequires: libwebp-devel >= 0.6.0
BuildRequires: pkgconfig >= 1:0.9.0
BuildRequires: rpmbuild(macros) >= 1.527
Requires: SDL2 >= 2.0.9
-%{?with_avif:Suggests: libavif}
+%{?with_avif:Suggests: libavif >= 0.9.3}
Suggests: libjpeg >= 8
%{?with_jxl:Suggests: libjxl}
Suggests: libpng >= 2:1.6.0
@@ -97,7 +96,6 @@ Bibliotecas estáticas para desenvolvimento de aplicações SDL2.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%build
%{__libtoolize}
diff --git a/relax-soname-pattern.patch b/relax-soname-pattern.patch
deleted file mode 100644
index f846025..0000000
--- a/relax-soname-pattern.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From e77f5ac322b24fbcde94a55ed99ba61755c983eb Mon Sep 17 00:00:00 2001
-From: Jan Palus <[email protected]>
-Date: Sun, 10 Jul 2022 18:02:46 +0200
-Subject: [PATCH] autotools: relax soname pattern for dynamic loading
-
-SDL makes assumption that each dynamically loaded library must have
-SONAME matching pattern <libname>.so.<digit>+ hence it discards any file
-that has two (or more) digits after ".so". in practice however SONAME
-might be in the form of ie <libname>.so.<major>.<minor>.
-
-as a solution keep requirement for dynamically loaded files to be named
-<libname>.so.* but consider all the possibilities and prefer the shortest
-one.
-
-Fixes: #289
-From: libsdl-org/SDL#5901
----
- configure.ac | 7 ++++++-
- 1 file changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/configure.ac b/configure.ac
-index ca1013a..9cff1e7 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -67,6 +67,11 @@ AC_CHECK_TOOL(RC,[windres],[:])
- AC_PROG_INSTALL
- AC_PROG_MAKE_SET
- PKG_PROG_PKG_CONFIG
-+AC_PROG_AWK
-+
-+if test -z "$AWK"; then
-+ AC_MSG_ERROR([*** Required awk tool not found!])
-+fi
-
- case "$host" in
- *-*-beos*)
-@@ -132,7 +137,7 @@ find_lib()
- host_lib_path="$ac_default_prefix/$base_libdir
$ac_default_prefix/$base_bindir /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 's,.*/,,' | $AWK '{print
length() " " $0;}' | sort -n -r | tail -1 | sed 's/^[0-9]\+ //'`]
- if test x$lib != x; then
- echo $lib
- return
---
-2.37.0
-
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/SDL2_image.git/commitdiff/c9d9b5f831eb35d9b1a1f8b04ecaf0ab67d4d7c9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
