- up to 2.4.0

- remove libmtp.patch (corrected upstsream)
- icecast and vfstrace plugins remove upstream
- crossfade plugin moved from Output to Effect category

Changed files:
    audacious-plugins-libmtp.patch -> 1.9
    audacious-plugins-mkdir.patch -> 1.2
    audacious-plugins.spec -> 1.59

diff --git a/audacious-plugins-libmtp.patch b/audacious-plugins-libmtp.patch
deleted file mode 100644 (file)
index fd3e1a7..0000000
--- a/audacious-plugins-libmtp.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -burNp audacious-plugins-2.1/src/mtp_up/mtp.c audacious-plugins-2.1-dud/src/mtp_up/mtp.c
---- audacious-plugins-2.1/src/mtp_up/mtp.c     2009-07-07 00:40:36.000000000 +0200
-+++ audacious-plugins-2.1-dud/src/mtp_up/mtp.c 2009-08-23 13:29:56.601303553 +0200
-@@ -197,6 +197,7 @@ gint upload_file(Tuple *from_tuple)
-     g_print("Uploading track '%s'\n",filename);
- #endif
-     gentrack->parent_id = mtp_device->default_music_folder;
-+    gentrack->parent_id = parent_id;
-     ret = LIBMTP_Send_Track_From_File(mtp_device, filename , gentrack, NULL , NULL);
-     LIBMTP_destroy_track_t(gentrack);
-     if (ret == 0) 

diff --git a/audacious-plugins-mkdir.patch b/audacious-plugins-mkdir.patch
index e6f1af5c251fe22e445dd9f820d2f2c09002583c..080a1a7f70eced42e8db312969b31a8f645e7449 100644 (file)
--- a/audacious-plugins-mkdir.patch
+++ b/audacious-plugins-mkdir.patch
@@ -1,10 +1,10 @@
 --- audacious-plugins-2.3/src/projectm-1.0/gtk_projectm_impl.cxx~      2010-04-06 22:03:09.000000000 +0200
 +++ audacious-plugins-2.3/src/projectm-1.0/gtk_projectm_impl.cxx       2010-06-03 16:58:47.213077228 +0200
-@@ -13,6 +13,8 @@
+@@ -13,7 +13,8 @@
  #include <stdlib.h>
  #include <unistd.h>
  #include <fcntl.h>
-+#include <sys/stat.h>
+ #include <sys/stat.h>
 +#include <sys/types.h>
  #include <gtk/gtk.h>
  #include <gtk/gtkgl.h>

diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index f97e95c924d2c26e46c438b07e8dc7d1dc8b7c97..bca39773c172955d12d6d76e3fd6d348377c855c 100644 (file)
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -3,17 +3,16 @@
 #
 # NOTE:
 # - projectM plugin is available in two versions, building only newest
-%define                audver  2.3
+%define                audver  2.4.0
 Summary:       Plugins for Audacious media player (metapackage)
 Summary(pl.UTF-8):     Wtyczki dla odtwarzacza multimedialnego Audacious (metapakiet)
 Name:          audacious-plugins
-Version:       2.3
-Release:       5
+Version:       2.4.0
+Release:       0.1
 License:       GPL
 Group:         X11/Applications/Sound
 Source0:       http://distfiles.atheme.org/%{name}-%{version}.tgz
-# Source0-md5: de350b7612ff42e3719ae19a36389118
-Patch0:                %{name}-libmtp.patch
+# Source0-md5: fdf7d4bb660d95e90044556f12213f42
 Patch1:                %{name}-mkdir.patch
 URL:           http://audacious-media-player.org/
 # BR by visualization-projectM
@@ -26,6 +25,8 @@ BuildRequires:        automake
 BuildRequires: flac-devel >= 1.1.2
 # BR input-aac
 BuildRequires: faad2-devel
+# BR ffaudio
+BuildRequires:  ffmpeg-devel
 # BR by output-jack and input-amidi
 BuildRequires: fluidsynth-devel >= 1.0.6
 BuildRequires: gettext-devel
@@ -58,8 +59,6 @@ BuildRequires:        pango-devel >= 1.14.7
 BuildRequires: pkgconfig
 BuildRequires: pulseaudio-devel >= 0.9.9
 BuildRequires: wavpack-devel >= 4.31
-# BR by output-icecast
-BuildRequires: libshout-devel
 # BR by general-aosd (X Composite Support)
 BuildRequires: xorg-lib-libXcomposite-devel
 Requires:      audacious-container-cuesheet = %{version}-%{release}
@@ -87,7 +86,6 @@ Requires:     audacious-general-skins = %{version}-%{release}
 Requires:      audacious-general-song-change = %{version}-%{release}
 Requires:      audacious-general-statusicon = %{version}-%{release}
 Requires:      audacious-general-streambrowser = %{version}-%{release}
-Requires:      audacious-general-vfstrace = %{version}-%{release}
 Requires:      audacious-input-aac = %{version}-%{release}
 Requires:      audacious-input-adplug = %{version}-%{release}
 Requires:      audacious-input-amidi = %{version}-%{release}
@@ -107,9 +105,8 @@ Requires:   audacious-input-vtx = %{version}-%{release}
 Requires:      audacious-input-wavpack = %{version}-%{release}
 Requires:      audacious-input-xsf = %{version}-%{release}
 Requires:      audacious-output-alsa = %{version}-%{release}
-Requires:      audacious-output-crossfade = %{version}-%{release}
+Requires:      audacious-effect-crossfade = %{version}-%{release}
 Requires:      audacious-output-file = %{version}-%{release}
-Requires:      audacious-output-icecast = %{version}-%{release}
 Requires:      audacious-output-jack = %{version}-%{release}
 Requires:      audacious-output-null = %{version}-%{release}
 Requires:      audacious-output-oss = %{version}-%{release}
@@ -327,18 +324,6 @@ streambrowser plugin for Audacious media player.
 %description -n audacious-general-streambrowser -l pl.UTF-8
 Wtyczka streambrowser dla odtwarzacza multimedialnego Audacious.
 
-%package -n audacious-general-vfstrace
-Summary:       Audacious media player - vfstrace plugin
-Summary(pl.UTF-8):     Wtyczka vfstrace odtwarzacza multimedialnego Audacious
-Group:         X11/Applications/Sound
-Requires:      audacious = %{audver}
-
-%description -n audacious-general-vfstrace
-vfstrace plugin for Audacious media player.
-
-%description -n audacious-general-vfstrace -l pl.UTF-8
-Wtyczka vfstrace dla odtwarzacza multimedialnego Audacious.
-
 %package -n audacious-general-evdev
 Summary:       Audacious media player - evdev plugin
 Summary(pl.UTF-8):     Wtyczka evdev odtwarzacza multimedialnego Audacious
@@ -681,18 +666,19 @@ Output ALSA plugin for Audacious media player.
 %description -n audacious-output-alsa -l pl.UTF-8
 Wtyczka wyjściowa ALSA dla odtwarzacza multimedialnego Audacious.
 
-%package -n audacious-output-crossfade
+%package -n audacious-effect-crossfade
 Summary:       Audacious media player - crossfade output plugin
 Summary(pl.UTF-8):     Wtyczka wyjściowa crossfade odtwarzacza multimedialnego Audacious
 Group:         X11/Applications/Sound
 Requires:      audacious = %{audver}
-Provides:      audacious-output-plugin
+Provides:      audacious-output-effect
+Obsoletes:     audacious-output-effect
 
-%description -n audacious-output-crossfade
-Output crossfade plugin for Audacious media player.
+%description -n audacious-effect-crossfade
+Crossfade plugin for Audacious media player.
 
-%description -n audacious-output-crossfade -l pl.UTF-8
-Wtyczka wyjściowa crossfade dla odtwarzacza multimedialnego Audacious.
+%description -n audacious-effect-crossfade -l pl.UTF-8
+Wtyczka crossfade dla odtwarzacza multimedialnego Audacious.
 
 %package -n audacious-output-file
 Summary:       Audacious media player - file-writer output plugin
@@ -708,19 +694,6 @@ Output file-writer plugin for Audacious media player.
 Wtyczka wyjściowa zapisu do pliku dla odtwarzacza multimedialnego
 Audacious.
 
-%package -n audacious-output-icecast
-Summary:       Audacious media player - icecast output plugin
-Summary(pl.UTF-8):     Wtyczka wyjściowa icecast odtwarzacza multimedialnego Audacious
-Group:         X11/Applications/Sound
-Requires:      audacious = %{audver}
-Provides:      audacious-output-plugin
-
-%description -n audacious-output-icecast
-Output icecast plugin for Audacious media player.
-
-%description -n audacious-output-icecast -l pl.UTF-8
-Wtyczka wyjściowa icecast dla odtwarzacza multimedialnego Audacious.
-
 %package -n audacious-output-jack
 Summary:       Audacious media player - JACK output plugin
 Summary(pl.UTF-8):     Wtyczka wyjściowa JACK odtwarzacza multimedialnego Audacious
@@ -890,7 +863,6 @@ Wtyczka graficzna Spectrum dla odtwarzacza multimedialnego Audacious.
 
 %prep
 %setup -q
-%patch0 -p1
 %patch1 -p1
 
 %build
@@ -989,10 +961,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/General/streambrowser.so
 
-%files -n audacious-general-vfstrace
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/General/vfstrace.so
-
 %files -n audacious-general-evdev
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/General/evdev-plug.so
@@ -1104,13 +1072,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/Output/alsa.so
 
-%files -n audacious-output-crossfade
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/Output/crossfade.so
-
-%files -n audacious-output-icecast
+%files -n audacious-effect-crossfade
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/Output/icecast.so
+%attr(755,root,root) %{_libdir}/audacious/Effect/crossfade.so
 
 %files -n audacious-output-file
 %defattr(644,root,root,755)