[audacious-plugins/f12/master] sync with f13
Michael Schwendt
mschwendt at fedoraproject.org
Sat Aug 14 16:44:32 UTC 2010
commit 4a0130e679fc082154f74c2d132b4a5ae273f8db
Author: Michael Schwendt <mschwendt at fedoraproject.org>
Date: Sat Aug 14 18:44:28 2010 +0200
sync with f13
audacious-plugins-2.2-amidi.patch | 28 +++++++++++++++-
audacious-plugins-2.2-delete-ui-state_cb.patch | 32 ++++++++++++++++++
audacious-plugins-2.2-pulse-flush.patch | 12 +++++++
audacious-plugins.spec | 42 ++++++++++++++++++------
4 files changed, 102 insertions(+), 12 deletions(-)
---
diff --git a/audacious-plugins-2.2-amidi.patch b/audacious-plugins-2.2-amidi.patch
index ed0a417..2d2e7ae 100644
--- a/audacious-plugins-2.2-amidi.patch
+++ b/audacious-plugins-2.2-amidi.patch
@@ -1,6 +1,30 @@
-diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/amidi-plug.c audacious-plugins-2.2/src/amidi-plug/amidi-plug.c
+--- audacious-plugins-2.2-orig/src/amidi-plug/amidi-plug.c 2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2/src/amidi-plug/amidi-plug.c 2010-05-31 12:17:41.000000000 +0200
+@@ -259,7 +259,7 @@
+ soft_init ();
+
+ if (filename != NULL)
+- title = g_path_get_basename(filename_uri);
++ title = g_path_get_basename(filename);
+ else
+ title = g_strdup(filename_uri);
+
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_backend.c audacious-plugins-2.2/src/amidi-plug/i_backend.c
+--- audacious-plugins-2.2-orig/src/amidi-plug/i_backend.c 2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2/src/amidi-plug/i_backend.c 2010-05-31 12:18:24.000000000 +0200
+@@ -105,7 +105,7 @@
+ {
+ gchar * module_pathfilename = g_strjoin( "" , AMIDIPLUGBACKENDDIR , "/ap-" , module_name , ".so" , NULL );
+ DEBUGMSG( "loading backend '%s'\n" , module_pathfilename );
+- backend.gmodule = g_module_open( module_pathfilename , 0 );
++ backend.gmodule = g_module_open( module_pathfilename, G_MODULE_BIND_LAZY|G_MODULE_BIND_LOCAL );
+
+ if ( backend.gmodule != NULL )
+ {
+diff -Nur audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c audacious-plugins-2.2/src/amidi-plug/i_midi.c
--- audacious-plugins-2.2-orig/src/amidi-plug/i_midi.c 2009-11-22 23:49:52.000000000 +0100
-+++ audacious-plugins-2.2-amidi/src/amidi-plug/i_midi.c 2010-03-16 10:41:24.000000000 +0100
++++ audacious-plugins-2.2/src/amidi-plug/i_midi.c 2010-05-31 12:17:20.000000000 +0200
@@ -659,8 +659,10 @@
/* IMPORTANT
this couple of important values is set by i_midi_set_length */
diff --git a/audacious-plugins-2.2-delete-ui-state_cb.patch b/audacious-plugins-2.2-delete-ui-state_cb.patch
new file mode 100644
index 0000000..4e071d0
--- /dev/null
+++ b/audacious-plugins-2.2-delete-ui-state_cb.patch
@@ -0,0 +1,32 @@
+diff -Nur audacious-plugins-2.2-orig/src/skins/ui_main.c audacious-plugins-2.2/src/skins/ui_main.c
+--- audacious-plugins-2.2-orig/src/skins/ui_main.c 2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-2.2/src/skins/ui_main.c 2010-06-07 18:55:11.000000000 +0200
+@@ -2148,19 +2148,6 @@
+ ui_skinned_window_set_shade (mainwin, config.player_shaded);
+ }
+
+-static gboolean state_cb (GtkWidget * widget, GdkEventWindowState * event,
+- void * unused)
+-{
+- if (event->changed_mask & GDK_WINDOW_STATE_STICKY)
+- mainwin_set_sticky (event->new_window_state & GDK_WINDOW_STATE_STICKY);
+-
+- if (event->changed_mask & GDK_WINDOW_STATE_ABOVE)
+- mainwin_set_always_on_top (event->new_window_state &
+- GDK_WINDOW_STATE_ABOVE);
+-
+- return TRUE;
+-}
+-
+ static gboolean delete_cb (GtkWidget * widget, GdkEvent * event, void * unused)
+ {
+ audacious_drct_quit ();
+@@ -2201,8 +2188,6 @@
+
+ ui_main_evlistener_init();
+
+- g_signal_connect ((GObject *) mainwin, "window-state-event", (GCallback)
+- state_cb, NULL);
+ g_signal_connect ((GObject *) mainwin, "delete-event", (GCallback)
+ delete_cb, NULL);
+ }
diff --git a/audacious-plugins-2.2-pulse-flush.patch b/audacious-plugins-2.2-pulse-flush.patch
new file mode 100644
index 0000000..562716f
--- /dev/null
+++ b/audacious-plugins-2.2-pulse-flush.patch
@@ -0,0 +1,12 @@
+diff -Nur audacious-plugins-fedora-2.2-orig/src/pulse_audio/pulse_audio.c audacious-plugins-fedora-2.2/src/pulse_audio/pulse_audio.c
+--- audacious-plugins-fedora-2.2-orig/src/pulse_audio/pulse_audio.c 2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-fedora-2.2/src/pulse_audio/pulse_audio.c 2010-08-14 18:36:53.000000000 +0200
+@@ -406,6 +406,8 @@
+ pa_operation *o = NULL;
+ int success = 0;
+
++ pulse_pause(1);
++
+ CHECK_CONNECTED();
+
+ pa_threaded_mainloop_lock(mainloop);
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index a445c2b..468c93f 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,7 +5,7 @@
Name: audacious-plugins
Version: 2.2
-Release: 32%{?dist}
+Release: 36%{?dist}
Summary: Plugins for the Audacious media player
Group: Applications/Multimedia
URL: http://audacious-media-player.org/
@@ -38,16 +38,16 @@ Patch5: audacious-plugins-2.2-alarm.patch
Patch6: audacious-plugins-2.2-xspf-base.patch
# merged upstream (AUDPLUG-160)
Patch7: audacious-plugins-2.2-svis_expose.patch
-#
+# additional safety not merged upstream with neon patche
Patch8: audacious-plugins-2.2-neon-session-destroy.patch
# obsolete with version upgrade
Patch9: audacious-plugins-2.2-adplug-fclose.patch
-#
+# submitted upstream
Patch10: audacious-plugins-2.2-adplug-lds.patch
-# reported upstream (AUDPLUG-180), as a rewrite of the plugin
+# merged upstream (AUDPLUG-180), as a rewrite of the plugin
# would be better
Patch11: audacious-plugins-2.2-streambrowser-race.patch
-# huh? AUDPLUG-161 / bz561635
+# merged upstream (AUDPLUG-161) / bz561635
# plus: hardcoded libdir replacement
# plus: fix dialogs (merged upstream)
Patch12: audacious-plugins-2.2-ladspa.patch
@@ -55,22 +55,28 @@ Patch12: audacious-plugins-2.2-ladspa.patch
Patch13: audacious-plugins-2.2-neon-error-handling.patch
# revised version merged upstream
Patch14: audacious-plugins-2.2-tmp-vuln.patch
-#
+# merged upstream
Patch15: audacious-plugins-2.2-streambrowser-url-add.patch
-#
+# plugin discontinued post-2.2 : AUDPLUG-179
+# merged upstream
Patch16: audacious-plugins-2.2-scrobbler.patch
# merged upstream with additional patch for 2.3: AUDPLUG-170
Patch17: audacious-plugins-2.2-status.patch
# merged upstream
Patch18: audacious-plugins-2.2-no-adplugdb.patch
-# is this even possible? bz 573075
+# is this even possible? bz 573075 - only keeping this in 2.2
Patch19: audacious-plugins-2.2-playlist-font-safety.patch
-# div-by-zero with almost empty MIDI file, bz 573851
+# submitted upstream: div-by-zero with almost empty MIDI file, bz 573851
+# backend module load + get_song_tuple: fixed upstream
Patch20: audacious-plugins-2.2-amidi.patch
# merged upstream - Visualization Mode issues, fixed while looking at bz 575093
Patch21: audacious-plugins-2.2-ui_vis.patch
# obsolete with version upgrade
Patch22: audacious-plugins-2.2-g_markup.patch
+# obsolete with version upgrade
+Patch23: audacious-plugins-2.2-delete-ui-state_cb.patch
+#
+Patch24: audacious-plugins-2.2-pulse-flush.patch
BuildRequires: audacious-devel >= %{aud_ver}
BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -78,7 +84,6 @@ BuildRequires: alsa-lib-devel
BuildRequires: pulseaudio-libs-devel
BuildRequires: esound-devel
BuildRequires: libsndfile-devel
-BuildRequires: taglib-devel
BuildRequires: wavpack-devel
BuildRequires: libsidplay-devel
BuildRequires: libogg-devel libvorbis-devel
@@ -223,6 +228,8 @@ in Vortex (.vtx) format.
%patch20 -p1 -b .amidi
%patch21 -p1 -b .ui_vis
%patch22 -p1 -b .g_markup
+%patch23 -p1 -b .delete-ui-state_cb
+%patch24 -p1 -b .pulse-flush
for i in src/ladspa/ladspa.c
do
@@ -279,6 +286,7 @@ update-desktop-database &> /dev/null || :
%files -f %{name}.lang
%defattr(-,root,root,-)
%doc AUTHORS COPYING
+%dir %{_libdir}/audacious
%{_libdir}/audacious/Input/
%{_libdir}/audacious/Output/
%{_libdir}/audacious/Container/
@@ -323,6 +331,20 @@ update-desktop-database &> /dev/null || :
%changelog
+* Sat Aug 14 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-36
+- In pulse_flush() start with pulse_pause() to pa_stream_cork()
+ playback quickly in order to avoid loud clicks/noise.
+
+* Mon Aug 2 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-35
+- Nothing has ever before owned directory %%_libdir/audacious/ - now fixed.
+
+* Mon Jun 7 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-34
+- Don't register window-state-event callback as this makes KDE hang
+ when turning on sticky view mode (#601233) (AUDPLUG-178).
+
+* Mon May 31 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-33
+- Fix amidi-plug backend loader (#598005) and get_song_tuple.
+
* Sat Apr 10 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-32
- Fix the gtk_message_dialog_new_with_markup() call as in 2.3.
More information about the scm-commits
mailing list