From e2c7939c4fbbefb2a5a05e9d969437a66657c133 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Fri, 18 May 2007 02:45:26 +0000 Subject: [PATCH 1/6] Initialize branch F-7 for akode --- branch | 1 + 1 file changed, 1 insertion(+) create mode 100644 branch diff --git a/branch b/branch new file mode 100644 index 0000000..c48525c --- /dev/null +++ b/branch @@ -0,0 +1 @@ +F-7 From aefa52059af0faf555e34d93e25220b6cde5ea34 Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Thu, 30 Aug 2007 03:03:38 +0000 Subject: [PATCH 2/6] - -libsamplerate: License: GPLv2+ - omit oss_sink Sat Aug 11 2007 Rex Dieter 2.0.1-7 - Requires: %%{name}-pulseaudio (f8+) - License: LGPLv2+ --- akode.spec | 62 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 35 insertions(+), 27 deletions(-) diff --git a/akode.spec b/akode.spec index df54e19..3e9cc66 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: 8%{?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,11 @@ Patch1: akode-pulseaudio.patch %define _with_pulseaudio --with-pulseaudio %endif -%if 0%{?fedora} > 6 -%define _with_pulseaudio --with-pulseaudio -# pulseaudio is/will-be the F7 default, +%if 0%{?fedora} > 7 +# pulseaudio is/will-be the F8 default Requires: %{name}-pulseaudio %endif - BuildRequires: automake BuildRequires: alsa-lib-devel BuildRequires: flac-devel @@ -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,25 +151,34 @@ 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+ + * 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 809cc92e9a2a4d310467519aeefbad5baef0641b Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Mon, 24 Dec 2007 04:57:07 +0000 Subject: [PATCH 3/6] sync w/rawhide (akode-2.0.2) --- .cvsignore | 2 +- akode-2.0.2-flac113-portable.patch | 11 +++++ akode-2.0.2-multilib.patch | 65 ++++++++++++++++++++++++++++++ akode.spec | 61 ++++++++++++++++++---------- sources | 2 +- 5 files changed, 118 insertions(+), 23 deletions(-) create mode 100644 akode-2.0.2-flac113-portable.patch create mode 100644 akode-2.0.2-multilib.patch 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 3e9cc66..32cafba 100644 --- a/akode.spec +++ b/akode.spec @@ -1,22 +1,24 @@ Summary: Audio-decoding framework Name: akode -Version: 2.0.1 -Release: 8%{?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_libsamplerate --with-libsamplerate %define _with_pulseaudio --with-pulseaudio %endif @@ -25,15 +27,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_flac:BuildRequires: flac-devel} %{?_with_jack:BuildRequires: jack-audio-connection-kit-devel} -%{?_with_pulseaudio:BuildRequires: pulseaudio-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 @@ -51,6 +52,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 +85,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,9 +99,9 @@ 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_libsamplerate} %{!?_with_libsamplerate:--without-libsamplerate} \ %{?_with_pulseaudio} %{!?_with_pulseaudio:--without-pulseaudio} \ --with-speex \ --with-vorbis \ @@ -144,6 +149,7 @@ rm -rf %{buildroot} %{_bindir}/akode-config %{_includedir}/* %{_libdir}/libakode.so +%{_libdir}/pkgconfig/*.pc %if "%{?_with_jack:1}" == "1" %files jack @@ -151,20 +157,33 @@ 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 +- 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 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 635831e16eaa19deaee62d5e878238869b786bfc Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Wed, 9 Jan 2008 04:49:58 +0000 Subject: [PATCH 4/6] - -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 0380d202efe95eaa06ebb3a17955034bbaec0053 Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Thu, 26 Nov 2009 01:25:50 +0000 Subject: [PATCH 5/6] Fix typo that causes a failure to update the common directory. (releng #2781) --- Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 8ef17d3..ea97209 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ 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 7b12fa59d455bfdbe8cb0f80f9d19953205a7258 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 28 Jul 2010 09:39:46 +0000 Subject: [PATCH 6/6] dist-git conversion --- .cvsignore => .gitignore | 0 Makefile | 21 --------------------- branch | 1 - 3 files changed, 22 deletions(-) rename .cvsignore => .gitignore (100%) delete mode 100644 Makefile delete mode 100644 branch diff --git a/.cvsignore b/.gitignore similarity index 100% rename from .cvsignore rename to .gitignore diff --git a/Makefile b/Makefile deleted file mode 100644 index ea97209..0000000 --- a/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile for source rpm: akode -# $Id$ -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) diff --git a/branch b/branch deleted file mode 100644 index c48525c..0000000 --- a/branch +++ /dev/null @@ -1 +0,0 @@ -F-7