Hello community, here is the log from the commit of package xmp for openSUSE:Factory checked in at 2014-10-06 22:04:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xmp (Old) and /work/SRC/openSUSE:Factory/.xmp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xmp" Changes: -------- --- /work/SRC/openSUSE:Factory/xmp/xmp.changes 2014-08-11 10:08:28.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmp.new/xmp.changes 2014-10-06 22:04:52.000000000 +0200 @@ -1,0 +2,6 @@ +Sun Oct 5 21:18:15 UTC 2014 - [email protected] + +- Update to new upstream release 4.0.9 +* Add the "-p" option to set the default pan amplitude + +------------------------------------------------------------------- Old: ---- xmp-4.0.8.tar.gz New: ---- xmp-4.0.9.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmp.spec ++++++ --- /var/tmp/diff_new_pack.BvTURK/_old 2014-10-06 22:04:53.000000000 +0200 +++ /var/tmp/diff_new_pack.BvTURK/_new 2014-10-06 22:04:53.000000000 +0200 @@ -20,7 +20,7 @@ Summary: Extended Module Player for MOD/S3M/XM/IT/etc. License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players -Version: 4.0.8 +Version: 4.0.9 Release: 0 Url: http://xmp.sf.net/ @@ -30,7 +30,7 @@ BuildRequires: pkgconfig BuildRequires: pkgconfig(alsa) >= 1 BuildRequires: pkgconfig(libpulse-simple) -BuildRequires: pkgconfig(libxmp) >= 4.1.0 +BuildRequires: pkgconfig(libxmp) >= 4.3 %description The Extended Module Player is a command-line mod player for Unix-like ++++++ xmp-4.0.8.tar.gz -> xmp-4.0.9.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/Changelog new/xmp-4.0.9/Changelog --- old/xmp-4.0.8/Changelog 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/Changelog 2014-09-26 02:32:38.000000000 +0200 @@ -1,6 +1,13 @@ Stable versions --------------- +4.0.9 (20140926): + - Add option '-p' to set the default pan amplitude + - Add parameter 'default_pan' to configuration file + - Fix library detection when cross-compiling + - Fix Visual Studio 2013 build (by Stephen Leary) + - Default pan amplitude set to 50% + 4.0.8 (20140714): - Add command 'c' to display module comment - Add command-line option -C to display module comment diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/Makefile.am new/xmp-4.0.9/Makefile.am --- old/xmp-4.0.8/Makefile.am 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/Makefile.am 2014-09-26 02:43:12.000000000 +0200 @@ -2,4 +2,4 @@ SUBDIRS = src -EXTRA_DIST = CREDITS Changelog drozerix_-_mecanum_overdrive.xm +EXTRA_DIST = CREDITS Changelog girl_from_mars.xm diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/Makefile.in new/xmp-4.0.9/Makefile.in --- old/xmp-4.0.8/Makefile.in 2014-07-15 01:28:15.000000000 +0200 +++ new/xmp-4.0.9/Makefile.in 2014-09-26 02:43:19.000000000 +0200 @@ -307,7 +307,7 @@ top_builddir = @top_builddir@ top_srcdir = @top_srcdir@ SUBDIRS = src -EXTRA_DIST = CREDITS Changelog drozerix_-_mecanum_overdrive.xm +EXTRA_DIST = CREDITS Changelog girl_from_mars.xm all: all-recursive .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/configure new/xmp-4.0.9/configure --- old/xmp-4.0.8/configure 2014-07-15 01:28:15.000000000 +0200 +++ new/xmp-4.0.9/configure 2014-08-09 14:16:34.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for xmp 4.0.8. +# Generated by GNU Autoconf 2.69 for xmp 4.0.9. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='xmp' PACKAGE_TARNAME='xmp' -PACKAGE_VERSION='4.0.8' -PACKAGE_STRING='xmp 4.0.8' +PACKAGE_VERSION='4.0.9' +PACKAGE_STRING='xmp 4.0.9' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -1335,7 +1335,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xmp 4.0.8 to adapt to many kinds of systems. +\`configure' configures xmp 4.0.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1405,7 +1405,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xmp 4.0.8:";; + short | recursive ) echo "Configuration of xmp 4.0.9:";; esac cat <<\_ACEOF @@ -1515,7 +1515,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xmp configure 4.0.8 +xmp configure 4.0.9 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1802,52 +1802,6 @@ } # ac_fn_c_check_header_compile -# ac_fn_c_try_link LINENO -# ----------------------- -# Try to link conftest.$ac_ext, and return whether this succeeded. -ac_fn_c_try_link () -{ - as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack - rm -f conftest.$ac_objext conftest$ac_exeext - if { { ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_link") 2>conftest.err - ac_status=$? - if test -s conftest.err; then - grep -v '^ *+' conftest.err >conftest.er1 - cat conftest.er1 >&5 - mv -f conftest.er1 conftest.err - fi - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && { - test -z "$ac_c_werror_flag" || - test ! -s conftest.err - } && test -s conftest$ac_exeext && { - test "$cross_compiling" = yes || - test -x conftest$ac_exeext - }; then : - ac_retval=0 -else - $as_echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - - ac_retval=1 -fi - # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information - # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would - # interfere with the next link command; also delete a directory that is - # left behind by Apple's compiler. We do this before executing the actions. - rm -rf conftest.dSYM conftest_ipa8_conftest.oo - eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno - as_fn_set_status $ac_retval - -} # ac_fn_c_try_link - # ac_fn_c_check_func LINENO FUNC VAR # ---------------------------------- # Tests whether FUNC exists, setting the cache variable VAR accordingly @@ -1918,7 +1872,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xmp $as_me 4.0.8, which was +It was created by xmp $as_me 4.0.9, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3993,7 +3947,7 @@ # Define the identity of the package. PACKAGE='xmp' - VERSION='4.0.8' + VERSION='4.0.9' cat >>confdefs.h <<_ACEOF @@ -4515,12 +4469,12 @@ pkg_cv_libxmp_CFLAGS="$libxmp_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxmp >= 4.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libxmp >= 4.1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxmp >= 4.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxmp >= 4.3") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libxmp_CFLAGS=`$PKG_CONFIG --cflags "libxmp >= 4.1" 2>/dev/null` + pkg_cv_libxmp_CFLAGS=`$PKG_CONFIG --cflags "libxmp >= 4.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4532,12 +4486,12 @@ pkg_cv_libxmp_LIBS="$libxmp_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxmp >= 4.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libxmp >= 4.1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libxmp >= 4.3\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libxmp >= 4.3") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libxmp_LIBS=`$PKG_CONFIG --libs "libxmp >= 4.1" 2>/dev/null` + pkg_cv_libxmp_LIBS=`$PKG_CONFIG --libs "libxmp >= 4.3" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4558,43 +4512,116 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libxmp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxmp >= 4.1" 2>&1` + libxmp_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libxmp >= 4.3" 2>&1` else - libxmp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxmp >= 4.1" 2>&1` + libxmp_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libxmp >= 4.3" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libxmp_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libxmp >= 4.1) were not met: - -$libxmp_PKG_ERRORS - -Consider adjusting the PKG_CONFIG_PATH environment variable if you -installed software in a non-standard prefix. - -Alternatively, you may set the environment variables libxmp_CFLAGS -and libxmp_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details." "$LINENO" 5 + echo "You need libxmp version 4.3 or later to build this package"; exit 1 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 -$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} -as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it -is in your PATH or set the PKG_CONFIG environment variable to the full -path to pkg-config. - -Alternatively, you may set the environment variables libxmp_CFLAGS -and libxmp_LIBS to avoid the need to call pkg-config. -See the pkg-config man page for more details. - -To get pkg-config, see <http://pkg-config.freedesktop.org/>. -See \`config.log' for more details" "$LINENO" 5; } + echo "You need libxmp version 4.3 or later to build this package"; exit 1 else libxmp_CFLAGS=$pkg_cv_libxmp_CFLAGS libxmp_LIBS=$pkg_cv_libxmp_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xmp_version in -lxmp" >&5 +$as_echo_n "checking for xmp_version in -lxmp... " >&6; } +if ${ac_cv_lib_xmp_xmp_version+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lxmp $LIBS" + + +# ac_fn_c_try_link LINENO +# ----------------------- +# Try to link conftest.$ac_ext, and return whether this succeeded. +ac_fn_c_try_link () +{ + as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack + rm -f conftest.$ac_objext conftest$ac_exeext + if { { ac_try="$ac_link" +case "(($ac_try" in + *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; + *) ac_try_echo=$ac_try;; +esac +eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" +$as_echo "$ac_try_echo"; } >&5 + (eval "$ac_link") 2>conftest.err + ac_status=$? + if test -s conftest.err; then + grep -v '^ *+' conftest.err >conftest.er1 + cat conftest.er1 >&5 + mv -f conftest.er1 conftest.err + fi + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; } && { + test -z "$ac_c_werror_flag" || + test ! -s conftest.err + } && test -s conftest$ac_exeext && { + test "$cross_compiling" = yes || + test -x conftest$ac_exeext + }; then : + ac_retval=0 +else + $as_echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + + ac_retval=1 +fi + # Delete the IPA/IPO (Inter Procedural Analysis/Optimization) information + # created by the PGI compiler (conftest_ipa8_conftest.oo), as it would + # interfere with the next link command; also delete a directory that is + # left behind by Apple's compiler. We do this before executing the actions. + rm -rf conftest.dSYM conftest_ipa8_conftest.oo + eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno + as_fn_set_status $ac_retval + +} # ac_fn_c_try_link +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char xmp_version (); +int +main () +{ +return xmp_version (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_xmp_xmp_version=yes +else + ac_cv_lib_xmp_xmp_version=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_xmp_xmp_version" >&5 +$as_echo "$ac_cv_lib_xmp_xmp_version" >&6; } +if test "x$ac_cv_lib_xmp_xmp_version" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_LIBXMP 1 +_ACEOF + + LIBS="-lxmp $LIBS" + +else + exit 1 +fi fi @@ -4615,7 +4642,6 @@ - ac_ext=c ac_cpp='$CPP $CPPFLAGS' ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -5358,7 +5384,46 @@ alsa_LIBS=$pkg_cv_alsa_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_alsa=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for snd_pcm_open in -lasound" >&5 +$as_echo_n "checking for snd_pcm_open in -lasound... " >&6; } +if ${ac_cv_lib_asound_snd_pcm_open+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lasound $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char snd_pcm_open (); +int +main () +{ +return snd_pcm_open (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_asound_snd_pcm_open=yes +else + ac_cv_lib_asound_snd_pcm_open=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_asound_snd_pcm_open" >&5 +$as_echo "$ac_cv_lib_asound_snd_pcm_open" >&6; } +if test "x$ac_cv_lib_asound_snd_pcm_open" = xyes; then : + enable_alsa=yes +fi + fi fi @@ -5546,7 +5611,46 @@ pulseaudio_LIBS=$pkg_cv_pulseaudio_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - enable_pulseaudio=yes + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pa_simple_new in -lpulse-simple" >&5 +$as_echo_n "checking for pa_simple_new in -lpulse-simple... " >&6; } +if ${ac_cv_lib_pulse_simple_pa_simple_new+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lpulse-simple $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char pa_simple_new (); +int +main () +{ +return pa_simple_new (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_pulse_simple_pa_simple_new=yes +else + ac_cv_lib_pulse_simple_pa_simple_new=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_pulse_simple_pa_simple_new" >&5 +$as_echo "$ac_cv_lib_pulse_simple_pa_simple_new" >&6; } +if test "x$ac_cv_lib_pulse_simple_pa_simple_new" = xyes; then : + enable_pulseaudio=yes +fi + fi fi @@ -6595,7 +6699,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xmp $as_me 4.0.8, which was +This file was extended by xmp $as_me 4.0.9, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6652,7 +6756,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -xmp config.status 4.0.8 +xmp config.status 4.0.9 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/configure.ac new/xmp-4.0.9/configure.ac --- old/xmp-4.0.8/configure.ac 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/configure.ac 2014-08-09 14:16:27.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([xmp], [4.0.8]) +AC_INIT([xmp], [4.0.9]) AC_CONFIG_AUX_DIR([build-aux]) 0>confdefs.h @@ -28,7 +28,9 @@ AC_PROG_INSTALL AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax]) -PKG_CHECK_MODULES([libxmp], [libxmp >= 4.1]) +PKG_CHECK_MODULES([libxmp], [libxmp >= 4.3], + AC_CHECK_LIB(xmp, xmp_version, [], [exit 1]), + [echo "You need libxmp version 4.3 or later to build this package"; exit 1]) dnl Don't use things like /usr/etc or /usr/var @@ -105,7 +107,9 @@ PKG_CHECK_MODULES([alsa], [alsa >= 1], [enable_alsa=yes]) ], [ AS_IF([test "$enable_alsa" != "no"], [ - PKG_CHECK_MODULES([alsa], [alsa >= 1], [enable_alsa=yes], [true]) + PKG_CHECK_MODULES([alsa], [alsa >= 1], + AC_CHECK_LIB(asound, snd_pcm_open, [enable_alsa=yes]), + [true]) ]) ]) AS_IF([test "$enable_alsa" = "yes"], [ @@ -118,7 +122,8 @@ ], [ AS_IF([test "$enable_pulseaudio" != "no"], [ PKG_CHECK_MODULES([pulseaudio], [libpulse-simple], - [enable_pulseaudio=yes], [true]) + AC_CHECK_LIB(pulse-simple, pa_simple_new, [enable_pulseaudio=yes]), + [true]) ]) ]) AS_IF([test "$enable_pulseaudio" = "yes"], [ Files old/xmp-4.0.8/drozerix_-_mecanum_overdrive.xm and new/xmp-4.0.9/drozerix_-_mecanum_overdrive.xm differ Files old/xmp-4.0.8/girl_from_mars.xm and new/xmp-4.0.9/girl_from_mars.xm differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/src/common.h new/xmp-4.0.9/src/common.h --- old/xmp-4.0.8/src/common.h 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/src/common.h 2014-08-09 14:16:27.000000000 +0200 @@ -24,6 +24,7 @@ int format; /* sample format */ int max_time; /* max. replay time */ int mix; /* channel separation */ + int defpan; /* default pan */ int interp; /* interpolation type */ int dsp; /* dsp effects */ int loop; /* loop module */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/src/getopt.c new/xmp-4.0.9/src/getopt.c --- old/xmp-4.0.8/src/getopt.c 2014-02-22 00:49:00.000000000 +0100 +++ new/xmp-4.0.9/src/getopt.c 2014-08-16 15:13:35.000000000 +0200 @@ -371,7 +371,7 @@ nextchar = NULL; - posixly_correct getenv ("POSIXLY_CORRECT"); + posixly_correct = getenv ("POSIXLY_CORRECT"); /* Determine how to handle the ordering of options and nonoptions. */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/src/main.c new/xmp-4.0.9/src/main.c --- old/xmp-4.0.8/src/main.c 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/src/main.c 2014-08-16 15:13:35.000000000 +0200 @@ -221,6 +221,7 @@ opt.verbose = 1; opt.rate = 44100; opt.mix = -1; + opt.defpan = 50; opt.driver_id = NULL; opt.interp = XMP_INTERP_SPLINE; opt.dsp = XMP_DSP_LOWPASS; @@ -333,6 +334,8 @@ argv[optind], optind - first + 1, argc - first); } + xmp_set_player(xc, XMP_PLAYER_DEFPAN, opt.defpan); + /* load module */ val = xmp_load_module(xc, argv[optind]); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/src/options.c new/xmp-4.0.9/src/options.c --- old/xmp-4.0.8/src/options.c 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/src/options.c 2014-08-16 15:13:35.000000000 +0200 @@ -38,7 +38,7 @@ OPT_LOOPALL, }; -static void usage(char *s) +static void usage(char *s, struct options *options) { struct list_head *head; struct sound_driver *sd; @@ -90,6 +90,7 @@ " -F --nofilter Disable IT lowpass filters\n" " -o --output-file name Mix the module to file ('-' for stdout)\n" " -P --pan pan Percentual pan separation\n" +" -p --default-pan Percentual default pan setting (default %d%%)\n" " -r --reverse Reverse left/right stereo channels\n" " -u --unsigned Set the mixer to use unsigned samples\n" "\nEnvironment options:\n" @@ -102,13 +103,15 @@ " --load-only Load module and exit\n" " -q --quiet Quiet mode (verbosity level = 0)\n" " -V --version Print version information\n" -" -v --verbose Verbose mode (incremental)\n"); +" -v --verbose Verbose mode (incremental)\n", + options->defpan); } static const struct option lopt[] = { { "amplify", 1, 0, 'a' }, { "bits", 1, 0, 'b' }, { "driver", 1, 0, 'd' }, + { "default-pan", 1, 0, 'p' }, { "fix-sample-loops", 0, 0, OPT_FIXLOOP }, { "frequency", 1, 0, 'f' }, { "help", 0, 0, 'h' }, @@ -151,7 +154,7 @@ int optidx = 0; int o; -#define OPTIONS "a:b:CcD:d:Ff:hI:i:LlM:mNo:P:qRrS:s:T:t:uVvZz:" +#define OPTIONS "a:b:CcD:d:Ff:hI:i:LlM:mNo:P:p:qRrS:s:T:t:uVvZz:" while ((o = getopt_long(argc, argv, OPTIONS, lopt, &optidx)) != -1) { switch (o) { case 'a': @@ -249,6 +252,13 @@ if (options->mix > 100) options->mix = 100; break; + case 'p': + options->defpan = strtoul(optarg, NULL, 0); + if (options->defpan < 0) + options->defpan = 0; + if (options->defpan > 100) + options->defpan = 100; + break; case OPT_PROBEONLY: options->probeonly = 1; break; @@ -313,7 +323,7 @@ options->sequence = strtoul(optarg, NULL, 0); break; case 'h': - usage(argv[0]); + usage(argv[0], options); default: exit(-1); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/src/read_config.c new/xmp-4.0.9/src/read_config.c --- old/xmp-4.0.8/src/read_config.c 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/src/read_config.c 2014-08-09 14:16:27.000000000 +0200 @@ -113,6 +113,7 @@ getval_yn("reverse", o->reverse, 1); getval_no("amplify", o->amplify); getval_no("mix", o->mix); + getval_no("default_pan", o->defpan); /*getval_no("chorus", o->chorus); getval_no("reverb", o->reverb);*/ getval_no("srate", o->rate); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/src/xmp.1 new/xmp-4.0.9/src/xmp.1 --- old/xmp-4.0.8/src/xmp.1 2014-07-15 01:14:57.000000000 +0200 +++ new/xmp-4.0.9/src/xmp.1 2014-09-26 02:32:04.000000000 +0200 @@ -1,4 +1,4 @@ -.TH "XMP" "1" "Version 4\&.0\&.8" "Jul 2014" "Extended Module Player" +.TH "XMP" "1" "Version 4\&.0\&.9" "Sep 2014" "Extended Module Player" .PP .SH "NAME" xmp - Extended Module Player @@ -27,7 +27,8 @@ [\fB\-\-nocmd\fP] [\fB\-o, \-\-output\-file\fP \fIfilename\fP] [\fB\-\-offset\-bug\-emulation\fP] -[\fB\-P, \-\-pan\fP \fIpan\fP] +[\fB\-P, \-\-pan\fP \fInum\fP] +[\fB\-p, \-\-default\-pan\fP \fInum\fP] [\fB\-\-probe\-only\fP] [\fB\-q, \-\-quiet\fP] [\fB\-R, \-\-random\fP] @@ -107,6 +108,9 @@ Emulate Protracker 2.x handling of effect 0x09 (set sample offset)\&. .IP "\fB\-P, \-\-pan\fP \fInum\fP" Set the percentual panning amplitude\&. +.IP "\fB\-P, \-\-default\-pan\fP \fInum\fP" +Set the percentual default pan setting for modules that don\'t set their +own pan values\&. Useful to reduce LRRL pan separation on headphones\&. .IP "\fB\-\-probe\-only\fP" Exit after probing the audio device\&. .IP "\fB\-R, \-\-random\fP" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.8/src/xmp.conf new/xmp-4.0.9/src/xmp.conf --- old/xmp-4.0.8/src/xmp.conf 2014-02-22 00:49:00.000000000 +0100 +++ new/xmp-4.0.9/src/xmp.conf 2014-08-16 15:13:35.000000000 +0200 @@ -133,3 +133,8 @@ # Percentual stereo mixing. Default is 70%. # #mix = 70 + +# default_pan = <val> +# Default pan setting for 4-channel Amiga modules. Default is 50% +# +#default_pan = 50 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
