From e7d5ac5edbb7d8160eecd4ac51e9b3fc02da6b93 Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:46 +0200 Subject: [PATCH 1/7] Eliminate use of obsolete %patchN syntax (#2283636) --- alure.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/alure.spec b/alure.spec index 06e215d..b7c27e5 100644 --- a/alure.spec +++ b/alure.spec @@ -33,8 +33,8 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -%patch1 -p1 -b .fluidsynth-cflags-fix +%patch -P0 +%patch -P1 -p1 -b .fluidsynth-cflags-fix %build %cmake -DBUILD_STATIC:BOOL=OFF From 66b83eefa2c1cd178e2af0a6067bd426fc8dbdc4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 17 Jul 2024 16:54:10 +0000 Subject: [PATCH 2/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- alure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alure.spec b/alure.spec index b7c27e5..b3fd01b 100644 --- a/alure.spec +++ b/alure.spec @@ -3,7 +3,7 @@ Name: alure Version: 1.2 -Release: 30%{?dist} +Release: 31%{?dist} Summary: Audio Library Tools REloaded # ALURE code is LGPLv2+; note -devel subpackage has its own license tag License: LGPL-2.1-or-later @@ -61,6 +61,9 @@ rm -rf %{buildroot}%{_docdir}/alure/html %{_libdir}/pkgconfig/*.pc %changelog +* 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 From 869c112cbacd62ca749d95be245bcaaf43a166ee Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 22 Oct 2024 09:15:10 -0400 Subject: [PATCH 3/7] fix FTBFS, apply a minor C++ cleanup --- alure-1.2-sndfile-cflags-fix.patch | 15 ++++++ alure-1.2-use-unique_ptr.patch | 85 ++++++++++++++++++++++++++++++ alure.spec | 13 +++-- 3 files changed, 110 insertions(+), 3 deletions(-) create mode 100644 alure-1.2-sndfile-cflags-fix.patch create mode 100644 alure-1.2-use-unique_ptr.patch 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 1634ec9..d9eac69 100644 --- a/alure.spec +++ b/alure.spec @@ -3,7 +3,7 @@ Name: alure Version: 1.2 -Release: 26%{?dist} +Release: 27%{?dist} Summary: Audio Library Tools REloaded # ALURE code is LGPLv2+; note -devel subpackage has its own license tag License: LGPL-2.1-or-later @@ -11,6 +11,8 @@ 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 @@ -33,8 +35,10 @@ developing applications that use %{name}. %prep %setup -q -%patch0 -%patch1 -p1 -b .fluidsynth-cflags-fix +%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 @@ -61,6 +65,9 @@ rm -rf %{buildroot}%{_docdir}/alure/html %{_libdir}/pkgconfig/*.pc %changelog +* Tue Oct 22 2024 Tom Callaway - 1.2-27 +- fix FTBFS, apply a minor C++ cleanup + * Tue Jan 17 2023 Tom Callaway - 1.2-26 - fix FTBFS From 38914b5bd78b326726c05ef668e7e3875b24c5d4 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 16 Jan 2025 10:55:56 +0000 Subject: [PATCH 4/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- alure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alure.spec b/alure.spec index 8f4c2a4..acd1356 100644 --- a/alure.spec +++ b/alure.spec @@ -3,7 +3,7 @@ Name: alure Version: 1.2 -Release: 32%{?dist} +Release: 33%{?dist} Summary: Audio Library Tools REloaded # ALURE code is LGPLv2+; note -devel subpackage has its own license tag License: LGPL-2.1-or-later @@ -65,6 +65,9 @@ rm -rf %{buildroot}%{_docdir}/alure/html %{_libdir}/pkgconfig/*.pc %changelog +* 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 From aabdc448f83b03e9461e1fa405bc7f76181344bc Mon Sep 17 00:00:00 2001 From: Cristian Le Date: Fri, 30 May 2025 17:10:33 +0200 Subject: [PATCH 5/7] Allow to build with CMake 4.0 --- alure.spec | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/alure.spec b/alure.spec index acd1356..80dd30a 100644 --- a/alure.spec +++ b/alure.spec @@ -1,9 +1,6 @@ -# Force out of source build -%undefine __cmake_in_source_build - Name: alure Version: 1.2 -Release: 33%{?dist} +Release: 34%{?dist} Summary: Audio Library Tools REloaded # ALURE code is LGPLv2+; note -devel subpackage has its own license tag License: LGPL-2.1-or-later @@ -41,7 +38,12 @@ developing applications that use %{name}. %patch -P3 -p1 -b .sndfile-cflags-fix %build -%cmake -DBUILD_STATIC:BOOL=OFF +export CMAKE_POLICY_VERSION_MINIMUM=3.5 +%cmake \ + %if "%{?_lib}" == "lib64" + %{?_cmake_lib_suffix64} \ + %endif + -DBUILD_STATIC:BOOL=OFF %cmake_build %install @@ -65,6 +67,9 @@ rm -rf %{buildroot}%{_docdir}/alure/html %{_libdir}/pkgconfig/*.pc %changelog +* 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 From a6dc43f892434ce37bb268c716f63247ea44b8de Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 23 Jul 2025 16:55:54 +0000 Subject: [PATCH 6/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- alure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alure.spec b/alure.spec index 80dd30a..73d5a54 100644 --- a/alure.spec +++ b/alure.spec @@ -1,6 +1,6 @@ Name: alure Version: 1.2 -Release: 34%{?dist} +Release: 35%{?dist} Summary: Audio Library Tools REloaded # ALURE code is LGPLv2+; note -devel subpackage has its own license tag License: LGPL-2.1-or-later @@ -67,6 +67,9 @@ rm -rf %{buildroot}%{_docdir}/alure/html %{_libdir}/pkgconfig/*.pc %changelog +* 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 From b6cadfd5c5e57516fc4fe897c15f3750e9adc18d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 16 Jan 2026 03:37:24 +0000 Subject: [PATCH 7/7] Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild --- alure.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/alure.spec b/alure.spec index 73d5a54..18ccdde 100644 --- a/alure.spec +++ b/alure.spec @@ -1,6 +1,6 @@ Name: alure Version: 1.2 -Release: 35%{?dist} +Release: 36%{?dist} Summary: Audio Library Tools REloaded # ALURE code is LGPLv2+; note -devel subpackage has its own license tag License: LGPL-2.1-or-later @@ -67,6 +67,9 @@ rm -rf %{buildroot}%{_docdir}/alure/html %{_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