- being upgrade to 3.3.1

- remove obsoleted mtp_up, null and oss plugins
- sndstretch replaced with speed-pitch
- smb transport provided by gio plugin

diff --git a/audacious-plugins-verbose_make.patch b/audacious-plugins-verbose_make.patch
index 3126ed8097d91fc3587787fc7327bb735d55897b..c8f1824f3fba0198fac9fa0c6c181068e213c863 100644 (file)
--- a/audacious-plugins-verbose_make.patch
+++ b/audacious-plugins-verbose_make.patch
@@ -8,53 +8,53 @@
  .SUFFIXES:
  .SUFFIXES: .beam .c .c.dep .cc .cc.dep .cxx .cxx.dep .d .erl .lib.o .mo .m .m.dep .mm .mm.dep .o .plugin.o .po .py .pyc .xpm .S .S.dep
  .PHONY: all subdirs pre-depend depend install install-extra uninstall uninstall-extra clean distclean locales
-@@ -564,27 +563,27 @@
+@@ -714,27 +714,27 @@
                fi \
        done
  
--DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit 1
--DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit 1
+-DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6@Entering directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd $$i || exit $$?
+-DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6@Leaving directory @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF6@.@TERM_SGR0@\n"; cd .. || exit $$?
 -DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3@Generating dependencies...@TERM_SGR0@\r"
 -DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully generated dependencies.@TERM_SGR0@\n"
--DEPEND_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit 1
+-DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
 -COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
 -COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
--COMPILE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1
+-COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
 -COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)...@TERM_SGR0@\r"
 -COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib).@TERM_SGR0@\n"
--COMPILE_LIB_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit 1
+-COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
 -COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3@Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)...@TERM_SGR0@\r"
 -COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin).@TERM_SGR0@\n"
--COMPILE_PLUGIN_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit 1
+-COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
 -LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3@Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
 -LINK_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
--LINK_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1
+-LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
 -INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3@Installing @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF3@...@TERM_SGR0@\r"
 -INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2@Successfully installed @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF2@.@TERM_SGR0@\n"
--INSTALL_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1
+-INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to install @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
 -DELETE_OK = printf "@TERM_EL@@TERM_SETAF4@Deleted @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF4@.@TERM_SGR0@\n"
--DELETE_FAILED = printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit 1
-+DIR_ENTER = printf "Entering directory $$i.\n"; cd $$i || exit 1
-+DIR_LEAVE = printf "Leaving directory $$i.\n"; cd .. || exit 1
+-DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1@Failed to delete @TERM_BOLD@$$i@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
++DIR_ENTER = printf "Entering directory $$i.\n"; cd $$i || exit $$?
++DIR_LEAVE = printf "Leaving directory $$i.\n"; cd .. || exit $$?
 +DEPEND_STATUS = printf "Generating dependencies...\r"
 +DEPEND_OK = printf "Successfully generated dependencies.\n"
-+DEPEND_FAILED = printf "Failed to generate dependencies!\n"; exit 1
++DEPEND_FAILED = err=$$?; printf "Failed to generate dependencies!\n"; exit $$err
 +COMPILE_STATUS = printf "Compiling $<...\r"
 +COMPILE_OK = printf "Successfully compiled $<.\n"
-+COMPILE_FAILED = printf "Failed to compile $<!\n"; exit 1
++COMPILE_FAILED = err=$$?; printf "Failed to compile $<!\n"; exit $$err
 +COMPILE_LIB_STATUS = printf "Compiling $< (lib)...\r"
 +COMPILE_LIB_OK = printf "Successfully compiled $< (lib).\n"
-+COMPILE_LIB_FAILED = printf "Failed to compile $< (lib)!\n"; exit 1
++COMPILE_LIB_FAILED = err=$$?; printf "Failed to compile $< (lib)!\n"; exit $$err
 +COMPILE_PLUGIN_STATUS = printf "Compiling $< (plugin)...\r"
 +COMPILE_PLUGIN_OK = printf "Successfully compiled $< (plugin).\n"
-+COMPILE_PLUGIN_FAILED = printf "Failed to compile $< (plugin)!\n"; exit 1
++COMPILE_PLUGIN_FAILED = err=$$?; printf "Failed to compile $< (plugin)!\n"; exit $$err
 +LINK_STATUS = printf "Linking $@...\r"
 +LINK_OK = printf "Successfully linked $@.\n"
-+LINK_FAILED = printf "Failed to link $@!\n"; exit 1
++LINK_FAILED = err=$$?; printf "Failed to link $@!\n"; exit $$err
 +INSTALL_STATUS = printf "Installing $$i...\r"
 +INSTALL_OK = printf "Successfully installed $$i.\n"
-+INSTALL_FAILED = printf "Failed to install $$i!\n"; exit 1
++INSTALL_FAILED = err=$$?; printf "Failed to install $$i!\n"; exit $$err
 +DELETE_OK = printf "Deleted $$i.\n"
-+DELETE_FAILED = printf "Failed to delete $$i!\n"; exit 1
++DELETE_FAILED = err=$$?; printf "Failed to delete $$i!\n"; exit $$err
  
  include .deps

diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index a90e899c8126e6e168034a7d8188273200f05a2d..23af27d88ec1dbf0af45f6ebc174dcc5761dc393 100644 (file)
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -3,16 +3,16 @@
 # - build oss4 plugin
 # - sort subpackages
 #
-%define                audver  3.2.4
+%define                audver  3.3.1
 Summary:       Plugins for Audacious media player (metapackage)
 Summary(pl.UTF-8):     Wtyczki dla odtwarzacza multimedialnego Audacious (metapakiet)
 Name:          audacious-plugins
-Version:       3.2.4
-Release:       1
+Version:       3.3.1
+Release:       0.1
 License:       GPL
 Group:         X11/Applications/Sound
 Source0:       http://distfiles.audacious-media-player.org/%{name}-%{version}.tar.bz2
-# Source0-md5: c54d998fc280d83286fb637294723717
+# Source0-md5: cc8c6b035279d6ef976bc7775881b42a
 Patch0:                %{name}-verbose_make.patch
 URL:           http://audacious-media-player.org/
 BuildRequires: SDL-devel >= 1.2.11
@@ -79,7 +79,7 @@ Requires:     audacious-effect-echo = %{version}-%{release}
 Requires:      audacious-effect-ladspa = %{version}-%{release}
 Requires:      audacious-effect-mixer = %{version}-%{release}
 Requires:      audacious-effect-resample = %{version}-%{release}
-Requires:      audacious-effect-sndstretch = %{version}-%{release}
+Requires:      audacious-effect-speed-pitch = %{version}-%{release}
 Requires:      audacious-effect-stereo = %{version}-%{release}
 Requires:      audacious-effect-voice_removal = %{version}-%{release}
 Requires:      audacious-general-alarm = %{version}-%{release}
@@ -91,7 +91,6 @@ Requires:     audacious-general-gtkui = %{version}-%{release}
 Requires:      audacious-general-hotkey = %{version}-%{release}
 Requires:      audacious-general-lyricwiki = %{version}-%{release}
 Requires:      audacious-general-mpris2 = %{version}-%{release}
-Requires:      audacious-general-mtp_up = %{version}-%{release}
 Requires:      audacious-general-notify = %{version}-%{release}
 Requires:      audacious-general-scrobbler = %{version}-%{release}
 Requires:      audacious-general-search-tool = %{version}-%{release}
@@ -119,14 +118,11 @@ Requires: audacious-input-xsf = %{version}-%{release}
 Requires:      audacious-output-alsa = %{version}-%{release}
 Requires:      audacious-output-file = %{version}-%{release}
 Requires:      audacious-output-jack = %{version}-%{release}
-Requires:      audacious-output-null = %{version}-%{release}
-Requires:      audacious-output-oss = %{version}-%{release}
 Requires:      audacious-output-pulseaudio = %{version}-%{release}
 Requires:      audacious-output-sdlout = %{version}-%{release}
 Requires:      audacious-transport-gio = %{version}-%{release}
 Requires:      audacious-transport-mms = %{version}-%{release}
 Requires:      audacious-transport-neon = %{version}-%{release}
-Requires:      audacious-transport-smb = %{version}-%{release}
 Requires:      audacious-transport-unix_io = %{version}-%{release}
 Requires:      audacious-visualization-blur-scope = %{version}-%{release}
 Requires:      audacious-visualization-cairo-spectrum = %{version}-%{release}
@@ -260,23 +256,22 @@ Wtyczka ladspa dla odtwarzacza multimedialnego Audacious.
 
 %package -n audacious-effect-resample
 Summary:       Audacious media player - sample rate converter plugin
+License:       BSD
 Group:         X11/Applications/Sound
 Requires:      audacious = %{audver}
 
 %description -n audacious-effect-resample
 sample rate converter plugin for Audacious media player.
 
-%package -n audacious-effect-sndstretch
-Summary:       Audacious media player - sndstretch plugin
-Summary(pl.UTF-8):     Wtyczka sndstretch odtwarzacza multimedialnego Audacious
+%package -n audacious-effect-speed-pitch
+Summary:       Audacious media player - speed change plugin
+License:       BSD
 Group:         X11/Applications/Sound
 Requires:      audacious = %{audver}
+Obsoletes:     audacious-effect-sndstretch
 
-%description -n audacious-effect-sndstretch
-sndstretch plugin for Audacious media player.
-
-%description -n audacious-effect-sndstretch -l pl.UTF-8
-Wtyczka sndstretch dla odtwarzacza multimedialnego Audacious.
+%description -n audacious-effect-speed-pitch
+speed change plugin for Audacious media player.
 
 %package -n audacious-effect-stereo
 Summary:       Audacious media player - stereo plugin
@@ -430,18 +425,6 @@ mpris2 plugin for Audacious media player.
 %description -n audacious-general-mpris2 -l pl.UTF-8
 Wtyczka mpris2 dla odtwarzacza multimedialnego Audacious.
 
-%package -n audacious-general-mtp_up
-Summary:       Audacious media player - mtp_up plugin
-Summary(pl.UTF-8):     Wtyczka mtp_up odtwarzacza multimedialnego Audacious
-Group:         X11/Applications/Sound
-Requires:      audacious = %{audver}
-
-%description -n audacious-general-mtp_up
-mtp_up plugin for Audacious media player.
-
-%description -n audacious-general-mtp_up -l pl.UTF-8
-Wtyczka mtp_up dla odtwarzacza multimedialnego Audacious.
-
 %package -n audacious-general-notify
 Summary:       Audacious media player - notify plugin
 Summary(pl.UTF-8):     Wtyczka notify odtwarzacza multimedialnego Audacious
@@ -788,32 +771,6 @@ Output JACK plugin for Audacious media player.
 %description -n audacious-output-jack -l pl.UTF-8
 Wtyczka wyjściowa JACK dla odtwarzacza multimedialnego Audacious.
 
-%package -n audacious-output-null
-Summary:       Audacious media player - null output plugin
-Summary(pl.UTF-8):     Wtyczka wyjściowa null odtwarzacza multimedialnego Audacious
-Group:         X11/Applications/Sound
-Requires:      audacious = %{audver}
-Provides:      audacious-output-plugin
-
-%description -n audacious-output-null
-null output plugin for Audacious media player.
-
-%description -n audacious-output-null -l pl.UTF-8
-Wtyczka wyjściowa null dla odtwarzacza multimedialnego Audacious.
-
-%package -n audacious-output-oss
-Summary:       Audacious media player - OSS output plugin
-Summary(pl.UTF-8):     Wtyczka wyjściowa OSS odtwarzacza multimedialnego Audacious
-Group:         X11/Applications/Sound
-Requires:      audacious = %{audver}
-Provides:      audacious-output-plugin
-
-%description -n audacious-output-oss
-Output OSS plugin for Audacious media player.
-
-%description -n audacious-output-oss -l pl.UTF-8
-Wtyczka wyjściowa OSS dla odtwarzacza multimedialnego Audacious.
-
 %package -n audacious-output-pulseaudio
 Summary:       Audacious media player - PulseAudio output plugin
 Summary(pl.UTF-8):     Wtyczka wyjściowa PulseAudio odtwarzacza multimedialnego Audacious
@@ -850,6 +807,7 @@ Group:              X11/Applications/Sound
 Requires:      audacious = %{audver}
 Provides:      audacious-transport-stdio
 Obsoletes:     audacious-transport-stdio
+Obsoletes:     audacious-transport-smb
 
 %description -n audacious-transport-gio
 Audacious media player - gio plugin.
@@ -857,18 +815,6 @@ Audacious media player - gio plugin.
 %description -n audacious-transport-gio -l pl.UTF-8
 Wtyczka gio odtwarzacza multimedialnego Audacious.
 
-%package -n audacious-transport-smb
-Summary:       Audacious media player - smb plugin
-Summary(pl.UTF-8):     Wtyczka smb odtwarzacza multimedialnego Audacious
-Group:         X11/Applications/Sound
-Requires:      audacious = %{audver}
-
-%description -n audacious-transport-smb
-Audacious media player - smb plugin.
-
-%description -n audacious-transport-smb -l pl.UTF-8
-Wtyczka smb odtwarzacza multimedialnego Audacious.
-
 %package -n audacious-transport-mms
 Summary:       Audacious media player - MMS plugin
 Summary(pl.UTF-8):     Wtyczka MMS odtwarzacza multimedialnego Audacious
@@ -1008,9 +954,9 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/Effect/resample.so
 
-%files -n audacious-effect-sndstretch
+%files -n audacious-effect-speed-pitch
 %defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/Effect/sndstretch.so
+%attr(755,root,root) %{_libdir}/audacious/Effect/speed-pitch.so
 
 %files -n audacious-effect-stereo
 %defattr(644,root,root,755)
@@ -1066,10 +1012,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/General/mpris2.so
 
-%files -n audacious-general-mtp_up
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/General/mtp_up.so
-
 %files -n audacious-general-notify
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/General/notify.so
@@ -1181,14 +1123,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/Output/jackout.so
 
-%files -n audacious-output-null
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/Output/null.so
-
-%files -n audacious-output-oss
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/Output/OSS.so
-
 %files -n audacious-output-pulseaudio
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/Output/pulse_audio.so
@@ -1209,10 +1143,6 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/Transport/neon.so
 
-%files -n audacious-transport-smb
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/Transport/smb.so
-
 %files -n audacious-transport-unix_io
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/audacious/Transport/unix-io.so