[SCM] cmus/master: Refreshed 10-roaraudio_support.patch

[ryanakca-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 312824630c736423b148109356c01ba248e763f2
Author: Ryan Kavanagh <ryanakca at kubuntu.org>
Date:   Tue Feb 15 15:15:16 2011 -0500

    Refreshed 10-roaraudio_support.patch

diff --git a/debian/patches/10-roaraudio_support.patch b/debian/patches/10-roaraudio_support.patch
index 06d31d2..4f6c88a 100644
--- a/debian/patches/10-roaraudio_support.patch
+++ b/debian/patches/10-roaraudio_support.patch
@@ -8,8 +8,10 @@ Description: Add RoarAudio output plugin.
  roar.c    |  322 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
  3 files changed, 337 insertions(+), 1 deletion(-)
 
---- /dev/null
-+++ cmus/roar.c
+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
 @@ -0,0 +1,322 @@
 +/*
 + * Copyright 2006 Johannes Weißl
@@ -333,9 +335,11 @@ Description: Add RoarAudio output plugin.
 +};
 +
 +const int op_priority = -2;
---- cmus.orig/Makefile
-+++ cmus/Makefile
-@@ -141,6 +141,7 @@ oss-objs		:= oss.lo mixer_oss.lo
+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 @@
  sun-objs		:= sun.lo mixer_sun.lo
  ao-objs			:= ao.lo
  waveout-objs		:= waveout.lo
@@ -343,7 +347,7 @@ Description: Add RoarAudio output plugin.
  
  op-$(CONFIG_PULSE)	+= pulse.so
  op-$(CONFIG_ALSA)	+= alsa.so
-@@ -149,6 +150,7 @@ op-$(CONFIG_OSS)	+= oss.so
+@@ -149,6 +150,7 @@
  op-$(CONFIG_SUN)	+= sun.so
  op-$(CONFIG_AO)		+= ao.so
  op-$(CONFIG_WAVEOUT)	+= waveout.so
@@ -351,7 +355,7 @@ Description: Add RoarAudio output plugin.
  
  $(pulse-objs): CFLAGS	+= $(PULSE_CFLAGS)
  $(alsa-objs): CFLAGS	+= $(ALSA_CFLAGS)
-@@ -157,6 +159,7 @@ $(oss-objs):  CFLAGS	+= $(OSS_CFLAGS)
+@@ -157,6 +159,7 @@
  $(sun-objs):  CFLAGS	+= $(SUN_CFLAGS)
  $(ao-objs):   CFLAGS	+= $(AO_CFLAGS)
  $(waveout-objs): CFLAGS += $(WAVEOUT_CFLAGS)
@@ -359,7 +363,7 @@ Description: Add RoarAudio output plugin.
  
  pulse.so: $(pulse-objs) $(libcmus-y)
  	$(call cmd,ld_dl,$(PULSE_LIBS))
-@@ -178,6 +181,9 @@ ao.so: $(ao-objs) $(libcmus-y)
+@@ -178,6 +181,9 @@
  
  waveout.so: $(waveout-objs) $(libcmus-y)
  	$(call cmd,ld_dl,$(WAVEOUT_LIBS))
@@ -369,9 +373,11 @@ Description: Add RoarAudio output plugin.
  # }}}
  
  # man {{{
---- cmus.orig/configure
-+++ cmus/configure
-@@ -260,6 +260,12 @@ check_waveout()
+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 @@
  	return 1
  }
  
@@ -384,7 +390,7 @@ Description: Add RoarAudio output plugin.
  check_mp4()
  {
  	check_header mp4v2/mp4v2.h
-@@ -319,6 +325,7 @@ Optional Features: y/n
+@@ -319,6 +325,7 @@
    CONFIG_MP4      MPEG-4 AAC (.mp4, .m4a, .m4b)                   [auto]
    CONFIG_AAC      AAC (.aac, audio/aac, audio/aacp)               [auto]
    CONFIG_FFMPEG   FFMPEG (.shn, .wma)                             [auto]
@@ -392,7 +398,7 @@ Description: Add RoarAudio output plugin.
    CONFIG_PULSE    native PulseAudio output                        [auto]
    CONFIG_ALSA     ALSA                                            [auto]
    CONFIG_AO       Libao cross-platform audio library              [auto]
-@@ -376,6 +383,7 @@ check check_arts    CONFIG_ARTS
+@@ -379,6 +386,7 @@
  check check_oss     CONFIG_OSS
  check check_sun     CONFIG_SUN
  check check_waveout CONFIG_WAVEOUT
@@ -400,7 +406,7 @@ Description: Add RoarAudio output plugin.
  
  test "$WORDS_BIGENDIAN" = y && CFLAGS="${CFLAGS} -DWORDS_BIGENDIAN"
  
-@@ -392,6 +400,6 @@ config_header config/curses.h HAVE_RESIZ
+@@ -395,6 +403,6 @@
  
  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