commit 52ca08fef1b39bec47c6e3e8bc7bd362996ba9a1
Author: Jakub Bogusz <[email protected]>
Date: Sun Feb 16 21:37:03 2014 +0100
- up to 0.4 release
roaraudio-arts.patch | 42 ++++++++
roaraudio-celt.patch | 188 ++++++++++++++++++++++++++++++++++++
roaraudio-flac.patch | 31 ++++++
roaraudio.spec | 267 +++++++++++++++++++++++++++++++++------------------
4 files changed, 436 insertions(+), 92 deletions(-)
---
diff --git a/roaraudio.spec b/roaraudio.spec
index a820717..01c1cc1 100644
--- a/roaraudio.spec
+++ b/roaraudio.spec
@@ -1,44 +1,58 @@
# TODO
+# - RAUM (libraum, raum.h)
+# - libossaudio (OSS 4?)
+# - librsound (librsound, rsound.h)
+# - PABLIO (libpablio, pablio/pablio.h)
# - see HACKING for packaging suggestions
# - libroar/libroar-devel should be complete, rest needs more work
# - figure out which libs go where
# - figure out which are drivers and which are compat
# - drop all the compat stuff?
# - roarmonhttp as subpackage (cgi/inetd server)
+# NOTE:
# - -ldnet it searches is for DEC Networking, not our libdnet
#
# Conditional build:
%bcond_with arts # aRts audio output
%bcond_without esd # EsounD sound support
%bcond_without nas # NAS audio output
+%bcond_without oss # OSS compatibility layer
%bcond_without pulseaudio # pulseaudio output
+%bcond_with rsound # rsound support
%bcond_without sndfile # sndfile output
%bcond_without yiff # YIFF sound server support
%bcond_without xmms # XMMS plugin
-%bcond_without audacious # audacious player support module
+%bcond_with audacious # audacious player plugin [temporarily(?)
removed from sources]
# celt version required for roaraudio
-%define celt_version 0.7.1
+%define celt_ver 0.7.1
-%define subver beta4
-%define rel 0.1
Summary: RoarAudio is a cross-platform sound system for both, home and
professional use
Summary(pl.UTF-8): RoarAudio - wieloplatformowy system dźwięku do użytku
domowego i profesjonalnego
Name: roaraudio
-Version: 0.3
-Release: 0.%{subver}.%{rel}
+Version: 0.4
+Release: 0.1
License: GPL v3, LGPL v3
Group: Libraries
-Source0:
http://roaraudio.keep-cool.org/dl/%{name}-%{version}%{subver}.tar.gz
-# Source0-md5: 001e5d9ecc65d80e14486d5157eb5d42
+Source0: http://roaraudio.keep-cool.org/dl/%{name}-%{version}.tar.gz
+# Source0-md5: 74b5ea7805f7986954435cfb9917827e
+Patch0: %{name}-celt.patch
+Patch1: %{name}-flac.patch
+Patch2: %{name}-arts.patch
URL: http://roaraudio.keep-cool.org/
-%{?with_arts:BuildRequires: arts-devel}
+BuildRequires: alsa-lib-devel >= 0.9
+%{?with_arts:BuildRequires: artsc-devel}
%{?with_audacious:BuildRequires: audacious-devel}
-BuildRequires: celt-devel >= %{celt_version}
+BuildRequires: celt-devel >= %{celt_ver}
+BuildRequires: dbus-devel
%{?with_esd:BuildRequires: esound-devel}
+BuildRequires: flac-devel
+BuildRequires: gtk+2-devel >= 2.0
+BuildRequires: jack-audio-connection-kit-devel
BuildRequires: libao-devel
BuildRequires: libfishsound-devel
%{?with_fishsound:BuildRequires: libfishsound-devel}
+BuildRequires: libgcrypt-devel
BuildRequires: libogg-devel
BuildRequires: liboggz-devel
BuildRequires: libsamplerate-devel
@@ -49,12 +63,15 @@ BuildRequires: libvorbis-devel
BuildRequires: openslp-devel
BuildRequires: openssl-devel
BuildRequires: pkgconfig
+BuildRequires: portaudio-devel >= 19
%{?with_pulseaudio:BuildRequires: pulseaudio-devel}
BuildRequires: sed >= 4.0
BuildRequires: speex-devel >= 1:1.2
BuildRequires: which
+BuildRequires: xorg-lib-libX11-devel
%{?with_xmms:BuildRequires: xmms-devel}
%{?with_yiff:BuildRequires: yiff-devel}
+BuildRequires: zlib-devel
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
@@ -73,7 +90,7 @@ klienci sieciowi, ponieważ serwer jest w pełni przezroczysty
sieciowo.
Summary: RoarAudio sound system shared libraries
Summary(pl.UTF-8): Biblioteki współdzielone systemu dźwięku RoarAudio
Group: Libraries
-Requires: celt >= %{celt_version}
+Requires: celt >= %{celt_ver}
%description -n libroar
This package contains the shared libraries for the RoarAudio sound
@@ -100,7 +117,7 @@ Summary: RoarAudio sound system server daemon
Summary(pl.UTF-8): Demon serwera systemu dźwięku RoarAudio
Group: Daemons
# roaraudio may call binaries which should be installed
-Requires: celt >= %{celt_version}
+Requires: celt >= %{celt_ver}
Requires: flac
Requires: vorbis-tools
@@ -117,7 +134,7 @@ Summary: RoarAudio sound system utilities
Summary(pl.UTF-8): Narzędzia dla systemu dźwięku RoarAudio
Group: Applications/Multimedia
# roaraudio may call binaries which should be installed
-Requires: celt >= %{celt_version}
+Requires: celt >= %{celt_ver}
Requires: gnuplot
%description utils
@@ -128,20 +145,6 @@ system.
Ten pakiet zawiera narzędzia linii poleceń dla systemu dźwięku
RoarAudio.
-%package compat-esound
-Summary: RoarAudio sound system compatibility system for EsounD
-Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla systemu
EsounD
-Group: Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description compat-esound
-This package contains the EsounD compatibility system for the
-RoarAudio sound system.
-
-%description compat-esound -l pl.UTF-8
-Ten pakiet zawiera warstwę zgodności systemu dźwięku RoarAudio dla
-systemu EsounD.
-
%package compat-arts
Summary: RoarAudio sound system compatibility system for aRts
Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla systemu
aRts
@@ -156,6 +159,20 @@ sound system.
Ten pakiet zawiera warstwę zgodności systemu dźwięku RoarAudio dla
systemu aRts.
+%package compat-esound
+Summary: RoarAudio sound system compatibility system for EsounD
+Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla systemu
EsounD
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description compat-esound
+This package contains the EsounD compatibility system for the
+RoarAudio sound system.
+
+%description compat-esound -l pl.UTF-8
+Ten pakiet zawiera warstwę zgodności systemu dźwięku RoarAudio dla
+systemu EsounD.
+
%package compat-nas
Summary: RoarAudio sound system compatibility system for NAS
Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla systemu
NAS
@@ -170,6 +187,20 @@ sound system.
Ten pakiet zawiera warstwę zgodności systemu dźwięku RoarAudio dla
systemu NAS.
+%package compat-oss
+Summary: RoarAudio sound system compatibility system for OSS
+Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla systemu
OSS
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description compat-oss
+This package contains the OSS compatibility system for the RoarAudio
+sound system.
+
+%description compat-oss -l pl.UTF-8
+Ten pakiet zawiera warstwę zgodności systemu dźwięku RoarAudio dla
+systemu OSS.
+
%package compat-pulseaudio
Summary: RoarAudio sound system compatibility system for PulseAudio
Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla systemu
PulseAudio
@@ -184,6 +215,20 @@ RoarAudio sound system.
Ten pakiet zawiera warstwę zgodności systemu dźwięku RoarAudio dla
systemu PulseAudio.
+%package compat-rsound
+Summary: RoarAudio sound system compatibility system for rsound
+Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla systemu
rsound
+Group: Libraries
+Requires: %{name} = %{version}-%{release}
+
+%description compat-rsound
+This package contains the rsound compatibility system for the
+RoarAudio sound system.
+
+%description compat-rsound -l pl.UTF-8
+Ten pakiet zawiera warstwę zgodności systemu dźwięku RoarAudio dla
+systemu rsound.
+
%package compat-sndfile
Summary: RoarAudio sound system compatibility system for sndfile
Summary(pl.UTF-8): Warstwa zgodności systemu dźwięku RoarAudio dla sndfile
@@ -257,27 +302,27 @@ Ten pakiet zawiera wtyczkę systemu dźwięku RoarAudio dla
odtwarzacza
Audacious Media Player.
%prep
-%setup -q -n %{name}-%{version}%{subver}
-
-find -name Makefile | xargs grep -l -- '-g -Wall -O2' | xargs sed -i -e 's@-g
-Wall -O2@%{rpmcflags}@'
-
-sed -i -e 's,unknown,%{version},' roarclients/roar-config.c
+%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
sed -i -e '
- %{!?with_alsa:/libroarartsc.so/d}
+ %{!?with_arts:/libroarartsc.so/d}
%{!?with_esd:/libroaresd.so/d}
%{!?with_pulseaudio:/libroarpulse.so/d}
+ %{!?with_rsound:/libroarrsound.so/d}
%{!?with_sndfile:/libroarsndio.so/d}
%{!?with_yiff:/libroaryiff.so/d}
%{!?with_oss:/libroaross.so/d}
' symlinks.comp
-sed -i -e '/ROAR_HAVE_LIBCELT/s/\<celt\>/celt0/' configure
-
%build
# NOTE: not autoconf derivered configure
./configure \
--cc "%{__cc}" \
+ --cflags "%{rpmcflags} %{rpmcppflags}" \
+ --ldflags "%{rpmldflags}" \
--prefix %{_prefix} \
--prefix-lib %{_libdir} \
--prefix-comp-bins %{_bindir} \
@@ -294,6 +339,7 @@ sed -i -e '/ROAR_HAVE_LIBCELT/s/\<celt\>/celt0/' configure
%{!?with_esd:TARGETS_ESD=} \
%{!?with_arts:TARGETS_ARTS=} \
%{!?with_nas:TARGETS_NAS=} \
+ %{!?with_rsound:TARGETS_RSOUND=} \
%{!?with_yiff:TARGETS_YIFF=} \
%{!?with_pulseaudio:TARGETS_PA=}
@@ -302,9 +348,6 @@ rm -rf $RPM_BUILD_ROOT
%{__make} install \
DESTDIR=$RPM_BUILD_ROOT
-# created by ldconfig
-#rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.so.0.3
-
# make symlinks relative
for lib in $RPM_BUILD_ROOT%{_libdir}/lib*.so*; do
[ -L $lib ] || continue
@@ -312,8 +355,8 @@ for lib in $RPM_BUILD_ROOT%{_libdir}/lib*.so*; do
ln -snf $(basename $target) $lib
done
-# remove non header files
-%{__rm} -v $RPM_BUILD_ROOT%{_includedir}/*/*.h.*
+# old test programs, not installed now
+%{__rm} $RPM_BUILD_ROOT%{_mandir}/man1/{roarfctest,roarsocktypes}.1
%clean
rm -rf $RPM_BUILD_ROOT
@@ -336,9 +379,12 @@ rm -rf $RPM_BUILD_ROOT
%files
%defattr(644,root,root,755)
%doc AUTHORS ChangeLog HACKING README TODO
+%attr(755,root,root) %{_bindir}/dtmfdial
%attr(755,root,root) %{_bindir}/roarbidir
%attr(755,root,root) %{_bindir}/roarcat*
+%attr(755,root,root) %{_bindir}/roarclientpass
%attr(755,root,root) %{_bindir}/roarctl
+%attr(755,root,root) %{_bindir}/roardtmf
%attr(755,root,root) %{_bindir}/roarfish
%attr(755,root,root) %{_bindir}/roarify
%attr(755,root,root) %{_bindir}/roarinterconnect
@@ -347,13 +393,15 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/roarradio
%attr(755,root,root) %{_bindir}/roarshout
%attr(755,root,root) %{_bindir}/roarsockconnect
-%attr(755,root,root) %{_bindir}/roarsocktypes
%attr(755,root,root) %{_bindir}/roartypes
+%attr(755,root,root) %{_bindir}/roarvio
%attr(755,root,root) %{_bindir}/roarvorbis
%{_mandir}/man1/roarbaseclients.1*
%{_mandir}/man1/roarbidir.1*
%{_mandir}/man1/roarcat*.1*
+%{_mandir}/man1/roarclientpass.1*
%{_mandir}/man1/roarctl.1*
+%{_mandir}/man1/roardtmf.1*
%{_mandir}/man1/roarfish.1*
%{_mandir}/man1/roarify.1*
%{_mandir}/man1/roarinterconnect.1*
@@ -362,28 +410,21 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/roarradio.1*
%{_mandir}/man1/roarshout.1*
%{_mandir}/man1/roarsockconnect.1*
-%{_mandir}/man1/roarsocktypes.1*
%{_mandir}/man1/roartestclients.1*
%{_mandir}/man1/roartypes.1*
+%{_mandir}/man1/roarvio.1*
%{_mandir}/man1/roarvorbis.1*
-%{_mandir}/man7/*.7*
-
-%attr(755,root,root) %{_libdir}/libroaross.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libroaross.so.0
-%attr(755,root,root) %{_libdir}/libroaross.so
+%{_mandir}/man7/RoarAudio.7*
+%{_mandir}/man7/roardecnet.7*
+%{_mandir}/man7/roartips.7*
%files -n libroar
%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/libroar.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libroar.so.0
-%attr(755,root,root) %{_libdir}/libroardsp.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libroardsp.so.0
-%attr(755,root,root) %{_libdir}/libroarmidi.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libroarmidi.so.0
-%attr(755,root,root) %{_libdir}/libroarlight.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libroarlight.so.0
-%attr(755,root,root) %{_libdir}/libroareio.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libroareio.so.0
+%attr(755,root,root) %{_libdir}/libroar.so.1
+%attr(755,root,root) %{_libdir}/libroardsp.so.1
+%attr(755,root,root) %{_libdir}/libroareio.so.1
+%attr(755,root,root) %{_libdir}/libroarlight.so.1
+%attr(755,root,root) %{_libdir}/libroarmidi.so.1
%files -n libroar-devel
%defattr(644,root,root,755)
@@ -401,11 +442,21 @@ rm -rf $RPM_BUILD_ROOT
%{_includedir}/libroarmidi
%{_includedir}/libroarpulse
%{_includedir}/libroarsndio
+%{_includedir}/libroarrsound
%{_includedir}/libroaryiff
%{_includedir}/roaraudio.h
%{_includedir}/roaraudio
+%{_pkgconfigdir}/libroar.pc
+%{_pkgconfigdir}/libroardsp.pc
+%{_pkgconfigdir}/libroareio.pc
+%{_pkgconfigdir}/libroarlight.pc
+%{_pkgconfigdir}/libroarmidi.pc
%{_mandir}/man1/roar-config.1*
-%{_mandir}/man3/*.3*
+%{_mandir}/man3/roar_*.3*
+%{_mandir}/man7/libroar.7*
+%{_mandir}/man7/roartut.7*
+%{_mandir}/man7/roarvio.7*
+%{_mandir}/man7/roarvs.7*
%files server
%defattr(644,root,root,755)
@@ -415,7 +466,6 @@ rm -rf $RPM_BUILD_ROOT
%files utils
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/roarfctest
%attr(755,root,root) %{_bindir}/roarfilt
%attr(755,root,root) %{_bindir}/roarsin
%attr(755,root,root) %{_bindir}/roarvumeter
@@ -425,18 +475,34 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/roarsin.1*
%{_mandir}/man1/roarvumeter.1*
+%if %{with arts}
+%files compat-arts
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/artscat
+%attr(755,root,root) %{_bindir}/artsd
+%attr(755,root,root) %{_bindir}/artsdsp
+%attr(755,root,root) %{_bindir}/artsplay
+%attr(755,root,root) %{_libdir}/libroarartsc.so.1
+# compat links pointing to libroarartsc.so.1
+%attr(755,root,root) %{_libdir}/libartsc.so.0
+# needed?
+%attr(755,root,root) %{_libdir}/libroarartsc.so
+%attr(755,root,root) %{_libdir}/libartsc.so
+%attr(755,root,root) %{_libdir}/libartsc.so.0.0
+%attr(755,root,root) %{_libdir}/libartsc.so.0.0.0
+%endif
+
%if %{with esd}
%files compat-esound
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/esd
%attr(755,root,root) %{_bindir}/esdcat
+%attr(755,root,root) %{_bindir}/esddsp
%attr(755,root,root) %{_bindir}/esdfilt
%attr(755,root,root) %{_bindir}/esdmon
%attr(755,root,root) %{_bindir}/esdplay
-%attr(755,root,root) %{_libdir}/libroaresd.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libroaresd.so.0
-
-# compat libs pointing to libroaresd
+%attr(755,root,root) %{_libdir}/libroaresd.so.1
+# compat links pointing to libroaresd
%attr(755,root,root) %{_libdir}/libesd.so.0
# needed?
%attr(755,root,root) %{_libdir}/libroaresd.so
@@ -445,57 +511,74 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/libesd.so.0.2.36
%endif
-%if %{with arts}
-%files compat-arts
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/artscat
-%attr(755,root,root) %{_bindir}/artsd
-%attr(755,root,root) %{_bindir}/artsplay
-# compat libs pointing to libroarpulse
-%attr(755,root,root) %{_libdir}/libartsc.so.0
-# needed?
-%attr(755,root,root) %{_libdir}/libartsc.so
-%attr(755,root,root) %{_libdir}/libartsc.so.0.0
-%attr(755,root,root) %{_libdir}/libartsc.so.0.0.0
-%attr(755,root,root) %{_libdir}/libroarartsc.so
-%endif
-
%if %{with nas}
%files compat-nas
%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/audial
+%attr(755,root,root) %{_bindir}/audiooss
%attr(755,root,root) %{_bindir}/auplay
%endif
+%files compat-oss
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libroaross.so.1
+%attr(755,root,root) %{_libdir}/libroaross.so
+# compat symlinks to libroaross.so.1
+%attr(755,root,root) %{_libdir}/liboss.so
+%attr(755,root,root) %{_libdir}/libossaudio.so
+
%if %{with pulseaudio}
%files compat-pulseaudio
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/pacat
+%attr(755,root,root) %{_bindir}/padsp
%attr(755,root,root) %{_bindir}/paplay
-%attr(755,root,root) %{_libdir}/libroarpulse.so
-%attr(755,root,root) %ghost %{_libdir}/libroarpulse.so.0
-%attr(755,root,root) %{_libdir}/libroarpulse.so.*.*.*
-# compat libs pointing to libroarpulse
-%attr(755,root,root) %{_libdir}/libpulse-simple.so.0
+%attr(755,root,root) %{_libdir}/libroarpulse.so.1
+%attr(755,root,root) %{_libdir}/libroarpulse-simple.so.1
+# compat links pointing to libroarpulse.so.1 and libroarpulse-simple.so.1
%attr(755,root,root) %{_libdir}/libpulse.so.0
+%attr(755,root,root) %{_libdir}/libpulse-simple.so.0
# needed?
-%attr(755,root,root) %{_libdir}/libpulse-simple.so
-%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0
-%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0.0
-%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0.1
+%attr(755,root,root) %{_libdir}/libroarpulse.so
+%attr(755,root,root) %{_libdir}/libroarpulse-simple.so
%attr(755,root,root) %{_libdir}/libpulse.so
%attr(755,root,root) %{_libdir}/libpulse.so.0.1
%attr(755,root,root) %{_libdir}/libpulse.so.0.1.0
%attr(755,root,root) %{_libdir}/libpulse.so.0.4
%attr(755,root,root) %{_libdir}/libpulse.so.0.4.1
+%attr(755,root,root) %{_libdir}/libpulse.so.0.12.2
+%attr(755,root,root) %{_libdir}/libpulse-simple.so
+%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0
+%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0.0
+%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0.1
+%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0.2
+%attr(755,root,root) %{_libdir}/libpulse-simple.so.0.0.3
+%endif
+
+%if %{with rsound}
+%files compat-rsound
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_bindir}/ross
+%attr(755,root,root) %{_bindir}/rsd
+%attr(755,root,root) %{_bindir}/rsdplay
+# not built yet
+#%attr(755,root,root) %{_libdir}/libroarrsound.so.1
+#%attr(755,root,root) %{_libdir}/libroarrsound.so
+# compat symlinks to libroarrsound.so.1
+#%attr(755,root,root) %{_libdir}/librsound.so.0
+#%attr(755,root,root) %{_libdir}/librsound.so.1
+#%attr(755,root,root) %{_libdir}/librsound.so
%endif
%if %{with sndfile}
%files compat-sndfile
%defattr(644,root,root,755)
-%attr(755,root,root) %ghost %{_libdir}/libroarsndio.so.0
-%attr(755,root,root) %{_libdir}/libroarsndio.so.*.*.*
+%attr(755,root,root) %{_libdir}/libroarsndio.so.1
+# compat symlink to libroarsndio.so.1
+%attr(755,root,root) %{_libdir}/libsndio.so.0
# needed?
%attr(755,root,root) %{_libdir}/libroarsndio.so
+%attr(755,root,root) %{_libdir}/libsndio.so
%endif
%if %{with yiff}
@@ -504,12 +587,12 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/yiff
%attr(755,root,root) %{_bindir}/yplay
%attr(755,root,root) %{_bindir}/yshutdown
-%attr(755,root,root) %ghost %{_libdir}/libroaryiff.so.0
-%attr(755,root,root) %{_libdir}/libroaryiff.so.*.*.*
+%attr(755,root,root) %{_libdir}/libroaryiff.so.1
+# compat symlink to libroaryiff.so.1
%attr(755,root,root) %{_libdir}/libY2.so.14
# needed?
-%attr(755,root,root) %{_libdir}/libY2.so
%attr(755,root,root) %{_libdir}/libroaryiff.so
+%attr(755,root,root) %{_libdir}/libY2.so
%endif
%if %{with xmms}
diff --git a/roaraudio-arts.patch b/roaraudio-arts.patch
new file mode 100644
index 0000000..474b139
--- /dev/null
+++ b/roaraudio-arts.patch
@@ -0,0 +1,42 @@
+--- roaraudio-0.4/configure.orig 2011-11-01 12:23:04.000000000 +0100
++++ roaraudio-0.4/configure 2014-02-08 16:02:00.663591608 +0100
+@@ -1514,7 +1514,7 @@
+ test_lib_defmake ROAR_HAVE_H_POLL % poll.h c
-- poll.h
+ test_lib_defmake ROAR_HAVE_H_MMSYSTEM % mmsystem.h c
-- windows.h mmsystem.h
+ test_lib_defmake ROAR_HAVE_H_ESD libroaresd esd.h c
-- esd.h
+-test_lib_defmake ROAR_HAVE_H_ARTSC libroararts artsc.h c
-- kde/artsc/artsc.h
++test_lib_defmake ROAR_HAVE_H_ARTSC libroararts artsc.h c
-- artsc/artsc.h
+ test_lib_defmake ROAR_HAVE_H_ICONV % iconv.h c
-- iconv.h
+ test_lib_defmake ROAR_HAVE_H_NETINET_IN % 'netinet/in.h' c
-- 'netinet/in.h'
+ test_lib_defmake ROAR_HAVE_H_LINUX_REBOOT % linux/reboot.h c
-- linux/reboot.h
+@@ -1559,7 +1559,7 @@
+ test_lib_defmake ROAR_HAVE_LIBPULSE libroarpulse libpulse pulse
-- pulse/pulseaudio.h pulse/simple.h
+ test_lib_defmake ROAR_HAVE_LIBPULSESIMPLE % libpulse-simple
pulse-simple -- pulse/simple.h
+ test_lib_defmake ROAR_HAVE_LIBY2 libroaryiff libyiff Y2
-- Y2/Y.h Y2/Ylib.h
+-test_lib_defmake ROAR_HAVE_LIBARTSC % libartsc artsc
-- kde/artsc/artsc.h
++test_lib_defmake ROAR_HAVE_LIBARTSC % libartsc artsc
-- artsc/artsc.h
+ test_lib_defmake ROAR_HAVE_LIBOSSAUDIO % libossaudio ossaudio
-- sys/ioctl.h
+ test_lib_defmake ROAR_HAVE_LIBSNDIO % libsndio sndio
-- sndio.h
+ test_lib_defmake ROAR_HAVE_LIBRSOUND libroarrsound librsound rsound
-- rsound.h
+--- roaraudio-0.4/libroararts/libartsc.c.orig 2011-04-28 20:47:34.000000000
+0200
++++ roaraudio-0.4/libroararts/libartsc.c 2014-02-08 16:10:56.106902472
+0100
+@@ -37,7 +37,7 @@
+ */
+
+ #include <roaraudio.h>
+-#include <kde/artsc/artsc.h>
++#include <artsc/artsc.h>
+
+ static struct roar_connection _libroarartsc_connection[1];
+
+--- roaraudio-0.4/roard/include/driver.h.orig 2011-05-26 12:57:17.000000000
+0200
++++ roaraudio-0.4/roard/include/driver.h 2014-02-08 16:18:46.640216058
+0100
+@@ -139,7 +139,7 @@
+ #endif
+
+ #ifdef ROAR_HAVE_LIBARTSC
+-#include <kde/artsc/artsc.h>
++#include <artsc/artsc.h>
+ #include "driver_artsc.h"
+ #endif
+
diff --git a/roaraudio-celt.patch b/roaraudio-celt.patch
new file mode 100644
index 0000000..6963bce
--- /dev/null
+++ b/roaraudio-celt.patch
@@ -0,0 +1,188 @@
+--- roaraudio-0.4/include/roaraudio.h.orig 2011-10-22 14:17:16.000000000
+0200
++++ roaraudio-0.4/include/roaraudio.h 2014-02-07 19:09:15.346745999 +0100
+@@ -29,7 +29,7 @@
+ #ifndef _ROARAUDIO_H_
+ #define _ROARAUDIO_H_
+
+-#define _ROAR_MKVERSION(a,b,c) (((uint32_t)(a) << 16) + ((uint32_t)(b) << 8)
+ (uint32_t)(c))
++#define _ROAR_MKVERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))
+
+ #include <roaraudio/config.h>
+ #include <roaraudio/compilerhacks.h>
+--- roaraudio-0.4/libroardsp/transcode_celt.c.orig 2011-01-08
17:05:39.000000000 +0100
++++ roaraudio-0.4/libroardsp/transcode_celt.c 2014-02-07 20:13:40.729917120
+0100
+@@ -30,7 +30,14 @@
+ #define _16BIT (16/8)
+ #define _SIZE_LEN 2
+
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
++#if (ROAR_HAVE_CELT_VERSION) >= _ROAR_MKVERSION(0,7,0)
++#define ROAR_HAVE_CELT_0_7
++#endif
++#if (ROAR_HAVE_CELT_VERSION) >= _ROAR_MKVERSION(0,8,0)
++#define ROAR_HAVE_CELT_0_8
++#endif
++
++#ifdef ROAR_HAVE_CELT_0_7
+ typedef celt_int16 celt_int16_t;
+ #endif
+
+@@ -61,7 +68,7 @@ int roar_xcoder_celt_init (struct
+ return -1;
+ }
+
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
++#ifdef ROAR_HAVE_CELT_0_7
+ self->mode = celt_mode_create(info->rate, self->frame_size,
NULL);
+ #else
+ self->mode = celt_mode_create(info->rate, info->channels,
self->frame_size, NULL);
+@@ -74,8 +81,8 @@ int roar_xcoder_celt_init (struct
+ }
+
+ if (state->encode) {
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+- self->encoder = celt_encoder_create(self->mode, info->channels, NULL);
++#ifdef ROAR_HAVE_CELT_0_7
++ self->encoder = celt_encoder_create_custom(self->mode, info->channels,
NULL);
+ #else
+ self->encoder = celt_encoder_create(self->mode);
+ #endif
+@@ -84,8 +91,8 @@ int roar_xcoder_celt_init (struct
+ return -1;
+ }
+ } else {
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+- self->decoder = celt_decoder_create(self->mode, info->channels, NULL);
++#ifdef ROAR_HAVE_CELT_0_7
++ self->decoder = celt_decoder_create_custom(self->mode, info->channels,
NULL);
+ #else
+ self->decoder = celt_decoder_create(self->mode);
+ #endif
+@@ -151,7 +158,11 @@ int roar_xcoder_celt_encode (struct
+ ROAR_DBG("roar_xcoder_celt_encode(*): Wrote MAGIC");
+ }
+
++#ifdef ROAR_HAVE_CELT_0_8
++ pkglen = celt_encode(self->encoder, (celt_int16_t *) buf, self->frame_size,
cp, self->bufferlen - _SIZE_LEN);
++#else
+ pkglen = celt_encode(self->encoder, (celt_int16_t *) buf, NULL, cp,
self->bufferlen - _SIZE_LEN);
++#endif
+ *lenp = ROAR_HOST2NET16(pkglen);
+
+ if ( roar_vio_write(state->backend, self->iobuffer, pkglen+2) == -1 )
+@@ -194,7 +205,11 @@ int roar_xcoder_celt_decode (struct
+ if ( roar_vio_read(state->backend, cp, pkglen) != pkglen )
+ return -1;
+
++#ifdef ROAR_HAVE_CELT_0_8
++ if ( celt_decode(self->decoder, cp, pkglen, (celt_int16_t *) buf,
self->frame_size) < 0 )
++#else
+ if ( celt_decode(self->decoder, cp, pkglen, (celt_int16_t *) buf) < 0 )
++#endif
+ return -1;
+
+ return 0;
+--- roaraudio-0.4/roard/codecfilter_celt.c.orig 2011-05-13
23:30:16.000000000 +0200
++++ roaraudio-0.4/roard/codecfilter_celt.c 2014-02-07 21:01:48.163129276
+0100
+@@ -26,7 +26,14 @@
+ #include "roard.h"
+ #ifdef ROAR_HAVE_LIBCELT
+
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
++#if (ROAR_HAVE_CELT_VERSION) >= _ROAR_MKVERSION(0,7,0)
++#define ROAR_HAVE_CELT_0_7
++#endif
++#if (ROAR_HAVE_CELT_VERSION) >= _ROAR_MKVERSION(0,8,0)
++#define ROAR_HAVE_CELT_0_8
++#endif
++
++#ifdef ROAR_HAVE_CELT_0_7
+ typedef celt_int16 celt_int16_t;
+ #endif
+
+@@ -85,7 +92,7 @@ int cf_celt_open(CODECFILTER_USERDATA_T
+ return -1;
+ }
+
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
++#ifdef ROAR_HAVE_CELT_0_7
+ self->mode = celt_mode_create(s->info.rate,
self->frame_size, NULL);
+ #else
+ self->mode = celt_mode_create(s->info.rate,
s->info.channels, self->frame_size, NULL);
+@@ -97,21 +104,21 @@ int cf_celt_open(CODECFILTER_USERDATA_T
+ }
+
+ if ( s->dir == ROAR_DIR_PLAY ) {
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+- self->decoder = celt_decoder_create(self->mode, s->info.channels, NULL);
++#ifdef ROAR_HAVE_CELT_0_7
++ self->decoder = celt_decoder_create_custom(self->mode, s->info.channels,
NULL);
+ #else
+ self->decoder = celt_decoder_create(self->mode);
+ #endif
+ } else if ( s->dir == ROAR_DIR_MONITOR || s->dir == ROAR_DIR_OUTPUT ) {
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+- self->encoder = celt_encoder_create(self->mode, s->info.channels, NULL);
++#ifdef ROAR_HAVE_CELT_0_7
++ self->encoder = celt_encoder_create_custom(self->mode, s->info.channels,
NULL);
+ #else
+ self->encoder = celt_encoder_create(self->mode);
+ #endif
+ } else if ( s->dir == ROAR_DIR_BIDIR ) {
+-#ifdef ROAR_HAVE_CELT_VERSION_0_7_1
+- self->decoder = celt_decoder_create(self->mode, s->info.channels, NULL);
+- self->encoder = celt_encoder_create(self->mode, s->info.channels, NULL);
++#ifdef ROAR_HAVE_CELT_0_7
++ self->decoder = celt_decoder_create_custom(self->mode, s->info.channels,
NULL);
++ self->encoder = celt_encoder_create_custom(self->mode, s->info.channels,
NULL);
+ #else
+ self->decoder = celt_decoder_create(self->mode);
+ self->encoder = celt_encoder_create(self->mode);
+@@ -204,7 +211,11 @@ int cf_celt_read(CODECFILTER_USERDATA_T
+ cbuf = buf + r;
+
+ // printf("buf=%p, r=%i // cbuf=%p\n", buf, r, cbuf);
++#ifdef ROAR_HAVE_CELT_0_8
++ if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs,
(celt_int16_t *) cbuf, self->frame_size) < 0 )
++#else
+ if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs,
(celt_int16_t *) cbuf) < 0 )
++#endif
+ return -1;
+
+ r += self->s_buf;
+@@ -220,7 +231,11 @@ int cf_celt_read(CODECFILTER_USERDATA_T
+ return -1;
+ if ( stream_vio_s_read(self->stream, self->ibuf, fs) == fs ) {
+ // printf("got data!\n");
++#ifdef ROAR_HAVE_CELT_0_8
++ if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs,
(celt_int16_t *) self->obuf, self->frame_size) >= 0 ) {
++#else
+ if ( celt_decode(self->decoder, (unsigned char *) self->ibuf, fs,
(celt_int16_t *) self->obuf) >= 0 ) {
++#endif
+ // printf("{ // decode rest\n");
+ // printf(" r=%i // need %i Bytes\n", r, len - r);
+ // printf(" memcpy(buf+%i, self->obuf, %i) = ?\n", r, len - r);
+@@ -280,7 +295,11 @@ int cf_celt_write(CODECFILTER_USERDATA_T
+ buf += diff;
+ len -= diff;
+
++#ifdef ROAR_HAVE_CELT_0_8
++ pkglen = celt_encode(self->encoder, (celt_int16_t *) self->obuf,
self->frame_size, cbits+2, BS);
++#else
+ pkglen = celt_encode(self->encoder, (celt_int16_t *) self->obuf, NULL,
cbits+2, BS);
++#endif
+ pkglen_net = ROAR_HOST2NET16(pkglen);
+ *(uint16_t*)cbits = pkglen_net;
+
+@@ -288,7 +307,11 @@ int cf_celt_write(CODECFILTER_USERDATA_T
+ return -1;
+
+ while (len >= fs2) {
++#ifdef ROAR_HAVE_CELT_0_8
++ pkglen = celt_encode(self->encoder, (celt_int16_t *) buf,
self->frame_size, cbits+2, BS);
++#else
+ pkglen = celt_encode(self->encoder, (celt_int16_t *) buf, NULL,
cbits+2, BS);
++#endif
+ pkglen_net = ROAR_HOST2NET16(pkglen);
+ *(uint16_t*)cbits = pkglen_net;
+
diff --git a/roaraudio-flac.patch b/roaraudio-flac.patch
new file mode 100644
index 0000000..82ee4d6
--- /dev/null
+++ b/roaraudio-flac.patch
@@ -0,0 +1,31 @@
+--- roaraudio-0.4/roard/codecfilter_flac.c.orig 2014-02-07
21:52:35.829668045 +0100
++++ roaraudio-0.4/roard/codecfilter_flac.c 2014-02-07 21:52:40.459667849
+0100
+@@ -28,6 +28,10 @@
+
+ #ifdef ROAR_HAVE_LIBFLAC
+
++#if ROAR_HAVE_FLAC_VERSION >= _ROAR_MKVERSION(1,2,0)
++#define ROAR_HAVE_FLAC_1_2
++#endif
++
+ FLAC__StreamDecoderReadStatus cf_flac_cb_read(const FLAC__StreamDecoder
*decoder, FLAC__byte buffer[], unsigned *bytes, void *client_data) {
+ struct codecfilter_flac_inst * self = client_data;
+ ssize_t ret;
+@@ -209,7 +213,7 @@ int cf_flac_open(CODECFILTER_USERDATA_T
+ return -1;
+ }
+
+-#ifndef ROAR_HAVE_FLAC_VERSION_1_2_1
++#ifndef ROAR_HAVE_FLAC_1_2
+ FLAC__stream_decoder_set_read_callback(self->decoder.decoder,
cf_flac_cb_read);
+ FLAC__stream_decoder_set_write_callback(self->decoder.decoder,
cf_flac_cb_write);
+ FLAC__stream_decoder_set_metadata_callback(self->decoder.decoder,
cf_flac_cb_metadata);
+@@ -219,7 +223,7 @@ int cf_flac_open(CODECFILTER_USERDATA_T
+
+ FLAC__stream_decoder_set_metadata_respond(self->decoder.decoder,
FLAC__METADATA_TYPE_VORBIS_COMMENT);
+
+-#ifdef ROAR_HAVE_FLAC_VERSION_1_2_1
++#ifdef ROAR_HAVE_FLAC_1_2
+ FLAC__stream_decoder_init_stream(self->decoder.decoder, cf_flac_cb_read,
NULL, NULL, NULL, NULL, cf_flac_cb_write, cf_flac_cb_metadata,
cf_flac_cb_error, self);
+ #else
+ FLAC__stream_decoder_init(self->decoder.decoder);
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/roaraudio.git/commitdiff/52ca08fef1b39bec47c6e3e8bc7bd362996ba9a1
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
