[SCM] deadbeef/master: Add use-system-libdca patch and update Build-Depends
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Mon Jan 3 15:10:52 UTC 2011
The following commit has been merged in the master branch:
commit 6e78231e8b1ae9ddc4a2315ba62a3d5486ae490c
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date: Mon Jan 3 15:28:45 2011 +0100
Add use-system-libdca patch and update Build-Depends
diff --git a/debian/control b/debian/control
index bc0bed7..c6636ef 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Alessandro Ghedini <al3xbio at gmail.com>
Build-Depends: debhelper (>= 7.0.50~), cdbs, autotools-dev, intltool,
libasound2-dev, libavcodec-dev, libavformat-dev,
libavutil-dev, libadplug-dev, libcddb2-dev, libcdio-dev, libcurl4-gnutls-dev,
- libflac-dev, libgtk2.0-dev, libmad0-dev, libogg-dev, libpulse-dev,
+ libdca-dev, libflac-dev, libgtk2.0-dev, libmad0-dev, libogg-dev, libpulse-dev,
libsamplerate0-dev, libsndfile1-dev, libvorbis-dev, libwavpack-dev,
libmpcdec-dev, libmms-dev
Standards-Version: 3.9.1
diff --git a/debian/patches/0007-use-system-libdca.patch b/debian/patches/0007-use-system-libdca.patch
new file mode 100644
index 0000000..55b264a
--- /dev/null
+++ b/debian/patches/0007-use-system-libdca.patch
@@ -0,0 +1,133 @@
+From: Alessandro Ghedini <al3xbio at gmail.com>
+Date: Mon, 3 Jan 2011 15:21:12 +0100
+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(-)
+
+diff --git a/plugins/dca/Makefile.am b/plugins/dca/Makefile.am
+index 0ae4734..515186b 100644
+--- a/plugins/dca/Makefile.am
++++ b/plugins/dca/Makefile.am
+@@ -2,28 +2,9 @@ if HAVE_DCA
+
+ pkglib_LTLIBRARIES = dca.la
+
+-dca_la_SOURCES = dcaplug.c\
+-extract_dca.c\
+-gettimeofday.c\
+-parse.c\
+-bitstream.c\
+-downmix.c\
+-convert2s16.c\
+-audio_out.h\
+-dca.h\
+-dts.h\
+-gettimeofday.h\
+-tendra.h\
+-dca_internal.h\
+-tables_adpcm.h\
+-tables_fir.h\
+-tables.h\
+-tables_huffman.h\
+-tables_quantization.h\
+-tables_vq.h\
+-bitstream.h
++dca_la_SOURCES = dcaplug.c gettimeofday.c
+
+-dca_la_LDFLAGS = -module
++dca_la_LDFLAGS = -module -ldca
+ dca_la_LIBADD = $(LDADD) -lm
+
+ AM_CFLAGS = $(CFLAGS) -fPIC
+diff --git a/plugins/dca/Makefile.in b/plugins/dca/Makefile.in
+index 01d6a28..14404b6 100644
+--- a/plugins/dca/Makefile.in
++++ b/plugins/dca/Makefile.in
+@@ -70,20 +70,14 @@ am__base_list = \
+ am__installdirs = "$(DESTDIR)$(pkglibdir)"
+ LTLIBRARIES = $(pkglib_LTLIBRARIES)
+ dca_la_DEPENDENCIES =
+-am__dca_la_SOURCES_DIST = dcaplug.c extract_dca.c gettimeofday.c \
+- parse.c bitstream.c downmix.c convert2s16.c audio_out.h dca.h \
+- dts.h gettimeofday.h tendra.h dca_internal.h tables_adpcm.h \
+- tables_fir.h tables.h tables_huffman.h tables_quantization.h \
+- tables_vq.h bitstream.h
+- 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
+ 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) \
+ $(LDFLAGS) -o $@
+ @HAVE_DCA_TRUE at am_dca_la_rpath = -rpath $(pkglibdir)
+-DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
++DEFAULT_INCLUDES = -I$(top_builddir)
+ depcomp = $(SHELL) $(top_srcdir)/depcomp
+ am__depfiles_maybe = depfiles
+ am__mv = mv -f
+@@ -312,27 +306,9 @@ 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@extract_dca.c\
+- at HAVE_DCA_TRUE@gettimeofday.c\
+- at HAVE_DCA_TRUE@parse.c\
+- at HAVE_DCA_TRUE@bitstream.c\
+- at HAVE_DCA_TRUE@downmix.c\
+- at HAVE_DCA_TRUE@convert2s16.c\
+- at HAVE_DCA_TRUE@audio_out.h\
+- at HAVE_DCA_TRUE@dca.h\
+- at HAVE_DCA_TRUE@dts.h\
+- at HAVE_DCA_TRUE@gettimeofday.h\
+- at HAVE_DCA_TRUE@tendra.h\
+- at HAVE_DCA_TRUE@dca_internal.h\
+- at HAVE_DCA_TRUE@tables_adpcm.h\
+- at HAVE_DCA_TRUE@tables_fir.h\
+- at HAVE_DCA_TRUE@tables.h\
+- at HAVE_DCA_TRUE@tables_huffman.h\
+- at HAVE_DCA_TRUE@tables_quantization.h\
+- at HAVE_DCA_TRUE@tables_vq.h\
+- 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_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:
+ distclean-compile:
+ -rm -f *.tab.c
+
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/bitstream.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/convert2s16.Plo at am__quote@
+ @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/dcaplug.Plo at am__quote@
+- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/downmix.Plo at am__quote@
+- 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@
+
+ .c.o:
+ @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
+diff --git a/plugins/dca/dcaplug.c b/plugins/dca/dcaplug.c
+index 9d7f251..4d21f46 100644
+--- a/plugins/dca/dcaplug.c
++++ b/plugins/dca/dcaplug.c
+@@ -25,7 +25,7 @@
+ # include <config.h>
+ #endif
+ #include "../../deadbeef.h"
+-#include "dca.h"
++#include <dca.h>
+ #include "gettimeofday.h"
+
+ #ifdef WORDS_BIGENDIAN
+--
diff --git a/debian/patches/series b/debian/patches/series
index 3002067..527f73b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@
0004-use-system-libmpcdec.patch
0005-use-system-libmms.patch
0006-use-system-libadplug.patch
+0007-use-system-libdca.patch
--
deadbeef packaging
More information about the pkg-multimedia-commits
mailing list