Hello community, here is the log from the commit of package xmp for openSUSE:Factory checked in at 2013-03-12 17:19:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmp (Old) and /work/SRC/openSUSE:Factory/.xmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmp", Maintainer is "[email protected]" Changes: -------- New Changes file: --- /dev/null 2013-02-26 18:15:11.936010755 +0100 +++ /work/SRC/openSUSE:Factory/.xmp.new/xmp.changes 2013-03-12 17:19:35.000000000 +0100 @@ -0,0 +1,10 @@ +------------------------------------------------------------------- +Mon Mar 11 09:36:25 UTC 2013 - [email protected] + +- license update: GPL-2.0+ + No reason for GPL-2.0 only license + +------------------------------------------------------------------- +Sat Feb 16 04:10:25 UTC 2013 - [email protected] + +- Initial package (version 4.0.1) for build.opensuse.org New: ---- 0001-xmp-give-ALSA-output-higher-priority-than-OSS.patch 0002-xmp-give-Pulseaudio-higher-priority-than-ALSA.patch xmp-4.0.1.tar.xz xmp-use-decimal.diff xmp.changes xmp.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmp.spec ++++++ # # spec file for package xmp # # Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # Name: xmp Summary: Extended Module Player for MOD/S3M/XM/IT/etc. License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players Version: 4.0.1 Release: 0 Url: http://xmp.sf.net/ #DL-URL: http://downloads.sf.net/%name/%name-%version.tar.gz Source: %name-%version.tar.xz Patch1: 0001-xmp-give-ALSA-output-higher-priority-than-OSS.patch Patch2: 0002-xmp-give-Pulseaudio-higher-priority-than-ALSA.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: alsa-devel BuildRequires: pkgconfig BuildRequires: xz BuildRequires: pkgconfig(libxmp) >= 4 %description The Extended Module Player is a command-line mod player for Unix-like systems that plays over 90 mainstream and obscure module formats from Amiga, Atari, Acorn, Apple IIgs, C64, and PC, including Protracker (MOD), Scream Tracker 3 (S3M), Fast Tracker II (XM), and Impulse Tracker (IT) files. %prep %setup -q %patch -P 1 -P 2 -p3 %build %configure make %{?_smp_mflags} %install make install DESTDIR="%buildroot" %files %defattr(-,root,root) %dir %_sysconfdir/xmp %config %_sysconfdir/xmp/*.conf %_bindir/xmp %_mandir/man1/xmp.1* %changelog ++++++ 0001-xmp-give-ALSA-output-higher-priority-than-OSS.patch ++++++ >From 3cd98b9c8ae78103da87bc4b0e31ae6929a87b30 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Tue, 26 Feb 2013 10:23:46 +0100 Subject: [PATCH 1/2] xmp: give ALSA output higher priority than OSS OSS does not offer software volume control, which means people always get the maximum volume with it on sufficiently dumb hardware. Prefer the ALSA output, which has appropriate defaults configured. --- players/xmp/src/sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/players/xmp/src/sound.c b/players/xmp/src/sound.c index 92f2e79..bb50fba 100644 --- a/players/xmp/src/sound.c +++ b/players/xmp/src/sound.c @@ -72,15 +72,15 @@ void init_sound_drivers() #ifdef SOUND_WIN32 register_sound_driver(&sound_win32); #endif -#ifdef SOUND_OSS - register_sound_driver(&sound_oss); -#endif #ifdef SOUND_ALSA register_sound_driver(&sound_alsa); #endif #ifdef SOUND_ALSA05 register_sound_driver(&sound_alsa05); #endif +#ifdef SOUND_OSS + register_sound_driver(&sound_oss); +#endif #ifdef SOUND_QNX register_sound_driver(&sound_qnx); #endif -- 1.7.10.4 ++++++ 0002-xmp-give-Pulseaudio-higher-priority-than-ALSA.patch ++++++ >From 6ca17937424d10a25068b6918e7b6546ab98d6c2 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt <[email protected]> Date: Tue, 26 Feb 2013 10:30:24 +0100 Subject: [PATCH 2/2] xmp: give Pulseaudio higher priority than ALSA On systems that do happen to be configured to use Pulseaudio, do prefer PA over plain ALSA. --- players/xmp/src/sound.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/players/xmp/src/sound.c b/players/xmp/src/sound.c index bb50fba..1036972 100644 --- a/players/xmp/src/sound.c +++ b/players/xmp/src/sound.c @@ -72,6 +72,9 @@ void init_sound_drivers() #ifdef SOUND_WIN32 register_sound_driver(&sound_win32); #endif +#ifdef SOUND_PULSEAUDIO + register_sound_driver(&sound_pulseaudio); +#endif #ifdef SOUND_ALSA register_sound_driver(&sound_alsa); #endif @@ -84,9 +87,6 @@ void init_sound_drivers() #ifdef SOUND_QNX register_sound_driver(&sound_qnx); #endif -#ifdef SOUND_PULSEAUDIO - register_sound_driver(&sound_pulseaudio); -#endif register_sound_driver(&sound_wav); register_sound_driver(&sound_file); register_sound_driver(&sound_null); -- 1.7.10.4 ++++++ xmp-use-decimal.diff ++++++ From: Jan Engelhardt <[email protected]> Date: 2013-02-16 05:26:26.299330654 +0100 Use base 10 for output, this is much more common among module players. --- src/info.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) Index: xmp-4.0.1/src/info.c =================================================================== --- xmp-4.0.1.orig/src/info.c +++ xmp-4.0.1/src/info.c @@ -106,8 +106,8 @@ void info_frame(struct xmp_module_info * time = fi->time / 100; if (reprint || fi->pos != ord || fi->bpm != bpm || fi->speed != spd) { - report("\rSpeed[%02X] BPM[%02X] Pos[%02X/%02X] " - "Pat[%02X/%02X] Row[ / ] Chn[ / ] 0:00:00.0", + report("\rSpeed[%2u] BPM[%3u] Pos[%3u/%3u] " + "Pat[%3u/%3u] Row[ / ] Chn[ / ] 0:00:00.0", fi->speed, fi->bpm, fi->pos, mi->mod->len - 1, fi->pattern, mi->mod->pat - 1); @@ -117,7 +117,7 @@ void info_frame(struct xmp_module_info * } report("\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b\b" - "%02X/%02X] Chn[%02X/%02X] %c ", + "%3u/%3u] Chn[%2u/%2u] %c ", fi->row, fi->num_rows - 1, fi->virt_used, max_channels, ctl->loop ? 'L' : ' '); -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
