Compare commits

...
Sign in to create a new pull request.

20 commits

Author SHA1 Message Date
Fedora Release Engineering
b6cadfd5c5 Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild 2026-01-16 03:37:24 +00:00
Fedora Release Engineering
a6dc43f892 Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild 2025-07-23 16:55:54 +00:00
Cristian Le
aabdc448f8 Allow to build with CMake 4.0 2025-05-30 17:17:02 +02:00
Fedora Release Engineering
38914b5bd7 Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild 2025-01-16 10:55:56 +00:00
Tom Callaway
4e48148b82 merge fix 2024-10-22 09:17:17 -04:00
Tom Callaway
869c112cba fix FTBFS, apply a minor C++ cleanup 2024-10-22 09:15:10 -04:00
Fedora Release Engineering
66b83eefa2 Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild 2024-07-17 16:54:10 +00:00
Software Management Team
e7d5ac5edb Eliminate use of obsolete %patchN syntax (#2283636) 2024-05-30 12:46:46 +02:00
Fedora Release Engineering
81087ef988 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-22 22:57:39 +00:00
Fedora Release Engineering
cacdff4676 Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild 2024-01-19 12:47:18 +00:00
Fedora Release Engineering
eb67d3ac5c Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-07-19 13:11:04 +00:00
Fedora Release Engineering
cc2ab6b018 Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2023-01-18 21:39:02 +00:00
Tom Callaway
5c907646ce fix FTBFS, license tags 2023-01-17 09:32:45 -05:00
e23c4b51e4 Unretirement request: https://pagure.io/releng/issue/11211 2023-01-13 11:03:50 +01:00
Miro Hrončok
601364e484 Orphaned for 6+ weeks 2023-01-10 19:19:06 +01:00
Fedora Release Engineering
9251cc784f Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-07-20 20:42:13 +00:00
Fedora Release Engineering
e49bb9ec02 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2022-01-19 21:10:27 +00:00
Fedora Release Engineering
9b93bb1e04 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 17:29:20 +00:00
Fedora Release Engineering
b5ea7c76db - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-07-21 12:33:55 +00:00
Fedora Release Engineering
b24cc73449 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
Signed-off-by: Fedora Release Engineering <releng@fedoraproject.org>
2021-01-26 00:01:42 +00:00
4 changed files with 179 additions and 23 deletions

View file

@ -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)

View file

@ -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)

View file

@ -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<alureStream>(*FactoryType)(std::istream*);
+ typedef std::unique_ptr<alureStream>(*FactoryType)(std::istream*);
typedef std::multimap<ALint,FactoryType> ListType;
static const ListType& GetList();
@@ -336,11 +336,11 @@ struct DecoderDecl : public Decoder {
}
private:
- static std::auto_ptr<alureStream> Factory(std::istream *file)
+ static std::unique_ptr<alureStream> Factory(std::istream *file)
{
- std::auto_ptr<alureStream> ret(new T(file));
+ std::unique_ptr<alureStream> ret(new T(file));
if(ret->IsValid()) return ret;
- return std::auto_ptr<alureStream>();
+ return std::unique_ptr<alureStream>();
}
};
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<std::istream> fstream(_stream->fstream);
- std::auto_ptr<alureStream> stream(_stream);
+ std::unique_ptr<std::istream> fstream(_stream->fstream);
+ std::unique_ptr<alureStream> 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<std::istream> fstream(instream->fstream);
- std::auto_ptr<alureStream> stream(instream);
+ std::unique_ptr<std::istream> fstream(instream->fstream);
+ std::unique_ptr<alureStream> 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<ALint,UserCallbacks>::iterator i = InstalledCallbacks.begin();
while(i != InstalledCallbacks.end() && i->first < 0)
{
- std::auto_ptr<alureStream> stream(new customStream(fdata, i->second));
+ std::unique_ptr<alureStream> 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<alureStream> stream(factory->second(file));
+ std::unique_ptr<alureStream> 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<alureStream> stream(new customStream(fdata, i->second));
+ std::unique_ptr<alureStream> stream(new customStream(fdata, i->second));
if(stream->IsValid()) return stream.release();
i++;
}

View file

@ -1,49 +1,51 @@
# Force out of source build
%undefine __cmake_in_source_build
Name: alure Name: alure
Version: 1.2 Version: 1.2
Release: 21%{?dist} Release: 36%{?dist}
Summary: Audio Library Tools REloaded Summary: Audio Library Tools REloaded
# ALURE code is LGPLv2+; note -devel subpackage has its own license tag # 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 URL: http://kcat.strangesoft.net/alure.html
Source0: http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}.tar.bz2 Source0: http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}.tar.bz2
Patch0: alure-gcc47.patch 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
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: cmake, libvorbis-devel, libsndfile-devel, openal-soft-devel, flac-devel, dumb-devel, fluidsynth-devel BuildRequires: cmake, libvorbis-devel, libsndfile-devel, openal-soft-devel, flac-devel, dumb-devel, fluidsynth-devel
%description %description
ALURE is a utility library to help manage common tasks with OpenAL ALURE is a utility library to help manage common tasks with OpenAL
applications. This includes device enumeration and initialization, applications. This includes device enumeration and initialization,
file loading, and streaming. file loading, and streaming.
%package devel %package devel
Summary: Development files for %{name} Summary: Development files for %{name}
# Devel doc includes some files under GPLv2+ from NaturalDocs # 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: %{name} = %{version}-%{release}
Requires: pkgconfig Requires: pkgconfig
%description devel %description devel
The %{name}-devel package contains libraries and header files for The %{name}-devel package contains libraries and header files for
developing applications that use %{name}. developing applications that use %{name}.
%prep %prep
%setup -q %setup -q
%patch0 %patch -P0
%patch -P1 -p1 -b .fluidsynth-cflags-fix
%patch -P2 -p1 -b .unique_ptr
%patch -P3 -p1 -b .sndfile-cflags-fix
%build %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 %cmake_build
%install %install
%cmake_install %cmake_install
@ -51,25 +53,65 @@ find %{buildroot} -name '*.la' -exec rm -f {} ';'
# strip installed html doc # strip installed html doc
rm -rf %{buildroot}%{_docdir}/alure/html rm -rf %{buildroot}%{_docdir}/alure/html
%ldconfig_scriptlets %ldconfig_scriptlets
%files %files
%doc COPYING %doc COPYING
%{_libdir}/*.so.* %{_libdir}/*.so.*
%{_bindir}/alure* %{_bindir}/alure*
%files devel %files devel
%doc docs/html examples %doc docs/html examples
%{_includedir}/AL/ %{_includedir}/AL/
%{_libdir}/*.so %{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc %{_libdir}/pkgconfig/*.pc
%changelog %changelog
* Fri Jan 16 2026 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-36
- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild
* Wed Jul 23 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-35
- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild
* Fri May 30 2025 Cristian Le <git@lecris.dev> - 1.2-34
- Allow to build with CMake 4.0
* Thu Jan 16 2025 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-33
- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild
* Tue Oct 22 2024 Tom Callaway <spot@fedoraproject.org> - 1.2-32
- fix FTBFS, apply a minor C++ cleanup
* Wed Jul 17 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-31
- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild
* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-30
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Fri Jan 19 2024 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-29
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Wed Jul 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-28
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Wed Jan 18 2023 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-27
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Tue Jan 17 2023 Tom Callaway <spot@fedoraproject.org> - 1.2-26
- fix FTBFS
* Wed Jul 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-25
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Wed Jan 19 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-24
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Wed Jul 21 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-23
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-22
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-21 * Fri Jul 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-21
- Second attempt - Rebuilt for - Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild