Author: jwrdegoede Update of /cvs/free/rpms/audacious-plugins-freeworld/F-14 In directory se02.es.rpmfusion.net:/tmp/cvs-serv19175 Modified Files: .cvsignore audacious-plugins-2.4-ffaudio-metadata.patch audacious-plugins-freeworld.spec sources Log Message: * Mon Apr 11 2011 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; 2.4.4-1 - Update to 2.4.4 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-14/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 28 Jan 2011 09:25:42 -0000 1.8 +++ .cvsignore 11 Apr 2011 12:18:38 -0000 1.9 @@ -1 +1 @@ -audacious-plugins-2.4.3.tgz +audacious-plugins-2.4.4.tgz audacious-plugins-2.4-ffaudio-metadata.patch: ffaudio-core.c | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) Index: audacious-plugins-2.4-ffaudio-metadata.patch =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-14/audacious-plugins-2.4-ffaudio-metadata.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- audacious-plugins-2.4-ffaudio-metadata.patch 24 Aug 2010 20:00:48 -0000 1.1 +++ audacious-plugins-2.4-ffaudio-metadata.patch 11 Apr 2011 12:18:38 -0000 1.2 @@ -1,5 +1,6 @@ ---- audacious-plugins-2.4-rc2/src/ffaudio/ffaudio-core.c 2010-08-13 23:01:12.000000000 +0200 -+++ audacious-plugins-2.4-rc2.new/src/ffaudio/ffaudio-core.c 2010-08-24 20:43:12.963479070 +0200 +diff -up audacious-plugins-2.4.4/src/ffaudio/ffaudio-core.c.orig audacious-plugins-2.4.4/src/ffaudio/ffaudio-core.c +--- audacious-plugins-2.4.4/src/ffaudio/ffaudio-core.c.orig 2011-02-22 18:29:46.000000000 +0100 ++++ audacious-plugins-2.4.4/src/ffaudio/ffaudio-core.c 2011-04-11 13:31:39.014243940 +0200 @@ -31,6 +31,7 @@ #ifdef FFAUDIO_USE_AUDTAG #include <audacious/audtag.h> @@ -8,7 +9,7 @@ /*********************************************************************************** * Plugin glue. * -@@ -151,21 +152,21 @@ +@@ -155,21 +156,21 @@ typedef struct { } ffaudio_meta_t; static const ffaudio_meta_t metaentries[] = { @@ -33,7 +34,7 @@ static void ffaudio_get_meta(Tuple *tuple, AVFormatContext *ic, const ffaudio_meta_t *m) { -@@ -202,18 +204,15 @@ +@@ -206,18 +207,15 @@ ffaudio_get_meta(Tuple *tuple, AVFormatC } } } @@ -52,7 +53,7 @@ tuple_associate_int(tuple, FIELD_LENGTH, NULL, ic->duration / 1000); tuple_associate_int(tuple, FIELD_BITRATE, NULL, ic->bit_rate / 1000); -@@ -259,7 +258,6 @@ +@@ -263,7 +261,6 @@ static Tuple * read_tuple (const gchar * return tuple; } @@ -60,13 +61,13 @@ static Tuple * ffaudio_probe_for_tuple(const gchar *filename, VFSFile *fd) { -@@ -267,12 +265,15 @@ +@@ -271,12 +268,15 @@ ffaudio_probe_for_tuple(const gchar *fil if (t == NULL) return NULL; +#ifdef FFAUDIO_USE_AUDTAG - vfs_fseek(fd, 0, SEEK_SET); - tag_tuple_read(t, fd); + if (! vfs_fseek (fd, 0, SEEK_SET)) + tag_tuple_read (t, fd); +#endif return t; @@ -76,7 +77,7 @@ static gboolean ffaudio_write_tag (const Tuple * tuple, VFSFile * file) { gchar *file_uri = g_ascii_strdown(file->uri, -4); -@@ -305,9 +306,6 @@ +@@ -309,9 +309,6 @@ static gboolean ffaudio_play (InputPlayb ReSampleContext *resctx = NULL; gboolean codec_opened = FALSE, do_resampling = FALSE; gint out_fmt; @@ -86,7 +87,7 @@ gboolean seekable; gchar uribuf[64]; -@@ -387,11 +385,6 @@ +@@ -397,11 +394,6 @@ static gboolean ffaudio_play (InputPlayb resbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE); AUDDBG("setting parameters\n"); @@ -98,7 +99,7 @@ if (pause) playback->output->pause(TRUE); -@@ -682,9 +675,7 @@ +@@ -692,9 +684,7 @@ InputPlugin ffaudio_ip = { .init = ffaudio_init, .cleanup = ffaudio_cleanup, .is_our_file_from_vfs = ffaudio_probe, Index: audacious-plugins-freeworld.spec =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-14/audacious-plugins-freeworld.spec,v retrieving revision 1.13 retrieving revision 1.14 diff -u -r1.13 -r1.14 --- audacious-plugins-freeworld.spec 28 Jan 2011 09:33:00 -0000 1.13 +++ audacious-plugins-freeworld.spec 11 Apr 2011 12:18:38 -0000 1.14 @@ -3,11 +3,11 @@ # - 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_ver 2.4.3 +%global aud_plugin_api %(grep '[ ]*#define[ ]*__AUDACIOUS_PLUGIN_API__' %{_includedir}/audacious/plugin.h | sed 's!.*__AUDACIOUS_PLUGIN_API__[ ]*\\([0-9]\\+\\).*!\\1!') Name: audacious-plugins-freeworld -Version: 2.4.3 -Release: 1%{?dist}.1 +Version: 2.4.4 +Release: 1%{?dist} Summary: Additional plugins for the Audacious media player Group: Applications/Multimedia @@ -19,9 +19,10 @@ 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) -BuildRequires: audacious-devel >= %{aud_ver} +BuildRequires: audacious-devel >= %{version} BuildRequires: zlib-devel, libxml2-devel, desktop-file-utils >= 0.9 BuildRequires: taglib-devel >= 1.4 BuildRequires: libmms-devel, libmpg123-devel @@ -51,7 +52,9 @@ %package mp3 Summary: MP3 playback plugin for Audacious Group: Applications/Multimedia -Requires: audacious-plugins >= %{aud_ver} +%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0) +Requires: audacious(plugin-api) = %{aud_plugin_api} +%endif Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 @@ -71,7 +74,9 @@ %package aac Summary: AAC playback plugin for Audacious Group: Applications/Multimedia -Requires: audacious-plugins >= %{aud_ver} +%if %(test -f %{_includedir}/audacious/plugin.h && echo 1 || echo 0) +Requires: audacious(plugin-api) = %{aud_plugin_api} +%endif Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 @@ -88,23 +93,25 @@ This is the plugin needed to play AAC audio files. -%package ffaudio -Summary: FFMpeg/FAAD2 based input plugin for Audacious -Group: Applications/Multimedia -Requires: audacious-plugins >= %{aud_ver} +%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 Requires(post): desktop-file-utils >= 0.9 Requires(postun): desktop-file-utils >= 0.9 # obsolete discontinued plugins -Obsoletes: audacious-plugins-freeworld-alac <= 2.1 -Obsoletes: audacious-plugins-freeworld-tta <= 2.1 -Obsoletes: audacious-plugins-freeworld-wma <= 2.1 +Obsoletes: audacious-plugins-freeworld-alac <= 2.1 +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} +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. @@ -113,7 +120,9 @@ %package mms Summary: MMS stream plugin for Audacious Group: Applications/Multimedia -Requires: audacious-plugins >= %{aud_ver} +%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} @@ -133,6 +142,7 @@ rm -r src/mpg123/libmpg123 %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i '\,^.SILENT:,d' buildsys.mk.in @@ -219,7 +229,14 @@ %changelog -* Fri Jan 28 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.4.3-1.fc14.1 +* Mon Apr 11 2011 Hans de Goede <j.w.r.degoede(a)gmail.com&gt; 2.4.4-1 +- Update to 2.4.4 + +* Fri Jan 28 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.4.3-2 +- Change audacious version require to use the new Fedora packages + audacious(plugin-api) provides, for proper detection of plugin ABI changes + +* Thu Jan 20 2011 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.4.3-1 - Update to 2.4.3 * Sun Aug 29 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl&gt; 2.4.0-1 Index: sources =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/F-14/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 28 Jan 2011 09:25:42 -0000 1.8 +++ sources 11 Apr 2011 12:18:38 -0000 1.9 @@ -1 +1 @@ -d2c76253e7a5d83dbd87319790f3c7a5 audacious-plugins-2.4.3.tgz +e0b097beeba9da70896d1e36888996c8 audacious-plugins-2.4.4.tgz