From 473cc05ae6da2706a6f6a568c45ebb6a6a518cb0e76e0c8040aeb5ae2061175f Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 22 Jun 2022 22:45:18 +0000 Subject: [PATCH] - Add 0001-configure.ac-Accept-SDL-1.2.50.patch OBS-URL: https://build.opensuse.org/package/show/multimedia:apps/schismtracker?expand=0&rev=44 --- 0001-configure.ac-Accept-SDL-1.2.50.patch | 28 +++++++++++++++++++++++ schismtracker.changes | 5 ++++ schismtracker.spec | 1 + 3 files changed, 34 insertions(+) create mode 100644 0001-configure.ac-Accept-SDL-1.2.50.patch diff --git a/0001-configure.ac-Accept-SDL-1.2.50.patch b/0001-configure.ac-Accept-SDL-1.2.50.patch new file mode 100644 index 0000000..d242911 --- /dev/null +++ b/0001-configure.ac-Accept-SDL-1.2.50.patch @@ -0,0 +1,28 @@ +From e52565aa278d4662a3ed1e2ef413a8c6d1f09f0c Mon Sep 17 00:00:00 2001 +From: "Haelwenn (lanodan) Monnier" +Date: Sun, 12 Jun 2022 19:56:16 +0200 +Subject: [PATCH] configure.ac: Accept SDL 1.2.50+ + +1.2.50+ (currently 1.2.52) is the version returned by the SDL 1.2 compatibility library[1]. + +1: https://github.com/libsdl-org/sdl12-compat +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 58bf2963..0e6b2eb3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -64,7 +64,7 @@ AC_SUBST(SDL_CONFIG) + if test "x$SDL_CONFIG" == "x"; then + AC_MSG_ERROR([*** sdl-config not found.]) + fi +-if $SDL_CONFIG --version | grep -qv 1.2.1; then ++if $SDL_CONFIG --version | grep -qv '1.2.\[1-9\]'; then + AC_MSG_ERROR([*** SDL version >= 1.2.10 not found.]) + fi + SDL_CFLAGS=$($SDL_CONFIG --cflags) +-- +2.36.1 + diff --git a/schismtracker.changes b/schismtracker.changes index 41fbfee..efa6dd5 100644 --- a/schismtracker.changes +++ b/schismtracker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed Jun 22 22:44:47 UTC 2022 - Jan Engelhardt + +- Add 0001-configure.ac-Accept-SDL-1.2.50.patch + ------------------------------------------------------------------- Tue May 17 08:16:41 UTC 2022 - Jan Engelhardt diff --git a/schismtracker.spec b/schismtracker.spec index 8388016..d395ecb 100644 --- a/schismtracker.spec +++ b/schismtracker.spec @@ -28,6 +28,7 @@ Source2: %name.desktop Patch1: schism-alsa.diff Patch2: schism-nodate.diff Patch3: schism-deptrack.diff +Patch4: 0001-configure.ac-Accept-SDL-1.2.50.patch BuildRequires: alsa-devel BuildRequires: autoconf BuildRequires: automake