Author: jwrdegoede Update of /cvs/free/rpms/audacious-plugins-freeworld/F-15 In directory se02.es.rpmfusion.net:/tmp/cvs-serv10092 Modified Files: .cvsignore audacious-plugins-2.4-sys-mpg123.patch audacious-plugins-freeworld.spec sources Added Files: audacious-plugins-2.5.2-aac-m4a.patch Removed Files: audacious-plugins-2.4-ffaudio-metadata.patch audacious-plugins-2.4-no-avcore.patch Log Message: * Wed Jun 22 2011 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; 2.5.2-1 - Update to 2.5.2 - Drop Provides + Obsoletes for upgrade path from livna / freshrpms audacious-plugins-2.5.2-aac-m4a.patch: libmp4.c | 12 ------------ 1 file changed, 12 deletions(-) --- NEW FILE audacious-plugins-2.5.2-aac-m4a.patch --- aac plugin: Starting with a m4a header is not enough to identify an aac file mp4_is_our_fd gives back false positives due to the m4a header check which succeeds for m4a files containing for example alac audio, but the aac plugin cannot handle these files, so this is a false postive. diff -up audacious-plugins-2.5.2/src/aac/libmp4.c~ audacious-plugins-2.5.2/src/aac/libmp4.c --- audacious-plugins-2.5.2/src/aac/libmp4.c~ 2011-06-20 03:14:25.000000000 +0200 +++ audacious-plugins-2.5.2/src/aac/libmp4.c 2011-06-22 17:32:17.024868976 +0200 @@ -24,9 +24,6 @@ */ #define BUFFER_SIZE (FAAD_MIN_STREAMSIZE * 16) -static const guchar M4A_MAGIC[11] = {0x00, 0x00, 0x00, 0x20, 0x66, 0x74, 0x79, - 0x70, 0x4D, 0x34, 0x41}; - static void mp4_about (void); static void mp4_cleanup (void); static gint mp4_is_our_fd (const char *, VFSFile *); @@ -241,15 +238,6 @@ static gboolean is_mp4_aac_file (VFSFile static gboolean mp4_is_our_fd (const gchar * filename, VFSFile * file) { - gchar magic[sizeof M4A_MAGIC]; - - if (vfs_fread (magic, 1, sizeof magic, file) != sizeof magic) - return FALSE; - if (! memcmp (magic, M4A_MAGIC, sizeof magic)) - return TRUE; - - if (vfs_fseek (file, 0, SEEK_SET)) - return FALSE; if (parse_aac_stream (file)) return TRUE; Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-15/.cvsignore,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- .cvsignore 29 Apr 2011 11:33:20 -0000 1.10 +++ .cvsignore 23 Jun 2011 18:28:02 -0000 1.11 @@ -1 +1 @@ -audacious-plugins-2.4.5.tgz +audacious-plugins-2.5.2.tar.gz audacious-plugins-2.4-sys-mpg123.patch: Makefile | 24 ++---------------------- mpg123.c | 2 +- 2 files changed, 3 insertions(+), 23 deletions(-) Index: audacious-plugins-2.4-sys-mpg123.patch =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-15/audacious-plugins-2.4-sys-mpg123.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- audacious-plugins-2.4-sys-mpg123.patch 24 Aug 2010 20:00:48 -0000 1.1 +++ audacious-plugins-2.4-sys-mpg123.patch 23 Jun 2011 18:28:02 -0000 1.2 @@ -40,9 +40,9 @@ --- audacious-plugins-2.4-rc2/src/mpg123/mpg123.c~ 2010-08-13 23:01:12.000000000 +0200 +++ audacious-plugins-2.4-rc2/src/mpg123/mpg123.c 2010-08-24 12:00:25.904713006 +0200 @@ -33,7 +33,7 @@ - #include <audacious/plugin.h> #include <audacious/audtag.h> + #include "config.h" -#include "libmpg123/mpg123.h" +#include <mpg123.h> Index: audacious-plugins-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-15/audacious-plugins-freeworld.spec,v retrieving revision 1.17 retrieving revision 1.18 diff -u -r1.17 -r1.18 --- audacious-plugins-freeworld.spec 29 Apr 2011 11:33:20 -0000 1.17 +++ audacious-plugins-freeworld.spec 23 Jun 2011 18:28:02 -0000 1.18 @@ -3,26 +3,27 @@ # - add BR sidplay2-devel and find a way to make the built sid.so # plugin an alternative to Fedora's sidplay1 based sid.so -%global aud_plugin_api %(grep '[ ]*#define[ ]*__AUDACIOUS_PLUGIN_API__' %{_includedir}/audacious/plugin.h | sed 's!.*__AUDACIOUS_PLUGIN_API__[ ]*\\([0-9]\\+\\).*!\\1!') +%global aud_plugin_api %(grep '[ ]*#define[ ]*_AUD_PLUGIN_VERSION[ ]\\+' %{_includedir}/audacious/plugin.h 2>/dev/null | sed 's!.*_AUD_PLUGIN_VERSION[ ]*\\([0-9]\\+\\).*!\\1!') +%if 0%{aud_plugin_api} > 0 +%global aud_plugin_dep Requires: audacious(plugin-api) = %{aud_plugin_api} +%endif Name: audacious-plugins-freeworld -Version: 2.4.5 +Version: 2.5.2 Release: 1%{?dist} Summary: Additional plugins for the Audacious media player Group: Applications/Multimedia License: GPLv3 URL: http://audacious-media-player.org/ -Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz +Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tar.gz Source1: audacious-mp3.desktop Source2: audacious-aac.desktop Source3: audacious-ffaudio.desktop Patch0: audacious-plugins-2.4-sys-mpg123.patch -Patch1: audacious-plugins-2.4-ffaudio-metadata.patch -Patch2: audacious-plugins-2.4-no-avcore.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) +Patch1: audacious-plugins-2.5.2-aac-m4a.patch -BuildRequires: audacious-devel >= %{version} +BuildRequires: audacious-devel >= 2.5 BuildRequires: zlib-devel, libxml2-devel, desktop-file-utils >= 0.9 BuildRequires: taglib-devel >= 1.4 BuildRequires: libmms-devel, libmpg123-devel @@ -37,10 +38,6 @@ Requires: %{name}-mms = %{version}-%{release} Requires: %{name}-ffaudio = %{version}-%{release} -# obsolete old freshrpms package -Provides: audacious-plugins-extras = %{version}-%{release} -Obsoletes: audacious-plugins-extras < %{version}-%{release} - %description Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") @@ -52,17 +49,11 @@ %package mp3 Summary: MP3 playback plugin for Audacious Group: Applications/Multimedia -%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0) -Requires: audacious(plugin-api) = %{aud_plugin_api} -%endif +%{?aud_plugin_dep} Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 -# obsolete old livna package -Provides: audacious-plugins-nonfree-mp3 = %{version}-%{release} -Obsoletes: audacious-plugins-nonfree-mp3 < %{version}-%{release} - %description mp3 Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") @@ -74,17 +65,11 @@ %package aac Summary: AAC playback plugin for Audacious Group: Applications/Multimedia -%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0) -Requires: audacious(plugin-api) = %{aud_plugin_api} -%endif +%{?aud_plugin_dep} Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 -# obsolete old livna package -Provides: audacious-plugins-nonfree-aac = %{version}-%{release} -Obsoletes: audacious-plugins-nonfree-aac < %{version}-%{release} - %description aac Audacious is a media player that currently uses a skinned user interface based on Winamp 2.x skins. It is based on ("forked off") @@ -96,9 +81,7 @@ %package ffaudio Summary: FFMpeg/FAAD2 based input plugin for Audacious Group: Applications/Multimedia -%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0) -Requires: audacious(plugin-api) = %{aud_plugin_api} -%endif +%{?aud_plugin_dep} Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 @@ -108,11 +91,6 @@ Obsoletes: audacious-plugins-freeworld-tta <= 2.1 Obsoletes: audacious-plugins-freeworld-wma <= 2.1 -# obsolete old livna packages -Obsoletes: audacious-plugins-nonfree-alac < %{version}-%{release} -Obsoletes: audacious-plugins-nonfree-tta < %{version}-%{release} -Obsoletes: audacious-plugins-nonfree-wma < %{version}-%{release} - %description ffaudio FFMpeg/FAAD2 based input plugin for Audacious. @@ -120,13 +98,7 @@ %package mms Summary: MMS stream plugin for Audacious Group: Applications/Multimedia -%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0) -Requires: audacious(plugin-api) = %{aud_plugin_api} -%endif - -# obsolete old livna package -Provides: audacious-plugins-nonfree-mms = %{version}-%{release} -Obsoletes: audacious-plugins-nonfree-mms < %{version}-%{release} +%{?aud_plugin_dep} %description mms Audacious is a media player that currently uses a skinned @@ -142,7 +114,6 @@ rm -r src/mpg123/libmpg123 %patch0 -p1 %patch1 -p1 -%patch2 -p1 sed -i '\,^.SILENT:,d' buildsys.mk.in @@ -160,7 +131,6 @@ %install -rm -rf $RPM_BUILD_ROOT make -C src/mpg123 install DESTDIR=$RPM_BUILD_ROOT make -C src/aac install DESTDIR=$RPM_BUILD_ROOT make -C src/ffaudio install DESTDIR=$RPM_BUILD_ROOT @@ -181,10 +151,6 @@ find $RPM_BUILD_ROOT -type f -name "*.la" -exec rm -f {} ';' -%clean -rm -rf $RPM_BUILD_ROOT - - %post mp3 update-desktop-database %{_datadir}/applications @@ -206,29 +172,36 @@ %files %defattr(-,root,root,-) -%doc COPYING %files mp3 %defattr(-,root,root,-) +%doc COPYING %{_libdir}/audacious/Input/madplug.so %{_datadir}/applications/livna-audacious-mp3.desktop %files aac %defattr(-,root,root,-) +%doc COPYING %{_libdir}/audacious/Input/aac.so %{_datadir}/applications/livna-audacious-aac.desktop %files ffaudio %defattr(-,root,root,-) +%doc COPYING %{_libdir}/audacious/Input/ffaudio.so %{_datadir}/applications/audacious-ffaudio.desktop %files mms +%doc COPYING %defattr(-,root,root,-) %{_libdir}/audacious/Transport/mms.so %changelog +* Wed Jun 22 2011 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; 2.5.2-1 +- Update to 2.5.2 +- Drop Provides + Obsoletes for upgrade path from livna / freshrpms + * Fri Apr 29 2011 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; 2.4.5-1 - Update to 2.4.5 Index: sources =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-15/sources,v retrieving revision 1.10 retrieving revision 1.11 diff -u -r1.10 -r1.11 --- sources 29 Apr 2011 11:33:21 -0000 1.10 +++ sources 23 Jun 2011 18:28:02 -0000 1.11 @@ -1 +1 @@ -83eff47ca063d9955a77039c1e1c18a3 audacious-plugins-2.4.5.tgz +d5f109995e4aa3a8b51297c67df6e758 audacious-plugins-2.5.2.tar.gz --- audacious-plugins-2.4-ffaudio-metadata.patch DELETED --- --- audacious-plugins-2.4-no-avcore.patch DELETED ---