Hello community, here is the log from the commit of package xmms2 for openSUSE:Factory checked in at 2017-03-02 19:25:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmms2 (Old) and /work/SRC/openSUSE:Factory/.xmms2.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmms2" Thu Mar 2 19:25:58 2017 rev:29 rq:458849 version:0.8 Changes: -------- --- /work/SRC/openSUSE:Factory/xmms2/xmms2.changes 2015-05-22 09:51:49.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2.changes 2017-03-02 19:25:59.731916199 +0100 @@ -1,0 +2,72 @@ +Mon Feb 13 18:10:32 UTC 2017 - jeng...@inai.de + +- Trim and update descriptions + +------------------------------------------------------------------- +Thu Feb 9 12:49:44 UTC 2017 - mvet...@suse.com + +- On Oct 18 marguerite also added this patch: + * xmms2-0.8-add-lib-vorbis-and-ogg.patch + +------------------------------------------------------------------- +Thu Feb 2 15:43:17 UTC 2017 - adam.ma...@suse.de + +- use individual libboost-*-devel packages instead of boost-devel + +------------------------------------------------------------------- +Sun Oct 18 17:07:49 UTC 2015 - i...@marguerite.su + +- update version 0.8 + * Waf build system updated to version 1.6, which brings Python + 3.x compatibility to the build system. + * Python bindings migrated to cython which brings Python 3.x + compatibility to Python clients. + * Server side IPC code is now generated, thus a whole lot more + consistent and less prone to errors. + * Better support for high quality (S32) audio, together with + xform updates to output such formats. + * Don't let ALSA resample as it consumes insane amount of + resources which makes it look like XMMS2 is resource heavy. + * More format support to CoreAudio and PulseAudio letting them + resample in their own processes instead, thus utilizing + multi-core systems better. + * A ton of man page updates so that we can hopefully answer most + questions with RTFM. +- new subpackage plugin-sndfile +- sync w/ packman +- drop patch: xmms2-0.7-no-O0.patch +- drop patch: xmms2-0.7-rpath.patch +- drop patch: xmms2-0.7-spelling-error.patch +- drop patch: xmms2-0.7-no-return.patch, upstreamed +- drop patch: xmms2-0.7-cli-output-verbosity.patch, + no more src/clients/cli +- drop patch: xmms2-0.7-escape-minus-signes.patch, upstreamed +- drop patch: xmms2-0.7-silent-launcher.patch, upstreamed +- drop patch: xmms2-0.7-fix-typo-in-xmms2-mdns-avahi-manpage.patch + upstreamed +- drop patch: xmms2-0.7-vorbis-picture-support.patch, upstreamed +- drop patch: xmms2-0.7-linker-flags.patch +- drop patch: xmms2-0.7-fix-cast-error.patch +- drop patch: xmms2-0.7-remove-path_max.patch, upstreamed +- drop patch: xmms2-0.7-fixwarnings.patch +- drop patch: xmms2-0.7-ld_fix.patch, no longer needed +- drop patch: xmms2-disable-parallel-build.patch, no more wafadmin + directory +- drop patch: xmms2-0.7-cunit.patch, upstreamed +- drop patch: xmms-ruby2.2.patch, no waftools/ruby.py +- unpack waf to fix for ruby 2.2 +- add patch: xmms2-0.8-no-O0.patch + * don't build w/ -O0 flag +- add patch: xmms2-0.8-rpath.patch + * don't build w/ rpath for sidplay +- add patch: xmms2-0.8-spelling-error.patch + * fix a spell mistake in mp4meta.c +- add patch: xmms2-0.8-linker-flags.patch + * don't link against unused libraries +- add patch: xmms2-0.8-fix-cast-error.patch + * Fix cast to pointer from integer of different size error +- add patch: xmms2-0.8-fixwarnings.patch +- add patch: xmms2-samba4-include-path.patch + * adjust samba-4.0 include path for libsmbclient.h + +------------------------------------------------------------------- Old: ---- README.SuSE xmms-ruby2.2.patch xmms2-0.7-cli-output-verbosity.patch xmms2-0.7-cunit.patch xmms2-0.7-escape-minus-signes.patch xmms2-0.7-fix-cast-error.patch xmms2-0.7-fix-typo-in-xmms2-mdns-avahi-manpage.patch xmms2-0.7-fixwarnings.patch xmms2-0.7-ld_fix.patch xmms2-0.7-linker-flags.patch xmms2-0.7-no-O0.patch xmms2-0.7-no-return.patch xmms2-0.7-remove-path_max.patch xmms2-0.7-rpath.patch xmms2-0.7-silent-launcher.patch xmms2-0.7-spelling-error.patch xmms2-0.7-vorbis-picture-support.patch xmms2-0.7DrNo.tar.bz2 xmms2-disable-parallel-build.patch New: ---- README.SUSE xmms2-0.8-add-lib-vorbis-and-ogg.patch xmms2-0.8-fix-cast-error.patch xmms2-0.8-fixwarnings.patch xmms2-0.8-linker-flags.patch xmms2-0.8-no-O0.patch xmms2-0.8-rpath.patch xmms2-0.8-spelling-error.patch xmms2-0.8DrO_o.tar.bz2 xmms2-samba4-include-path.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmms2.spec ++++++ ++++ 1348 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/xmms2/xmms2.spec ++++ and /work/SRC/openSUSE:Factory/.xmms2.new/xmms2.spec ++++++ README.SUSE ++++++ this package has been built inside the OpenSUSE BuildService, so it may lack of some features where it need headers that may not respect some patent law ++++++ xmms2-0.8-add-lib-vorbis-and-ogg.patch ++++++ Index: xmms2-0.8DrO_o/src/clients/vistest/wscript =================================================================== --- xmms2-0.8DrO_o.orig/src/clients/vistest/wscript +++ xmms2-0.8DrO_o/src/clients/vistest/wscript @@ -23,12 +23,12 @@ def build(bld): t.install_path = None - if bld.env.LIB_vorbisenc: + if bld.env.LIB_vorbisenc and bld.env.LIB_vorbis and bld.env.LIB_ogg: t = bld(features = 'c cprogram', target = 'xmms2-ripper', source = 'ripper.c', includes = '. ../../.. ../../include', - uselib = 'vorbisenc', + uselib = 'vorbisenc vorbis ogg', use = 'xmmsclient' ) if not bld.env.INSTALL_VIS_REFERENCE_CLIENTS: @@ -56,6 +56,10 @@ def configure(conf): conf.check_cfg(package='vorbisenc', uselib_store='vorbisenc', args='--cflags --libs', mandatory=False) + conf.check_cfg(package='vorbis', uselib_store='vorbis', args='--cflags --libs', mandatory=False) + + conf.check_cfg(package='ogg', uselib_store='ogg', 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', ++++++ xmms2-0.7-fix-cast-error.patch -> xmms2-0.8-fix-cast-error.patch ++++++ --- /work/SRC/openSUSE:Factory/xmms2/xmms2-0.7-fix-cast-error.patch 2011-09-23 12:51:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2-0.8-fix-cast-error.patch 2017-03-02 19:25:59.443956931 +0100 @@ -1,10 +1,8 @@ -Description: Fix cast to pointer from integer of different size error -Author: Benjamin Drung <bdr...@ubuntu.com> -Bug-Debian: http://bugs.debian.org/571539 - ---- xmms2-0.7DrNo.orig/src/clients/medialib-updater/main.c -+++ xmms2-0.7DrNo/src/clients/medialib-updater/main.c -@@ -457,6 +457,8 @@ updater_remove_directory_by_id (xmmsv_t +Index: xmms2-0.8DrO_o/src/clients/medialib-updater/main.c +=================================================================== +--- xmms2-0.8DrO_o.orig/src/clients/medialib-updater/main.c ++++ xmms2-0.8DrO_o/src/clients/medialib-updater/main.c +@@ -489,6 +489,8 @@ updater_remove_directory_by_id (xmmsv_t return TRUE; } ++++++ xmms2-0.7-fixwarnings.patch -> xmms2-0.8-fixwarnings.patch ++++++ --- /work/SRC/openSUSE:Factory/xmms2/xmms2-0.7-fixwarnings.patch 2011-09-23 12:51:56.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2-0.8-fixwarnings.patch 2017-03-02 19:25:59.475952405 +0100 @@ -1,26 +1,11 @@ -Index: xmms2-0.7DrNo/src/xmms/compat/signal_unix.c +Index: xmms2-0.8DrO_o/src/xmms/visualization/unixshm.c =================================================================== ---- xmms2-0.7DrNo.orig/src/xmms/compat/signal_unix.c -+++ xmms2-0.7DrNo/src/xmms/compat/signal_unix.c -@@ -64,8 +64,7 @@ sigwaiter (gpointer data) - break; - } - } -- --return; -+ return NULL; - } - - void -Index: xmms2-0.7DrNo/src/xmms/visualization/unixshm.c -=================================================================== ---- xmms2-0.7DrNo.orig/src/xmms/visualization/unixshm.c -+++ xmms2-0.7DrNo/src/xmms/visualization/unixshm.c -@@ -13,7 +13,7 @@ - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +--- xmms2-0.8DrO_o.orig/src/xmms/visualization/unixshm.c ++++ xmms2-0.8DrO_o/src/xmms/visualization/unixshm.c +@@ -14,6 +14,7 @@ * Lesser General Public License for more details. */ -- + +#define _GNU_SOURCE #include <sys/shm.h> #include <sys/sem.h> ++++++ xmms2-0.7-linker-flags.patch -> xmms2-0.8-linker-flags.patch ++++++ --- /work/SRC/openSUSE:Factory/xmms2/xmms2-0.7-linker-flags.patch 2011-09-23 12:51:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2-0.8-linker-flags.patch 2017-03-02 19:25:59.495949576 +0100 @@ -1,15 +1,14 @@ -Description: Do not link against unused libraries -Author: Benjamin Drung <bdr...@ubuntu.com> - ---- xmms2-0.7DrNo.orig/wscript -+++ xmms2-0.7DrNo/wscript -@@ -420,6 +420,9 @@ def configure(conf): - enabled_optionals, disabled_optionals, - output_plugins) +Index: xmms2-0.8DrO_o/wscript +=================================================================== +--- xmms2-0.8DrO_o.orig/wscript ++++ xmms2-0.8DrO_o/wscript +@@ -448,6 +448,9 @@ int main() { return 0; } + enabled_optionals, disabled_optionals, + output_plugins) + # Do not link against unused libraries (make dpkg-shlibdeps happy). + conf.env.LINKFLAGS += ['-Wl,--as-needed'] + return True - + #### ++++++ xmms2-0.7-no-O0.patch -> xmms2-0.8-no-O0.patch ++++++ --- /work/SRC/openSUSE:Factory/xmms2/xmms2-0.7-no-O0.patch 2011-09-23 12:51:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2-0.8-no-O0.patch 2017-03-02 19:25:59.523945617 +0100 @@ -1,59 +1,26 @@ -diff -uNr old-xmms2-0.7DrNo//src/plugins/pulse/wscript xmms2-0.7DrNo/src/plugins/pulse/wscript ---- old-xmms2-0.7DrNo//src/plugins/pulse/wscript 2010-02-19 18:43:54.000000000 +0100 -+++ xmms2-0.7DrNo/src/plugins/pulse/wscript 2010-03-01 23:32:24.033756750 +0100 -@@ -7,4 +7,4 @@ +Index: xmms2-0.8DrO_o/src/plugins/pulse/wscript +=================================================================== +--- xmms2-0.8DrO_o.orig/src/plugins/pulse/wscript ++++ xmms2-0.8DrO_o/src/plugins/pulse/wscript +@@ -3,5 +3,5 @@ from waftools.plugin import plugin + def plugin_configure(conf): + conf.check_cfg(package="libpulse", args="--cflags --libs", uselib_store="pulse") - configure, build = plugin("pulse", configure=plugin_configure, - source=["pulse.c", "backend.c"], -- output_prio=25, libs=["pulse"]) -+ output_prio=45, libs=["pulse"]) -diff -uNr old-xmms2-0.7DrNo//wscript xmms2-0.7DrNo/wscript ---- old-xmms2-0.7DrNo//wscript 2010-02-19 18:43:54.000000000 +0100 -+++ xmms2-0.7DrNo/wscript 2010-03-01 23:33:49.967756992 +0100 -@@ -275,27 +275,27 @@ - conf.check_message("uncommitted changes", "", bool(changed)) - conf.env["VERSION"] = BASEVERSION + " (git commit: %s%s)" % (nam, dirty) +-configure, build = plugin("pulse", configure=plugin_configure, output_prio=25, ++configure, build = plugin("pulse", configure=plugin_configure, output_prio=45, + libs=["pulse"]) +Index: xmms2-0.8DrO_o/wscript +=================================================================== +--- xmms2-0.8DrO_o.orig/wscript ++++ xmms2-0.8DrO_o/wscript +@@ -295,8 +295,8 @@ def configure(conf): + conf.msg("uncommited changed", changed and "yes" or "no") + conf.env.VERSION = "%s (git commit: %s%s)" % (BASEVERSION, nam, dirty) -- conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] -- for warning in ('all', -- 'no-format-extra-args', -- 'no-format-zero-length', -- 'format-nonliteral', -- 'format-security', -- 'format=2', -- "missing-prototypes", -- "strict-prototypes", -- "empty-body", -- "ignored-qualifiers", -- "type-limits", -- "write-strings", -- ): -- warnflag = "-W%s" % warning -- if conf.check_cc(cflags=warnflag): -- conf.env["CCFLAGS"].append(warnflag) -+# conf.env["CCFLAGS"] = Utils.to_list(conf.env["CCFLAGS"]) + ['-g', '-O0'] -+# for warning in ('all', -+# 'no-format-extra-args', -+# 'no-format-zero-length', -+# 'format-nonliteral', -+# 'format-security', -+# 'format=2', -+# "missing-prototypes", -+# "strict-prototypes", -+# "empty-body", -+# "ignored-qualifiers", -+# "type-limits", -+# "write-strings", -+# ): -+# warnflag = "-W%s" % warning -+# if conf.check_cc(cflags=warnflag): -+# conf.env["CCFLAGS"].append(warnflag) - # autogenerate uselib definitions to disable warnings -- conf.env["CCFLAGS_NO%s" % warning.replace("-","").upper()] = ["-Wno-%s" % warning] -+# 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")] +- conf.env.append_unique('CFLAGS', ['-g', '-O0']) +- conf.env.append_unique('CXXFLAGS', ['-g', '-O0']) ++ #conf.env.append_unique('CFLAGS', ['-g', '-O0']) ++ #conf.env.append_unique('CXXFLAGS', ['-g', '-O0']) + if conf.options.with_profiling: + conf.env.with_profiling = True ++++++ xmms2-0.7-rpath.patch -> xmms2-0.8-rpath.patch ++++++ --- /work/SRC/openSUSE:Factory/xmms2/xmms2-0.7-rpath.patch 2011-09-23 12:51:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2-0.8-rpath.patch 2017-03-02 19:25:59.539943353 +0100 @@ -1,22 +1,18 @@ -Description: Fix binary-or-shlib-defines-rpath Lintian warning. -Author: Benjamin Drung <bdr...@ubuntu.com> -Forwarded: No - -Index: debian.git/src/plugins/sid/wscript +Index: xmms2-0.8DrO_o/src/plugins/sid/wscript =================================================================== ---- debian.git.orig/src/plugins/sid/wscript 2010-02-19 18:43:54.000000000 +0100 -+++ debian.git/src/plugins/sid/wscript 2010-02-20 12:50:08.312900440 +0100 -@@ -14,13 +14,6 @@ - # extract what's inside builders pkg-config variable - builders = conf.check_cfg(package="libsidplay2", args="--variable=builders").strip() +--- xmms2-0.8DrO_o.orig/src/plugins/sid/wscript ++++ xmms2-0.8DrO_o/src/plugins/sid/wscript +@@ -19,13 +19,6 @@ def plugin_configure(conf): + builders = conf.check_cfg(package="libsidplay2", + args="--variable=builders").strip() - # It looks funny that this is LIBPATH_sidplay but it is correct - # since we explcitly set the path to builders for resid it will - # find resid in the list even though we still need to -rpath it. -- if not realpath(builders) in [realpath(i) for i in conf.env['LIBPATH_sidplay']]: -- conf.env['LINKFLAGS_resid'] = ["-Wl,-rpath=%s" % builders] -- conf.env["LIBPATH_resid"] = [builders] +- if not realpath(builders) in [realpath(i) for i in conf.env.LIBPATH_sidplay]: +- conf.env.LINKFLAGS_resid = ["-Wl,-rpath=%s" % builders] +- conf.env.LIBPATH_resid = [builders] - - if not conf.check_cxx(lib="resid-builder", header_name="sidplay/builders/resid.h", uselib_store="resid", uselib="resid"): - return False + conf.check_cxx(lib="resid-builder", header_name="sidplay/builders/resid.h", + uselib_store="resid", uselib="resid") ++++++ xmms2-0.7-spelling-error.patch -> xmms2-0.8-spelling-error.patch ++++++ --- /work/SRC/openSUSE:Factory/xmms2/xmms2-0.7-spelling-error.patch 2011-09-23 12:51:57.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmms2.new/xmms2-0.8-spelling-error.patch 2017-03-02 19:25:59.551941656 +0100 @@ -1,12 +1,8 @@ -Description: Correct spelling error found by Lintian. -Author: Benjamin Drung <bdr...@ubuntu.com> -Forwarded: No - -Index: debian.git/src/plugins/mp4/mp4ff/mp4meta.c +Index: xmms2-0.8DrO_o/src/plugins/mp4/mp4ff/mp4meta.c =================================================================== ---- debian.git.orig/src/plugins/mp4/mp4ff/mp4meta.c 2010-02-19 18:43:54.000000000 +0100 -+++ debian.git/src/plugins/mp4/mp4ff/mp4meta.c 2010-02-20 12:53:23.254149836 +0100 -@@ -123,7 +123,7 @@ +--- xmms2-0.8DrO_o.orig/src/plugins/mp4/mp4ff/mp4meta.c ++++ xmms2-0.8DrO_o/src/plugins/mp4/mp4ff/mp4meta.c +@@ -128,7 +128,7 @@ static const char* ID3v1GenreList[] = { "Ethnic", "Gothic", "Darkwave", "Techno-Industrial", "Electronic", "Pop-Folk", "Eurodance", "Dream", "Southern Rock", "Comedy", "Cult", "Gangsta", "Top 40", "Christian Rap", "Pop/Funk", "Jungle", "Native American", "Cabaret", @@ -15,29 +11,3 @@ "Tribal", "Acid Punk", "Acid Jazz", "Polka", "Retro", "Musical", "Rock & Roll", "Hard Rock", "Folk", "Folk/Rock", "National Folk", "Swing", "Fast-Fusion", "Bebob", "Latin", "Revival", "Celtic", "Bluegrass", "Avantgarde", -Index: debian.git/src/xmms/main.c -=================================================================== ---- debian.git.orig/src/xmms/main.c 2010-02-19 18:43:54.000000000 +0100 -+++ debian.git/src/xmms/main.c 2010-02-20 12:53:23.254149836 +0100 -@@ -254,10 +254,10 @@ - - plugin = (xmms_output_plugin_t *)xmms_plugin_find (XMMS_PLUGIN_TYPE_OUTPUT, outname); - if (!plugin) { -- xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something usefull"); -+ xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something useful"); - } else { - if (!xmms_output_plugin_switch (mainobj->output, plugin)) { -- xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something usefull"); -+ xmms_log_error ("Baaaaad output plugin, try to change the output.plugin config variable to something useful"); - } - } - } -@@ -564,7 +564,7 @@ - o_plugin = (xmms_output_plugin_t *)xmms_plugin_find (XMMS_PLUGIN_TYPE_OUTPUT, outname); - if (!o_plugin) { - xmms_log_error ("Baaaaad output plugin, try to change the" -- "output.plugin config variable to something usefull"); -+ "output.plugin config variable to something useful"); - } - - mainobj->output = xmms_output_new (o_plugin, playlist); ++++++ xmms2-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.5fK3pz/_old 2017-03-02 19:26:00.939745352 +0100 +++ /var/tmp/diff_new_pack.5fK3pz/_new 2017-03-02 19:26:00.939745352 +0100 @@ -7,6 +7,6 @@ Description: XMMS Generation 2 Requires: -Version: @VERSION@ -+Version: 0.7 ++Version: 0.8 Libs: -L${libdir} @LIB@ Cflags: -I${includedir} ++++++ xmms2-samba4-include-path.patch ++++++ diff -Naur xmms2-0.8DrO_o.orig/src/plugins/samba/samba.c xmms2-0.8DrO_o/src/plugins/samba/samba.c --- xmms2-0.8DrO_o.orig/src/plugins/samba/samba.c 2011-10-20 21:26:08.000000000 +0200 +++ xmms2-0.8DrO_o/src/plugins/samba/samba.c 2013-11-05 14:10:11.540534423 +0100 @@ -27,7 +27,7 @@ #include <string.h> #include <unistd.h> -#include "libsmbclient.h" +#include "samba-4.0/libsmbclient.h" /* * libsmbclient is not threadsafe. diff -Naur xmms2-0.8DrO_o.orig/src/plugins/samba/wscript xmms2-0.8DrO_o/src/plugins/samba/wscript --- xmms2-0.8DrO_o.orig/src/plugins/samba/wscript 2011-10-20 21:26:08.000000000 +0200 +++ xmms2-0.8DrO_o/src/plugins/samba/wscript 2013-11-05 14:09:58.668511884 +0100 @@ -1,7 +1,7 @@ from waftools.plugin import plugin def plugin_configure(conf): - conf.check_cc(header_name="libsmbclient.h") + conf.check_cc(header_name="samba-4.0/libsmbclient.h") conf.check(lib="smbclient", uselib_store="smbclient") configure, build = plugin("samba", configure=plugin_configure,