rpms/audacious/F-12 audacious-2.2-set_tuple_cb.patch, NONE, 1.1 audacious.spec, 1.60, 1.61
Michael Schwendt
mschwendt at fedoraproject.org
Thu Jan 28 13:03:47 UTC 2010
- Previous message: rpms/audacious/devel audacious-2.2-set_tuple_cb.patch, NONE, 1.1 audacious.spec, 1.66, 1.67
- Next message: rpms/octave/devel .cvsignore, 1.27, 1.28 octave.spec, 1.96, 1.97 sources, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: mschwendt
Update of /cvs/pkgs/rpms/audacious/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv16324
Modified Files:
audacious.spec
Added Files:
audacious-2.2-set_tuple_cb.patch
Log Message:
sync with Rawhide
audacious-2.2-set_tuple_cb.patch:
audacious/playback.c | 4 +++-
libaudcore/tuple.c | 2 ++
2 files changed, 5 insertions(+), 1 deletion(-)
--- NEW FILE audacious-2.2-set_tuple_cb.patch ---
diff -Nur audacious-2.2-orig/src/audacious/playback.c audacious-2.2/src/audacious/playback.c
--- audacious-2.2-orig/src/audacious/playback.c 2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/audacious/playback.c 2010-01-28 13:52:03.000000000 +0100
@@ -614,8 +614,10 @@
static void set_tuple (InputPlayback * playback, Tuple * tuple)
{
+ Tuple* copy = tuple_copy(tuple);
+ tuple_free(tuple);
/* playlist_entry_set_tuple must execute in main thread */
- g_timeout_add (0, set_tuple_cb, tuple);
+ g_timeout_add (0, set_tuple_cb, copy);
}
void ip_set_info (const gchar * title, gint length, gint bitrate, gint
diff -Nur audacious-2.2-orig/src/libaudcore/tuple.c audacious-2.2/src/libaudcore/tuple.c
--- audacious-2.2-orig/src/libaudcore/tuple.c 2009-11-22 23:43:47.000000000 +0100
+++ audacious-2.2/src/libaudcore/tuple.c 2010-01-28 13:51:04.000000000 +0100
@@ -236,9 +236,11 @@
res = mowgli_heap_alloc(tuple_value_heap);
switch (src->type) {
case TUPLE_STRING:
+ res->type = TUPLE_STRING;
res->value.string = stringpool_get(src->value.string);
break;
case TUPLE_INT:
+ res->type = TUPLE_INT;
res->value.integer = src->value.integer;
break;
default:
Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-12/audacious.spec,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -p -r1.60 -r1.61
--- audacious.spec 24 Jan 2010 07:59:31 -0000 1.60
+++ audacious.spec 28 Jan 2010 13:03:47 -0000 1.61
@@ -5,7 +5,7 @@
Name: audacious
Version: 2.2
-Release: 7%{?dist}
+Release: 9%{?dist}
License: GPLv3
Summary: GTK2 based media player similar to XMMS
@@ -23,6 +23,8 @@ Patch2: audacious-2.2-pkgconfig-libs.pat
# for a problem that is known upstream, but 2.3-alpha1 doesn't fixed it yet
# iplugin sorting order is important, too
Patch3: audacious-2.2-multiple-decoders-per-ext.patch
+#
+Patch4: audacious-2.2-set_tuple_cb.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -80,10 +82,12 @@ Files needed when building software for
%prep
%setup -q -n %{name}-%{version}
sed -i '\,^.SILENT:,d' buildsys.mk.in
+sed -i -e 's!\(build_stamp.*\)UNSUPPORTED VERSION!\1Fedora package!' src/audacious/Makefile ; grep 'Fedora package' src/audacious/Makefile || exit -1
%patch0 -p1 -b .disabled-iplugins
%patch1 -p1 -b .AUD-99
%patch2 -p1 -b .pkgconfig-libs
%patch3 -p1 -b .multiple-decoders
+%patch4 -p1 -b .set_tuple_cb
# From .desktop files remove MIME types the base build of the
# Fedora audacious-plugins package does not understand.
@@ -134,6 +138,7 @@ desktop-file-install \
--remove-mime-type audio/x-ms-wma \
--remove-mime-type audio/x-scpls \
--remove-category Application \
+ --add-category AudioVideo \
$RPM_BUILD_ROOT%{_datadir}/applications/audacious2.desktop
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/48x48/apps
@@ -198,6 +203,15 @@ gtk-update-icon-cache %{_datadir}/icons/
%changelog
+* Thu Jan 28 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-9
+- Let set_tuple_cb() work on a copied tuple
+ (the metadata updates flood is too racy IMO).
+- Fix tuple_copy().
+
+* Wed Jan 27 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-8
+- Change build_stamp from "UNSUPPORTED VERSION" to "Fedora package".
+- Always add category AudioVideo to .desktop file for safety reasons.
+
* Sat Jan 23 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-7
- Patch filename_find_decoder to probe a file if multiple decoders
compete with eachother to handle files with the same extension.
- Previous message: rpms/audacious/devel audacious-2.2-set_tuple_cb.patch, NONE, 1.1 audacious.spec, 1.66, 1.67
- Next message: rpms/octave/devel .cvsignore, 1.27, 1.28 octave.spec, 1.96, 1.97 sources, 1.27, 1.28
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list