diff --git a/alure-1.2-fluidsynth-cflags-fix.patch b/alure-1.2-fluidsynth-cflags-fix.patch new file mode 100644 index 0000000..5a3d21e --- /dev/null +++ b/alure-1.2-fluidsynth-cflags-fix.patch @@ -0,0 +1,14 @@ +diff -up alure-1.2/CMakeLists.txt.fluidsynth-cflags-fix alure-1.2/CMakeLists.txt +--- alure-1.2/CMakeLists.txt.fluidsynth-cflags-fix 2011-07-29 04:37:48.000000000 -0400 ++++ alure-1.2/CMakeLists.txt 2023-01-11 15:40:29.823041640 -0500 +@@ -375,8 +375,8 @@ IF(FLUIDSYNTH) + ELSE(NOT FLUIDSYNTH_FOUND) + SET(HAS_FLUIDSYNTH 1) + LINK_DIRECTORIES(${FLUIDSYNTH_LIBRARY_DIRS}) +- SET_SOURCE_FILES_PROPERTIES(src/codec_fluidsynth.cpp PROPERTIES +- COMPILE_FLAGS "${FLUIDSYNTH_CFLAGS}") ++ STRING(REPLACE ";" " " FLUIDSYNTH_PROPER_CFLAGS "${FLUIDSYNTH_CFLAGS}") ++ SET_PROPERTY(SOURCE src/codec_fluidsynth.cpp PROPERTY COMPILE_FLAGS ${FLUIDSYNTH_PROPER_CFLAGS}) + ENDIF(NOT FLUIDSYNTH_FOUND) + IF(HAS_FLUIDSYNTH) + SET(ALURE_OBJS ${ALURE_OBJS} src/codec_fluidsynth.cpp) diff --git a/alure-1.2-sndfile-cflags-fix.patch b/alure-1.2-sndfile-cflags-fix.patch new file mode 100644 index 0000000..8ac0ebe --- /dev/null +++ b/alure-1.2-sndfile-cflags-fix.patch @@ -0,0 +1,15 @@ +diff -up alure-1.2/CMakeLists.txt.sndfile-cflags-fix alure-1.2/CMakeLists.txt +--- alure-1.2/CMakeLists.txt.sndfile-cflags-fix 2024-10-22 09:12:33.559930694 -0400 ++++ alure-1.2/CMakeLists.txt 2024-10-22 09:12:39.122009443 -0400 +@@ -214,8 +214,9 @@ IF(SNDFILE) + IF(SNDFILE_FOUND) + SET(HAS_SNDFILE 1) + LINK_DIRECTORIES(${SNDFILE_LIBRARY_DIRS}) +- SET_SOURCE_FILES_PROPERTIES(src/codec_sndfile.cpp PROPERTIES +- COMPILE_FLAGS "${SNDFILE_CFLAGS}") ++ STRING(REPLACE ";" " " SNDFILE_PROPER_CFLAGS "${SNDFILE_CFLAGS}") ++ SET_PROPERTY(SOURCE src/codec_sndfile.cpp PROPERTY ++ COMPILE_FLAGS "${SNDFILE_PROPER_CFLAGS}") + ELSE(SNDFILE_FOUND) + FIND_PACKAGE(SndFile) + IF(SNDFILE_FOUND) diff --git a/alure-1.2-use-unique_ptr.patch b/alure-1.2-use-unique_ptr.patch new file mode 100644 index 0000000..548a24c --- /dev/null +++ b/alure-1.2-use-unique_ptr.patch @@ -0,0 +1,85 @@ +diff -up alure-1.2/include/main.h.unique_ptr alure-1.2/include/main.h +--- alure-1.2/include/main.h.unique_ptr 2024-10-22 09:03:09.652946816 -0400 ++++ alure-1.2/include/main.h 2024-10-22 09:03:28.493213559 -0400 +@@ -312,7 +312,7 @@ T1 SearchSecond(T1 start, T1 end, T2 val + } + + struct Decoder { +- typedef std::auto_ptr(*FactoryType)(std::istream*); ++ typedef std::unique_ptr(*FactoryType)(std::istream*); + typedef std::multimap ListType; + + static const ListType& GetList(); +@@ -336,11 +336,11 @@ struct DecoderDecl : public Decoder { + } + + private: +- static std::auto_ptr Factory(std::istream *file) ++ static std::unique_ptr Factory(std::istream *file) + { +- std::auto_ptr ret(new T(file)); ++ std::unique_ptr ret(new T(file)); + if(ret->IsValid()) return ret; +- return std::auto_ptr(); ++ return std::unique_ptr(); + } + }; + +diff -up alure-1.2/src/buffer.cpp.unique_ptr alure-1.2/src/buffer.cpp +--- alure-1.2/src/buffer.cpp.unique_ptr 2024-10-22 09:03:37.423339989 -0400 ++++ alure-1.2/src/buffer.cpp 2024-10-22 09:03:52.266550135 -0400 +@@ -38,8 +38,8 @@ static bool load_stream(alureStream *_st + if(!_stream) + return false; + +- std::auto_ptr fstream(_stream->fstream); +- std::auto_ptr stream(_stream); ++ std::unique_ptr fstream(_stream->fstream); ++ std::unique_ptr stream(_stream); + + ALenum format; + ALuint freq, blockAlign; +diff -up alure-1.2/src/stream.cpp.unique_ptr alure-1.2/src/stream.cpp +--- alure-1.2/src/stream.cpp.unique_ptr 2024-10-22 09:04:00.044660257 -0400 ++++ alure-1.2/src/stream.cpp 2024-10-22 09:04:17.381905734 -0400 +@@ -35,8 +35,8 @@ static bool SizeIsUS = false; + + static alureStream *InitStream(alureStream *instream, ALsizei chunkLength, ALsizei numBufs, ALuint *bufs) + { +- std::auto_ptr fstream(instream->fstream); +- std::auto_ptr stream(instream); ++ std::unique_ptr fstream(instream->fstream); ++ std::unique_ptr stream(instream); + ALenum format; + ALuint freq, blockAlign; + +diff -up alure-1.2/src/streamdec.cpp.unique_ptr alure-1.2/src/streamdec.cpp +--- alure-1.2/src/streamdec.cpp.unique_ptr 2024-10-22 09:04:24.078000540 -0400 ++++ alure-1.2/src/streamdec.cpp 2024-10-22 09:04:38.803209018 -0400 +@@ -124,7 +124,7 @@ static alureStream *get_stream_decoder(c + std::map::iterator i = InstalledCallbacks.begin(); + while(i != InstalledCallbacks.end() && i->first < 0) + { +- std::auto_ptr stream(new customStream(fdata, i->second)); ++ std::unique_ptr stream(new customStream(fdata, i->second)); + if(stream->IsValid()) return stream.release(); + i++; + } +@@ -140,7 +140,7 @@ static alureStream *get_stream_decoder(c + file->clear(); + file->seekg(0, std::ios_base::beg); + +- std::auto_ptr stream(factory->second(file)); ++ std::unique_ptr stream(factory->second(file)); + if(stream.get() != NULL) return stream.release(); + + factory++; +@@ -157,7 +157,7 @@ static alureStream *get_stream_decoder(c + + while(i != InstalledCallbacks.end()) + { +- std::auto_ptr stream(new customStream(fdata, i->second)); ++ std::unique_ptr stream(new customStream(fdata, i->second)); + if(stream->IsValid()) return stream.release(); + i++; + } diff --git a/alure.spec b/alure.spec index 81b4e16..18ccdde 100644 --- a/alure.spec +++ b/alure.spec @@ -1,72 +1,124 @@ Name: alure Version: 1.2 -Release: 19%{?dist} +Release: 36%{?dist} Summary: Audio Library Tools REloaded # ALURE code is LGPLv2+; note -devel subpackage has its own license tag -License: LGPLv2+ +License: LGPL-2.1-or-later URL: http://kcat.strangesoft.net/alure.html Source0: http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}.tar.bz2 Patch0: alure-gcc47.patch +Patch1: alure-1.2-fluidsynth-cflags-fix.patch +Patch2: alure-1.2-use-unique_ptr.patch +Patch3: alure-1.2-sndfile-cflags-fix.patch BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: cmake, libvorbis-devel, libsndfile-devel, openal-soft-devel, flac-devel, dumb-devel, fluidsynth-devel - %description -ALURE is a utility library to help manage common tasks with OpenAL -applications. This includes device enumeration and initialization, -file loading, and streaming. - +ALURE is a utility library to help manage common tasks with OpenAL +applications. This includes device enumeration and initialization, +file loading, and streaming. %package devel Summary: Development files for %{name} # Devel doc includes some files under GPLv2+ from NaturalDocs -License: LGPLv2+ and GPLv2+ +License: LGPL-2.1-or-later AND GPL-2.0-or-later Requires: %{name} = %{version}-%{release} Requires: pkgconfig - %description devel The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %prep -%setup -q -%patch0 - +%setup -q +%patch -P0 +%patch -P1 -p1 -b .fluidsynth-cflags-fix +%patch -P2 -p1 -b .unique_ptr +%patch -P3 -p1 -b .sndfile-cflags-fix %build -%cmake . -DBUILD_STATIC:BOOL=OFF -make VERBOSE=1 %{?_smp_mflags} - +export CMAKE_POLICY_VERSION_MINIMUM=3.5 +%cmake \ + %if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} \ + %endif + -DBUILD_STATIC:BOOL=OFF +%cmake_build %install -rm -rf %{buildroot} -make install DESTDIR=%{buildroot} +%cmake_install + find %{buildroot} -name '*.la' -exec rm -f {} ';' # strip installed html doc rm -rf %{buildroot}%{_docdir}/alure/html - - %ldconfig_scriptlets - %files %doc COPYING %{_libdir}/*.so.* %{_bindir}/alure* - %files devel %doc docs/html examples %{_includedir}/AL/ %{_libdir}/*.so %{_libdir}/pkgconfig/*.pc - %changelog +* Fri Jan 16 2026 Fedora Release Engineering - 1.2-36 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Wed Jul 23 2025 Fedora Release Engineering - 1.2-35 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Fri May 30 2025 Cristian Le - 1.2-34 +- Allow to build with CMake 4.0 + +* Thu Jan 16 2025 Fedora Release Engineering - 1.2-33 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Tue Oct 22 2024 Tom Callaway - 1.2-32 +- fix FTBFS, apply a minor C++ cleanup + +* Wed Jul 17 2024 Fedora Release Engineering - 1.2-31 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Mon Jan 22 2024 Fedora Release Engineering - 1.2-30 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Fri Jan 19 2024 Fedora Release Engineering - 1.2-29 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Wed Jul 19 2023 Fedora Release Engineering - 1.2-28 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Wed Jan 18 2023 Fedora Release Engineering - 1.2-27 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Tue Jan 17 2023 Tom Callaway - 1.2-26 +- fix FTBFS + +* Wed Jul 20 2022 Fedora Release Engineering - 1.2-25 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Wed Jan 19 2022 Fedora Release Engineering - 1.2-24 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Wed Jul 21 2021 Fedora Release Engineering - 1.2-23 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Tue Jan 26 2021 Fedora Release Engineering - 1.2-22 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Fri Jul 31 2020 Fedora Release Engineering - 1.2-21 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Mon Jul 27 2020 Fedora Release Engineering - 1.2-20 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Tue Jan 28 2020 Fedora Release Engineering - 1.2-19 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild