From f5393b36afed38a434575c0162af6c072261ee68 Mon Sep 17 00:00:00 2001 From: Giovanni Mariani Date: Fri, 6 Oct 2023 17:35:10 +0200 Subject: [PATCH] Updated to release 2.0.2, updated P0 and file lists --- .abf.yml | 2 +- sdl2_sound-2.0.2-sdl2-path.patch | 58 ++++++++++++++++++++++++++++++++ sdl2_sound-sdl2-path.patch | 36 -------------------- sdl2_sound.spec | 32 +++++++++++------- 4 files changed, 79 insertions(+), 49 deletions(-) create mode 100644 sdl2_sound-2.0.2-sdl2-path.patch delete mode 100644 sdl2_sound-sdl2-path.patch diff --git a/.abf.yml b/.abf.yml index eef9ac7..3cbc886 100644 --- a/.abf.yml +++ b/.abf.yml @@ -1,2 +1,2 @@ sources: - SDL_sound-2.0.1.tar.gz: 53b035d88f7348a8c373da71254c9e7b947de5f5 + SDL_sound-2.0.2.tar.gz: e095baeaf33631850bab7f727bd8a3a2ff2f9d7f diff --git a/sdl2_sound-2.0.2-sdl2-path.patch b/sdl2_sound-2.0.2-sdl2-path.patch new file mode 100644 index 0000000..9d0d2b9 --- /dev/null +++ b/sdl2_sound-2.0.2-sdl2-path.patch @@ -0,0 +1,58 @@ +diff -rupN SDL_sound-2.0.2.old/cmake/test/main.c SDL_sound-2.0.2/cmake/test/main.c +--- SDL_sound-2.0.2.old/cmake/test/main.c 2023-06-29 16:48:42.000000000 +0200 ++++ SDL_sound-2.0.2/cmake/test/main.c 2023-10-06 17:19:02.567869572 +0200 +@@ -1,5 +1,5 @@ + #define SDL_MAIN_HANDLED +-#include "SDL.h" ++#include "SDL2/SDL.h" + #include "SDL_sound.h" + #include + +diff -rupN SDL_sound-2.0.2.old/examples/playsound.c SDL_sound-2.0.2/examples/playsound.c +--- SDL_sound-2.0.2.old/examples/playsound.c 2023-06-29 16:48:42.000000000 +0200 ++++ SDL_sound-2.0.2/examples/playsound.c 2023-10-06 17:19:47.945301715 +0200 +@@ -13,7 +13,7 @@ + #ifdef _WIN32 + #define SDL_MAIN_HANDLED /* this is a console-only app */ + #endif +-#include "SDL.h" ++#include "SDL2/SDL.h" + #include "SDL_sound.h" + + #include +diff -rupN SDL_sound-2.0.2.old/examples/playsound_simple.c SDL_sound-2.0.2/examples/playsound_simple.c +--- SDL_sound-2.0.2.old/examples/playsound_simple.c 2023-06-29 16:48:42.000000000 +0200 ++++ SDL_sound-2.0.2/examples/playsound_simple.c 2023-10-06 17:19:36.521976482 +0200 +@@ -18,7 +18,7 @@ + #ifdef _WIN32 + #define SDL_MAIN_HANDLED /* this is a console-only app */ + #endif +-#include "SDL.h" ++#include "SDL2/SDL.h" + #include "SDL_sound.h" + + /* global decoding state. */ +diff -rupN SDL_sound-2.0.2.old/src/libmodplug/fastmix.c SDL_sound-2.0.2/src/libmodplug/fastmix.c +--- SDL_sound-2.0.2.old/src/libmodplug/fastmix.c 2023-06-29 16:48:42.000000000 +0200 ++++ SDL_sound-2.0.2/src/libmodplug/fastmix.c 2023-10-06 17:23:54.582977272 +0200 +@@ -8,7 +8,7 @@ + #include "libmodplug.h" + #include + +-#include "SDL_stdinc.h" ++#include "SDL2/SDL_stdinc.h" + #define floor SDL_floor + + /* +diff -rupN SDL_sound-2.0.2.old/src/SDL_sound.h SDL_sound-2.0.2/src/SDL_sound.h +--- SDL_sound-2.0.2.old/src/SDL_sound.h 2023-06-29 16:48:42.000000000 +0200 ++++ SDL_sound-2.0.2/src/SDL_sound.h 2023-10-06 17:20:09.766868798 +0200 +@@ -50,7 +50,7 @@ + #ifndef _INCLUDE_SDL_SOUND_H_ + #define _INCLUDE_SDL_SOUND_H_ + +-#include "SDL.h" ++#include "SDL2/SDL.h" + + #if SDL_MAJOR_VERSION < 2 + #error SDL2_sound requires SDL 2.0.0 or later. diff --git a/sdl2_sound-sdl2-path.patch b/sdl2_sound-sdl2-path.patch deleted file mode 100644 index 53fd718..0000000 --- a/sdl2_sound-sdl2-path.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ur SDL_sound-2.0.1/examples/playsound.c SDL_sound-2.0.1_patched/examples/playsound.c ---- SDL_sound-2.0.1/examples/playsound.c 2022-03-25 23:17:50.000000000 +0300 -+++ SDL_sound-2.0.1_patched/examples/playsound.c 2022-04-20 09:06:24.649341390 +0300 -@@ -21,7 +21,7 @@ - #ifdef _WIN32 - #define SDL_MAIN_HANDLED /* this is a console-only app */ - #endif --#include "SDL.h" -+#include "SDL2/SDL.h" - #include "SDL_sound.h" - - #define DEFAULT_DECODEBUF 16384 -diff -ur SDL_sound-2.0.1/examples/playsound_simple.c SDL_sound-2.0.1_patched/examples/playsound_simple.c ---- SDL_sound-2.0.1/examples/playsound_simple.c 2022-03-25 23:17:50.000000000 +0300 -+++ SDL_sound-2.0.1_patched/examples/playsound_simple.c 2022-04-20 09:06:40.035635467 +0300 -@@ -18,7 +18,7 @@ - #ifdef _WIN32 - #define SDL_MAIN_HANDLED /* this is a console-only app */ - #endif --#include "SDL.h" -+#include "SDL2/SDL.h" - #include "SDL_sound.h" - - /* global decoding state. */ -diff -ur SDL_sound-2.0.1/src/SDL_sound.h SDL_sound-2.0.1_patched/src/SDL_sound.h ---- SDL_sound-2.0.1/src/SDL_sound.h 2022-03-25 23:17:50.000000000 +0300 -+++ SDL_sound-2.0.1_patched/src/SDL_sound.h 2022-04-20 09:07:06.588326724 +0300 -@@ -50,7 +50,7 @@ - #ifndef _INCLUDE_SDL_SOUND_H_ - #define _INCLUDE_SDL_SOUND_H_ - --#include "SDL.h" -+#include "SDL2/SDL.h" - - #if SDL_MAJOR_VERSION < 2 - #error SDL2_sound requires SDL 2.0.0 or later. diff --git a/sdl2_sound.spec b/sdl2_sound.spec index 6f2ac59..3110278 100644 --- a/sdl2_sound.spec +++ b/sdl2_sound.spec @@ -1,20 +1,21 @@ -%define major 2 -%define libname %mklibname %{name} %{major} -%define develname %mklibname -d %{name} -%define oname SDL_sound +%define major 2 +%define libname %mklibname %{name} %{major} +%define develname %mklibname -d %{name} +%define oname SDL_sound Summary: An abstract SDL2 sound-file decoder Name: sdl2_sound # see cmake file #set(SDLSOUND_VERSION 2.0.0) -Version: 2.0.1 -Release: 2 +Version: 2.0.2 +Release: 1 License: zlib Group: System/Libraries Url: https://hg.icculus.org/icculus/SDL_sound/ Source0: https://github.com/icculus/SDL_sound/archive/v%{version}.tar.gz?/%{oname}-%{version}.tar.gz -Patch0: sdl2_sound-sdl2-path.patch +Patch0: sdl2_sound-2.0.2-sdl2-path.patch BuildRequires: cmake +BuildRequires: doxygen BuildRequires: physfs-devel BuildRequires: pkgconfig(flac) BuildRequires: pkgconfig(libmikmod) @@ -24,7 +25,7 @@ BuildRequires: pkgconfig(speex) BuildRequires: pkgconfig(vorbis) %description -SDL2_sound is SDL_sound but with a SDL2 backend. This is a library +SDL2_sound is SDL_sound but with a SDL2 back-end. This is a library that handles the decoding of several popular sound file formats, such as .WAV and .MP3. It is meant to make the programmer's sound playback tasks simpler. The programmer gives SDL2_sound a file-name, or feeds it @@ -39,7 +40,7 @@ behind-the-scenes. %files %doc docs/CREDITS.txt %license LICENSE.txt -%{_bindir}/* +%{_bindir}/playsound #-------------------------------------------------------------- @@ -51,7 +52,7 @@ Group: System/Libraries %{summary}. %files -n %{libname} -%doc docs/README.txt docs/INSTALL.txt +%doc README.md %{_libdir}/libSDL2_sound.so.%{major} %{_libdir}/libSDL2_sound.so.%{major}.* @@ -69,20 +70,27 @@ Provides: %{name}-devel = %{EVRD} %{summary}. %files -n %{develname} -%{_libdir}/lib*.so +%doc README.md docs/INSTALL.txt +%{_libdir}/libSDL2_sound.so %{_includedir}/SDL2/SDL_sound.h +%{_libdir}/cmake/SDL2_sound/*.cmake +%{_libdir}/pkgconfig/SDL2_sound.pc #------------------------------------------------------------- %prep %autosetup -p1 -n %{oname}-%{version} + %build export CFLAGS="%{optflags} -lm -lSDL2" %cmake + %make + %install %makeinstall_std -C build -# remove static stuff + +# Remove static stuff find %{buildroot}%{_libdir} -name '*.la' -o -name "*.a" -exec rm {} \;