Author: jwrdegoede Update of /cvs/free/rpms/audacious-plugins-freeworld/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv15000 Modified Files: .cvsignore audacious-plugins-2.4-ffaudio-metadata.patch audacious-plugins-freeworld.spec sources Added Files: audacious-plugins-2.4-no-avcore.patch 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 audacious-plugins-2.4-no-avcore.patch: configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) --- NEW FILE audacious-plugins-2.4-no-avcore.patch --- diff -up audacious-plugins-2.4.4/configure~ audacious-plugins-2.4.4/configure --- audacious-plugins-2.4.4/configure~ 2011-02-22 18:29:49.000000000 +0100 +++ audacious-plugins-2.4.4/configure 2011-04-11 13:40:25.962244060 +0200 @@ -9468,20 +9468,20 @@ fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FFMPEG" >&5 $as_echo_n "checking for FFMPEG... " >&6; } if test "x$PKG_CONFIG" != "x"; then - if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0") 2>&5 + if { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then if test "x${FFMPEG_CFLAGS}" != "x"; then pkg_cv_FFMPEG_CFLAGS="${FFMPEG_CFLAGS}" else - pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>/dev/null` + pkg_cv_FFMPEG_CFLAGS=`$PKG_CONFIG --cflags "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>/dev/null` fi if test "x${FFMPEG_LIBS}" != "x"; then pkg_cv_FFMPEG_LIBS="${FFMPEG_LIBS}" else - pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>/dev/null` + pkg_cv_FFMPEG_LIBS=`$PKG_CONFIG --libs "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>/dev/null` fi else pkg_failed="yes" @@ -9493,9 +9493,9 @@ fi if test "x$pkg_failed" = "xyes"; then if test "x$_pkg_short_errors_supported" = "xyes"; then - FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1` + FFMPEG_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1` else - FFMPEG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libavcodec >= 52.20.0 libavcore >= 0.12.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1` + FFMPEG_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libavcodec >= 52.20.0 libavformat >= 52.31.0 libavutil >= 49.15.0" 2>&1` fi echo "$FFMPEG_PKG_ERRORS" >&5 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/.cvsignore,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- .cvsignore 20 Jan 2011 19:11:26 -0000 1.8 +++ .cvsignore 11 Apr 2011 11:45:07 -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/devel/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 11:45:07 -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/devel/audacious-plugins-freeworld.spec,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- audacious-plugins-freeworld.spec 28 Jan 2011 10:42:23 -0000 1.15 +++ audacious-plugins-freeworld.spec 11 Apr 2011 11:45:07 -0000 1.16 @@ -6,8 +6,8 @@ %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: 2%{?dist} +Version: 2.4.4 +Release: 1%{?dist} Summary: Additional plugins for the Audacious media player Group: Applications/Multimedia @@ -19,6 +19,7 @@ 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 >= %{version} @@ -141,6 +142,7 @@ rm -r src/mpg123/libmpg123 %patch0 -p1 %patch1 -p1 +%patch2 -p1 sed -i '\,^.SILENT:,d' buildsys.mk.in @@ -227,6 +229,9 @@ %changelog +* 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 Index: sources =================================================================== RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/sources,v retrieving revision 1.8 retrieving revision 1.9 diff -u -r1.8 -r1.9 --- sources 20 Jan 2011 19:11:26 -0000 1.8 +++ sources 11 Apr 2011 11:45:07 -0000 1.9 @@ -1 +1 @@ -d2c76253e7a5d83dbd87319790f3c7a5 audacious-plugins-2.4.3.tgz +e0b097beeba9da70896d1e36888996c8 audacious-plugins-2.4.4.tgz