From 3ef25d468a61ba6ee531421e6581e8e095dc735e Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 24 2007 04:28:02 +0000 Subject: - fix flac113 support --- 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)