rpms/audacious/F-11 audacious-1.5.1-pulseaudio-by-default.patch, NONE, 1.1 audacious-1.5.1-tuple_get_int-assertion.patch, NONE, 1.1 audacious.spec, 1.47, 1.48 audacious-1.1.0-amidi-backend.patch, 1.1, NONE audacious-1.1.0-no-rpath.patch, 1.2, NONE audacious-1.1.0-quoting.patch, 1.2, NONE audacious-1.1.1-controlsocket-name.patch, 1.1, NONE audacious-1.1.1-playlist-twenty.patch, 1.3, NONE audacious-1.2.1-relative-links.patch, 1.1, NONE audacious-1.2.1-shaded-skin.patch, 1.1, NONE audacious-1.4.2-id3tag-close-file.patch, 1.1, NONE

Michael Schwendt mschwendt at fedoraproject.org
Sun Sep 13 08:53:05 UTC 2009


Author: mschwendt

Update of /cvs/pkgs/rpms/audacious/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv25640

Modified Files:
	audacious.spec 
Added Files:
	audacious-1.5.1-pulseaudio-by-default.patch 
	audacious-1.5.1-tuple_get_int-assertion.patch 
Removed Files:
	audacious-1.1.0-amidi-backend.patch 
	audacious-1.1.0-no-rpath.patch audacious-1.1.0-quoting.patch 
	audacious-1.1.1-controlsocket-name.patch 
	audacious-1.1.1-playlist-twenty.patch 
	audacious-1.2.1-relative-links.patch 
	audacious-1.2.1-shaded-skin.patch 
	audacious-1.4.2-id3tag-close-file.patch 
Log Message:
* Sun Sep 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
- Fix playlist tuple_get_int assertion (#522995).
- Default to pulseaudio output plugin.
- Prune obsolete/unapplied patches.


audacious-1.5.1-pulseaudio-by-default.patch:
 audconfig.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE audacious-1.5.1-pulseaudio-by-default.patch ---
diff -Nur audacious-1.5.1-orig/src/audacious/audconfig.c audacious-1.5.1/src/audacious/audconfig.c
--- audacious-1.5.1-orig/src/audacious/audconfig.c	2008-05-24 00:00:34.000000000 +0200
+++ audacious-1.5.1/src/audacious/audconfig.c	2009-09-13 10:02:11.118092467 +0200
@@ -104,7 +104,7 @@
     .equalizer_bands = {0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0, 0.0},
     .scale_factor = 2.0,
     .skin = NULL,
-    .outputplugin = NULL,
+    .outputplugin = "__RPM_LIBDIR__/audacious/Output/pulse_audio.so (#0)",
     .filesel_path = NULL,
     .playlist_path = NULL,
     .playlist_font = NULL,

audacious-1.5.1-tuple_get_int-assertion.patch:
 playlist.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-1.5.1-tuple_get_int-assertion.patch ---
diff -Nur audacious-1.5.1-orig/src/audacious/playlist.c audacious-1.5.1/src/audacious/playlist.c
--- audacious-1.5.1-orig/src/audacious/playlist.c	2008-05-24 00:00:34.000000000 +0200
+++ audacious-1.5.1/src/audacious/playlist.c	2009-09-13 09:46:50.030085752 +0200
@@ -2429,7 +2429,7 @@
                     /* Entry disappeared while we looked it up.
                        Restart. */
                     node = playlist->entries;
-                else if ((entry->tuple != NULL || entry->title != NULL) && 
+                else if (entry->tuple != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                          tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1)
                 {
@@ -2480,7 +2480,7 @@
                         node = g_list_nth(playlist->entries,
                                           playlistwin_get_toprow());
                 }
-                else if ((entry->tuple != NULL || entry->title != NULL) && 
+                else if (entry->tuple != NULL && 
                          tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 &&
                          tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1) {
                     update_playlistwin = TRUE;


Index: audacious.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious/F-11/audacious.spec,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -p -r1.47 -r1.48
--- audacious.spec	12 Sep 2009 08:57:44 -0000	1.47
+++ audacious.spec	13 Sep 2009 08:53:05 -0000	1.48
@@ -4,7 +4,7 @@
 
 Name:           audacious
 Version:        1.5.1
-Release:        10%{?dist}
+Release:        11%{?dist}
 Summary:        GTK2 based media player similar to XMMS
 
 Group:          Applications/Multimedia
@@ -13,19 +13,13 @@ URL:            http://audacious-media-p
 
 Source0:        http://distfiles.atheme.org/audacious-%{version}.tgz
 Patch0:         audacious-1.5.1-xmms-skins.patch
-Patch1:         audacious-1.5.1-default-skin.patch
-# Patch2:         audacious-1.1.0-no-rpath.patch
-Patch3:         audacious-1.2.1-relative-links.patch
-# Patch4:         audacious-1.1.0-quoting.patch
-# Patch5:         audacious-1.1.0-amidi-backend.patch
-Patch6:         audacious-1.2.1-shaded-skin.patch
-# Patch7:         audacious-1.1.1-controlsocket-name.patch
-# Patch8:         audacious-1.1.1-playlist-twenty.patch
-Patch9:         audacious-1.4.2-id3tag-close-file.patch
+#Patch1:         audacious-1.5.1-default-skin.patch
 Patch10:        audacious-1.5.1-libsad-header.patch
 Patch11:        audacious-1.5.1-playlist-length.patch
 Patch12:        audacious-1.5.1-playlist-play-clicked.patch
 Patch13:        audacious-1.5.1-desktop-name.patch
+Patch14:        audacious-1.5.1-tuple_get_int-assertion.patch
+Patch15:        audacious-1.5.1-pulseaudio-by-default.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  gtk2-devel >= 2.6
@@ -81,32 +75,8 @@ Files needed when building software for 
 # Read xmms skins directory
 %patch0 -p1 -b .xmms-skins
 
-# Use bluecurve as default skin
-%patch1 -p1 -b .default-skin
-
-# No rpath in binaries
-# %patch2 -p1 -b .no-rpath
-
-# Relative symlink paths
-# %patch3 -p1 -b .relative-links
-
-# Filename quoting
-# %patch4 -p1 -b .quoting
-
-# Amidi backends path
-# %patch5 -p1 -b .amidi-backend
-
-# Shaded playlist window decorations
-# %patch6 -p1 -b .shaded-skin
-
-# Controlsocket named "xmms" instead of "audacious"
-# %patch7 -p1 -b controlsocket-name
-
-# Fix "%20" in playlist entries
-# %patch8 -p1 -b playlist-twenty
-
-# Fix files left open on non-seekable mp3 streams
-# %patch9 -p1 -b id3tag-close-file
+# Use bluecurve as default skin (from package "bluecurve-xmms-skin")
+#patch1 -p1 -b .default-skin
 
 # Remove libSAD references from the public headers
 %patch10 -p1 -b libsad-header
@@ -120,6 +90,12 @@ Files needed when building software for 
 # /usr/bin/audacious looks for the fedora-audacious.desktop file
 %patch13 -p1 -b .desktop-name
 
+# was scheduled for 1.5.2
+%patch14 -p1 -b .tuple_get_int-assertion
+
+%patch15 -p1 -b .pulseaudio-by-default
+sed -i -e 's!__RPM_LIBDIR__!%{_libdir}!g' src/audacious/audconfig.c
+
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
 %build
@@ -207,6 +183,11 @@ gtk-update-icon-cache %{_datadir}/icons/
 
 
 %changelog
+* Sun Sep 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-11
+- Fix playlist tuple_get_int assertion (#522995).
+- Default to pulseaudio output plugin.
+- Prune obsolete/unapplied patches.
+
 * Sat Sep 12 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.5.1-10
 - Build with --enable-samplerate (off by default), BR libsamplerate-devel
 


--- audacious-1.1.0-amidi-backend.patch DELETED ---


--- audacious-1.1.0-no-rpath.patch DELETED ---


--- audacious-1.1.0-quoting.patch DELETED ---


--- audacious-1.1.1-controlsocket-name.patch DELETED ---


--- audacious-1.1.1-playlist-twenty.patch DELETED ---


--- audacious-1.2.1-relative-links.patch DELETED ---


--- audacious-1.2.1-shaded-skin.patch DELETED ---


--- audacious-1.4.2-id3tag-close-file.patch DELETED ---




More information about the fedora-extras-commits mailing list