From 7db087f6625fc888655f23a09f33f5297970849a Mon Sep 17 00:00:00 2001 From: Funda Wang Date: Wed, 29 Jan 2025 19:51:58 +0800 Subject: [PATCH] allow build with sdl12_compat --- libvisual-use-sdl12_compat.patch | 12 ++++++++++++ libvisual.spec | 9 ++++++--- 2 files changed, 18 insertions(+), 3 deletions(-) create mode 100644 libvisual-use-sdl12_compat.patch diff --git a/libvisual-use-sdl12_compat.patch b/libvisual-use-sdl12_compat.patch new file mode 100644 index 0000000..fc5678a --- /dev/null +++ b/libvisual-use-sdl12_compat.patch @@ -0,0 +1,12 @@ +--- libvisual-0.4.2/configure.ac.orig 2025-01-29 19:43:39.335429700 +0800 ++++ libvisual-0.4.2/configure.ac 2025-01-29 19:50:25.784148900 +0800 +@@ -397,7 +397,9 @@ + # Find SDL 1.x.x + # On success, this will set and substitute SDL_CFLAGS and SDL_LIBS + PKG_CHECK_MODULES([SDL], [sdl >= 1.2.0], [], [ ++ PKG_CHECK_MODULES([SDL], [sdl12_compat >= 1.2.0], [], [ + AC_MSG_ERROR([*** SDL 1.2.x not installed - please install first]) ++ ]) + ]) + if test x$examples = xyes ; then + AC_SUBST([EXAMPLES], ['simplesdl morphsdl']) diff --git a/libvisual.spec b/libvisual.spec index 44409c0..e457053 100644 --- a/libvisual.spec +++ b/libvisual.spec @@ -1,6 +1,6 @@ Name: libvisual Version: 0.4.2 -Release: 4 +Release: 5 Epoch: 1 Summary: Audio Visualization Library @@ -12,9 +12,10 @@ Patch1: libvisual-0.4.0-inlinedefineconflict.patch Patch2: libvisual-0.4.2-sw.patch Patch3: libvisual-0.4.2-respect-environment-ldflags.patch Patch4: libvisual-c99.patch +Patch5: libvisual-use-sdl12_compat.patch BuildRequires: libtool gettext-devel gcc-c++ doxygen autoconf-archive automake -BuildRequires: pkgconfig(sdl) >= 1.2.0 +BuildRequires: SDL-devel >= 1.2.0 %description Libvisual is a library that acts as a middle layer between applications @@ -38,7 +39,6 @@ libraries. %autosetup -n %{name}-%{version} -p1 %build -#automake upgrade to 1.17 and autoconf upgrade to 2.72, but libvisual configure etc files also 1.16.5, so autoreconf autoreconf -f %configure --disable-static %make_build @@ -62,6 +62,9 @@ autoreconf -f %{_libdir}/pkgconfig/*.pc %changelog +* Wed Jan 29 2025 Funda Wang - 1:0.4.2-5 +- allow build with sdl12_compat + * Mon Aug 05 2024 Funda Wang - 1:0.4.2-4 - Add patch to respect environment LDFLAGS - C99 compatibility fixes -- Gitee