8 p.m.
Author: jwrdegoede
Update of /cvs/free/rpms/audacious-plugins-freeworld/devel
In directory se02.es.rpmfusion.net:/tmp/cvs-serv28403
Modified Files:
.cvsignore audacious-plugins-freeworld.spec sources
Added Files:
audacious-plugins-2.4-aac-seek.patch
audacious-plugins-2.4-ffaudio-metadata.patch
audacious-plugins-2.4-sys-mpg123.patch
Removed Files:
audacious-plugins-2.2-m4a.patch
audacious-plugins-2.2-madplug-hang.patch
audacious-plugins-2.2-madplug.patch
Log Message:
* Tue Aug 24 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4-0.1.rc2
- Update to 2.4-rc2
audacious-plugins-2.4-aac-seek.patch:
libmp4.c | 22 ++++++++++------------
1 file changed, 10 insertions(+), 12 deletions(-)
--- NEW FILE audacious-plugins-2.4-aac-seek.patch ---
--- audacious-plugins-2.4-rc2/src/aac/libmp4.c 2010-08-13 23:01:11.000000000 +0200
+++ audacious-plugins-2.4-rc2.new/src/aac/libmp4.c 2010-08-24 20:55:16.072479001 +0200
@@ -577,15 +577,13 @@
// We are reading an MP4 file
gint mp4track= getAACTrack(mp4file);
NeAACDecHandle decoder;
- mp4AudioSpecificConfig mp4ASC;
guchar *buffer = NULL;
guint bufferSize = 0;
gulong samplerate = 0;
guchar channels = 0;
- gulong msDuration;
guint numSamples;
gulong sampleID = 1;
- guint framesize = 1024;
+ guint framesize = 0;
gboolean paused = FALSE;
if (mp4track < 0)
@@ -607,12 +605,6 @@
return FALSE;
}
- /* Add some hacks for SBR profile */
- if (AudioSpecificConfig(buffer, bufferSize, &mp4ASC) >= 0) {
- if (mp4ASC.frameLengthFlag == 1) framesize = 960;
- if (mp4ASC.sbr_present_flag == 1) framesize *= 2;
- }
-
g_free(buffer);
if( !channels ) {
NeAACDecClose(decoder);
@@ -620,7 +612,6 @@
return FALSE;
}
numSamples = mp4ff_num_samples(mp4file, mp4track);
- msDuration = ((float)numSamples * (float)(framesize - 1.0)/(float)samplerate) *
1000;
if (! playback->output->open_audio (FMT_S16_NE, samplerate, channels))
{
@@ -645,8 +636,12 @@
if (seek_value >= 0)
{
- sampleID = (gint64) seek_value * samplerate / 1000 / (framesize - 1);
- playback->output->flush (seek_value);
+ /* Ignore seek requests when we don't have a framesize yet, but
+ do signal the seek_cond ! */
+ if (framesize ) {
+ sampleID = (gint64) seek_value * samplerate / 1000 / framesize;
+ playback->output->flush (seek_value);
+ }
seek_value = -1;
g_cond_signal (seek_cond);
}
@@ -723,6 +718,9 @@
}
playback->output->write_audio (sampleBuffer, 2 * frameInfo.samples);
+
+ if (!framesize)
+ framesize = frameInfo.samples / frameInfo.channels;
}
playback->output->close_audio();
audacious-plugins-2.4-ffaudio-metadata.patch:
ffaudio-core.c | 24 +++++++-----------------
1 file changed, 7 insertions(+), 17 deletions(-)
--- NEW FILE audacious-plugins-2.4-ffaudio-metadata.patch ---
--- 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
@@ -31,6 +31,7 @@
#ifdef FFAUDIO_USE_AUDTAG
#include <audacious/audtag.h>
#endif
+#include <libaudcore/audstrings.h>
/***********************************************************************************
* Plugin glue. *
@@ -151,21 +152,21 @@
} ffaudio_meta_t;
static const ffaudio_meta_t metaentries[] = {
- { TUPLE_STRING, FIELD_ARTIST, "author", { "hor", NULL }
},
+ { TUPLE_STRING, FIELD_ARTIST, "author", { "hor",
"artist", NULL } },
{ TUPLE_STRING, FIELD_TITLE, "title", { "le", NULL }
},
{ TUPLE_STRING, FIELD_ALBUM, "album", {
"WM/AlbumTitle", NULL } },
{ TUPLE_STRING, FIELD_PERFORMER, "performer", { NULL } },
{ TUPLE_STRING, FIELD_COPYRIGHT, "copyright", { NULL } },
{ TUPLE_STRING, FIELD_GENRE, "genre", { "WM/Genre",
NULL } },
{ TUPLE_STRING, FIELD_COMMENT, "comment", { NULL } },
+ { TUPLE_STRING, FIELD_COMPOSER, "composer", { NULL } },
{ TUPLE_STRING, -1, "lyrics", { "WM/Lyrics",
NULL } },
- { TUPLE_INT, FIELD_YEAR, "year", { "WM/Year",
NULL } },
+ { TUPLE_INT, FIELD_YEAR, "year", { "WM/Year",
"date", NULL } },
{ TUPLE_INT, FIELD_TRACK_NUMBER, "track", {
"WM/TrackNumber", NULL } },
};
static const gint n_metaentries = sizeof(metaentries) / sizeof(metaentries[0]);
-#ifndef FFAUDIO_USE_AUDTAG
static void
ffaudio_get_meta(Tuple *tuple, AVFormatContext *ic, const ffaudio_meta_t *m)
{
@@ -202,18 +204,15 @@
}
}
}
-#endif
static void
ffaudio_get_tuple_data(Tuple *tuple, AVFormatContext *ic, AVCodecContext *c, AVCodec
*codec)
{
if (ic != NULL)
{
-#ifndef FFAUDIO_USE_AUDTAG
gint i;
for (i = 0; i < n_metaentries; i++)
ffaudio_get_meta(tuple, ic, &metaentries[i]);
-#endif
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 @@
return tuple;
}
-#ifdef FFAUDIO_USE_AUDTAG
static Tuple *
ffaudio_probe_for_tuple(const gchar *filename, VFSFile *fd)
{
@@ -267,12 +265,15 @@
if (t == NULL)
return NULL;
+#ifdef FFAUDIO_USE_AUDTAG
vfs_fseek(fd, 0, SEEK_SET);
tag_tuple_read(t, fd);
+#endif
return t;
}
+#ifdef FFAUDIO_USE_AUDTAG
static gboolean ffaudio_write_tag (const Tuple * tuple, VFSFile * file)
{
gchar *file_uri = g_ascii_strdown(file->uri, -4);
@@ -305,9 +306,6 @@
ReSampleContext *resctx = NULL;
gboolean codec_opened = FALSE, do_resampling = FALSE;
gint out_fmt;
-#ifndef FFAUDIO_USE_AUDTAG
- Tuple *tuple;
-#endif
gboolean seekable;
gchar uribuf[64];
@@ -387,11 +385,6 @@
resbuf = av_malloc(AVCODEC_MAX_AUDIO_FRAME_SIZE);
AUDDBG("setting parameters\n");
-#ifndef FFAUDIO_USE_AUDTAG
- tuple = tuple_new_from_filename(playback->filename);
- ffaudio_get_tuple_data(tuple, ic, c, codec);
- playback->set_tuple(playback, tuple);
-#endif
if (pause)
playback->output->pause(TRUE);
@@ -682,9 +675,7 @@
.init = ffaudio_init,
.cleanup = ffaudio_cleanup,
.is_our_file_from_vfs = ffaudio_probe,
-#ifdef FFAUDIO_USE_AUDTAG
.probe_for_tuple = ffaudio_probe_for_tuple,
-#endif
.play = ffaudio_play,
.stop = ffaudio_stop,
.pause = ffaudio_pause,
audacious-plugins-2.4-sys-mpg123.patch:
Makefile | 24 ++----------------------
mpg123.c | 2 +-
2 files changed, 3 insertions(+), 23 deletions(-)
--- NEW FILE audacious-plugins-2.4-sys-mpg123.patch ---
diff -up audacious-plugins-2.4-rc2/src/mpg123/Makefile~
audacious-plugins-2.4-rc2/src/mpg123/Makefile
--- audacious-plugins-2.4-rc2/src/mpg123/Makefile~ 2010-08-13 23:01:12.000000000 +0200
+++ audacious-plugins-2.4-rc2/src/mpg123/Makefile 2010-08-24 11:58:06.147712997 +0200
@@ -1,27 +1,7 @@
PLUGIN = madplug${PLUGIN_SUFFIX}
SRCS = mpg123.c \
- id3skip.c \
- libmpg123/compat.c \
- libmpg123/dct64.c \
- libmpg123/equalizer.c \
- libmpg123/feature.c \
- libmpg123/format.c \
- libmpg123/frame.c \
- libmpg123/icy2utf8.c \
- libmpg123/icy.c \
- libmpg123/id3.c \
- libmpg123/index.c \
- libmpg123/layer1.c \
- libmpg123/layer2.c \
- libmpg123/layer3.c \
- libmpg123/libmpg123.c \
- libmpg123/optimize.c \
- libmpg123/parse.c \
- libmpg123/readers.c \
- libmpg123/stringbuf.c \
- libmpg123/synth.c \
- libmpg123/tabinit.c
+ id3skip.c
include ../../buildsys.mk
include ../../extra.mk
@@ -31,4 +11,4 @@ plugindir := ${plugindir}/${INPUT_PLUGIN
CFLAGS += ${PLUGIN_CFLAGS}
CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS}
${ARCH_DEFINES} ${SIMD_CFLAGS} -I../..
LDFLAGS += ${AUDLDFLAGS}
-LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} -laudtag -lm
+LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${MOWGLI_LIBS} -laudtag -lm -lmpg123
diff -up audacious-plugins-2.4-rc2/src/mpg123/mpg123.c~
audacious-plugins-2.4-rc2/src/mpg123/mpg123.c
--- 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 "libmpg123/mpg123.h"
+#include <mpg123.h>
/* Define to read all frame headers when calculating file length */
/* #define FULL_SCAN */
Index: .cvsignore
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/.cvsignore,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- .cvsignore 19 Dec 2009 15:59:56 -0000 1.5
+++ .cvsignore 24 Aug 2010 20:00:48 -0000 1.6
@@ -1 +1 @@
-audacious-plugins-2.2.tgz
+audacious-plugins-2.4-rc2.tgz
Index: audacious-plugins-freeworld.spec
===================================================================
RCS file:
/cvs/free/rpms/audacious-plugins-freeworld/devel/audacious-plugins-freeworld.spec,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- audacious-plugins-freeworld.spec 29 Jan 2010 14:12:12 -0000 1.8
+++ audacious-plugins-freeworld.spec 24 Aug 2010 20:00:48 -0000 1.9
@@ -3,29 +3,30 @@
# - add BR sidplay2-devel and find a way to make the built sid.so
# plugin an alternative to Fedora's sidplay1 based sid.so
-%define aud_ver 2.2
+%global aud_ver 2.4
+%global extra_ver rc2
Name: audacious-plugins-freeworld
-Version: 2.2
-Release: 3%{?dist}
+Version: 2.4
+Release: 0.1.%{extra_ver}%{?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}-%{extra_ver}.tgz
Source1: audacious-mp3.desktop
Source2: audacious-aac.desktop
Source3: audacious-ffaudio.desktop
-Patch0: audacious-plugins-2.2-m4a.patch
-Patch1: audacious-plugins-2.2-madplug.patch
-Patch2: audacious-plugins-2.2-madplug-hang.patch
+Patch0: audacious-plugins-2.4-sys-mpg123.patch
+Patch1: audacious-plugins-2.4-aac-seek.patch
+Patch2: audacious-plugins-2.4-ffaudio-metadata.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: audacious-devel >= %{aud_ver}
BuildRequires: zlib-devel, desktop-file-utils >= 0.9
BuildRequires: taglib-devel >= 1.4
-BuildRequires: lame-devel, libmms-devel, libmad-devel
+BuildRequires: libmms-devel, libmpg123-devel
BuildRequires: gettext, libbinio-devel
BuildRequires: dbus-devel >= 0.60, dbus-glib-devel >= 0.60
# ffaudio plugin
@@ -129,7 +130,9 @@
%prep
-%setup -q -n audacious-plugins-%{version}
+%setup -q -n audacious-plugins-%{version}-%{extra_ver}
+# We want to use the system mpg123
+rm -r src/mpg123/libmpg123
%patch0 -p1
%patch1 -p1
%patch2 -p1
@@ -143,7 +146,7 @@
--disable-sse2 \
--disable-altivec \
--disable-dependency-tracking
-make V=1 %{?_smp_mflags} -C src/madplug
+make V=1 %{?_smp_mflags} -C src/mpg123
make V=1 %{?_smp_mflags} -C src/aac
make V=1 %{?_smp_mflags} -C src/ffaudio
make V=1 %{?_smp_mflags} -C src/mms
@@ -151,7 +154,7 @@
%install
rm -rf $RPM_BUILD_ROOT
-make -C src/madplug install DESTDIR=$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
make -C src/mms install DESTDIR=$RPM_BUILD_ROOT
@@ -219,6 +222,9 @@
%changelog
+* Tue Aug 24 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.4-0.1.rc2
+- Update to 2.4-rc2
+
* Fri Jan 29 2010 Hans de Goede <j.w.r.degoede(a)hhs.nl> 2.2-3
- Fix another hang in the madplug plugin (rf1061)
Index: sources
===================================================================
RCS file: /cvs/free/rpms/audacious-plugins-freeworld/devel/sources,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- sources 19 Dec 2009 15:59:56 -0000 1.5
+++ sources 24 Aug 2010 20:00:48 -0000 1.6
@@ -1 +1 @@
-ed6790bf5667c824eda72301f0a886a8 audacious-plugins-2.2.tgz
+216eca46679fcd9c6d217dd2e37202a9 audacious-plugins-2.4-rc2.tgz
--- audacious-plugins-2.2-m4a.patch DELETED ---
--- audacious-plugins-2.2-madplug-hang.patch DELETED ---
--- audacious-plugins-2.2-madplug.patch DELETED ---