Author: rdieter Update of /cvs/free/rpms/akode-extras/F-8 In directory se02.es.rpmfusion.net:/tmp/cvs-serv5812 Modified Files: akode-extras.spec Added Files: akode-2.0.2-no_undefined.patch Log Message: * Fri Oct 03 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.0.2-4 - no_undefined patch - omit ffmpeg_decoder (for now, until undefined symbols are fixed) akode-2.0.2-no_undefined.patch: --- NEW FILE akode-2.0.2-no_undefined.patch --- diff -up akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.am.undefined akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.am --- akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.am.undefined 2005-11-19 06:02:20.000000000 -0600 +++ akode-2.0.2/akode/plugins/ffmpeg_decoder/Makefile.am 2008-10-03 09:52:33.000000000 -0500 @@ -4,5 +4,5 @@ lib_LTLIBRARIES = libakode_ffmpeg_decode libakode_ffmpeg_decoder_la_SOURCES = ffmpeg_decoder.cpp -libakode_ffmpeg_decoder_la_LDFLAGS = -avoid-version -no-undefined $(AVCODEC_LDFLAGS) $(AVFORMAT_LDFLAGS) +libakode_ffmpeg_decoder_la_LDFLAGS = -avoid-version $(KDE_NO_UNDEFINED) $(AVCODEC_LDFLAGS) $(AVFORMAT_LDFLAGS) libakode_ffmpeg_decoder_la_LIBADD = ../../lib/libakode.la $(AVCODEC_LIBADD) $(AVFORMAT_LIBADD) Index: akode-extras.spec =================================================================== RCS file: /cvs/free/rpms/akode-extras/F-8/akode-extras.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- akode-extras.spec 4 Sep 2008 16:45:08 -0000 1.2 +++ akode-extras.spec 3 Oct 2008 14:55:33 -0000 1.3 @@ -1,5 +1,6 @@ -%if 0%{?fedora} > 2 +#if 0%{?fedora} > 2 +%if 0 %define _with_ffmpeg --with-ffmpeg %define ffmpeg ffmpeg %endif @@ -7,7 +8,7 @@ Summary: Extra decoder plugins for akode Name: akode-extras Version: 2.0.2 -Release: 3%{?dist} +Release: 4%{?dist} License: GPLv2+%{?_with_ffmpeg:/LGPLv2+ (see description)} Group: System Environment/Libraries @@ -16,11 +17,14 @@ Source0: http://www.kde-apps.org/CONTENT/content-files/30375-akode-%{version}.tar.bz2 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +# just s start, ffmpeg plugin only atm -- Rex +Patch1: akode-2.0.2-no_undefined.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 } @@ -41,6 +45,8 @@ %prep %setup -q -n akode-%{version}%{?beta} +%patch1 -p1 -b .no_undefined + %patch4 -p1 -b .gcc43 %patch10 -p1 -b .ffmpeg-int64_c @@ -95,6 +101,10 @@ %changelog +* Fri Oct 03 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.0.2-4 +- no_undefined patch +- omit ffmpeg_decoder (for now, until undefined symbols are fixed) + * Thu Sep 04 2008 Rex Dieter <rdieter(a)fedoraproject.org&gt; 2.0.2-3 - fix build - spec cosmetics