Compare commits

..

4 commits

Author SHA1 Message Date
Fedora Release Engineering
b991a57373 dist-git conversion 2010-07-28 09:46:50 +00:00
Bill Nottingham
f95a38151d Fix typo that causes a failure to update the common directory. (releng
#2781)
2009-11-26 01:27:04 +00:00
Guido Grazioli
0133e9cc25 - Fixed license for -devel subpackage
- Included sample code in -devel subpackage
- Sanitized %%files
Tue Sep 29 2009 Guido Grazioli <guido.grazioli@gmail.com> - 1.0-3
- Renamed from libalure to alure
- Fixed license
Mon Sep 28 2009 Guido Grazioli <guido.grazioli@gmail.com> - 1.0-2
- Fix multilib pkgconfig path
Sat Sep 26 2009 Guido Grazioli <guido.grazioli@gmail.com> - 1.0-1
- Initial packaging
2009-10-04 22:14:41 +00:00
Kevin Fenzi
b858948f32 Initialize branch F-12 for alure 2009-10-03 21:25:47 +00:00
9 changed files with 67 additions and 275 deletions

2
.gitignore vendored
View file

@ -1,3 +1 @@
alure-1.0-src.tar.bz2
/alure-1.1.tar.bz2
/alure-1.2.tar.bz2

View file

@ -1,14 +0,0 @@
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

@ -1,15 +0,0 @@
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

@ -1,85 +0,0 @@
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,11 +0,0 @@
--- include/main.h.orig 2012-01-30 23:27:53.230334632 -0600
+++ include/main.h 2012-01-30 23:28:26.241530184 -0600
@@ -4,6 +4,8 @@
#include "AL/alure.h"
#include "alext.h"
+#include <unistd.h>
+
#ifdef HAVE_SYS_TYPES_H
#include <sys/types.h>
#endif

View file

@ -1,188 +1,86 @@
Name: alure
Version: 1.2
Release: 36%{?dist}
Version: 1.0
Release: 4%{?dist}
Summary: Audio Library Tools REloaded
Group: System Environment/Libraries
# ALURE code is LGPLv2+; note -devel subpackage has its own license tag
License: LGPL-2.1-or-later
License: LGPLv2+
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
Source0: http://kcat.strangesoft.net/%{name}-releases/%{name}-%{version}-src.tar.bz2
# patch to compile with GCC 4.4
Patch0: alure_compile_with_gcc44.patch
# set correct pkgconfig path for multilib
Patch1: alure_multilib_pkgconfig.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# flac-devel not BRed as build against flac currently fails
BuildRequires: cmake, libvorbis-devel, libsndfile-devel, openal-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}
Group: Development/Libraries
# Devel doc includes some files under GPLv2+ from NaturalDocs
License: LGPL-2.1-or-later AND GPL-2.0-or-later
License: LGPLv2+ and GPLv2+
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
%patch -P0
%patch -P1 -p1 -b .fluidsynth-cflags-fix
%patch -P2 -p1 -b .unique_ptr
%patch -P3 -p1 -b .sndfile-cflags-fix
%setup -q
%patch0 -p1
%patch1 -p1
%build
export CMAKE_POLICY_VERSION_MINIMUM=3.5
%cmake \
%if "%{?_lib}" == "lib64"
%{?_cmake_lib_suffix64} \
%endif
-DBUILD_STATIC:BOOL=OFF
%cmake_build
# disable build against FLAC (currently fails)
%cmake . -DFLAC:BOOL=OFF
make VERBOSE=1 %{?_smp_mflags}
%install
%cmake_install
rm -rf %{buildroot}
make install DESTDIR=%{buildroot}
find %{buildroot} -name '*.la' -exec rm -f {} ';'
# strip installed html doc
rm -rf %{buildroot}%{_docdir}/alure/html
%ldconfig_scriptlets
%clean
rm -rf %{buildroot}
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%files
%defattr(-,root,root,-)
%doc COPYING
%{_libdir}/*.so.*
%{_bindir}/alure*
%files devel
%defattr(-,root,root,-)
%doc docs/html examples
%{_includedir}/AL/
%{_libdir}/*.so
%{_libdir}/pkgconfig/*.pc
%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
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Mon Jul 27 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-20
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Tue Jan 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-19
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Wed Jul 24 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-18
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
* Thu Jan 31 2019 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-17
- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
* Thu Jul 12 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-16
- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
* Wed Feb 07 2018 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-15
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
* Wed Aug 02 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-14
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
* Wed Jul 26 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-13
- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
* Fri Feb 10 2017 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-12
- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
* Wed Feb 03 2016 Fedora Release Engineering <releng@fedoraproject.org> - 1.2-11
- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
* Tue Jun 16 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-10
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
* Sat May 02 2015 Kalev Lember <kalevlember@gmail.com> - 1.2-9
- Rebuilt for GCC 5 C++11 ABI change
* Fri Aug 15 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild
* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-6
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
* Wed Feb 13 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
* Wed Jul 18 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_18_Mass_Rebuild
* Mon Jan 30 2012 Bruno Wolff III <bruno@wolff.to> - 1.2-3
- Fix for gcc 4.7
* Thu Jan 12 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
* Fri Jul 29 2011 Julian Aloofi <julian@fedoraproject.org> - 1.2-1
- update to latest upstream release
* Sat May 28 2011 Julian Aloofi <julian@fedoraproject.org> - 1.1-1
- update to latest upstream release
- enabled FLAC, DUMB and fluidsynth support
* Mon Feb 07 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
* Thu Oct 01 2009 Guido Grazioli <guido.grazioli@gmail.com> - 1.0-4
- Fixed license for -devel subpackage
- Included sample code in -devel subpackage

View file

@ -0,0 +1,10 @@
--- A/src/stream.cpp 2009-09-28 04:17:12.511762978 +0200
+++ B/src/stream.cpp 2009-09-28 04:17:25.200016279 +0200
@@ -10,6 +10,7 @@
#include <vector>
#include <memory>
#include <string>
+#include <cstdio>
struct nullStream : public alureStream {

View file

@ -0,0 +1,11 @@
--- A/CMakeLists.txt 2009-09-28 15:55:01.864452396 +0200
+++ B/CMakeLists.txt 2009-09-28 15:55:28.513440879 +0200
@@ -323,7 +323,7 @@
DESTINATION "include/${INCPATH}"
)
INSTALL(FILES "${ALURE_BINARY_DIR}/alure.pc"
- DESTINATION lib/pkgconfig
+ DESTINATION ${LIB_INSTALL_DIR}/pkgconfig
)

View file

@ -1 +1 @@
3088aba074ad02d95ea51e705053b9f5 alure-1.2.tar.bz2
48a81287f2caf2adc5870cd075e70c9c alure-1.0-src.tar.bz2