aboutsummaryrefslogtreecommitdiffstats
path: root/audio/xmms2/files
diff options
context:
space:
mode:
Diffstat (limited to 'audio/xmms2/files')
-rw-r--r--audio/xmms2/files/extra-patch-src-clients-vistest-wscript43
-rw-r--r--audio/xmms2/files/patch-patch-src-plugins-musepack-wscript14
-rw-r--r--audio/xmms2/files/patch-src-plugins-airplay-wscript24
-rw-r--r--audio/xmms2/files/patch-src-plugins-file-wscript19
-rw-r--r--audio/xmms2/files/patch-wafadmin-Task.py18
-rw-r--r--audio/xmms2/files/patch-wscript51
6 files changed, 85 insertions, 84 deletions
diff --git a/audio/xmms2/files/extra-patch-src-clients-vistest-wscript b/audio/xmms2/files/extra-patch-src-clients-vistest-wscript
index 1550d87a382..db0c7495c7b 100644
--- a/audio/xmms2/files/extra-patch-src-clients-vistest-wscript
+++ b/audio/xmms2/files/extra-patch-src-clients-vistest-wscript
@@ -1,25 +1,30 @@
--- src/clients/vistest/wscript~
+++ src/clients/vistest/wscript
-@@ -15,14 +15,6 @@ def build(bld):
- obj.uselib_local = 'xmmsclient-glib xmmsclient'
- obj.uselib = 'glib2 math'
+@@ -23,17 +23,6 @@ def build(bld):
+ t.install_path = None
-- if bld.env['LIB_vorbisenc']:
-- obj = bld.new_task_gen('cc', 'program')
-- obj.target = 'xmms2-ripper'
-- obj.source = 'ripper.c'
-- obj.includes = '. ../../.. ../../include'
-- obj.uselib_local = 'xmmsclient'
-- obj.uselib = 'vorbisenc'
+
+- if bld.env.LIB_vorbisenc:
+- t = bld(features = 'c cprogram',
+- target = 'xmms2-ripper',
+- source = 'ripper.c',
+- includes = '. ../../.. ../../include',
+- uselib = 'vorbisenc',
+- use = 'xmmsclient'
+- )
+- if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS:
+- t.install_path = None
-
- if bld.env['LIB_visual'] and bld.env['LIB_sdl']:
- obj = bld.new_task_gen('cc', 'program')
- obj.target = 'xmms2-libvisual'
-@@ -38,7 +30,6 @@ def configure(conf):
- conf.check_cc(lib="m", uselib_store="math")
- conf.check_cfg(package='libvisual-0.4', uselib_store='visual', args='--cflags --libs')
- conf.check_cfg(package='sdl', uselib_store='sdl', args='--cflags --libs')
-- conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs')
+ if bld.env.LIB_visual and bld.env.LIB_sdl:
+ t = bld(features = 'c cprogram',
+ target = 'xmms2-libvisual',
+@@ -53,9 +42,6 @@ def configure(conf):
- return True
+ conf.check_cc(lib="m", uselib_store="math", mandatory=False)
+- conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc',
+- 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/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript b/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
index 9a450a72c3d..17423479499 100644
--- a/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
+++ b/audio/xmms2/files/patch-patch-src-plugins-musepack-wscript
@@ -1,11 +1,11 @@
--- src/plugins/musepack/wscript.orig 2010-09-10 22:55:03.412930402 +0200
+++ src/plugins/musepack/wscript 2010-09-10 23:02:05.738208553 +0200
-@@ -5,7 +5,7 @@
- if not conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD", uselib_store="mpcdec"):
- return False
+@@ -8,7 +8,7 @@ def plugin_configure(conf):
+ conf.check_cc(header_name="mpcdec/mpcdec.h", defines="HAVE_MPCDEC_OLD",
+ uselib_store="mpcdec")
-- if not conf.check_cc(lib="mpcdec", uselib_store="mpcdec"):
-+ if not conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec"):
- return False
+- conf.check_cc(lib="mpcdec", uselib_store="mpcdec")
++ conf.check_cc(lib="mpcdec", uselib="math", uselib_store="mpcdec")
- return True
+ configure, build = plugin("musepack", configure=plugin_configure,
+ libs=["mpcdec"])
diff --git a/audio/xmms2/files/patch-src-plugins-airplay-wscript b/audio/xmms2/files/patch-src-plugins-airplay-wscript
index 9a06e08da61..961daba7755 100644
--- a/audio/xmms2/files/patch-src-plugins-airplay-wscript
+++ b/audio/xmms2/files/patch-src-plugins-airplay-wscript
@@ -1,19 +1,11 @@
--- src/plugins/airplay/wscript.orig 2010-02-19 18:43:54.000000000 +0100
+++ src/plugins/airplay/wscript 2010-03-17 15:14:34.459359323 +0100
-@@ -1,15 +1,6 @@
- from waftools.plugin import plugin
+@@ -12,8 +12,6 @@ rtspmessage.c
+ def plugin_configure(conf):
+ # MinGW doesn't ship sys/select.h
+ conf.check_cc(header_name='sys/select.h')
+- conf.check_cfg(package="openssl", args="--cflags --libs",
+- uselib_store="openssl")
--def plugin_configure(conf):
-- # MinGW doesn't ship sys/select.h
-- if not conf.check_cc(header_name='sys/select.h'):
-- return False
--
-- if not conf.check_cfg(package="openssl", args="--cflags --libs", uselib_store="openssl"):
-- return False
-- return True
--
--configure, build = plugin("airplay", configure=plugin_configure,
-+configure, build = plugin("airplay",
- source=["airplay.c", "raop_client.c",
- "net_utils.c", "rtspdefs.c",
- "rtspconnection.c", "rtspmessage.c"],
+ configure, build = plugin("airplay", configure=plugin_configure,
+ source = source, libs=["openssl"], output_prio=4)
diff --git a/audio/xmms2/files/patch-src-plugins-file-wscript b/audio/xmms2/files/patch-src-plugins-file-wscript
new file mode 100644
index 00000000000..b148d973ec0
--- /dev/null
+++ b/audio/xmms2/files/patch-src-plugins-file-wscript
@@ -0,0 +1,19 @@
+--- src/plugins/file/wscript.orig 2011-10-20 21:26:08.000000000 +0200
++++ src/plugins/file/wscript 2012-05-04 23:01:58.940585349 +0200
+@@ -1,7 +1,7 @@
+ from waftools.plugin import plugin
+
+ def plugin_build(bld, obj):
+- if bld.env.HAVE_FSTATAT and bld.env.HAVE_DIRFD:
++ if bld.env.HAVE_FSTATAT:
+ obj.source.append('browse/fstatat.c')
+ else:
+ obj.source.append('browse/gdir.c')
+@@ -9,7 +9,6 @@
+ def plugin_configure(conf):
+ conf.check_cc(function_name='fstatat', header_name=['fcntl.h','sys/stat.h'],
+ defines=['_ATFILE_SOURCE=1'])
+- conf.check_cc(function_name='dirfd', header_name=['dirent.h','sys/types.h'])
+
+ configure, build = plugin("file",
+ configure=plugin_configure, build=plugin_build,
diff --git a/audio/xmms2/files/patch-wafadmin-Task.py b/audio/xmms2/files/patch-wafadmin-Task.py
deleted file mode 100644
index 6e7553a31e1..00000000000
--- a/audio/xmms2/files/patch-wafadmin-Task.py
+++ /dev/null
@@ -1,18 +0,0 @@
---- wafadmin/Task.py.orig 2010-02-19 18:43:54.000000000 +0100
-+++ wafadmin/Task.py 2011-10-14 14:36:57.000663231 +0200
-@@ -47,6 +47,7 @@
- import Build, Runner, Utils, Node, Logs, Options
- from Logs import debug, warn, error
- from Constants import *
-+import time
-
- algotype = NORMAL
- #algotype = JOBCONTROL
-@@ -406,6 +407,7 @@
- def call_run(self):
- if self.can_retrieve_cache():
- return 0
-+ time.sleep(0.02)
- return self.run()
-
- def run(self):
diff --git a/audio/xmms2/files/patch-wscript b/audio/xmms2/files/patch-wscript
index e953ae0ee50..1580805f669 100644
--- a/audio/xmms2/files/patch-wscript
+++ b/audio/xmms2/files/patch-wscript
@@ -1,27 +1,30 @@
---- wscript.orig 2010-02-19 18:43:54.000000000 +0100
-+++ wscript 2010-03-17 15:21:16.184861151 +0100
-@@ -303,7 +303,7 @@
- conf.env['PKGCONFIGDIR'] = Options.options.pkgconfigdir
- print(conf.env['PKGCONFIGDIR'])
- else:
-- conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["LIBDIR"], "pkgconfig")
-+ conf.env['PKGCONFIGDIR'] = os.path.join(conf.env["PREFIX"], "libdata", "pkgconfig")
+--- wscript.orig 2011-10-20 21:26:08.000000000 +0200
++++ wscript 2012-05-06 18:28:07.902349353 +0200
+@@ -295,9 +295,6 @@
+ conf.msg("uncommited changed", changed and "yes" or "no")
+ conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty)
- if Options.options.config_prefix:
- for dir in Options.options.config_prefix:
-@@ -480,15 +480,6 @@
- opt.sub_options(o)
+- conf.env.append_unique('CFLAGS', ['-g', '-O0'])
+- conf.env.append_unique('CXXFLAGS', ['-g', '-O0'])
+-
+ if conf.options.with_profiling:
+ conf.env.with_profiling = True
+ conf.env.append_unique('CFLAGS', ['--coverage'])
+@@ -330,7 +327,7 @@
+ conf.env.PKGCONFIGDIR = conf.options.pkgconfigdir
+ Logs.pprint('Normal', conf.env.PKGCONFIGDIR) #XXX What is it ?
+ else:
+- conf.env.PKGCONFIGDIR = os.path.join(conf.env.LIBDIR, 'pkgconfig')
++ conf.env.PKGCONFIGDIR = os.path.join(conf.env.PREFIX, 'libdata', 'pkgconfig')
- def shutdown():
-- if Options.commands['install'] and (
-- Options.options.ldconfig or
-- (Options.options.ldconfig is None and os.geteuid() == 0)
-- ):
-- ldconfig = '/sbin/ldconfig'
-- if os.path.isfile(ldconfig):
-- libprefix = Utils.subst_vars('${PREFIX}/lib', Build.bld.env)
-- try: Utils.cmd_output(ldconfig + ' ' + libprefix)
-- except: pass
+ if conf.options.config_prefix:
+ for d in conf.options.config_prefix:
+@@ -339,6 +336,8 @@
+ conf.env.prepend_value('LIBPATH', os.path.join(d, 'lib'))
+ conf.env.prepend_value('CPPPATH', os.path.join(d, 'include'))
- if Options.options.run_tests:
- os.system(os.path.join(blddir, "default/tests/test_xmmstypes"))
++ conf.env.prepend_value('LIBPATH', "%%WRKSRC%%/_build_/src/clients/lib/xmmsclient")
++
+ if Options.platform != 'win32':
+ conf.env.append_unique('CFLAGS_cstlib', ['-fPIC', '-DPIC'])
+ conf.env.append_unique('CPPFLAGS_cxxshlib', ['-fPIC', '-DPIC'])
generated by cgit (git 2.34.1) at 2024-12-21 06:45:56 +0800