commit f786859bd9670e80084185fb0b42365fd4d65e84
Author: Jakub Bogusz <[email protected]>
Date: Sat May 13 22:04:27 2023 +0200
- up to 0.2DrGonzo
xmms2-ffmpeg.patch | 20 +++----
xmms2-java.patch | 18 ++++--
xmms2-man.patch | 13 +++++
xmms2-python3.patch | 154 +++++++++++++++++++++++++++++++++++-----------------
xmms2-ruby.patch | 39 ++++++++-----
xmms2-tabs.patch | 63 ++++++++++++++++-----
xmms2.spec | 48 ++++++++++++++--
7 files changed, 261 insertions(+), 94 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index 78d6a17..1b6c647 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -10,18 +10,19 @@
Summary: Client/server based media player system
Summary(pl.UTF-8): System odtwarzania multimediów oparty na architekturze
klient/serwer
Name: xmms2
-Version: 0.2DrFeelgood
+Version: 0.2DrGonzo
Release: 0.1
License: LGPL v2.1
Group: Applications/Sound
Source0:
https://downloads.sourceforge.net/xmms2/%{name}-%{version}.tar.bz2
-# Source0-md5: 46dc92bb78bf16d6cd9a733e6a923a92
+# Source0-md5: 0845dc7ce04d1825c28566b5c36f23b3
Patch0: %{name}-tabs.patch
Patch1: %{name}-python3.patch
Patch2: %{name}-link.patch
Patch3: %{name}-modplug.patch
Patch4: %{name}-ffmpeg.patch
Patch5: %{name}-ruby.patch
+Patch6: %{name}-man.patch
Patch7: %{name}-java.patch
URL: http://xmms2.xmms.se/
BuildRequires: SDL-devel
@@ -44,6 +45,8 @@ BuildRequires: libmad-devel
BuildRequires: libmodplug-devel
BuildRequires: libmms-devel
BuildRequires: libmpcdec-devel
+BuildRequires: libogg-devel
+BuildRequires: libshout-devel
BuildRequires: libsidplay2-devel
BuildRequires: libsmbclient-devel
BuildRequires: libstdc++-devel
@@ -317,6 +320,18 @@ This package enables ALSA output for xmms2.
%description output-alsa -l pl.UTF-8
Ten pakiet udostępnia wyjście ALSA dla xmms2.
+%package output-ices
+Summary: ICES (Icecast source) output
+Summary(pl.UTF-8): Wyjście ICES (Icecast source)
+Group: X11/Applications/Sound
+Requires: %{name} = %{version}-%{release}
+
+%description output-ices
+This package enables Icecast source output for xmms2.
+
+%description output-ices -l pl.UTF-8
+Ten pakiet udostępnia wyjście źródła Icecast dla xmms2.
+
%package output-jack
Summary: JACK output
Summary(pl.UTF-8): Wyjście JACK
@@ -353,6 +368,18 @@ This package contains a HTTP transport for xmms2.
%description transport-curl -l pl.UTF-8
Ten pakiet zawiera transport HTTP dla xmms2.
+%package transport-daap
+Summary: DAAP transport
+Summary(pl.UTF-8): Transport DAAP
+Group: X11/Applications/Sound
+Requires: %{name} = %{version}-%{release}
+
+%description transport-daap
+This package enables DAAP transport for xmms2.
+
+%description transport-daap -l pl.UTF-8
+Ten pakiet umożliwia odbiór danych DAAP przez xmms2.
+
%package transport-gnomevfs
Summary: GnomeVFS transport
Summary(pl.UTF-8): Transport GnomeVFS
@@ -409,8 +436,9 @@ xmms2.
%patch1 -p1
%patch2 -p1
%patch3 -p1
-%patch4 -p1 -b .orig
+%patch4 -p1
%patch5 -p1
+%patch6 -p1
%patch7 -p1
%{__sed} -i xmms2.pc.in \
@@ -434,8 +462,10 @@ scons \
CXX="%{__cxx}" \
CCFLAGS="%{rpmcflags} %{rpmcppflags} $(pkg-config --cflags smbclient)"
\
PREFIX=%{_prefix} \
+ LIBDIR=%{_libdir} \
MANDIR=%{_mandir} \
- PKGCONFIGDIR=%{_pkgconfigdir}
+ PKGCONFIGDIR=%{_pkgconfigdir} \
+ SHAREDIR=%{_datadir}/xmms2
%install
rm -rf $RPM_BUILD_ROOT
@@ -466,6 +496,7 @@ rm -rf $RPM_BUILD_ROOT
#%attr(755,root,root) %{_libdir}/%{name}/libxmms_m3u.so
#%attr(755,root,root) %{_libdir}/%{name}/libxmms_pls.so
%{_datadir}/%{name}
+%{_mandir}/man8/xmms2-launcher.8*
%{_mandir}/man8/xmms2d.8*
### clients
@@ -479,6 +510,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/xmms2-mlib-updater
%{_mandir}/man1/xmms2.1*
%{_mandir}/man1/xmms2-et.1*
+%{_mandir}/man8/xmms2-mdns-avahi.8*
%files client-sdlvis
%defattr(644,root,root,755)
@@ -577,6 +609,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_alsa.so
+%files output-ices
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_ices.so
+
%files output-jack
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_jack.so
@@ -589,6 +625,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_curl_http.so
+%files transport-daap
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_daap.so
+
%files transport-gnomevfs
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_gnomevfs.so
diff --git a/xmms2-ffmpeg.patch b/xmms2-ffmpeg.patch
index f6d07b9..788e720 100644
--- a/xmms2-ffmpeg.patch
+++ b/xmms2-ffmpeg.patch
@@ -1,5 +1,5 @@
---- xmms2-0.2DrEvil/src/plugins/wma/wma.c.orig 2006-07-06 22:35:55.000000000
+0200
-+++ xmms2-0.2DrEvil/src/plugins/wma/wma.c 2023-05-13 14:06:54.268936218
+0200
+--- xmms2-0.2DrGonzo/src/plugins/wma/wma.c.orig 2006-09-26
15:50:20.000000000 +0200
++++ xmms2-0.2DrGonzo/src/plugins/wma/wma.c 2023-05-13 18:39:29.583665211
+0200
@@ -24,7 +24,7 @@
#include <string.h>
#include <glib.h>
@@ -75,18 +75,18 @@
- if ((temp = avcodec_open (data->codecctx, codec)) < 0) {
+ if ((temp = avcodec_open2 (data->codecctx, codec, NULL)) < 0) {
XMMS_DBG ("Opening WMA decoder failed");
- goto err;
- }
-@@ -209,7 +214,7 @@ err:
- avcodec_close (data->codecctx);
+ goto err_close_codec;
}
+@@ -208,7 +213,7 @@ err_close_codec:
+ avcodec_close (data->codecctx);
+ err:
if (data->fmtctx) {
- av_close_input_file (data->fmtctx);
+ avformat_close_input (&data->fmtctx);
}
g_string_free (data->outbuf, TRUE);
g_free (data);
-@@ -223,9 +228,7 @@ xmms_wma_read (xmms_xform_t *xform, xmms
+@@ -222,9 +227,7 @@ xmms_wma_read (xmms_xform_t *xform, xmms
{
xmms_wma_data_t *data;
AVPacket pkt;
@@ -97,7 +97,7 @@
data = xmms_xform_private_data_get (xform);
g_return_val_if_fail (data, -1);
-@@ -237,26 +240,33 @@ xmms_wma_read (xmms_xform_t *xform, xmms
+@@ -236,26 +239,33 @@ xmms_wma_read (xmms_xform_t *xform, xmms
if (pkt.size == 0)
return 0;
@@ -143,7 +143,7 @@
}
if (pkt.data) {
-@@ -505,8 +515,8 @@ xmms_wma_read_callback (void *user_data,
+@@ -504,8 +514,8 @@ xmms_wma_read_callback (void *user_data,
return ret;
}
@@ -154,7 +154,7 @@
{
xmms_xform_t *xform;
xmms_wma_data_t *data;
-@@ -556,7 +566,7 @@ xmms_wma_get_track (AVFormatContext *fmt
+@@ -555,7 +565,7 @@ xmms_wma_get_track (AVFormatContext *fmt
for (wma_idx = 0; wma_idx < fmtctx->nb_streams; wma_idx++) {
codec = fmtctx->streams[wma_idx]->codec;
diff --git a/xmms2-java.patch b/xmms2-java.patch
index 8ffe5c5..d01ecf0 100644
--- a/xmms2-java.patch
+++ b/xmms2-java.patch
@@ -1,6 +1,6 @@
---- xmms2-0.2DrEvil/src/clients/lib/java/Library.orig 2023-05-11
22:00:10.991235882 +0200
-+++ xmms2-0.2DrEvil/src/clients/lib/java/Library 2023-05-11
22:01:06.790933589 +0200
-@@ -123,7 +123,7 @@ def config(env):
+--- xmms2-0.2DrGonzo/src/clients/lib/java/Library.orig 2023-05-13
18:41:07.899799253 +0200
++++ xmms2-0.2DrGonzo/src/clients/lib/java/Library 2023-05-13
18:43:31.892352512 +0200
+@@ -125,7 +125,7 @@ def config(env):
env.Java(target = mydir, source = [mydir + '/src'])
env.Jar(target=mydir + '/xmms2java.jar', source=mydir + '/org')
@@ -8,4 +8,14 @@
+ env.Install(env['PREFIX'] + '/share/java', mydir + '/xmms2java.jar')
def mkdir(target, source, env):
try:
- os.mkdir(mydir + "/src/org/xmms2/xmms2bindings")
+ os.mkdir(mydir + "/src/org/xmms2/wrapper/xmms2bindings")
+--- xmms2-0.2DrGonzo/src/clients/lib/java/misc.c.orig 2006-09-26
15:50:20.000000000 +0200
++++ xmms2-0.2DrGonzo/src/clients/lib/java/misc.c 2023-05-13
19:59:12.574420194 +0200
+@@ -14,6 +14,7 @@
+ * Lesser General Public License for more details.
+ */
+
++#include <limits.h>
+ #include <stdio.h>
+ #include <xmmsclient/xmmsclient.h>
+ #include <xmms/xmms_defs.h>
diff --git a/xmms2-man.patch b/xmms2-man.patch
new file mode 100644
index 0000000..7669925
--- /dev/null
+++ b/xmms2-man.patch
@@ -0,0 +1,13 @@
+--- xmms2-0.2DrGonzo/SConstruct.orig 2023-05-13 21:17:48.115540583 +0200
++++ xmms2-0.2DrGonzo/SConstruct 2023-05-13 21:25:55.299567947 +0200
+@@ -181,8 +181,8 @@ scan_headers("xmmsclient/xmmsclient++")
+ base_env.add_manpage(1, 'doc/xmms2.1')
+ base_env.add_manpage(8, 'doc/xmms2d.8')
+ base_env.add_manpage(1, 'doc/xmms2-et.1')
+-base_env.add_manpage(1, 'doc/xmms2-launcher.8')
+-base_env.add_manpage(1, 'doc/xmms2-mdns-avahi.8')
++base_env.add_manpage(8, 'doc/xmms2-launcher.8')
++base_env.add_manpage(8, 'doc/xmms2-mdns-avahi.8')
+
+ #### Generate pc files.
+
diff --git a/xmms2-python3.patch b/xmms2-python3.patch
index e6cdc7e..26ff25f 100644
--- a/xmms2-python3.patch
+++ b/xmms2-python3.patch
@@ -1,5 +1,5 @@
---- 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
+--- xmms2-0.2DrGonzo/SConstruct.orig 2023-05-13 18:09:37.823372009 +0200
++++ xmms2-0.2DrGonzo/SConstruct 2023-05-13 18:32:37.612563716 +0200
@@ -5,7 +5,6 @@ import sys
import SCons
import re
@@ -8,7 +8,7 @@
import gittools
from marshal import dump
-@@ -24,7 +23,7 @@ EnsurePythonVersion(2, 1)
+@@ -24,7 +23,7 @@ EnsurePythonVersion(2, 3)
SConsignFile()
def SimpleListOption(key, help, default=[]):
@@ -16,17 +16,17 @@
+ return(key, help, default, None, lambda val: val.split())
- if sys.platform == 'win32':
-@@ -43,7 +42,7 @@ else:
- else:
- default_cpppath = []
+ default_pyrex = 'pyrexc'
+@@ -36,7 +35,7 @@ if sys.platform == 'darwin':
+ else:
+ default_cpppath = []
-opts = Options("options.cache")
+opts = Variables("options.cache")
opts.Add('CC', 'C compiler to use')
opts.Add('CXX', 'C++ compiler to use')
opts.Add('LD', 'Linker to use')
-@@ -57,9 +56,9 @@ opts.Add('MANDIR', 'manual directory', '
+@@ -56,10 +55,10 @@ opts.Add('INCLUDEDIR', 'specified includ
opts.Add('RUBYARCHDIR', 'Path to install Ruby bindings')
opts.Add('INSTALLDIR', 'install dir')
opts.Add('PKGCONFIGDIR', 'Where should we put our .pc files?',
'$PREFIX/lib/pkgconfig')
@@ -34,11 +34,22 @@
+opts.Add(BoolVariable('SHOWCACHE', 'show what flags that lives inside cache',
0))
opts.Add(SimpleListOption('EXCLUDE', 'exclude these modules', []))
-opts.Add(BoolOption('CONFIG', 'run configuration commands again', 0))
+-opts.Add(BoolOption('STATIC', 'Link everything static', 0))
+opts.Add(BoolVariable('CONFIG', 'run configuration commands again', 0))
++opts.Add(BoolVariable('STATIC', 'Link everything static', 0))
# base CCPATH
base_env = xmmsenv.XMMSEnvironment(options=opts)
-@@ -77,24 +76,24 @@ def do_subst_in_file(targetfile, sourcef
+@@ -72,7 +72,7 @@ except xmmsenv.ConfigError:
+ os.remove("config.cache")
+ except:
+ pass
+- print "OPTION CC MUST POINT TO A VALID C COMPILER!"
++ print("OPTION CC MUST POINT TO A VALID C COMPILER!")
+ sys.exit(-1)
+
+ base_env.Append(CPPPATH=["#src/include"])
+@@ -86,24 +85,24 @@ def do_subst_in_file(targetfile, sourcef
then all instances of %VERSION% in the file will be replaced with
1.2345 etc.
"""
try:
@@ -69,7 +80,7 @@
d = dict(env['SUBST_DICT']) # copy it
for (k,v) in d.items():
if callable(v):
-@@ -102,7 +101,7 @@ def subst_in_file(target, source, env):
+@@ -111,7 +110,7 @@ def subst_in_file(target, source, env):
elif SCons.Util.is_String(v):
d[k]=env.subst(v)
else:
@@ -78,7 +89,7 @@
for (t,s) in zip(target, source):
return do_subst_in_file(str(t), str(s), d)
-@@ -159,7 +158,7 @@ config = base_env.SubstInFile("src/inclu
+@@ -161,7 +160,7 @@ config = base_env.SubstInFile("src/inclu
try:
dump(base_env.config_cache, open("config.cache", "wb+"))
except IOError:
@@ -87,7 +98,7 @@
#### INSTALL HEADERS!
-@@ -195,14 +194,14 @@ for p in pc_files:
+@@ -205,14 +204,14 @@ for p in pc_files:
base_env.Install("$PKGCONFIGDIR", p["name"]+".pc")
@@ -108,8 +119,8 @@
base_env.add_script("startup.d", "src/clients/mdns/xmms2-mdns-launcher.sh")
base_env.add_shared("mind.in.a.box-lament_snipplet.ogg")
---- xmms2-0.2DrFeelgood/xmmsenv.py.orig 2023-05-13 16:44:13.801131219
+0200
-+++ xmms2-0.2DrFeelgood/xmmsenv.py 2023-05-13 16:46:40.797001541 +0200
+--- xmms2-0.2DrGonzo/xmmsenv.py.orig 2023-05-13 18:32:56.662460514 +0200
++++ xmms2-0.2DrGonzo/xmmsenv.py 2023-05-13 18:33:57.138799553 +0200
@@ -5,8 +5,7 @@ import shutil
import gzip
from marshal import load
@@ -126,10 +137,10 @@
-any = lambda x: reduce(operator.or_, x)
-
- def installFunc(dest, source, env):
- """Copy file, setting sane permissions"""
-
-@@ -41,9 +38,9 @@ class Target:
+
+ def find_static_lib(env, lib):
+ libname = "lib%s.a" % lib
+@@ -48,9 +45,9 @@ class Target:
self.globs['platform'] = env.platform
self.globs['ConfigError'] = ConfigError
@@ -141,7 +152,7 @@
x += '\n'
c = compile(x, target, "exec")
-@@ -92,14 +89,14 @@ class XMMSEnvironment(Environment):
+@@ -101,14 +98,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)
@@ -158,7 +169,7 @@
self.config_cache={}
else:
self.config_cache={}
-@@ -109,7 +106,7 @@ class XMMSEnvironment(Environment):
+@@ -118,7 +115,7 @@ class XMMSEnvironment(Environment):
self.programs=[]
self.install_targets=[]
@@ -167,16 +178,25 @@
self.installdir = os.path.normpath(self["INSTALLDIR"] +
'/')
else:
self.installdir = ""
-@@ -141,7 +138,7 @@ class XMMSEnvironment(Environment):
+@@ -147,7 +147,7 @@ class XMMSEnvironment(Environment):
self.platform = sys.platform
+ # Where to place the xmms2 user config directory
+- if self.has_key("USERCONFDIR"):
++ if "USERCONFDIR" in self:
+ self.userconfpath = self["USERCONFDIR"]
+ else:
+ if sys.platform == 'darwin':
+@@ -159,7 +156,7 @@ class XMMSEnvironment(Environment):
+ self.userconfpath = '.config/xmms2'
+
def gzipper(target, source, env):
- gzip.GzipFile(target[0].path,
'wb',9).write(file(source[0].path).read())
+ gzip.GzipFile(target[0].path,
'wb',9).write(open(source[0].path, "rb").read())
self['BUILDERS']['GZipper'] =
SCons.Builder.Builder(action=SCons.Action.Action(gzipper))
if self.platform == 'darwin':
-@@ -157,7 +154,7 @@ class XMMSEnvironment(Environment):
+@@ -178,7 +175,7 @@ class XMMSEnvironment(Environment):
self.install_targets.append(target)
def tryaction(self, cmd):
@@ -185,7 +205,7 @@
return self.config_cache[cmd]
r = False
-@@ -178,7 +175,7 @@ class XMMSEnvironment(Environment):
+@@ -199,7 +196,7 @@ class XMMSEnvironment(Environment):
return r
def run(self, cmd):
@@ -194,7 +214,7 @@
return self.config_cache[cmd]
try:
-@@ -196,28 +193,29 @@ class XMMSEnvironment(Environment):
+@@ -217,28 +214,29 @@ class XMMSEnvironment(Environment):
if libs:
cmd += " --libs"
cmd += " \"%s\"" % module
@@ -231,7 +251,7 @@
sys.exit(-1)
raise ConfigError("Command '%s' failed" % cmd)
ret = ret.strip()
-@@ -231,11 +229,11 @@ class XMMSEnvironment(Environment):
+@@ -252,33 +250,33 @@ class XMMSEnvironment(Environment):
else:
key = ("HEADER", header)
@@ -245,7 +265,37 @@
sys.exit(1)
raise ConfigError("Headerfile '%s' not found" % header)
-@@ -246,11 +244,11 @@ class XMMSEnvironment(Environment):
+ def checkcompiler(self):
+- if not self.config_cache.has_key("c"):
+- print "Checking for working C compiler...",
++ if "c" not in self.config_cache:
++ print("Checking for working C compiler...", end="")
+ self.config_cache["c"] = self.conf.TryCompile("int
main() {}",".c")
+ if self.config_cache["c"]:
+- print "yes"
++ print("yes")
+ else:
+- print "no"
++ print("no")
+ if not self.config_cache["c"]:
+ raise ConfigError("couldn't compile C files")
+
+ def checkcpp(self):
+- if not self.config_cache.has_key("cpp"):
+- print "Checking for working C++ compiler...",
++ if "cpp" not in self.config_cache:
++ print("Checking for working C++ compiler...", end="")
+ self.config_cache["cpp"] = self.conf.TryCompile("using
namespace std; int main() {};",".cpp")
+ if self.config_cache["cpp"]:
+- print "yes"
++ print("yes")
+ else:
+- print "no"
++ print("no")
+ if not self.config_cache["cpp"]:
+ raise ConfigError("couldn't compile CPP files")
+
+@@ -289,11 +287,11 @@ class XMMSEnvironment(Environment):
else:
key = ("HEADER", header)
@@ -259,7 +309,7 @@
sys.exit(1)
raise ConfigError("Headerfile '%s' not found" % header)
-@@ -258,7 +256,7 @@ class XMMSEnvironment(Environment):
+@@ -301,7 +299,7 @@ class XMMSEnvironment(Environment):
def checklib(self, lib, func, header=0, lang="c", fail=False):
key = (lib, func)
@@ -268,7 +318,7 @@
#libtool_flags = None
self.config_cache[key] = ""
-@@ -281,7 +279,7 @@ class XMMSEnvironment(Environment):
+@@ -324,7 +322,7 @@ class XMMSEnvironment(Environment):
if not self.config_cache[key]:
if fail:
@@ -277,7 +327,7 @@
sys.exit(1)
raise ConfigError("Symbol '%s' in library '%s' not
found" % (func, lib))
-@@ -423,14 +421,14 @@ class XMMSEnvironment(Environment):
+@@ -478,14 +476,14 @@ class XMMSEnvironment(Environment):
if options.files:
for filename in options.files:
if os.path.exists(filename):
@@ -295,7 +345,7 @@
if options.args[option.key] !=
cached[option.key]:
# differnt value
return True
-@@ -460,7 +458,7 @@ class XMMSEnvironment(Environment):
+@@ -515,7 +513,7 @@ class XMMSEnvironment(Environment):
This will open the libtool file and read the lines
that we need.
"""
@@ -304,7 +354,7 @@
line = f.readline()
ret = {}
while line:
-@@ -477,13 +475,13 @@ class XMMSEnvironment(Environment):
+@@ -532,13 +530,13 @@ class XMMSEnvironment(Environment):
targets = [cls(a[1], self) for a in self.potential_targets if
a[0].startswith(targettype)]
for t in targets:
@@ -407,17 +457,17 @@
env.librarypath = env["RUBYARCHDIR"]
else:
cmd = "ruby -rrbconfig -e 'print
Config::CONFIG[\"sitearchdir\"]'"
---- xmms2-0.2DrEvil/src/xmms/Program.orig 2023-05-11 21:33:20.679959687
+0200
-+++ xmms2-0.2DrEvil/src/xmms/Program 2023-05-11 21:35:06.382720379 +0200
-@@ -23,7 +23,7 @@ source = ["main.c",
- "statfs.c"]
+--- xmms2-0.2DrGonzo/src/xmms/Program.orig 2023-05-13 18:34:24.915315741
+0200
++++ xmms2-0.2DrGonzo/src/xmms/Program 2023-05-13 18:34:56.695143575 +0200
+@@ -25,7 +25,7 @@ source = ["main.c",
+ "bindata.c"]
def config(env):
- pluginenv = env.Copy()
+ pluginenv = env.Clone()
- env.Prepend(LIBPATH=["src/lib/xmmsipc"])
- env.Prepend(LIBPATH=["src/lib/xmmssocket"])
- env.Append(LIBS=['xmmsipc'])
+ env.pkgconfig("glib-2.0 >= 2.6.0", fail=True)
+ env.pkgconfig("gmodule-2.0", fail=True)
+ env.pkgconfig("gthread-2.0", fail=True)
--- xmms2-0.2DrCox/gittools.py.orig 2023-05-10 21:38:46.116265598 +0200
+++ xmms2-0.2DrCox/gittools.py 2023-05-10 21:39:29.229365368 +0200
@@ -1,9 +1,9 @@
@@ -448,8 +498,8 @@
commithash = info[0]
---- xmms2-0.2DrEvil/src/clients/lib/java/Library.orig 2006-07-06
22:35:55.000000000 +0200
-+++ xmms2-0.2DrEvil/src/clients/lib/java/Library 2023-05-12
06:17:51.984695466 +0200
+--- xmms2-0.2DrGonzo/src/clients/lib/java/Library.orig 2023-05-13
18:35:17.925028563 +0200
++++ xmms2-0.2DrGonzo/src/clients/lib/java/Library 2023-05-13
18:37:16.014388818 +0200
@@ -8,42 +8,38 @@ import sys
def walkDirs(path):
@@ -470,7 +520,7 @@
def config(env):
- print "Checking for swig >= 1.3.25 ... ",
+ print("Checking for swig >= 1.3.25 ... ", end="")
-
+
if not env.get('SWIG'):
- print "no"
+ print("no")
@@ -478,7 +528,7 @@
try:
version = env.run(env.get('SWIG') + "
-version").strip().split("\n")[0].split(' ')[2]
-
+
if not version or ([int(a) for a in version.split(".")] <
[1,3,25]) :
- print "no"
+ print("no")
@@ -486,7 +536,7 @@
- print version
+ print(version)
- except ValueError:
+ except:
- print "no"
+ print("no")
raise ConfigError("Couldn't check version of swig")
@@ -494,18 +544,24 @@
- print "Checking for presence of java ... ",
+ print("Checking for presence of java ... ", end="")
- if not env.get('JAVAC'):
-- print "no"
-+ print("no")
+ if not env.get('JAVAC') or not env.get('JAR'):
+- print "not present"
++ print("not present")
raise ConfigError("Couldn't find javac")
-- print "yes"
-+ print("yes")
+- print "present"
++ print("present")
# link with xmmsclient is nice.
if env.platform == 'win32':
-@@ -67,15 +63,15 @@ def config(env):
+@@ -65,19 +61,19 @@ def config(env):
+ # Apple's OS X has its own special java base directory
+ java_base =
'/System/Library/Frameworks/JavaVM.framework'
else:
+- print "Your system is missing JAVA_HOME which is needed
for javabindings"
+- print "Please set JAVA_HOME and run scons with CONFIG=1
again"
++ print("Your system is missing JAVA_HOME which is needed
for javabindings")
++ print("Please set JAVA_HOME and run scons with CONFIG=1
again")
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... ",
diff --git a/xmms2-ruby.patch b/xmms2-ruby.patch
index d2eab0e..5ee3107 100644
--- a/xmms2-ruby.patch
+++ b/xmms2-ruby.patch
@@ -64,9 +64,20 @@
env.librarypath = os.popen(cmd).read().strip()
env.pkgconfig("glib-2.0")
---- xmms2-0.2DrEvil/src/clients/lib/ruby/rb_xmmsclient.c.orig 2023-05-11
21:39:17.024695868 +0200
-+++ xmms2-0.2DrEvil/src/clients/lib/ruby/rb_xmmsclient.c 2023-05-11
21:40:47.684204724 +0200
-@@ -728,7 +728,7 @@ static VALUE c_playlist_add (VALUE self,
+--- xmms2-0.2DrGonzo/src/clients/lib/ruby/rb_xmmsclient.c.orig 2006-09-26
15:50:20.000000000 +0200
++++ xmms2-0.2DrGonzo/src/clients/lib/ruby/rb_xmmsclient.c 2023-05-13
20:16:33.032116884 +0200
+@@ -78,8 +78,8 @@
+ StringValue (arg1); \
+ \
+ res = xmmsc_##name (xmms->real, \
+- (unsigned char *) RSTRING (arg1)->ptr, \
+- RSTRING (arg1)->len); \
++ (unsigned char *) RSTRING_PTR (arg1), \
++ RSTRING_LEN (arg1)); \
+ METHOD_HANDLER_FOOTER
+
+ static VALUE eClientError, eDisconnectedError;
+@@ -784,7 +784,7 @@ c_playlist_add (VALUE self, VALUE arg)
if (!NIL_P (rb_check_string_type (arg)))
is_str = true;
@@ -75,7 +86,7 @@
rb_raise (eClientError, "unsupported argument");
return Qnil;
}
-@@ -760,7 +760,7 @@ static VALUE c_playlist_insert (VALUE se
+@@ -817,7 +817,7 @@ c_playlist_insert (VALUE self, VALUE pos
if (!NIL_P (rb_check_string_type (arg)))
is_str = true;
@@ -84,7 +95,7 @@
rb_raise (eClientError, "unsupported argument");
return Qnil;
}
-@@ -932,7 +932,7 @@ static VALUE c_medialib_entry_property_s
+@@ -999,7 +999,7 @@ c_medialib_entry_property_set (int argc,
if (!NIL_P (rb_check_string_type (value)))
is_str = true;
@@ -93,25 +104,25 @@
rb_raise (eClientError, "unsupported argument");
return Qnil;
}
---- xmms2-0.2DrEvil/src/clients/lib/ruby/rb_result.c.orig 2006-07-06
22:35:55.000000000 +0200
-+++ xmms2-0.2DrEvil/src/clients/lib/ruby/rb_result.c 2023-05-12
23:07:41.934554417 +0200
-@@ -382,6 +382,7 @@ static VALUE c_propdict_init (VALUE self
+--- xmms2-0.2DrGonzo/src/clients/lib/ruby/rb_result.c.orig 2006-09-26
15:50:20.000000000 +0200
++++ xmms2-0.2DrGonzo/src/clients/lib/ruby/rb_result.c 2023-05-13
18:40:37.719962752 +0200
+@@ -417,6 +417,7 @@ c_propdict_init (VALUE self, VALUE resul
return self;
}
+#ifdef HAVE_RB_PROTECT_INSPECT
- static VALUE propdict_inspect_cb (VALUE args, VALUE s)
+ static VALUE
+ propdict_inspect_cb (VALUE args, VALUE s)
{
- VALUE src, key, value;
-@@ -421,6 +422,7 @@ static VALUE c_propdict_inspect (VALUE s
+@@ -459,6 +460,7 @@ c_propdict_inspect (VALUE self)
{
return rb_protect_inspect (propdict_inspect, self, 0);
}
+#endif
- static VALUE c_propdict_aref (VALUE self, VALUE key)
- {
-@@ -586,7 +588,9 @@ void Init_Result (VALUE mXmms)
+ static VALUE
+ c_propdict_aref (VALUE self, VALUE key)
+@@ -629,7 +631,9 @@ Init_Result (VALUE mXmms)
cPropDict = rb_define_class_under (mXmms, "PropDict", rb_cObject);
rb_define_method (cPropDict, "initialize", c_propdict_init, 1);
diff --git a/xmms2-tabs.patch b/xmms2-tabs.patch
index e8f3b71..b276a77 100644
--- a/xmms2-tabs.patch
+++ b/xmms2-tabs.patch
@@ -1,6 +1,6 @@
---- xmms2-0.2DrEvil/SConstruct.orig 2006-07-06 22:35:55.000000000 +0200
-+++ xmms2-0.2DrEvil/SConstruct 2023-05-11 21:28:12.098298084 +0200
-@@ -71,8 +71,8 @@ base_env.Append(CPPPATH=["#src/include"]
+--- xmms2-0.2DrGonzo/SConstruct.orig 2006-09-26 15:50:20.000000000 +0200
++++ xmms2-0.2DrGonzo/SConstruct 2023-05-13 18:09:05.863545151 +0200
+@@ -81,8 +81,8 @@ base_env.Append(CPPPATH=["#src/include"]
Help(opts.GenerateHelpText(base_env))
def do_subst_in_file(targetfile, sourcefile, dict):
@@ -11,24 +11,26 @@
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")
+@@ -148,12 +148,12 @@ base_env.handle_targets("Library")
base_env.handle_targets("Program")
subst_dict = {"%VERSION%":XMMS_VERSION, "%PLATFORM%":"XMMS_OS_" +
base_env.platform.upper().replace("-", ""),
-- "%PKGLIBDIR%":base_env["PREFIX"]+"/lib/xmms2",
-- "%BINDIR%":base_env["PREFIX"]+"/bin",
+- "%PKGLIBDIR%":base_env["PLUGINDIR"],
+- "%BINDIR%":base_env["BINDIR"],
- "%SHAREDDIR%":base_env.sharepath,
- "%PREFIX%":base_env.install_prefix,
- "%DEFAULT_OUTPUT%":xmmsenv.default_output[1],
-+ "%PKGLIBDIR%":base_env["PREFIX"]+"/lib/xmms2",
-+ "%BINDIR%":base_env["PREFIX"]+"/bin",
+- "%USERCONFDIR%":base_env.userconfpath,
++ "%PKGLIBDIR%":base_env["PLUGINDIR"],
++ "%BINDIR%":base_env["BINDIR"],
+ "%SHAREDDIR%":base_env.sharepath,
+ "%PREFIX%":base_env.install_prefix,
+ "%DEFAULT_OUTPUT%":xmmsenv.default_output[1],
++ "%USERCONFDIR%":base_env.userconfpath,
}
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):
+@@ -171,7 +171,7 @@ def scan_headers(name):
newf = dir+"/"+d
if os.path.isfile(newf) and newf.endswith('.h'):
base_env.add_header(name, newf)
@@ -37,7 +39,7 @@
scan_headers("xmmsc")
scan_headers("xmms")
scan_headers("xmmsclient")
-@@ -177,11 +177,11 @@ base_env.add_manpage(1, 'doc/xmms2-et.1'
+@@ -188,11 +188,11 @@ base_env.add_manpage(1, 'doc/xmms2-mdns-
#### Generate pc files.
pc_files = [{"name": "xmms2-plugin", "lib":""},
@@ -54,9 +56,18 @@
for p in pc_files:
d = subst_dict.copy()
---- xmms2-0.2DrAlban/xmmsenv.py.orig 2023-05-09 21:16:22.821611818 +0200
-+++ xmms2-0.2DrAlban/xmmsenv.py 2023-05-09 21:45:23.205516682 +0200
-@@ -352,7 +352,7 @@ class XMMSEnvironment(Environment):
+--- xmms2-0.2DrGonzo/xmmsenv.py.orig 2006-09-26 15:50:20.000000000 +0200
++++ xmms2-0.2DrGonzo/xmmsenv.py 2023-05-13 19:07:22.814600542 +0200
+@@ -445,7 +445,7 @@ class XMMSEnvironment(Environment):
+ else:
+ if self.platform == 'darwin':
+ self["SHLINKFLAGS"] += " -dynamiclib"
+- self["SHLINKFLAGS"] += " -single_module"
++ self["SHLINKFLAGS"] += " -single_module"
+ if install:
+ self.Install(self.librarypath,
os.path.join(self.dir, self.shlibname(target)))
+ if self.platform == 'darwin':
+@@ -465,7 +465,7 @@ class XMMSEnvironment(Environment):
def add_header(self, target, source):
self.Install(os.path.join(self.includepath,target), source)
@@ -107,3 +118,29 @@
val += indent + "}\n"
return val
+--- xmms2-0.2DrGonzo/src/xmms/Program.orig 2023-05-13 19:08:01.724389749
+0200
++++ xmms2-0.2DrGonzo/src/xmms/Program 2023-05-13 19:18:25.297678229 +0200
+@@ -20,9 +20,9 @@ source = ["main.c",
+ "converter_plugin.c",
+ "ringbuf_xform.c",
+ "outputplugin.c",
+- "statfs.c",
+- "strfunc.c",
+- "bindata.c"]
++ "statfs.c",
++ "strfunc.c",
++ "bindata.c"]
+
+ def config(env):
+ pluginenv = env.Copy()
+@@ -52,8 +52,8 @@ def config(env):
+ except ConfigError:
+ pass
+
+- if env.platform == 'darwin':
+- env.Append(LINKFLAGS=['-framework', 'CoreFoundation'])
++ if env.platform == 'darwin':
++ env.Append(LINKFLAGS=['-framework', 'CoreFoundation'])
+
+ # we have an xmms2d - we might want plugins!
+ pluginenv.handle_targets("Plugin")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmms2.git/commitdiff/f786859bd9670e80084185fb0b42365fd4d65e84
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
