- updated to 3.3.0

- updated nondfsg patch
- arts and esd disabled by default

Changed files:
    xmp-nondfsg.patch -> 1.3
    xmp.spec -> 1.24

diff --git a/xmp-nondfsg.patch b/xmp-nondfsg.patch
index b1caa411b80dd582d02f7da3f1e7a05543066f94..06dc180e716ef5dfe27d4f020d8ac268caee2165 100644 (file)
--- a/xmp-nondfsg.patch
+++ b/xmp-nondfsg.patch
@@ -71,7 +71,7 @@ index 607bf9f..c573ffa 100644
 -
 -/*** For xmp ***/
 -#define HAS_YM3812 1
--#define INLINE inline
+-#define INLINE static inline
 -/* $Id$ */
 -
  #include "fmopl.h"
@@ -83,7 +83,7 @@ index 607bf9f..c573ffa 100644
 +#ifdef _MSC_VER
 +#  define INLINE __inline
 +#elif defined(__GNUC__)
-+#  define INLINE inline
++#  define INLINE static inline
 +#else
 +#  define INLINE
 +#endif

diff --git a/xmp.spec b/xmp.spec
index 9b471658b70da95c5dbc8c5067881d126b3b6f43..86dcd201c5f4fc965ae30d837a9d8bcc5766bc4d 100644 (file)
--- a/xmp.spec
+++ b/xmp.spec
@@ -1,21 +1,22 @@
+# TODO: bmp, audacious plugins
 #
 # Conditional build:
-%bcond_without arts            # without aRts audio driver
-%bcond_without esd             # without EsounD audio output driver
-%bcond_without nas             # without NAS audio output driver
-%bcond_without pulseaudio      # without PulseAudio audio output driver
-%bcond_without xmms            # without XMP as XMMS plugin
+%bcond_with    arts            # aRts audio driver
+%bcond_with    esd             # EsounD audio output driver
+%bcond_without nas             # NAS audio output driver
+%bcond_without pulseaudio      # PulseAudio audio output driver
+%bcond_without xmms            # XMP as XMMS plugin
 %bcond_with    nonfree         # with recent fmopl (GPL-incompatible - non-distributable)
 #
 Summary:       Extended Module Player
 Summary(pl.UTF-8):     Rozszerzony odtwarzacz modułów
 Name:          xmp
-Version:       2.7.1
+Version:       3.3.0
 Release:       1
 License:       GPL%{?with_nonfree: with non-commercial additions}
 Group:         Applications/Sound
-Source0:       http://dl.sourceforge.net/xmp/%{name}-%{version}.tar.gz
-# Source0-md5: bbed5ba3dc9bd8ff38133b31fd5b8846
+Source0:       http://downloads.sourceforge.net/xmp/%{name}-%{version}.tar.gz
+# Source0-md5: 0ac15cdb68cf0a08f418d37b4c1843bd
 Patch0:                %{name}-nondfsg.patch
 URL:           http://xmp.sourceforge.net/
 %{?with_arts:BuildRequires:    arts-devel}
@@ -74,7 +75,8 @@ cp -f /usr/share/automake/config.* scripts
        %{?with_nas:--enable-nas} \
        %{?with_pulseaudio:--enable-pulseaudio} \
        %{?with_xmms:--enable-xmms-plugin}
-%{__make} -j1
+%{__make} -j1 \
+       V=1
 
 %install
 rm -rf $RPM_BUILD_ROOT