[packages/xmms2] - up to 0.7DrNo; added -input-{gme,sc68,tremor} subpackages

qboosh qboosh at pld-linux.org
Sat Jun 24 11:56:32 CEST 2023 

commit 2cb7be605d0d0edea1040cbb4ca26fd02090d143
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Sat Jun 24 10:54:16 2023 +0200

    - up to 0.7DrNo; added -input-{gme,sc68,tremor} subpackages

 xmms2-boost.patch   | 85 -----------------------------------------------
 xmms2-format.patch  | 83 ----------------------------------------------
 xmms2-perl.patch    | 15 ---------
 xmms2-ruby.patch    | 95 ++++++++++++-----------------------------------------
 xmms2-sc68.patch    | 22 +++++++++++++
 xmms2-version.patch | 10 +++---
 xmms2-waf.patch     | 35 ++++++--------------
 xmms2.spec          | 90 ++++++++++++++++++++++++++++++++++++++++----------
 8 files changed, 131 insertions(+), 304 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index e679022..1f525d4 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -12,36 +12,36 @@
 Summary:	Client/server based media player system
 Summary(pl.UTF-8):	System odtwarzania multimediów oparty na architekturze klient/serwer
 Name:		xmms2
-Version:	0.6DrMattDestruction
+Version:	0.7DrNo
 Release:	0.1
 License:	LGPL v2.1
 Group:		Applications/Sound
 Source0:	https://downloads.sourceforge.net/xmms2/%{name}-%{version}.tar.bz2
-# Source0-md5:	954fb9c76b5db5e324a105e81b273200
+# Source0-md5:	60e50b591078acb6a85cd83de0f2b077
 Patch0:		%{name}-tabs.patch
 Patch1:		%{name}-openssl.patch
-Patch2:		%{name}-format.patch
 Patch3:		%{name}-modplug.patch
 Patch4:		%{name}-ffmpeg.patch
 Patch5:		%{name}-ruby.patch
-Patch6:		%{name}-perl.patch
 Patch7:		%{name}-waf.patch
 Patch8:		%{name}-version.patch
-Patch9:		%{name}-boost.patch
 Patch10:	%{name}-link.patch
+Patch11:	%{name}-sc68.patch
 URL:		http://xmms2.xmms.se/
 BuildRequires:	alsa-lib-devel
 BuildRequires:	avahi-devel
 BuildRequires:	avahi-compat-libdns_sd-devel
 BuildRequires:	avahi-glib-devel
-BuildRequires:	curl-devel >= 7.11.2
+BuildRequires:	boost-devel
+BuildRequires:	curl-devel >= 7.12.0
 %{?with_efl:BuildRequires:	ecore-devel}
 BuildRequires:	faad2-devel >= 2
 BuildRequires:	ffmpeg-devel >= 2
 BuildRequires:	fftw3-single-devel >= 3
 %{?with_flac:BuildRequires:	flac-devel >= 1.1.3}
+BuildRequires:	game-music-emu-devel
 BuildRequires:	gamin-devel
-BuildRequires:	glib2-devel >= 1:2.6.0
+BuildRequires:	glib2-devel >= 1:2.8.0
 BuildRequires:	jack-audio-connection-kit-devel
 %{?with_java:BuildRequires:	jdk}
 BuildRequires:	libao-devel
@@ -66,21 +66,25 @@ BuildRequires:	pkgconfig
 BuildRequires:	pulseaudio-devel
 %if %{with python}
 BuildRequires:	python-Pyrex >= 0.9.4.2
-BuildRequires:	python-devel >= 2.3
+BuildRequires:	python-devel >= 1:2.4
 %endif
 BuildRequires:	python3 >= 1:3.2
 BuildRequires:	rpmbuild(macros) >= 1.277
 %{?with_ruby:BuildRequires:	ruby-modules >= 1:1.8}
+BuildRequires:	sc68-devel
 BuildRequires:	scons >= 4
 BuildRequires:	sed >= 4.0
 BuildRequires:	speex-devel
-BuildRequires:	sqlite3-devel >= 3.2
+BuildRequires:	sqlite3-devel >= 3.5
 BuildRequires:	swig >= 1.3.25
+BuildRequires:	tremor-devel
 BuildRequires:	wavpack-devel
 %if %{with sdl}
 BuildRequires:	SDL-devel
 BuildRequires:	libvisual-devel
 %endif
+Requires:	glib2 >= 1:2.8.0
+Requires:	sqlite3 >= 3.5
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
@@ -96,6 +100,7 @@ Summary:	Simple text-ui for xmms2
 Summary(pl.UTF-8):	Prosty tekstowy interfejs dla xmms2
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	glib2 >= 1:2.8.0
 
 %description client-cli
 Simple text-ui for xmms2.
@@ -145,6 +150,7 @@ Summary:	GLib client library
 Summary(pl.UTF-8):	Biblioteka kliencka GLib
 Group:		X11/Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	glib2 >= 1:2.8.0
 
 %description client-lib-glib
 GLib client library.
@@ -277,6 +283,19 @@ This package enables FLAC decoding for xmms2.
 %description input-flac -l pl.UTF-8
 Ten pakiet umożliwia dekodowanie FLAC przez xmms2.
 
+%package input-gme
+Summary:	Game Music decorer
+Summary(pl.UTF-8):	Dekoder muzyki z gier
+Group:		Applications/Sound
+Requires:	%{name} = %{version}-%{release}
+
+%description input-gme
+This package enables Game Music Emulator decoding for xmms2.
+
+%description input-gme -l pl.UTF-8
+Ten pakiet umożliwia dekodowanie muzyki z gier retro przez xmms2
+poprzez Game Music Emulator.
+
 %package input-mad
 Summary:	mad-based MP3 decoder
 Summary(pl.UTF-8):	Oparty na mad dekoder MP3
@@ -326,6 +345,19 @@ This package enables MPC decoding for xmms2.
 %description input-musepack -l pl.UTF-8
 Ten pakiet umożliwia dekodowanie MPC przez xmms2.
 
+%package input-sc68
+Summary:	sc68 decoder
+Summary(pl.UTF-8):	Dekoder sc68
+Group:		X11/Applications/Sound
+Requires:	%{name} = %{version}-%{release}
+
+%description input-sc68
+This package enables Atari ST/Amiga music decoding for xmms2.
+
+%description input-sc68 -l pl.UTF-8
+Ten pakiet umożliwia dekodowanie muzyki z Atari ST i Amigi przez
+xmms2.
+
 %package input-sid
 Summary:	SID decoder
 Summary(pl.UTF-8):	Dekoder SID
@@ -350,6 +382,19 @@ This package enables speex decoding for xmms2.
 %description input-speex -l pl.UTF-8
 Ten pakiet umożliwia dekodowanie speex przez xmms2.
 
+%package input-tremor
+Summary:	Ogg/Vorbis decoder using tremor library
+Summary(pl.UTF-8):	Dekoder Ogg/Vorbis wykorzystujący bibliotekę tremor
+Group:		X11/Applications/Sound
+Requires:	%{name} = %{version}-%{release}
+
+%description input-tremor
+This package enables Ogg/Vorbis decoding for xmms2 via tremor library.
+
+%description input-tremor -l pl.UTF-8
+Ten pakiet umożliwia dekodowanie Ogg/Vorbis przez xmms2 poprzez
+bibliotekę tremor.
+
 %package input-vorbis
 Summary:	Ogg/Vorbis decoder
 Summary(pl.UTF-8):	Dekoder Ogg/Vorbis
@@ -463,6 +508,7 @@ Summary:	HTTP curl transport
 Summary(pl.UTF-8):	Transport HTTP poprzez curl
 Group:		Applications/Sound
 Requires:	%{name} = %{version}-%{release}
+Requires:	curl-libs >= 7.12.0
 
 %description transport-curl
 This package contains a HTTP transport for xmms2.
@@ -524,6 +570,7 @@ Summary:	Development libraries and header files
 Summary(pl.UTF-8):	Biblioteki programistyczne i pliki nagłówkowe
 Group:		Development/Libraries
 Requires:	%{name} = %{version}-%{release}
+Requires:	glib2-devel >= 1:2.8.0
 
 %description devel
 This is the package containing the development libaries and header
@@ -537,15 +584,13 @@ xmms2.
 %setup -q
 %patch0 -p1
 %patch1 -p1
-%patch2 -p1
 %patch3 -p1
 %patch4 -p1
 %patch5 -p1
-%patch6 -p1
 %patch7 -p1
 %patch8 -p1
-%patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 # sanitize version to avoid invalid format in .pc files
 %{__sed} -i -e '/^BASEVERSION=/ s/ \(Dr[^ ]*\)/\1/' wscript
@@ -570,8 +615,8 @@ CXXFLAGS="%{rpmcxxflags} %{rpmcppflags} $(pkg-config --cflags smbclient)" \
 LDFLAGS="%{rpmldflags}" \
 ./waf configure -v \
 	--prefix=%{_prefix} \
-	--with-libdir=%{_libdir} \
-	--with-mandir=%{_mandir} \
+	--libdir=%{_libdir} \
+	--mandir=%{_mandir} \
 	--with-perl-archdir=%{perl_vendorarch} \
 	--with-ruby-archdir=%{ruby_vendorarchdir} \
 	--with-ruby-libdir=%{ruby_vendorlibdir} \
@@ -606,9 +651,9 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_bindir}/xmms2-launcher
 %attr(755,root,root) %{_bindir}/xmms2d
 %attr(755,root,root) %{_libdir}/libxmmsclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxmmsclient.so.5
+%attr(755,root,root) %ghost %{_libdir}/libxmmsclient.so.6
 %attr(755,root,root) %{_libdir}/libxmmsclient++.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxmmsclient++.so.3
+%attr(755,root,root) %ghost %{_libdir}/libxmmsclient++.so.4
 %dir %{_libdir}/%{name}
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_apefile.so
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_asf.so
@@ -618,7 +663,6 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_equalizer.so
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_file.so
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_flv.so
-%attr(755,root,root) %{_libdir}/%{name}/libxmms_gme.so
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_html.so
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_icymetaint.so
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_id3v2.so
@@ -751,6 +795,10 @@ rm -rf $RPM_BUILD_ROOT
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_flac.so
 %endif
 
+%files input-gme
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_gme.so
+
 %files input-mad
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_mad.so
@@ -767,6 +815,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_musepack.so
 
+%files input-sc68
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_sc68.so
+
 %files input-sid
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_sid.so
@@ -775,6 +827,10 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_speex.so
 
+%files input-tremor
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_tremor.so
+
 %files input-vorbis
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/%{name}/libxmms_vorbis.so
diff --git a/xmms2-boost.patch b/xmms2-boost.patch
deleted file mode 100644
index d892ade..0000000
--- a/xmms2-boost.patch
+++ /dev/null
@@ -1,85 +0,0 @@
---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/signal.h.orig	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/signal.h	2023-06-22 18:59:11.362344508 +0200
-@@ -18,7 +18,7 @@
- #define XMMSCLIENTPP_SIGNAL_H
- 
- #include <xmmsclient/xmmsclient.h>
--#include <boost/signal.hpp>
-+#include <boost/signals2.hpp>
- #include <string>
- #include <list>
- #include <iostream>
-@@ -33,7 +33,7 @@ namespace Xmms
- 		class Coll;
- 	}
- 
--	typedef boost::signal< bool( const std::string& ) > error_sig;
-+	typedef boost::signals2::signal< bool( const std::string& ) > error_sig;
- 
- 	/** @class SignalInterface
- 	 *  This is here only to unify all Signal classes so that they can be
-@@ -54,7 +54,7 @@ namespace Xmms
- 	template< typename T >
- 	struct Signal : public SignalInterface
- 	{
--		typedef boost::signal< bool( const T& ) > signal_t;
-+		typedef boost::signals2::signal< bool( const T& ) > signal_t;
- 
- 		error_sig error_signal;
- 		signal_t signal;
-@@ -67,7 +67,7 @@ namespace Xmms
- 	template<>
- 	struct Signal< void > : public SignalInterface
- 	{
--		typedef boost::signal< bool() > signal_t;
-+		typedef boost::signals2::signal< bool() > signal_t;
- 
- 		error_sig error_signal;
- 		signal_t signal;
-@@ -212,7 +212,7 @@ namespace Xmms
- 	inline bool
- 	callSignal( const Signal< void >* sig, xmmsv_t*& /* val */)
- 	{
--		return sig->signal();
-+		return *sig->signal();
- 	}
- 
- 	/** Called on the notifier udata when an xmmsc_result_t is freed.
-@@ -244,7 +244,7 @@ namespace Xmms
- 
- 			std::string error( buf );
- 			if( !data->error_signal.empty() ) {
--				ret = data->error_signal( error );
-+				ret = *data->error_signal( error );
- 			}
- 
- 		}
-@@ -257,7 +257,7 @@ namespace Xmms
- 				catch( std::exception& e ) {
- 
- 					if( !data->error_signal.empty() ) {
--						ret = data->error_signal( e.what() );
-+						ret = *data->error_signal( e.what() );
- 					}
- 
- 				}
-@@ -272,7 +272,7 @@ namespace Xmms
- 		return ret;
- 	}
- 
--	typedef boost::signal< void() > DisconnectCallback;
-+	typedef boost::signals2::signal< void() > DisconnectCallback;
- 
- 	void disconnect_callback( void* userdata );
- 	/** @endcond INTERNAL */
---- xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h.orig	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction/src/include/xmmsclient/xmmsclient++/helpers.h	2023-06-22 18:21:32.241241299 +0200
-@@ -26,7 +26,7 @@
- 
- #include <boost/bind.hpp>
- #include <boost/function.hpp>
--#include <boost/signal.hpp>
-+#include <boost/signals2.hpp>
- #include <boost/type_traits/remove_pointer.hpp>
- 
- #include <string>
diff --git a/xmms2-format.patch b/xmms2-format.patch
deleted file mode 100644
index 4c0c95c..0000000
--- a/xmms2-format.patch
+++ /dev/null
@@ -1,83 +0,0 @@
---- xmms2-0.5DrLecter/src/xmms/main.c.orig	2008-06-15 19:31:38.000000000 +0200
-+++ xmms2-0.5DrLecter/src/xmms/main.c	2023-05-21 17:23:28.557155999 +0200
-@@ -420,7 +420,7 @@ main (int argc, char **argv)
- 	}
- 	if (showhelp) {
- #if GLIB_CHECK_VERSION(2,14,0)
--		g_print (g_option_context_get_help (context, TRUE, NULL));
-+		g_print ("%s", g_option_context_get_help (context, TRUE, NULL));
- 		exit (EXIT_SUCCESS);
- #else
- 		g_print ("Please use --help or -? for help\n");
---- xmms2-0.6DrMattDestruction/src/clients/nycli/column_display.c.orig	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction/src/clients/nycli/column_display.c	2023-06-22 20:49:36.616801277 +0200
-@@ -178,11 +178,11 @@ print_fixed_width_string (gchar *value,
-                           column_def_align_t align, gchar padchar)
- {
- 	if (align == COLUMN_DEF_ALIGN_LEFT) {
--		g_printf (value);
-+		g_printf ("%s", value);
- 		print_padding (width - realsize, padchar);
- 	} else {
- 		print_padding (width - realsize, padchar);
--		g_printf (value);
-+		g_printf ("%s", value);
- 	}
- }
- 
-@@ -200,7 +200,7 @@ print_string_using_coldef (column_displa
- 
- 	case COLUMN_DEF_SIZE_AUTO:
- 		/* Just print the string */
--		g_printf (disp->buffer);
-+		g_printf ("%s", disp->buffer);
- 		break;
- 	}
- }
-@@ -360,7 +360,7 @@ column_display_print_header (column_disp
- 	/* Display column headers */
- 	for (i = 0; i < disp->cols->len; ++i) {
- 		coldef = g_array_index (disp->cols, column_def_t *, i);
--		realsize = g_snprintf (disp->buffer, coldef->size + 1, coldef->name);
-+		realsize = g_snprintf (disp->buffer, coldef->size + 1, "%s", coldef->name);
- 		print_fixed_width_string (disp->buffer, coldef->size, realsize,
- 		                          coldef->align, ' ');
- 	}
-@@ -524,7 +524,7 @@ column_display_render_text (column_displ
- 	gint realsize;
- 	const gchar *sep = coldef->name;
- 
--	realsize = g_printf (sep);
-+	realsize = g_printf ("%s", sep);
- 
- 	return realsize;
- }
-@@ -545,7 +545,7 @@ column_display_render_time (column_displ
- 		break;
- 	default:
- 		/* Invalid type, don't render anything*/
--		return;
-+		return 0;
- 	}
- 
- 	time = format_time (millisecs, FALSE);
-@@ -557,7 +557,7 @@ column_display_render_time (column_displ
- 	 * alignment and overflow termwidth if strlen(time) > coldef->size,
- 	 * but it's a temporary fix to avoid displaying a wrong time.
- 	 */
--	realsize = g_snprintf (disp->buffer, disp->termwidth + 1, time);
-+	realsize = g_snprintf (disp->buffer, disp->termwidth + 1, "%s", time);
- 	print_string_using_coldef (disp, coldef, realsize);
- 
- 	g_free (time);
---- xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c.orig	2023-06-22 20:50:00.663337673 +0200
-+++ xmms2-0.6DrMattDestruction/src/clients/lib/ruby/rb_xmmsclient.c	2023-06-22 20:53:19.725592593 +0200
-@@ -166,7 +166,7 @@ c_connect (int argc, VALUE *argv, VALUE
- 		snprintf (buf, sizeof (buf), "cannot connect to daemon (%s)\n",
- 		          xmmsc_get_last_error (xmms->real));
- 
--		rb_raise (eClientError, buf);
-+		rb_raise (eClientError, "%s", buf);
- 	}
- 
- 	return self;
diff --git a/xmms2-perl.patch b/xmms2-perl.patch
deleted file mode 100644
index 1ea0ee6..0000000
--- a/xmms2-perl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- xmms2-0.6DrMattDestruction/src/clients/lib/perl/wscript.orig	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction/src/clients/lib/perl/wscript	2023-06-22 21:52:44.209615459 +0200
-@@ -17,9 +17,9 @@ def build(bld):
-     obj.mac_bundle = True
- 
-     bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient.pm')
--    bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Sync.pm')
--    bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Glib.pm')
--    bld.install_files('${INSTALLDIR_PERL_LIB}', 'pm/XMMSClient/Collection.pm')
-+    bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Sync.pm')
-+    bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Glib.pm')
-+    bld.install_files('${INSTALLDIR_PERL_LIB}/XMMSClient', 'pm/XMMSClient/Collection.pm')
- 
- def configure(conf):
-     conf.check_tool('perl')
diff --git a/xmms2-ruby.patch b/xmms2-ruby.patch
index 8391182..145d316 100644
--- a/xmms2-ruby.patch
+++ b/xmms2-ruby.patch
@@ -1,8 +1,12 @@
---- xmms2-0.6DrMattDestruction/waftools/ruby.py.orig	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction/waftools/ruby.py	2023-05-22 09:39:14.409985899 +0200
-@@ -62,9 +62,9 @@ def check_ruby_ext_devel(conf):
+--- xmms2-0.7DrNo/waftools/ruby.py.orig	2023-06-23 06:13:20.083662855 +0200
++++ xmms2-0.7DrNo/waftools/ruby.py	2023-06-23 06:23:46.506545435 +0200
+@@ -63,12 +63,12 @@ def check_ruby_ext_devel(conf):
      version = conf.env['RUBY_VERSION']
  
+     def ruby_get_config(key):
+-        return Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"" + key + "\"]'").strip()
++        return Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"" + key + "\"]'").strip()
+ 
      if version >= (1, 9, 0):
 -        ruby_h = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.exist?(Config::CONFIG[\"rubyhdrdir\"] + \"/ruby.h\")'").strip()
 +        ruby_h = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.exist?(RbConfig::CONFIG[\"rubyhdrdir\"] + \"/ruby.h\")'").strip()
@@ -12,106 +16,49 @@
  
      if ruby_h != 'true':
          conf.check_message('ruby', 'header file', False)
-@@ -72,18 +72,18 @@ def check_ruby_ext_devel(conf):
+@@ -76,18 +76,18 @@ def check_ruby_ext_devel(conf):
  
      conf.check_message('ruby', 'header file', True)
  
 -    archdir = Utils.cmd_output(ruby + " -rrbconfig -e 'puts \"%s\" % [].fill(Config::CONFIG[\"archdir\"], 0..1)'").strip()
 +    archdir = Utils.cmd_output(ruby + " -rrbconfig -e 'puts \"%s\" % [].fill(RbConfig::CONFIG[\"archdir\"], 0..1)'").strip()
-     conf.env["CPPPATH_ruby"] = [archdir]
-     conf.env["LINKFLAGS_ruby"] = '-L%s' % archdir
+     conf.env["CPPPATH_RUBY"] = [archdir]
+     conf.env["LINKFLAGS_RUBY"] = '-L%s' % archdir
  
      if version >= (1, 9, 0):
 -        incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts Config::CONFIG[\"rubyhdrdir\"]'").strip()
 +        incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts RbConfig::CONFIG[\"rubyhdrdir\"]'").strip()
-         conf.env["CPPPATH_ruby"] += [incpaths]
+         conf.env["CPPPATH_RUBY"] += [incpaths]
  
 -        incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.join(Config::CONFIG[\"rubyhdrdir\"], Config::CONFIG[\"arch\"])'").strip()
 +        incpaths = Utils.cmd_output(ruby + " -rrbconfig -e 'puts File.join(RbConfig::CONFIG[\"rubyhdrdir\"], RbConfig::CONFIG[\"arch\"])'").strip()
-         conf.env["CPPPATH_ruby"] += [incpaths]
+         conf.env["CPPPATH_RUBY"] += [incpaths]
  
 -    ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LDSHARED\"]'").strip()
 +    ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"LDSHARED\"]'").strip()
  
      # ok this is really stupid, but the command and flags are combined.
      # so we try to find the first argument...
-@@ -97,25 +97,25 @@ def check_ruby_ext_devel(conf):
- 
-     conf.env["LINKFLAGS_ruby"] += " " + " ".join(flags)
- 
--    ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LIBS\"]'").strip()
-+    ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"LIBS\"]'").strip()
-     conf.env["LINKFLAGS_ruby"] += " " + ldflags
--    ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LIBRUBYARG_SHARED\"]'").strip()
-+    ldflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"LIBRUBYARG_SHARED\"]'").strip()
-     conf.env["LINKFLAGS_ruby"] += " " + ldflags
- 
--    cflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"CCDLFLAGS\"]'").strip()
-+    cflags = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"CCDLFLAGS\"]'").strip()
-     conf.env["CCFLAGS_ruby"] = cflags
- 
+@@ -113,14 +113,14 @@ def check_ruby_ext_devel(conf):
      if Options.options.rubyarchdir:
-         conf.env["ARCHDIR_ruby"] = Options.options.rubyarchdir
+         conf.env["ARCHDIR_RUBY"] = Options.options.rubyarchdir
      else:
--        conf.env["ARCHDIR_ruby"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitearchdir\"]'").strip()
-+        conf.env["ARCHDIR_ruby"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"sitearchdir\"]'").strip()
+-        conf.env["ARCHDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitearchdir\"]'").strip()
++        conf.env["ARCHDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"sitearchdir\"]'").strip()
  
      if Options.options.rubylibdir:
-         conf.env["LIBDIR_ruby"] = Options.options.rubylibdir
+         conf.env["LIBDIR_RUBY"] = Options.options.rubylibdir
      else:
--        conf.env["LIBDIR_ruby"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitelibdir\"]'").strip()
-+        conf.env["LIBDIR_ruby"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]'").strip()
+-        conf.env["LIBDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitelibdir\"]'").strip()
++        conf.env["LIBDIR_RUBY"] = Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"sitelibdir\"]'").strip()
  
 -    conf.env['rubyext_PATTERN'] = '%s.' + Utils.cmd_output(ruby + " -rrbconfig -e 'print Config::CONFIG[\"DLEXT\"]'").strip()
 +    conf.env['rubyext_PATTERN'] = '%s.' + Utils.cmd_output(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"DLEXT\"]'").strip()
  
-     return True
- 
---- xmms2-0.2DrJekyll/src/clients/lib/ruby/rb_xmmsclient.c.orig	2023-05-14 19:24:29.670968613 +0200
-+++ xmms2-0.2DrJekyll/src/clients/lib/ruby/rb_xmmsclient.c	2023-05-14 19:29:16.606080819 +0200
-@@ -1371,10 +1371,10 @@ parse_string_array (VALUE value)
- 	if (!NIL_P (rb_check_array_type (value))) {
- 		struct RArray *ary = RARRAY (value);
- 
--		ret = malloc (sizeof (char *) * (ary->len + 1));
-+		ret = malloc (sizeof (char *) * (RARRAY_LEN(ary) + 1));
- 
--		for (i = 0; i < ary->len; i++)
--			ret[i] = StringValuePtr (ary->ptr[i]);
-+		for (i = 0; i < RARRAY_LEN(ary); i++)
-+			ret[i] = StringValuePtr (RARRAY_PTR(ary)[i]);
- 
- 		ret[i] = NULL;
- 	} else {
-@@ -1451,10 +1451,10 @@ parse_string_array2 (VALUE value)
- 		struct RArray *ary = RARRAY (value);
- 		int i;
- 
--		for (i = 0; i < ary->len; i++) {
-+		for (i = 0; i < RARRAY_LEN(ary); i++) {
- 			xmmsv_t *elem;
- 
--			elem = xmmsv_new_string (StringValuePtr (ary->ptr[i]));
-+			elem = xmmsv_new_string (StringValuePtr (RARRAY_PTR(ary)[i]));
- 			xmmsv_list_append (list, elem);
- 			xmmsv_unref (elem);
- 		}
+     # Change some strings to a list
+     conf.env["LINKFLAGS_RUBY"] = Utils.to_list(conf.env["LINKFLAGS_RUBY"])
 --- xmms2-0.5DrLecter/src/clients/lib/ruby/rb_collection.c.orig	2008-06-15 19:31:38.000000000 +0200
 +++ xmms2-0.5DrLecter/src/clients/lib/ruby/rb_collection.c	2023-05-21 15:05:06.452132360 +0200
-@@ -241,10 +241,10 @@ c_coll_idlist_set (VALUE self, VALUE ids
- 	COLL_METHOD_HANDLER_HEADER
- 
- 	rb_ary = RARRAY (ids);
--	ary = malloc (sizeof (unsigned int *) * (rb_ary->len + 1));
-+	ary = malloc (sizeof (unsigned int *) * (RARRAY_LEN(rb_ary) + 1));
- 
--	for (i = 0; i < rb_ary->len; i++)
--		ary[i] = NUM2UINT (rb_ary->ptr[i]);
-+	for (i = 0; i < RARRAY_LEN(rb_ary); i++)
-+		ary[i] = NUM2UINT (RARRAY_PTR(rb_ary)[i]);
- 
- 	ary[i] = 0;
- 
 @@ -285,8 +285,8 @@ attrs_inspect_cb (VALUE args, VALUE s)
  {
  	VALUE key, value;
diff --git a/xmms2-sc68.patch b/xmms2-sc68.patch
new file mode 100644
index 0000000..3b7a3e4
--- /dev/null
+++ b/xmms2-sc68.patch
@@ -0,0 +1,22 @@
+--- xmms2-0.7DrNo/src/plugins/sc68/wscript.orig	2010-02-19 18:43:54.000000000 +0100
++++ xmms2-0.7DrNo/src/plugins/sc68/wscript	2023-06-24 10:14:52.663648483 +0200
+@@ -1,7 +1,7 @@
+ from waftools.plugin import plugin
+ 
+ def plugin_configure(conf):
+-	if not conf.check_cfg(path="sc68-config", package="sc68", uselib_store="sc68", atleast_version="2.3.0", args="--cflags --libs"):
++	if not conf.check_cfg(path="sc68-config", package="sc68", uselib_store="sc68", atleast_version="2.2.1", args="--cflags --libs"):
+ 		return False
+ 
+ 	return True
+--- xmms2-0.7DrNo/src/plugins/sc68/sc68.c.orig	2010-02-19 18:43:54.000000000 +0100
++++ xmms2-0.7DrNo/src/plugins/sc68/sc68.c	2023-06-24 10:24:06.463981622 +0200
+@@ -237,7 +237,7 @@ sc68_load_track (api68_disk_t disk, int
+ 		return -1;
+ 	}
+ 
+-	if (api68_play (sc68_api, track, 1)) {
++	if (api68_play (sc68_api, track)) {
+ 		xmms_log_info ("Could not set track on sc68 disk");
+ 		xmms_error_set (error, XMMS_ERROR_GENERIC, sc68_error ());
+ 		return -1;
diff --git a/xmms2-version.patch b/xmms2-version.patch
index b8cf1a6..2869112 100644
--- a/xmms2-version.patch
+++ b/xmms2-version.patch
@@ -1,11 +1,11 @@
---- xmms2-0.5DrLecter/wscript.orig	2023-05-21 17:42:46.300883963 +0200
-+++ xmms2-0.5DrLecter/wscript	2023-05-21 18:02:09.441249357 +0200
-@@ -259,7 +259,7 @@ def configure(conf):
+--- xmms2-0.7DrNo/wscript.orig	2023-06-23 06:29:12.321345610 +0200
++++ xmms2-0.7DrNo/wscript	2023-06-23 06:29:55.905086544 +0200
+@@ -273,7 +273,7 @@ def configure(conf):
          if changed:
              dirty="-dirty"
          conf.check_message("uncommitted changes", "", bool(changed))
 -        conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
 +        conf.env["VERSION"] = BASEVERSION
  
-     conf.env['XMMS_PKGCONF_FILES'] = []
-     conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]
+     for warning in ('all',
+                     'no-format-extra-args',
diff --git a/xmms2-waf.patch b/xmms2-waf.patch
index 91c4257..1a58002 100644
--- a/xmms2-waf.patch
+++ b/xmms2-waf.patch
@@ -1,33 +1,18 @@
---- xmms2-0.6DrMattDestruction/wscript.orig	2009-04-21 19:51:11.000000000 +0200
-+++ xmms2-0.6DrMattDestruction/wscript	2023-05-22 10:12:54.089044360 +0200
-@@ -278,8 +278,6 @@ def configure(conf):
+--- xmms2-0.7DrNo/wscript.orig	2023-06-23 06:27:29.055856784 +0200
++++ xmms2-0.7DrNo/wscript	2023-06-23 06:28:26.602468011 +0200
+@@ -275,7 +275,6 @@ def configure(conf):
          conf.check_message("uncommitted changes", "", bool(changed))
          conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty)
  
 -    conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
+     for warning in ('all',
+                     'no-format-extra-args',
+                     'no-format-zero-length',
+@@ -295,7 +294,6 @@ def configure(conf):
+             # autogenerate uselib definitions to disable warnings
+             conf.env["CCFLAGS_NO%s" % warning.replace("-","").upper()] = ["-Wno-%s" % warning]
+ 
 -    conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0']
      conf.env['XMMS_PKGCONF_FILES'] = []
      conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]
  
-@@ -297,7 +295,7 @@ def configure(conf):
-         conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
-         print(conf.env['PKGCONFIGDIR'])
-     else:
--        conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
-+        conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
- 
-     if Options.options.config_prefix:
-         for dir in Options.options.config_prefix:
---- xmms2-0.5DrLecter/src/include/xmms/wscript.orig	2023-05-21 15:46:27.778689861 +0200
-+++ xmms2-0.5DrLecter/src/include/xmms/wscript	2023-05-21 16:22:50.510198323 +0200
-@@ -12,8 +12,8 @@ def configure(conf):
- 
-     defs = {}
- 
--    defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'],
--                                     'lib', 'xmms2')
-+    defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'],
-+                                     'xmms2')
-     defs['BINDIR']    = conf.env['BINDIR']
-     defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'],
-                                      'share', 'xmms2')
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/xmms2.git/commitdiff/2cb7be605d0d0edea1040cbb4ca26fd02090d143

More information about the pld-cvs-commit mailing list