[packages/audacious-plugins] - up to 3.10

arekm arekm at pld-linux.org
Thu Aug 9 18:11:37 CEST 2018


commit bc2eab212ff4a55cc55f90401a448c6bd12c1f93
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date:   Thu Aug 9 18:11:28 2018 +0200

    - up to 3.10

 audacious-plugins-verbose_make.patch | 135 ++++++++++++++++++++++-------------
 audacious-plugins.spec               |  30 ++------
 2 files changed, 89 insertions(+), 76 deletions(-)
---
diff --git a/audacious-plugins.spec b/audacious-plugins.spec
index 8750042..938c369 100644
--- a/audacious-plugins.spec
+++ b/audacious-plugins.spec
@@ -5,16 +5,16 @@
 %bcond_without	bs2b		# BS2B effect plugin
 %bcond_with	jack1		# use JACK 1 (0.12x) instead of JACK 2 (1.9.x)
 #
-%define		audver	3.9
+%define		audver	3.10
 Summary:	Plugins for Audacious media player (metapackage)
 Summary(pl.UTF-8):	Wtyczki dla odtwarzacza multimedialnego Audacious (metapakiet)
 Name:		audacious-plugins
-Version:	3.9
+Version:	3.10
 Release:	1
 License:	GPL v2+, LGPL v2+, GPL v3, MIT, BSD (see individual plugins)
 Group:		X11/Applications/Sound
 Source0:	http://distfiles.audacious-media-player.org/%{name}-%{version}.tar.bz2
-# Source0-md5:	fe467c4dcee8abbf571e69ed980a56b6
+# Source0-md5:	26268359f4f21171de35cc10d0545733
 Patch0:		%{name}-verbose_make.patch
 URL:		http://audacious-media-player.org/
 BuildRequires:	Qt5Core-devel >= 5
@@ -24,6 +24,7 @@ BuildRequires:	Qt5Multimedia-devel >= 5
 # audacious-qt/gl-spectrum-qt part
 BuildRequires:	Qt5OpenGL-devel >= 5
 BuildRequires:	Qt5Widgets-devel >= 5
+BuildRequires:	adplug-devel
 BuildRequires:	audacious-devel >= %{audver}
 BuildRequires:	audacious-libs-gtk-devel >= %{audver}
 BuildRequires:	audacious-libs-qt-devel >= %{audver}
@@ -42,9 +43,6 @@ BuildRequires:	alsa-lib-devel >= 1.0.16
 BuildRequires:	cairo-devel >= 1.2.4
 # general-scrobbler
 BuildRequires:	curl-devel >= 7.9.7
-# general-gnomeshortcuts
-BuildRequires:	dbus-devel >= 0.60
-BuildRequires:	dbus-glib-devel >= 0.60
 # input-flacng (>= 1.2.1), output-file (>= 1.1.3)
 BuildRequires:	flac-devel >= 1.2.1
 # input-aac
@@ -141,7 +139,6 @@ Requires:	audacious-general-alarm = %{version}-%{release}
 Requires:	audacious-general-albumart = %{version}-%{release}
 Requires:	audacious-general-aosd = %{version}-%{release}
 Requires:	audacious-general-cd-menu-items = %{version}-%{release}
-Requires:	audacious-general-gnomeshortcuts = %{version}-%{release}
 Requires:	audacious-general-hotkey = %{version}-%{release}
 Requires:	audacious-general-lirc = %{version}-%{release}
 Requires:	audacious-general-lyricwiki = %{version}-%{release}
@@ -502,21 +499,6 @@ CD menu items plugin for Audacious media player.
 Wtyczka z menu odtwarzacza CD dla odtwarzacza multimedialnego
 Audacious.
 
-%package -n audacious-general-gnomeshortcuts
-Summary:	Audacious media player - gnomeshortcuts plugin
-Summary(pl.UTF-8):	Wtyczka gnomeshortcuts dla odtwarzacza multimedialnego Audacious
-License:	GPL v2+
-Group:		X11/Applications/Sound
-Requires:	audacious = %{audver}
-Requires:	dbus >= 0.60
-Requires:	dbus-glib >= 0.60
-
-%description -n audacious-general-gnomeshortcuts
-GNOME Shortcut plugin for Audacious media player.
-
-%description -n audacious-general-gnomeshortcuts -l pl.UTF-8
-Wtyczka skrótów GNOME dla odtwarzacza multimedialnego Audacious..
-
 %package -n audacious-general-gtkui
 Summary:	Audacious media player - gtkui plugin
 Summary(pl.UTF-8):	Wtyczka gtkui dla odtwarzacza multimedialnego Audacious
@@ -1337,10 +1319,6 @@ rm -rf $RPM_BUILD_ROOT
 %doc src/cd-menu-items/LICENSE
 %attr(755,root,root) %{_libdir}/audacious/General/cd-menu-items.so
 
-%files -n audacious-general-gnomeshortcuts
-%defattr(644,root,root,755)
-%attr(755,root,root) %{_libdir}/audacious/General/gnomeshortcuts.so
-
 %files -n audacious-general-gtkui
 %defattr(644,root,root,755)
 %doc src/gtkui/LICENSE
diff --git a/audacious-plugins-verbose_make.patch b/audacious-plugins-verbose_make.patch
index c8f1824..d3c9a90 100644
--- a/audacious-plugins-verbose_make.patch
+++ b/audacious-plugins-verbose_make.patch
@@ -1,3 +1,87 @@
+--- a/m4/buildsys.m4~	2018-08-09 00:41:00.000000000 +0200
++++ b/m4/buildsys.m4	2018-08-09 17:58:09.579552969 +0200
+@@ -28,73 +28,14 @@ AC_DEFUN([BUILDSYS_INIT], [
+ 		AC_SUBST(OBJC_DEPENDS, $GOBJC)
+ 		AC_SUBST(OBJCXX_DEPENDS, $GOBJCXX)
+ 
+-		AC_PATH_PROG(TPUT, tput)
+-
+-		AS_IF([test x"$TPUT" != x""], [
+-			if x=$($TPUT el 2>/dev/null); then
+-				AC_SUBST(TERM_EL, "$x")
+-			else
+-				AC_SUBST(TERM_EL, "$($TPUT ce 2>/dev/null)")
+-			fi
+-
+-			if x=$($TPUT sgr0 2>/dev/null); then
+-				AC_SUBST(TERM_SGR0, "$x")
+-			else
+-				AC_SUBST(TERM_SGR0, "$($TPUT me 2>/dev/null)")
+-			fi
+-
+-			if x=$($TPUT bold 2>/dev/null); then
+-				AC_SUBST(TERM_BOLD, "$x")
+-			else
+-				AC_SUBST(TERM_BOLD, "$($TPUT md 2>/dev/null)")
+-			fi
+-
+-			if x=$($TPUT setaf 1 2>/dev/null); then
+-				AC_SUBST(TERM_SETAF1, "$x")
+-				AC_SUBST(TERM_SETAF2,
+-					"$($TPUT setaf 2 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF3,
+-					"$($TPUT setaf 3 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF4,
+-					"$($TPUT setaf 4 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF6,
+-					"$($TPUT setaf 6 2>/dev/null)")
+-			dnl OpenBSD seems to want 3 parameters for terminals
+-			dnl ending in -256color, but the additional two
+-			dnl parameters don't seem to do anything, so we set
+-			dnl them to 0.
+-			elif x=$($TPUT setaf 1 0 0 2>/dev/null); then
+-				AC_SUBST(TERM_SETAF1, "$x")
+-				AC_SUBST(TERM_SETAF2,
+-					"$($TPUT setaf 2 0 0 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF3,
+-					"$($TPUT setaf 3 0 0 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF4,
+-					"$($TPUT setaf 4 0 0 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF6,
+-					"$($TPUT setaf 6 0 0 2>/dev/null)")
+-			else
+-				AC_SUBST(TERM_SETAF1,
+-					"$($TPUT AF 1 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF2,
+-					"$($TPUT AF 2 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF3,
+-					"$($TPUT AF 3 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF4,
+-					"$($TPUT AF 4 2>/dev/null)")
+-				AC_SUBST(TERM_SETAF6,
+-					"$($TPUT AF 6 2>/dev/null)")
+-			fi
+-		], [
+-			AC_SUBST(TERM_EL, '\033\133K')
+-			AC_SUBST(TERM_SGR0, '\033\133m')
+-			AC_SUBST(TERM_BOLD, '\033\1331m')
+-			AC_SUBST(TERM_SETAF1, '\033\13331m')
+-			AC_SUBST(TERM_SETAF2, '\033\13332m')
+-			AC_SUBST(TERM_SETAF3, '\033\13333m')
+-			AC_SUBST(TERM_SETAF4, '\033\13334m')
+-			AC_SUBST(TERM_SETAF6, '\033\13336m')
+-		])
++			AC_SUBST(TERM_EL, '')
++			AC_SUBST(TERM_SGR0, '')
++			AC_SUBST(TERM_BOLD, '')
++			AC_SUBST(TERM_SETAF1, '')
++			AC_SUBST(TERM_SETAF2, '')
++			AC_SUBST(TERM_SETAF3, '')
++			AC_SUBST(TERM_SETAF4, '')
++			AC_SUBST(TERM_SETAF6, '')
+ 	])
+ ])
+ 
 --- audacious-plugins-2.5.0/buildsys.mk.in~	2011-04-16 18:10:09.000000000 +0200
 +++ audacious-plugins-2.5.0/buildsys.mk.in	2011-05-04 13:15:04.393333839 +0200
 @@ -93,7 +93,6 @@
@@ -8,53 +92,4 @@
  .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
-@@ -714,27 +714,27 @@
- 		fi \
- 	done
- 
--DIR_ENTER = printf "@TERM_EL@@TERM_SETAF6 at Entering directory @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n"; cd $$i || exit $$?
--DIR_LEAVE = printf "@TERM_EL@@TERM_SETAF6 at Leaving directory @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF6 at .@TERM_SGR0@\n"; cd .. || exit $$?
--DEPEND_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Generating dependencies... at TERM_SGR0@\r"
--DEPEND_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully generated dependencies. at TERM_SGR0@\n"
--DEPEND_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to generate dependencies!@TERM_SGR0@\n"; exit $$err
--COMPILE_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
--COMPILE_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
--COMPILE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--COMPILE_LIB_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (lib)... at TERM_SGR0@\r"
--COMPILE_LIB_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (lib). at TERM_SGR0@\n"
--COMPILE_LIB_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (lib)!@TERM_SGR0@\n"; exit $$err
--COMPILE_PLUGIN_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Compiling @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF3@ (plugin)... at TERM_SGR0@\r"
--COMPILE_PLUGIN_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully compiled @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF2@ (plugin). at TERM_SGR0@\n"
--COMPILE_PLUGIN_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to compile @TERM_BOLD@$<@TERM_SGR0@@TERM_SETAF1@ (plugin)!@TERM_SGR0@\n"; exit $$err
--LINK_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Linking @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
--LINK_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully linked @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
--LINK_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to link @TERM_BOLD@$@@TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--INSTALL_STATUS = printf "@TERM_EL@@TERM_SETAF3 at Installing @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF3 at ...@TERM_SGR0@\r"
--INSTALL_OK = printf "@TERM_EL@@TERM_SETAF2 at Successfully installed @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF2 at .@TERM_SGR0@\n"
--INSTALL_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to install @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF1@!@TERM_SGR0@\n"; exit $$err
--DELETE_OK = printf "@TERM_EL@@TERM_SETAF4 at Deleted @TERM_BOLD@$$i at TERM_SGR0@@TERM_SETAF4 at .@TERM_SGR0@\n"
--DELETE_FAILED = err=$$?; printf "@TERM_EL@@TERM_SETAF1 at Failed to delete @TERM_BOLD@$$i at 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 = err=$$?; printf "Failed to generate dependencies!\n"; exit $$err
-+COMPILE_STATUS = printf "Compiling $<...\r"
-+COMPILE_OK = printf "Successfully compiled $<.\n"
-+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 = 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 = err=$$?; printf "Failed to compile $< (plugin)!\n"; exit $$err
-+LINK_STATUS = printf "Linking $@...\r"
-+LINK_OK = printf "Successfully linked $@.\n"
-+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 = err=$$?; printf "Failed to install $$i!\n"; exit $$err
-+DELETE_OK = printf "Deleted $$i.\n"
-+DELETE_FAILED = err=$$?; printf "Failed to delete $$i!\n"; exit $$err
- 
- include .deps
+
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/audacious-plugins.git/commitdiff/bc2eab212ff4a55cc55f90401a448c6bd12c1f93



More information about the pld-cvs-commit mailing list