Fri Jun 11 18:57:35 UTC 2010

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv919

Modified Files:
	.cvsignore audacious-plugins-2.2-amidi.patch 
	audacious-plugins.spec sources 
Added Files:
	audacious-plugins-2.4-libdir.patch 
	audacious-plugins-2.4-neon-session-destroy.patch 
	audacious-plugins-2.4-projectm-includes.patch 
Removed Files:
	audacious-plugins-2.2-adplug-fclose.patch 
	audacious-plugins-2.2-alarm.patch 
	audacious-plugins-2.2-bluetooth.patch 
	audacious-plugins-2.2-cfg_db_close.patch 
	audacious-plugins-2.2-delete-ui-state_cb.patch 
	audacious-plugins-2.2-g_markup.patch 
	audacious-plugins-2.2-jack.patch 
	audacious-plugins-2.2-ladspa.patch 
	audacious-plugins-2.2-neon-error-handling.patch 
	audacious-plugins-2.2-neon-request.patch 
	audacious-plugins-2.2-neon-session-destroy.patch 
	audacious-plugins-2.2-no-adplugdb.patch 
	audacious-plugins-2.2-playlist-font-safety.patch 
	audacious-plugins-2.2-scrobbler.patch 
	audacious-plugins-2.2-status.patch 
	audacious-plugins-2.2-streambrowser-race.patch 
	audacious-plugins-2.2-streambrowser-url-add.patch 
	audacious-plugins-2.2-svis_expose.patch 
	audacious-plugins-2.2-tmp-vuln.patch 
	audacious-plugins-2.2-ui_vis.patch 
	audacious-plugins-2.2-xspf-base.patch 
Log Message:
* Wed Jun  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.1.alpha1
- No longer available:
   * scrobbler/last.fm plugin (AUDPLUG-179)
   * icecast plugin (AUDPLUG-156)
- Add BR libprojectM-devel, gtkglext-devel, libbs2b-devel
- Merge WavPack plugin into base -plugins package.
- Remove obsolete --disable-libmadtest configure option.
- Remove Provides/Obsoletes for old audacious-plugins-pulseaudio package,
  which were last in Fedora 8.
- Upgrade to 2.4 alpha1.


audacious-plugins-2.4-libdir.patch:
 ladspa.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.4-libdir.patch ---
diff -Nur audacious-plugins-2.4-alpha1-orig/src/ladspa/ladspa.c audacious-plugins-2.4-alpha1/src/ladspa/ladspa.c
--- audacious-plugins-2.4-alpha1-orig/src/ladspa/ladspa.c	2010-06-08 16:00:01.000000000 +0200
+++ audacious-plugins-2.4-alpha1/src/ladspa/ladspa.c	2010-06-11 19:48:21.000000000 +0200
@@ -224,8 +224,8 @@
     if (ladspa_path == NULL)
     {
 	/* Fallback, look in obvious places */
-	find_plugins("/usr/lib/ladspa");
-	find_plugins("/usr/local/lib/ladspa");
+	find_plugins("__RPM_LIBDIR__/ladspa");
+	find_plugins("/usr/local/__RPM_LIB__/ladspa");
     }
     else
     {

audacious-plugins-2.4-neon-session-destroy.patch:
 neon.c |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

--- NEW FILE audacious-plugins-2.4-neon-session-destroy.patch ---
It's just bad to de-couple state and NULL ptrs.

diff -Nur audacious-plugins-2.4-alpha1-orig/src/neon/neon.c audacious-plugins-2.4-alpha1/src/neon/neon.c
--- audacious-plugins-2.4-alpha1-orig/src/neon/neon.c	2010-06-08 16:00:01.000000000 +0200
+++ audacious-plugins-2.4-alpha1/src/neon/neon.c	2010-06-11 20:07:22.000000000 +0200
@@ -702,11 +702,13 @@
             return 0;
         } else if (-1 == ret) {
             ne_session_destroy(handle->session);
+            handle->session = NULL;
             return -1;
         }
 
         _DEBUG("<%p> Following redirect...", handle);
         ne_session_destroy(handle->session);
+        handle->session = NULL;
     }
 
     /*
@@ -878,7 +880,9 @@
     }
 
     _DEBUG("<%p> Destroying session", h);
-    ne_session_destroy(h->session);
+    if (NULL != h->session) {
+        ne_session_destroy(h->session);
+    }
 
     handle_free(h);
 
@@ -1270,7 +1274,10 @@
     if (NULL != h->request) {
         ne_request_destroy(h->request);
     }
-    ne_session_destroy(h->session);
+    if (NULL != h->session) {
+        ne_session_destroy(h->session);
+        h->session = NULL;
+    }
     reset_rb(&h->rb);
 
     if (0 != open_handle(h, newpos)) {

audacious-plugins-2.4-projectm-includes.patch:
 gtk_projectm_impl.cxx |    1 +
 1 file changed, 1 insertion(+)

--- NEW FILE audacious-plugins-2.4-projectm-includes.patch ---
diff -Nur audacious-plugins-fedora-2.4-alpha1-orig/src/projectm-1.0/gtk_projectm_impl.cxx audacious-plugins-fedora-2.4-alpha1/src/projectm-1.0/gtk_projectm_impl.cxx
--- audacious-plugins-fedora-2.4-alpha1-orig/src/projectm-1.0/gtk_projectm_impl.cxx	2010-06-08 16:00:01.000000000 +0200
+++ audacious-plugins-fedora-2.4-alpha1/src/projectm-1.0/gtk_projectm_impl.cxx	2010-06-11 20:33:56.000000000 +0200
@@ -13,6 +13,7 @@
 #include <stdlib.h>
 #include <unistd.h>
 #include <fcntl.h>
+#include <sys/stat.h>
 #include <gtk/gtk.h>
 #include <gtk/gtkgl.h>
 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/.cvsignore,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -p -r1.22 -r1.23
--- .cvsignore	25 Nov 2009 14:51:24 -0000	1.22
+++ .cvsignore	11 Jun 2010 18:57:34 -0000	1.23
@@ -1 +1 @@
-audacious-plugins-fedora-2.2.tar.bz2
+audacious-plugins-fedora-2.4-alpha1.tar.bz2

audacious-plugins-2.2-amidi.patch:
 i_midi.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

Index: audacious-plugins-2.2-amidi.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins-2.2-amidi.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- audacious-plugins-2.2-amidi.patch	31 May 2010 10:26:48 -0000	1.2
+++ audacious-plugins-2.2-amidi.patch	11 Jun 2010 18:57:34 -0000	1.3
@@ -1,27 +1,3 @@
-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/src/amidi-plug/i_midi.c	2010-05-31 12:17:20.000000000 +0200


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/audacious-plugins.spec,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -p -r1.117 -r1.118
--- audacious-plugins.spec	7 Jun 2010 17:26:36 -0000	1.117
+++ audacious-plugins.spec	11 Jun 2010 18:57:35 -0000	1.118
@@ -1,82 +1,46 @@
 # Minimum audacious/audacious-plugins version in inter-package
 # dependencies.
-# We need 2.2 as 2.1 is insufficient.
-%define aud_ver 2.2
+# We need 2.4 as 2.2 is insufficient.
+%define aud_ver 2.4
 
 Name: audacious-plugins
-Version: 2.2
-Release: 34%{?dist}
+Version: 2.4
+Release: 0.1.alpha1%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
 
 # LGPLv2+: adplug, bio2jack, rocklight
 # MIT: crystalizer, dockalbumart
-# BSD: lastfm
-License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and BSD and GPLv3
+# BSD: scrobbler/lastfm (removed pre-2.4-alpha1)
+License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and GPLv3
 
 # Modified source tarball to remove problematic files.
-# Removed: aac madplug
+# Removed: aac
 # Disabled via options where possible, see %%build.
-Source0: audacious-plugins-fedora-%{version}.tar.bz2
-#Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
+Source0: audacious-plugins-fedora-%{version}-alpha1.tar.bz2
+#Source0: http://distfiles.atheme.org/audacious-plugins-%{version}-alpha1.tgz
 Source1: audacious-sid.desktop
 
 Patch0: audacious-plugins-2.0.1-xmms-skindir.patch
-# obsolete with version upgrade: declaration conflict for jack_free
-Patch1: audacious-plugins-2.2-jack.patch
-# merged upstream
-Patch2: audacious-plugins-2.2-neon-request.patch
-# merged upstream
-Patch3: audacious-plugins-2.2-cfg_db_close.patch
-# merged upstream
-Patch4: audacious-plugins-2.2-bluetooth.patch
-# merged upstream
-Patch5: audacious-plugins-2.2-alarm.patch
-# obsolete with version upgrade (AUDPLUG-159), but recheck that XMP's plugin
-# no longer manages to insert non-URI filenames into the playlist
-Patch6: audacious-plugins-2.2-xspf-base.patch
-# merged upstream (AUDPLUG-160)
-Patch7: audacious-plugins-2.2-svis_expose.patch
-#
-Patch8: audacious-plugins-2.2-neon-session-destroy.patch
-# obsolete with version upgrade
-Patch9: audacious-plugins-2.2-adplug-fclose.patch
-#
-Patch10: audacious-plugins-2.2-adplug-lds.patch
-# reported upstream (AUDPLUG-180), as a rewrite of the plugin
-# would be better
-Patch11: audacious-plugins-2.2-streambrowser-race.patch
-# huh? AUDPLUG-161 / bz561635
-# plus: hardcoded libdir replacement
-# plus: fix dialogs (merged upstream)
-Patch12: audacious-plugins-2.2-ladspa.patch
-# merged upstream (request destroy+NULL only, the important half)
-Patch13: audacious-plugins-2.2-neon-error-handling.patch
-# revised version merged upstream
-Patch14: audacious-plugins-2.2-tmp-vuln.patch
-#
-Patch15: audacious-plugins-2.2-streambrowser-url-add.patch
-#
-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
-Patch19: audacious-plugins-2.2-playlist-font-safety.patch
+# fix hardcoded libdir replacement
+Patch1: audacious-plugins-2.4-libdir.patch
+# additional safety not merged upstream with neon patches
+Patch2: audacious-plugins-2.4-neon-session-destroy.patch
+# submitted: AUDPLUG-237
+Patch3: audacious-plugins-2.2-adplug-lds.patch
 # 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
+# submitted: AUDPLUG-238
+# modified patch file vs. F-13
+Patch4: audacious-plugins-2.2-amidi.patch
+# submitted upstream
+Patch5: audacious-plugins-2.4-projectm-includes.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
-BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
+BuildRequires: gettext
+BuildRequires: desktop-file-utils
+BuildRequires: jack-audio-connection-kit-devel
+BuildRequires: libsamplerate-devel
 BuildRequires: alsa-lib-devel
 BuildRequires: pulseaudio-libs-devel
 BuildRequires: esound-devel
@@ -86,20 +50,17 @@ BuildRequires: libsidplay-devel
 BuildRequires: libogg-devel libvorbis-devel
 BuildRequires: flac-devel
 BuildRequires: fluidsynth-devel
-BuildRequires: libshout-devel
-BuildRequires: curl-devel
 BuildRequires: libbinio-devel
 BuildRequires: libcdio-devel
 BuildRequires: libcue-devel
 BuildRequires: SDL-devel
 BuildRequires: lirc-devel
 BuildRequires: bluez-libs-devel
-BuildRequires: libXcomposite-devel
 BuildRequires: libcddb-devel
 BuildRequires: libmtp-devel
 BuildRequires: libxml2-devel
-BuildRequires: gettext
-BuildRequires: desktop-file-utils
+BuildRequires: libprojectM-devel gtkglext-devel
+BuildRequires: libbs2b-devel
 
 # experimental, disabled by default
 BuildRequires: neon-devel
@@ -107,19 +68,22 @@ BuildRequires: neon-devel
 Requires: audacious >= %{aud_ver}
 
 # temporarily till that upgrade is marked stable
-Requires: alsa-lib >= 1.0.22
+# Available: F11 updates, F12 updates
+#Requires: alsa-lib >= 1.0.22
 
-# last in 1.5.1
+# last in 1.5.1, tagged dist-f11-updates
 Obsoletes: audacious-plugins-arts
 
-# last tagged f8-final
-Obsoletes: audacious-plugins-pulseaudio <= 1.3.5
-Provides: audacious-plugins-pulseaudio = %{version}
-
+# last tagged dist-f12-updates
 # obsolete old subpackage -- no reason to split this off
 Obsoletes: audacious-plugins-metronome < 2.2-2
 Provides: audacious-plugins-metronome = %{version}-%{release}
 
+# last tagged dist-f13-updates
+# obsolete old subpackage -- no reason to split this off
+Obsoletes: audacious-plugins-wavpack < 2.4
+Provides: audacious-plugins-wavpack = %{version}-%{release}
+
 
 %description
 Audacious is a media player that currently uses a skinned user interface
@@ -134,8 +98,6 @@ visualization.
 %package jack
 Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
-# ancient
-#Obsoletes: audacious-jack <= 1.1.2
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description jack
@@ -146,8 +108,6 @@ Jack Audio Connection Kit (JACK) sound s
 %package esd
 Summary: Audacious output plugin for EsounD service
 Group: Applications/Multimedia
-# ancient
-#Obsoletes: audacious-esd <= 1.1.2
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description esd
@@ -179,16 +139,6 @@ This build of the plugin uses libsidplay
 providers may build it with libsidplay 2.
 
 
-%package wavpack
-Summary: Audacious input plugin for WavPack compressed files
-Group: Applications/Multimedia
-Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
-
-%description wavpack
-This package provides an Audacious input plugin that reads WavPack
-compressed files.
-
-
 %package vortex
 Summary: Audacious input plugin for Vortex format files
 Group: Applications/Multimedia
@@ -201,31 +151,13 @@ in Vortex (.vtx) format.
 
 
 %prep
-%setup -q -n audacious-plugins-fedora-%{version}
+%setup -q -n audacious-plugins-fedora-%{version}-alpha1
 %patch0 -p1 -b .xmms-skindir
-%patch1 -p1 -b .jack
-%patch2 -p1 -b .neon-request
-%patch3 -p1 -b .cfg_db_close
-%patch4 -p1 -b .bluetooth
-%patch5 -p1 -b .alarm
-%patch6 -p1 -b .xspf
-%patch7 -p1 -b .svis_expose
-%patch8 -p1 -b .neon-session-destroy
-%patch9 -p1 -b .adplug-fclose
-%patch10 -p1 -b .lds-out-of-bounds
-%patch11 -p1 -b .streambrowser-race
-%patch12 -p1 -b .ladspa
-%patch13 -p1 -b .neon-error-handling
-%patch14 -p1 -b .tmp-vuln
-%patch15 -p1 -b .streambrowser-url-add
-%patch16 -p1 -b .scrobbler
-%patch17 -p1 -b .status
-%patch18 -p1 -b .no-adplugdb
-%patch19 -p1 -b .playlist-font-safety
-%patch20 -p1 -b .amidi
-%patch21 -p1 -b .ui_vis
-%patch22 -p1 -b .g_markup
-%patch23 -p1 -b .delete-ui-state_cb
+%patch1 -p1 -b .libdir
+%patch2 -p1 -b .neon-session-destroy
+%patch3 -p1 -b .lds-out-of-bounds
+%patch4 -p1 -b .amidi
+%patch5 -p1 -b .projectm-includes
 
 for i in src/ladspa/ladspa.c
 do
@@ -248,7 +180,6 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --disable-ffaudio  \
     --disable-mp3  \
     --disable-mms  \
-    --disable-libmadtest  \
     \
     --disable-oss  \
     --disable-projectm  \
@@ -291,7 +222,6 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/audacious/Transport/
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
-%exclude %{_libdir}/audacious/Input/wavpack.so
 %exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Input/vtx.so
 %exclude %{_libdir}/audacious/Output/jackout.so
@@ -316,16 +246,23 @@ update-desktop-database &> /dev/null || 
 %{_libdir}/audacious/Input/sid.so
 %{_datadir}/applications/audacious-sid.desktop
 
-%files wavpack
-%defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wavpack.so
-
 %files vortex
 %defattr(-,root,root,-)
 %{_libdir}/audacious/Input/vtx.so
 
 
 %changelog
+* Wed Jun  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 2.4-0.1.alpha1
+- No longer available:
+   * scrobbler/last.fm plugin (AUDPLUG-179)
+   * icecast plugin (AUDPLUG-156)
+- Add BR libprojectM-devel, gtkglext-devel, libbs2b-devel
+- Merge WavPack plugin into base -plugins package.
+- Remove obsolete --disable-libmadtest configure option.
+- Remove Provides/Obsoletes for old audacious-plugins-pulseaudio package,
+  which were last in Fedora 8.
+- Upgrade to 2.4 alpha1.
+
 * 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).


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/devel/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -p -r1.23 -r1.24
--- sources	25 Nov 2009 14:51:25 -0000	1.23
+++ sources	11 Jun 2010 18:57:35 -0000	1.24
@@ -1 +1 @@
-6ac5463ae9b58055077c2c63583fb1fe  audacious-plugins-fedora-2.2.tar.bz2
+5332c05306584b958dc004831b490273  audacious-plugins-fedora-2.4-alpha1.tar.bz2


--- audacious-plugins-2.2-adplug-fclose.patch DELETED ---


--- audacious-plugins-2.2-alarm.patch DELETED ---


--- audacious-plugins-2.2-bluetooth.patch DELETED ---


--- audacious-plugins-2.2-cfg_db_close.patch DELETED ---


--- audacious-plugins-2.2-delete-ui-state_cb.patch DELETED ---


--- audacious-plugins-2.2-g_markup.patch DELETED ---


--- audacious-plugins-2.2-jack.patch DELETED ---


--- audacious-plugins-2.2-ladspa.patch DELETED ---


--- audacious-plugins-2.2-neon-error-handling.patch DELETED ---


--- audacious-plugins-2.2-neon-request.patch DELETED ---


--- audacious-plugins-2.2-neon-session-destroy.patch DELETED ---


--- audacious-plugins-2.2-no-adplugdb.patch DELETED ---


--- audacious-plugins-2.2-playlist-font-safety.patch DELETED ---


--- audacious-plugins-2.2-scrobbler.patch DELETED ---


--- audacious-plugins-2.2-status.patch DELETED ---


--- audacious-plugins-2.2-streambrowser-race.patch DELETED ---


--- audacious-plugins-2.2-streambrowser-url-add.patch DELETED ---


--- audacious-plugins-2.2-svis_expose.patch DELETED ---


--- audacious-plugins-2.2-tmp-vuln.patch DELETED ---


--- audacious-plugins-2.2-ui_vis.patch DELETED ---


--- audacious-plugins-2.2-xspf-base.patch DELETED ---

