[SCM] cmus/master: Refresh patches.

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 83dd9d24c7c61d9a28a9c2b72a256a36a3d9b5ed
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Apr 23 09:46:36 2011 +0200

    Refresh patches.

diff --git a/debian/patches/10-roaraudio_support.patch b/debian/patches/10-roaraudio_support.patch
index 4f6c88a..8578b7c 100644
--- a/debian/patches/10-roaraudio_support.patch
+++ b/debian/patches/10-roaraudio_support.patch
@@ -8,10 +8,8 @@ Description: Add RoarAudio output plugin.
  roar.c    |  322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 337 insertions(+), 1 deletion(-)
 
-Index: cmus/roar.c
-===================================================================
---- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ cmus/roar.c	2011-02-15 15:14:39.917192079 -0500
+--- /dev/null
++++ cmus/roar.c
 @@ -0,0 +1,322 @@
 +/*
 + * Copyright 2006 Johannes Weißl
@@ -335,11 +333,9 @@ Index: cmus/roar.c
 +};
 +
 +const int op_priority = -2;
-Index: cmus/Makefile
-===================================================================
---- cmus.orig/Makefile	2011-02-15 15:02:28.096193816 -0500
-+++ cmus/Makefile	2011-02-15 15:14:39.917192079 -0500
-@@ -141,6 +141,7 @@
+--- cmus.orig/Makefile
++++ cmus/Makefile
+@@ -141,6 +141,7 @@ oss-objs		:= oss.lo mixer_oss.lo
  sun-objs		:= sun.lo mixer_sun.lo
  ao-objs			:= ao.lo
  waveout-objs		:= waveout.lo
@@ -347,7 +343,7 @@ Index: cmus/Makefile
  
  op-$(CONFIG_PULSE)	+= pulse.so
  op-$(CONFIG_ALSA)	+= alsa.so
-@@ -149,6 +150,7 @@
+@@ -149,6 +150,7 @@ op-$(CONFIG_OSS)	+= oss.so
  op-$(CONFIG_SUN)	+= sun.so
  op-$(CONFIG_AO)		+= ao.so
  op-$(CONFIG_WAVEOUT)	+= waveout.so
@@ -355,7 +351,7 @@ Index: cmus/Makefile
  
  $(pulse-objs): CFLAGS	+= $(PULSE_CFLAGS)
  $(alsa-objs): CFLAGS	+= $(ALSA_CFLAGS)
-@@ -157,6 +159,7 @@
+@@ -157,6 +159,7 @@ $(oss-objs):  CFLAGS	+= $(OSS_CFLAGS)
  $(sun-objs):  CFLAGS	+= $(SUN_CFLAGS)
  $(ao-objs):   CFLAGS	+= $(AO_CFLAGS)
  $(waveout-objs): CFLAGS += $(WAVEOUT_CFLAGS)
@@ -363,7 +359,7 @@ Index: cmus/Makefile
  
  pulse.so: $(pulse-objs) $(libcmus-y)
  	$(call cmd,ld_dl,$(PULSE_LIBS))
-@@ -178,6 +181,9 @@
+@@ -178,6 +181,9 @@ ao.so: $(ao-objs) $(libcmus-y)
  
  waveout.so: $(waveout-objs) $(libcmus-y)
  	$(call cmd,ld_dl,$(WAVEOUT_LIBS))
@@ -373,11 +369,9 @@ Index: cmus/Makefile
  # }}}
  
  # man {{{
-Index: cmus/configure
-===================================================================
---- cmus.orig/configure	2011-02-15 15:02:28.112193267 -0500
-+++ cmus/configure	2011-02-15 15:14:39.921192588 -0500
-@@ -260,6 +260,12 @@
+--- cmus.orig/configure
++++ cmus/configure
+@@ -276,6 +276,12 @@ check_waveout()
  	return 1
  }
  
@@ -390,7 +384,7 @@ Index: cmus/configure
  check_mp4()
  {
  	check_header mp4v2/mp4v2.h
-@@ -319,6 +325,7 @@
+@@ -336,6 +342,7 @@ Optional Features: y/n
    CONFIG_MP4      MPEG-4 AAC (.mp4, .m4a, .m4b)                   [auto]
    CONFIG_AAC      AAC (.aac, audio/aac, audio/aacp)               [auto]
    CONFIG_FFMPEG   FFMPEG (.shn, .wma)                             [auto]
@@ -398,7 +392,7 @@ Index: cmus/configure
    CONFIG_PULSE    native PulseAudio output                        [auto]
    CONFIG_ALSA     ALSA                                            [auto]
    CONFIG_AO       Libao cross-platform audio library              [auto]
-@@ -379,6 +386,7 @@
+@@ -397,6 +404,7 @@ check check_arts    CONFIG_ARTS
  check check_oss     CONFIG_OSS
  check check_sun     CONFIG_SUN
  check check_waveout CONFIG_WAVEOUT
@@ -406,7 +400,7 @@ Index: cmus/configure
  
  test "$WORDS_BIGENDIAN" = y && CFLAGS="${CFLAGS} -DWORDS_BIGENDIAN"
  
-@@ -395,6 +403,6 @@
+@@ -415,6 +423,6 @@ config_header config/iconv.h HAVE_ICONV
  
  makefile_vars bindir datadir libdir mandir exampledir
  makefile_vars CONFIG_FLAC CONFIG_MAD CONFIG_MIKMOD CONFIG_MODPLUG CONFIG_MPC CONFIG_VORBIS CONFIG_WAVPACK CONFIG_WAV CONFIG_MP4 CONFIG_AAC CONFIG_FFMPEG

-- 
cmus packaging