[packages/xmms2] - up to 0.4DrKosmos
qboosh
qboosh at pld-linux.org
Sat May 20 22:20:43 CEST 2023
commit ceaebfc77e0ce413f75a69747ddab81969703fd5
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Sat May 20 22:22:56 2023 +0200
- up to 0.4DrKosmos
xmms2-mdns-launcher-conflict.patch | 8 ++---
xmms2-perl.patch | 11 ------
xmms2-ruby.patch | 34 ++++++++++++++++---
xmms2-waf.patch | 68 +++++++-------------------------------
xmms2.spec | 37 +++++++++++++++++----
5 files changed, 76 insertions(+), 82 deletions(-)
---
diff --git a/xmms2.spec b/xmms2.spec
index 5e3995b..9a9601f 100644
--- a/xmms2.spec
+++ b/xmms2.spec
@@ -12,14 +12,13 @@
Summary: Client/server based media player system
Summary(pl.UTF-8): System odtwarzania multimediów oparty na architekturze klient/serwer
Name: xmms2
-Version: 0.2DrJekyll
+Version: 0.4DrKosmos
Release: 0.1
License: LGPL v2.1
Group: Applications/Sound
Source0: https://downloads.sourceforge.net/xmms2/%{name}-%{version}.tar.bz2
-# Source0-md5: 768de76a98b6a9766cec157ff0a12543
+# Source0-md5: f363857a77606a2d7d14603ab375f454
Patch0: %{name}-tabs.patch
-Patch1: %{name}-perl.patch
Patch3: %{name}-modplug.patch
Patch4: %{name}-ffmpeg.patch
Patch5: %{name}-ruby.patch
@@ -62,6 +61,7 @@ BuildRequires: libstdc++-devel
BuildRequires: libvorbis-devel
BuildRequires: libxml2-devel >= 2.0
BuildRequires: pkgconfig
+BuildRequires: pulseaudio-devel
%if %{with python}
BuildRequires: python-Pyrex >= 0.9.4.2
BuildRequires: python-devel >= 2.3
@@ -414,6 +414,18 @@ This package enables OSS output for xmms2.
%description output-oss -l pl.UTF-8
Ten pakiet udostępnia wyjście OSS dla xmms2.
+%package output-pulse
+Summary: PulseAudio output
+Summary(pl.UTF-8): Wyjście PulseAudio
+Group: X11/Applications/Sound
+Requires: %{name} = %{version}-%{release}
+
+%description output-pulse
+This package enables PulseAudio output for xmms2.
+
+%description output-pulse -l pl.UTF-8
+Ten pakiet udostępnia wyjście PulseAudio dla xmms2.
+
%package transport-curl
Summary: HTTP curl transport
Summary(pl.UTF-8): Transport HTTP poprzez curl
@@ -491,7 +503,6 @@ xmms2.
%prep
%setup -q
%patch0 -p1
-%patch1 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
@@ -516,13 +527,14 @@ done
%build
CC="%{__cc}" \
CXX="%{__cxx}" \
-CCFLAGS="%{rpmcflags} %{rpmcppflags} $(pkg-config --cflags smbclient)" \
+CFLAGS="%{rpmcflags} %{rpmcppflags} $(pkg-config --cflags smbclient)" \
CXXFLAGS="%{rpmcxxflags} %{rpmcppflags} $(pkg-config --cflags smbclient)" \
LDFLAGS="%{rpmldflags}" \
./waf configure -v \
--prefix=%{_prefix} \
- --libdir=%{_libdir} \
+ --with-libdir=%{_libdir} \
--with-mandir=%{_mandir} \
+ --with-perl-archdir=%{perl_vendorarch} \
--without-optionals=python
./waf build -v
@@ -554,8 +566,9 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_bindir}/xmms2-launcher
%attr(755,root,root) %{_bindir}/xmms2d
%attr(755,root,root) %{_libdir}/libxmmsclient.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libxmmsclient.so.2
+%attr(755,root,root) %ghost %{_libdir}/libxmmsclient.so.3
%dir %{_libdir}/%{name}
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_asf.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_asx.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_cue.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_diskwrite.so
@@ -565,6 +578,7 @@ rm -rf $RPM_BUILD_ROOT
%attr(755,root,root) %{_libdir}/%{name}/libxmms_id3v2.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_m3u.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_mp4.so
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_normalize.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_null.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_nulstripper.so
%attr(755,root,root) %{_libdir}/%{name}/libxmms_pls.so
@@ -579,6 +593,8 @@ rm -rf $RPM_BUILD_ROOT
# disabled since 0.2DrEvil ("broken=True")
#%attr(755,root,root) %{_libdir}/%{name}/libxmms_html.so
%{_datadir}/%{name}
+%{_pixmapsdir}/xmms2*.png
+%{_pixmapsdir}/xmms2*.svg
%{_mandir}/man1/xmms2-launcher.1*
%{_mandir}/man1/xmms2d.1*
@@ -734,6 +750,10 @@ rm -rf $RPM_BUILD_ROOT
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_oss.so
+%files output-pulse
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/%{name}/libxmms_pulse.so
+
%files transport-curl
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/%{name}/libxmms_curl.so
@@ -759,6 +779,9 @@ rm -rf $RPM_BUILD_ROOT
%files devel
%defattr(644,root,root,755)
%attr(755,root,root) %{_libdir}/libxmmsclient.so
+%if %{with efl}
+%attr(755,root,root) %{_libdir}/libxmmsclient-ecore.so
+%endif
%attr(755,root,root) %{_libdir}/libxmmsclient-glib.so
%attr(755,root,root) %{_libdir}/libxmmsclient++-glib.so
%{_includedir}/xmms2
diff --git a/xmms2-mdns-launcher-conflict.patch b/xmms2-mdns-launcher-conflict.patch
index 2299f47..5916986 100644
--- a/xmms2-mdns-launcher-conflict.patch
+++ b/xmms2-mdns-launcher-conflict.patch
@@ -1,10 +1,10 @@
---- xmms2-0.2DrJekyll/src/clients/mdns/dns_sd/wscript.orig 2007-05-20 17:55:40.000000000 +0200
-+++ xmms2-0.2DrJekyll/src/clients/mdns/dns_sd/wscript 2023-05-14 20:16:34.294041077 +0200
-@@ -15,7 +15,6 @@ def build(bld):
+--- xmms2-0.4DrKosmos/src/clients/mdns/dns_sd/wscript.orig 2023-05-20 14:56:24.889693533 +0200
++++ xmms2-0.4DrKosmos/src/clients/mdns/dns_sd/wscript 2023-05-20 14:59:16.145432428 +0200
+@@ -17,7 +17,6 @@ def build(bld):
obj = bld.create_obj('subst')
obj.source = 'xmms2-mdns-launcher.sh.in'
obj.dict = {'PRG_PATH' : os.path.join(bld.env_of_name('default')['PREFIX'], 'bin')}
- Common.install_files('SCRIPTDIR', None, 'xmms2-mdns-launcher.sh', chmod=0755)
def configure(conf):
- if not conf.check_header('dns_sd.h'):
+ conf.env['explicit_dnssd'] = True
diff --git a/xmms2-perl.patch b/xmms2-perl.patch
deleted file mode 100644
index 3a7bc4a..0000000
--- a/xmms2-perl.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- xmms2-0.2DrJekyll/src/clients/lib/perl/wscript.orig 2007-05-20 17:55:40.000000000 +0200
-+++ xmms2-0.2DrJekyll/src/clients/lib/perl/wscript 2023-05-19 19:41:28.398438169 +0200
-@@ -50,7 +50,7 @@ def configure(conf):
- conf.env["CCFLAGS_perl"] += ' -DVERSION="0.03"'
-
- if not Params.g_options.perlarchdir:
-- conf.env["ARCHDIR_perl"] = os.popen(perl + " -MConfig -e'print $Config{sitearch}'").read()
-+ conf.env["ARCHDIR_perl"] = os.popen(perl + " -MConfig -e'print $Config{vendorarch}'").read()
- else:
- conf.env["ARCHDIR_perl"] = Params.g_options.perlarchdir
-
diff --git a/xmms2-ruby.patch b/xmms2-ruby.patch
index 68268ff..f00bf46 100644
--- a/xmms2-ruby.patch
+++ b/xmms2-ruby.patch
@@ -1,6 +1,6 @@
---- xmms2-0.2DrJekyll/src/clients/lib/ruby/wscript.orig 2007-05-20 17:55:40.000000000 +0200
-+++ xmms2-0.2DrJekyll/src/clients/lib/ruby/wscript 2023-05-14 19:24:00.501126640 +0200
-@@ -53,23 +53,23 @@ def configure(conf):
+--- xmms2-0.4DrKosmos/src/clients/lib/ruby/wscript.orig 2023-05-20 14:47:32.535910875 +0200
++++ xmms2-0.4DrKosmos/src/clients/lib/ruby/wscript 2023-05-20 14:55:29.619992955 +0200
+@@ -51,17 +51,17 @@ def configure(conf):
return False
conf.check_message('ruby version', '> 1.8', True, version)
@@ -13,9 +13,29 @@
- dir = os.popen(ruby + " -rrbconfig -e 'puts \"%s\" % [].fill(Config::CONFIG[\"archdir\"], 0..1)'").read().strip()
+ dir = os.popen(ruby + " -rrbconfig -e 'puts \"%s\" % [].fill(RbConfig::CONFIG[\"rubyhdrdir\"], 0..1)'").read().strip()
- conf.env["CCFLAGS_ruby"] = '-I%s' % dir
+ conf.env["CPPPATH_ruby"] = dir
conf.env["LINKFLAGS_ruby"] = '-L%s' % dir
+- ldflags = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LDSHARED\"]'").read().strip()
++ ldflags = os.popen(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"LDSHARED\"]'").read().strip()
+ # ok this is really stupid, but the command and flags are combined.
+ # so we try to find the first argument...
+ flags = ldflags.split()
+@@ -69,26 +69,26 @@ def configure(conf):
+ flags = flags[1:]
+ conf.env["LINKFLAGS_ruby"] += " "+" ".join(flags)
+
+- ldflags = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LIBS\"]'").read().strip()
++ ldflags = os.popen(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"LIBS\"]'").read().strip()
+ conf.env["LINKFLAGS_ruby"] += " "+ldflags
+- ldflags = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"LIBRUBYARG_SHARED\"]'").read().strip()
++ ldflags = os.popen(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"LIBRUBYARG_SHARED\"]'").read().strip()
+ conf.env["LINKFLAGS_ruby"] += " "+ldflags
+
+- cflags = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"CCDLFLAGS\"]'").read().strip()
++ cflags = os.popen(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"CCDLFLAGS\"]'").read().strip()
+ conf.env["CCFLAGS_ruby"] = cflags
+
if not Params.g_options.rubyarchdir:
- conf.env["ARCHDIR_ruby"] = os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"sitearchdir\"]'").read().strip()
+ conf.env["ARCHDIR_ruby"] = os.popen(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"vendorarchdir\"]'").read().strip()
@@ -28,6 +48,12 @@
else:
conf.env["LIBDIR_ruby"] = Params.g_options.rubylibdir
+ conf.env["rubyext_PREFIX"] = ''
+- conf.env["rubyext_SUFFIX"] = '.' + os.popen(ruby + " -rrbconfig -e 'print Config::CONFIG[\"DLEXT\"]'").read().strip()
++ conf.env["rubyext_SUFFIX"] = '.' + os.popen(ruby + " -rrbconfig -e 'print RbConfig::CONFIG[\"DLEXT\"]'").read().strip()
+ conf.env["rubyext_USELIB"] = "ruby"
+ conf.env["rubyext_obj_ext"] = conf.env["shlib_obj_ext"]
+
--- xmms2-0.2DrJekyll/src/clients/lib/ruby/rb_xmmsclient.c.orig 2023-05-14 19:24:29.670968613 +0200
+++ xmms2-0.2DrJekyll/src/clients/lib/ruby/rb_xmmsclient.c 2023-05-14 19:29:16.606080819 +0200
@@ -73,8 +73,8 @@
diff --git a/xmms2-waf.patch b/xmms2-waf.patch
index eb0b56b..d766008 100644
--- a/xmms2-waf.patch
+++ b/xmms2-waf.patch
@@ -9,22 +9,10 @@
test.headers = ['math.h']
test.libs = ['m']
test.mandatory = 1
---- xmms2-0.2DrJekyll/wscript.orig 2007-05-20 17:55:40.000000000 +0200
-+++ xmms2-0.2DrJekyll/wscript 2023-05-19 16:34:46.732465581 +0200
-@@ -212,6 +212,11 @@ def configure(conf):
- conf.env["BUILD_XMMS2D"] = True
- subdirs.insert(0, "src/xmms")
-
-+ if Params.g_options.libdir:
-+ conf.env["LIBDIR"] = Params.g_options.libdir
-+ else:
-+ conf.env["LIBDIR"] = os.path.join(conf.env["PREFIX"], "lib")
-+
- if Params.g_options.manualdir:
- conf.env["MANDIR"] = Params.g_options.manualdir
- else:
-@@ -227,8 +232,6 @@ def configure(conf):
- conf.check_tool('man', tooldir=os.path.abspath('waftools'))
+--- xmms2-0.4DrKosmos/wscript.orig 2007-11-15 19:25:07.000000000 +0100
++++ xmms2-0.4DrKosmos/wscript 2023-05-20 15:03:03.017536689 +0200
+@@ -244,8 +244,6 @@ def configure(conf):
+ Params.g_platform = Params.g_options.target_platform
conf.env["VERSION"] = VERSION
- conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0']
@@ -32,38 +20,6 @@
conf.env['XMMS_PKGCONF_FILES'] = []
conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")]
-@@ -234,11 +239,10 @@ def configure(conf):
- conf.env['CXXDEFINES'] += ["XMMS_VERSION=\"\\\"%s\\\"\"" % VERSION]
-
- if Params.g_options.config_prefix:
-- conf.env["LIBPATH"] += [os.path.join(Params.g_options.config_prefix, "lib")]
- include = [os.path.join(Params.g_options.config_prefix, "include")]
- conf.env['CPPPATH'] += include
-
-- conf.env["LINKFLAGS_xlibs"] += ['-install_name %s%s%s' % (os.path.join(conf.env["PREFIX"], 'lib', conf.env["shlib_PREFIX"]), '%s', conf.env["shlib_SUFFIX"])]
-+ conf.env["LINKFLAGS_xlibs"] += ['-install_name %s%s%s' % (os.path.join(conf.env["LIBDIR"], conf.env["shlib_PREFIX"]), '%s', conf.env["shlib_SUFFIX"])]
-
- # Our static libraries may link to dynamic libraries
- conf.env["staticlib_CCFLAGS"] += ['-fPIC', '-DPIC']
-@@ -303,6 +308,7 @@ def set_options(opt):
- opt.add_option('--conf-prefix', type='string', dest='config_prefix')
- opt.add_option('--without-xmms2d', type='int', dest='without_xmms2d')
- opt.add_option('--with-mandir', type='string', dest='manualdir')
-+ opt.add_option('--libdir', type='string', dest='libdir')
-
- for o in optional_subdirs + subdirs:
- opt.sub_options(o)
---- xmms2-0.2DrJekyll/wafadmin/Tools/gcc.py.orig 2007-05-20 17:55:40.000000000 +0200
-+++ xmms2-0.2DrJekyll/wafadmin/Tools/gcc.py 2023-05-19 16:58:09.314656440 +0200
-@@ -81,7 +81,7 @@ def detect(conf):
- if not dest: dest=orig
- try: conf.env[dest] = ron[orig]
- except KeyError: pass
-- addflags('CCFLAGS', 'CFLAGS')
-+ addflags('CCFLAGS')
- addflags('CPPFLAGS')
- addflags('LINKFLAGS')
-
--- xmms2-0.2DrJekyll/waftools/pkgconfig.py.orig 2007-05-20 17:55:40.000000000 +0200
+++ xmms2-0.2DrJekyll/waftools/pkgconfig.py 2023-05-19 17:20:32.982353210 +0200
@@ -20,7 +20,7 @@ class pkgcobj(copyobj):
@@ -75,11 +31,11 @@
val["INCLUDEDIR"] = os.path.join("${prefix}", "include", "xmms2")
val["VERSION"] = self.version
---- xmms2-0.2DrJekyll/src/include/xmms/wscript.orig 2007-05-20 17:55:40.000000000 +0200
-+++ xmms2-0.2DrJekyll/src/include/xmms/wscript 2023-05-20 07:52:15.284232542 +0200
-@@ -19,8 +19,8 @@ def configure(conf):
- defs["XMMS_OS_%s" % platform.upper()] = 1
- break
+--- xmms2-0.4DrKosmos/src/include/xmms/wscript.orig 2023-05-20 18:07:08.337699055 +0200
++++ xmms2-0.4DrKosmos/src/include/xmms/wscript 2023-05-20 19:51:04.783913328 +0200
+@@ -12,8 +12,8 @@ def configure(conf):
+
+ defs = {}
- defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'],
- 'lib', 'xmms2')
@@ -88,12 +44,12 @@
defs['BINDIR'] = os.path.join(conf.env['PREFIX'],
'bin')
defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'],
-@@ -45,7 +45,7 @@ def configure(conf):
+@@ -38,7 +38,7 @@ def configure(conf):
conf.env['XMMS_DEFS'] = defs
conf.env['PLUGINDIR'] = defs['PKGLIBDIR']
- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "lib", "pkgconfig")
+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
- for i in defs:
- conf.add_define(i, defs[i])
+ # The plugin path in Windows should be relative, not absolute
+ if Params.g_platform == 'win32':
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/xmms2.git/commitdiff/ceaebfc77e0ce413f75a69747ddab81969703fd5
More information about the pld-cvs-commit
mailing list