Hello community, here is the log from the commit of package xmp for openSUSE:Factory checked in at 2013-06-05 13:25:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-05-16 16:25:42.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.xmp.new/xmp.changes 2013-06-05 13:25:04.000000000 +0200 @@ -1,0 +2,6 @@ +Mon May 20 10:29:21 UTC 2013 - [email protected] + +- Update to new upstream release 4.0.6 +* Build fixes only; do not require C++ compiler on Linux + +------------------------------------------------------------------- Old: ---- xmp-4.0.5.tar.xz New: ---- xmp-4.0.6.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xmp.spec ++++++ --- /var/tmp/diff_new_pack.a1rmBM/_old 2013-06-05 13:25:05.000000000 +0200 +++ /var/tmp/diff_new_pack.a1rmBM/_new 2013-06-05 13:25:05.000000000 +0200 @@ -20,12 +20,12 @@ Summary: Extended Module Player for MOD/S3M/XM/IT/etc. License: GPL-2.0+ Group: Productivity/Multimedia/Sound/Players -Version: 4.0.5 +Version: 4.0.6 Release: 0 Url: http://xmp.sf.net/ #Freecode-URL: http://freecode.com/projects/xmp -#DL-URL: http://downloads.sf.net/xmp/xmp-4.0.4.tar.gz +#DL-URL: http://downloads.sf.net/xmp/xmp-4.0.6.tar.gz #Git-Clone: git://git.code.sf.net/p/xmp/xmp-cli Source: %name-%version.tar.xz BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,14 +47,14 @@ %build %configure -make %{?_smp_mflags} CXXLD='${CCLD}' +make %{?_smp_mflags} %install make install DESTDIR="%buildroot" %files %defattr(-,root,root) -%dir %_sysconfdir/xmp +%dir %_sysconfdir/xmp/ %config %_sysconfdir/xmp/*.conf %_bindir/xmp %_mandir/man1/xmp.1* ++++++ xmp-4.0.5.tar.xz -> xmp-4.0.6.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/CREDITS new/xmp-4.0.6/CREDITS --- old/xmp-4.0.5/CREDITS 2013-04-06 15:38:02.000000000 +0200 +++ new/xmp-4.0.6/CREDITS 2013-05-19 16:40:57.000000000 +0200 @@ -28,6 +28,7 @@ - Jan Engelhardt <[email protected]> * fixes for background process handling * misc source code fixes + * automake-based build system - Mike Gorchak <[email protected]> * QNX6 portability fix diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/Changelog new/xmp-4.0.6/Changelog --- old/xmp-4.0.5/Changelog 2013-05-12 13:56:29.000000000 +0200 +++ new/xmp-4.0.6/Changelog 2013-05-19 16:49:00.000000000 +0200 @@ -1,6 +1,12 @@ Stable versions --------------- +4.0.6 (20130519): + - Portability fixes to build with Visual C++ + + Changes by Jan Engelhardt: + - Do not error out when g++ is absent on non-BEOS + 4.0.5 (20130512): - Fix loop when skipping to first file and it's not playable diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/Makefile.in new/xmp-4.0.6/Makefile.in --- old/xmp-4.0.5/Makefile.in 2013-05-07 01:11:01.000000000 +0200 +++ new/xmp-4.0.6/Makefile.in 2013-05-19 15:50:32.000000000 +0200 @@ -58,7 +58,7 @@ $(top_srcdir)/build-aux/install-sh \ $(top_srcdir)/build-aux/missing $(top_srcdir)/configure \ COPYING INSTALL build-aux/config.guess build-aux/config.sub \ - build-aux/install-sh build-aux/missing + build-aux/depcomp build-aux/install-sh build-aux/missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ @@ -147,6 +147,7 @@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXLD = @CXXLD@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/configure new/xmp-4.0.6/configure --- old/xmp-4.0.5/configure 2013-05-07 01:11:13.000000000 +0200 +++ new/xmp-4.0.6/configure 2013-05-19 15:50:32.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.5. +# Generated by GNU Autoconf 2.69 for xmp 4.0.6. # # # 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.5' -PACKAGE_STRING='xmp 4.0.5' +PACKAGE_VERSION='4.0.6' +PACKAGE_STRING='xmp 4.0.6' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -703,6 +703,7 @@ INSTALL_DATA INSTALL_SCRIPT INSTALL_PROGRAM +CXXLD ac_ct_CXX CXXFLAGS CXX @@ -1329,7 +1330,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.5 to adapt to many kinds of systems. +\`configure' configures xmp 4.0.6 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1399,7 +1400,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xmp 4.0.5:";; + short | recursive ) echo "Configuration of xmp 4.0.6:";; esac cat <<\_ACEOF @@ -1507,7 +1508,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xmp configure 4.0.5 +xmp configure 4.0.6 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1910,7 +1911,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.5, which was +It was created by xmp $as_me 4.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3423,6 +3424,19 @@ ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu +case "$host_os" in +beos*|haiku*) + if ! which "$CXX" >/dev/null 2>/dev/null; then : + as_fn_error $? "C++ compiler required on this platform ($host_os)" "$LINENO" 5 +fi + ;; +*) + # Do not error out on linking when g++ is absent. + CXXLD='${CCLD}' + + ;; +esac + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: @@ -3933,7 +3947,7 @@ # Define the identity of the package. PACKAGE='xmp' - VERSION='4.0.5' + VERSION='4.0.6' cat >>confdefs.h <<_ACEOF @@ -4944,7 +4958,7 @@ done -for ac_header in getopt.h signal.h termios.h +for ac_header in getopt.h signal.h termios.h sys/time.h sys/audioio.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -4965,19 +4979,6 @@ ;; esac -for ac_header in sys/audioio.h -do : - ac_fn_c_check_header_mongrel "$LINENO" "sys/audioio.h" "ac_cv_header_sys_audioio_h" "$ac_includes_default" -if test "x$ac_cv_header_sys_audioio_h" = xyes; then : - cat >>confdefs.h <<_ACEOF -#define HAVE_SYS_AUDIOIO_H 1 -_ACEOF - -fi - -done - - if false; then SOUND_AHI_TRUE= SOUND_AHI_FALSE='#' @@ -6539,7 +6540,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.5, which was +This file was extended by xmp $as_me 4.0.6, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -6596,7 +6597,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.5 +xmp config.status 4.0.6 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.5/configure.ac new/xmp-4.0.6/configure.ac --- old/xmp-4.0.5/configure.ac 2013-05-07 01:09:58.000000000 +0200 +++ new/xmp-4.0.6/configure.ac 2013-05-19 15:47:28.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([xmp], [4.0.5]) +AC_INIT([xmp], [4.0.6]) AC_CONFIG_AUX_DIR([build-aux]) 0>confdefs.h @@ -13,6 +13,18 @@ AC_CANONICAL_HOST AC_PROG_CC AC_PROG_CXX +case "$host_os" in +beos*|haiku*) + AS_IF([! which "$CXX" >/dev/null 2>/dev/null], + [AC_MSG_ERROR([C++ compiler required on this platform ($host_os)])]) + ;; +*) + # Do not error out on linking when g++ is absent. + CXXLD='${CCLD}' + AC_SUBST([CXXLD]) + ;; +esac + AC_PROG_INSTALL AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax]) @@ -55,7 +67,7 @@ AS_VAR_POPDEF([ac_var])dnl ]) -AC_CHECK_HEADERS([getopt.h signal.h termios.h]) +AC_CHECK_HEADERS([getopt.h signal.h termios.h sys/time.h sys/audioio.h]) case "$host_cpu" in powerpc64) @@ -64,8 +76,6 @@ ;; esac -AC_CHECK_HEADERS(sys/audioio.h) - AM_CONDITIONAL([SOUND_AHI], [false]) AM_CONDITIONAL([SOUND_AIX], [false]) AM_CONDITIONAL([SOUND_ALSA05], [false]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/Makefile.am new/xmp-4.0.6/src/Makefile.am --- old/xmp-4.0.5/src/Makefile.am 2013-05-07 01:09:58.000000000 +0200 +++ new/xmp-4.0.6/src/Makefile.am 2013-05-19 16:44:07.000000000 +0200 @@ -89,7 +89,7 @@ pkgsysconfdir = ${sysconfdir}/${PACKAGE_NAME} pkgsysconf_DATA = modules.conf xmp.conf -EXTRA_DIST = ${man_MANS} ${pkgsysconf_DATA} +EXTRA_DIST = ${man_MANS} ${pkgsysconf_DATA} win32/usleep.c win32/unistd.h # unused sources EXTRA_DIST += sound_dart.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/Makefile.in new/xmp-4.0.6/src/Makefile.in --- old/xmp-4.0.5/src/Makefile.in 2013-05-07 01:11:01.000000000 +0200 +++ new/xmp-4.0.6/src/Makefile.in 2013-05-19 16:44:09.000000000 +0200 @@ -143,7 +143,6 @@ LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -CXXLD = $(CXX) CXXLINK = $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) \ -o $@ SOURCES = $(xmp_SOURCES) @@ -201,6 +200,7 @@ CXX = @CXX@ CXXDEPMODE = @CXXDEPMODE@ CXXFLAGS = @CXXFLAGS@ +CXXLD = @CXXLD@ CYGPATH_W = @CYGPATH_W@ DEFS = @DEFS@ DEPDIR = @DEPDIR@ @@ -318,7 +318,8 @@ pkgsysconf_DATA = modules.conf xmp.conf # unused sources -EXTRA_DIST = ${man_MANS} ${pkgsysconf_DATA} sound_dart.c +EXTRA_DIST = ${man_MANS} ${pkgsysconf_DATA} win32/usleep.c \ + win32/unistd.h sound_dart.c all: all-am .SUFFIXES: diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/common.h new/xmp-4.0.6/src/common.h --- old/xmp-4.0.5/src/common.h 2013-04-12 01:49:34.000000000 +0200 +++ new/xmp-4.0.6/src/common.h 2013-05-19 16:37:36.000000000 +0200 @@ -1,5 +1,19 @@ -#ifndef __COMMON_H -#define __COMMON_H +#ifndef XMP_COMMON_H +#define XMP_COMMON_H + +#ifdef _MSC_VER +#define PATH_MAX 1024 +#define inline __inline +#define open _open +#define close _close +#define write _write +#define lseek _lseek +#define strdup _strdup +#define strcasecmp _stricmp +#define snprintf _snprintf +#define kbhit _kbhit +#define getch _getch +#endif #define MAX_DRV_PARM 20 @@ -35,7 +49,7 @@ }; struct control { - long time; /* Replay time in ms */ + double time; /* Replay time in ms */ int skip; /* Skip to next module */ int loop; /* Module is looped */ int pause; /* Replay paused */ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/getopt.c new/xmp-4.0.6/src/getopt.c --- old/xmp-4.0.5/src/getopt.c 2013-04-28 13:51:16.000000000 +0200 +++ new/xmp-4.0.6/src/getopt.c 2013-05-19 16:07:09.000000000 +0200 @@ -218,7 +218,8 @@ /* Avoid depending on library functions or files whose names are inconsistent. */ -char *getenv (); +/* char *getenv (); */ +#include <stdlib.h> static char * my_index (str, chr) @@ -370,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.5/src/main.c new/xmp-4.0.6/src/main.c --- old/xmp-4.0.5/src/main.c 2013-05-12 13:53:22.000000000 +0200 +++ new/xmp-4.0.6/src/main.c 2013-05-19 16:18:08.000000000 +0200 @@ -12,7 +12,9 @@ #ifdef HAVE_SIGNAL_H #include <signal.h> #endif +#ifdef HAVE_SYS_TIME_H #include <sys/time.h> +#endif #include <sys/types.h> #include <unistd.h> #include <stdarg.h> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/sound.h new/xmp-4.0.6/src/sound.h --- old/xmp-4.0.5/src/sound.h 2013-04-06 15:38:02.000000000 +0200 +++ new/xmp-4.0.6/src/sound.h 2013-05-19 16:50:19.000000000 +0200 @@ -1,5 +1,5 @@ -#ifndef __SOUND_H -#define __SOUND_H +#ifndef XMP_SOUND_H +#define XMP_SOUND_H #include <xmp.h> #include <stdio.h> @@ -25,7 +25,7 @@ #define parm_end() } } #define parm_error() do { \ fprintf(stderr, "xmp: incorrect parameters in -D %s\n", s); \ - exit(-4); } while (0) + exit(4); } while (0) #define chkparm0(x,y) { \ if (!strcmp(s, x)) { \ if (token != NULL) parm_error(); else { y; } } } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/sound_file.c new/xmp-4.0.6/src/sound_file.c --- old/xmp-4.0.5/src/sound_file.c 2013-04-06 15:38:02.000000000 +0200 +++ new/xmp-4.0.6/src/sound_file.c 2013-05-19 16:18:27.000000000 +0200 @@ -91,8 +91,8 @@ } static const char *const help[] = { - "big-endian", "Force big-endian 16-bit samples", - "little-endian", "Force little-endian 16-bit samples", + "endian=big", "Force big-endian 16-bit samples", + "endian=little", "Force little-endian 16-bit samples", NULL }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/win32/unistd.h new/xmp-4.0.6/src/win32/unistd.h --- old/xmp-4.0.5/src/win32/unistd.h 1970-01-01 01:00:00.000000000 +0100 +++ new/xmp-4.0.6/src/win32/unistd.h 2013-05-19 16:14:01.000000000 +0200 @@ -0,0 +1,8 @@ +#ifndef _XMP_WIN32_UNISTD_H +#define _XMP_WIN32_UNISTD_H + +#include <io.h> + +void usleep(long usec); + +#endif diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/xmp-4.0.5/src/win32/usleep.c new/xmp-4.0.6/src/win32/usleep.c --- old/xmp-4.0.5/src/win32/usleep.c 1970-01-01 01:00:00.000000000 +0100 +++ new/xmp-4.0.6/src/win32/usleep.c 2013-05-19 16:08:12.000000000 +0200 @@ -0,0 +1,48 @@ +#ifndef HAVE_USLEEP + +#ifdef HAVE_SELECT + +#ifdef HAVE_SYS_SELECT_H +# include <sys/select.h> +#else +# include <sys/time.h> +# include <sys/types.h> +# include <unistd.h> +#endif + +void usleep(long usec) +{ + struct timeval tv; + + tv.tv_sec = usec / 1000000; + tv.tv_usec = usec % 1000000; + select(0, NULL, NULL, NULL, &tv); +} + +#elif defined WIN32 + +/* usleep implementation from FreeSCI */ + +#include <windows.h> + +void usleep (long usec) +{ + LARGE_INTEGER lFrequency; + LARGE_INTEGER lEndTime; + LARGE_INTEGER lCurTime; + + QueryPerformanceFrequency (&lFrequency); + if (lFrequency.QuadPart) { + QueryPerformanceCounter (&lEndTime); + lEndTime.QuadPart += (LONGLONG) usec * + lFrequency.QuadPart / 1000000; + do { + QueryPerformanceCounter (&lCurTime); + Sleep(0); + } while (lCurTime.QuadPart < lEndTime.QuadPart); + } +} + +#endif + +#endif /* !HAVE_USLEEP */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
