commit d08281810523050063b2031bafddcc33cf110bdd
Author: Jakub Bogusz <[email protected]>
Date: Sun May 14 17:36:19 2023 +0200
- up to 0.2DrHouse
xmms2-java.patch | 10 --------
xmms2-man.patch | 13 ----------
xmms2-mdns-launcher-conflict.patch | 7 +++++
xmms2-python3.patch | 52 +++++++++++++++++++-------------------
xmms2-tabs.patch | 14 +++++-----
xmms2.spec | 50 +++++++++++++++++++++++++++++++-----
6 files changed, 85 insertions(+), 61 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index 1b6c647..4d32b98 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -10,19 +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.2DrGonzo
+Version: 0.2DrHouse
Release: 0.1
License: LGPL v2.1
Group: Applications/Sound
Source0:
https://downloads.sourceforge.net/xmms2/%{name}-%{version}.tar.bz2
-# Source0-md5: 0845dc7ce04d1825c28566b5c36f23b3
+# Source0-md5: 8f7293b21bd6cb28e7705559a9deab10
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
+Patch6: %{name}-mdns-launcher-conflict.patch
Patch7: %{name}-java.patch
URL: http://xmms2.xmms.se/
BuildRequires: SDL-devel
@@ -35,17 +35,20 @@ BuildRequires: curl-devel >= 7.11.2
%{?with_efl:BuildRequires: ecore-devel}
BuildRequires: faad2-devel >= 2
BuildRequires: ffmpeg-devel >= 2
+BuildRequires: fftw3-single-devel >= 3
%{?with_flac:BuildRequires: flac-devel < 1.1.3}
BuildRequires: gamin-devel
BuildRequires: glib2-devel >= 2.2.0
BuildRequires: gnome-vfs2-devel >= 2.0
BuildRequires: jack-audio-connection-kit-devel
%{?with_java:BuildRequires: jdk}
+BuildRequires: libao-devel
BuildRequires: libmad-devel
BuildRequires: libmodplug-devel
BuildRequires: libmms-devel
BuildRequires: libmpcdec-devel
BuildRequires: libogg-devel
+BuildRequires: libsamplerate-devel
BuildRequires: libshout-devel
BuildRequires: libsidplay2-devel
BuildRequires: libsmbclient-devel
@@ -187,6 +190,18 @@ Ruby bindings for the xmms2 client library.
%description client-lib-ruby -l pl.UTF-8
Wiązania Ruby'ego dla biblioteki klienckiej xmms2.
+%package effect-vocoder
+Summary: Vocoder effect
+Summary(pl.UTF-8): Efekt vocoder
+Group: Applications/Sound
+Requires: %{name} = %{version}-%{release}
+
+%description effect-vocoder
+This package enables phase vocoder effect for xmms2.
+
+%description effect-vocoder -l pl.UTF-8
+Ten pakiet obsługuje efekt fazowego vocodera w xmms2.
+
%package input-faad
Summary: AAC decorer
Summary(pl.UTF-8): Dekoder AAC
@@ -320,6 +335,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-ao
+Summary: AO output
+Summary(pl.UTF-8): Wyjście AO
+Group: X11/Applications/Sound
+Requires: %{name} = %{version}-%{release}
+
+%description output-ao
+This package enables AO output for xmms2.
+
+%description output-ao -l pl.UTF-8
+Ten pakiet udostępnia wyjście AO dla xmms2.
+
%package output-ices
Summary: ICES (Icecast source) output
Summary(pl.UTF-8): Wyjście ICES (Icecast source)
@@ -496,8 +523,8 @@ 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*
+%{_mandir}/man1/xmms2-launcher.1*
+%{_mandir}/man1/xmms2d.1*
### clients
%files client-cli
@@ -510,7 +537,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*
+%{_mandir}/man1/xmms2-mdns-avahi.1*
%files client-sdlvis
%defattr(644,root,root,755)
@@ -558,6 +585,11 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{ruby_vendorarchdir}/xmmsclient.so
%endif
+### effect
+%files effect-vocoder
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_vocoder.so
+
### input
%files input-faad
%defattr(644,root,root,755)
@@ -609,6 +641,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_alsa.so
+%files output-ao
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_ao.so
+
%files output-ices
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_ices.so
@@ -624,6 +660,8 @@ rm -rf $RPM_BUILD_ROOT
%files transport-curl
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_curl_http.so
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_lastfm.so
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_lastfmeta.so
%files transport-daap
%defattr(644,root,root,755)
diff --git a/xmms2-java.patch b/xmms2-java.patch
index d01ecf0..8da54fc 100644
--- a/xmms2-java.patch
+++ b/xmms2-java.patch
@@ -9,13 +9,3 @@
def mkdir(target, source, env):
try:
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
deleted file mode 100644
index 7669925..0000000
--- a/xmms2-man.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- 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-mdns-launcher-conflict.patch
b/xmms2-mdns-launcher-conflict.patch
new file mode 100644
index 0000000..5b35d81
--- /dev/null
+++ b/xmms2-mdns-launcher-conflict.patch
@@ -0,0 +1,7 @@
+--- xmms2-0.2DrHouse/src/clients/mdns/dns_sd/Program.orig 2006-12-03
00:01:08.000000000 +0100
++++ xmms2-0.2DrHouse/src/clients/mdns/dns_sd/Program 2023-05-14
07:23:59.735165278 +0200
+@@ -11,4 +11,3 @@ def config(env):
+ # on macosx it's in libc?
+ if env.platform != "darwin":
+ env.checklib("dns_sd", "DNSServiceRegister")
+- env.add_script("startup.d",
"src/clients/mdns/dns_sd/xmms2-mdns-launcher.sh.in")
diff --git a/xmms2-python3.patch b/xmms2-python3.patch
index 26ff25f..893c974 100644
--- a/xmms2-python3.patch
+++ b/xmms2-python3.patch
@@ -1,5 +1,5 @@
---- 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
+--- xmms2-0.2DrHouse/SConstruct.orig 2023-05-13 22:20:48.565060133 +0200
++++ xmms2-0.2DrHouse/SConstruct 2023-05-13 22:25:42.430134796 +0200
@@ -5,7 +5,6 @@ import sys
import SCons
import re
@@ -40,7 +40,7 @@
# base CCPATH
base_env = xmmsenv.XMMSEnvironment(options=opts)
-@@ -72,7 +72,7 @@ except xmmsenv.ConfigError:
+@@ -73,7 +72,7 @@ except xmmsenv.ConfigError:
os.remove("config.cache")
except:
pass
@@ -117,10 +117,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")
---- 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
+ base_env.Alias('install', base_env.install_targets)
+--- xmms2-0.2DrHouse/xmmsenv.py.orig 2023-05-13 22:26:34.319853686 +0200
++++ xmms2-0.2DrHouse/xmmsenv.py 2023-05-13 22:41:26.755018949 +0200
@@ -5,8 +5,7 @@ import shutil
import gzip
from marshal import load
@@ -140,7 +140,7 @@
def find_static_lib(env, lib):
libname = "lib%s.a" % lib
-@@ -48,9 +45,9 @@ class Target:
+@@ -56,9 +53,9 @@ class Target:
self.globs['platform'] = env.platform
self.globs['ConfigError'] = ConfigError
@@ -152,7 +152,7 @@
x += '\n'
c = compile(x, target, "exec")
-@@ -101,14 +98,14 @@ class XMMSEnvironment(Environment):
+@@ -109,14 +106,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)
@@ -169,7 +169,7 @@
self.config_cache={}
else:
self.config_cache={}
-@@ -118,7 +115,7 @@ class XMMSEnvironment(Environment):
+@@ -126,7 +123,7 @@ class XMMSEnvironment(Environment):
self.programs=[]
self.install_targets=[]
@@ -178,7 +178,7 @@
self.installdir = os.path.normpath(self["INSTALLDIR"] +
'/')
else:
self.installdir = ""
-@@ -147,7 +147,7 @@ class XMMSEnvironment(Environment):
+@@ -158,7 +155,7 @@ class XMMSEnvironment(Environment):
self.platform = sys.platform
# Where to place the xmms2 user config directory
@@ -187,7 +187,7 @@
self.userconfpath = self["USERCONFDIR"]
else:
if sys.platform == 'darwin':
-@@ -159,7 +156,7 @@ class XMMSEnvironment(Environment):
+@@ -167,7 +164,7 @@ class XMMSEnvironment(Environment):
self.userconfpath = '.config/xmms2'
def gzipper(target, source, env):
@@ -196,16 +196,16 @@
self['BUILDERS']['GZipper'] =
SCons.Builder.Builder(action=SCons.Action.Action(gzipper))
if self.platform == 'darwin':
-@@ -178,7 +175,7 @@ class XMMSEnvironment(Environment):
+@@ -186,7 +183,7 @@ class XMMSEnvironment(Environment):
self.install_targets.append(target)
-
+
def tryaction(self, cmd):
- if self.config_cache.has_key(cmd):
+ if cmd in self.config_cache:
return self.config_cache[cmd]
r = False
-@@ -199,7 +196,7 @@ class XMMSEnvironment(Environment):
+@@ -207,7 +204,7 @@ class XMMSEnvironment(Environment):
return r
def run(self, cmd):
@@ -214,7 +214,7 @@
return self.config_cache[cmd]
try:
-@@ -217,28 +214,29 @@ class XMMSEnvironment(Environment):
+@@ -225,28 +222,29 @@ class XMMSEnvironment(Environment):
if libs:
cmd += " --libs"
cmd += " \"%s\"" % module
@@ -251,7 +251,7 @@
sys.exit(-1)
raise ConfigError("Command '%s' failed" % cmd)
ret = ret.strip()
-@@ -252,33 +250,33 @@ class XMMSEnvironment(Environment):
+@@ -260,33 +258,33 @@ class XMMSEnvironment(Environment):
else:
key = ("HEADER", header)
@@ -295,7 +295,7 @@
if not self.config_cache["cpp"]:
raise ConfigError("couldn't compile CPP files")
-@@ -289,11 +287,11 @@ class XMMSEnvironment(Environment):
+@@ -297,11 +295,11 @@ class XMMSEnvironment(Environment):
else:
key = ("HEADER", header)
@@ -309,7 +309,7 @@
sys.exit(1)
raise ConfigError("Headerfile '%s' not found" % header)
-@@ -301,7 +299,7 @@ class XMMSEnvironment(Environment):
+@@ -309,7 +307,7 @@ class XMMSEnvironment(Environment):
def checklib(self, lib, func, header=0, lang="c", fail=False):
key = (lib, func)
@@ -318,7 +318,7 @@
#libtool_flags = None
self.config_cache[key] = ""
-@@ -324,7 +322,7 @@ class XMMSEnvironment(Environment):
+@@ -332,7 +330,7 @@ class XMMSEnvironment(Environment):
if not self.config_cache[key]:
if fail:
@@ -327,7 +327,7 @@
sys.exit(1)
raise ConfigError("Symbol '%s' in library '%s' not
found" % (func, lib))
-@@ -478,14 +476,14 @@ class XMMSEnvironment(Environment):
+@@ -489,14 +487,14 @@ class XMMSEnvironment(Environment):
if options.files:
for filename in options.files:
if os.path.exists(filename):
@@ -345,7 +345,7 @@
if options.args[option.key] !=
cached[option.key]:
# differnt value
return True
-@@ -515,7 +513,7 @@ class XMMSEnvironment(Environment):
+@@ -526,7 +524,7 @@ class XMMSEnvironment(Environment):
This will open the libtool file and read the lines
that we need.
"""
@@ -354,7 +354,7 @@
line = f.readline()
ret = {}
while line:
-@@ -532,13 +530,13 @@ class XMMSEnvironment(Environment):
+@@ -543,13 +541,13 @@ class XMMSEnvironment(Environment):
targets = [cls(a[1], self) for a in self.potential_targets if
a[0].startswith(targettype)]
for t in targets:
@@ -457,10 +457,10 @@
env.librarypath = env["RUBYARCHDIR"]
else:
cmd = "ruby -rrbconfig -e 'print
Config::CONFIG[\"sitearchdir\"]'"
---- 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"]
+--- xmms2-0.2DrHouse/src/xmms/Program.orig 2023-05-13 23:04:50.170749327
+0200
++++ xmms2-0.2DrHouse/src/xmms/Program 2023-05-13 23:10:10.055683028 +0200
+@@ -26,7 +26,7 @@ source = ["main.c",
+ "utils.c"]
def config(env):
- pluginenv = env.Copy()
diff --git a/xmms2-tabs.patch b/xmms2-tabs.patch
index b276a77..dcd1e54 100644
--- a/xmms2-tabs.patch
+++ b/xmms2-tabs.patch
@@ -118,22 +118,24 @@
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",
+--- xmms2-0.2DrHouse/src/xmms/Program.orig 2006-12-03 00:01:08.000000000
+0100
++++ xmms2-0.2DrHouse/src/xmms/Program 2023-05-13 22:16:01.913279726 +0200
+@@ -20,10 +20,10 @@ source = ["main.c",
"converter_plugin.c",
"ringbuf_xform.c",
"outputplugin.c",
- "statfs.c",
- "strfunc.c",
-- "bindata.c"]
+- "bindata.c",
+- "utils.c"]
+ "statfs.c",
+ "strfunc.c",
-+ "bindata.c"]
++ "bindata.c",
++ "utils.c"]
def config(env):
pluginenv = env.Copy()
-@@ -52,8 +52,8 @@ def config(env):
+@@ -58,8 +58,8 @@ def config(env):
except ConfigError:
pass
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmms2.git/commitdiff/d08281810523050063b2031bafddcc33cf110bdd
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
