Author: goetz
Date: Mon Feb 12 17:23:05 2007
New Revision: 119898
Added:
packages/cooker/audacious-plugins/current/SOURCES/audacious-plugins-1362-aosd-exit.patch
Modified:
packages/cooker/audacious-plugins/current/SOURCES/audacious-plugins-1.3.0-alpha4-fixcrash.patch
packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec
Log:
fix crash on exit in aosd
Modified:
packages/cooker/audacious-plugins/current/SOURCES/audacious-plugins-1.3.0-alpha4-fixcrash.patch
==============================================================================
---
packages/cooker/audacious-plugins/current/SOURCES/audacious-plugins-1.3.0-alpha4-fixcrash.patch
(original)
+++
packages/cooker/audacious-plugins/current/SOURCES/audacious-plugins-1.3.0-alpha4-fixcrash.patch
Mon Feb 12 17:23:05 2007
@@ -1,25 +1,11 @@
---- audacious-plugins-1.3.0-alpha4/src/vorbis/vorbis.c.fixcrash
2007-02-07 19:18:56.000000000 +0100
-+++ audacious-plugins-1.3.0-alpha4/src/vorbis/vorbis.c 2007-02-07
19:19:00.000000000 +0100
-@@ -37,8 +37,6 @@
+--- trunk/src/vorbis/vorbis.c 2007/02/04 21:40:53 1302
++++ trunk/src/vorbis/vorbis.c 2007/02/07 18:35:13 1316
+@@ -37,7 +37,7 @@
#define DEBUG
-#define REMOVE_NONEXISTANT_TAG(x) if (!*x) { x = NULL; }
--
++#define REMOVE_NONEXISTANT_TAG(x) if (x != NULL && !*x) { x = NULL; }
+
#include <glib.h>
#include <gtk/gtk.h>
-
-@@ -784,13 +782,6 @@
- tuple->genre = g_strdup(vorbis_comment_query(comment, "genre", 0));
- tuple->comment =
- g_strdup(vorbis_comment_query(comment, "comment", 0));
--
-- /* remove any blank tags */
-- REMOVE_NONEXISTANT_TAG(tuple->performer);
-- REMOVE_NONEXISTANT_TAG(tuple->album_name);
-- REMOVE_NONEXISTANT_TAG(tuple->track_name);
-- REMOVE_NONEXISTANT_TAG(tuple->genre);
-- REMOVE_NONEXISTANT_TAG(tuple->comment);
- }
-
- return tuple;
Added:
packages/cooker/audacious-plugins/current/SOURCES/audacious-plugins-1362-aosd-exit.patch
==============================================================================
--- (empty file)
+++
packages/cooker/audacious-plugins/current/SOURCES/audacious-plugins-1362-aosd-exit.patch
Mon Feb 12 17:23:05 2007
@@ -0,0 +1,49 @@
+Index: src/aosd/aosd.c
+===================================================================
+--- src/aosd/aosd.c (Revision 1361)
++++ src/aosd/aosd.c (Revision 1362)
+@@ -26,6 +26,7 @@
+
+
+ aosd_cfg_t * global_config = NULL;
++static gboolean plugin_is_active = FALSE;
+
+
+ /* ***************** */
+@@ -40,6 +41,7 @@
+ void
+ aosd_init ( void )
+ {
++ plugin_is_active = TRUE;
+ g_log_set_handler( NULL , G_LOG_LEVEL_WARNING , g_log_default_handler ,
NULL );
+
+ global_config = aosd_cfg_new();
+@@ -54,16 +56,21 @@
+ void
+ aosd_cleanup ( void )
+ {
+- aosd_trigger_stop( &global_config->osd->trigger );
++ if ( plugin_is_active == TRUE )
++ {
++ aosd_trigger_stop( &global_config->osd->trigger );
+
+- aosd_shutdown();
++ aosd_shutdown();
+
+- if ( global_config != NULL )
+- {
+- aosd_cfg_delete( global_config );
+- global_config = NULL;
++ if ( global_config != NULL )
++ {
++ aosd_cfg_delete( global_config );
++ global_config = NULL;
++ }
++
++ plugin_is_active = FALSE;
+ }
+-
++
+ return;
+ }
+
Modified: packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec
==============================================================================
--- packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec
(original)
+++ packages/cooker/audacious-plugins/current/SPECS/audacious-plugins.spec
Mon Feb 12 17:23:05 2007
@@ -2,7 +2,7 @@
%define svn 0
%define pre alpha4
%if %pre
-%define release %mkrel 0.%pre.2
+%define release %mkrel 0.%pre.3
%define fname %name-%version-%pre
%else
%define fname %name-%version
@@ -20,6 +20,7 @@
Release: %release
Epoch: 3
Source0: http://audacious-media-player.org/release/%fname.tar.bz2
+Patch: audacious-plugins-1362-aosd-exit.patch
Patch3: audacious-862-timidity-config.patch
Patch4: audacious-plugins-1.3.0-alpha4-fixcrash.patch
License: GPL
@@ -206,6 +207,7 @@
%else
%setup -q -n %fname
%endif
+%patch -p0
cd src
%patch3 -p3 -b .timidity
cd ..
