From 66559c90d5deef91b1179c3cccbe11a3b42b3250 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 12 Aug 2007 01:22:14 +0000 Subject: [PATCH 01/15] - Requires: %{name}-pulseaudio (f8+) - License: LGPLv2+ --- akode.spec | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/akode.spec b/akode.spec index df54e19..7876d78 100644 --- a/akode.spec +++ b/akode.spec @@ -2,8 +2,9 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.1 -Release: 6%{?dist} -License: LGPL +Release: 7%{?dist} + +License: LGPLv2+ Group: System Environment/Libraries #URL: http://carewolf.com/akode/ URL: http://www.kde-apps.org/content/show.php?content=30375 @@ -19,13 +20,12 @@ Patch1: akode-pulseaudio.patch %define _with_pulseaudio --with-pulseaudio %endif -%if 0%{?fedora} > 6 +%if 0%{?fedora} > 7 %define _with_pulseaudio --with-pulseaudio -# pulseaudio is/will-be the F7 default, +# pulseaudio is/will-be the F8 default Requires: %{name}-pulseaudio %endif - BuildRequires: automake BuildRequires: alsa-lib-devel BuildRequires: flac-devel @@ -165,12 +165,16 @@ rm -rf $RPM_BUILD_ROOT %changelog +* Sat Aug 11 2007 Rex Dieter 2.0.1-7 +- Requires: %%{name}-pulseaudio (f8+) +- License: LGPLv2+ + * Thu Feb 15 2007 Rex Dieter 2.0.1-6 - respin (for flac, fc7+) * Mon Feb 12 2007 Rex Dieter 2.0.1-5 - enable pulseaudio support -- Requires: akode-pulseaudio (fc7+) +- Requires: akode-pulseaudio (f7+) * Thu Dec 14 2006 Rex Dieter 2.0.1-4 - enable jack support (subpkg) From cf8a1fd2f8f7618916249147a59171a973e15ac0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 21 Aug 2007 20:28:17 +0000 Subject: [PATCH 02/15] - -libsamplerate: License: GPLv2+ - omit oss_sink --- akode.spec | 48 ++++++++++++++++++++++++++---------------------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/akode.spec b/akode.spec index 7876d78..3e9cc66 100644 --- a/akode.spec +++ b/akode.spec @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.1 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -21,7 +21,6 @@ Patch1: akode-pulseaudio.patch %endif %if 0%{?fedora} > 7 -%define _with_pulseaudio --with-pulseaudio # pulseaudio is/will-be the F8 default Requires: %{name}-pulseaudio %endif @@ -46,7 +45,6 @@ aKode currently has the following decoder plugins: * xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. aKode also has the following audio outputs: -* oss: Outputs to the OSS (Open Sound System) * alsa: Outputs to ALSA (dmix is recommended). %package devel @@ -63,22 +61,22 @@ Requires: %{name} = %{version}-%{release} %description jack %{summary}. -%package libsamplerate -Summary: Resampler based on (GPL) libsamplerate for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -%description libsamplerate -%{summary}. -Packaged separately to keep main/core %{akode} package LGPL-clean. - -%package pulseaudio +%package pulseaudio Summary: Pulseaudio output backend for %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} -%description pulseaudio +%description pulseaudio %{summary}. Recommended for network transparent audio. +# Packaged separately to keep main/core %{akode} package LGPL-clean. +%package libsamplerate +Summary: Resampler based on libsamplerate for %{name} +Group: Development/Libraries +License: GPLv2+ +Requires: %{name} = %{version}-%{release} +%description libsamplerate +%{summary}. %prep @@ -95,6 +93,7 @@ Recommended for network transparent audio. --disable-debug --disable-warnings --disable-dependency-tracking \ --without-libltdl \ --with-alsa \ + --without-oss \ --with-flac \ %{?_with_jack} %{!?_with_jack:--without-jack} \ --with-libsamplerate \ @@ -108,12 +107,13 @@ make %{?_smp_mflags} %install -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} -make install DESTDIR=$RPM_BUILD_ROOT +make install DESTDIR=%{buildroot} # unpackaged files -rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la +rm -f %{buildroot}%{_libdir}/lib*.la +#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so # rpmdocs for file in AUTHORS COPYING NEWS README TODO ; do @@ -122,7 +122,7 @@ done %clean -rm -rf $RPM_BUILD_ROOT +rm -rf %{buildroot} %post -p /sbin/ldconfig @@ -136,7 +136,6 @@ rm -rf $RPM_BUILD_ROOT %{_bindir}/akodeplay %{_libdir}/libakode.so.* %{_libdir}/libakode_alsa_sink.so -%{_libdir}/libakode_oss_sink.so %{_libdir}/libakode_mpc_decoder.so %{_libdir}/libakode_xiph_decoder.so @@ -152,19 +151,24 @@ rm -rf $RPM_BUILD_ROOT %{_libdir}/libakode_jack_sink.so %endif -%files libsamplerate -%defattr(-,root,root,-) -%{_libdir}/libakode_src_resampler.so - %if "%{?_with_pulseaudio:1}" == "1" %files pulseaudio %defattr(-,root,root,-) %{_libdir}/libakode_polyp_sink.so %endif +# License: GPLv2+ +%files libsamplerate +%defattr(-,root,root,-) +%{_libdir}/libakode_src_resampler.so + %changelog +* Mon Aug 20 2007 Rex Dieter 2.0.1-8 +- -libsamplerate: License: GPLv2+ +- omit oss_sink + * Sat Aug 11 2007 Rex Dieter 2.0.1-7 - Requires: %%{name}-pulseaudio (f8+) - License: LGPLv2+ From 6a3385412ed7ef0d14751fbf0be4761dc33bff52 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 26 Sep 2007 16:06:59 +0000 Subject: [PATCH 03/15] - BR: pulseaudio-libs-devel --- akode.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/akode.spec b/akode.spec index 3e9cc66..c97058c 100644 --- a/akode.spec +++ b/akode.spec @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.1 -Release: 8%{?dist} +Release: 9%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -33,7 +33,7 @@ BuildRequires: speex-devel BuildRequires: libvorbis-devel BuildRequires: libtool %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} -%{?_with_pulseaudio:BuildRequires: pulseaudio-devel} +%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel} %description aKode is a simple audio-decoding frame-work that provides a uniform @@ -165,6 +165,9 @@ rm -rf %{buildroot} %changelog +* Wed Sep 26 2007 Rex Dieter 2.0.1-9 +- BR: pulseaudio-libs-devel + * Mon Aug 20 2007 Rex Dieter 2.0.1-8 - -libsamplerate: License: GPLv2+ - omit oss_sink From 78d2a373323f39b96d74ef7b79713646355c4126 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Sun, 9 Dec 2007 04:07:16 +0000 Subject: [PATCH 04/15] cosmetics (sort BR's mostly) --- akode.spec | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/akode.spec b/akode.spec index c97058c..cbf1caa 100644 --- a/akode.spec +++ b/akode.spec @@ -13,8 +13,6 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: akode-pulseaudio.patch -#Conflicts: kdemultimedia < 6:3.5 - %if 0%{?fedora} > 4 %define _with_jack --with-jack %define _with_pulseaudio --with-pulseaudio @@ -25,15 +23,14 @@ Patch1: akode-pulseaudio.patch Requires: %{name}-pulseaudio %endif -BuildRequires: automake +BuildRequires: automake libtool BuildRequires: alsa-lib-devel BuildRequires: flac-devel -BuildRequires: libsamplerate-devel -BuildRequires: speex-devel -BuildRequires: libvorbis-devel -BuildRequires: libtool %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} +BuildRequires: libsamplerate-devel +BuildRequires: libvorbis-devel %{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel} +BuildRequires: speex-devel %description aKode is a simple audio-decoding frame-work that provides a uniform @@ -163,7 +160,6 @@ rm -rf %{buildroot} %{_libdir}/libakode_src_resampler.so - %changelog * Wed Sep 26 2007 Rex Dieter 2.0.1-9 - BR: pulseaudio-libs-devel From 90a1ce4eed40007d3fa82ee889e61623b20d98ef Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Dec 2007 03:03:15 +0000 Subject: [PATCH 05/15] - akode-2.0.2 --- .cvsignore | 2 +- akode.spec | 14 +++++++++----- sources | 2 +- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/.cvsignore b/.cvsignore index e220dfd..54e7f71 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1 @@ -30375-akode-2.0.1.tar.bz2 +30375-akode-2.0.2.tar.bz2 diff --git a/akode.spec b/akode.spec index cbf1caa..3f69356 100644 --- a/akode.spec +++ b/akode.spec @@ -1,14 +1,14 @@ Summary: Audio-decoding framework Name: akode -Version: 2.0.1 -Release: 9%{?dist} +Version: 2.0.2 +Release: 1%{?dist} License: LGPLv2+ Group: System Environment/Libraries #URL: http://carewolf.com/akode/ URL: http://www.kde-apps.org/content/show.php?content=30375 -Source0: http://www.kde-apps.org/content/files/30375-akode-%{version}.tar.bz2 +Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: akode-pulseaudio.patch @@ -29,7 +29,7 @@ BuildRequires: flac-devel %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} BuildRequires: libsamplerate-devel BuildRequires: libvorbis-devel -%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel} +%{?_with_pulseaudio:BuildRequires: pulseaudio-lib-devel} BuildRequires: speex-devel %description @@ -81,7 +81,8 @@ Requires: %{name} = %{version}-%{release} %patch1 -p1 -b .pulseaudio -[ ! -f configure ] && make -f Makefile.cvs +#[ ! -f configure ] && \ +make -f Makefile.cvs %build @@ -161,6 +162,9 @@ rm -rf %{buildroot} %changelog +* Sun Dec 23 2007 Rex Dieter 2.0.2-1 +- akode-2.0.2 + * Wed Sep 26 2007 Rex Dieter 2.0.1-9 - BR: pulseaudio-libs-devel diff --git a/sources b/sources index a5c7fad..1e620c4 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -94a10e7729b20b669bc5c7721f62e162 30375-akode-2.0.1.tar.bz2 +659ced0c9c735cb3e55b9138ff02342c 30375-akode-2.0.2.tar.bz2 From 89af7f2ab12e57a332eb04a5784f65754c3cd1c7 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Dec 2007 03:40:40 +0000 Subject: [PATCH 06/15] - fix multilib conflicts (#340591) --- akode-2.0.2-multilib.patch | 65 ++++++++++++++++++++++++++++++++++++++ akode.spec | 9 +++++- 2 files changed, 73 insertions(+), 1 deletion(-) create mode 100644 akode-2.0.2-multilib.patch diff --git a/akode-2.0.2-multilib.patch b/akode-2.0.2-multilib.patch new file mode 100644 index 0000000..c3832a9 --- /dev/null +++ b/akode-2.0.2-multilib.patch @@ -0,0 +1,65 @@ +diff -up /dev/null akode-2.0.2/akode/akode.pc.in +--- /dev/null 2007-12-13 13:41:14.965729569 -0600 ++++ akode-2.0.2/akode/akode.pc.in 2007-12-23 21:32:59.000000000 -0600 +@@ -0,0 +1,11 @@ ++prefix=@prefix@ ++exec_prefix=@prefix@ ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: akode ++Description: aKode is a simple audio-decoding frame-work ++Version: 2.0.2 ++Libs: -L${libdir} -lakode ++Cflags: -I${includedir} ++ +diff -up akode-2.0.2/akode/configure.in.in.multilib akode-2.0.2/akode/configure.in.in +--- akode-2.0.2/akode/configure.in.in.multilib 2007-12-23 21:32:59.000000000 -0600 ++++ akode-2.0.2/akode/configure.in.in 2007-12-23 21:32:59.000000000 -0600 +@@ -1,5 +1,6 @@ + dnl don't remove the below + dnl AC_OUTPUT(akode/akode-config) ++dnl AC_OUTPUT(akode/akode.pc) + + AM_CONFIG_HEADER(akode/lib/akode_export.h) + +diff -up akode-2.0.2/akode/akode-config.in.multilib akode-2.0.2/akode/akode-config.in +--- akode-2.0.2/akode/akode-config.in.multilib 2007-04-06 08:16:47.000000000 -0500 ++++ akode-2.0.2/akode/akode-config.in 2007-12-23 21:37:40.000000000 -0600 +@@ -15,9 +15,8 @@ EOH + } + + prefix=@prefix@ +-exec_prefix=@exec_prefix@ +-libdir=@libdir@ +-includedir=@includedir@ ++akode_libs="`pkg-config --libs akode`" ++akode_cflags="`pkg-config --cflags akode`" + + flags="" + +@@ -29,10 +28,10 @@ while test $# -gt 0 + do + case $1 in + --libs) +- flags="$flags -L$libdir -lakode" ++ flags="$flags $akode_libs" + ;; + --cflags) +- flags="$flags -I$includedir" ++ flags="$flags $akode_cflags" + ;; + --version) + echo 2.0.2 +diff -up akode-2.0.2/akode/Makefile.am.multilib akode-2.0.2/akode/Makefile.am +--- akode-2.0.2/akode/Makefile.am.multilib 2005-07-14 09:27:18.000000000 -0500 ++++ akode-2.0.2/akode/Makefile.am 2007-12-23 21:32:59.000000000 -0600 +@@ -1,3 +1,8 @@ + bin_SCRIPTS = akode-config + + SUBDIRS= lib plugins akodeplay ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = akode.pc ++ ++EXTRA_DIST = akode.pc.in diff --git a/akode.spec b/akode.spec index 3f69356..9fe261d 100644 --- a/akode.spec +++ b/akode.spec @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.2 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -12,6 +12,7 @@ Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.ta BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: akode-pulseaudio.patch +Patch2: akode-2.0.2-multilib.patch %if 0%{?fedora} > 4 %define _with_jack --with-jack @@ -48,6 +49,7 @@ aKode also has the following audio outputs: Summary: Headers for developing programs that will use %{name} Group: Development/Libraries Requires: %{name} = %{version}-%{release} +Requires: pkgconfig %description devel %{summary}. @@ -80,6 +82,7 @@ Requires: %{name} = %{version}-%{release} %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .pulseaudio +%patch2 -p1 -b .multilib #[ ! -f configure ] && \ make -f Makefile.cvs @@ -142,6 +145,7 @@ rm -rf %{buildroot} %{_bindir}/akode-config %{_includedir}/* %{_libdir}/libakode.so +%{_libdir}/pkgconfig/*.pc %if "%{?_with_jack:1}" == "1" %files jack @@ -162,6 +166,9 @@ rm -rf %{buildroot} %changelog +* Sun Dec 23 2007 Rex Dieter 2.0.2-2 +- fix multilib conflicts (#340591) + * Sun Dec 23 2007 Rex Dieter 2.0.2-1 - akode-2.0.2 From 3ef25d468a61ba6ee531421e6581e8e095dc735e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Dec 2007 04:28:02 +0000 Subject: [PATCH 07/15] - fix flac113 support --- akode-2.0.2-flac113-portable.patch | 11 +++++++++++ akode.spec | 12 +++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 akode-2.0.2-flac113-portable.patch diff --git a/akode-2.0.2-flac113-portable.patch b/akode-2.0.2-flac113-portable.patch new file mode 100644 index 0000000..4c5a261 --- /dev/null +++ b/akode-2.0.2-flac113-portable.patch @@ -0,0 +1,11 @@ +--- branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:11:43 654042 ++++ branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:14:06 654043 +@@ -108,7 +108,7 @@ + static FLAC__StreamDecoderReadStatus flac_read_callback( + const FLAC__StreamDecoder *, + FLAC__byte buffer[], +- unsigned *bytes, ++ size_t *bytes, + void *client_data) + { + FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data; diff --git a/akode.spec b/akode.spec index 9fe261d..69bbfb6 100644 --- a/akode.spec +++ b/akode.spec @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.2 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -13,7 +13,9 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: akode-pulseaudio.patch Patch2: akode-2.0.2-multilib.patch +Patch3: akode-2.0.2-flac113-portable.patch +%define _with_flac --with-flac %if 0%{?fedora} > 4 %define _with_jack --with-jack %define _with_pulseaudio --with-pulseaudio @@ -26,7 +28,7 @@ Requires: %{name}-pulseaudio BuildRequires: automake libtool BuildRequires: alsa-lib-devel -BuildRequires: flac-devel +%{?_with_flac:BuildRequires: flac-devel} %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} BuildRequires: libsamplerate-devel BuildRequires: libvorbis-devel @@ -83,6 +85,7 @@ Requires: %{name} = %{version}-%{release} %patch1 -p1 -b .pulseaudio %patch2 -p1 -b .multilib +%patch3 -p4 -b .flac113_portable #[ ! -f configure ] && \ make -f Makefile.cvs @@ -95,7 +98,7 @@ make -f Makefile.cvs --without-libltdl \ --with-alsa \ --without-oss \ - --with-flac \ + %{?_with_flac} %{!?_with_flac:--without-flac} \ %{?_with_jack} %{!?_with_jack:--without-jack} \ --with-libsamplerate \ %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ @@ -166,6 +169,9 @@ rm -rf %{buildroot} %changelog +* Sun Dec 23 2007 Rex Dieter 2.0.2-3 +- fix flac113 support + * Sun Dec 23 2007 Rex Dieter 2.0.2-2 - fix multilib conflicts (#340591) From 7ca90b0454cc056227ef9ed7adc9c8c73baa2cec Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Dec 2007 04:46:11 +0000 Subject: [PATCH 08/15] make libsamplerate optional (and fedora only) --- akode.spec | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/akode.spec b/akode.spec index 69bbfb6..32cafba 100644 --- a/akode.spec +++ b/akode.spec @@ -18,6 +18,7 @@ Patch3: akode-2.0.2-flac113-portable.patch %define _with_flac --with-flac %if 0%{?fedora} > 4 %define _with_jack --with-jack +%define _with_libsamplerate --with-libsamplerate %define _with_pulseaudio --with-pulseaudio %endif @@ -30,7 +31,7 @@ BuildRequires: automake libtool BuildRequires: alsa-lib-devel %{?_with_flac:BuildRequires: flac-devel} %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} -BuildRequires: libsamplerate-devel +%{?_with_libsamplerate:BuildRequires: libsamplerate-devel} BuildRequires: libvorbis-devel %{?_with_pulseaudio:BuildRequires: pulseaudio-lib-devel} BuildRequires: speex-devel @@ -100,7 +101,7 @@ make -f Makefile.cvs --without-oss \ %{?_with_flac} %{!?_with_flac:--without-flac} \ %{?_with_jack} %{!?_with_jack:--without-jack} \ - --with-libsamplerate \ + %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ --with-speex \ --with-vorbis \ @@ -156,17 +157,19 @@ rm -rf %{buildroot} %{_libdir}/libakode_jack_sink.so %endif +# License: GPLv2+ +%if "%{?_with_libsamplerate:1}" == "1" +%files libsamplerate +%defattr(-,root,root,-) +%{_libdir}/libakode_src_resampler.so +%endif + %if "%{?_with_pulseaudio:1}" == "1" %files pulseaudio %defattr(-,root,root,-) %{_libdir}/libakode_polyp_sink.so %endif -# License: GPLv2+ -%files libsamplerate -%defattr(-,root,root,-) -%{_libdir}/libakode_src_resampler.so - %changelog * Sun Dec 23 2007 Rex Dieter 2.0.2-3 From 9f5ffeca711066ab380a8712c1c1b55fa6b2f23d Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 7 Jan 2008 17:34:46 +0000 Subject: [PATCH 09/15] - -Requires: %name-pulseaudio (can be added to kde-settings-pulseaudio) --- akode.spec | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/akode.spec b/akode.spec index 32cafba..7d91caf 100644 --- a/akode.spec +++ b/akode.spec @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -22,11 +22,6 @@ Patch3: akode-2.0.2-flac113-portable.patch %define _with_pulseaudio --with-pulseaudio %endif -%if 0%{?fedora} > 7 -# pulseaudio is/will-be the F8 default -Requires: %{name}-pulseaudio -%endif - BuildRequires: automake libtool BuildRequires: alsa-lib-devel %{?_with_flac:BuildRequires: flac-devel} @@ -172,6 +167,9 @@ rm -rf %{buildroot} %changelog +* Mon Jan 07 2008 Rex Dieter 2.0.2-4 +- -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio) + * Sun Dec 23 2007 Rex Dieter 2.0.2-3 - fix flac113 support From 7fcc105e0804643f4b9513de4cd8075ed59ec724 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 8 Feb 2008 21:21:47 +0000 Subject: [PATCH 10/15] - respin (gcc43) --- akode.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/akode.spec b/akode.spec index 7d91caf..3424cdc 100644 --- a/akode.spec +++ b/akode.spec @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.2 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -167,6 +167,9 @@ rm -rf %{buildroot} %changelog +* Fri Feb 08 2008 Rex Dieter 2.0.2-5 +- respin (gcc43) + * Mon Jan 07 2008 Rex Dieter 2.0.2-4 - -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio) From 13cbcdcd7bbed2c2805418b933a68b035dba0415 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 12 Feb 2008 23:32:02 +0000 Subject: [PATCH 11/15] - gcc43 patch --- akode-2.0.2-gcc43.patch | 46 +++++++++++++++++++++++++++++++++++++++++ akode.spec | 6 ++++-- 2 files changed, 50 insertions(+), 2 deletions(-) create mode 100644 akode-2.0.2-gcc43.patch diff --git a/akode-2.0.2-gcc43.patch b/akode-2.0.2-gcc43.patch new file mode 100644 index 0000000..b4491eb --- /dev/null +++ b/akode-2.0.2-gcc43.patch @@ -0,0 +1,46 @@ +diff -up akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 akode-2.0.2/akode/akodeplay/akodeplay.cpp +--- akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 2006-11-06 07:20:52.000000000 -0600 ++++ akode-2.0.2/akode/akodeplay/akodeplay.cpp 2008-02-12 17:28:00.000000000 -0600 +@@ -25,6 +25,7 @@ + #include "../lib/sink.h" + #include "../lib/decoder.h" + ++#include + #ifdef HAVE_GNU_GETOPT + #include + #else +diff -up akode-2.0.2/akode/lib/player.cpp.gcc43 akode-2.0.2/akode/lib/player.cpp +--- akode-2.0.2/akode/lib/player.cpp.gcc43 2006-11-05 08:37:48.000000000 -0600 ++++ akode-2.0.2/akode/lib/player.cpp 2008-02-12 17:10:58.000000000 -0600 +@@ -21,6 +21,7 @@ + #include + #include + #include ++#include + + #include "audioframe.h" + #include "audiobuffer.h" +diff -up akode-2.0.2/akode/lib/magic.cpp.gcc43 akode-2.0.2/akode/lib/magic.cpp +--- akode-2.0.2/akode/lib/magic.cpp.gcc43 2008-02-12 16:52:26.000000000 -0600 ++++ akode-2.0.2/akode/lib/magic.cpp 2008-02-12 17:16:54.000000000 -0600 +@@ -21,6 +21,8 @@ + #include "akodelib.h" + #include "magic.h" + #include "file.h" ++#include ++#include + #include + using std::cerr; + +diff -up akode-2.0.2/akode/lib/akode_export.h.in.gcc43 akode-2.0.2/akode/lib/akode_export.h.in +diff -up akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 akode-2.0.2/akode/lib/auto_sink.cpp +--- akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 2005-10-26 08:50:29.000000000 -0500 ++++ akode-2.0.2/akode/lib/auto_sink.cpp 2008-02-12 16:57:18.000000000 -0600 +@@ -21,6 +21,7 @@ + #include "audioframe.h" + #include "auto_sink.h" + ++#include + #include + + namespace aKode { diff --git a/akode.spec b/akode.spec index 3424cdc..cf05600 100644 --- a/akode.spec +++ b/akode.spec @@ -14,6 +14,7 @@ BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Patch1: akode-pulseaudio.patch Patch2: akode-2.0.2-multilib.patch Patch3: akode-2.0.2-flac113-portable.patch +Patch4: akode-2.0.2-gcc43.patch %define _with_flac --with-flac %if 0%{?fedora} > 4 @@ -82,6 +83,7 @@ Requires: %{name} = %{version}-%{release} %patch1 -p1 -b .pulseaudio %patch2 -p1 -b .multilib %patch3 -p4 -b .flac113_portable +%patch4 -p1 -b .gcc43 #[ ! -f configure ] && \ make -f Makefile.cvs @@ -167,8 +169,8 @@ rm -rf %{buildroot} %changelog -* Fri Feb 08 2008 Rex Dieter 2.0.2-5 -- respin (gcc43) +* Tue Feb 12 2008 Rex Dieter 2.0.2-5 +- gcc43 patch * Mon Jan 07 2008 Rex Dieter 2.0.2-4 - -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio) From 4673fb658dd535334cd630f60a328934bc63710c Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 26 Sep 2008 19:25:09 +0000 Subject: [PATCH 12/15] fix pulseaudio patch to apply without fuzz --- akode-pulseaudio.patch | 296 ++++++++++++++++++++--------------------- akode.spec | 8 +- 2 files changed, 153 insertions(+), 151 deletions(-) diff --git a/akode-pulseaudio.patch b/akode-pulseaudio.patch index 99521a2..944c3a9 100644 --- a/akode-pulseaudio.patch +++ b/akode-pulseaudio.patch @@ -1,7 +1,7 @@ -diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in ---- akode-2.0.1.orig/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -169,9 +169,9 @@ +diff -up akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio akode-2.0.2/akode/akodeplay/Makefile.in +--- akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/akodeplay/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -172,9 +172,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -14,42 +14,10 @@ diff -urN akode-2.0.1.orig/Makefile.in akode-2.0.1/Makefile.in RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/Makefile.in akode-2.0.1/akode/Makefile.in ---- akode-2.0.1.orig/akode/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -158,9 +158,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/akodeplay/Makefile.in akode-2.0.1/akode/akodeplay/Makefile.in ---- akode-2.0.1.orig/akode/akodeplay/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/akodeplay/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -170,9 +170,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in.in ---- akode-2.0.1.orig/akode/configure.in.in 2005-10-27 17:12:36.000000000 +0200 -+++ akode-2.0.1/akode/configure.in.in 2006-09-06 14:45:46.000000000 +0200 -@@ -295,24 +295,24 @@ +diff -up akode-2.0.2/akode/configure.in.in.pulseaudio akode-2.0.2/akode/configure.in.in +--- akode-2.0.2/akode/configure.in.in.pulseaudio 2007-02-06 16:47:43.000000000 -0500 ++++ akode-2.0.2/akode/configure.in.in 2008-09-26 13:35:25.000000000 -0400 +@@ -270,24 +270,24 @@ AC_SUBST(JACK_LIBADD) AC_SUBST(JACK_LDFLAGS) fi @@ -86,8 +54,8 @@ diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in. +AC_SUBST(PULSE_LDFLAGS) fi - AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"]) -@@ -507,7 +507,7 @@ + AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"]) +@@ -482,7 +482,7 @@ AM_CONDITIONAL(include_alsa_sink, test x AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) @@ -96,10 +64,10 @@ diff -urN akode-2.0.1.orig/akode/configure.in.in akode-2.0.1/akode/configure.in. AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) AC_MSG_CHECKING(for compilable aKode) -diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile.in ---- akode-2.0.1.orig/akode/lib/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/lib/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -194,9 +194,9 @@ +diff -up akode-2.0.2/akode/lib/Makefile.in.pulseaudio akode-2.0.2/akode/lib/Makefile.in +--- akode-2.0.2/akode/lib/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/lib/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -196,9 +196,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -112,10 +80,10 @@ diff -urN akode-2.0.1.orig/akode/lib/Makefile.in akode-2.0.1/akode/lib/Makefile. RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/Makefile.in ---- akode-2.0.1.orig/akode/plugins/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -154,9 +154,9 @@ +diff -up akode-2.0.2/akode/Makefile.in.pulseaudio akode-2.0.2/akode/Makefile.in +--- akode-2.0.2/akode/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -160,9 +160,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -128,7 +96,71 @@ diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/M RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -@@ -251,11 +251,11 @@ +diff -up akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/alsa_sink/Makefile.in +--- akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/alsa_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-POLYP_CFLAGS = @POLYP_CFLAGS@ +-POLYP_LDFLAGS = @POLYP_LDFLAGS@ +-POLYP_LIBADD = @POLYP_LIBADD@ ++PULSE_CFLAGS = @PULSE_CFLAGS@ ++PULSE_LDFLAGS = @PULSE_LDFLAGS@ ++PULSE_LIBADD = @PULSE_LIBADD@ + RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +diff -up akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in +--- akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-POLYP_CFLAGS = @POLYP_CFLAGS@ +-POLYP_LDFLAGS = @POLYP_LDFLAGS@ +-POLYP_LIBADD = @POLYP_LIBADD@ ++PULSE_CFLAGS = @PULSE_CFLAGS@ ++PULSE_LDFLAGS = @PULSE_LDFLAGS@ ++PULSE_LIBADD = @PULSE_LIBADD@ + RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +diff -up akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/jack_sink/Makefile.in +--- akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/jack_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-POLYP_CFLAGS = @POLYP_CFLAGS@ +-POLYP_LDFLAGS = @POLYP_LDFLAGS@ +-POLYP_LIBADD = @POLYP_LIBADD@ ++PULSE_CFLAGS = @PULSE_CFLAGS@ ++PULSE_LDFLAGS = @PULSE_LDFLAGS@ ++PULSE_LIBADD = @PULSE_LIBADD@ + RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +diff -up akode-2.0.2/akode/plugins/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/Makefile.in +--- akode-2.0.2/akode/plugins/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -156,9 +156,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-POLYP_CFLAGS = @POLYP_CFLAGS@ +-POLYP_LDFLAGS = @POLYP_LDFLAGS@ +-POLYP_LIBADD = @POLYP_LIBADD@ ++PULSE_CFLAGS = @PULSE_CFLAGS@ ++PULSE_LDFLAGS = @PULSE_LDFLAGS@ ++PULSE_LIBADD = @PULSE_LIBADD@ + RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ +@@ -257,11 +257,11 @@ AKODE_MPC_DECODER = mpc_decoder @include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink @include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink @include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink @@ -142,10 +174,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/Makefile.in akode-2.0.1/akode/plugins/M $(AKODE_SRC_RESAMPLER) #>- all: all-recursive -diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode/plugins/alsa_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/alsa_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ +diff -up akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in +--- akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -193,9 +193,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -158,10 +190,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/alsa_sink/Makefile.in akode-2.0.1/akode RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/ffmpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -178,9 +178,9 @@ +diff -up akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in +--- akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -174,10 +206,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/ffmpeg_decoder/Makefile.in akode-2.0.1/ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode/plugins/jack_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/jack_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ +diff -up akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in +--- akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -190,10 +222,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/jack_sink/Makefile.in akode-2.0.1/akode RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/mpc_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -191,9 +191,9 @@ +diff -up akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/oss_sink/Makefile.in +--- akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/oss_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -206,57 +238,9 @@ diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/Makefile.in akode-2.0.1/ako RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in ---- akode-2.0.1.orig/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/mpc_decoder/mppdec/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -169,9 +169,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/mpeg_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/mpeg_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -178,9 +178,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in akode-2.0.1/akode/plugins/oss_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/oss_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/oss_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akode/plugins/polyp_sink/Makefile.am ---- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am 2005-07-15 13:20:03.000000000 +0200 -+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.am 2006-09-06 14:38:04.000000000 +0200 +diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.am +--- akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio 2005-07-15 07:20:03.000000000 -0400 ++++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.am 2008-09-26 13:32:59.000000000 -0400 @@ -1,7 +1,7 @@ -INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) +INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) @@ -268,10 +252,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.am akode-2.0.1/akod -libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) +libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) +libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) -diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akode/plugins/polyp_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/polyp_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -177,9 +177,9 @@ +diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.in +--- akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -284,7 +268,7 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akod RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -@@ -265,13 +265,13 @@ +@@ -271,13 +271,13 @@ target_os = @target_os@ target_vendor = @target_vendor@ unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ @@ -302,9 +286,9 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/Makefile.in akode-2.0.1/akod #>- all: all-am #>+ 1 all: docs-am all-am -diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp ---- akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp 2005-10-20 22:54:12.000000000 +0200 -+++ akode-2.0.1/akode/plugins/polyp_sink/polyp_sink.cpp 2006-09-06 15:14:52.000000000 +0200 +diff -up akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp +--- akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio 2005-10-20 16:54:12.000000000 -0400 ++++ akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp 2008-09-26 13:32:59.000000000 -0400 @@ -25,7 +25,7 @@ #elif defined(HAVE_INTTYPES_H) #include @@ -314,7 +298,7 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/a #include "audioframe.h" #include "audiobuffer.h" -@@ -59,7 +59,7 @@ +@@ -59,7 +59,7 @@ PolypSink::PolypSink() bool PolypSink::open() { int error = 0; @@ -323,10 +307,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/polyp_sink/polyp_sink.cpp akode-2.0.1/a if (!m_data->server || error != 0) { m_data->error = true; close(); -diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/akode/plugins/src_resampler/Makefile.in ---- akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/src_resampler/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -178,9 +178,9 @@ +diff -up akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/src_resampler/Makefile.in +--- akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/src_resampler/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -339,10 +323,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/src_resampler/Makefile.in akode-2.0.1/a RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/plugins/sun_sink/Makefile.in ---- akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/sun_sink/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -175,9 +175,9 @@ +diff -up akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/sun_sink/Makefile.in +--- akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/sun_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -177,9 +177,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -355,10 +339,10 @@ diff -urN akode-2.0.1.orig/akode/plugins/sun_sink/Makefile.in akode-2.0.1/akode/ RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in ---- akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in 2006-07-23 00:17:11.000000000 +0200 -+++ akode-2.0.1/akode/plugins/xiph_decoder/Makefile.in 2006-09-06 14:38:04.000000000 +0200 -@@ -185,9 +185,9 @@ +diff -up akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in +--- akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -189,9 +189,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ PACKAGE_VERSION = @PACKAGE_VERSION@ PATH_SEPARATOR = @PATH_SEPARATOR@ PKG_CONFIG = @PKG_CONFIG@ @@ -371,9 +355,9 @@ diff -urN akode-2.0.1.orig/akode/plugins/xiph_decoder/Makefile.in akode-2.0.1/ak RANLIB = @RANLIB@ SET_MAKE = @SET_MAKE@ SHELL = @SHELL@ -diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in ---- akode-2.0.1.orig/config.h.in 2006-07-23 00:17:04.000000000 +0200 -+++ akode-2.0.1/config.h.in 2006-09-06 14:44:55.000000000 +0200 +diff -up akode-2.0.2/config.h.in.pulseaudio akode-2.0.2/config.h.in +--- akode-2.0.2/config.h.in.pulseaudio 2007-04-06 09:23:23.000000000 -0400 ++++ akode-2.0.2/config.h.in 2008-09-26 13:32:59.000000000 -0400 @@ -43,9 +43,9 @@ /* Define if you have libOggFLAC (required for loading OggFLAC files) */ #undef HAVE_LIBOGGFLAC @@ -386,10 +370,10 @@ diff -urN akode-2.0.1.orig/config.h.in akode-2.0.1/config.h.in /* defined if you have libsamplerate library and header */ #undef HAVE_LIBSAMPLERATE -diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in ---- akode-2.0.1.orig/configure.in 2006-07-23 00:16:52.000000000 +0200 -+++ akode-2.0.1/configure.in 2006-09-06 14:45:21.000000000 +0200 -@@ -400,24 +400,24 @@ +diff -up akode-2.0.2/configure.in.pulseaudio akode-2.0.2/configure.in +--- akode-2.0.2/configure.in.pulseaudio 2007-04-06 09:23:11.000000000 -0400 ++++ akode-2.0.2/configure.in 2008-09-26 13:37:25.000000000 -0400 +@@ -375,24 +375,24 @@ AC_SUBST(JACK_LIBADD) AC_SUBST(JACK_LDFLAGS) fi @@ -426,8 +410,8 @@ diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in +AC_SUBST(PULSE_LDFLAGS) fi - AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=no@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="no"]) -@@ -612,7 +612,7 @@ + AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"]) +@@ -587,7 +587,7 @@ AM_CONDITIONAL(include_alsa_sink, test x AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) @@ -436,3 +420,19 @@ diff -urN akode-2.0.1.orig/configure.in akode-2.0.1/configure.in AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) AC_MSG_CHECKING(for compilable aKode) +diff -up akode-2.0.2/Makefile.in.pulseaudio akode-2.0.2/Makefile.in +--- akode-2.0.2/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 ++++ akode-2.0.2/Makefile.in 2008-09-26 13:32:59.000000000 -0400 +@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ + PACKAGE_VERSION = @PACKAGE_VERSION@ + PATH_SEPARATOR = @PATH_SEPARATOR@ + PKG_CONFIG = @PKG_CONFIG@ +-POLYP_CFLAGS = @POLYP_CFLAGS@ +-POLYP_LDFLAGS = @POLYP_LDFLAGS@ +-POLYP_LIBADD = @POLYP_LIBADD@ ++PULSE_CFLAGS = @PULSE_CFLAGS@ ++PULSE_LDFLAGS = @PULSE_LDFLAGS@ ++PULSE_LIBADD = @PULSE_LIBADD@ + RANLIB = @RANLIB@ + SET_MAKE = @SET_MAKE@ + SHELL = @SHELL@ diff --git a/akode.spec b/akode.spec index cf05600..41f3933 100644 --- a/akode.spec +++ b/akode.spec @@ -2,7 +2,7 @@ Summary: Audio-decoding framework Name: akode Version: 2.0.2 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPLv2+ Group: System Environment/Libraries @@ -85,11 +85,10 @@ Requires: %{name} = %{version}-%{release} %patch3 -p4 -b .flac113_portable %patch4 -p1 -b .gcc43 +%build #[ ! -f configure ] && \ make -f Makefile.cvs - -%build %configure \ --disable-static \ --disable-debug --disable-warnings --disable-dependency-tracking \ @@ -169,6 +168,9 @@ rm -rf %{buildroot} %changelog +* Fri Sep 26 2008 Tom "spot" Callaway 2.0.2-6 +- fix pulseaudio patch to apply without fuzz + * Tue Feb 12 2008 Rex Dieter 2.0.2-5 - gcc43 patch From 08a072c2d12ac2becf22aa1fb96a5cb26d520ae0 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Fri, 3 Oct 2008 13:56:56 +0000 Subject: [PATCH 13/15] akode was primarily for kdemultimedia(3), now deprecated in the F9+ kde4 world --- .cvsignore | 1 - akode-2.0.2-flac113-portable.patch | 11 - akode-2.0.2-gcc43.patch | 46 --- akode-2.0.2-multilib.patch | 65 ----- akode-pulseaudio.patch | 438 ----------------------------- akode.spec | 235 ---------------- dead.package | 1 + sources | 1 - 8 files changed, 1 insertion(+), 797 deletions(-) delete mode 100644 .cvsignore delete mode 100644 akode-2.0.2-flac113-portable.patch delete mode 100644 akode-2.0.2-gcc43.patch delete mode 100644 akode-2.0.2-multilib.patch delete mode 100644 akode-pulseaudio.patch delete mode 100644 akode.spec create mode 100644 dead.package delete mode 100644 sources diff --git a/.cvsignore b/.cvsignore deleted file mode 100644 index 54e7f71..0000000 --- a/.cvsignore +++ /dev/null @@ -1 +0,0 @@ -30375-akode-2.0.2.tar.bz2 diff --git a/akode-2.0.2-flac113-portable.patch b/akode-2.0.2-flac113-portable.patch deleted file mode 100644 index 4c5a261..0000000 --- a/akode-2.0.2-flac113-portable.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:11:43 654042 -+++ branches/kdesupport/3.5/kdesupport/akode/plugins/xiph_decoder/flac113_decoder.cpp 2007/04/14 22:14:06 654043 -@@ -108,7 +108,7 @@ - static FLAC__StreamDecoderReadStatus flac_read_callback( - const FLAC__StreamDecoder *, - FLAC__byte buffer[], -- unsigned *bytes, -+ size_t *bytes, - void *client_data) - { - FLACDecoder::private_data *data = (FLACDecoder::private_data*)client_data; diff --git a/akode-2.0.2-gcc43.patch b/akode-2.0.2-gcc43.patch deleted file mode 100644 index b4491eb..0000000 --- a/akode-2.0.2-gcc43.patch +++ /dev/null @@ -1,46 +0,0 @@ -diff -up akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 akode-2.0.2/akode/akodeplay/akodeplay.cpp ---- akode-2.0.2/akode/akodeplay/akodeplay.cpp.gcc43 2006-11-06 07:20:52.000000000 -0600 -+++ akode-2.0.2/akode/akodeplay/akodeplay.cpp 2008-02-12 17:28:00.000000000 -0600 -@@ -25,6 +25,7 @@ - #include "../lib/sink.h" - #include "../lib/decoder.h" - -+#include - #ifdef HAVE_GNU_GETOPT - #include - #else -diff -up akode-2.0.2/akode/lib/player.cpp.gcc43 akode-2.0.2/akode/lib/player.cpp ---- akode-2.0.2/akode/lib/player.cpp.gcc43 2006-11-05 08:37:48.000000000 -0600 -+++ akode-2.0.2/akode/lib/player.cpp 2008-02-12 17:10:58.000000000 -0600 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - - #include "audioframe.h" - #include "audiobuffer.h" -diff -up akode-2.0.2/akode/lib/magic.cpp.gcc43 akode-2.0.2/akode/lib/magic.cpp ---- akode-2.0.2/akode/lib/magic.cpp.gcc43 2008-02-12 16:52:26.000000000 -0600 -+++ akode-2.0.2/akode/lib/magic.cpp 2008-02-12 17:16:54.000000000 -0600 -@@ -21,6 +21,8 @@ - #include "akodelib.h" - #include "magic.h" - #include "file.h" -+#include -+#include - #include - using std::cerr; - -diff -up akode-2.0.2/akode/lib/akode_export.h.in.gcc43 akode-2.0.2/akode/lib/akode_export.h.in -diff -up akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 akode-2.0.2/akode/lib/auto_sink.cpp ---- akode-2.0.2/akode/lib/auto_sink.cpp.gcc43 2005-10-26 08:50:29.000000000 -0500 -+++ akode-2.0.2/akode/lib/auto_sink.cpp 2008-02-12 16:57:18.000000000 -0600 -@@ -21,6 +21,7 @@ - #include "audioframe.h" - #include "auto_sink.h" - -+#include - #include - - namespace aKode { diff --git a/akode-2.0.2-multilib.patch b/akode-2.0.2-multilib.patch deleted file mode 100644 index c3832a9..0000000 --- a/akode-2.0.2-multilib.patch +++ /dev/null @@ -1,65 +0,0 @@ -diff -up /dev/null akode-2.0.2/akode/akode.pc.in ---- /dev/null 2007-12-13 13:41:14.965729569 -0600 -+++ akode-2.0.2/akode/akode.pc.in 2007-12-23 21:32:59.000000000 -0600 -@@ -0,0 +1,11 @@ -+prefix=@prefix@ -+exec_prefix=@prefix@ -+libdir=@libdir@ -+includedir=@includedir@ -+ -+Name: akode -+Description: aKode is a simple audio-decoding frame-work -+Version: 2.0.2 -+Libs: -L${libdir} -lakode -+Cflags: -I${includedir} -+ -diff -up akode-2.0.2/akode/configure.in.in.multilib akode-2.0.2/akode/configure.in.in ---- akode-2.0.2/akode/configure.in.in.multilib 2007-12-23 21:32:59.000000000 -0600 -+++ akode-2.0.2/akode/configure.in.in 2007-12-23 21:32:59.000000000 -0600 -@@ -1,5 +1,6 @@ - dnl don't remove the below - dnl AC_OUTPUT(akode/akode-config) -+dnl AC_OUTPUT(akode/akode.pc) - - AM_CONFIG_HEADER(akode/lib/akode_export.h) - -diff -up akode-2.0.2/akode/akode-config.in.multilib akode-2.0.2/akode/akode-config.in ---- akode-2.0.2/akode/akode-config.in.multilib 2007-04-06 08:16:47.000000000 -0500 -+++ akode-2.0.2/akode/akode-config.in 2007-12-23 21:37:40.000000000 -0600 -@@ -15,9 +15,8 @@ EOH - } - - prefix=@prefix@ --exec_prefix=@exec_prefix@ --libdir=@libdir@ --includedir=@includedir@ -+akode_libs="`pkg-config --libs akode`" -+akode_cflags="`pkg-config --cflags akode`" - - flags="" - -@@ -29,10 +28,10 @@ while test $# -gt 0 - do - case $1 in - --libs) -- flags="$flags -L$libdir -lakode" -+ flags="$flags $akode_libs" - ;; - --cflags) -- flags="$flags -I$includedir" -+ flags="$flags $akode_cflags" - ;; - --version) - echo 2.0.2 -diff -up akode-2.0.2/akode/Makefile.am.multilib akode-2.0.2/akode/Makefile.am ---- akode-2.0.2/akode/Makefile.am.multilib 2005-07-14 09:27:18.000000000 -0500 -+++ akode-2.0.2/akode/Makefile.am 2007-12-23 21:32:59.000000000 -0600 -@@ -1,3 +1,8 @@ - bin_SCRIPTS = akode-config - - SUBDIRS= lib plugins akodeplay -+ -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = akode.pc -+ -+EXTRA_DIST = akode.pc.in diff --git a/akode-pulseaudio.patch b/akode-pulseaudio.patch deleted file mode 100644 index 944c3a9..0000000 --- a/akode-pulseaudio.patch +++ /dev/null @@ -1,438 +0,0 @@ -diff -up akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio akode-2.0.2/akode/akodeplay/Makefile.in ---- akode-2.0.2/akode/akodeplay/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/akodeplay/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -172,9 +172,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/configure.in.in.pulseaudio akode-2.0.2/akode/configure.in.in ---- akode-2.0.2/akode/configure.in.in.pulseaudio 2007-02-06 16:47:43.000000000 -0500 -+++ akode-2.0.2/akode/configure.in.in 2008-09-26 13:35:25.000000000 -0400 -@@ -270,24 +270,24 @@ AC_SUBST(JACK_LIBADD) - AC_SUBST(JACK_LDFLAGS) - fi - --AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) -+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) - --if test "x$polypaudio_test" = "xyes" ; then --AC_MSG_CHECKING(for Polypaudio 0.7 or later) --if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then -- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" -- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" -- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" -- have_polyp=yes -+if test "x$pulseaudio_test" = "xyes" ; then -+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) -+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then -+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" -+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" -+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" -+ have_pulse=yes - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LIBPOLYP, 1, -- [Define if you have polyplib (required if you want Polypaudio server support)]) -+ AC_DEFINE(HAVE_LIBPULSE, 1, -+ [Define if you have libpulse (required if you want PulseAudio server support)]) - else - AC_MSG_RESULT(not installed) - fi --AC_SUBST(POLYP_CFLAGS) --AC_SUBST(POLYP_LIBADD) --AC_SUBST(POLYP_LDFLAGS) -+AC_SUBST(PULSE_CFLAGS) -+AC_SUBST(PULSE_LIBADD) -+AC_SUBST(PULSE_LDFLAGS) - fi - - AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"]) -@@ -482,7 +482,7 @@ AM_CONDITIONAL(include_alsa_sink, test x - AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) - AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) - AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) --AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) -+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) - AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) - - AC_MSG_CHECKING(for compilable aKode) -diff -up akode-2.0.2/akode/lib/Makefile.in.pulseaudio akode-2.0.2/akode/lib/Makefile.in ---- akode-2.0.2/akode/lib/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/lib/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -196,9 +196,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/Makefile.in.pulseaudio akode-2.0.2/akode/Makefile.in ---- akode-2.0.2/akode/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -160,9 +160,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/alsa_sink/Makefile.in ---- akode-2.0.2/akode/plugins/alsa_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/alsa_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in ---- akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/jack_sink/Makefile.in ---- akode-2.0.2/akode/plugins/jack_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/jack_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/Makefile.in ---- akode-2.0.2/akode/plugins/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -156,9 +156,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -@@ -257,11 +257,11 @@ AKODE_MPC_DECODER = mpc_decoder - @include_oss_sink_TRUE@AKODE_OSS_SINK = oss_sink - @include_sun_sink_TRUE@AKODE_SUN_SINK = sun_sink - @include_jack_sink_TRUE@AKODE_JACK_SINK = jack_sink --@include_polyp_sink_TRUE@AKODE_POLYP_SINK = polyp_sink -+@include_polyp_sink_TRUE@AKODE_PULSE_SINK = polyp_sink - SUBDIRS = $(AKODE_MPC_DECODER) $(AKODE_XIPH_DECODER) \ - $(AKODE_MPEG_DECODER) $(AKODE_FFMPEG_DECODER) \ - $(AKODE_ALSA_SINK) $(AKODE_OSS_SINK) $(AKODE_SUN_SINK) \ -- $(AKODE_JACK_SINK) $(AKODE_POLYP_SINK) \ -+ $(AKODE_JACK_SINK) $(AKODE_PULSE_SINK) \ - $(AKODE_SRC_RESAMPLER) - - #>- all: all-recursive -diff -up akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in ---- akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/mpc_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -193,9 +193,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in ---- akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/mpc_decoder/mppdec/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in ---- akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/mpeg_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/oss_sink/Makefile.in ---- akode-2.0.2/akode/plugins/oss_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/oss_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.am ---- akode-2.0.2/akode/plugins/polyp_sink/Makefile.am.pulseaudio 2005-07-15 07:20:03.000000000 -0400 -+++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.am 2008-09-26 13:32:59.000000000 -0400 -@@ -1,7 +1,7 @@ --INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) -+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) - - lib_LTLIBRARIES = libakode_polyp_sink.la - - libakode_polyp_sink_la_SOURCES = polyp_sink.cpp --libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) --libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) -+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) -+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) -diff -up akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/Makefile.in ---- akode-2.0.2/akode/plugins/polyp_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/polyp_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -179,9 +179,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -@@ -271,13 +271,13 @@ target_os = @target_os@ - target_vendor = @target_vendor@ - unsermake_enable_pch_FALSE = @unsermake_enable_pch_FALSE@ - unsermake_enable_pch_TRUE = @unsermake_enable_pch_TRUE@ --INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(POLYP_CFLAGS) $(all_includes) -+INCLUDES = -I$(top_srcdir)/akode/lib -I$(top_builddir)/akode/lib $(PULSE_CFLAGS) $(all_includes) - lib_LTLIBRARIES = libakode_polyp_sink.la - libakode_polyp_sink_la_SOURCES = polyp_sink.cpp --#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(POLYP_LDFLAGS) -+#>- libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(PULSE_LDFLAGS) - #>+ 1 --libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(POLYP_LDFLAGS) --libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(POLYP_LIBADD) -+libakode_polyp_sink_la_LDFLAGS = -module -avoid-version -no-undefined $(KDE_NO_UNDEFINED) $(PULSE_LDFLAGS) -+libakode_polyp_sink_la_LIBADD = ../../lib/libakode.la $(PULSE_LIBADD) - #>- all: all-am - #>+ 1 - all: docs-am all-am -diff -up akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp ---- akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp.pulseaudio 2005-10-20 16:54:12.000000000 -0400 -+++ akode-2.0.2/akode/plugins/polyp_sink/polyp_sink.cpp 2008-09-26 13:32:59.000000000 -0400 -@@ -25,7 +25,7 @@ - #elif defined(HAVE_INTTYPES_H) - #include - #endif --#include -+#include - - #include "audioframe.h" - #include "audiobuffer.h" -@@ -59,7 +59,7 @@ PolypSink::PolypSink() - - bool PolypSink::open() { - int error = 0; -- m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 255, &error ); -+ m_data->server = pa_simple_new(0, "akode-client", PA_STREAM_PLAYBACK, 0, "", &m_data->sample_spec, 0, 0, &error ); - if (!m_data->server || error != 0) { - m_data->error = true; - close(); -diff -up akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/src_resampler/Makefile.in ---- akode-2.0.2/akode/plugins/src_resampler/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/src_resampler/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -180,9 +180,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/sun_sink/Makefile.in ---- akode-2.0.2/akode/plugins/sun_sink/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/sun_sink/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -177,9 +177,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in ---- akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/akode/plugins/xiph_decoder/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -189,9 +189,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ -diff -up akode-2.0.2/config.h.in.pulseaudio akode-2.0.2/config.h.in ---- akode-2.0.2/config.h.in.pulseaudio 2007-04-06 09:23:23.000000000 -0400 -+++ akode-2.0.2/config.h.in 2008-09-26 13:32:59.000000000 -0400 -@@ -43,9 +43,9 @@ - /* Define if you have libOggFLAC (required for loading OggFLAC files) */ - #undef HAVE_LIBOGGFLAC - --/* Define if you have polyplib (required if you want Polypaudio server -+/* Define if you have libpulse (required if you want PulseAudio server - support) */ --#undef HAVE_LIBPOLYP -+#undef HAVE_LIBPULSE - - /* defined if you have libsamplerate library and header */ - #undef HAVE_LIBSAMPLERATE -diff -up akode-2.0.2/configure.in.pulseaudio akode-2.0.2/configure.in ---- akode-2.0.2/configure.in.pulseaudio 2007-04-06 09:23:11.000000000 -0400 -+++ akode-2.0.2/configure.in 2008-09-26 13:37:25.000000000 -0400 -@@ -375,24 +375,24 @@ AC_SUBST(JACK_LIBADD) - AC_SUBST(JACK_LDFLAGS) - fi - --AC_ARG_WITH(polypaudio,AC_HELP_STRING([--with-polypaudio],[Enable Polypaudio server support @<:@default=check@:>@]),[polypaudio_test="$withval"],[polypaudio_test="yes"]) -+AC_ARG_WITH(pulseaudio,AC_HELP_STRING([--with-pulseaudio],[Enable PulseAudio server support @<:@default=check@:>@]),[pulseaudio_test="$withval"],[pulseaudio_test="yes"]) - --if test "x$polypaudio_test" = "xyes" ; then --AC_MSG_CHECKING(for Polypaudio 0.7 or later) --if $PKG_CONFIG --atleast-version 0.7 polyplib-simple >/dev/null 2>&1 ; then -- POLYP_CFLAGS="`$PKG_CONFIG --cflags polyplib-simple`" -- POLYP_LIBADD="`$PKG_CONFIG --libs-only-l polyplib-simple`" -- POLYP_LDFLAGS="`$PKG_CONFIG --libs-only-L polyplib-simple`" -- have_polyp=yes -+if test "x$pulseaudio_test" = "xyes" ; then -+AC_MSG_CHECKING(for PulseAudio 0.9.2 or later) -+if $PKG_CONFIG --atleast-version 0.9.2 libpulse-simple >/dev/null 2>&1 ; then -+ PULSE_CFLAGS="`$PKG_CONFIG --cflags libpulse-simple`" -+ PULSE_LIBADD="`$PKG_CONFIG --libs-only-l libpulse-simple`" -+ PULSE_LDFLAGS="`$PKG_CONFIG --libs-only-L libpulse-simple`" -+ have_pulse=yes - AC_MSG_RESULT(yes) -- AC_DEFINE(HAVE_LIBPOLYP, 1, -- [Define if you have polyplib (required if you want Polypaudio server support)]) -+ AC_DEFINE(HAVE_LIBPULSE, 1, -+ [Define if you have libpulse (required if you want PulseAudio server support)]) - else - AC_MSG_RESULT(not installed) - fi --AC_SUBST(POLYP_CFLAGS) --AC_SUBST(POLYP_LIBADD) --AC_SUBST(POLYP_LDFLAGS) -+AC_SUBST(PULSE_CFLAGS) -+AC_SUBST(PULSE_LIBADD) -+AC_SUBST(PULSE_LDFLAGS) - fi - - AC_ARG_WITH(ffmpeg,AC_HELP_STRING([--with-ffmpeg],[Enable experimental FFMPEG decoder support @<:@default=check@:>@]),[ffmpeg_test="$withval"],[ffmpeg_test="yes"]) -@@ -587,7 +587,7 @@ AM_CONDITIONAL(include_alsa_sink, test x - AM_CONDITIONAL(include_oss_sink, test x$have_oss = xyes) - AM_CONDITIONAL(include_sun_sink, test x$have_sun = xyes) - AM_CONDITIONAL(include_jack_sink, test x$have_jack = xyes) --AM_CONDITIONAL(include_polyp_sink, test x$have_polyp = xyes) -+AM_CONDITIONAL(include_polyp_sink, test x$have_pulse = xyes) - AM_CONDITIONAL(include_ffmpeg_decoder, test x$have_ffmpeg = xyes) - - AC_MSG_CHECKING(for compilable aKode) -diff -up akode-2.0.2/Makefile.in.pulseaudio akode-2.0.2/Makefile.in ---- akode-2.0.2/Makefile.in.pulseaudio 2007-04-06 09:23:30.000000000 -0400 -+++ akode-2.0.2/Makefile.in 2008-09-26 13:32:59.000000000 -0400 -@@ -171,9 +171,9 @@ PACKAGE_TARNAME = @PACKAGE_TARNAME@ - PACKAGE_VERSION = @PACKAGE_VERSION@ - PATH_SEPARATOR = @PATH_SEPARATOR@ - PKG_CONFIG = @PKG_CONFIG@ --POLYP_CFLAGS = @POLYP_CFLAGS@ --POLYP_LDFLAGS = @POLYP_LDFLAGS@ --POLYP_LIBADD = @POLYP_LIBADD@ -+PULSE_CFLAGS = @PULSE_CFLAGS@ -+PULSE_LDFLAGS = @PULSE_LDFLAGS@ -+PULSE_LIBADD = @PULSE_LIBADD@ - RANLIB = @RANLIB@ - SET_MAKE = @SET_MAKE@ - SHELL = @SHELL@ diff --git a/akode.spec b/akode.spec deleted file mode 100644 index 41f3933..0000000 --- a/akode.spec +++ /dev/null @@ -1,235 +0,0 @@ - -Summary: Audio-decoding framework -Name: akode -Version: 2.0.2 -Release: 6%{?dist} - -License: LGPLv2+ -Group: System Environment/Libraries -#URL: http://carewolf.com/akode/ -URL: http://www.kde-apps.org/content/show.php?content=30375 -Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.tar.bz2 -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) - -Patch1: akode-pulseaudio.patch -Patch2: akode-2.0.2-multilib.patch -Patch3: akode-2.0.2-flac113-portable.patch -Patch4: akode-2.0.2-gcc43.patch - -%define _with_flac --with-flac -%if 0%{?fedora} > 4 -%define _with_jack --with-jack -%define _with_libsamplerate --with-libsamplerate -%define _with_pulseaudio --with-pulseaudio -%endif - -BuildRequires: automake libtool -BuildRequires: alsa-lib-devel -%{?_with_flac:BuildRequires: flac-devel} -%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} -%{?_with_libsamplerate:BuildRequires: libsamplerate-devel} -BuildRequires: libvorbis-devel -%{?_with_pulseaudio:BuildRequires: pulseaudio-lib-devel} -BuildRequires: speex-devel - -%description -aKode is a simple audio-decoding frame-work that provides a uniform -interface to decode the most common audio-formats. It also has a direct -playback option for a number of audio-outputs. - -aKode currently has the following decoder plugins: -* mpc: Decodes musepack aka mpc audio. -* xiph: Decodes FLAC, Ogg/FLAC, Speex and Ogg Vorbis audio. - -aKode also has the following audio outputs: -* alsa: Outputs to ALSA (dmix is recommended). - -%package devel -Summary: Headers for developing programs that will use %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -Requires: pkgconfig -%description devel -%{summary}. - -%package jack -Summary: Jack audio output backend for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -%description jack -%{summary}. - -%package pulseaudio -Summary: Pulseaudio output backend for %{name} -Group: Development/Libraries -Requires: %{name} = %{version}-%{release} -%description pulseaudio -%{summary}. -Recommended for network transparent audio. - -# Packaged separately to keep main/core %{akode} package LGPL-clean. -%package libsamplerate -Summary: Resampler based on libsamplerate for %{name} -Group: Development/Libraries -License: GPLv2+ -Requires: %{name} = %{version}-%{release} -%description libsamplerate -%{summary}. - - -%prep -%setup -q -n %{name}-%{version}%{?beta} - -%patch1 -p1 -b .pulseaudio -%patch2 -p1 -b .multilib -%patch3 -p4 -b .flac113_portable -%patch4 -p1 -b .gcc43 - -%build -#[ ! -f configure ] && \ -make -f Makefile.cvs - -%configure \ - --disable-static \ - --disable-debug --disable-warnings --disable-dependency-tracking \ - --without-libltdl \ - --with-alsa \ - --without-oss \ - %{?_with_flac} %{!?_with_flac:--without-flac} \ - %{?_with_jack} %{!?_with_jack:--without-jack} \ - %{?_with_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ - %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ - --with-speex \ - --with-vorbis \ - --without-ffmpeg \ - --without-libmad - -make %{?_smp_mflags} - - -%install -rm -rf %{buildroot} - -make install DESTDIR=%{buildroot} - -# unpackaged files -rm -f %{buildroot}%{_libdir}/lib*.la -#rm -f %{buildroot}%{_libdir}/libakode_oss_sink.so - -# rpmdocs -for file in AUTHORS COPYING NEWS README TODO ; do - test -s "$file" && install -p -m644 -D "$file" "rpmdocs/$file" -done - - -%clean -rm -rf %{buildroot} - - -%post -p /sbin/ldconfig - -%postun -p /sbin/ldconfig - - -%files -%defattr(-,root,root,-) -%doc rpmdocs/* -%{_bindir}/akodeplay -%{_libdir}/libakode.so.* -%{_libdir}/libakode_alsa_sink.so -%{_libdir}/libakode_mpc_decoder.so -%{_libdir}/libakode_xiph_decoder.so - -%files devel -%defattr(-,root,root,-) -%{_bindir}/akode-config -%{_includedir}/* -%{_libdir}/libakode.so -%{_libdir}/pkgconfig/*.pc - -%if "%{?_with_jack:1}" == "1" -%files jack -%defattr(-,root,root,-) -%{_libdir}/libakode_jack_sink.so -%endif - -# License: GPLv2+ -%if "%{?_with_libsamplerate:1}" == "1" -%files libsamplerate -%defattr(-,root,root,-) -%{_libdir}/libakode_src_resampler.so -%endif - -%if "%{?_with_pulseaudio:1}" == "1" -%files pulseaudio -%defattr(-,root,root,-) -%{_libdir}/libakode_polyp_sink.so -%endif - - -%changelog -* Fri Sep 26 2008 Tom "spot" Callaway 2.0.2-6 -- fix pulseaudio patch to apply without fuzz - -* Tue Feb 12 2008 Rex Dieter 2.0.2-5 -- gcc43 patch - -* Mon Jan 07 2008 Rex Dieter 2.0.2-4 -- -Requires: %%name-pulseaudio (can be added to kde-settings-pulseaudio) - -* Sun Dec 23 2007 Rex Dieter 2.0.2-3 -- fix flac113 support - -* Sun Dec 23 2007 Rex Dieter 2.0.2-2 -- fix multilib conflicts (#340591) - -* Sun Dec 23 2007 Rex Dieter 2.0.2-1 -- akode-2.0.2 - -* Wed Sep 26 2007 Rex Dieter 2.0.1-9 -- BR: pulseaudio-libs-devel - -* Mon Aug 20 2007 Rex Dieter 2.0.1-8 -- -libsamplerate: License: GPLv2+ -- omit oss_sink - -* Sat Aug 11 2007 Rex Dieter 2.0.1-7 -- Requires: %%{name}-pulseaudio (f8+) -- License: LGPLv2+ - -* Thu Feb 15 2007 Rex Dieter 2.0.1-6 -- respin (for flac, fc7+) - -* Mon Feb 12 2007 Rex Dieter 2.0.1-5 -- enable pulseaudio support -- Requires: akode-pulseaudio (f7+) - -* Thu Dec 14 2006 Rex Dieter 2.0.1-4 -- enable jack support (subpkg) -- package (GPL'd) libsamplerate-based resampler separately, - to keep main pkg LGPL-clean - -* Mon Aug 28 2006 Rex Dieter 2.0.1-2 -- fc6 respin - -* Mon Aug 07 2006 Rex Dieter 2.0.1-1 -- 2.0.1 - -* Fri Jul 21 2006 Rex Dieter -- fc6: gcc/glibc respin - -* Fri Feb 10 2006 Rex Dieter -- fc5: gcc/glibc respin - -* Mon Dec 19 2005 Rex Dieter 2.0-1 -- 2.0(final) - -* Wed Nov 23 2005 Rex Dieter 2.0-0.4.rc1 -- 2.0rc1 - -* Wed Nov 23 2005 Rex Dieter 2.0-0.1.b3 -- akode-2.0b3 - diff --git a/dead.package b/dead.package new file mode 100644 index 0000000..cf57267 --- /dev/null +++ b/dead.package @@ -0,0 +1 @@ +akode was primarily for kdemultimedia(3), now deprecated in the F9+ kde4 world diff --git a/sources b/sources deleted file mode 100644 index 1e620c4..0000000 --- a/sources +++ /dev/null @@ -1 +0,0 @@ -659ced0c9c735cb3e55b9138ff02342c 30375-akode-2.0.2.tar.bz2 From 154d3e0b6344af92eac5bea26a81b745f22abd3b Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Wed, 25 Nov 2009 22:38:54 +0000 Subject: [PATCH 14/15] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 8ef17d3..fb5821e 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,10 @@ # Makefile for source rpm: akode -# $Id$ +# $Id: Makefile,v 1.1 2006/01/06 14:49:25 rdieter Exp $ NAME := akode SPECFILE = $(firstword $(wildcard *.spec)) define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done +for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done endef MAKEFILE_COMMON := $(shell $(find-makefile-common)) From 48724ba81acb545cf7701684f6a0b1f43a20220d Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:39:48 +0000 Subject: [PATCH 15/15] dist-git conversion --- Makefile | 21 --------------------- 1 file changed, 21 deletions(-) delete mode 100644 Makefile diff --git a/Makefile b/Makefile deleted file mode 100644 index fb5821e..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: akode -# $Id: Makefile,v 1.1 2006/01/06 14:49:25 rdieter Exp $ -NAME := akode -SPECFILE = $(firstword $(wildcard *.spec)) - -define find-makefile-common -for d in common ../common ../../common ; do if [ -f $$d/Makefile.common ] ; then if [ -f $$d/CVS/Root -a -w $$d/Makefile.common ] ; then cd $$d ; cvs -Q update ; fi ; echo "$$d/Makefile.common" ; break ; fi ; done -endef - -MAKEFILE_COMMON := $(shell $(find-makefile-common)) - -ifeq ($(MAKEFILE_COMMON),) -# attept a checkout -define checkout-makefile-common -test -f CVS/Root && { cvs -Q -d $$(cat CVS/Root) checkout common && echo "common/Makefile.common" ; } || { echo "ERROR: I can't figure out how to checkout the 'common' module." ; exit -1 ; } >&2 -endef - -MAKEFILE_COMMON := $(shell $(checkout-makefile-common)) -endif - -include $(MAKEFILE_COMMON)