4:45 p.m.
Author: rdieter
Update of /cvs/free/rpms/akode-extras/F-8
In directory se02.es.rpmfusion.net:/tmp/cvs-serv8419
Modified Files:
akode-extras.spec
Added Files:
akode-2.0.2-ffmpeg.patch akode-2.0.2-gcc43.patch
Log Message:
* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-3
- fix build
- spec cosmetics
akode-2.0.2-ffmpeg.patch:
--- NEW FILE akode-2.0.2-ffmpeg.patch ---
diff -up akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ffmpeg
akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp
--- akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp.ffmpeg 2008-09-04
11:20:15.000000000 -0500
+++ akode-2.0.2/akode/plugins/ffmpeg_decoder/ffmpeg_decoder.cpp 2008-09-04
11:40:31.000000000 -0500
@@ -29,9 +29,9 @@
#include "decoder.h"
#include <assert.h>
-#include <ffmpeg/avcodec.h>
-#include <ffmpeg/avformat.h>
-#include <ffmpeg/avio.h>
+#include <ffmpeg/libavcodec/avcodec.h>
+#include <ffmpeg/libavformat/avformat.h>
+#include <ffmpeg/libavformat/avio.h>
#include "ffmpeg_decoder.h"
#include <iostream>
akode-2.0.2-gcc43.patch:
--- NEW FILE akode-2.0.2-gcc43.patch ---
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 <stdlib.h>
#ifdef HAVE_GNU_GETOPT
#include <getopt.h>
#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 <pthread.h>
#include <semaphore.h>
#include <assert.h>
+#include <string.h>
#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 <stdlib.h>
+#include <string.h>
#include <iostream>
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 <stdlib.h>
#include <iostream>
namespace aKode {
Index: akode-extras.spec
===================================================================
RCS file: /cvs/free/rpms/akode-extras/F-8/akode-extras.spec,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- akode-extras.spec 10 Aug 2008 13:08:43 -0000 1.1
+++ akode-extras.spec 4 Sep 2008 16:45:08 -0000 1.2
@@ -1,12 +1,13 @@
%if 0%{?fedora} > 2
%define _with_ffmpeg --with-ffmpeg
+%define ffmpeg ffmpeg
%endif
Summary: Extra decoder plugins for akode
Name: akode-extras
Version: 2.0.2
-Release: 2%{?dist}.1
+Release: 3%{?dist}
License: GPLv2+%{?_with_ffmpeg:/LGPLv2+ (see description)}
Group: System Environment/Libraries
@@ -15,11 +16,14 @@
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-2.0.2-ffmpeg-int64_c.patch
+Patch4: akode-2.0.2-gcc43.patch
+Patch10: akode-2.0.2-ffmpeg-int64_c.patch
+# for newer ffmpeg's that move headers around
+Patch11: akode-2.0.2-ffmpeg.patch
BuildRequires: automake
BuildRequires: libmad-devel
-%{?_with_ffmpeg:BuildRequires: ffmpeg-devel >= 0.4.9 }
+%{?_with_ffmpeg:BuildRequires: %{ffmpeg}-devel >= 0.4.9 }
# Be mindful of these, since kdemultimedia-extras-nonfree needs to be rebuilt when/if
anything
# is added/removed -- Rex
Provides: %{name}-mpeg_decoder = %{version}-%{release}
@@ -37,7 +41,10 @@
%prep
%setup -q -n akode-%{version}%{?beta}
-%patch1 -p1 -b .ffmpeg-int64_c
+%patch4 -p1 -b .gcc43
+
+%patch10 -p1 -b .ffmpeg-int64_c
+%patch11 -p1 -b .ffmpeg
#[ ! -f configure ] && \
make -f Makefile.cvs
@@ -48,6 +55,13 @@
--disable-static \
--disable-debug --disable-warnings --disable-dependency-tracking \
--without-libltdl \
+ --without-flac \
+ --without-oss \
+ --without-jack \
+ --without-libsamplerate \
+ --without-pulseaudio \
+ --without-speex \
+ --without-vorbis \
--with-libmad \
%{?_with_ffmpeg} %{!?_with_ffmpeg:--without-ffmpeg} \
@@ -61,17 +75,17 @@
%install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
-make -C akode/plugins/mpeg_decoder install DESTDIR=$RPM_BUILD_ROOT
-%{?_with_ffmpeg:make -C akode/plugins/ffmpeg_decoder install DESTDIR=$RPM_BUILD_ROOT}
+make -C akode/plugins/mpeg_decoder install DESTDIR=%{buildroot}
+%{?_with_ffmpeg:make -C akode/plugins/ffmpeg_decoder install DESTDIR=%{buildroot}}
# unpackaged files
-rm -f $RPM_BUILD_ROOT%{_libdir}/lib*.la
+rm -f %{buildroot}%{_libdir}/lib*.la
%clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
%files
@@ -81,7 +95,11 @@
%changelog
-* Sun Aug 10 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.0.2-2.1
+* Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org> 2.0.2-3
+- fix build
+- spec cosmetics
+
+* Sun Aug 10 2008 Thorsten Leemhuis <fedora [AT] leemhuis [DOT] info - 2.0.2-2
- rebuild for RPM Fusion
* Sun Dec 23 2007 Rex Dieter <rdieter[AT]fedoraproject.org> 2.0.2-1