packages: xmp/xmp-nondfsg.patch, xmp/xmp.spec - updated to 3.3.0 - updated ...

[qboosh]

Author: qboosh                       Date: Fri Jan 14 18:06:08 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- updated to 3.3.0
- updated nondfsg patch
- arts and esd disabled by default

---- Files affected:
packages/xmp:
   xmp-nondfsg.patch (1.2 -> 1.3) , xmp.spec (1.23 -> 1.24) 

---- Diffs:

================================================================
Index: packages/xmp/xmp-nondfsg.patch
diff -u packages/xmp/xmp-nondfsg.patch:1.2 packages/xmp/xmp-nondfsg.patch:1.3
--- packages/xmp/xmp-nondfsg.patch:1.2	Wed Sep 30 19:19:08 2009
+++ packages/xmp/xmp-nondfsg.patch	Fri Jan 14 19:06:03 2011
@@ -71,7 +71,7 @@
 -
 -/*** For xmp ***/
 -#define HAS_YM3812 1
--#define INLINE inline
+-#define INLINE static inline
 -/* $Id$ */
 -
  #include "fmopl.h"
@@ -83,7 +83,7 @@
 +#ifdef _MSC_VER
 +#  define INLINE __inline
 +#elif defined(__GNUC__)
-+#  define INLINE inline
++#  define INLINE static inline
 +#else
 +#  define INLINE
 +#endif

================================================================
Index: packages/xmp/xmp.spec
diff -u packages/xmp/xmp.spec:1.23 packages/xmp/xmp.spec:1.24
--- packages/xmp/xmp.spec:1.23	Wed Sep 30 19:11:59 2009
+++ packages/xmp/xmp.spec	Fri Jan 14 19:06:03 2011
@@ -1,22 +1,23 @@
 # $Revision$, $Date$
+# 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}
@@ -75,7 +76,8 @@
 	%{?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
@@ -110,6 +112,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.24  2011/01/14 18:06:03  qboosh
+- updated to 3.3.0
+- updated nondfsg patch
+- arts and esd disabled by default
+
 Revision 1.23  2009/09/30 17:11:59  lkrotowski
 - up to 2.7.1
 - dropped obsolete patches (including gcc 3.3 patch)
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmp/xmp-nondfsg.patch?r1=1.2&r2=1.3&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/xmp/xmp.spec?r1=1.23&r2=1.24&f=u