From e95cdb6ad2eb9e4e2be2377b45ed1e418fda848a Mon Sep 17 00:00:00 2001 From: Vít Ondruch Date: Feb 08 2012 08:28:11 +0000 Subject: Rebuilt for Ruby 1.9.3. --- diff --git a/xmms2-0.5DrLecter-moresaneversioning.patch b/xmms2-0.5DrLecter-moresaneversioning.patch deleted file mode 100644 index ea8a6e9..0000000 --- a/xmms2-0.5DrLecter-moresaneversioning.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up xmms2-0.5DrLecter/wscript.versionsanity xmms2-0.5DrLecter/wscript ---- xmms2-0.5DrLecter/wscript.versionsanity 2008-12-10 15:22:56.000000000 -0500 -+++ xmms2-0.5DrLecter/wscript 2008-12-10 15:27:09.000000000 -0500 -@@ -23,7 +23,7 @@ import Object - import Utils - import Common - --BASEVERSION="0.5 DrLecter" -+BASEVERSION="0.5" - APPNAME='xmms2' - - srcdir='.' -@@ -252,14 +252,15 @@ def configure(conf): - - nam,changed = gittools.get_info() - conf.check_message("git commit id", "", True, nam) -- if Params.g_options.customversion: -- conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Params.g_options.customversion) -- else: -- dirty="" -- if changed: -- dirty="-dirty" -- conf.check_message("uncommitted changes", "", bool(changed)) -- conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) -+ ## if Params.g_options.customversion: -+ ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Params.g_options.customversion) -+ ## else: -+ ## dirty="" -+ ## if changed: -+ ## dirty="-dirty" -+ ## conf.check_message("uncommitted changes", "", bool(changed)) -+ ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) -+ conf.env["VERSION"] = BASEVERSION - - ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] - ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] diff --git a/xmms2-0.5DrLecter-no-O0.patch b/xmms2-0.5DrLecter-no-O0.patch deleted file mode 100644 index 227776e..0000000 --- a/xmms2-0.5DrLecter-no-O0.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -up xmms2-0.5DrLecter/wscript.BAD xmms2-0.5DrLecter/wscript ---- xmms2-0.5DrLecter/wscript.BAD 2008-12-10 15:04:53.000000000 -0500 -+++ xmms2-0.5DrLecter/wscript 2008-12-10 15:05:09.000000000 -0500 -@@ -261,8 +261,8 @@ def configure(conf): - conf.check_message("uncommitted changes", "", bool(changed)) - conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) - -- conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] -- conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] -+ ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] -+ ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] - conf.env['XMMS_PKGCONF_FILES'] = [] - conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")] - diff --git a/xmms2-0.5DrLecter-pulse-output-default.patch b/xmms2-0.5DrLecter-pulse-output-default.patch deleted file mode 100644 index 3b1aebd..0000000 --- a/xmms2-0.5DrLecter-pulse-output-default.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up xmms2-0.5DrLecter/src/plugins/pulse/wscript.BAD xmms2-0.5DrLecter/src/plugins/pulse/wscript ---- xmms2-0.5DrLecter/src/plugins/pulse/wscript.BAD 2008-12-05 11:49:32.000000000 -0500 -+++ xmms2-0.5DrLecter/src/plugins/pulse/wscript 2008-12-05 11:49:50.000000000 -0500 -@@ -5,4 +5,4 @@ def plugin_configure(conf): - - configure, build = plugin('pulse', configure=plugin_configure, - source=['pulse.c', 'backend.c'], -- extra_libs=['libpulse'], output_prio=25) -+ extra_libs=['libpulse'], output_prio=45) diff --git a/xmms2-0.5DrLecter-use-libdir.patch b/xmms2-0.5DrLecter-use-libdir.patch deleted file mode 100644 index fd16f99..0000000 --- a/xmms2-0.5DrLecter-use-libdir.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff -up xmms2-0.5DrLecter/src/include/xmms/wscript.BAD xmms2-0.5DrLecter/src/include/xmms/wscript ---- xmms2-0.5DrLecter/src/include/xmms/wscript.BAD 2008-12-04 16:28:12.000000000 -0500 -+++ xmms2-0.5DrLecter/src/include/xmms/wscript 2008-12-04 16:28:44.000000000 -0500 -@@ -12,8 +12,7 @@ def configure(conf): - - defs = {} - -- defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'], -- 'lib', 'xmms2') -+ defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'], 'xmms2') - defs['BINDIR'] = conf.env['BINDIR'] - defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'], - 'share', 'xmms2') -diff -up xmms2-0.5DrLecter/wafadmin/Tools/python.py.BAD xmms2-0.5DrLecter/wafadmin/Tools/python.py ---- xmms2-0.5DrLecter/wafadmin/Tools/python.py.BAD 2008-12-04 16:36:29.000000000 -0500 -+++ xmms2-0.5DrLecter/wafadmin/Tools/python.py 2008-12-04 16:36:41.000000000 -0500 -@@ -211,7 +211,7 @@ def check_python_version(conf, minver=No - else: - python_LIBDEST = None - if python_LIBDEST is None: -- python_LIBDEST = os.path.join(conf.env['PREFIX'], "lib", "python" + pyver) -+ python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver) - dir = os.path.join(python_LIBDEST, "site-packages") - - conf.add_define('PYTHONDIR', dir) diff --git a/xmms2-0.6DrMattDestruction-moresaneversioning.patch b/xmms2-0.6DrMattDestruction-moresaneversioning.patch deleted file mode 100644 index a7da758..0000000 --- a/xmms2-0.6DrMattDestruction-moresaneversioning.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up xmms2-0.6DrMattDestruction/wscript.versionsanity xmms2-0.6DrMattDestruction/wscript ---- xmms2-0.6DrMattDestruction/wscript.versionsanity 2009-08-11 14:00:44.013247917 -0400 -+++ xmms2-0.6DrMattDestruction/wscript 2009-08-11 14:01:48.446370522 -0400 -@@ -23,7 +23,7 @@ import Build - import Configure - from logging import fatal, warning - --BASEVERSION="0.6 DrMattDestruction" -+BASEVERSION="0.6" - APPNAME='xmms2' - - srcdir='.' -@@ -269,14 +269,15 @@ def configure(conf): - - nam,changed = gittools.get_info() - conf.check_message("git commit id", "", True, nam) -- if Options.options.customversion: -- conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) -- else: -- dirty="" -- if changed: -- dirty="-dirty" -- conf.check_message("uncommitted changes", "", bool(changed)) -- conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) -+ ## if Options.options.customversion: -+ ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) -+ ## else: -+ ## dirty="" -+ ## if changed: -+ ## dirty="-dirty" -+ ## conf.check_message("uncommitted changes", "", bool(changed)) -+ ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) -+ conf.env["VERSION"] = BASEVERSION - - ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] - ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] diff --git a/xmms2-0.6DrMattDestruction-pulse-output-default.patch b/xmms2-0.6DrMattDestruction-pulse-output-default.patch deleted file mode 100644 index 8667a1c..0000000 --- a/xmms2-0.6DrMattDestruction-pulse-output-default.patch +++ /dev/null @@ -1,9 +0,0 @@ -diff -up xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript.BAD xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript ---- xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript.BAD 2009-08-11 13:58:27.922241908 -0400 -+++ xmms2-0.6DrMattDestruction/src/plugins/pulse/wscript 2009-08-11 13:58:32.982243043 -0400 -@@ -7,4 +7,4 @@ def plugin_configure(conf): - - configure, build = plugin("pulse", configure=plugin_configure, - source=["pulse.c", "backend.c"], -- output_prio=25, libs=["pulse"]) -+ output_prio=45, libs=["pulse"]) diff --git a/xmms2-0.6DrMattDestruction-use-libdir.patch b/xmms2-0.6DrMattDestruction-use-libdir.patch deleted file mode 100644 index 60bf7e8..0000000 --- a/xmms2-0.6DrMattDestruction-use-libdir.patch +++ /dev/null @@ -1,68 +0,0 @@ -diff -up xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD xmms2-0.6DrMattDestruction/src/include/xmms/wscript ---- xmms2-0.6DrMattDestruction/src/include/xmms/wscript.BAD 2009-08-11 15:17:57.020242949 -0400 -+++ xmms2-0.6DrMattDestruction/src/include/xmms/wscript 2009-08-11 15:18:04.940381687 -0400 -@@ -15,8 +15,7 @@ def configure(conf): - - defs = {} - -- defs['PKGLIBDIR'] = os.path.join(conf.env['PREFIX'], -- 'lib', 'xmms2') -+ defs['PKGLIBDIR'] = os.path.join(conf.env['LIBDIR'], 'xmms2') - defs['BINDIR'] = conf.env['BINDIR'] - defs['SHAREDDIR'] = os.path.join(conf.env['PREFIX'], - 'share', 'xmms2') -diff -up xmms2-0.6DrMattDestruction/waftools/tool.py.BAD xmms2-0.6DrMattDestruction/waftools/tool.py ---- xmms2-0.6DrMattDestruction/waftools/tool.py.BAD 2009-08-11 15:28:30.157242468 -0400 -+++ xmms2-0.6DrMattDestruction/waftools/tool.py 2009-08-11 15:28:45.251245035 -0400 -@@ -6,5 +6,5 @@ def add_install_flag(bld, obj): - - if env['explicit_install_name']: - libname = obj.env["shlib_PATTERN"] % obj.target -- insname = os.path.join(obj.env["PREFIX"], 'lib', libname) -+ insname = os.path.join(obj.env["LIBDIR"], libname) - obj.env.append_unique("LINKFLAGS", '-install_name ' + insname) -diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py ---- xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py.BAD 2009-08-11 15:33:10.276383650 -0400 -+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/libtool.py 2009-08-11 15:33:33.646236480 -0400 -@@ -45,7 +45,7 @@ def fakelibtool_build(task): - fu("current=0\n") - fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n") - fu("dlopen=''\ndlpreopen=''\n") -- fu("libdir='%s/lib'\n" % env['PREFIX']) -+ fu("libdir='%s'\n" % env['LIBDIR']) - dest.close() - return 0 - -@@ -75,7 +75,7 @@ def apply_link_libtool(self): - self.latask = latask - - if Options.commands['install'] or Options.commands['uninstall']: -- Build.bld.install_files('PREFIX', 'lib', linktask.outputs[0].abspath(self.env), self.env) -+ Build.bld.install_files('LIBDIR', linktask.outputs[0].abspath(self.env), self.env) - - @taskgen - @feature("libtool") -diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py ---- xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py.BAD 2009-08-11 15:35:28.864257981 -0400 -+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/ccroot.py 2009-08-11 15:35:36.165270276 -0400 -@@ -127,7 +127,7 @@ def vars_target_cprogram(self): - @feature('cstaticlib', 'dstaticlib', 'cshlib', 'dshlib') - @before('apply_core') - def vars_target_cstaticlib(self): -- self.default_install_path = '${PREFIX}/lib' -+ self.default_install_path = '${LIBDIR}' - if sys.platform in ['win32', 'cygwin']: - # on win32, libraries need the execute bit, else we - # get 'permission denied' when using them (issue 283) -diff -up xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py ---- xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py.BAD 2009-08-11 15:35:49.334273249 -0400 -+++ xmms2-0.6DrMattDestruction/wafadmin/Tools/gnu_dirs.py 2009-08-11 15:36:35.058242288 -0400 -@@ -39,7 +39,7 @@ libexecdir, program executables, $(EXEC_ - sysconfdir, read-only single-machine data, $(PREFIX)/etc - sharedstatedir, modifiable architecture-independent data, $(PREFIX)/com - localstatedir, modifiable single-machine data, $(PREFIX)/var --libdir, object code libraries, $(EXEC_PREFIX)/lib -+libdir, object code libraries, $(LIBDIR) - includedir, C header files, $(PREFIX)/include - oldincludedir, C header files for non-gcc, /usr/include - datarootdir, read-only arch.-independent data root, $(PREFIX)/share diff --git a/xmms2-0.7DrNo-moresaneversioning.patch b/xmms2-0.7DrNo-moresaneversioning.patch deleted file mode 100644 index ce67f0e..0000000 --- a/xmms2-0.7DrNo-moresaneversioning.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -up xmms2-0.7DrNo/wscript.versionsanity xmms2-0.7DrNo/wscript ---- xmms2-0.7DrNo/wscript.versionsanity 2010-04-13 17:50:25.000000000 -0400 -+++ xmms2-0.7DrNo/wscript 2010-04-13 17:51:34.272674113 -0400 -@@ -23,7 +23,7 @@ import Build - import Configure - from logging import fatal, warning - --BASEVERSION="0.7 DrNo" -+BASEVERSION="0.7" - APPNAME='xmms2' - - srcdir='.' -@@ -266,14 +266,15 @@ def configure(conf): - - nam,changed = gittools.get_info() - conf.check_message("git commit id", "", True, nam) -- if Options.options.customversion: -- conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) -- else: -- dirty="" -- if changed: -- dirty="-dirty" -- conf.check_message("uncommitted changes", "", bool(changed)) -- conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) -+ ## if Options.options.customversion: -+ ## conf.env["VERSION"] = BASEVERSION + " (%s + %s)" % (nam, Options.options.customversion) -+ ## else: -+ ## dirty="" -+ ## if changed: -+ ## dirty="-dirty" -+ ## conf.check_message("uncommitted changes", "", bool(changed)) -+ ## conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) -+ conf.env["VERSION"] = BASEVERSION - - ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] - for warning in ('all', diff --git a/xmms2-0.7DrNo-no-O0.patch b/xmms2-0.7DrNo-no-O0.patch deleted file mode 100644 index 5be0ecd..0000000 --- a/xmms2-0.7DrNo-no-O0.patch +++ /dev/null @@ -1,21 +0,0 @@ -diff -up xmms2-0.7DrNo/wscript.noO0 xmms2-0.7DrNo/wscript ---- xmms2-0.7DrNo/wscript.noO0 2010-02-19 12:43:54.000000000 -0500 -+++ xmms2-0.7DrNo/wscript 2010-04-13 17:49:15.351789069 -0400 -@@ -275,7 +275,7 @@ def configure(conf): - conf.check_message("uncommitted changes", "", bool(changed)) - conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) - -- conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] -+ ## conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] - for warning in ('all', - 'no-format-extra-args', - 'no-format-zero-length', -@@ -295,7 +295,7 @@ def configure(conf): - # autogenerate uselib definitions to disable warnings - conf.env["CCFLAGS_NO%s" % warning.replace("-","").upper()] = ["-Wno-%s" % warning] - -- conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] -+ ## conf.env["CXXFLAGS"] = Utils.to_list(conf.env["CXXFLAGS"]) + ['-g', '-O0'] - conf.env['XMMS_PKGCONF_FILES'] = [] - conf.env['XMMS_OUTPUT_PLUGINS'] = [(-1, "NONE")] - diff --git a/xmms2-0.7DrNo-use-libdir.patch b/xmms2-0.7DrNo-use-libdir.patch deleted file mode 100644 index c96003f..0000000 --- a/xmms2-0.7DrNo-use-libdir.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff -up xmms2-0.7DrNo/src/include/xmms/wscript.plugins-use-libdir xmms2-0.7DrNo/src/include/xmms/wscript -diff -up xmms2-0.7DrNo/wafadmin/Tools/ccroot.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/ccroot.py -diff -up xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py -diff -up xmms2-0.7DrNo/wafadmin/Tools/libtool.py.plugins-use-libdir xmms2-0.7DrNo/wafadmin/Tools/libtool.py ---- xmms2-0.7DrNo/wafadmin/Tools/libtool.py.plugins-use-libdir 2010-02-19 12:43:54.000000000 -0500 -+++ xmms2-0.7DrNo/wafadmin/Tools/libtool.py 2010-04-13 17:45:12.718672360 -0400 -@@ -45,7 +45,7 @@ def fakelibtool_build(task): - fu("current=0\n") - fu("age=0\nrevision=0\ninstalled=yes\nshouldnotlink=no\n") - fu("dlopen=''\ndlpreopen=''\n") -- fu("libdir='%s/lib'\n" % env['PREFIX']) -+ fu("libdir='%s'\n" % env['LIBDIR']) - dest.close() - return 0 - -@@ -71,7 +71,7 @@ def apply_link_libtool(self): - self.latask = self.create_task('fakelibtool', linktask.outputs, linktask.outputs[0].change_ext('.la')) - - if self.bld.is_install: -- self.bld.install_files('${PREFIX}/lib', linktask.outputs[0], self.env) -+ self.bld.install_files('${LIBDIR}', linktask.outputs[0], self.env) - - @feature("libtool") - @before('apply_core') -diff -up xmms2-0.7DrNo/waftools/tool.py.plugins-use-libdir xmms2-0.7DrNo/waftools/tool.py ---- xmms2-0.7DrNo/waftools/tool.py.plugins-use-libdir 2010-02-19 12:43:54.000000000 -0500 -+++ xmms2-0.7DrNo/waftools/tool.py 2010-04-13 17:40:40.215663210 -0400 -@@ -6,5 +6,5 @@ def add_install_flag(bld, obj): - - if env['explicit_install_name']: - libname = obj.env["shlib_PATTERN"] % obj.target -- insname = os.path.join(obj.env["PREFIX"], 'lib', libname) -+ insname = os.path.join(obj.env["LIBDIR"], libname) - obj.env.append_unique("LINKFLAGS", '-install_name ' + insname) ---- xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py.plugins-use-libdir 2010-04-13 18:02:40.858675994 -0400 -+++ xmms2-0.7DrNo/wafadmin/Tools/gnu_dirs.py 2010-04-13 18:03:01.201810629 -0400 -@@ -44,7 +44,7 @@ libexecdir, program executables, ${EXEC_ - sysconfdir, read-only single-machine data, ${PREFIX}/etc - sharedstatedir, modifiable architecture-independent data, ${PREFIX}/com - localstatedir, modifiable single-machine data, ${PREFIX}/var --libdir, object code libraries, ${EXEC_PREFIX}/lib -+libdir, object code libraries, ${LIBDIR} - includedir, C header files, ${PREFIX}/include - oldincludedir, C header files for non-gcc, /usr/include - datarootdir, read-only arch.-independent data root, ${PREFIX}/share ---- xmms2-0.7DrNo/wafadmin/Tools/python.py.plugins-use-libdir 2010-04-13 18:15:49.402785506 -0400 -+++ xmms2-0.7DrNo/wafadmin/Tools/python.py 2010-04-13 18:22:03.243800732 -0400 -@@ -342,13 +342,10 @@ - python_LIBDEST = None - (pydir,) = \ - _get_python_variables(python, -- ["get_python_lib(standard_lib=0, prefix=%r)" % conf.env['PREFIX']], -+ ["get_python_lib(1)"], - ['from distutils.sysconfig import get_config_var, get_python_lib']) - if python_LIBDEST is None: -- if conf.env['LIBDIR']: -- python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver) -- else: -- python_LIBDEST = os.path.join(conf.env['PREFIX'], "lib", "python" + pyver) -+ python_LIBDEST = os.path.join(conf.env['LIBDIR'], "python" + pyver) - - if hasattr(conf, 'define'): # conf.define is added by the C tool, so may not exist - conf.define('PYTHONDIR', pydir) diff --git a/xmms2-devel.git-054a12d54325820c8d31e482193007af0ed15be3.patch b/xmms2-devel.git-054a12d54325820c8d31e482193007af0ed15be3.patch deleted file mode 100644 index cf0b191..0000000 --- a/xmms2-devel.git-054a12d54325820c8d31e482193007af0ed15be3.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Jonne Lehtinen -Date: Thu, 14 Aug 2008 11:00:30 +0000 (+0300) -Subject: BUG(2022): link speex plugin with libogg. -X-Git-Url: http://git.xmms.se/?p=xmms2-devel.git;a=commitdiff_plain;h=054a12d54325820c8d31e482193007af0ed15be3 - -BUG(2022): link speex plugin with libogg. ---- - -diff --git a/src/plugins/speex/wscript b/src/plugins/speex/wscript -index 1fa8821..5336a7d 100644 ---- a/src/plugins/speex/wscript -+++ b/src/plugins/speex/wscript -@@ -1,6 +1,8 @@ - from waftools.plugin import plugin - - def plugin_configure(conf): -- return conf.check_pkg('speex', destvar='speex') -+ return (conf.check_pkg('speex', destvar='speex') and -+ conf.check_pkg('ogg', destvar='ogg')) - --configure, build = plugin('speex', needs_lib=True, configure=plugin_configure) -+configure, build = plugin('speex', needs_lib=True, configure=plugin_configure, -+ extra_libs=['ogg']) diff --git a/xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch b/xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch deleted file mode 100644 index c054976..0000000 --- a/xmms2-devel.git-37578b59f5d7376213da74b3bf6b7c7f430d0bc9.patch +++ /dev/null @@ -1,23 +0,0 @@ -From: Daniel Chokola -Date: Tue, 22 Jul 2008 14:21:36 +0000 (-0400) -Subject: BUG(1998): use XMMS_PATH_MAX in helpers.h -X-Git-Url: http://git.xmms.se/?p=xmms2-devel.git;a=commitdiff_plain;h=37578b59f5d7376213da74b3bf6b7c7f430d0bc9 - -BUG(1998): use XMMS_PATH_MAX in helpers.h ---- - -diff --git a/src/include/xmmsclient/xmmsclient++/helpers.h b/src/include/xmmsclient/xmmsclient++/helpers.h -index b131575..f237231 100644 ---- a/src/include/xmmsclient/xmmsclient++/helpers.h -+++ b/src/include/xmmsclient/xmmsclient++/helpers.h -@@ -44,8 +44,8 @@ namespace Xmms - */ - inline std::string getUserConfDir() { - -- char buf[PATH_MAX] = { '\0' }; -- if( !xmmsc_userconfdir_get( buf, PATH_MAX ) ) { -+ char buf[XMMS_PATH_MAX] = { '\0' }; -+ if( !xmmsc_userconfdir_get( buf, XMMS_PATH_MAX ) ) { - throw Xmms::result_error( "Error occured when trying to get " - "user config directory." ); - } diff --git a/xmms2.spec b/xmms2.spec index b45f4ee..1f7d927 100644 --- a/xmms2.spec +++ b/xmms2.spec @@ -1,12 +1,11 @@ %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")} -%{!?ruby_sitearch: %global ruby_sitearch %(ruby -rrbconfig -e 'puts Config::CONFIG["sitearchdir"] ')} %global codename DrO_o Name: xmms2 Summary: A modular audio framework and plugin architecture Version: 0.8 -Release: 2%{?dist} +Release: 3%{?dist} License: LGPLv2+ and GPLv2+ and BSD Group: Applications/Multimedia # We can't use the upstream source tarball as-is, because it includes an mp4 decoder. @@ -87,7 +86,7 @@ Perl bindings for XMMS2. Summary: Ruby support for XMMS2 Group: Applications/Multimedia Requires: %{name} = %{version}-%{release} -Requires: ruby(abi) = 1.8 +Requires: ruby(abi) = 1.9.1 %description ruby Ruby bindings for XMMS2. @@ -124,7 +123,8 @@ export CFLAGS="%{optflags}" export CPPFLAGS="%{optflags}" export LIBDIR="%{_libdir}" export PYTHONDIR="%{python_sitearch}" -./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 +./waf configure --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ + --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig -j1 ./waf build -v %{?_smp_mflags} # make the docs doxygen @@ -133,11 +133,12 @@ doxygen rm -rf %{buildroot} export LIBDIR="%{_libdir}" export python_LIBDEST="%{python_sitearch}" -./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_sitearch} --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig +./waf install --destdir=%{buildroot} --prefix=%{_prefix} --libdir=%{_libdir} --with-ruby-libdir=%{ruby_vendorlibdir} --with-ruby-archdir=%{ruby_vendorarchdir} \ + --with-perl-archdir=%{perl_archlib} --with-pkgconfigdir=%{_libdir}/pkgconfig # exec flags for debuginfo chmod +x %{buildroot}%{_libdir}/%{name}/* %{buildroot}%{_libdir}/libxmmsclient*.so* %{buildroot}%{python_sitearch}/xmmsclient/xmmsapi.so \ - %{buildroot}%{perl_archlib}/auto/Audio/XMMSClient/XMMSClient.so %{buildroot}%{ruby_sitearch}/xmmsclient_*.so + %{buildroot}%{perl_archlib}/auto/Audio/XMMSClient/XMMSClient.so %{buildroot}%{ruby_vendorarchdir}/xmmsclient_*.so # Convert to utf-8 for i in %{buildroot}%{_mandir}/man1/*.gz; do @@ -188,13 +189,20 @@ rm -rf %{buildroot} %files ruby %defattr(-,root,root,-) -%{ruby_sitearch}/xmmsclient* +%{ruby_vendorlibdir}/xmmsclient.rb +%{ruby_vendorlibdir}/xmmsclient/ +%{ruby_vendorarchdir}/xmmsclient_ecore.so +%{ruby_vendorarchdir}/xmmsclient_ext.so +%{ruby_vendorarchdir}/xmmsclient_glib.so %files -n nyxmms2 %defattr(-,root,root,-) %{_bindir}/nyxmms2 %changelog +* Wed Feb 08 2012 Bohuslav Kabrda - 0.8-3 +- Rebuilt for Ruby 1.9.3. + * Sat Jan 14 2012 Fedora Release Engineering - 0.8-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild