From 2aabc125a0e282105257e21ded35501f3d429591 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Dec 24 2007 04:40:15 +0000 Subject: sync w/rawhide (akode-2.0.2) --- 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-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-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 c97058c..69bbfb6 100644 --- a/akode.spec +++ b/akode.spec @@ -1,20 +1,21 @@ Summary: Audio-decoding framework Name: akode -Version: 2.0.1 -Release: 9%{?dist} +Version: 2.0.2 +Release: 3%{?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 +Patch2: akode-2.0.2-multilib.patch +Patch3: akode-2.0.2-flac113-portable.patch -#Conflicts: kdemultimedia < 6:3.5 - +%define _with_flac --with-flac %if 0%{?fedora} > 4 %define _with_jack --with-jack %define _with_pulseaudio --with-pulseaudio @@ -25,15 +26,14 @@ Patch1: akode-pulseaudio.patch Requires: %{name}-pulseaudio %endif -BuildRequires: automake +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: speex-devel BuildRequires: libvorbis-devel -BuildRequires: libtool -%{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} -%{?_with_pulseaudio:BuildRequires: pulseaudio-libs-devel} +%{?_with_pulseaudio:BuildRequires: pulseaudio-lib-devel} +BuildRequires: speex-devel %description aKode is a simple audio-decoding frame-work that provides a uniform @@ -51,6 +51,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}. @@ -83,8 +84,11 @@ Requires: %{name} = %{version}-%{release} %setup -q -n %{name}-%{version}%{?beta} %patch1 -p1 -b .pulseaudio +%patch2 -p1 -b .multilib +%patch3 -p4 -b .flac113_portable -[ ! -f configure ] && make -f Makefile.cvs +#[ ! -f configure ] && \ +make -f Makefile.cvs %build @@ -94,7 +98,7 @@ Requires: %{name} = %{version}-%{release} --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} \ @@ -144,6 +148,7 @@ rm -rf %{buildroot} %{_bindir}/akode-config %{_includedir}/* %{_libdir}/libakode.so +%{_libdir}/pkgconfig/*.pc %if "%{?_with_jack:1}" == "1" %files jack @@ -163,8 +168,16 @@ rm -rf %{buildroot} %{_libdir}/libakode_src_resampler.so - %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) + +* 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