[SCM] deadbeef/master: Fix missing symbol channels_multi in dca plugin

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

The following commit has been merged in the master branch:
commit 7f11cafda320ee681d4a66d2ede29d47a63e1b14
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Mon Jan 3 18:02:42 2011 +0100

    Fix missing symbol channels_multi in dca plugin

diff --git a/debian/patches/0007-use-system-libdca.patch b/debian/patches/0007-use-system-libdca.patch
index 55b264a..43191a7 100644
--- a/debian/patches/0007-use-system-libdca.patch
+++ b/debian/patches/0007-use-system-libdca.patch
@@ -4,13 +4,14 @@ Subject: [PATCH] use system libdca
 
 Make build system use system libdca instead of bundled one
 ---
- plugins/dca/Makefile.am |   23 ++---------------------
- plugins/dca/Makefile.in |   39 +++++----------------------------------
- plugins/dca/dcaplug.c   |    2 +-
- 3 files changed, 8 insertions(+), 56 deletions(-)
+ plugins/dca/Makefile.am   |   23 ++---------------------
+ plugins/dca/Makefile.in   |   41 ++++++-----------------------------------
+ plugins/dca/convert2s16.c |    2 +-
+ plugins/dca/dcaplug.c     |    2 +-
+ 4 files changed, 10 insertions(+), 58 deletions(-)
 
 diff --git a/plugins/dca/Makefile.am b/plugins/dca/Makefile.am
-index 0ae4734..515186b 100644
+index 0ae4734..8cb5ec6 100644
 --- a/plugins/dca/Makefile.am
 +++ b/plugins/dca/Makefile.am
 @@ -2,28 +2,9 @@ if HAVE_DCA
@@ -37,7 +38,7 @@ index 0ae4734..515186b 100644
 -tables_quantization.h\
 -tables_vq.h\
 -bitstream.h
-+dca_la_SOURCES = dcaplug.c gettimeofday.c
++dca_la_SOURCES = dcaplug.c gettimeofday.c convert2s16.c
  
 -dca_la_LDFLAGS = -module
 +dca_la_LDFLAGS = -module -ldca
@@ -45,7 +46,7 @@ index 0ae4734..515186b 100644
  
  AM_CFLAGS = $(CFLAGS) -fPIC
 diff --git a/plugins/dca/Makefile.in b/plugins/dca/Makefile.in
-index 01d6a28..14404b6 100644
+index 01d6a28..a4f5f89 100644
 --- a/plugins/dca/Makefile.in
 +++ b/plugins/dca/Makefile.in
 @@ -70,20 +70,14 @@ am__base_list = \
@@ -60,8 +61,8 @@ index 01d6a28..14404b6 100644
 - at HAVE_DCA_TRUE@am_dca_la_OBJECTS = dcaplug.lo extract_dca.lo \
 - at HAVE_DCA_TRUE@	gettimeofday.lo parse.lo bitstream.lo \
 - at HAVE_DCA_TRUE@	downmix.lo convert2s16.lo
-+am__dca_la_SOURCES_DIST = dcaplug.c gettimeofday.c
-+ at HAVE_DCA_TRUE@am_dca_la_OBJECTS = dcaplug.lo gettimeofday.lo
++am__dca_la_SOURCES_DIST = dcaplug.c gettimeofday.c convert2s16.c
++ at HAVE_DCA_TRUE@am_dca_la_OBJECTS = dcaplug.lo gettimeofday.lo convert2s16.lo
  dca_la_OBJECTS = $(am_dca_la_OBJECTS)
  dca_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
  	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(dca_la_LDFLAGS) \
@@ -72,10 +73,11 @@ index 01d6a28..14404b6 100644
  depcomp = $(SHELL) $(top_srcdir)/depcomp
  am__depfiles_maybe = depfiles
  am__mv = mv -f
-@@ -312,27 +306,9 @@ top_builddir = @top_builddir@
+@@ -311,28 +305,9 @@ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  @HAVE_DCA_TRUE at pkglib_LTLIBRARIES = dca.la
- @HAVE_DCA_TRUE at dca_la_SOURCES = dcaplug.c\
+- at HAVE_DCA_TRUE@dca_la_SOURCES = dcaplug.c\
 - at HAVE_DCA_TRUE@extract_dca.c\
 - at HAVE_DCA_TRUE@gettimeofday.c\
 - at HAVE_DCA_TRUE@parse.c\
@@ -97,13 +99,13 @@ index 01d6a28..14404b6 100644
 - at HAVE_DCA_TRUE@bitstream.h
 -
 - at HAVE_DCA_TRUE@dca_la_LDFLAGS = -module
-+ at HAVE_DCA_TRUE@gettimeofday.c
++ at HAVE_DCA_TRUE@dca_la_SOURCES = dcaplug.c gettimeofday.c convert2s16.c
 +
 + at HAVE_DCA_TRUE@dca_la_LDFLAGS = -module -ldca
  @HAVE_DCA_TRUE at dca_la_LIBADD = $(LDADD) -lm
  @HAVE_DCA_TRUE at AM_CFLAGS = $(CFLAGS) -fPIC
  all: all-am
-@@ -409,13 +385,8 @@ mostlyclean-compile:
+@@ -409,13 +384,9 @@ mostlyclean-compile:
  distclean-compile:
  	-rm -f *.tab.c
  
@@ -114,9 +116,23 @@ index 01d6a28..14404b6 100644
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/extract_dca.Plo at am__quote@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gettimeofday.Plo at am__quote@
 - at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/parse.Plo at am__quote@
++ at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/convert2s16.Plo at am__quote@
  
  .c.o:
  @am__fastdepCC_TRUE@	$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+diff --git a/plugins/dca/convert2s16.c b/plugins/dca/convert2s16.c
+index b0647ea..8d42676 100644
+--- a/plugins/dca/convert2s16.c
++++ b/plugins/dca/convert2s16.c
+@@ -26,7 +26,7 @@
+ 
+ #include <inttypes.h>
+ 
+-#include "dca.h"
++#include <dca.h>
+ 
+ #include <stdio.h>
+ 
 diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c
 index 9d7f251..4d21f46 100644
 --- a/plugins/dca/dcaplug.c

-- 
deadbeef packaging