Wed Dec 30 15:17:11 UTC 2009

Author: mschwendt

Update of /cvs/pkgs/rpms/audacious-plugins/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9268

Modified Files:
	.cvsignore audacious-plugins.spec sources 
Added Files:
	audacious-plugins-2.2-bluetooth.patch 
	audacious-plugins-2.2-cfg_db_close.patch 
	audacious-plugins-2.2-jack.patch 
	audacious-plugins-2.2-neon-request.patch 
Removed Files:
	audacious-plugins-1.5.1-timidity-cfg.patch 
	audacious-plugins-2.1-alsa-ng.patch 
	audacious-plugins-2.1-bluetooth.patch 
	audacious-plugins-2.1-cfg_db_close.patch 
	audacious-plugins-2.1-filewriter-dialogs.patch 
	audacious-plugins-2.1-icecast.patch 
	audacious-plugins-2.1-jack.patch 
	audacious-plugins-2.1-ladspa-backto201.patch 
	audacious-plugins-2.1-modplug.patch 
	audacious-plugins-2.1-musepack.patch 
	audacious-plugins-2.1-neon-request.patch 
	audacious-plugins-2.1-playlist-scrollbar.patch 
	audacious-plugins-2.1-pulseaudio-no-drain.patch 
	audacious-plugins-2.1-pulseaudio-volume.patch 
	audacious-plugins-2.1-sid-playfix.patch 
	audacious-plugins-2.1-sndfile-playfix.patch 
	audacious-plugins-2.1-sndstretch-dialog.patch 
	audacious-plugins-2.1-underruns.patch 
	audacious_20090702_console.diff 
Log Message:
sync with Rawhide for Audacious 2.2

audacious-plugins-2.2-bluetooth.patch:
 bluetooth.c |   28 ++++++++++++++++++++--------
 1 file changed, 20 insertions(+), 8 deletions(-)

Index: audacious-plugins-2.2-bluetooth.patch
===================================================================
RCS file: audacious-plugins-2.2-bluetooth.patch
diff -N audacious-plugins-2.2-bluetooth.patch

--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacious-plugins-2.2-bluetooth.patch	30 Dec 2009 15:17:10 -0000	1.3
@@ -0,0 +1,97 @@
+diff -Nur audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c
+--- audacious-plugins-2.2-orig/src/bluetooth/bluetooth.c	2009-11-22 23:49:52.000000000 +0100
++++ audacious-plugins-2.2-bluetooth/src/bluetooth/bluetooth.c	2009-12-19 19:48:34.000000000 +0100
+@@ -29,6 +29,7 @@
+ GList * current_device = NULL;
+ gint config = 0;
+ gint devices_no = 0;
++gboolean pcmdev_modified = FALSE;
+ GStaticMutex mutex = G_STATIC_MUTEX_INIT;
+ static gchar *current_address=NULL;
+ static GThread *connect_th;
+@@ -58,44 +59,53 @@
+ 
+ void bluetooth_init ( void )
+ {
++    bonded_dev = NULL;
++    discover_finish = 0;
++    pcmdev_modified = FALSE;
+     audio_devices = NULL;
+     bus = NULL;
+     obj = NULL;
+-    gchar* bonded_addr="zz";
++    gchar* bonded_addr = NULL;
+     discover_devices();
+     mcs_handle_t *cfgfile ;
+     cfgfile = aud_cfg_db_open();
+     if(!aud_cfg_db_get_string(cfgfile, "BLUETOOTH_PLUGIN", "bonded",
+-				  &bonded_addr))
++                              &bonded_addr)) {
++        aud_cfg_db_close(cfgfile);
+         return;
++    }
+     if(bonded_addr!=NULL && g_strcmp0(bonded_addr,"no")!=0)
+         {
+              remove_bonding(bonded_addr);
+         }
++    free(bonded_addr);
+     aud_cfg_db_close(cfgfile);
+ 
+ }
+ 
+ void bluetooth_cleanup ( void )
+ {
+-    printf("bluetooth: exit\n");
+     if (config ==1 )
+     {
+         close_window();
+         config =0;
+     }
+-    remove_bonding(bonded_dev);
++    if (bonded_dev) {
++        printf("bluetooth: exit\n");
++        remove_bonding(bonded_dev);
++    }
+     if(discover_finish == 2) {
+         dbus_g_connection_flush (bus);
+         dbus_g_connection_unref(bus);
+         disconnect_dbus_signals();
+ 
+     }
++    if (pcmdev_modified) {
+     /* switching back to default pcm device at cleanup */
+     mcs_handle_t *cfgfile = aud_cfg_db_open();
+-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "default");
++    aud_cfg_db_set_string(cfgfile,"alsa-gapless","pcm", "default");
+     aud_cfg_db_close(cfgfile);
+-
++    }
+ }
+ 
+ void bt_about( void )
+@@ -243,8 +253,9 @@
+     g_free(device_line);
+     g_free(file_name);
+     g_free(temp_file_name);
++    pcmdev_modified = TRUE;
+     mcs_handle_t *cfgfile = aud_cfg_db_open();
+-    aud_cfg_db_set_string(cfgfile,"ALSA","pcm_device", "audacious_bt");
++    aud_cfg_db_set_string(cfgfile,"alsa-gapless","pcm", "audacious_bt");
+     aud_cfg_db_close(cfgfile);
+ 
+     printf("play callback\n");
+@@ -360,12 +371,13 @@
+ {
+     GError *error = NULL;
+     //  g_type_init();
+-    g_log_set_always_fatal (G_LOG_LEVEL_WARNING);
++    /*    g_log_set_always_fatal (G_LOG_LEVEL_WARNING); */ /* too invasive */
+     bus = dbus_g_bus_get(DBUS_BUS_SYSTEM, &error);
+     if (error != NULL)
+     {
+         g_printerr("Connecting to system bus failed: %s\n", error->message);
+         g_error_free(error);
++        return;
+     }
+     obj = dbus_g_proxy_new_for_name(bus, "org.bluez", "/org/bluez/hci0", "org.bluez.Adapter");
+     printf("bluetooth plugin - start discovery \n");

audacious-plugins-2.2-cfg_db_close.patch:
 alarm/alarm.c   |    1 +
 lastfm/lastfm.c |    2 +-
 neon/neon.c     |    3 +++
 3 files changed, 5 insertions(+), 1 deletion(-)

--- NEW FILE audacious-plugins-2.2-cfg_db_close.patch ---
diff -Nur audacious-plugins-2.2-orig/src/alarm/alarm.c audacious-plugins-2.2-cfg_db_close/src/alarm/alarm.c
--- audacious-plugins-2.2-orig/src/alarm/alarm.c	2009-11-22 23:49:52.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/alarm/alarm.c	2009-12-19 19:43:39.000000000 +0100
@@ -354,6 +354,7 @@
        alarm_conf.day[daynum].min = DEFAULT_ALARM_MIN;
    }
 
+   aud_cfg_db_close(conf);
    DEBUG("END alarm_read_config\n");
 }
 
diff -Nur audacious-plugins-2.2-orig/src/lastfm/lastfm.c audacious-plugins-2.2-cfg_db_close/src/lastfm/lastfm.c
--- audacious-plugins-2.2-orig/src/lastfm/lastfm.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/lastfm/lastfm.c	2009-12-19 19:43:39.000000000 +0100
@@ -109,7 +109,7 @@
     {
         aud_cfg_db_get_string(cfg, "audioscrobbler", "username", &username);
         aud_cfg_db_get_string(cfg, "audioscrobbler", "password", &password);
-        g_free(cfg);
+        aud_cfg_db_close(cfg);
     }
     if (username != NULL && password != NULL)
     {
diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-cfg_db_close/src/neon/neon.c
--- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
+++ audacious-plugins-2.2-cfg_db_close/src/neon/neon.c	2009-12-19 19:43:39.000000000 +0100
@@ -508,6 +508,7 @@
     aud_cfg_db_get_string(db, NULL, "proxy_user", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_user", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(username, value, NE_ABUFSIZ);
@@ -516,11 +517,13 @@
     aud_cfg_db_get_string(db, NULL, "proxy_pass", &value);
     if (!value) {
         _DEBUG("<%p> proxy_auth requested but no proxy_pass", userdata);
+        aud_cfg_db_close(db);
         _LEAVE -1;
     }
     g_strlcpy(password, value, NE_ABUFSIZ);
     value = NULL;
 
+    aud_cfg_db_close(db);
     _LEAVE attempt;
 }
 

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

--- NEW FILE audacious-plugins-2.2-jack.patch ---
diff -Nur /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c audacious-plugins/src/jack/jack.c
--- /tmp/tmp.XuE20VQcQk/audacious-plugins-old/src/jack/jack.c	2009-09-11 17:27:13.000000000 +0200
+++ audacious-plugins/src/jack/jack.c	2009-11-24 19:20:15.674971400 +0100
@@ -236,7 +236,7 @@
 
 
 /* Return the amount of data that can be written to the device */
-static gint jack_free(void)
+static gint audacious_jack_free(void)
 {
   unsigned long return_val = JACK_GetBytesFreeSpace(driver);
   unsigned long tmp;
@@ -448,7 +448,7 @@
     .close_audio = jack_close,
     .flush = jack_flush,
     .pause = jack_pause,
-    .buffer_free = jack_free,
+    .buffer_free = audacious_jack_free,
     .buffer_playing = jack_playing,
     .output_time = jack_get_output_time,
     .written_time = jack_get_written_time,


audacious-plugins-2.2-neon-request.patch:
 neon.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

Index: audacious-plugins-2.2-neon-request.patch
===================================================================
RCS file: audacious-plugins-2.2-neon-request.patch
diff -N audacious-plugins-2.2-neon-request.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ audacious-plugins-2.2-neon-request.patch	30 Dec 2009 15:17:10 -0000	1.3
@@ -0,0 +1,14 @@
+diff -Nur audacious-plugins-2.2-orig/src/neon/neon.c audacious-plugins-2.2-neon/src/neon/neon.c
+--- audacious-plugins-2.2-orig/src/neon/neon.c	2009-11-22 23:49:53.000000000 +0100
++++ audacious-plugins-2.2-neon/src/neon/neon.c	2009-12-19 19:02:17.000000000 +0100
+@@ -1354,7 +1354,9 @@
+         kill_reader(h);
+     }
+ 
+-    ne_request_destroy(h->request);
++    if (NULL != h->request) {
++        ne_request_destroy(h->request);
++    }
+     ne_session_destroy(h->session);
+     reset_rb(&h->rb);
+ 


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/.cvsignore,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -p -r1.19 -r1.20
--- .cvsignore	14 Jul 2009 17:24:08 -0000	1.19
+++ .cvsignore	30 Dec 2009 15:17:10 -0000	1.20
@@ -1 +1 @@
-audacious-plugins-fedora-2.1.tar.bz2
+audacious-plugins-fedora-2.2.tar.bz2


Index: audacious-plugins.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/audacious-plugins.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -p -r1.75 -r1.76
--- audacious-plugins.spec	19 Dec 2009 18:58:38 -0000	1.75
+++ audacious-plugins.spec	30 Dec 2009 15:17:10 -0000	1.76
@@ -1,11 +1,11 @@
 # Minimum audacious/audacious-plugins version in inter-package
 # dependencies.
-# We need 2.1 as 2.0.1 is insufficient.
-%define aud_ver 2.1
+# We need 2.2 as 2.1 is insufficient.
+%define aud_ver 2.2
 
 Name: audacious-plugins
-Version: 2.1
-Release: 27%{?dist}
+Version: 2.2
+Release: 5%{?dist}
 Summary: Plugins for the Audacious media player
 Group: Applications/Multimedia
 URL: http://audacious-media-player.org/
@@ -16,41 +16,21 @@ URL: http://audacious-media-player.org/
 License: GPLv2 and GPLv2+ and LGPLv2+ and MIT and BSD
 
 # Modified source tarball to remove problematic files.
-# Removed: aac alc demac tta wma
-# Not removed (no codec included): madplug mms
+# Removed: aac madplug
 # Disabled via options where possible, see %%build.
 Source0: audacious-plugins-fedora-%{version}.tar.bz2
 #Source0: http://distfiles.atheme.org/audacious-plugins-%{version}.tgz
+Source1: audacious-sid.desktop
 
-Patch1: audacious-plugins-1.5.1-timidity-cfg.patch
-Patch2: audacious-plugins-2.0.1-xmms-skindir.patch
-Patch3: audacious-plugins-2.1-alsa-ng.patch
-Patch4: audacious-plugins-2.1-underruns.patch
-Patch5: audacious-plugins-2.1-pulseaudio-volume.patch
-Patch7: audacious-plugins-2.1-modplug.patch
-Patch8: audacious-plugins-2.1-sndfile-playfix.patch
-Patch9: audacious-plugins-2.1-filewriter-dialogs.patch
-Patch10: audacious-plugins-2.1-playlist-scrollbar.patch
-Patch11: audacious_20090702_console.diff
-Patch12: audacious-plugins-2.1-ladspa-backto201.patch
-Patch13: audacious-plugins-2.1-musepack.patch
-# merged upstream
-Patch14: audacious-plugins-2.1-sndstretch-dialog.patch
-# merged upstream: dialog fix
-# not necessary in 2.2-beta2?: crash work-around
-Patch15: audacious-plugins-2.1-icecast.patch
-# merged upstream
-Patch16: audacious-plugins-2.1-jack.patch
-# as in 2.2
-Patch17: audacious-plugins-2.1-pulseaudio-no-drain.patch
+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
 #
-Patch18: audacious-plugins-2.1-sid-playfix.patch
-#
-Patch19: audacious-plugins-2.1-neon-request.patch
+Patch2: audacious-plugins-2.2-neon-request.patch
 # submitted upstream
-Patch20: audacious-plugins-2.1-cfg_db_close.patch
-#
-Patch21: audacious-plugins-2.1-bluetooth.patch
+Patch3: audacious-plugins-2.2-cfg_db_close.patch
+# submitted upstream
+Patch4: audacious-plugins-2.2-bluetooth.patch
 
 BuildRequires: audacious-devel >= %{aud_ver}
 BuildRequires: jack-audio-connection-kit-devel libsamplerate-devel
@@ -66,11 +46,10 @@ BuildRequires: flac-devel
 BuildRequires: libmodplug-devel
 BuildRequires: fluidsynth-devel
 BuildRequires: libshout-devel
-BuildRequires: libmpcdec-devel
-BuildRequires: libtimidity-devel
 BuildRequires: curl-devel
 BuildRequires: libbinio-devel
 BuildRequires: libcdio-devel
+BuildRequires: libcue-devel
 BuildRequires: SDL-devel
 BuildRequires: lirc-devel
 BuildRequires: bluez-libs-devel
@@ -79,12 +58,16 @@ BuildRequires: libcddb-devel
 BuildRequires: libmtp-devel
 BuildRequires: libxml2-devel
 BuildRequires: gettext
+BuildRequires: desktop-file-utils
 
 # experimental, disabled by default
 BuildRequires: neon-devel
 
 Requires: audacious >= %{aud_ver}
 
+# temporarily till that upgrade is marked stable
+Requires: alsa-lib >= 1.0.22
+
 # last in 1.5.1
 Obsoletes: audacious-plugins-arts
 
@@ -92,16 +75,23 @@ Obsoletes: audacious-plugins-arts
 Obsoletes: audacious-plugins-pulseaudio <= 1.3.5
 Provides: audacious-plugins-pulseaudio = %{version}
 
+# obsolete old subpackage -- no reason to split this off
+Obsoletes: audacious-plugins-metronome < 2.2-2
+Provides: audacious-plugins-metronome = %{version}-%{release}
+
+
 %description
 Audacious is a media player that currently uses a skinned user interface
-based on Winamp 2.x skins. It is based on ("forked off") BMP.
+(based on Winamp 2.x skins) as well as a separate GTK2 based front end.
+Historically, it started as a fork of Beep Media Player (BMP), which
+itself forked from XMMS.
 
 This package provides essential plugins for audio input, audio output and
 visualization.
 
 
 %package jack
-Summary: Audacious output plugin for JACK sound service
+Summary: Audacious output plugin for Jack Audio Connection Kit
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-jack <= 1.1.2
@@ -109,11 +99,11 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description jack
 This package provides an Audacious output plugin that uses the
-JACK sound service.
+Jack Audio Connection Kit (JACK) sound service.
 
 
 %package esd
-Summary: Audacious output plugin for esd sound service
+Summary: Audacious output plugin for EsounD service
 Group: Applications/Multimedia
 # ancient
 #Obsoletes: audacious-esd <= 1.1.2
@@ -121,76 +111,61 @@ Requires: audacious >= %{aud_ver}, audac
 
 %description esd
 This package provides an Audacious output plugin that uses the
-ESD sound server.
+EsounD service.
 
 
 %package amidi
-Summary: Audacious input plugin for amidi
+Summary: Audacious input plugin for MIDI
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description amidi
-This package provides an Audacious input plugin that uses the
-amidi sound service.
+This package provides AMIDI-Plug, a modular MIDI music player, as an
+input plugin for Audacious.
 
 
-
-%package wavpack
-Summary: Audacious input plugin for wavpack
+%package sid
+Summary: Audacious input plugin for SID music files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
+Requires(post): desktop-file-utils
+Requires(postun): desktop-file-utils
 
-%description wavpack
-This package provides an Audacious input plugin that reads WavPack
-compressed files.
+%description sid
+This package provides an Audacious input plugin for SID music files.
 
+This build of the plugin uses libsidplay 1. 3rd party package
+providers may build it with libsidplay 2.
 
 
-%package metronome
-Summary: Audacious input plugin simulating a metronome
+%package wavpack
+Summary: Audacious input plugin for WavPack compressed files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
-%description metronome
-This package provides an Audacious input plugin that simulates
-a metronome.
-
+%description wavpack
+This package provides an Audacious input plugin that reads WavPack
+compressed files.
 
 
 %package vortex
-Summary: Audacious input plugin for vortex audio files
+Summary: Audacious input plugin for Vortex format files
 Group: Applications/Multimedia
 Requires: audacious >= %{aud_ver}, audacious-plugins >= %{aud_ver}
 
 %description vortex
-This package provides an Audacious input plugin that reads
-vortex compressed files.
+This package provides an Audacious input plugin that reads files
+in Vortex (.vtx) format.
 
 
 
 %prep
 %setup -q -n audacious-plugins-fedora-%{version}
-
-%patch1 -p1 -b .timidity-cfg
-%patch2 -p1 -b .xmms-skindir
-%patch3 -p1 -b .alsa-ng
-%patch4 -p1 -b .underruns
-%patch5 -p1 -b .pulseaudio-volume
-%patch7 -p1 -b .modplug
-%patch8 -p1 -b .sndfile-playfix
-%patch9 -p1 -b .filewriter-dialogs
-%patch10 -p1 -b .playlist-scrollbar
-%patch11 -p1 -b .console
-%patch12 -p1 -b .ladspa
-%patch13 -p1 -b .musepack
-%patch14 -p1 -b .sndstretch-dialog
-%patch15 -p1 -b .icecast
-%patch16 -p1 -b .jack
-%patch17 -p1 -b .no-drain
-%patch18 -p1 -b .sid-playfix
-%patch19 -p1 -b .neon-request
-%patch20 -p1 -b .cfg_db_close
-%patch21 -p1 -b .bluetooth
+%patch0 -p1 -b .xmms-skindir
+%patch1 -p1 -b .jack
+%patch2 -p1 -b .neon-request
+%patch3 -p1 -b .cfg_db_close
+%patch4 -p1 -b .bluetooth
 
 sed -i '\,^.SILENT:,d' buildsys.mk.in
 
@@ -203,11 +178,9 @@ sed -i '\,^.SILENT:,d' buildsys.mk.in
     --enable-neon  \
     \
     --disable-aac  \
-    --disable-ape  \
+    --disable-ffaudio  \
     --disable-mp3  \
     --disable-mms  \
-    --disable-tta  \
-    --disable-wma  \
     --disable-libmadtest  \
     \
     --disable-oss  \
@@ -222,12 +195,23 @@ make %{?_smp_mflags}
 rm -rf $RPM_BUILD_ROOT
 make install DESTDIR=$RPM_BUILD_ROOT INSTALL="install -p"
 %find_lang %{name}
+# audacious-sid.desktop
+desktop-file-install --vendor "" \
+    --dir ${RPM_BUILD_ROOT}%{_datadir}/applications \
+    %{SOURCE1}
 
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
 
+%post sid
+update-desktop-database &> /dev/null || :
+
+%postun sid
+update-desktop-database &> /dev/null || :
+
+
 %files -f %{name}.lang
 %defattr(-,root,root,-)
 %doc AUTHORS COPYING
@@ -241,7 +225,7 @@ rm -rf $RPM_BUILD_ROOT
 %exclude %{_libdir}/audacious/Input/amidi-plug.so
 %exclude %{_libdir}/audacious/Input/amidi-plug/
 %exclude %{_libdir}/audacious/Input/wavpack.so
-%exclude %{_libdir}/audacious/Input/metronom.so
+%exclude %{_libdir}/audacious/Input/sid.so
 %exclude %{_libdir}/audacious/Input/vtx.so
 %exclude %{_libdir}/audacious/Output/jackout.so
 %exclude %{_libdir}/audacious/Output/ESD.so
@@ -260,13 +244,14 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/audacious/Input/amidi-plug.so
 %{_libdir}/audacious/Input/amidi-plug/
 
-%files wavpack
+%files sid
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/wavpack.so
+%{_libdir}/audacious/Input/sid.so
+%{_datadir}/applications/audacious-sid.desktop
 
-%files metronome
+%files wavpack
 %defattr(-,root,root,-)
-%{_libdir}/audacious/Input/metronom.so
+%{_libdir}/audacious/Input/wavpack.so
 
 %files vortex
 %defattr(-,root,root,-)
@@ -274,59 +259,56 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
-* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-27
+* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-5
+- Remove BR libtimidity-devel as that plugin is no longer available.
+
+* Fri Dec 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-4
+- Let bluetooth plugin access "alsa-gapless" config values not "alsa"
+  as it will be called in post-2.2.
+
+* Sat Dec 19 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-3
 - Beat bluetooth plugin a bit.
 - Fix missing aud_cfg_db_close calls.
-
-* Thu Dec 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-26
 - Avoid that neon's ne_request_destroy() is called with a NULL ptr.
 
-* Wed Dec 16 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-25
-- Patch SID plugin to remove old cruft and fix playback.
-- Don't drain in pulse_audio output plugin (2.2 doesn't do this anymore
-  either, but does it cause loud clicks'n'pops instead? Test this also
-  with 2.2).
-
-* Mon Nov 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-24
-- Merge some of the default volume level changes that went into the
-  pulse_audio output plugin in 2.2.
-- Fix musepack playback end for alsa-ng plugin.
-- Merge jack_free redeclaration fix.
-
-* Sat Nov 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-21
-- Avoid crash in unconfigured icecast effects plugin.
-- Fix non-top-level icecast plugin dialog.
-- Fix non-top-level sndstretch plugin dialog.
-
-* Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-18
-- Corrupt musepack files were able to crash Audacious.
-
-* Tue Nov 17 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-17
-- More cleanup in musepack plugin.
-
-* Fri Nov 13 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-16
-- Make musepack output time work.
-- Patch musepack plugin to remove old cruft and fix playback.
+* Wed Dec  2 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-2
+- Move SID music plugin into audacious-plugins-sid package. Its 
+  built with libsidplay 1 while 3rd party package providers may
+  build it with libsidplay 2.
+- Include metronome plugin in base plugins package. No reason to
+  split this off into an optional subpackage.
+
+* Wed Nov 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-1
+- Upgrade to 2.2 (declared as the next "stable release" after 2.1).
+- The ladspa plugin has been reworked since beta2.
+
+* Tue Nov 24 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- BR libcue-devel which is available now and is enabled by default
+  post 2.2-beta2
+- Drop --disable-tta switch as that plugin is gone.
+
+* Fri Nov 13 2009 Michael Schwendt <mschwendt at fedoraproject.org>
+- Remove BR libmpcdec-devel ("musepack" plugin is not available anymore
+  after 2.1 as it got removed in favour of "ffaudio"/ffmpeg plugin).
 
-* Sun Nov  8 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-13
+* Tue Nov 10 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.4.beta2
+- Upgrade to 2.2-beta2
 - Add patch to use old/working ladspa plugin from 2.0.1 (#533641).
-- Add patch to fix console game music emu crash (#533642).
-
-* Sun Nov  1 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-12
-- Fix playlist scrollbar page up/down click.
 
-* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-11
+* Fri Oct 30 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.4.beta1
 - Fix non-top-level filewriter plugin dialogs.
 
-* Thu Oct 29 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-10
-- Remove decode_thread from sndfile plugin to fix playback.
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.3.beta1
+- Update pulse_audio patch with correct get_song_name().
 
-* Mon Oct 26 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-9
-- Let buffer_time_min in underruns patch depend on default buffer size.
-
-* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-8
+* Sun Oct 25 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.2.beta1
 - Patch modplug plugin to remove old cruft and fix playback.
 
+* Thu Oct 22 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.beta1
+- Upgrade to 2.2-beta1
+- Port old pulse_audio plugin from Audacious 2.1
+  and patch it to fix volume issues.
+
 * Wed Oct 21 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-7
 - Patch pulseaudio plugin to not suffer from precision loss when
   calculating the volume level to save.
@@ -338,6 +320,14 @@ rm -rf $RPM_BUILD_ROOT
 - Patch pulseaudio plugin to not get confused by volume values passed
   in via callback.
 
+* Sun Oct 18 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha2
+- Upgrade to 2.2-alpha2 (breaks ALSA output with alsa-plugins-pulseaudio!)
+
+* Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.2-0.1.alpha1
+- Upgrade to 2.2-alpha1 (primarly for alsa-gapless output plugin).
+- Removes pulse_audio output plugin!
+- Obsolete patches: timidity-cfg, keep-mixer-open
+
 * Sun Sep 20 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 2.1-4
 - Patch alsa-ng plugin with some buffer prefilling to fight underruns.
 - Merge minor changes from 2.2-alpha1 alsa-ng plugin.


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/audacious-plugins/F-12/sources,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -p -r1.20 -r1.21
--- sources	14 Jul 2009 17:24:08 -0000	1.20
+++ sources	30 Dec 2009 15:17:10 -0000	1.21
@@ -1 +1 @@
-199dfef2aa2020f0405d54b67e6540f7  audacious-plugins-fedora-2.1.tar.bz2
+6ac5463ae9b58055077c2c63583fb1fe  audacious-plugins-fedora-2.2.tar.bz2


--- audacious-plugins-1.5.1-timidity-cfg.patch DELETED ---


--- audacious-plugins-2.1-alsa-ng.patch DELETED ---


--- audacious-plugins-2.1-bluetooth.patch DELETED ---


--- audacious-plugins-2.1-cfg_db_close.patch DELETED ---


--- audacious-plugins-2.1-filewriter-dialogs.patch DELETED ---


--- audacious-plugins-2.1-icecast.patch DELETED ---


--- audacious-plugins-2.1-jack.patch DELETED ---


--- audacious-plugins-2.1-ladspa-backto201.patch DELETED ---


--- audacious-plugins-2.1-modplug.patch DELETED ---


--- audacious-plugins-2.1-musepack.patch DELETED ---


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


--- audacious-plugins-2.1-playlist-scrollbar.patch DELETED ---


--- audacious-plugins-2.1-pulseaudio-no-drain.patch DELETED ---


--- audacious-plugins-2.1-pulseaudio-volume.patch DELETED ---


--- audacious-plugins-2.1-sid-playfix.patch DELETED ---


--- audacious-plugins-2.1-sndfile-playfix.patch DELETED ---


--- audacious-plugins-2.1-sndstretch-dialog.patch DELETED ---


--- audacious-plugins-2.1-underruns.patch DELETED ---


--- audacious_20090702_console.diff DELETED ---


