From 52decece59f8a1b5d5b320234f2a7dd02d864a49 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 4 Jun 2019 13:05:55 +0200 Subject: [PATCH 01/49] Perl 5.30 re-rebuild updated packages --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index a65b05b..72e9725 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 63%{?dist} +Release: 64%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -240,6 +240,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{_bindir}/nyxmms2 %changelog +* Tue Jun 04 2019 Jitka Plesnikova - 0.8-64 +- Perl 5.30 re-rebuild updated packages + * Mon Jun 03 2019 Xavier Bachelot - 0.8-63 - Obsoletes xmms2-mad for proper upgrade path. From dff55e4dbd8490916a638088db43c790868fb2cb Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jul 2019 04:23:34 +0000 Subject: [PATCH 02/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 72e9725..1284b98 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 64%{?dist} +Release: 65%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -240,6 +240,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{_bindir}/nyxmms2 %changelog +* Sat Jul 27 2019 Fedora Release Engineering - 0.8-65 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Tue Jun 04 2019 Jitka Plesnikova - 0.8-64 - Perl 5.30 re-rebuild updated packages From a067e8df0638b9fc178050d12621b618e2e4b955 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Sat, 18 Jan 2020 14:57:42 +0900 Subject: [PATCH 03/49] Remove python2 related files explicitly for F-32 for now --- xmms2.spec | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 1284b98..e068aa2 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 65%{?dist} +Release: 66%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -205,6 +205,11 @@ done install -m0755 %{SOURCE1} %{buildroot}%{_bindir} +# For F-32: +# Explicitly remove python2 related files. F32 "python27" package +# contains header files, which makes xmms2 build python2 bindings +rm -rf %{buildroot}%{python2_sitelib}/xmmsclient/ + %ldconfig_scriptlets %files @@ -240,6 +245,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{_bindir}/nyxmms2 %changelog +* Sat Jan 18 2020 Mamoru TASAKA - 0.8-66 +- Remove python2 related files explicitly for F-32 for now + * Sat Jul 27 2019 Fedora Release Engineering - 0.8-65 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From 0120cd95799a4dfc0c685735437981f0fee8f711 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 31 Jan 2020 04:38:30 +0000 Subject: [PATCH 04/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index e068aa2..d53b0d2 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 66%{?dist} +Release: 67%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -245,6 +245,9 @@ rm -rf %{buildroot}%{python2_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Fri Jan 31 2020 Fedora Release Engineering - 0.8-67 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Sat Jan 18 2020 Mamoru TASAKA - 0.8-66 - Remove python2 related files explicitly for F-32 for now From 4e85eae97110878f68e59b077cad0abb8113603a Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Fri, 28 Feb 2020 10:27:04 -0500 Subject: [PATCH 05/49] use system waf, python3, please do not look too closely at the evil --- xmms2-0.8DrO_o-python3.patch | 44 ++ xmms2-0.8DrO_o-use-system-waf.patch | 677 ++++++++++++++++++ ...msc_collection_changed_actions_t-fix.patch | 36 + xmms2.spec | 45 +- 4 files changed, 783 insertions(+), 19 deletions(-) create mode 100644 xmms2-0.8DrO_o-python3.patch create mode 100644 xmms2-0.8DrO_o-use-system-waf.patch create mode 100644 xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch diff --git a/xmms2-0.8DrO_o-python3.patch b/xmms2-0.8DrO_o-python3.patch new file mode 100644 index 0000000..219340b --- /dev/null +++ b/xmms2-0.8DrO_o-python3.patch @@ -0,0 +1,44 @@ +diff -up xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd.py3 xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd +--- xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd.py3 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd 2020-02-28 09:57:34.639494568 -0500 +@@ -1,3 +1,5 @@ ++# cython: language_level=3 ++ + from xmmsvalue cimport Collection, XmmsValue + from cxmmsvalue cimport * + from cxmmsclient cimport * +diff -up xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd.py3 xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd +--- xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd.py3 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd 2020-02-28 09:57:34.639494568 -0500 +@@ -1,4 +1,5 @@ + #needs to reimport required symbols from .h files. ++# cython: language_level=3 + + cdef extern from "xmmsc/xmmsv.h": + ctypedef struct xmmsv_t +diff -up xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx.py3 xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx +--- xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx.py3 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx 2020-02-28 09:59:05.686592346 -0500 +@@ -1358,22 +1358,6 @@ cdef class XmmsApi(XmmsCore): + res = xmmsc_medialib_import_path(self.conn, p) + return self.create_result(cb, res) + +- @deprecated +- def medialib_path_import(self, path, cb = None, encoded=False): +- """ +- @deprecated +- Use medialib_import_path(path, ...) instead +- """ +- return self.medialib_import_path(self, path, cb=cb, encoded=encoded) +- +- @deprecated +- def medialib_path_import_encoded(self, path, cb = None): +- """ +- @deprecated +- Use medialib_import_path(path, ..., encoded=True) instead +- """ +- return self.medialib_import_path(self, path, cb=cb, encoded=True) +- + cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None): + """ + medialib_property_set(id, key, value, source=None, cb=None) -> XmmsResult diff --git a/xmms2-0.8DrO_o-use-system-waf.patch b/xmms2-0.8DrO_o-use-system-waf.patch new file mode 100644 index 0000000..002ab4b --- /dev/null +++ b/xmms2-0.8DrO_o-use-system-waf.patch @@ -0,0 +1,677 @@ +diff -up xmms2-0.8DrO_o/src/clients/et/wscript.fixme xmms2-0.8DrO_o/src/clients/et/wscript +--- xmms2-0.8DrO_o/src/clients/et/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/et/wscript 2020-02-28 09:49:55.142637980 -0500 +@@ -23,9 +23,9 @@ def build(bld): + + + def configure(conf): +- if Options.platform == "win32": ++ if Utils.unversioned_sys_platform == "win32": + conf.fatal("Not supported on Windows") +- elif Options.platform == "sunos": ++ elif Utils.unversioned_sys_platform == "sunos": + conf.check_cc(lib="resolv", uselib_store="resolv", mandatory=True) + return True + +diff -up xmms2-0.8DrO_o/src/clients/launcher/wscript.fixme xmms2-0.8DrO_o/src/clients/launcher/wscript +--- xmms2-0.8DrO_o/src/clients/launcher/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/launcher/wscript 2020-02-28 09:49:55.142637980 -0500 +@@ -1,4 +1,4 @@ +-import Options ++from waflib import Utils + + def build(bld): + bld(features = 'c cprogram', +@@ -14,7 +14,7 @@ def build(bld): + ) + + def configure(conf): +- if Options.platform == 'win32': ++ if Utils.unversioned_sys_platform == 'win32': + conf.fatal("Not supported on Windows") + + def options(opt): +diff -up xmms2-0.8DrO_o/src/clients/lib/perl/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/perl/wscript +--- xmms2-0.8DrO_o/src/clients/lib/perl/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/perl/wscript 2020-02-28 09:49:55.143637956 -0500 +@@ -37,11 +37,11 @@ def build(bld): + + + def configure(conf): +- conf.check_tool('perl') ++ conf.load('perl') + conf.check_perl_version((5,7,3)) + conf.check_perl_ext_devel() + conf.load('podselect', tooldir='waftools') +- conf.check_tool('podselect') ++ conf.load('podselect') + + if not os.path.commonprefix([conf.env.ARCHDIR_PERL, conf.env.PREFIX]).startswith(conf.env.PREFIX): + Logs.warn("Default perl libdir is not under PREFIX. specify the path " +@@ -54,4 +54,4 @@ def configure(conf): + + + def options(opt): +- opt.tool_options('perl') ++ opt.load('perl') +diff -up xmms2-0.8DrO_o/src/clients/lib/python/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/python/wscript +--- xmms2-0.8DrO_o/src/clients/lib/python/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/python/wscript 2020-02-28 09:49:55.143637956 -0500 +@@ -79,7 +79,7 @@ def build(bld): + # TODO: Distribute .pxd files + + def configure(conf): +- conf.check_tool('python') ++ conf.load('python') + if not conf.env.PYTHON: + conf.fatal("python not found") + +@@ -112,7 +112,7 @@ def configure(conf): + "files, you should consider reconfiguring with --no-cython") + + def options(opt): +- opt.tool_options('cython', tooldir = os.path.abspath('waftools')) ++ opt.load('cython', tooldir = os.path.abspath('waftools')) + opt.add_option('--no-cython', action="store_true", + dest="no_cython", default=False, + help="Use precompiled cython files even if cython is installed on " +diff -up xmms2-0.8DrO_o/src/clients/lib/ruby/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/ruby/wscript +--- xmms2-0.8DrO_o/src/clients/lib/ruby/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/ruby/wscript 2020-02-28 09:49:55.143637956 -0500 +@@ -48,11 +48,11 @@ def build(bld): + ) + + def configure(conf): +- conf.check_tool("ruby") ++ conf.load("ruby") + conf.check_ruby_version((1,8,0)) + conf.check_ruby_ext_devel() + +- conf.check_cc(function_name="rb_protect_inspect", header_name="ruby.h", ++ conf.check_cc(header_name="ruby.h", + uselib="RUBYEXT", mandatory=False) + + prefix = os.path.commonprefix([conf.env.ARCHDIR_RUBY, conf.env.PREFIX]) +@@ -70,4 +70,4 @@ def configure(conf): + return True + + def options(opt): +- opt.tool_options('ruby', tdir=os.path.abspath('waftools')) ++ opt.load('ruby', tdir=os.path.abspath('waftools')) +diff -up xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript +--- xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript 2020-02-28 09:49:55.143637956 -0500 +@@ -40,4 +40,4 @@ def configure(conf): + return True + + def options(opt): +- opt.tool_options('boost') ++ opt.load('boost') +diff -up xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript +--- xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript 2020-02-28 09:49:55.143637956 -0500 +@@ -39,8 +39,7 @@ def build(bld): + def configure(conf): + conf.env.XMMS_PKGCONF_FILES.append(("xmms2-client", "-lxmmsclient")) + +- conf.check_cc(function_name="semtimedop", +- header_name=["sys/types.h", "sys/ipc.h", "sys/sem.h"], ++ conf.check_cc(header_name=["sys/types.h", "sys/ipc.h", "sys/sem.h"], + defines=["_GNU_SOURCE=1"], mandatory=False) + if not conf.env.HAVE_SEMTIMEDOP: + Logs.warn("Compiling visualization without shm support!") +diff -up xmms2-0.8DrO_o/src/clients/medialib-updater/wscript.fixme xmms2-0.8DrO_o/src/clients/medialib-updater/wscript +--- xmms2-0.8DrO_o/src/clients/medialib-updater/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/medialib-updater/wscript 2020-02-28 09:49:55.143637956 -0500 +@@ -24,8 +24,7 @@ def configure(conf): + conf.check_cfg(package="gthread-2.0", uselib_store='gthread2', + args="--cflags --libs") + +- conf.check_cc(function_name="g_file_query_file_type", +- header_name="gio/gio.h", uselib="gio2", mandatory=False) ++ conf.check_cc(header_name="gio/gio.h", uselib="gio2", mandatory=False) + + + def options(opt): +diff -up xmms2-0.8DrO_o/src/clients/nycli/wscript.fixme xmms2-0.8DrO_o/src/clients/nycli/wscript +--- xmms2-0.8DrO_o/src/clients/nycli/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/clients/nycli/wscript 2020-02-28 09:49:55.143637956 -0500 +@@ -1,4 +1,4 @@ +-from waflib import Options, Errors ++from waflib import Utils, Errors + + source = """ + main.c +@@ -37,7 +37,7 @@ def build(bld): + + + def configure(conf): +- if Options.platform == 'win32': ++ if Utils.unversioned_sys_platform == 'win32': + conf.env.CLI_COMPAT_IMPL = 'win32' + else: + conf.env.CLI_COMPAT_IMPL = 'unix' +@@ -49,8 +49,7 @@ def configure(conf): + # first try just linking against libreadline + try: + conf.check_cc(lib="readline", header_name=rl_headers, +- function_name='rl_filename_dequoting_function', +- uselib_store="readline", uselib="glib2") ++ uselib_store="readline", uselib="glib2") + except Errors.ConfigurationError: + pass + else: +diff -up xmms2-0.8DrO_o/src/clients/vistest/wscript.fixme xmms2-0.8DrO_o/src/clients/vistest/wscript +--- xmms2-0.8DrO_o/src/clients/vistest/wscript.fixme 2020-02-28 09:49:55.137638098 -0500 ++++ xmms2-0.8DrO_o/src/clients/vistest/wscript 2020-02-28 09:49:55.144637932 -0500 +@@ -1,4 +1,4 @@ +-import Options ++from waflib import Utils + + def build(bld): + t = bld(features = 'c cprogram', +@@ -46,7 +46,7 @@ def build(bld): + t.install_path = None + + def configure(conf): +- if Options.platform == "win32": ++ if Utils.unversioned_sys_platform == "win32": + conf.fatal("visualisation clients not supported on windows") + + conf.env.INSTALL_VIS_REFERENCE_CLIENTS = conf.options.with_vis_clients +diff -up xmms2-0.8DrO_o/src/includepriv/wscript.fixme xmms2-0.8DrO_o/src/includepriv/wscript +--- xmms2-0.8DrO_o/src/includepriv/wscript.fixme 2020-02-28 09:50:50.912314901 -0500 ++++ xmms2-0.8DrO_o/src/includepriv/wscript 2020-02-28 09:51:04.246998545 -0500 +@@ -3,5 +3,5 @@ def configure(conf): + def options(conf): + pass + def build(bld): +- bld.add_subdirs("xmmspriv") +- bld.add_subdirs("xmmsclientpriv") ++ bld.recurse("xmmspriv") ++ bld.recurse("xmmsclientpriv") +diff -up xmms2-0.8DrO_o/src/include/wscript.fixme xmms2-0.8DrO_o/src/include/wscript +--- xmms2-0.8DrO_o/src/include/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/include/wscript 2020-02-28 09:49:55.144637932 -0500 +@@ -17,7 +17,7 @@ def build(bld): + #bld.install_files(os.path.join(bld.env.INCLUDEDIR, 'xmms2', p), " ".join(f)) + + def configure(conf): +- conf.sub_config("xmms") ++ conf.recurse("xmms") + + return True + +diff -up xmms2-0.8DrO_o/src/include/xmms/wscript.fixme xmms2-0.8DrO_o/src/include/xmms/wscript +--- xmms2-0.8DrO_o/src/include/xmms/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/include/xmms/wscript 2020-02-28 09:49:55.144637932 -0500 +@@ -1,5 +1,5 @@ + import os, sys +-from waflib import Options, Logs ++from waflib import Options, Logs, Utils + + def build(bld): + pass +@@ -20,7 +20,7 @@ def configure(conf): + else: + conf.fatal('The "%s" output plugin could not be found.' % (preferred)) + +- if Options.platform == 'darwin': ++ if Utils.unversioned_sys_platform == 'darwin': + uconf = 'Library/xmms2' + ucache = 'Library/xmms2/logs' + else: +@@ -28,7 +28,7 @@ def configure(conf): + ucache = '.cache/xmms2' + + sharedir = os.path.join(conf.env.DATADIR, 'xmms2') +- if Options.platform == 'win32': ++ if Utils.unversioned_sys_platform == 'win32': + # The plugin path in Windows should be relative, not absolute + conf.env.PLUGINDIR = 'Plugins/' + else: +diff -up xmms2-0.8DrO_o/src/lib/xmmsutils/wscript.fixme xmms2-0.8DrO_o/src/lib/xmmsutils/wscript +--- xmms2-0.8DrO_o/src/lib/xmmsutils/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/lib/xmmsutils/wscript 2020-02-28 09:49:55.144637932 -0500 +@@ -4,7 +4,7 @@ + # Copyright (C) 2006-2011 XMMS2 Team + # + +-from waflib import Options, Logs, Errors ++from waflib import Options, Logs, Errors, Utils + + def build(bld): + source = """ +@@ -26,14 +26,14 @@ def build(bld): + + + def configure(conf): +- if Options.platform == 'win32': ++ if Utils.unversioned_sys_platform == 'win32': + conf.env.util_impl = 'win32' + else: + conf.env.util_impl = 'unix' + try: +- conf.check_cc(function_name="nanosleep", header_name="time.h") ++ conf.check_cc(header_name="time.h") + except Errors.ConfigurationError: +- conf.check_cc(function_name="nanosleep", header_name="time.h", ++ conf.check_cc(header_name="time.h", + lib="rt", uselib_store="rt") + return True + +diff -up xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript.fixme xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript +--- xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript 2020-02-28 09:49:55.144637932 -0500 +@@ -21,7 +21,7 @@ def build(bld): + + def configure(conf): + # Check for the modf function in the math lib +- conf.check_cc(function_name="modf", header_name="math.h", ++ conf.check_cc(header_name="math.h", + lib="m", uselib_store="math") + return True + +diff -up xmms2-0.8DrO_o/src/plugins/cdda/wscript.fixme xmms2-0.8DrO_o/src/plugins/cdda/wscript +--- xmms2-0.8DrO_o/src/plugins/cdda/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/plugins/cdda/wscript 2020-02-28 09:49:55.145637908 -0500 +@@ -1,11 +1,11 @@ + from waftools.plugin import plugin + +-import Options ++from waflib import Utils + + def plugin_configure(conf): + conf.check_cfg(package="libcdio_cdda", args="--cflags --libs", uselib_store="cdda") + conf.check_cfg(package="libdiscid", args="--cflags --libs", uselib_store="discid") +- if Options.platform == "win32": ++ if Utils.unversioned_sys_platform == "win32": + conf.check_cc(lib="winmm", uselib_store="winmm", args="--cflags --libs") + + configure, build = plugin("cdda", configure=plugin_configure, +diff -up xmms2-0.8DrO_o/src/plugins/curl/wscript.fixme xmms2-0.8DrO_o/src/plugins/curl/wscript +--- xmms2-0.8DrO_o/src/plugins/curl/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/plugins/curl/wscript 2020-02-28 09:49:55.145637908 -0500 +@@ -16,8 +16,7 @@ def plugin_configure(conf): + # This is a function this plugin uses and that was added to curl in + # version 7.12.0. We cannot check for the curl version as curl-config + # did not support version tests before version 7.15.0 +- conf.check_cc(function_name="curl_multi_strerror", +- header_name="curl/curl.h", uselib="curl") ++ conf.check_cc(header_name="curl/curl.h", uselib="curl") + + configure, build = plugin('curl', configure=plugin_configure, + source=source, libs=["socket", "curl"]) +diff -up xmms2-0.8DrO_o/src/plugins/daap/wscript.fixme xmms2-0.8DrO_o/src/plugins/daap/wscript +--- xmms2-0.8DrO_o/src/plugins/daap/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/plugins/daap/wscript 2020-02-28 09:49:55.146637885 -0500 +@@ -1,4 +1,4 @@ +-import Options ++from waflib import Options + from waftools.plugin import plugin + + source = """ +diff -up xmms2-0.8DrO_o/src/plugins/file/wscript.fixme xmms2-0.8DrO_o/src/plugins/file/wscript +--- xmms2-0.8DrO_o/src/plugins/file/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/plugins/file/wscript 2020-02-28 09:49:55.146637885 -0500 +@@ -7,9 +7,9 @@ def plugin_build(bld, obj): + obj.source.append('browse/gdir.c') + + def plugin_configure(conf): +- conf.check_cc(function_name='fstatat', header_name=['fcntl.h','sys/stat.h'], ++ conf.check_cc(header_name=['fcntl.h','sys/stat.h'], + defines=['_ATFILE_SOURCE=1']) +- conf.check_cc(function_name='dirfd', header_name=['dirent.h','sys/types.h']) ++ conf.check_cc(header_name=['dirent.h','sys/types.h']) + + configure, build = plugin("file", + configure=plugin_configure, build=plugin_build, +diff -up xmms2-0.8DrO_o/src/xmms/wscript.fixme xmms2-0.8DrO_o/src/xmms/wscript +--- xmms2-0.8DrO_o/src/xmms/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/src/xmms/wscript 2020-02-28 09:49:55.147637861 -0500 +@@ -5,7 +5,7 @@ + # + + import os +-from waflib import Options, Logs, Errors ++from waflib import Options, Logs, Errors, Utils + + source = """ + config.c +@@ -127,7 +127,7 @@ int main() { + + def get_statfs_impl(conf): + # Detect the type of stat call used +- if Options.platform == 'win32': ++ if Utils.unversioned_sys_platform == 'win32': + return 'dummy' + else: + try: +@@ -147,7 +147,7 @@ def get_statfs_impl(conf): + else: + return 'bsd' + else: +- if Options.platform == 'sunos': ++ if Utils.unversioned_sys_platform == 'sunos': + return 'solaris' + else: + return 'linux' +@@ -155,7 +155,7 @@ def get_statfs_impl(conf): + # Get the implementation variant for the localtime_r function. + def get_localtime_impl(conf): + try: +- conf.check_cc(function_name='localtime_r', header_name='time.h') ++ conf.check_cc(header_name='time.h') + except Errors.ConfigurationError: + return 'dummy' + else: +@@ -174,7 +174,7 @@ def get_thread_name_impl(conf): + + # Get the implementation variant for signals, symlinks and uid check. + def get_compat_impl(conf): +- if Options.platform == 'win32': ++ if Utils.unversioned_sys_platform == 'win32': + return 'dummy' + else: + return 'unix' +@@ -183,8 +183,7 @@ def get_visualization_impl(conf): + if conf.options.without_unixshmserver: + return 'dummy' + +- conf.check_cc(function_name='semctl', +- header_name=['sys/types.h','sys/ipc.h','sys/sem.h'], ++ conf.check_cc(header_name=['sys/types.h','sys/ipc.h','sys/sem.h'], + mandatory=False) + try: + conf.check_cc(fragment=semun_fragment, uselib_store="semun", +@@ -198,7 +197,7 @@ def get_visualization_impl(conf): + return 'dummy' + + def configure(conf): +- conf.check_tool('python-generator', tooldir=os.path.abspath('waftools')) ++ conf.load('python-generator', tooldir=os.path.abspath('waftools')) + + conf.check_cfg(package='gmodule-2.0', atleast_version='2.6.0', + uselib_store='gmodule2', args='--cflags --libs') +@@ -208,7 +207,7 @@ def configure(conf): + uselib_store='sqlite3', args='--cflags --libs') + + # Check for the sin function in the math lib +- conf.check_cc(lib='m', function_name='sin', header_name='math.h', ++ conf.check_cc(lib='m', header_name='math.h', + uselib_store="math") + + conf.env.compat_impl = get_compat_impl(conf) +@@ -221,11 +220,11 @@ def configure(conf): + Logs.warn("Compiling visualization without shm support") + + # Add Darwin stuff +- if Options.platform == 'darwin': ++ if Utils.unversioned_sys_platform == 'darwin': + conf.env.append_value('LINKFLAGS', ['-framework', 'CoreFoundation']) + conf.env.append_value('DEFINES', 'USE_BUNDLES') + +- conf.env.xmms_shared_library = (Options.platform == 'win32') ++ conf.env.xmms_shared_library = (Utils.unversioned_sys_platform == 'win32') + + conf.env.XMMS_PKGCONF_FILES.append(('xmms2-plugin', '')) + +diff -up xmms2-0.8DrO_o/waftools/cython_extra.py.fixme xmms2-0.8DrO_o/waftools/cython_extra.py +--- xmms2-0.8DrO_o/waftools/cython_extra.py.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/waftools/cython_extra.py 2020-02-28 09:49:55.147637861 -0500 +@@ -3,37 +3,9 @@ + + import re + from waflib import Configure +-from subprocess import Popen, STDOUT, PIPE ++import subprocess + +-# Borrowed from Python 2.7, subprocess.py +-class CalledProcessError(Exception): +- """This exception is raised when a process run by check_call() or +- check_output() returns a non-zero exit status. +- The exit status will be stored in the returncode attribute; +- check_output() will also store the output in the output attribute. +- """ +- def __init__(self, returncode, cmd, output=None): +- self.returncode = returncode +- self.cmd = cmd +- self.output = output +- def __str__(self): +- return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) +- +-# Borrowed from Python 2.7, subprocess.py +-def check_output(*popenargs, **kwargs): +- if 'stdout' in kwargs: +- raise ValueError('stdout argument not allowed, it will be overridden.') +- process = Popen(stdout=PIPE, *popenargs, **kwargs) +- output, unused_err = process.communicate() +- retcode = process.poll() +- if retcode: +- cmd = kwargs.get("args") +- if cmd is None: +- cmd = popenargs[0] +- raise CalledProcessError(retcode, cmd, output=output) +- return output +- +-cython_ver_re = re.compile('Cython version ([0-9.]+)') ++cython_ver_re = re.compile(b'Cython version ([0-9.]+)') + def check_cython_version(self, version=None, minver=None, maxver=None): + log_s = [] + if version: +@@ -53,15 +25,15 @@ def check_cython_version(self, version=N + minver = tuple(map(int, minver)) + if maxver: + maxver = tuple(map(int, maxver)) +- +- # Trick to be compatible python 2.x and 3.x +- try: +- u = unicode +- except NameError: +- u = str + +- cmd = [self.env.CYTHON, '-V'] +- o = u(check_output(cmd, stderr=STDOUT), 'UTF-8').strip() ++ if isinstance(self.env.CYTHON, list): ++ cmdbin = " " ++ cmdbin = cmdbin.join(self.env.CYTHON) ++ else: ++ cmdbin = self.env.CYTHON ++ ++ cmd = [cmdbin, '-V'] ++ o = subprocess.check_output(cmd, stderr=subprocess.STDOUT).strip() + m = cython_ver_re.match(o) + self.start_msg('Checking for cython version') + if not m: +@@ -69,11 +41,11 @@ def check_cython_version(self, version=N + self.fatal("No version found") + else: + v = m.group(1) +- ver = tuple(map(int, v.split('.'))) ++ ver = tuple(map(int, v.split(b'.'))) + check = (not minver or minver <= ver) and (not maxver or maxver >= ver) + self.to_log(' cython %s\n -> %r\n' % (" ".join(log_s), v)) + if check: +- self.end_msg(v) ++ self.end_msg(v.decode("utf-8")) + self.env.CYTHON_VERSION = ver + else: + self.end_msg('wrong version %s' % v, 'YELLOW') +diff -up xmms2-0.8DrO_o/waftools/man.py.fixme xmms2-0.8DrO_o/waftools/man.py +--- xmms2-0.8DrO_o/waftools/man.py.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/waftools/man.py 2020-02-28 09:49:55.147637861 -0500 +@@ -2,7 +2,7 @@ from waflib import Task, Errors, Utils + import os + import gzip + +-from TaskGen import feature,before_method ++from waflib.TaskGen import feature,before_method + + def gzip_func(task): + infile = task.inputs[0].abspath() +diff -up xmms2-0.8DrO_o/waftools/python-generator.py.fixme xmms2-0.8DrO_o/waftools/python-generator.py +--- xmms2-0.8DrO_o/waftools/python-generator.py.fixme 2011-10-20 15:26:08.000000000 -0400 ++++ xmms2-0.8DrO_o/waftools/python-generator.py 2020-02-28 09:49:55.147637861 -0500 +@@ -1,6 +1,5 @@ +-import Task +-import TaskGen +-from TaskGen import extension ++from waflib import TaskGen ++from waflib.TaskGen import extension + import sys + + TaskGen.declare_chain( +diff -up xmms2-0.8DrO_o/waftools/tool.py.fixme xmms2-0.8DrO_o/waftools/tool.py +--- xmms2-0.8DrO_o/waftools/tool.py.fixme 2020-02-28 09:49:55.130638264 -0500 ++++ xmms2-0.8DrO_o/waftools/tool.py 2020-02-28 09:49:55.147637861 -0500 +@@ -1,4 +1,4 @@ +-import Utils ++from waflib import Utils + import os + + def add_install_flag(bld, obj): +diff -up xmms2-0.8DrO_o/wscript.fixme xmms2-0.8DrO_o/wscript +--- xmms2-0.8DrO_o/wscript.fixme 2020-02-28 09:49:55.141638004 -0500 ++++ xmms2-0.8DrO_o/wscript 2020-02-28 09:50:32.736746099 -0500 +@@ -113,9 +113,9 @@ def build(bld): + bld.fatal("You need to run waf configure") + raise SystemExit() + +- bld.add_subdirs(subdirs) +- bld.add_subdirs(plugindirs) +- bld.add_subdirs(optionaldirs) ++ bld.recurse(subdirs) ++ bld.recurse(plugindirs) ++ bld.recurse(optionaldirs) + + for name, lib in bld.env.XMMS_PKGCONF_FILES: + bld(features = 'subst', +@@ -170,7 +170,7 @@ def _configure_optionals(conf): + for o in selected_optionals: + x = [x for x in optional_subdirs if os.path.basename(x) == o][0] + try: +- conf.sub_config(x) ++ conf.recurse(x) + conf.env.append_value('XMMS_OPTIONAL_BUILD', x) + succeeded_optionals.add(o) + except Errors.ConfigurationError: +@@ -220,7 +220,7 @@ def _configure_plugins(conf): + + for plugin in selected_plugins: + try: +- conf.sub_config("src/plugins/%s" % plugin) ++ conf.recurse("src/plugins/%s" % plugin) + if (not conf.env.XMMS_PLUGINS_ENABLED or + (len(conf.env.XMMS_PLUGINS_ENABLED) > 0 and + conf.env.XMMS_PLUGINS_ENABLED[-1] != plugin)): +@@ -277,14 +277,14 @@ def configure(conf): + conf.env.BUILD_XMMS2D = True + subdirs.insert(0, "src/xmms") + +- conf.check_tool('gnu_dirs') +- conf.check_tool('man', tooldir=os.path.abspath('waftools')) +- conf.check_tool('misc') +- conf.check_tool('gcc') +- conf.check_tool('g++') ++ conf.load('gnu_dirs') ++ conf.load('man', tooldir=os.path.abspath('waftools')) ++ ## conf.load('misc') ++ conf.load('gcc') ++ conf.load('g++') + +- if conf.options.target_platform: +- Options.platform = conf.options.target_platform ++ ## if conf.options.target_platform: ++ ## Options.platform = conf.options.target_platform + + nam,changed = gittools.get_info() + conf.msg("git commit id", nam) +@@ -340,7 +340,7 @@ def configure(conf): + conf.env.prepend_value('LIBPATH', os.path.join(d, 'lib')) + conf.env.prepend_value('CPPPATH', os.path.join(d, 'include')) + +- if Options.platform != 'win32': ++ if Utils.unversioned_sys_platform != 'win32': + conf.env.append_unique('CFLAGS_cstlib', ['-fPIC', '-DPIC']) + conf.env.append_unique('CPPFLAGS_cxxshlib', ['-fPIC', '-DPIC']) + else: +@@ -356,14 +356,14 @@ def configure(conf): + conf.env.cshlib_PATTERN = 'lib%s.dll' + conf.env.cprogram_PATTERN = '%s.exe' + +- if Options.platform == 'darwin': ++ if Utils.unversioned_sys_platform == 'darwin': + conf.env.append_value('LINKFLAGS', '-multiply_defined_suppress') + conf.env.explicit_install_name = True + else: + conf.env.explicit_install_name = False + +- if Options.platform == 'sunos': +- conf.check_cc(function_name='socket', lib='socket', header_name='sys/socket.h', uselib_store='socket') ++ if Utils.unversioned_sys_platform == 'sunos': ++ conf.check_cc(lib='socket', header_name='sys/socket.h', uselib_store='socket') + if not conf.env.HAVE_SOCKET: + conf.fatal("xmms2 requires libsocket on Solaris.") + raise SystemExit(1) +@@ -371,7 +371,7 @@ def configure(conf): + conf.env.append_unique('CFLAGS', '-D_REENTRANT') + conf.env.append_unique('CFLAGS', '-std=gnu99') + conf.env.socket_impl = 'socket' +- elif Options.platform == 'win32': ++ elif Utils.unversioned_sys_platform == 'win32': + if conf.options.winver: + major, minor = [int(x) for x in Options.options.winver.split('.')] + else: +@@ -413,9 +413,9 @@ int main() { return 0; } + conf.env.socket_impl = 'posix' + + conf.env.xmms_icon = False +- if Options.platform == 'win32': ++ if Utils.unversioned_sys_platform == 'win32': + try: +- conf.check_tool('winres') ++ conf.load('winres') + except Errors.ConfigurationError: + pass + else: +@@ -425,7 +425,7 @@ int main() { return 0; } + # TaskGen.mac_bundle option seems to be no longer silently ignored + # if gcc -bundle option is not available. + # TODO: Add --no-mac-bundle in options ? +- conf.env.mac_bundle_enabled = Options.platform == 'darwin' ++ conf.env.mac_bundle_enabled = Utils.unversioned_sys_platform == 'darwin' + + conf.check_cfg(package='glib-2.0', atleat_version='2.8.0', + uselib_store='glib2', args='--cflags --libs') +@@ -439,7 +439,7 @@ int main() { return 0; } + newest = get_newest(subdirs, plugindirs, optionaldirs) + conf.env.NEWEST_WSCRIPT_SUBDIR = newest + +- [conf.sub_config(s) for s in subdirs] ++ [conf.recurse(s) for s in subdirs] + conf.write_config_header('xmms_configuration.h') + + output_plugins = [name for x, name in conf.env.XMMS_OUTPUT_PLUGINS if x > 0] +@@ -464,8 +464,8 @@ def _list_cb(option, opt, value, parser) + setattr(parser.values, option.dest, vals) + + def options(opt): +- opt.tool_options('gnu_dirs') +- opt.tool_options('gcc') ++ opt.load('gnu_dirs') ++ opt.load('gcc') + + opt.add_option('--with-custom-version', type='string', + dest='customversion', help="Override git commit hash version") +@@ -503,9 +503,9 @@ def options(opt): + opt.add_option('--without-ldconfig', action='store_false', + dest='ldconfig', help="Don't run ldconfig after install") + +- opt.sub_options("src/xmms") ++ opt.recurse("src/xmms") + for o in optional_subdirs + subdirs: +- opt.sub_options(o) ++ opt.recurse(o) + + def shutdown(ctx): + if ctx.cmd != 'install': diff --git a/xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch b/xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch new file mode 100644 index 0000000..43ba29b --- /dev/null +++ b/xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch @@ -0,0 +1,36 @@ +diff -up xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h.spot xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h +--- xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h.spot 2020-02-28 10:15:31.578897880 -0500 ++++ xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h 2020-02-28 10:15:46.242585829 -0500 +@@ -75,7 +75,7 @@ const gchar *xmms_collection_get_namespa + gboolean xmms_collection_get_int_attr (xmmsv_coll_t *coll, const gchar *attrname, gint *val); + gboolean xmms_collection_set_int_attr (xmmsv_coll_t *coll, const gchar *attrname, gint newval); + +-GTree *xmms_collection_changed_msg_new (xmms_collection_changed_actions_t type, const gchar *plname, const gchar *namespace); ++GTree *xmms_collection_changed_msg_new (xmmsc_collection_changed_actions_t type, const gchar *plname, const gchar *namespace); + void xmms_collection_changed_msg_send (xmms_coll_dag_t *colldag, GTree *dict); + + void bind_all_references (xmms_coll_dag_t *dag, xmmsv_coll_t *coll, xmmsv_coll_t *parent, void *udata); +diff -up xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h.spot xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h +--- xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h.spot 2020-02-28 10:15:18.475176735 -0500 ++++ xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h 2020-02-28 10:15:22.698086869 -0500 +@@ -193,7 +193,7 @@ typedef enum { + XMMS_COLLECTION_CHANGED_UPDATE, + XMMS_COLLECTION_CHANGED_RENAME, + XMMS_COLLECTION_CHANGED_REMOVE +-} xmms_collection_changed_actions_t; ++} xmmsc_collection_changed_actions_t; + + typedef enum { + XMMS_PLAYBACK_STATUS_STOP, +diff -up xmms2-0.8DrO_o/src/xmms/collection.c.spot xmms2-0.8DrO_o/src/xmms/collection.c +--- xmms2-0.8DrO_o/src/xmms/collection.c.spot 2020-02-28 10:15:56.804361068 -0500 ++++ xmms2-0.8DrO_o/src/xmms/collection.c 2020-02-28 10:16:03.248223939 -0500 +@@ -144,7 +144,7 @@ static void xmms_collection_client_sync + #include "collection_ipc.c" + + GTree * +-xmms_collection_changed_msg_new (xmms_collection_changed_actions_t type, ++xmms_collection_changed_msg_new (xmmsc_collection_changed_actions_t type, + const gchar *plname, const gchar *namespace) + { + GTree *dict; diff --git a/xmms2.spec b/xmms2.spec index d53b0d2..4d93a00 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 67%{?dist} +Release: 68%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -35,8 +35,15 @@ Patch9: xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch Patch10: xmms2-0.8DrO_o-openssl-1.1.patch # Swap mind.in.a.box for free.music.and.free.beer Patch11: xmms2-0.8DrO_o-no-mind.in.a.box.patch +# Use system waf +# This is ugly and not kosher for upstream... then again, I think upstream is dead. +Patch12: xmms2-0.8DrO_o-use-system-waf.patch +# Python3 +Patch13: xmms2-0.8DrO_o-python3.patch +# Fix naming issue with xmms_collection_changed_actions_t +Patch14: xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch URL: http://wiki.xmms2.xmms.se/ -BuildRequires: python2 +BuildRequires: python3 BuildRequires: sqlite-devel BuildRequires: flac-devel BuildRequires: libofa-devel @@ -79,6 +86,7 @@ BuildRequires: ncurses-devel BuildRequires: perl-ExtUtils-ParseXS BuildRequires: gcc BuildRequires: gcc-c++ +BuildRequires: waf Obsoletes: xmms2-mad < 0.8-26 Provides: xmms2-mad = %{version}-%{release} @@ -148,6 +156,9 @@ it executes the command passed as argument directly. %patch8 -p1 -b .vorbis_libs %patch10 -p1 -b .openssl11 %patch11 -p1 -b .nomind +%patch12 -p1 -b .fixme +%patch13 -p1 -b .py3 +%patch14 -p1 -b .namefix cp %{SOURCE2} . # This header doesn't need to be executable @@ -159,35 +170,28 @@ chmod -x src/include/xmmsclient/xmmsclient++/dict.h # sed -i 's|/usr/lib|%{_libdir}|g' $i # done # sed -i 's|"lib"|"%{_lib}"|g' wscript +%if 0 for i in doc/tutorial/python/tut1.py doc/tutorial/python/tut2.py doc/tutorial/python/tut3.py doc/tutorial/python/tut4.py doc/tutorial/python/tut5.py doc/tutorial/python/tut6.py utils/gen-tree-hashes.py utils/gen-wiki-release-bugs.py utils/gen-tarball.py utils/gen-wiki-release-authors.py waf waftools/podselect.py waftools/genipc.py waftools/genipc_server.py waftools/cython.py; do sed -i 's|#!/usr/bin/env python|#!/usr/bin/python2|g' $i done +%endif %build -export CFLAGS="%{optflags}" +export CFLAGS="%{optflags} -DHAVE_G_FILE_QUERY_FILE_TYPE" export CPPFLAGS="%{optflags}" export LIBDIR="%{_libdir}" export XSUBPP="%{_bindir}/xsubpp" -# Now with ruby22, the following waf fails until applying PATCH9 -# Really want to know how to patch against waf beforehand... -./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ - --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 || true -( - cd .waf-1.* - cat %PATCH9 | patch -p2 -) -# Hacky, hacky, hacky. -patch -p0 < %{_sourcedir}/xmms2-0.8DrO_o-xsubpp-fix.patch -./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ - --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 -./waf build -v %{?_smp_mflags} + +waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ +--with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 +waf build -v %{?_smp_mflags} + # make the docs doxygen %install -rm -rf %{buildroot} export LIBDIR="%{_libdir}" -./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ +waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig # exec flags for debuginfo @@ -208,7 +212,7 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} # For F-32: # Explicitly remove python2 related files. F32 "python27" package # contains header files, which makes xmms2 build python2 bindings -rm -rf %{buildroot}%{python2_sitelib}/xmmsclient/ +rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %ldconfig_scriptlets @@ -245,6 +249,9 @@ rm -rf %{buildroot}%{python2_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Fri Feb 28 2020 Tom Callaway - 0.8-68 +- abandon all hope ye who enter here + * Fri Jan 31 2020 Fedora Release Engineering - 0.8-67 - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 871884e12fea148096b73f0dd8094e69e4ea3e5e Mon Sep 17 00:00:00 2001 From: Adrian Reber Date: Tue, 7 Apr 2020 17:01:54 +0200 Subject: [PATCH 06/49] Rebuilt for libcdio-2.1.0 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 4d93a00..36348b1 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 68%{?dist} +Release: 69%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -249,6 +249,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Tue Mar 31 2020 Adrian Reber - 0.8-69 +- Rebuilt for libcdio-2.1.0 + * Fri Feb 28 2020 Tom Callaway - 0.8-68 - abandon all hope ye who enter here From 37d8e3516764c57d51cf64a6dc107b1801a0e907 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 22 Jun 2020 17:43:46 +0200 Subject: [PATCH 07/49] Perl 5.32 rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 36348b1..ede524e 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 69%{?dist} +Release: 70%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -249,6 +249,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Mon Jun 22 2020 Jitka Plesnikova - 0.8-70 +- Perl 5.32 rebuild + * Tue Mar 31 2020 Adrian Reber - 0.8-69 - Rebuilt for libcdio-2.1.0 From efa2da6fb019816e6c656f811021e29a1ec10057 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jul 2020 14:52:23 +0000 Subject: [PATCH 08/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index ede524e..172eb38 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 70%{?dist} +Release: 71%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -249,6 +249,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Wed Jul 29 2020 Fedora Release Engineering - 0.8-71 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Mon Jun 22 2020 Jitka Plesnikova - 0.8-70 - Perl 5.32 rebuild From ace0eb3a207a0b95e0dbf157343443288d074c56 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 1 Aug 2020 09:46:04 +0000 Subject: [PATCH 09/49] - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 172eb38..41ef525 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 71%{?dist} +Release: 72%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -249,6 +249,10 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Sat Aug 01 2020 Fedora Release Engineering - 0.8-72 +- Second attempt - Rebuilt for + https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jul 29 2020 Fedora Release Engineering - 0.8-71 - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From ea80d310549681f3e68512826690bb832536b364 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 6 Jan 2021 19:36:04 +0900 Subject: [PATCH 10/49] F-34: rebuild against ruby 3.0 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 41ef525..b7eccbf 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 72%{?dist} +Release: 73%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -249,6 +249,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Wed Jan 06 2021 Mamoru TASAKA - 0.8-73 +- F-34: rebuild against ruby 3.0 + * Sat Aug 01 2020 Fedora Release Engineering - 0.8-72 - Second attempt - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From 1d3181c3c547a81e1bd4b0ae83a317616b14f855 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 28 Jan 2021 00:11:43 +0000 Subject: [PATCH 11/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index b7eccbf..3390081 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 73%{?dist} +Release: 74%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -249,6 +249,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Thu Jan 28 2021 Fedora Release Engineering - 0.8-74 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jan 06 2021 Mamoru TASAKA - 0.8-73 - F-34: rebuild against ruby 3.0 From 87375aca267db04d76d6e72107f37b4197cd0f0c Mon Sep 17 00:00:00 2001 From: Kalev Lember Date: Wed, 3 Feb 2021 08:25:03 +0100 Subject: [PATCH 12/49] Drop unused gamin-devel build dep --- xmms2.spec | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/xmms2.spec b/xmms2.spec index 3390081..2d8ffa2 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 74%{?dist} +Release: 75%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -68,7 +68,6 @@ BuildRequires: boost-devel BuildRequires: pulseaudio-libs-devel BuildRequires: libmodplug-devel BuildRequires: ecore-devel -BuildRequires: gamin-devel BuildRequires: mpg123-devel BuildRequires: libmad-devel BuildRequires: doxygen @@ -249,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Wed Feb 03 2021 Kalev Lember - 0.8-75 +- Drop unused gamin-devel build dep + * Thu Jan 28 2021 Fedora Release Engineering - 0.8-74 - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild From a8ea38702f5af6b3378571b4aa75618ecc12fb6a Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 21 May 2021 23:57:48 +0200 Subject: [PATCH 13/49] Perl 5.34 rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 2d8ffa2..03bf6e2 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 75%{?dist} +Release: 76%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Fri May 21 2021 Jitka Plesnikova - 0.8-76 +- Perl 5.34 rebuild + * Wed Feb 03 2021 Kalev Lember - 0.8-75 - Drop unused gamin-devel build dep From a9388af96056eab7783eaccb5b70ca29c984a46e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 23 Jul 2021 21:44:49 +0000 Subject: [PATCH 14/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 03bf6e2..b3b9b12 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 76%{?dist} +Release: 77%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Fri Jul 23 2021 Fedora Release Engineering - 0.8-77 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Fri May 21 2021 Jitka Plesnikova - 0.8-76 - Perl 5.34 rebuild From 2bedf1adecc60e46599d4ac3739b3df1dce7072d Mon Sep 17 00:00:00 2001 From: Sahana Prasad Date: Tue, 14 Sep 2021 19:18:10 +0200 Subject: [PATCH 15/49] Rebuilt with OpenSSL 3.0.0 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index b3b9b12..e3603ce 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 77%{?dist} +Release: 78%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Tue Sep 14 2021 Sahana Prasad - 0.8-78 +- Rebuilt with OpenSSL 3.0.0 + * Fri Jul 23 2021 Fedora Release Engineering - 0.8-77 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 1b55c7cdff5c72dda1e0a4de10ec2de9af3cdb48 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jan 2022 05:17:28 +0000 Subject: [PATCH 16/49] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index e3603ce..a2feb71 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 78%{?dist} +Release: 79%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Sat Jan 22 2022 Fedora Release Engineering - 0.8-79 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Tue Sep 14 2021 Sahana Prasad - 0.8-78 - Rebuilt with OpenSSL 3.0.0 From 8938a21b80e048de6e5ee8e56015bb4c0552808a Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 27 Jan 2022 08:24:34 +0900 Subject: [PATCH 17/49] F-36: rebuild against ruby31 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index a2feb71..9df8d32 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 79%{?dist} +Release: 80%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Wed Jan 26 2022 Mamoru TASAKA - 0.8-80 +- F-36: rebuild against ruby31 + * Sat Jan 22 2022 Fedora Release Engineering - 0.8-79 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From e2c47768959287b0a7a1b849f4b34ffae0d2843c Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Mon, 30 May 2022 19:21:54 +0200 Subject: [PATCH 18/49] Perl 5.36 rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 9df8d32..4f4e9c7 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 80%{?dist} +Release: 81%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Mon May 30 2022 Jitka Plesnikova - 0.8-81 +- Perl 5.36 rebuild + * Wed Jan 26 2022 Mamoru TASAKA - 0.8-80 - F-36: rebuild against ruby31 From 26c3958340c60bc4297994da96611e81dc15e184 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 23 Jul 2022 13:19:28 +0000 Subject: [PATCH 19/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 4f4e9c7..1a99f02 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 81%{?dist} +Release: 82%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Sat Jul 23 2022 Fedora Release Engineering - 0.8-82 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Mon May 30 2022 Jitka Plesnikova - 0.8-81 - Perl 5.36 rebuild From 6c43df084393bfc3d37389fb327990fafadf87e4 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 15 Sep 2022 09:09:07 +0900 Subject: [PATCH 20/49] Rebuild for new flac --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 1a99f02..ff51936 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 82%{?dist} +Release: 83%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Thu Sep 15 2022 Mamoru TASAKA - 0.8-83 +- Rebuild for new flac + * Sat Jul 23 2022 Fedora Release Engineering - 0.8-82 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 212108082d896d7f6fcf55c7588b25e40881c493 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 4 Jan 2023 15:25:48 +0900 Subject: [PATCH 21/49] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index ff51936..5ea9572 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 83%{?dist} +Release: 84%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -248,6 +248,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Wed Jan 04 2023 Mamoru TASAKA - 0.8-84 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 + * Thu Sep 15 2022 Mamoru TASAKA - 0.8-83 - Rebuild for new flac From b59acb6c7232d859f8fa375490085b39e75629f1 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Fri, 13 Jan 2023 21:19:01 +0100 Subject: [PATCH 22/49] Remove perl(MODULE_COMPAT), it will be replaced by generators --- xmms2.spec | 1 - 1 file changed, 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 5ea9572..e5b251e 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -123,7 +123,6 @@ API documentation for the XMMS2 modular audio framework architecture. Summary: Perl support for XMMS2 License: GPL+ or Artistic Requires: %{name} = %{version}-%{release} -Requires: perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version)) %description perl Perl bindings for XMMS2. From 271b73f67bf03a92c3939a7cf9b085631032e6a5 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 21 Jan 2023 07:40:02 +0000 Subject: [PATCH 23/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index e5b251e..c05c16e 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 84%{?dist} +Release: 85%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -247,6 +247,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Sat Jan 21 2023 Fedora Release Engineering - 0.8-85 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Wed Jan 04 2023 Mamoru TASAKA - 0.8-84 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.2 From f5f29c78e1fac1edd01e85e313937e678d70533f Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 17 Mar 2023 13:15:03 -0400 Subject: [PATCH 24/49] Rebuilt for libmpcdec 1.3.0 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index c05c16e..530cb0c 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 85%{?dist} +Release: 86%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -247,6 +247,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Fri Mar 17 2023 Yaakov Selkowitz - 0.8-86 +- Rebuilt for libmpcdec 1.3.0 + * Sat Jan 21 2023 Fedora Release Engineering - 0.8-85 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild From 6cc171f3e2f471480b759bf3f9f0d0a506a39a37 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 11 Jul 2023 16:10:14 +0200 Subject: [PATCH 25/49] Perl 5.38 rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 530cb0c..691cb6c 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 86%{?dist} +Release: 87%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -247,6 +247,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Tue Jul 11 2023 Jitka Plesnikova - 0.8-87 +- Perl 5.38 rebuild + * Fri Mar 17 2023 Yaakov Selkowitz - 0.8-86 - Rebuilt for libmpcdec 1.3.0 From b8deea3a187b4b549bafc14a447c94e843c7f786 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 22 Jul 2023 19:03:40 +0000 Subject: [PATCH 26/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 691cb6c..d4e8bb8 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -4,7 +4,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 87%{?dist} +Release: 88%{?dist} License: LGPLv2+ and GPLv2+ and BSD # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -247,6 +247,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{_bindir}/nyxmms2 %changelog +* Sat Jul 22 2023 Fedora Release Engineering - 0.8-88 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Jul 11 2023 Jitka Plesnikova - 0.8-87 - Perl 5.38 rebuild From d8f98f98036e089b2998b839c52c8fb185024607 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Sep 2023 16:35:14 -0400 Subject: [PATCH 27/49] 0.9.3 --- .gitignore | 1 + sources | 2 +- ...0.8DrO_o-libmodplug-pkgconfig-change.patch | 11 - xmms2-0.8DrO_o-moresaneversioning.patch | 32 - xmms2-0.8DrO_o-no-O0.patch | 14 - xmms2-0.8DrO_o-openssl-1.1.patch | 41 -- xmms2-0.8DrO_o-pulse-output-default.patch | 10 - xmms2-0.8DrO_o-python3.patch | 44 -- ...DrO_o-ruby22-remove-deprecated-usage.patch | 11 - xmms2-0.8DrO_o-use-libdir.patch | 10 - xmms2-0.8DrO_o-use-system-waf.patch | 677 ------------------ xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch | 30 - ...msc_collection_changed_actions_t-fix.patch | 36 - xmms2-0.8DrO_o-xsubpp-fix.patch | 12 - xmms2-0.9.3-no-mind-in-a-box.patch | 40 ++ xmms2.spec | 111 +-- 16 files changed, 79 insertions(+), 1003 deletions(-) delete mode 100644 xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch delete mode 100644 xmms2-0.8DrO_o-moresaneversioning.patch delete mode 100644 xmms2-0.8DrO_o-no-O0.patch delete mode 100644 xmms2-0.8DrO_o-openssl-1.1.patch delete mode 100644 xmms2-0.8DrO_o-pulse-output-default.patch delete mode 100644 xmms2-0.8DrO_o-python3.patch delete mode 100644 xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch delete mode 100644 xmms2-0.8DrO_o-use-libdir.patch delete mode 100644 xmms2-0.8DrO_o-use-system-waf.patch delete mode 100644 xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch delete mode 100644 xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch delete mode 100644 xmms2-0.8DrO_o-xsubpp-fix.patch create mode 100644 xmms2-0.9.3-no-mind-in-a-box.patch diff --git a/.gitignore b/.gitignore index b1ee736..24cd549 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ xmms2-0.7DrNo-clean.tar.bz2 /xmms2-0.8DrO_o-clean.tar.bz2 /unreal_dm-free.music.and.free.beer.ogg +/xmms2-0.9.3-clean.tar.xz diff --git a/sources b/sources index e2df1ea..7671a35 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (xmms2-0.8DrO_o-clean.tar.bz2) = ab14d08baa7625e69f316e53ca9673ec8fec0a7f3cecd5656f74c317351ef033ce865acc7f3884caac22e2296bfa8f2eda866ef89a28d91ab5b4a62614879198 SHA512 (unreal_dm-free.music.and.free.beer.ogg) = 436389158cad78a95f62a1e4de2e9add243d9fb027dec57022d9b1791ccb203539a9562bb5ffaba5918533fec79a5e2b32415eac0bc467fc8441f4906bff1225 +SHA512 (xmms2-0.9.3-clean.tar.xz) = 06dfe5aef11f57fe2049e28b370f2ecb9dabdf9c6f8b18132730d0c45f9a6548d9c2ba97fdee7e03e3f64e95a128edde266ce670d3f1f7bcb1badab714154351 diff --git a/xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch b/xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch deleted file mode 100644 index 66964e7..0000000 --- a/xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmms2-0.8DrO_o/src/plugins/modplug/modplug.c.header 2011-10-21 04:26:08.000000000 +0900 -+++ xmms2-0.8DrO_o/src/plugins/modplug/modplug.c 2014-05-07 14:31:14.830068685 +0900 -@@ -9,7 +9,7 @@ - #include "xmms/xmms_sample.h" - #include "xmms/xmms_medialib.h" - #include "xmms/xmms_log.h" --#include -+#include - - #include - #include diff --git a/xmms2-0.8DrO_o-moresaneversioning.patch b/xmms2-0.8DrO_o-moresaneversioning.patch deleted file mode 100644 index 3ded289..0000000 --- a/xmms2-0.8DrO_o-moresaneversioning.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -up xmms2-0.8DrO_o/wscript.versionsanity xmms2-0.8DrO_o/wscript ---- xmms2-0.8DrO_o/wscript.versionsanity 2011-12-05 15:19:56.000000000 -0500 -+++ xmms2-0.8DrO_o/wscript 2011-12-05 15:22:01.885508715 -0500 -@@ -19,7 +19,7 @@ from waflib import Configure, Options, U - from waftools.compiler_flags import compiler_flags - from waftools import gittools - --BASEVERSION="0.8 DrO_o" -+BASEVERSION="0.8" - APPNAME='xmms2' - - top = '.' -@@ -288,12 +288,13 @@ def configure(conf): - - nam,changed = gittools.get_info() - conf.msg("git commit id", nam) -- if conf.options.customversion: -- conf.env.VERSION = "%s (%s + %s)" % (BASEVERSION, nam, conf.options.customversion) -- else: -- dirty = changed and "-dirty" or "" -- conf.msg("uncommited changed", changed and "yes" or "no") -- conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty) -+ ## if conf.options.customversion: -+ ## conf.env.VERSION = "%s (%s + %s)" % (BASEVERSION, nam, conf.options.customversion) -+ ## else: -+ ## dirty = changed and "-dirty" or "" -+ ## conf.msg("uncommited changed", changed and "yes" or "no") -+ ## conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty) -+ conf.env.VERSION = "%s" % (BASEVERSION) - - ## conf.env.append_unique('CFLAGS', ['-g', '-O0']) - ## conf.env.append_unique('CXXFLAGS', ['-g', '-O0']) diff --git a/xmms2-0.8DrO_o-no-O0.patch b/xmms2-0.8DrO_o-no-O0.patch deleted file mode 100644 index 79c41e9..0000000 --- a/xmms2-0.8DrO_o-no-O0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up xmms2-0.8DrO_o/wscript.noO0 xmms2-0.8DrO_o/wscript ---- xmms2-0.8DrO_o/wscript.noO0 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/wscript 2011-12-05 15:19:15.962065486 -0500 -@@ -295,8 +295,8 @@ def configure(conf): - conf.msg("uncommited changed", changed and "yes" or "no") - conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty) - -- conf.env.append_unique('CFLAGS', ['-g', '-O0']) -- conf.env.append_unique('CXXFLAGS', ['-g', '-O0']) -+ ## conf.env.append_unique('CFLAGS', ['-g', '-O0']) -+ ## conf.env.append_unique('CXXFLAGS', ['-g', '-O0']) - - if conf.options.with_profiling: - conf.env.with_profiling = True diff --git a/xmms2-0.8DrO_o-openssl-1.1.patch b/xmms2-0.8DrO_o-openssl-1.1.patch deleted file mode 100644 index e2157b2..0000000 --- a/xmms2-0.8DrO_o-openssl-1.1.patch +++ /dev/null @@ -1,41 +0,0 @@ -diff -up xmms2-0.8DrO_o/src/plugins/airplay/raop_client.c.openssl11 xmms2-0.8DrO_o/src/plugins/airplay/raop_client.c ---- xmms2-0.8DrO_o/src/plugins/airplay/raop_client.c.openssl11 2016-10-18 12:11:20.170416850 -0400 -+++ xmms2-0.8DrO_o/src/plugins/airplay/raop_client.c 2016-10-18 12:18:19.315015550 -0400 -@@ -31,6 +31,15 @@ - #define RAOP_RTSP_CONNECTED 0x40 - #define RAOP_RTSP_DONE 0x80 - -+/* Openssl 1.1.0 broke compatibility. We could depend on openssl 1.1.0, but -+ * it may take some time before distributions are able to upgrade to the new -+ * openssl version. To insulate ourselves from such transition problems, let's -+ * add a compatibility macro. -+ */ -+#if OPENSSL_VERSION_NUMBER < 0x10100000L -+#define RSA_set0_key(r, n_, e_, d) (r->n = n_, r->e = e_, 1) -+#endif -+ - typedef enum audio_jack_status { - AUDIO_JACK_CONNECTED, - AUDIO_JACK_DISCONNECTED -@@ -110,6 +119,8 @@ static gint - raop_rsa_encrypt (guchar *text, gint len, guchar *res) - { - RSA *rsa; -+ BIGNUM *n_bn; -+ BIGNUM *e_bn; - size_t size; - static const guchar mod[] = { - 0xe7,0xd7,0x44,0xf2,0xa2,0xe2,0x78,0x8b,0x6c,0x1f,0x55,0xa0, -@@ -137,8 +148,10 @@ raop_rsa_encrypt (guchar *text, gint len - static const guchar exp[] = {0x01, 0x00, 0x01}; - - rsa = RSA_new (); -- rsa->n = BN_bin2bn (mod, 256, NULL); -- rsa->e = BN_bin2bn (exp, 3, NULL); -+ n_bn = BN_bin2bn (mod, 256, NULL); -+ e_bn = BN_bin2bn (exp, 3, NULL); -+ /* TODO: Catch error here? */ -+ RSA_set0_key(rsa, n_bn, e_bn, NULL); - - size = RSA_public_encrypt (len, text, res, rsa, RSA_PKCS1_OAEP_PADDING); - diff --git a/xmms2-0.8DrO_o-pulse-output-default.patch b/xmms2-0.8DrO_o-pulse-output-default.patch deleted file mode 100644 index 70c35a4..0000000 --- a/xmms2-0.8DrO_o-pulse-output-default.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up xmms2-0.8DrO_o/src/plugins/pulse/wscript.default-output-pulse xmms2-0.8DrO_o/src/plugins/pulse/wscript ---- xmms2-0.8DrO_o/src/plugins/pulse/wscript.default-output-pulse 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/plugins/pulse/wscript 2011-12-05 14:59:38.466393458 -0500 -@@ -3,5 +3,5 @@ from waftools.plugin import plugin - def plugin_configure(conf): - conf.check_cfg(package="libpulse", args="--cflags --libs", uselib_store="pulse") - --configure, build = plugin("pulse", configure=plugin_configure, output_prio=25, -+configure, build = plugin("pulse", configure=plugin_configure, output_prio=45, - libs=["pulse"]) diff --git a/xmms2-0.8DrO_o-python3.patch b/xmms2-0.8DrO_o-python3.patch deleted file mode 100644 index 219340b..0000000 --- a/xmms2-0.8DrO_o-python3.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -up xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd.py3 xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd ---- xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd.py3 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsapi.pxd 2020-02-28 09:57:34.639494568 -0500 -@@ -1,3 +1,5 @@ -+# cython: language_level=3 -+ - from xmmsvalue cimport Collection, XmmsValue - from cxmmsvalue cimport * - from cxmmsclient cimport * -diff -up xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd.py3 xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd ---- xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd.py3 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/python/cython_include/xmmsvalue.pxd 2020-02-28 09:57:34.639494568 -0500 -@@ -1,4 +1,5 @@ - #needs to reimport required symbols from .h files. -+# cython: language_level=3 - - cdef extern from "xmmsc/xmmsv.h": - ctypedef struct xmmsv_t -diff -up xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx.py3 xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx ---- xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx.py3 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/python/xmmsapi.pyx 2020-02-28 09:59:05.686592346 -0500 -@@ -1358,22 +1358,6 @@ cdef class XmmsApi(XmmsCore): - res = xmmsc_medialib_import_path(self.conn, p) - return self.create_result(cb, res) - -- @deprecated -- def medialib_path_import(self, path, cb = None, encoded=False): -- """ -- @deprecated -- Use medialib_import_path(path, ...) instead -- """ -- return self.medialib_import_path(self, path, cb=cb, encoded=encoded) -- -- @deprecated -- def medialib_path_import_encoded(self, path, cb = None): -- """ -- @deprecated -- Use medialib_import_path(path, ..., encoded=True) instead -- """ -- return self.medialib_import_path(self, path, cb=cb, encoded=True) -- - cpdef XmmsResult medialib_property_set(self, int id, key, value, source=None, cb=None): - """ - medialib_property_set(id, key, value, source=None, cb=None) -> XmmsResult diff --git a/xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch b/xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch deleted file mode 100644 index 611a22e..0000000 --- a/xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- xmms2-0.8DrO_o/.waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/ruby.py.rbconfig 2015-01-16 17:04:41.900715116 +0900 -+++ xmms2-0.8DrO_o/.waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/ruby.py 2015-01-16 17:18:02.144349327 +0900 -@@ -45,7 +45,7 @@ - def read_out(cmd): - return Utils.to_list(self.cmd_and_log([self.env.RUBY,'-rrbconfig','-e',cmd])) - def read_config(key): -- return read_out('puts Config::CONFIG[%r]'%key) -+ return read_out('puts RbConfig::CONFIG[%r]'%key) - ruby=self.env['RUBY'] - archdir=read_config('archdir') - cpppath=archdir diff --git a/xmms2-0.8DrO_o-use-libdir.patch b/xmms2-0.8DrO_o-use-libdir.patch deleted file mode 100644 index a4e6623..0000000 --- a/xmms2-0.8DrO_o-use-libdir.patch +++ /dev/null @@ -1,10 +0,0 @@ -diff -up xmms2-0.8DrO_o/waftools/tool.py.plugins-use-libdir xmms2-0.8DrO_o/waftools/tool.py ---- xmms2-0.8DrO_o/waftools/tool.py.plugins-use-libdir 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/waftools/tool.py 2011-12-05 14:56:47.867995794 -0500 -@@ -6,5 +6,5 @@ def add_install_flag(bld, obj): - - if env['explicit_install_name']: - libname = obj.env["cshlib_PATTERN"] % obj.target -- insname = os.path.join(obj.env["PREFIX"], 'lib', libname) -+ insname = os.path.join(obj.env["LIBDIR"], libname) - obj.env.append_unique("LINKFLAGS", ["-install_name", insname]) diff --git a/xmms2-0.8DrO_o-use-system-waf.patch b/xmms2-0.8DrO_o-use-system-waf.patch deleted file mode 100644 index 002ab4b..0000000 --- a/xmms2-0.8DrO_o-use-system-waf.patch +++ /dev/null @@ -1,677 +0,0 @@ -diff -up xmms2-0.8DrO_o/src/clients/et/wscript.fixme xmms2-0.8DrO_o/src/clients/et/wscript ---- xmms2-0.8DrO_o/src/clients/et/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/et/wscript 2020-02-28 09:49:55.142637980 -0500 -@@ -23,9 +23,9 @@ def build(bld): - - - def configure(conf): -- if Options.platform == "win32": -+ if Utils.unversioned_sys_platform == "win32": - conf.fatal("Not supported on Windows") -- elif Options.platform == "sunos": -+ elif Utils.unversioned_sys_platform == "sunos": - conf.check_cc(lib="resolv", uselib_store="resolv", mandatory=True) - return True - -diff -up xmms2-0.8DrO_o/src/clients/launcher/wscript.fixme xmms2-0.8DrO_o/src/clients/launcher/wscript ---- xmms2-0.8DrO_o/src/clients/launcher/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/launcher/wscript 2020-02-28 09:49:55.142637980 -0500 -@@ -1,4 +1,4 @@ --import Options -+from waflib import Utils - - def build(bld): - bld(features = 'c cprogram', -@@ -14,7 +14,7 @@ def build(bld): - ) - - def configure(conf): -- if Options.platform == 'win32': -+ if Utils.unversioned_sys_platform == 'win32': - conf.fatal("Not supported on Windows") - - def options(opt): -diff -up xmms2-0.8DrO_o/src/clients/lib/perl/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/perl/wscript ---- xmms2-0.8DrO_o/src/clients/lib/perl/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/perl/wscript 2020-02-28 09:49:55.143637956 -0500 -@@ -37,11 +37,11 @@ def build(bld): - - - def configure(conf): -- conf.check_tool('perl') -+ conf.load('perl') - conf.check_perl_version((5,7,3)) - conf.check_perl_ext_devel() - conf.load('podselect', tooldir='waftools') -- conf.check_tool('podselect') -+ conf.load('podselect') - - if not os.path.commonprefix([conf.env.ARCHDIR_PERL, conf.env.PREFIX]).startswith(conf.env.PREFIX): - Logs.warn("Default perl libdir is not under PREFIX. specify the path " -@@ -54,4 +54,4 @@ def configure(conf): - - - def options(opt): -- opt.tool_options('perl') -+ opt.load('perl') -diff -up xmms2-0.8DrO_o/src/clients/lib/python/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/python/wscript ---- xmms2-0.8DrO_o/src/clients/lib/python/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/python/wscript 2020-02-28 09:49:55.143637956 -0500 -@@ -79,7 +79,7 @@ def build(bld): - # TODO: Distribute .pxd files - - def configure(conf): -- conf.check_tool('python') -+ conf.load('python') - if not conf.env.PYTHON: - conf.fatal("python not found") - -@@ -112,7 +112,7 @@ def configure(conf): - "files, you should consider reconfiguring with --no-cython") - - def options(opt): -- opt.tool_options('cython', tooldir = os.path.abspath('waftools')) -+ opt.load('cython', tooldir = os.path.abspath('waftools')) - opt.add_option('--no-cython', action="store_true", - dest="no_cython", default=False, - help="Use precompiled cython files even if cython is installed on " -diff -up xmms2-0.8DrO_o/src/clients/lib/ruby/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/ruby/wscript ---- xmms2-0.8DrO_o/src/clients/lib/ruby/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/ruby/wscript 2020-02-28 09:49:55.143637956 -0500 -@@ -48,11 +48,11 @@ def build(bld): - ) - - def configure(conf): -- conf.check_tool("ruby") -+ conf.load("ruby") - conf.check_ruby_version((1,8,0)) - conf.check_ruby_ext_devel() - -- conf.check_cc(function_name="rb_protect_inspect", header_name="ruby.h", -+ conf.check_cc(header_name="ruby.h", - uselib="RUBYEXT", mandatory=False) - - prefix = os.path.commonprefix([conf.env.ARCHDIR_RUBY, conf.env.PREFIX]) -@@ -70,4 +70,4 @@ def configure(conf): - return True - - def options(opt): -- opt.tool_options('ruby', tdir=os.path.abspath('waftools')) -+ opt.load('ruby', tdir=os.path.abspath('waftools')) -diff -up xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript ---- xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/xmmsclient++/wscript 2020-02-28 09:49:55.143637956 -0500 -@@ -40,4 +40,4 @@ def configure(conf): - return True - - def options(opt): -- opt.tool_options('boost') -+ opt.load('boost') -diff -up xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript.fixme xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript ---- xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/lib/xmmsclient/wscript 2020-02-28 09:49:55.143637956 -0500 -@@ -39,8 +39,7 @@ def build(bld): - def configure(conf): - conf.env.XMMS_PKGCONF_FILES.append(("xmms2-client", "-lxmmsclient")) - -- conf.check_cc(function_name="semtimedop", -- header_name=["sys/types.h", "sys/ipc.h", "sys/sem.h"], -+ conf.check_cc(header_name=["sys/types.h", "sys/ipc.h", "sys/sem.h"], - defines=["_GNU_SOURCE=1"], mandatory=False) - if not conf.env.HAVE_SEMTIMEDOP: - Logs.warn("Compiling visualization without shm support!") -diff -up xmms2-0.8DrO_o/src/clients/medialib-updater/wscript.fixme xmms2-0.8DrO_o/src/clients/medialib-updater/wscript ---- xmms2-0.8DrO_o/src/clients/medialib-updater/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/medialib-updater/wscript 2020-02-28 09:49:55.143637956 -0500 -@@ -24,8 +24,7 @@ def configure(conf): - conf.check_cfg(package="gthread-2.0", uselib_store='gthread2', - args="--cflags --libs") - -- conf.check_cc(function_name="g_file_query_file_type", -- header_name="gio/gio.h", uselib="gio2", mandatory=False) -+ conf.check_cc(header_name="gio/gio.h", uselib="gio2", mandatory=False) - - - def options(opt): -diff -up xmms2-0.8DrO_o/src/clients/nycli/wscript.fixme xmms2-0.8DrO_o/src/clients/nycli/wscript ---- xmms2-0.8DrO_o/src/clients/nycli/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/clients/nycli/wscript 2020-02-28 09:49:55.143637956 -0500 -@@ -1,4 +1,4 @@ --from waflib import Options, Errors -+from waflib import Utils, Errors - - source = """ - main.c -@@ -37,7 +37,7 @@ def build(bld): - - - def configure(conf): -- if Options.platform == 'win32': -+ if Utils.unversioned_sys_platform == 'win32': - conf.env.CLI_COMPAT_IMPL = 'win32' - else: - conf.env.CLI_COMPAT_IMPL = 'unix' -@@ -49,8 +49,7 @@ def configure(conf): - # first try just linking against libreadline - try: - conf.check_cc(lib="readline", header_name=rl_headers, -- function_name='rl_filename_dequoting_function', -- uselib_store="readline", uselib="glib2") -+ uselib_store="readline", uselib="glib2") - except Errors.ConfigurationError: - pass - else: -diff -up xmms2-0.8DrO_o/src/clients/vistest/wscript.fixme xmms2-0.8DrO_o/src/clients/vistest/wscript ---- xmms2-0.8DrO_o/src/clients/vistest/wscript.fixme 2020-02-28 09:49:55.137638098 -0500 -+++ xmms2-0.8DrO_o/src/clients/vistest/wscript 2020-02-28 09:49:55.144637932 -0500 -@@ -1,4 +1,4 @@ --import Options -+from waflib import Utils - - def build(bld): - t = bld(features = 'c cprogram', -@@ -46,7 +46,7 @@ def build(bld): - t.install_path = None - - def configure(conf): -- if Options.platform == "win32": -+ if Utils.unversioned_sys_platform == "win32": - conf.fatal("visualisation clients not supported on windows") - - conf.env.INSTALL_VIS_REFERENCE_CLIENTS = conf.options.with_vis_clients -diff -up xmms2-0.8DrO_o/src/includepriv/wscript.fixme xmms2-0.8DrO_o/src/includepriv/wscript ---- xmms2-0.8DrO_o/src/includepriv/wscript.fixme 2020-02-28 09:50:50.912314901 -0500 -+++ xmms2-0.8DrO_o/src/includepriv/wscript 2020-02-28 09:51:04.246998545 -0500 -@@ -3,5 +3,5 @@ def configure(conf): - def options(conf): - pass - def build(bld): -- bld.add_subdirs("xmmspriv") -- bld.add_subdirs("xmmsclientpriv") -+ bld.recurse("xmmspriv") -+ bld.recurse("xmmsclientpriv") -diff -up xmms2-0.8DrO_o/src/include/wscript.fixme xmms2-0.8DrO_o/src/include/wscript ---- xmms2-0.8DrO_o/src/include/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/include/wscript 2020-02-28 09:49:55.144637932 -0500 -@@ -17,7 +17,7 @@ def build(bld): - #bld.install_files(os.path.join(bld.env.INCLUDEDIR, 'xmms2', p), " ".join(f)) - - def configure(conf): -- conf.sub_config("xmms") -+ conf.recurse("xmms") - - return True - -diff -up xmms2-0.8DrO_o/src/include/xmms/wscript.fixme xmms2-0.8DrO_o/src/include/xmms/wscript ---- xmms2-0.8DrO_o/src/include/xmms/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/include/xmms/wscript 2020-02-28 09:49:55.144637932 -0500 -@@ -1,5 +1,5 @@ - import os, sys --from waflib import Options, Logs -+from waflib import Options, Logs, Utils - - def build(bld): - pass -@@ -20,7 +20,7 @@ def configure(conf): - else: - conf.fatal('The "%s" output plugin could not be found.' % (preferred)) - -- if Options.platform == 'darwin': -+ if Utils.unversioned_sys_platform == 'darwin': - uconf = 'Library/xmms2' - ucache = 'Library/xmms2/logs' - else: -@@ -28,7 +28,7 @@ def configure(conf): - ucache = '.cache/xmms2' - - sharedir = os.path.join(conf.env.DATADIR, 'xmms2') -- if Options.platform == 'win32': -+ if Utils.unversioned_sys_platform == 'win32': - # The plugin path in Windows should be relative, not absolute - conf.env.PLUGINDIR = 'Plugins/' - else: -diff -up xmms2-0.8DrO_o/src/lib/xmmsutils/wscript.fixme xmms2-0.8DrO_o/src/lib/xmmsutils/wscript ---- xmms2-0.8DrO_o/src/lib/xmmsutils/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/lib/xmmsutils/wscript 2020-02-28 09:49:55.144637932 -0500 -@@ -4,7 +4,7 @@ - # Copyright (C) 2006-2011 XMMS2 Team - # - --from waflib import Options, Logs, Errors -+from waflib import Options, Logs, Errors, Utils - - def build(bld): - source = """ -@@ -26,14 +26,14 @@ def build(bld): - - - def configure(conf): -- if Options.platform == 'win32': -+ if Utils.unversioned_sys_platform == 'win32': - conf.env.util_impl = 'win32' - else: - conf.env.util_impl = 'unix' - try: -- conf.check_cc(function_name="nanosleep", header_name="time.h") -+ conf.check_cc(header_name="time.h") - except Errors.ConfigurationError: -- conf.check_cc(function_name="nanosleep", header_name="time.h", -+ conf.check_cc(header_name="time.h", - lib="rt", uselib_store="rt") - return True - -diff -up xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript.fixme xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript ---- xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/lib/xmmsvisualization/wscript 2020-02-28 09:49:55.144637932 -0500 -@@ -21,7 +21,7 @@ def build(bld): - - def configure(conf): - # Check for the modf function in the math lib -- conf.check_cc(function_name="modf", header_name="math.h", -+ conf.check_cc(header_name="math.h", - lib="m", uselib_store="math") - return True - -diff -up xmms2-0.8DrO_o/src/plugins/cdda/wscript.fixme xmms2-0.8DrO_o/src/plugins/cdda/wscript ---- xmms2-0.8DrO_o/src/plugins/cdda/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/plugins/cdda/wscript 2020-02-28 09:49:55.145637908 -0500 -@@ -1,11 +1,11 @@ - from waftools.plugin import plugin - --import Options -+from waflib import Utils - - def plugin_configure(conf): - conf.check_cfg(package="libcdio_cdda", args="--cflags --libs", uselib_store="cdda") - conf.check_cfg(package="libdiscid", args="--cflags --libs", uselib_store="discid") -- if Options.platform == "win32": -+ if Utils.unversioned_sys_platform == "win32": - conf.check_cc(lib="winmm", uselib_store="winmm", args="--cflags --libs") - - configure, build = plugin("cdda", configure=plugin_configure, -diff -up xmms2-0.8DrO_o/src/plugins/curl/wscript.fixme xmms2-0.8DrO_o/src/plugins/curl/wscript ---- xmms2-0.8DrO_o/src/plugins/curl/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/plugins/curl/wscript 2020-02-28 09:49:55.145637908 -0500 -@@ -16,8 +16,7 @@ def plugin_configure(conf): - # This is a function this plugin uses and that was added to curl in - # version 7.12.0. We cannot check for the curl version as curl-config - # did not support version tests before version 7.15.0 -- conf.check_cc(function_name="curl_multi_strerror", -- header_name="curl/curl.h", uselib="curl") -+ conf.check_cc(header_name="curl/curl.h", uselib="curl") - - configure, build = plugin('curl', configure=plugin_configure, - source=source, libs=["socket", "curl"]) -diff -up xmms2-0.8DrO_o/src/plugins/daap/wscript.fixme xmms2-0.8DrO_o/src/plugins/daap/wscript ---- xmms2-0.8DrO_o/src/plugins/daap/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/plugins/daap/wscript 2020-02-28 09:49:55.146637885 -0500 -@@ -1,4 +1,4 @@ --import Options -+from waflib import Options - from waftools.plugin import plugin - - source = """ -diff -up xmms2-0.8DrO_o/src/plugins/file/wscript.fixme xmms2-0.8DrO_o/src/plugins/file/wscript ---- xmms2-0.8DrO_o/src/plugins/file/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/plugins/file/wscript 2020-02-28 09:49:55.146637885 -0500 -@@ -7,9 +7,9 @@ def plugin_build(bld, obj): - obj.source.append('browse/gdir.c') - - def plugin_configure(conf): -- conf.check_cc(function_name='fstatat', header_name=['fcntl.h','sys/stat.h'], -+ conf.check_cc(header_name=['fcntl.h','sys/stat.h'], - defines=['_ATFILE_SOURCE=1']) -- conf.check_cc(function_name='dirfd', header_name=['dirent.h','sys/types.h']) -+ conf.check_cc(header_name=['dirent.h','sys/types.h']) - - configure, build = plugin("file", - configure=plugin_configure, build=plugin_build, -diff -up xmms2-0.8DrO_o/src/xmms/wscript.fixme xmms2-0.8DrO_o/src/xmms/wscript ---- xmms2-0.8DrO_o/src/xmms/wscript.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/src/xmms/wscript 2020-02-28 09:49:55.147637861 -0500 -@@ -5,7 +5,7 @@ - # - - import os --from waflib import Options, Logs, Errors -+from waflib import Options, Logs, Errors, Utils - - source = """ - config.c -@@ -127,7 +127,7 @@ int main() { - - def get_statfs_impl(conf): - # Detect the type of stat call used -- if Options.platform == 'win32': -+ if Utils.unversioned_sys_platform == 'win32': - return 'dummy' - else: - try: -@@ -147,7 +147,7 @@ def get_statfs_impl(conf): - else: - return 'bsd' - else: -- if Options.platform == 'sunos': -+ if Utils.unversioned_sys_platform == 'sunos': - return 'solaris' - else: - return 'linux' -@@ -155,7 +155,7 @@ def get_statfs_impl(conf): - # Get the implementation variant for the localtime_r function. - def get_localtime_impl(conf): - try: -- conf.check_cc(function_name='localtime_r', header_name='time.h') -+ conf.check_cc(header_name='time.h') - except Errors.ConfigurationError: - return 'dummy' - else: -@@ -174,7 +174,7 @@ def get_thread_name_impl(conf): - - # Get the implementation variant for signals, symlinks and uid check. - def get_compat_impl(conf): -- if Options.platform == 'win32': -+ if Utils.unversioned_sys_platform == 'win32': - return 'dummy' - else: - return 'unix' -@@ -183,8 +183,7 @@ def get_visualization_impl(conf): - if conf.options.without_unixshmserver: - return 'dummy' - -- conf.check_cc(function_name='semctl', -- header_name=['sys/types.h','sys/ipc.h','sys/sem.h'], -+ conf.check_cc(header_name=['sys/types.h','sys/ipc.h','sys/sem.h'], - mandatory=False) - try: - conf.check_cc(fragment=semun_fragment, uselib_store="semun", -@@ -198,7 +197,7 @@ def get_visualization_impl(conf): - return 'dummy' - - def configure(conf): -- conf.check_tool('python-generator', tooldir=os.path.abspath('waftools')) -+ conf.load('python-generator', tooldir=os.path.abspath('waftools')) - - conf.check_cfg(package='gmodule-2.0', atleast_version='2.6.0', - uselib_store='gmodule2', args='--cflags --libs') -@@ -208,7 +207,7 @@ def configure(conf): - uselib_store='sqlite3', args='--cflags --libs') - - # Check for the sin function in the math lib -- conf.check_cc(lib='m', function_name='sin', header_name='math.h', -+ conf.check_cc(lib='m', header_name='math.h', - uselib_store="math") - - conf.env.compat_impl = get_compat_impl(conf) -@@ -221,11 +220,11 @@ def configure(conf): - Logs.warn("Compiling visualization without shm support") - - # Add Darwin stuff -- if Options.platform == 'darwin': -+ if Utils.unversioned_sys_platform == 'darwin': - conf.env.append_value('LINKFLAGS', ['-framework', 'CoreFoundation']) - conf.env.append_value('DEFINES', 'USE_BUNDLES') - -- conf.env.xmms_shared_library = (Options.platform == 'win32') -+ conf.env.xmms_shared_library = (Utils.unversioned_sys_platform == 'win32') - - conf.env.XMMS_PKGCONF_FILES.append(('xmms2-plugin', '')) - -diff -up xmms2-0.8DrO_o/waftools/cython_extra.py.fixme xmms2-0.8DrO_o/waftools/cython_extra.py ---- xmms2-0.8DrO_o/waftools/cython_extra.py.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/waftools/cython_extra.py 2020-02-28 09:49:55.147637861 -0500 -@@ -3,37 +3,9 @@ - - import re - from waflib import Configure --from subprocess import Popen, STDOUT, PIPE -+import subprocess - --# Borrowed from Python 2.7, subprocess.py --class CalledProcessError(Exception): -- """This exception is raised when a process run by check_call() or -- check_output() returns a non-zero exit status. -- The exit status will be stored in the returncode attribute; -- check_output() will also store the output in the output attribute. -- """ -- def __init__(self, returncode, cmd, output=None): -- self.returncode = returncode -- self.cmd = cmd -- self.output = output -- def __str__(self): -- return "Command '%s' returned non-zero exit status %d" % (self.cmd, self.returncode) -- --# Borrowed from Python 2.7, subprocess.py --def check_output(*popenargs, **kwargs): -- if 'stdout' in kwargs: -- raise ValueError('stdout argument not allowed, it will be overridden.') -- process = Popen(stdout=PIPE, *popenargs, **kwargs) -- output, unused_err = process.communicate() -- retcode = process.poll() -- if retcode: -- cmd = kwargs.get("args") -- if cmd is None: -- cmd = popenargs[0] -- raise CalledProcessError(retcode, cmd, output=output) -- return output -- --cython_ver_re = re.compile('Cython version ([0-9.]+)') -+cython_ver_re = re.compile(b'Cython version ([0-9.]+)') - def check_cython_version(self, version=None, minver=None, maxver=None): - log_s = [] - if version: -@@ -53,15 +25,15 @@ def check_cython_version(self, version=N - minver = tuple(map(int, minver)) - if maxver: - maxver = tuple(map(int, maxver)) -- -- # Trick to be compatible python 2.x and 3.x -- try: -- u = unicode -- except NameError: -- u = str - -- cmd = [self.env.CYTHON, '-V'] -- o = u(check_output(cmd, stderr=STDOUT), 'UTF-8').strip() -+ if isinstance(self.env.CYTHON, list): -+ cmdbin = " " -+ cmdbin = cmdbin.join(self.env.CYTHON) -+ else: -+ cmdbin = self.env.CYTHON -+ -+ cmd = [cmdbin, '-V'] -+ o = subprocess.check_output(cmd, stderr=subprocess.STDOUT).strip() - m = cython_ver_re.match(o) - self.start_msg('Checking for cython version') - if not m: -@@ -69,11 +41,11 @@ def check_cython_version(self, version=N - self.fatal("No version found") - else: - v = m.group(1) -- ver = tuple(map(int, v.split('.'))) -+ ver = tuple(map(int, v.split(b'.'))) - check = (not minver or minver <= ver) and (not maxver or maxver >= ver) - self.to_log(' cython %s\n -> %r\n' % (" ".join(log_s), v)) - if check: -- self.end_msg(v) -+ self.end_msg(v.decode("utf-8")) - self.env.CYTHON_VERSION = ver - else: - self.end_msg('wrong version %s' % v, 'YELLOW') -diff -up xmms2-0.8DrO_o/waftools/man.py.fixme xmms2-0.8DrO_o/waftools/man.py ---- xmms2-0.8DrO_o/waftools/man.py.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/waftools/man.py 2020-02-28 09:49:55.147637861 -0500 -@@ -2,7 +2,7 @@ from waflib import Task, Errors, Utils - import os - import gzip - --from TaskGen import feature,before_method -+from waflib.TaskGen import feature,before_method - - def gzip_func(task): - infile = task.inputs[0].abspath() -diff -up xmms2-0.8DrO_o/waftools/python-generator.py.fixme xmms2-0.8DrO_o/waftools/python-generator.py ---- xmms2-0.8DrO_o/waftools/python-generator.py.fixme 2011-10-20 15:26:08.000000000 -0400 -+++ xmms2-0.8DrO_o/waftools/python-generator.py 2020-02-28 09:49:55.147637861 -0500 -@@ -1,6 +1,5 @@ --import Task --import TaskGen --from TaskGen import extension -+from waflib import TaskGen -+from waflib.TaskGen import extension - import sys - - TaskGen.declare_chain( -diff -up xmms2-0.8DrO_o/waftools/tool.py.fixme xmms2-0.8DrO_o/waftools/tool.py ---- xmms2-0.8DrO_o/waftools/tool.py.fixme 2020-02-28 09:49:55.130638264 -0500 -+++ xmms2-0.8DrO_o/waftools/tool.py 2020-02-28 09:49:55.147637861 -0500 -@@ -1,4 +1,4 @@ --import Utils -+from waflib import Utils - import os - - def add_install_flag(bld, obj): -diff -up xmms2-0.8DrO_o/wscript.fixme xmms2-0.8DrO_o/wscript ---- xmms2-0.8DrO_o/wscript.fixme 2020-02-28 09:49:55.141638004 -0500 -+++ xmms2-0.8DrO_o/wscript 2020-02-28 09:50:32.736746099 -0500 -@@ -113,9 +113,9 @@ def build(bld): - bld.fatal("You need to run waf configure") - raise SystemExit() - -- bld.add_subdirs(subdirs) -- bld.add_subdirs(plugindirs) -- bld.add_subdirs(optionaldirs) -+ bld.recurse(subdirs) -+ bld.recurse(plugindirs) -+ bld.recurse(optionaldirs) - - for name, lib in bld.env.XMMS_PKGCONF_FILES: - bld(features = 'subst', -@@ -170,7 +170,7 @@ def _configure_optionals(conf): - for o in selected_optionals: - x = [x for x in optional_subdirs if os.path.basename(x) == o][0] - try: -- conf.sub_config(x) -+ conf.recurse(x) - conf.env.append_value('XMMS_OPTIONAL_BUILD', x) - succeeded_optionals.add(o) - except Errors.ConfigurationError: -@@ -220,7 +220,7 @@ def _configure_plugins(conf): - - for plugin in selected_plugins: - try: -- conf.sub_config("src/plugins/%s" % plugin) -+ conf.recurse("src/plugins/%s" % plugin) - if (not conf.env.XMMS_PLUGINS_ENABLED or - (len(conf.env.XMMS_PLUGINS_ENABLED) > 0 and - conf.env.XMMS_PLUGINS_ENABLED[-1] != plugin)): -@@ -277,14 +277,14 @@ def configure(conf): - conf.env.BUILD_XMMS2D = True - subdirs.insert(0, "src/xmms") - -- conf.check_tool('gnu_dirs') -- conf.check_tool('man', tooldir=os.path.abspath('waftools')) -- conf.check_tool('misc') -- conf.check_tool('gcc') -- conf.check_tool('g++') -+ conf.load('gnu_dirs') -+ conf.load('man', tooldir=os.path.abspath('waftools')) -+ ## conf.load('misc') -+ conf.load('gcc') -+ conf.load('g++') - -- if conf.options.target_platform: -- Options.platform = conf.options.target_platform -+ ## if conf.options.target_platform: -+ ## Options.platform = conf.options.target_platform - - nam,changed = gittools.get_info() - conf.msg("git commit id", nam) -@@ -340,7 +340,7 @@ def configure(conf): - conf.env.prepend_value('LIBPATH', os.path.join(d, 'lib')) - conf.env.prepend_value('CPPPATH', os.path.join(d, 'include')) - -- if Options.platform != 'win32': -+ if Utils.unversioned_sys_platform != 'win32': - conf.env.append_unique('CFLAGS_cstlib', ['-fPIC', '-DPIC']) - conf.env.append_unique('CPPFLAGS_cxxshlib', ['-fPIC', '-DPIC']) - else: -@@ -356,14 +356,14 @@ def configure(conf): - conf.env.cshlib_PATTERN = 'lib%s.dll' - conf.env.cprogram_PATTERN = '%s.exe' - -- if Options.platform == 'darwin': -+ if Utils.unversioned_sys_platform == 'darwin': - conf.env.append_value('LINKFLAGS', '-multiply_defined_suppress') - conf.env.explicit_install_name = True - else: - conf.env.explicit_install_name = False - -- if Options.platform == 'sunos': -- conf.check_cc(function_name='socket', lib='socket', header_name='sys/socket.h', uselib_store='socket') -+ if Utils.unversioned_sys_platform == 'sunos': -+ conf.check_cc(lib='socket', header_name='sys/socket.h', uselib_store='socket') - if not conf.env.HAVE_SOCKET: - conf.fatal("xmms2 requires libsocket on Solaris.") - raise SystemExit(1) -@@ -371,7 +371,7 @@ def configure(conf): - conf.env.append_unique('CFLAGS', '-D_REENTRANT') - conf.env.append_unique('CFLAGS', '-std=gnu99') - conf.env.socket_impl = 'socket' -- elif Options.platform == 'win32': -+ elif Utils.unversioned_sys_platform == 'win32': - if conf.options.winver: - major, minor = [int(x) for x in Options.options.winver.split('.')] - else: -@@ -413,9 +413,9 @@ int main() { return 0; } - conf.env.socket_impl = 'posix' - - conf.env.xmms_icon = False -- if Options.platform == 'win32': -+ if Utils.unversioned_sys_platform == 'win32': - try: -- conf.check_tool('winres') -+ conf.load('winres') - except Errors.ConfigurationError: - pass - else: -@@ -425,7 +425,7 @@ int main() { return 0; } - # TaskGen.mac_bundle option seems to be no longer silently ignored - # if gcc -bundle option is not available. - # TODO: Add --no-mac-bundle in options ? -- conf.env.mac_bundle_enabled = Options.platform == 'darwin' -+ conf.env.mac_bundle_enabled = Utils.unversioned_sys_platform == 'darwin' - - conf.check_cfg(package='glib-2.0', atleat_version='2.8.0', - uselib_store='glib2', args='--cflags --libs') -@@ -439,7 +439,7 @@ int main() { return 0; } - newest = get_newest(subdirs, plugindirs, optionaldirs) - conf.env.NEWEST_WSCRIPT_SUBDIR = newest - -- [conf.sub_config(s) for s in subdirs] -+ [conf.recurse(s) for s in subdirs] - conf.write_config_header('xmms_configuration.h') - - output_plugins = [name for x, name in conf.env.XMMS_OUTPUT_PLUGINS if x > 0] -@@ -464,8 +464,8 @@ def _list_cb(option, opt, value, parser) - setattr(parser.values, option.dest, vals) - - def options(opt): -- opt.tool_options('gnu_dirs') -- opt.tool_options('gcc') -+ opt.load('gnu_dirs') -+ opt.load('gcc') - - opt.add_option('--with-custom-version', type='string', - dest='customversion', help="Override git commit hash version") -@@ -503,9 +503,9 @@ def options(opt): - opt.add_option('--without-ldconfig', action='store_false', - dest='ldconfig', help="Don't run ldconfig after install") - -- opt.sub_options("src/xmms") -+ opt.recurse("src/xmms") - for o in optional_subdirs + subdirs: -- opt.sub_options(o) -+ opt.recurse(o) - - def shutdown(ctx): - if ctx.cmd != 'install': diff --git a/xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch b/xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch deleted file mode 100644 index c8243ba..0000000 --- a/xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- xmms2-0.8DrO_o/src/clients/vistest/wscript.vorbis 2011-10-21 04:26:08.000000000 +0900 -+++ xmms2-0.8DrO_o/src/clients/vistest/wscript 2014-05-07 15:33:45.670355972 +0900 -@@ -23,12 +23,12 @@ - t.install_path = None - - -- if bld.env.LIB_vorbisenc: -+ if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis: - t = bld(features = 'c cprogram', - target = 'xmms2-ripper', - source = 'ripper.c', - includes = '. ../../.. ../../include', -- uselib = 'vorbisenc', -+ uselib = 'vorbisenc vorbis ogg', - use = 'xmmsclient' - ) - if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS: -@@ -56,6 +56,12 @@ - conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', - args='--cflags --libs', mandatory=False) - -+ conf.check_cfg(package='vorbis', uselib_store='vorbis', -+ args='--cflags --libs', mandatory=False) -+ -+ conf.check_cfg(package='ogg', uselib_store='ogg', -+ args='--cflags --libs', mandatory=False) -+ - if conf.check_cfg(package='libvisual-0.4', uselib_store='visual', - args='--cflags --libs', mandatory=False): - conf.check_cfg(package='sdl', uselib_store='sdl', diff --git a/xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch b/xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch deleted file mode 100644 index 43ba29b..0000000 --- a/xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h.spot xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h ---- xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h.spot 2020-02-28 10:15:31.578897880 -0500 -+++ xmms2-0.8DrO_o/src/includepriv/xmmspriv/xmms_collection.h 2020-02-28 10:15:46.242585829 -0500 -@@ -75,7 +75,7 @@ const gchar *xmms_collection_get_namespa - gboolean xmms_collection_get_int_attr (xmmsv_coll_t *coll, const gchar *attrname, gint *val); - gboolean xmms_collection_set_int_attr (xmmsv_coll_t *coll, const gchar *attrname, gint newval); - --GTree *xmms_collection_changed_msg_new (xmms_collection_changed_actions_t type, const gchar *plname, const gchar *namespace); -+GTree *xmms_collection_changed_msg_new (xmmsc_collection_changed_actions_t type, const gchar *plname, const gchar *namespace); - void xmms_collection_changed_msg_send (xmms_coll_dag_t *colldag, GTree *dict); - - void bind_all_references (xmms_coll_dag_t *dag, xmmsv_coll_t *coll, xmmsv_coll_t *parent, void *udata); -diff -up xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h.spot xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h ---- xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h.spot 2020-02-28 10:15:18.475176735 -0500 -+++ xmms2-0.8DrO_o/src/include/xmmsc/xmmsc_idnumbers.h 2020-02-28 10:15:22.698086869 -0500 -@@ -193,7 +193,7 @@ typedef enum { - XMMS_COLLECTION_CHANGED_UPDATE, - XMMS_COLLECTION_CHANGED_RENAME, - XMMS_COLLECTION_CHANGED_REMOVE --} xmms_collection_changed_actions_t; -+} xmmsc_collection_changed_actions_t; - - typedef enum { - XMMS_PLAYBACK_STATUS_STOP, -diff -up xmms2-0.8DrO_o/src/xmms/collection.c.spot xmms2-0.8DrO_o/src/xmms/collection.c ---- xmms2-0.8DrO_o/src/xmms/collection.c.spot 2020-02-28 10:15:56.804361068 -0500 -+++ xmms2-0.8DrO_o/src/xmms/collection.c 2020-02-28 10:16:03.248223939 -0500 -@@ -144,7 +144,7 @@ static void xmms_collection_client_sync - #include "collection_ipc.c" - - GTree * --xmms_collection_changed_msg_new (xmms_collection_changed_actions_t type, -+xmms_collection_changed_msg_new (xmmsc_collection_changed_actions_t type, - const gchar *plname, const gchar *namespace) - { - GTree *dict; diff --git a/xmms2-0.8DrO_o-xsubpp-fix.patch b/xmms2-0.8DrO_o-xsubpp-fix.patch deleted file mode 100644 index 2a05f15..0000000 --- a/xmms2-0.8DrO_o-xsubpp-fix.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -up .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py.fixme .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py ---- .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py.fixme 2013-08-11 16:41:03.730842318 -0400 -+++ .waf-1.6.7-b271784c448ab906d5606267fb7f92c0/waflib/Tools/perl.py 2013-08-11 16:41:18.575842955 -0400 -@@ -60,7 +60,7 @@ def check_perl_ext_devel(self): - env['LINKFLAGS_PERLEXT']=read_out(" -MConfig -e'print $Config{lddlflags}'") - env['INCLUDES_PERLEXT']=read_out(" -MConfig -e'print \"$Config{archlib}/CORE\"'") - env['CFLAGS_PERLEXT']=read_out(" -MConfig -e'print \"$Config{ccflags} $Config{cccdlflags}\"'") -- env['XSUBPP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/xsubpp$Config{exe_ext}\"'") -+ env['XSUBPP']="/usr/bin/xsubpp" - env['EXTUTILS_TYPEMAP']=read_out(" -MConfig -e'print \"$Config{privlib}/ExtUtils/typemap\"'") - if not getattr(Options.options,'perlarchdir',None): - env['ARCHDIR_PERL']=self.cmd_and_log(perl+" -MConfig -e'print $Config{sitearch}'") diff --git a/xmms2-0.9.3-no-mind-in-a-box.patch b/xmms2-0.9.3-no-mind-in-a-box.patch new file mode 100644 index 0000000..43f5986 --- /dev/null +++ b/xmms2-0.9.3-no-mind-in-a-box.patch @@ -0,0 +1,40 @@ +diff -up xmms2-0.9.3/AUTHORS.nomind xmms2-0.9.3/AUTHORS +--- xmms2-0.9.3/AUTHORS.nomind 2023-05-12 04:19:00.000000000 -0400 ++++ xmms2-0.9.3/AUTHORS 2023-09-12 10:08:14.652340349 -0400 +@@ -272,12 +272,6 @@ N: Łukasz Michalik + E: lmi@ift.uni.wroc.pl + D: Bugfixes. + +-N: Mind.In.A.Box / Stefan Poiss and Markus Hadwiger +-W: http://www.mindinabox.com/ +-D: Supplied us with a great "intro" clip. +-D: Lament for Lost Dreams clip by mind.in.a.box +-D: Copyright (c) by Stefan Poiss and Markus Hadwiger +- + N: Dave Moore + E: wrex006@gmail.com + D: missing method in C++ bindings. +diff -up xmms2-0.9.3/checksums.nomind xmms2-0.9.3/checksums +--- xmms2-0.9.3/checksums.nomind 2023-05-12 04:19:00.000000000 -0400 ++++ xmms2-0.9.3/checksums 2023-09-12 10:08:14.652340349 -0400 +@@ -66,7 +66,6 @@ + 100644 blob 1c9606c6d58527d72f4354646f9c135da24da970 doc/tutorial/vala/xmms2-client-glib.deps + 100644 blob 5beabceeda7ae335cf8633a03d0febe2f51198f0 doc/tutorial/vala/xmms2-client-glib.vapi + 100644 blob e3677f8c3b4ccbb044a3f6f4f7e4bf6c5ddf6385 doc/tutorial/vala/xmms2-client.vapi +-100644 blob 7dea2b304cdacc745218cd4187d9ab644842c798 mind.in.a.box-lament_snipplet.ogg + 100644 blob 503aea3af178fd7ba02665706151f303703c3c95 pixmaps/wscript + 100644 blob 66e6d6c205e0824d18692b40169d95a4593c9bf8 pixmaps/xmms2-128.png + 100644 blob 0e2b17d6267581a9a49d7930af3c8a4f792ec0b3 pixmaps/xmms2-16.png +diff -up xmms2-0.9.3/src/xmms/medialib.c.nomind xmms2-0.9.3/src/xmms/medialib.c +diff -up xmms2-0.9.3/wscript.nomind xmms2-0.9.3/wscript +--- xmms2-0.9.3/wscript.nomind 2023-05-12 04:19:00.000000000 -0400 ++++ xmms2-0.9.3/wscript 2023-09-12 10:08:14.653340363 -0400 +@@ -139,7 +139,7 @@ def build(bld): + VERSION = bld.env.VERSION + ) + +- bld.install_files('${SHAREDDIR}', "mind.in.a.box-lament_snipplet.ogg") ++ bld.install_files('${SHAREDDIR}', "unreal_dm-free.music.and.free.beer.ogg") + + bld.add_post_fun(shutdown) + diff --git a/xmms2.spec b/xmms2.spec index d4e8bb8..fe166a8 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,47 +1,19 @@ - -%global codename DrO_o - Name: xmms2 Summary: A modular audio framework and plugin architecture -Version: 0.8 -Release: 88%{?dist} -License: LGPLv2+ and GPLv2+ and BSD +Version: 0.9.3 +Release: 1%{?dist} +License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. -# http://downloads.sourceforge.net/xmms2/%%{name}-%%{version}%%{codename}.tar.bz2 +# https://github.com/xmms2/xmms2-devel/releases/download/%%{version}/xmms2-%%{version}.tar.xz # Cleaning it is simple, just rm -rf src/plugins/mp4 mind.in.a.box-lament_snipplet.ogg -Source0: %{name}-%{version}%{codename}-clean.tar.bz2 +Source0: %{name}-%{version}-clean.tar.xz Source1: xmms2-client-launcher.sh # CC-BY # taken from http://ccmixter.org/files/unreal_dm/38156 Source2: unreal_dm-free.music.and.free.beer.ogg -# Use libdir properly for Fedora multilib -Patch1: xmms2-0.8DrO_o-use-libdir.patch -# Set default output to pulse -Patch2: xmms2-0.8DrO_o-pulse-output-default.patch -# Don't add extra CFLAGS, we're smart enough, thanks. -Patch4: xmms2-0.8DrO_o-no-O0.patch -# More sane versioning -Patch5: xmms2-0.8DrO_o-moresaneversioning.patch -# Fix xsubpp location -Patch6: xmms2-0.8DrO_o-xsubpp-fix.patch -# libmodplug 0.8.8.5 changed pkgconfig includedir output -Patch7: xmms2-0.8DrO_o-libmodplug-pkgconfig-change.patch -# libvorbis 1.3.4 changed pkgconfig libs output -Patch8: xmms2-0.8DrO_o-vorbis-pkgconfig-libs.patch -# Remove deprecated usage on ruby 22 -Patch9: xmms2-0.8DrO_o-ruby22-remove-deprecated-usage.patch -# Add support for OpenSSL 1.1 -Patch10: xmms2-0.8DrO_o-openssl-1.1.patch # Swap mind.in.a.box for free.music.and.free.beer -Patch11: xmms2-0.8DrO_o-no-mind.in.a.box.patch -# Use system waf -# This is ugly and not kosher for upstream... then again, I think upstream is dead. -Patch12: xmms2-0.8DrO_o-use-system-waf.patch -# Python3 -Patch13: xmms2-0.8DrO_o-python3.patch -# Fix naming issue with xmms_collection_changed_actions_t -Patch14: xmms2-0.8DrO_o-xmmsc_collection_changed_actions_t-fix.patch +Patch11: xmms2-0.9.3-no-mind-in-a-box.patch URL: http://wiki.xmms2.xmms.se/ BuildRequires: python3 BuildRequires: sqlite-devel @@ -52,7 +24,7 @@ BuildRequires: libdiscid-devel BuildRequires: libsmbclient-devel BuildRequires: libmpcdec-devel BuildRequires: gnome-vfs2-devel -BuildRequires: jack-audio-connection-kit-devel +BuildRequires: pkgconfig(jack) BuildRequires: fftw-devel BuildRequires: libsamplerate-devel BuildRequires: libxml2-devel @@ -81,6 +53,7 @@ BuildRequires: SDL-devel BuildRequires: glib2-devel BuildRequires: readline-devel BuildRequires: ncurses-devel +BuildRequires: mac-devel # For /usr/share/perl5/ExtUtils/xsubpp BuildRequires: perl-ExtUtils-ParseXS BuildRequires: gcc @@ -90,6 +63,11 @@ BuildRequires: waf Obsoletes: xmms2-mad < 0.8-26 Provides: xmms2-mad = %{version}-%{release} +Obsoletes: xmms2-mac < 0.8-24 +Provides: xmms2-mac = %{version}-%{release} + +Obsoletes: xmms2-nyxmms2 < 0.8-89 +Provides: xmms2-nyxmms2 = %{version}-%{release} %description XMMS2 is an audio framework, but it is not a general multimedia player - it @@ -121,12 +99,19 @@ API documentation for the XMMS2 modular audio framework architecture. %package perl Summary: Perl support for XMMS2 -License: GPL+ or Artistic +License: GPL-1.0-or-later OR Artistic-1.0-Perl Requires: %{name} = %{version}-%{release} %description perl Perl bindings for XMMS2. +%package python3 +Summary: Python3 support for XMMS2 +Requires: %{name} = %{version}-%{release} + +%description python3 +Python3 bindings for XMMS2. + %package ruby Summary: Ruby support for XMMS2 Requires: %{name} = %{version}-%{release} @@ -135,45 +120,14 @@ Requires: ruby(release) %description ruby Ruby bindings for XMMS2. -%package -n nyxmms2 -Summary: Commandline client for XMMS2 -Requires: %{name} = %{version}-%{release} - -%description -n nyxmms2 -nyxmms2 is the new official commandline client for XMMS2. It can be run in -either shell-mode (if started without arguments), or in inline-mode where -it executes the command passed as argument directly. - %prep -%setup -q -n %{name}-%{version}%{codename} -%patch1 -p1 -b .plugins-use-libdir -%patch2 -p1 -b .default-output-pulse -%patch4 -p1 -b .noO0 -%patch5 -p1 -b .versionsanity -%patch7 -p1 -b .modplug_header -%patch8 -p1 -b .vorbis_libs -%patch10 -p1 -b .openssl11 -%patch11 -p1 -b .nomind -%patch12 -p1 -b .fixme -%patch13 -p1 -b .py3 -%patch14 -p1 -b .namefix +%setup -q -n %{name}-%{version} +%patch -P11 -p1 -b .nomind cp %{SOURCE2} . # This header doesn't need to be executable chmod -x src/include/xmmsclient/xmmsclient++/dict.h -# Clean up paths in wafadmin -# WAFADMIN_FILES=`find wafadmin/ -type f` -# for i in $WAFADMIN_FILES; do -# sed -i 's|/usr/lib|%{_libdir}|g' $i -# done -# sed -i 's|"lib"|"%{_lib}"|g' wscript -%if 0 -for i in doc/tutorial/python/tut1.py doc/tutorial/python/tut2.py doc/tutorial/python/tut3.py doc/tutorial/python/tut4.py doc/tutorial/python/tut5.py doc/tutorial/python/tut6.py utils/gen-tree-hashes.py utils/gen-wiki-release-bugs.py utils/gen-tarball.py utils/gen-wiki-release-authors.py waf waftools/podselect.py waftools/genipc.py waftools/genipc_server.py waftools/cython.py; do - sed -i 's|#!/usr/bin/env python|#!/usr/bin/python2|g' $i -done -%endif - %build export CFLAGS="%{optflags} -DHAVE_G_FILE_QUERY_FILE_TYPE" export CPPFLAGS="%{optflags}" @@ -200,7 +154,7 @@ chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*. for i in %{buildroot}%{_mandir}/man1/*.gz; do gunzip $i; done -for i in %{buildroot}%{_mandir}/man1/*.1 xmms2-0.8DrO_o.ChangeLog; do +for i in %{buildroot}%{_mandir}/man1/*.1 xmms2-%{version}.ChangeLog; do iconv -o $i.iso88591 -f iso88591 -t utf8 $i mv $i.iso88591 $i done @@ -216,8 +170,11 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %files %license COPYING COPYING.GPL COPYING.LGPL -%doc AUTHORS xmms2-0.8DrO_o.ChangeLog README TODO +%doc AUTHORS xmms2-%{version}.ChangeLog README.mdown %{_bindir}/%{name}* +%{_bindir}/_xmms2-migrate-collections-v0 +%{_bindir}/s4 +%{_bindir}/sqlite2s4 %{_libdir}/libxmmsclient*.so.* %{_libdir}/%{name} %{_mandir}/man1/%{name}* @@ -236,6 +193,9 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{perl_archlib}/Audio/ %{perl_archlib}/auto/Audio/ +%files python3 +%{python3_sitearch}/xmmsclient/ + %files ruby %{ruby_vendorlibdir}/xmmsclient.rb %{ruby_vendorlibdir}/xmmsclient/ @@ -243,10 +203,13 @@ rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ %{ruby_vendorarchdir}/xmmsclient_ext.so %{ruby_vendorarchdir}/xmmsclient_glib.so -%files -n nyxmms2 -%{_bindir}/nyxmms2 - %changelog +* Tue Sep 12 2023 Tom Callaway - 0.9.3-1 +- update to 0.9.3 +- add BR: mac-devel +- provides/obsoletes xmms2-mac (from rpmfusion) +- provides/obsoletes xmms2-nyxmms2 (upstream dropped that naming) + * Sat Jul 22 2023 Fedora Release Engineering - 0.8-88 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 84177f8a4da864a16c145d6c4ae96ea2c03319c0 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 12 Sep 2023 16:51:53 -0400 Subject: [PATCH 28/49] missing BR --- xmms2.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index fe166a8..9e36d61 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -15,7 +15,8 @@ Source2: unreal_dm-free.music.and.free.beer.ogg # Swap mind.in.a.box for free.music.and.free.beer Patch11: xmms2-0.9.3-no-mind-in-a-box.patch URL: http://wiki.xmms2.xmms.se/ -BuildRequires: python3 +BuildRequires: git +BuildRequires: python3-devel BuildRequires: sqlite-devel BuildRequires: flac-devel BuildRequires: libofa-devel From aafe403e8dc82227e691c83997554afb658c2d83 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 13 Sep 2023 10:54:14 -0400 Subject: [PATCH 29/49] lots more BR --- xmms2.spec | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/xmms2.spec b/xmms2.spec index 9e36d61..d25c50a 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -17,6 +17,7 @@ Patch11: xmms2-0.9.3-no-mind-in-a-box.patch URL: http://wiki.xmms2.xmms.se/ BuildRequires: git BuildRequires: python3-devel +BuildRequires: python3-cython BuildRequires: sqlite-devel BuildRequires: flac-devel BuildRequires: libofa-devel @@ -55,6 +56,12 @@ BuildRequires: glib2-devel BuildRequires: readline-devel BuildRequires: ncurses-devel BuildRequires: mac-devel +BuildRequires: fluidsynth-devel +BuildRequires: opusfile-devel +BuildRequires: libmms-devel +BuildRequires: libcurl-devel +BuildRequires: flex +BuildRequires: bison # For /usr/share/perl5/ExtUtils/xsubpp BuildRequires: perl-ExtUtils-ParseXS BuildRequires: gcc From faa2a61ca513c7e68a29a93e639506781bccc341 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Wed, 13 Sep 2023 11:17:48 -0400 Subject: [PATCH 30/49] remove old py2 hack --- xmms2.spec | 5 ----- 1 file changed, 5 deletions(-) diff --git a/xmms2.spec b/xmms2.spec index d25c50a..e2da0aa 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -169,11 +169,6 @@ done install -m0755 %{SOURCE1} %{buildroot}%{_bindir} -# For F-32: -# Explicitly remove python2 related files. F32 "python27" package -# contains header files, which makes xmms2 build python2 bindings -rm -rf %{buildroot}%{python3_sitelib}/xmmsclient/ - %ldconfig_scriptlets %files From 6dd436cf542c7630f070bb1666bb0b348ca6c1b4 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sun, 19 Nov 2023 08:39:30 +0000 Subject: [PATCH 31/49] provides/obsoletes xmms2-mms (from rpmfusion) --- xmms2.spec | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index e2da0aa..8662f76 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.3 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -74,6 +74,9 @@ Provides: xmms2-mad = %{version}-%{release} Obsoletes: xmms2-mac < 0.8-24 Provides: xmms2-mac = %{version}-%{release} +Obsoletes: xmms2-mms < 0.8-39 +Provides: xmms2-mms = %{version}-%{release} + Obsoletes: xmms2-nyxmms2 < 0.8-89 Provides: xmms2-nyxmms2 = %{version}-%{release} @@ -207,6 +210,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Sun Nov 19 2023 Leigh Scott - 0.9.3-2 +- provides/obsoletes xmms2-mms (from rpmfusion) + * Tue Sep 12 2023 Tom Callaway - 0.9.3-1 - update to 0.9.3 - add BR: mac-devel From 829321114d2030586c3febbca31a3654005662e6 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 3 Jan 2024 22:06:45 +0900 Subject: [PATCH 32/49] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 8662f76..bbd5405 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.3 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -210,6 +210,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Wed Jan 03 2024 Mamoru TASAKA - 0.9.3-3 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 + * Sun Nov 19 2023 Leigh Scott - 0.9.3-2 - provides/obsoletes xmms2-mms (from rpmfusion) From 600ee539aecae0a881186d347a56f6997393be43 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 27 Jan 2024 09:54:20 +0000 Subject: [PATCH 33/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index bbd5405..59c46ab 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.3 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -210,6 +210,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Sat Jan 27 2024 Fedora Release Engineering - 0.9.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Wed Jan 03 2024 Mamoru TASAKA - 0.9.3-3 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.3 From a2ab3cc80a834b745ed4afcf9657fe8f03e5b844 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Sat, 8 Jun 2024 22:34:56 +0200 Subject: [PATCH 34/49] Rebuilt for Python 3.13 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 59c46ab..3b4606c 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.3 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -210,6 +210,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Sat Jun 08 2024 Python Maint - 0.9.3-5 +- Rebuilt for Python 3.13 + * Sat Jan 27 2024 Fedora Release Engineering - 0.9.3-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 064c174e6f33629713f5be455e2d753012d39e0b Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Wed, 12 Jun 2024 12:50:41 +0200 Subject: [PATCH 35/49] Perl 5.40 rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 3b4606c..c2c9f3e 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.3 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -210,6 +210,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Wed Jun 12 2024 Jitka Plesnikova - 0.9.3-6 +- Perl 5.40 rebuild + * Sat Jun 08 2024 Python Maint - 0.9.3-5 - Rebuilt for Python 3.13 From af36180aa01a848cc1e64a4f1cfea375b4f327d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sat, 20 Jul 2024 10:15:08 +0000 Subject: [PATCH 36/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index c2c9f3e..ad0eb12 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.3 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -210,6 +210,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Sat Jul 20 2024 Fedora Release Engineering - 0.9.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Wed Jun 12 2024 Jitka Plesnikova - 0.9.3-6 - Perl 5.40 rebuild From 2f222daecc37ef8d9aba887a53d568a0e510fcbd Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 22 Oct 2024 09:34:38 -0400 Subject: [PATCH 37/49] update to 0.9.4, fix FTBFS --- .gitignore | 1 + sources | 1 + xmms2-0.9.3-curl-buffer-overrun-fix.patch | 29 +++++++++++++++++++++++ xmms2-0.9.3-gentoo-cpp-client.patch | 12 ++++++++++ xmms2-0.9.3-gentoo-faad.patch | 14 +++++++++++ xmms2.spec | 17 +++++++++++-- 6 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 xmms2-0.9.3-curl-buffer-overrun-fix.patch create mode 100644 xmms2-0.9.3-gentoo-cpp-client.patch create mode 100644 xmms2-0.9.3-gentoo-faad.patch diff --git a/.gitignore b/.gitignore index 24cd549..b39d60c 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ xmms2-0.7DrNo-clean.tar.bz2 /xmms2-0.8DrO_o-clean.tar.bz2 /unreal_dm-free.music.and.free.beer.ogg /xmms2-0.9.3-clean.tar.xz +/xmms2-0.9.4-clean.tar.xz diff --git a/sources b/sources index 7671a35..d3369a8 100644 --- a/sources +++ b/sources @@ -1,2 +1,3 @@ SHA512 (unreal_dm-free.music.and.free.beer.ogg) = 436389158cad78a95f62a1e4de2e9add243d9fb027dec57022d9b1791ccb203539a9562bb5ffaba5918533fec79a5e2b32415eac0bc467fc8441f4906bff1225 SHA512 (xmms2-0.9.3-clean.tar.xz) = 06dfe5aef11f57fe2049e28b370f2ecb9dabdf9c6f8b18132730d0c45f9a6548d9c2ba97fdee7e03e3f64e95a128edde266ce670d3f1f7bcb1badab714154351 +SHA512 (xmms2-0.9.4-clean.tar.xz) = b3beb208a3d01494bdcf57aa89ca4b4d108644cfa3f5cee0a86dd4178a68df489cf5ba2f1d3a68d0cec6ca3faf8b23fd17a9002c55cc25cb5b10540700803f17 diff --git a/xmms2-0.9.3-curl-buffer-overrun-fix.patch b/xmms2-0.9.3-curl-buffer-overrun-fix.patch new file mode 100644 index 0000000..b069306 --- /dev/null +++ b/xmms2-0.9.3-curl-buffer-overrun-fix.patch @@ -0,0 +1,29 @@ +diff -up xmms2-0.9.3/src/plugins/curl/curl_http.c.underrunfix xmms2-0.9.3/src/plugins/curl/curl_http.c +--- xmms2-0.9.3/src/plugins/curl/curl_http.c.underrunfix 2023-09-15 10:00:07.480047876 -0400 ++++ xmms2-0.9.3/src/plugins/curl/curl_http.c 2023-09-15 10:00:49.812658794 -0400 +@@ -31,6 +31,7 @@ + /* + * Type definitions + */ ++#define XMMS2_CURL_BUFFER_SIZE 0x200000 + + typedef struct { + CURL *curl_easy; +@@ -212,7 +213,7 @@ xmms_curl_init (xmms_xform_t *xform) + g_snprintf (proxyuserpass, sizeof (proxyuserpass), "%s:%s", proxyuser, + proxypass); + +- data->buffer = g_malloc (CURL_MAX_WRITE_SIZE); ++ data->buffer = g_malloc (XMMS2_CURL_BUFFER_SIZE); + data->url = g_strdup (url); + + /* check for broken version of curl here */ +@@ -463,7 +464,7 @@ xmms_curl_callback_write (void *ptr, siz + + len = size * nmemb; + +- g_return_val_if_fail ((data->bufferlen + len) <= CURL_MAX_WRITE_SIZE, 0); ++ g_return_val_if_fail ((data->bufferlen + len) <= XMMS2_CURL_BUFFER_SIZE, 0); + + memcpy (data->buffer + data->bufferlen, ptr, len); + data->bufferlen = data->bufferlen + len; diff --git a/xmms2-0.9.3-gentoo-cpp-client.patch b/xmms2-0.9.3-gentoo-cpp-client.patch new file mode 100644 index 0000000..1416a2a --- /dev/null +++ b/xmms2-0.9.3-gentoo-cpp-client.patch @@ -0,0 +1,12 @@ +diff -up xmms2-0.9.3/src/include/xmmsclient/xmmsclient++/mainloop.h.gentoo xmms2-0.9.3/src/include/xmmsclient/xmmsclient++/mainloop.h +--- xmms2-0.9.3/src/include/xmmsclient/xmmsclient++/mainloop.h.gentoo 2023-09-15 09:51:09.760321870 -0400 ++++ xmms2-0.9.3/src/include/xmmsclient/xmmsclient++/mainloop.h 2023-09-15 09:53:49.565612336 -0400 +@@ -41,7 +41,7 @@ namespace Xmms + * @note The constructor should only initialize the + * mainloop, not start it! + */ +- MainloopInterface( xmmsc_connection_t* conn ) : ++ MainloopInterface( xmmsc_connection_t*& conn ) : + running_( false ), conn_( conn ) { } + + /** Destructor. Should also stop the loop. diff --git a/xmms2-0.9.3-gentoo-faad.patch b/xmms2-0.9.3-gentoo-faad.patch new file mode 100644 index 0000000..5c18a29 --- /dev/null +++ b/xmms2-0.9.3-gentoo-faad.patch @@ -0,0 +1,14 @@ +diff -up xmms2-0.9.3/src/plugins/faad/faad.c.gentoo xmms2-0.9.3/src/plugins/faad/faad.c +--- xmms2-0.9.3/src/plugins/faad/faad.c.gentoo 2023-09-15 09:56:23.452817978 -0400 ++++ xmms2-0.9.3/src/plugins/faad/faad.c 2023-09-15 09:56:55.255273805 -0400 +@@ -242,7 +242,9 @@ xmms_faad_init (xmms_xform_t *xform) + * and durations calculations... So we cheat and tell libfaad2 we're feeding + * it frame 1. + */ +- NeAACDecPostSeekReset (data->decoder, 1); ++ // This line has stopped working since security fixes in the faad 2.9.0 ++ // release. ++ // NeAACDecPostSeekReset (data->decoder, 1); + + /* FIXME: Because for HE AAC files some versions of libfaad return the wrong + * samplerate in init, we have to do one read and let it decide the real diff --git a/xmms2.spec b/xmms2.spec index ad0eb12..f02ff93 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture -Version: 0.9.3 -Release: 7%{?dist} +Version: 0.9.4 +Release: 1%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -12,6 +12,12 @@ Source1: xmms2-client-launcher.sh # CC-BY # taken from http://ccmixter.org/files/unreal_dm/38156 Source2: unreal_dm-free.music.and.free.beer.ogg +# Apply c++ client fix from gentoo +Patch2: xmms2-0.9.3-gentoo-cpp-client.patch +# Apply fix to faad plugin from gentoo +Patch3: xmms2-0.9.3-gentoo-faad.patch +# Apply fix for curl buffer overrun +Patch4: xmms2-0.9.3-curl-buffer-overrun-fix.patch # Swap mind.in.a.box for free.music.and.free.beer Patch11: xmms2-0.9.3-no-mind-in-a-box.patch URL: http://wiki.xmms2.xmms.se/ @@ -67,6 +73,7 @@ BuildRequires: perl-ExtUtils-ParseXS BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: waf +BuildRequires: openssl-devel-engine, openssl-devel Obsoletes: xmms2-mad < 0.8-26 Provides: xmms2-mad = %{version}-%{release} @@ -133,6 +140,9 @@ Ruby bindings for XMMS2. %prep %setup -q -n %{name}-%{version} +%patch -P2 -p1 -b .cpp-client +%patch -P3 -p1 -b .faad +%patch -P4 -p1 -b .overrun %patch -P11 -p1 -b .nomind cp %{SOURCE2} . @@ -210,6 +220,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Tue Oct 22 2024 Tom Callaway - 0.9.4-1 +- update to 0.9.4 + * Sat Jul 20 2024 Fedora Release Engineering - 0.9.3-7 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9b744b6318e80ff00165fe53c9756bd56eaebfc6 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 22 Oct 2024 10:38:27 -0400 Subject: [PATCH 38/49] use the local waf --- xmms2.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xmms2.spec b/xmms2.spec index f02ff93..86f8c49 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -155,16 +155,16 @@ export CPPFLAGS="%{optflags}" export LIBDIR="%{_libdir}" export XSUBPP="%{_bindir}/xsubpp" -waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ +./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 -waf build -v %{?_smp_mflags} +./waf build -v %{?_smp_mflags} # make the docs doxygen %install export LIBDIR="%{_libdir}" -waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ +./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig # exec flags for debuginfo From 34e3979316e289274e98f96078bbc893dc0f1659 Mon Sep 17 00:00:00 2001 From: Tom Callaway Date: Tue, 22 Oct 2024 10:50:34 -0400 Subject: [PATCH 39/49] BR: python-unversioned-command --- xmms2.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/xmms2.spec b/xmms2.spec index 86f8c49..32dc20b 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -24,6 +24,7 @@ URL: http://wiki.xmms2.xmms.se/ BuildRequires: git BuildRequires: python3-devel BuildRequires: python3-cython +BuildRequires: python-unversioned-command BuildRequires: sqlite-devel BuildRequires: flac-devel BuildRequires: libofa-devel From fb191d0a194cbd17e934da82172b7d3876b15a89 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Wed, 8 Jan 2025 10:24:06 +0900 Subject: [PATCH 40/49] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 32dc20b..c141893 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.4 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Wed Jan 08 2025 Mamoru TASAKA - 0.9.4-2 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 + * Tue Oct 22 2024 Tom Callaway - 0.9.4-1 - update to 0.9.4 From 46c49ca29365a91ae4ec7c47ab1d65d43b58d6d8 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 19 Jan 2025 16:03:18 +0000 Subject: [PATCH 41/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index c141893..32856d6 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.4 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Sun Jan 19 2025 Fedora Release Engineering - 0.9.4-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Wed Jan 08 2025 Mamoru TASAKA - 0.9.4-2 - Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_3.4 From 0bfa2b0fcb71c1ce3a53656fcd705b4157b4cb2f Mon Sep 17 00:00:00 2001 From: Tom spot Callaway Date: Mon, 10 Mar 2025 12:45:50 -0400 Subject: [PATCH 42/49] 0.9.5 --- .gitignore | 1 + sources | 3 +-- xmms2.spec | 7 +++++-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index b39d60c..8ab4456 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,4 @@ xmms2-0.7DrNo-clean.tar.bz2 /unreal_dm-free.music.and.free.beer.ogg /xmms2-0.9.3-clean.tar.xz /xmms2-0.9.4-clean.tar.xz +/xmms2-0.9.5-clean.tar.xz diff --git a/sources b/sources index d3369a8..3f8e255 100644 --- a/sources +++ b/sources @@ -1,3 +1,2 @@ SHA512 (unreal_dm-free.music.and.free.beer.ogg) = 436389158cad78a95f62a1e4de2e9add243d9fb027dec57022d9b1791ccb203539a9562bb5ffaba5918533fec79a5e2b32415eac0bc467fc8441f4906bff1225 -SHA512 (xmms2-0.9.3-clean.tar.xz) = 06dfe5aef11f57fe2049e28b370f2ecb9dabdf9c6f8b18132730d0c45f9a6548d9c2ba97fdee7e03e3f64e95a128edde266ce670d3f1f7bcb1badab714154351 -SHA512 (xmms2-0.9.4-clean.tar.xz) = b3beb208a3d01494bdcf57aa89ca4b4d108644cfa3f5cee0a86dd4178a68df489cf5ba2f1d3a68d0cec6ca3faf8b23fd17a9002c55cc25cb5b10540700803f17 +SHA512 (xmms2-0.9.5-clean.tar.xz) = 325dd15182a5f5fd436e74fe624c9f30c1335394650208cfc6c9e4ac2efb657618ea0b1b88592922ae840cadfefae7cb4d0f75e3cb7121a4b068468fbc6f76cc diff --git a/xmms2.spec b/xmms2.spec index 32856d6..7d7fde9 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture -Version: 0.9.4 -Release: 3%{?dist} +Version: 0.9.5 +Release: 1%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Mon Mar 10 2025 Tom Callaway - 0.9.5-1 +- update to 0.9.5 + * Sun Jan 19 2025 Fedora Release Engineering - 0.9.4-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild From 36580af26e46dc6a043785bfed02925acea373ac Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 27 May 2025 17:20:49 +0200 Subject: [PATCH 43/49] Rebuilt for flac 1.5.0 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 7d7fde9..19d0a66 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.5 -Release: 1%{?dist} +Release: 2%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Tue May 27 2025 Jitka Plesnikova - 0.9.5-2 +- Rebuilt for flac 1.5.0 + * Mon Mar 10 2025 Tom Callaway - 0.9.5-1 - update to 0.9.5 From 0b6236b1aaae6f59b9da44f048ce1b75ca114937 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Tue, 3 Jun 2025 14:31:10 +0200 Subject: [PATCH 44/49] Rebuilt for Python 3.14 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 19d0a66..c7cfba1 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.5 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Tue Jun 03 2025 Python Maint - 0.9.5-3 +- Rebuilt for Python 3.14 + * Tue May 27 2025 Jitka Plesnikova - 0.9.5-2 - Rebuilt for flac 1.5.0 From 51dffd48ce2ba3e9bb61f5fd4d1b9fdbd0ab3740 Mon Sep 17 00:00:00 2001 From: Jitka Plesnikova Date: Tue, 8 Jul 2025 14:26:11 +0200 Subject: [PATCH 45/49] Perl 5.42 rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index c7cfba1..e110feb 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.5 -Release: 3%{?dist} +Release: 4%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Tue Jul 08 2025 Jitka Plesnikova - 0.9.5-4 +- Perl 5.42 rebuild + * Tue Jun 03 2025 Python Maint - 0.9.5-3 - Rebuilt for Python 3.14 From 38a5c53cea285e6db8420321c8f8890863768065 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 25 Jul 2025 20:57:01 +0000 Subject: [PATCH 46/49] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index e110feb..13cf9bb 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.5 -Release: 4%{?dist} +Release: 5%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Fri Jul 25 2025 Fedora Release Engineering - 0.9.5-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Tue Jul 08 2025 Jitka Plesnikova - 0.9.5-4 - Perl 5.42 rebuild From 08ea2f7818840fd72d79addd62108458cda6b315 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 15 Aug 2025 15:23:16 +0200 Subject: [PATCH 47/49] Rebuilt for Python 3.14.0rc2 bytecode --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 13cf9bb..4ae70bf 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.5 -Release: 5%{?dist} +Release: 6%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Fri Aug 15 2025 Python Maint - 0.9.5-6 +- Rebuilt for Python 3.14.0rc2 bytecode + * Fri Jul 25 2025 Fedora Release Engineering - 0.9.5-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild From 735b239b059ddc6f7c0399d6503d9e299220f8a2 Mon Sep 17 00:00:00 2001 From: Python Maint Date: Fri, 19 Sep 2025 15:03:51 +0200 Subject: [PATCH 48/49] Rebuilt for Python 3.14.0rc3 bytecode --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 4ae70bf..9db5ffe 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.5 -Release: 6%{?dist} +Release: 7%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Fri Sep 19 2025 Python Maint - 0.9.5-7 +- Rebuilt for Python 3.14.0rc3 bytecode + * Fri Aug 15 2025 Python Maint - 0.9.5-6 - Rebuilt for Python 3.14.0rc2 bytecode From accb1bcc79d276212a261570d875d1eefd4906d8 Mon Sep 17 00:00:00 2001 From: Mamoru TASAKA Date: Thu, 8 Jan 2026 19:49:51 +0900 Subject: [PATCH 49/49] Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 --- xmms2.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/xmms2.spec b/xmms2.spec index 9db5ffe..b3157ab 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,7 +1,7 @@ Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.9.5 -Release: 7%{?dist} +Release: 8%{?dist} License: LGPL-2.1-or-later AND GPL-2.0-or-later AND BSD-3-Clause # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. # Also, the ogg sample included is not under a FOSS license. @@ -221,6 +221,9 @@ install -m0755 %{SOURCE1} %{buildroot}%{_bindir} %{ruby_vendorarchdir}/xmmsclient_glib.so %changelog +* Thu Jan 08 2026 Mamoru TASAKA - 0.9.5-8 +- Rebuild for https://fedoraproject.org/wiki/Changes/Ruby_4.0 + * Fri Sep 19 2025 Python Maint - 0.9.5-7 - Rebuilt for Python 3.14.0rc3 bytecode