commit ffbc49c0fc1a67ce3bd5e65adc8f99c992c1433e
Author: Jakub Bogusz <[email protected]>
Date: Thu May 11 21:09:55 2023 +0200
- up to 0.2DrDolittle; added -client-lib-java package
xmms2-java.patch | 11 ++++
xmms2-mdns.patch | 9 +++
xmms2-python3.patch | 172 ++++++++++++++++++++++++++++++++++++++--------------
xmms2-ruby.patch | 54 +++++------------
xmms2-tabs.patch | 58 +++++++++++++++---
xmms2.spec | 46 +++++++++++---
6 files changed, 253 insertions(+), 97 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index 9b80d91..be75766 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -2,6 +2,7 @@
#
# Conditional build:
%bcond_with efl # ecore client library
+%bcond_without java # Java/JNI module
%bcond_with python # Python module (doesn't build with python3-based scons
4)
%bcond_without ruby # Ruby modules
%bcond_with flac # flac plugin (incompatible with 1.1.3+)
@@ -9,34 +10,42 @@
Summary: Client/server based media player system
Summary(pl.UTF-8): System odtwarzania multimediów oparty na architekturze
klient/serwer
Name: xmms2
-Version: 0.2DrCox
+Version: 0.2DrDolittle
Release: 0.1
License: LGPL v2.1
Group: Applications/Sound
Source0:
https://downloads.sourceforge.net/xmms2/%{name}-%{version}.tar.bz2
-# Source0-md5: b93b26d7c71c686595ad4bf1e212e95d
+# Source0-md5: 93daf53d21d198d8e05bf4de37976d7a
Patch0: %{name}-tabs.patch
Patch1: %{name}-python3.patch
Patch2: %{name}-link.patch
Patch3: %{name}-modplug.patch
+Patch4: %{name}-mdns.patch
Patch5: %{name}-ruby.patch
Patch6: %{name}-sid-update.patch
+Patch7: %{name}-java.patch
URL: http://xmms2.xmms.se/
BuildRequires: SDL-devel
BuildRequires: SDL_ttf-devel
BuildRequires: alsa-lib-devel
+BuildRequires: avahi-devel
+BuildRequires: avahi-compat-libdns_sd-devel
+BuildRequires: avahi-glib-devel
BuildRequires: curl-devel >= 7.11.2
%{?with_efl:BuildRequires: ecore-devel}
BuildRequires: faad2-devel >= 2
%{?with_flac:BuildRequires: flac-devel < 1.1.3}
+BuildRequires: gamin-devel
BuildRequires: glib2-devel >= 2.2.0
-BuildRequires: gnome-vfs2-devel
+BuildRequires: gnome-vfs2-devel >= 2.0
BuildRequires: jack-audio-connection-kit-devel
+%{?with_java:BuildRequires: jdk}
BuildRequires: libmad-devel
BuildRequires: libmodplug-devel
BuildRequires: libmpcdec-devel
BuildRequires: libsidplay2-devel
BuildRequires: libsmbclient-devel
+BuildRequires: libstdc++-devel
BuildRequires: libvorbis-devel
BuildRequires: pkgconfig
%if %{with python}
@@ -135,6 +144,19 @@ Ruby bindings for the xmms2 GLib client library.
%description client-lib-glib-ruby -l pl.UTF-8
Wiązania Ruby'ego dla biblioteki klienckiej xmms2 GLib.
+%package client-lib-java
+Summary: xmms2 Java bindings
+Summary(pl.UTF-8): Wiązania Javy do XMMS2
+Group: Applications/Sound
+Requires: %{name} = %{version}-%{release}
+Requires: jre
+
+%description client-lib-java
+Java bindings for the xmms2 clientlib.
+
+%description client-lib-java -l pl.UTF-8
+Wiązania Javy do xmms2.
+
%package client-lib-python
Summary: xmms2 Python bindings
Summary(pl.UTF-8): Wiązania Pythona do XMMS2
@@ -361,8 +383,10 @@ xmms2.
%patch1 -p1
%patch2 -p1
%patch3 -p1
+%patch4 -p1
%patch5 -p1
%patch6 -p1
+%patch7 -p1
%{__sed} -i xmms2.pc.in \
-e '/^libdir/ s,/lib$,/%{_lib},'
@@ -371,7 +395,7 @@ xmms2.
%{__sed} -i xmmsenv.py \
-e '/os\.path\.join(self\.install_prefix.*"lib/s@"lib@"%{_lib}@'
%{__sed} -i src/clients/lib/python/Library \
- -e 's/get_python_lib()/get_python_lib("false")/'
+ -e 's/get_python_lib()/get_python_lib(plat_specific=True)/'
# avoid invalid version in .pc files
%{__sed} -i -e '/^XMMS_VERSION/ s/ \(Dr[^ ]*\) (git commit: %s%s)/\1/; s/ %
.*//;' SConstruct
@@ -380,9 +404,6 @@ iconv -f iso-8859-1 -t utf8 doc/xmms2.1 -o doc/xmms2.1.utf8
%{__mv} doc/xmms2.1.utf8 doc/xmms2.1
%build
-# how to make it called in scons 4 (SourceCode builder has been removed)?
-%{__python} src/xmms/generate-converter.py > src/xmms/converter.c
-
scons \
CC="%{__cc}" \
CXX="%{__cxx}" \
@@ -423,6 +444,9 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_bindir}/xmms2
%attr(755,root,root) %{_bindir}/xmms2-et
+%attr(755,root,root) %{_bindir}/xmms2-find-avahi
+%attr(755,root,root) %{_bindir}/xmms2-mdns-avahi
+%attr(755,root,root) %{_bindir}/xmms2-mdns-dnssd
%attr(755,root,root) %{_bindir}/xmms2-mlib-updater
%{_mandir}/man1/xmms2.1*
@@ -452,6 +476,13 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{ruby_vendorarchdir}/xmmsclient_glib.so
%endif
+%if %{with java}
+%files client-lib-java
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libxmms2java.so
+%{_javadir}/xmms2java.jar
+%endif
+
%if %{with python}
%files client-lib-python
%defattr(644,root,root,755)
@@ -539,6 +570,7 @@ rm -rf $RPM_BUILD_ROOT
%{_libdir}/libxmmsclient.a
%{_libdir}/libxmmsclient-glib.a
%{_pkgconfigdir}/xmms2-client.pc
+%{_pkgconfigdir}/xmms2-client-cpp.pc
%{_pkgconfigdir}/xmms2-client-ecore.pc
%{_pkgconfigdir}/xmms2-client-glib.pc
%{_pkgconfigdir}/xmms2-plugin.pc
diff --git a/xmms2-java.patch b/xmms2-java.patch
new file mode 100644
index 0000000..e4a4231
--- /dev/null
+++ b/xmms2-java.patch
@@ -0,0 +1,11 @@
+--- xmms2-0.2DrDolittle/src/clients/lib/java/Library.orig 2023-05-11
12:50:52.113122775 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/java/Library 2023-05-11
20:55:45.265511648 +0200
+@@ -103,7 +103,7 @@ def config(env):
+
+ env.Java(target = mydir, source = [mydir + '/src'])
+ env.Jar(target=mydir + '/xmms2java.jar', source=mydir + '/org')
+- env.Install(env['PREFIX'] + 'share/xmms2/java', mydir +
'/xmms2java.jar')
++ env.Install(env['PREFIX'] + '/share/java', mydir + '/xmms2java.jar')
+ def mkdir(target, source, env):
+ try:
+ os.mkdir(mydir + "/src/org/xmms2/xmms2bindings")
diff --git a/xmms2-mdns.patch b/xmms2-mdns.patch
new file mode 100644
index 0000000..d61945d
--- /dev/null
+++ b/xmms2-mdns.patch
@@ -0,0 +1,9 @@
+--- xmms2-0.2DrDolittle/src/clients/mdns/dns_sd/Program.orig 2006-03-27
21:34:45.000000000 +0200
++++ xmms2-0.2DrDolittle/src/clients/mdns/dns_sd/Program 2023-05-11
17:58:17.242155129 +0200
+@@ -8,5 +8,4 @@ def config(env):
+ env.Append(LIBS=["xmmsclient-glib"])
+ env.pkgconfig("glib-2.0")
+ env.checkheader("dns_sd.h")
+- # on macosx it's in libc?
+- #env.checklib("dns_sd", "DNSServiceRegister")
++ env.checklib("dns_sd", "DNSServiceRegister")
diff --git a/xmms2-python3.patch b/xmms2-python3.patch
index 3ca3854..7d4d0b4 100644
--- a/xmms2-python3.patch
+++ b/xmms2-python3.patch
@@ -1,5 +1,5 @@
---- xmms2-0.2DrCox/SConstruct.orig 2023-05-10 21:34:42.437585719 +0200
-+++ xmms2-0.2DrCox/SConstruct 2023-05-10 21:37:23.510046448 +0200
+--- xmms2-0.2DrDolittle/SConstruct.orig 2023-05-10 22:01:41.255482496
+0200
++++ xmms2-0.2DrDolittle/SConstruct 2023-05-10 22:05:57.770759500 +0200
@@ -5,7 +5,6 @@ import sys
import SCons
import re
@@ -78,17 +78,7 @@
for (t,s) in zip(target, source):
return do_subst_in_file(str(t), str(s), d)
-@@ -132,7 +131,8 @@ python_executable = sys.executable
- b = Builder(action = python_executable + ' src/xmms/generate-converter.py >
src/xmms/converter.c')
- base_env.Depends('#src/xmms/converter.c', 'src/xmms/generate-converter.py')
- base_env.Depends('#src/xmms/sample.c', 'src/xmms/converter.c')
--base_env.SourceCode('src/xmms/converter.c', b)
-+base_env['BUILDERS']['GenerateConverter'] = b
-+conv = base_env.GenerateConverter()
-
- base_env.handle_targets("Library")
- base_env.handle_targets("Program")
-@@ -152,7 +152,7 @@ config = base_env.SubstInFile("src/inclu
+@@ -159,7 +158,7 @@ config = base_env.SubstInFile("src/inclu
try:
dump(base_env.config_cache, open("config.cache", "wb+"))
except IOError:
@@ -97,7 +87,7 @@
#### INSTALL HEADERS!
-@@ -199,14 +199,14 @@ for p in pc_files:
+@@ -195,14 +194,14 @@ for p in pc_files:
base_env.Install("$PKGCONFIGDIR", p["name"]+".pc")
@@ -116,10 +106,10 @@
+print(", ".join(foo))
+print("Default output:", xmmsenv.default_output[1])
+ base_env.add_script("startup.d", "src/clients/mdns/xmms2-mdns-launcher.sh")
base_env.add_shared("mind.in.a.box-lament_snipplet.ogg")
- base_env.Alias('install', base_env.install_targets)
---- xmms2-0.2DrCox/xmmsenv.py.orig 2023-05-10 21:37:46.929919571 +0200
-+++ xmms2-0.2DrCox/xmmsenv.py 2023-05-10 21:38:22.049729311 +0200
+--- xmms2-0.2DrDolittle/xmmsenv.py.orig 2006-03-27 21:34:45.000000000
+0200
++++ xmms2-0.2DrDolittle/xmmsenv.py 2023-05-11 06:27:10.904565049 +0200
@@ -5,7 +5,6 @@ import shutil
import gzip
from marshal import load
@@ -146,7 +136,7 @@
eval(c, self.globs)
if not isinstance(self.globs.get("target"), str):
-@@ -86,14 +83,14 @@ class XMMSEnvironment(Environment):
+@@ -87,14 +84,14 @@ class XMMSEnvironment(Environment):
def __init__(self, parent=None, options=None, **kw):
reconfigure = self.options_changed(options, ['INSTALLPATH'])
Environment.__init__(self, options=options, ENV=os.environ)
@@ -163,7 +153,7 @@
self.config_cache={}
else:
self.config_cache={}
-@@ -103,7 +100,7 @@ class XMMSEnvironment(Environment):
+@@ -104,7 +101,7 @@ class XMMSEnvironment(Environment):
self.programs=[]
self.install_targets=[]
@@ -172,7 +162,7 @@
self.installdir = os.path.normpath(self["INSTALLDIR"] +
'/')
else:
self.installdir = ""
-@@ -134,7 +131,7 @@ class XMMSEnvironment(Environment):
+@@ -136,7 +133,7 @@ class XMMSEnvironment(Environment):
self.platform = sys.platform
def gzipper(target, source, env):
@@ -181,7 +171,7 @@
self['BUILDERS']['GZipper'] =
SCons.Builder.Builder(action=SCons.Action.Action(gzipper))
if self.platform == 'darwin':
-@@ -150,7 +147,7 @@ class XMMSEnvironment(Environment):
+@@ -152,7 +149,7 @@ class XMMSEnvironment(Environment):
self.install_targets.append(target)
def tryaction(self, cmd):
@@ -190,7 +180,7 @@
return self.config_cache[cmd]
r = False
-@@ -171,7 +168,7 @@ class XMMSEnvironment(Environment):
+@@ -173,7 +170,7 @@ class XMMSEnvironment(Environment):
return r
def run(self, cmd):
@@ -199,7 +189,15 @@
return self.config_cache[cmd]
try:
-@@ -193,7 +190,7 @@ class XMMSEnvironment(Environment):
+@@ -191,26 +188,26 @@ class XMMSEnvironment(Environment):
+ if libs:
+ cmd += " --libs"
+ cmd += " \"%s\"" % module
+- if not self.config_cache.has_key(cmd):
+- print "Checking for %s" % module,
++ if cmd not in self.config_cache:
++ print("Checking for %s" % module, end="")
+ self.configcmd(cmd, fail)
def configcmd(self, cmd, fail=False):
@@ -208,7 +206,14 @@
ret = self.config_cache[cmd]
else:
ret = os.popen(cmd).read()
-@@ -201,7 +198,7 @@ class XMMSEnvironment(Environment):
+ if cmd.startswith("pkg-config"):
+ if ret == '':
+- print " ... no"
++ print(" ... no")
+ else:
+- print " ... yes"
++ print(" ... yes")
+ self.config_cache[cmd] = ret
if ret == '':
if fail:
@@ -217,7 +222,7 @@
sys.exit(-1)
raise ConfigError("Command '%s' failed" % cmd)
ret = ret.strip()
-@@ -215,18 +212,18 @@ class XMMSEnvironment(Environment):
+@@ -224,18 +221,18 @@ class XMMSEnvironment(Environment):
else:
key = ("HEADER", header)
@@ -239,7 +244,7 @@
#libtool_flags = None
self.config_cache[key] = ""
-@@ -249,7 +246,7 @@ class XMMSEnvironment(Environment):
+@@ -258,7 +255,7 @@ class XMMSEnvironment(Environment):
if not self.config_cache[key]:
if fail:
@@ -248,7 +253,7 @@
sys.exit(1)
raise ConfigError("Symbol '%s' in library '%s' not
found" % (func, lib))
-@@ -380,14 +377,14 @@ class XMMSEnvironment(Environment):
+@@ -394,7 +394,7 @@ class XMMSEnvironment(Environment):
if options.files:
for filename in options.files:
if os.path.exists(filename):
@@ -257,6 +262,8 @@
else:
return False
+@@ -403,8 +400,8 @@ class XMMSEnvironment(Environment):
+
for option in options.options:
if option.key in exclude: continue
- if options.args.has_key(option.key):
@@ -266,7 +273,7 @@
if options.args[option.key] !=
cached[option.key]:
# differnt value
return True
-@@ -417,7 +414,7 @@ class XMMSEnvironment(Environment):
+@@ -434,7 +431,7 @@ class XMMSEnvironment(Environment):
This will open the libtool file and read the lines
that we need.
"""
@@ -275,7 +282,7 @@
line = f.readline()
ret = {}
while line:
-@@ -434,12 +431,12 @@ class XMMSEnvironment(Environment):
+@@ -451,13 +448,13 @@ class XMMSEnvironment(Environment):
targets = [cls(a[1], self) for a in self.potential_targets if
a[0].startswith(targettype)]
for t in targets:
@@ -290,16 +297,17 @@
+ except ConfigError as m:
self.conf.logstream.write("xmmsscons: File %s
reported error '%s' and was disabled.\n" % (t.target, m))
continue
---- xmms2-0.2DrBombay/src/clients/lib/ruby/Library.orig 2023-05-10
21:16:11.150272745 +0200
-+++ xmms2-0.2DrBombay/src/clients/lib/ruby/Library 2023-05-10
21:17:02.769993097 +0200
-@@ -7,14 +7,14 @@ static=False
+
+--- xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.orig 2006-03-27
21:34:45.000000000 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/ruby/Library 2023-05-10
22:08:47.519839891 +0200
+@@ -8,14 +8,14 @@ loadable=True
def config(env):
if env.tryaction ("ruby --version") :
# we require ruby 1.8 or greater
- print "Checking for Ruby 1.8 or greater... ",
+ print("Checking for Ruby 1.8 or greater... ", end="")
- version = env.run("ruby -e 'puts VERSION'").strip()
+ version = env.run("ruby -e 'puts defined?(VERSION) ? VERSION :
RUBY_VERSION'").strip()
if not version or [int(a) for a in version.split(".")] < [1, 8]
:
- print "no"
+ print("no")
@@ -310,7 +318,7 @@
got_ruby_h = env.run("ruby -rrbconfig -e 'puts
File.exist?(Config::CONFIG[\"archdir\"] + \"/ruby.h\")'").strip()
if got_ruby_h != "true" :
-@@ -22,7 +22,7 @@ def config(env):
+@@ -23,7 +23,7 @@ def config(env):
cmd = "ruby -rrbconfig -e 'puts \"-I%s -L%s\" %
[].fill(Config::CONFIG[\"archdir\"], 0..1)'"
env.configcmd(cmd)
@@ -319,16 +327,16 @@
env.librarypath = env["RUBYARCHDIR"]
else:
cmd = "ruby -rrbconfig -e 'print
Config::CONFIG[\"sitearchdir\"]'"
---- xmms2-0.1DR2.1/src/clients/lib/ruby/Library.ecore.orig 2005-08-18
20:26:23.000000000 +0200
-+++ xmms2-0.1DR2.1/src/clients/lib/ruby/Library.ecore 2023-05-06
20:36:42.295381814 +0200
-@@ -13,14 +13,14 @@ def ecorelib2sed(lib):
+--- xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.ecore.orig
2006-03-27 21:34:45.000000000 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.ecore 2023-05-10
22:09:41.692879744 +0200
+@@ -14,14 +14,14 @@ def ecorelib2sed(lib):
def config(env):
if env.tryaction ("ruby --version") :
# we require ruby 1.8 or greater
- print "Checking for Ruby 1.8 or greater... ",
+ print("Checking for Ruby 1.8 or greater... ", end="")
- version = env.run("ruby -e 'puts VERSION'").strip()
+ version = env.run("ruby -e 'puts defined?(VERSION) ? VERSION :
RUBY_VERSION'").strip()
if not version or [int(a) for a in version.split(".")] < [1, 8]
:
- print "no"
+ print("no")
@@ -339,7 +347,7 @@
got_ruby_h = env.run("ruby -rrbconfig -e 'puts
File.exist?(Config::CONFIG[\"archdir\"] + \"/ruby.h\")'").strip()
if got_ruby_h != "true" :
-@@ -28,7 +28,7 @@ def config(env):
+@@ -29,7 +29,7 @@ def config(env):
cmd = "ruby -rrbconfig -e 'puts \"-I%s -L%s\" %
[].fill(Config::CONFIG[\"archdir\"], 0..1)'"
env.configcmd(cmd)
@@ -348,16 +356,16 @@
env.librarypath = env["RUBYARCHDIR"]
else:
cmd = "ruby -rrbconfig -e 'print
Config::CONFIG[\"sitearchdir\"]'"
---- xmms2-0.1DR2.1/src/clients/lib/ruby/Library.glib.orig 2005-08-18
20:26:23.000000000 +0200
-+++ xmms2-0.1DR2.1/src/clients/lib/ruby/Library.glib 2023-05-06
20:37:48.775021663 +0200
-@@ -7,14 +7,14 @@ static=False
+--- xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.glib.orig 2006-03-27
21:34:45.000000000 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.glib 2023-05-10
22:10:27.335965807 +0200
+@@ -8,14 +8,14 @@ static=False
def config(env):
if env.tryaction ("ruby --version") :
# we require ruby 1.8 or greater
- print "Checking for Ruby 1.8 or greater... ",
+ print("Checking for Ruby 1.8 or greater... ", end="")
- version = env.run("ruby -e 'puts VERSION'").strip()
+ version = env.run("ruby -e 'puts defined?(VERSION) ? VERSION :
RUBY_VERSION'").strip()
if not version or [int(a) for a in version.split(".")] < [1, 8]
:
- print "no"
+ print("no")
@@ -368,7 +376,7 @@
got_ruby_h = env.run("ruby -rrbconfig -e 'puts
File.exist?(Config::CONFIG[\"archdir\"] + \"/ruby.h\")'").strip()
if got_ruby_h != "true" :
-@@ -22,7 +22,7 @@ def config(env):
+@@ -23,7 +23,7 @@ def config(env):
cmd = "ruby -rrbconfig -e 'puts \"-I%s -L%s\" %
[].fill(Config::CONFIG[\"archdir\"], 0..1)'"
env.configcmd(cmd)
@@ -418,3 +426,79 @@
commithash = info[0]
+--- xmms2-0.2DrDolittle/src/clients/lib/java/Library.orig 2006-03-27
21:34:45.000000000 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/java/Library 2023-05-11
06:29:58.761021248 +0200
+@@ -8,14 +8,10 @@ import sys
+
+ def walkDirs(path):
+ """helper function to get a list of all subdirectories"""
+- def addDirs(pathlist, dirname, names):
+- """internal function to pass to os.path.walk"""
+- for n in names:
+- f = os.path.join(dirname, n)
+- if os.path.isdir(f):
+- pathlist.append(f)
+ pathlist = [path]
+- os.path.walk(path, addDirs, pathlist)
++ for (dirname, dirnames, _) in os.walk(path):
++ for n in dirnames:
++ pathlist.append(os.path.join(dirname, n))
+ return pathlist
+
+ def config(env):
+@@ -47,15 +43,15 @@ def config(env):
+ else:
+ raise ConfigError("You need to define JAVA_HOME to
install the Java bindings.")
+ # Search for the java compiler
+- print "JAVA_HOME environment variable is not set.
Searching for java... ",
++ print("JAVA_HOME environment variable is not set.
Searching for java... ", end="")
+ jcdir = os.path.dirname(env.WhereIs('javac'))
+ if not jcdir:
+- print "not found."
++ print("not found.")
+ raise ConfigError("No javac found")
+ # assuming the compiler found is in some directory like
+ # /usr/jdkX.X/bin/javac, java's home directory is
/usr/jdkX.X
+ java_base = os.path.realpath(os.path.join(jcdir, ".."))
+- print "found in %s" % java_base
++ print("found in %s" % java_base)
+
+ if sys.platform == 'cygwin':
+ # Cygwin and Sun Java have different ideas of how path names
+--- xmms2-0.2DrDolittle/src/xmms/generate-converter.py.orig 2023-05-11
17:52:42.631056661 +0200
++++ xmms2-0.2DrDolittle/src/xmms/generate-converter.py 2023-05-11
18:00:05.225311544 +0200
+@@ -190,7 +190,7 @@ def make_conv(fields, curr):
+ # return ""
+
+ out=resamplingcode
+- for key,val in curr.iteritems():
++ for key,val in curr.items():
+ out = re.sub(key,str(val),out)
+
+ out = re.sub("CONVERTER",
+@@ -236,15 +236,15 @@ def make_switch(fields, curr):
+ val += indent + "}\n"
+ return val
+
+-print readwriters
+-print make_conv(data.keys(),{})
++print(readwriters)
++print(make_conv(list(data.keys()),{}))
+
+-print "static xmms_sample_conv_func_t"
+-print "xmms_sample_conv_get (guint inchannels, xmms_sample_format_t intype,"
+-print " guint outchannels, xmms_sample_format_t outtype,"
+-print " gboolean resample)"
+-print "{"
+-print make_switch(data.keys(),{})
+-print "\treturn NULL;"
+-print "}"
++print("static xmms_sample_conv_func_t")
++print("xmms_sample_conv_get (guint inchannels, xmms_sample_format_t intype,")
++print(" guint outchannels, xmms_sample_format_t
outtype,")
++print(" gboolean resample)")
++print("{")
++print(make_switch(list(data.keys()),{}))
++print("\treturn NULL;")
++print("}")
+
diff --git a/xmms2-ruby.patch b/xmms2-ruby.patch
index b3f81cc..b7d4e6c 100644
--- a/xmms2-ruby.patch
+++ b/xmms2-ruby.patch
@@ -1,14 +1,6 @@
---- xmms2-0.1DR2.1/src/clients/lib/ruby/Library.orig 2023-05-07
20:14:21.607909314 +0200
-+++ xmms2-0.1DR2.1/src/clients/lib/ruby/Library 2023-05-07
20:14:54.607730539 +0200
-@@ -9,23 +9,23 @@ def config(env):
- # we require ruby 1.8 or greater
- print("Checking for Ruby 1.8 or greater... ", end="")
-
-- version = env.run("ruby -e 'puts VERSION'").strip()
-+ version = env.run("ruby -e 'puts RUBY_VERSION'").strip()
- if not version or [int(a) for a in version.split(".")] < [1, 8]
:
- print("no")
- raise ConfigError("Need ruby 1.8")
+--- xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.orig 2023-05-10
22:10:51.425835301 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/ruby/Library 2023-05-10
22:34:00.468310213 +0200
+@@ -17,16 +17,16 @@ def config(env):
print(version)
@@ -28,17 +20,9 @@
env.librarypath = os.popen(cmd).read().strip()
env.Prepend(LIBPATH="src/clients/lib/xmmsclient")
---- xmms2-0.1DR2.1/src/clients/lib/ruby/Library.ecore.orig 2023-05-07
20:40:30.769408437 +0200
-+++ xmms2-0.1DR2.1/src/clients/lib/ruby/Library.ecore 2023-05-07
20:42:13.692184190 +0200
-@@ -15,23 +15,23 @@ def config(env):
- # we require ruby 1.8 or greater
- print("Checking for Ruby 1.8 or greater... ", end="")
-
-- version = env.run("ruby -e 'puts VERSION'").strip()
-+ version = env.run("ruby -e 'puts RUBY_VERSION'").strip()
- if not version or [int(a) for a in version.split(".")] < [1, 8]
:
- print("no")
- raise ConfigError("")
+--- xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.ecore.orig
2023-05-10 22:10:51.429168616 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.ecore 2023-05-10
22:34:47.804720436 +0200
+@@ -23,16 +23,16 @@ def config(env):
print(version)
@@ -58,17 +42,9 @@
env.librarypath = os.popen(cmd).read().strip()
env.Prepend(LIBPATH="src/clients/lib/xmmsclient")
---- xmms2-0.1DR2.1/src/clients/lib/ruby/Library.glib.orig 2023-05-07
20:42:40.065374647 +0200
-+++ xmms2-0.1DR2.1/src/clients/lib/ruby/Library.glib 2023-05-07
20:43:31.151764555 +0200
-@@ -9,23 +9,23 @@ def config(env):
- # we require ruby 1.8 or greater
- print("Checking for Ruby 1.8 or greater... ", end="")
-
-- version = env.run("ruby -e 'puts VERSION'").strip()
-+ version = env.run("ruby -e 'puts RUBY_VERSION'").strip()
- if not version or [int(a) for a in version.split(".")] < [1, 8]
:
- print("no")
- raise ConfigError("bad")
+--- xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.glib.orig 2023-05-10
22:10:51.429168616 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/ruby/Library.glib 2023-05-10
22:35:11.117927471 +0200
+@@ -17,16 +17,16 @@ def config(env):
print(version)
@@ -88,9 +64,9 @@
env.librarypath = os.popen(cmd).read().strip()
env.pkgconfig("glib-2.0")
---- xmms2-0.2DrAlban/src/clients/lib/ruby/rb_xmmsclient.c.orig 2005-12-18
17:35:27.000000000 +0100
-+++ xmms2-0.2DrAlban/src/clients/lib/ruby/rb_xmmsclient.c 2023-05-09
22:35:33.975872606 +0200
-@@ -511,7 +511,7 @@ static VALUE c_playlist_add (VALUE self,
+--- xmms2-0.2DrDolittle/src/clients/lib/ruby/rb_xmmsclient.c.orig
2023-05-10 22:10:51.432501932 +0200
++++ xmms2-0.2DrDolittle/src/clients/lib/ruby/rb_xmmsclient.c 2023-05-10
22:36:02.564315428 +0200
+@@ -721,7 +721,7 @@ static VALUE c_playlist_add (VALUE self,
if (!NIL_P (rb_check_string_type (arg)))
is_str = true;
@@ -98,8 +74,8 @@
+ else if (rb_obj_is_kind_of (arg, rb_cInteger))
is_str = false;
else {
- rb_raise (eXmmsClientError, "unsupported argument");
-@@ -538,7 +538,7 @@ static VALUE c_playlist_insert (VALUE se
+ rb_raise (eClientError, "unsupported argument");
+@@ -755,7 +755,7 @@ static VALUE c_playlist_insert (VALUE se
if (!NIL_P (rb_check_string_type (arg)))
is_str = true;
@@ -107,4 +83,4 @@
+ else if (rb_obj_is_kind_of (arg, rb_cInteger))
is_str = false;
else {
- rb_raise (eXmmsClientError, "unsupported argument");
+ rb_raise (eClientError, "unsupported argument");
diff --git a/xmms2-tabs.patch b/xmms2-tabs.patch
index 12c5630..2fa7950 100644
--- a/xmms2-tabs.patch
+++ b/xmms2-tabs.patch
@@ -1,5 +1,5 @@
---- xmms2-0.2DrCox/SConstruct.orig 2006-02-21 19:19:52.000000000 +0100
-+++ xmms2-0.2DrCox/SConstruct 2023-05-10 21:34:24.027685454 +0200
+--- xmms2-0.2DrDolittle/SConstruct.orig 2006-03-27 21:34:45.000000000
+0200
++++ xmms2-0.2DrDolittle/SConstruct 2023-05-10 22:01:19.352267823 +0200
@@ -72,8 +72,8 @@ base_env.Append(CPPPATH=["#src/include"]
Help(opts.GenerateHelpText(base_env))
@@ -11,7 +11,7 @@
then all instances of %VERSION% in the file will be replaced with
1.2345 etc.
"""
try:
-@@ -138,11 +138,11 @@ base_env.handle_targets("Library")
+@@ -145,11 +145,11 @@ base_env.handle_targets("Library")
base_env.handle_targets("Program")
subst_dict = {"%VERSION%":XMMS_VERSION, "%PLATFORM%":"XMMS_OS_" +
base_env.platform.upper().replace("-", ""),
@@ -28,7 +28,7 @@
}
config = base_env.SubstInFile("src/include/xmms/xmms_defs.h",
"src/include/xmms/xmms_defs.h.in", SUBST_DICT=subst_dict)
-@@ -162,7 +162,7 @@ def scan_headers(name):
+@@ -169,7 +169,7 @@ def scan_headers(name):
newf = dir+"/"+d
if os.path.isfile(newf) and newf.endswith('.h'):
base_env.add_header(name, newf)
@@ -37,16 +37,18 @@
scan_headers("xmmsc")
scan_headers("xmms")
scan_headers("xmmsclient")
-@@ -187,9 +187,9 @@ base_env.add_manpage(8, 'doc/xmms2d.8')
+@@ -182,10 +182,10 @@ base_env.add_manpage(8, 'doc/xmms2d.8')
#### Generate pc files.
pc_files = [{"name": "xmms2-plugin", "lib":""},
- {"name":"xmms2-client", "lib":"-lxmmsclient"},
- {"name":"xmms2-client-glib", "lib":"-lxmmsclient-glib"},
-- {"name":"xmms2-client-ecore", "lib":"-lxmmsclient-ecore"}]
+- {"name":"xmms2-client-ecore", "lib":"-lxmmsclient-ecore"},
+- {"name":"xmms2-client-cpp", "lib":"-lxmmsclient++"}]
+ {"name":"xmms2-client", "lib":"-lxmmsclient"},
+ {"name":"xmms2-client-glib", "lib":"-lxmmsclient-glib"},
-+ {"name":"xmms2-client-ecore", "lib":"-lxmmsclient-ecore"}]
++ {"name":"xmms2-client-ecore", "lib":"-lxmmsclient-ecore"},
++ {"name":"xmms2-client-cpp", "lib":"-lxmmsclient++"}]
for p in pc_files:
d = subst_dict.copy()
@@ -61,3 +63,45 @@
self.GZipper(source + '.gz', source)
self.Install(os.path.join(self.manpath, "man"+str(section)),
source+'.gz')
+--- xmms2-0.2DrDolittle/src/xmms/generate-converter.py.orig 2006-03-27
21:34:45.000000000 +0200
++++ xmms2-0.2DrDolittle/src/xmms/generate-converter.py 2023-05-11
17:52:42.631056661 +0200
+@@ -150,10 +150,10 @@ def get_channelconv(numin, numout, t):
+ for a in range(numout):
+ out += "\t\tout[%d] = WRITE%s(temp[%d]);\n" % (a,t,a)
+ elif numin == 1 and numout == 2:
+- out += "\t\tout[0] = WRITE%s(temp[0]);\n" % t
+- out += "\t\tout[1] = WRITE%s(temp[0]);\n" % t
++ out += "\t\tout[0] = WRITE%s(temp[0]);\n" % t
++ out += "\t\tout[1] = WRITE%s(temp[0]);\n" % t
+ elif numin == 2 and numout == 1:
+- out += "\t\tout[0] = WRITE%s((temp[0] + temp[1])/2);\n"
% t
++ out += "\t\tout[0] = WRITE%s((temp[0] + temp[1])/2);\n" % t
+ else:
+ raise RuntimeError("go implement channelconversion from %d to
%d channels" % (numin, numout))
+ return out
+@@ -194,11 +194,11 @@ def make_conv(fields, curr):
+ out = re.sub(key,str(val),out)
+
+ out = re.sub("CONVERTER",
+- get_channelconv(curr['INCHANNELS'],
+- curr['OUTCHANNELS'],
+- curr['OUTTYPE']),
+- out)
+-
++ get_channelconv(curr['INCHANNELS'],
++ curr['OUTCHANNELS'],
++ curr['OUTTYPE']),
++ out)
++
+ return out
+
+
+@@ -232,7 +232,7 @@ def make_switch(fields, curr):
+ val += indent + "case XMMS_SAMPLE_FORMAT_%s:\n" %
a.upper()
+ else:
+ val += indent + "case %s:\n" % a
+- val += make_switch(fields[1:], t)
++ val += make_switch(fields[1:], t)
+ val += indent + "}\n"
+ return val
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmms2.git/commitdiff/ffbc49c0fc1a67ce3bd5e65adc8f99c992c1433e
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
