[SCM] deadbeef/master: Revert "Add use-system-libfaad patch and update Build-Depends"
ghedo-guest at users.alioth.debian.org
ghedo-guest at users.alioth.debian.org
Mon Jan 3 17:22:56 UTC 2011
The following commit has been merged in the master branch:
commit 9c92b01249829b04fee325b827316b6c8663c744
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date: Mon Jan 3 18:17:11 2011 +0100
Revert "Add use-system-libfaad patch and update Build-Depends"
This reverts commit d096890f. Many of the symbols needed by the aac plugin
are not present in the newest version of faad2 library.
diff --git a/debian/control b/debian/control
index 5e0d332..c6636ef 100644
--- a/debian/control
+++ b/debian/control
@@ -6,9 +6,9 @@ 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,
- libdca-dev, libfaad-dev, libflac-dev, libgtk2.0-dev, libmad0-dev,
- libogg-dev, libpulse-dev, libsamplerate0-dev, libsndfile1-dev,
- libvorbis-dev, libwavpack-dev, libmpcdec-dev, libmms-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
Homepage: http://sf.net/projects/deadbeef
Vcs-Git: git://git.debian.org/git/pkg-multimedia/deadbeef.git
diff --git a/debian/patches/0008-use-system-libfaad.patch b/debian/patches/0008-use-system-libfaad.patch
deleted file mode 100644
index 5fbeb34..0000000
--- a/debian/patches/0008-use-system-libfaad.patch
+++ /dev/null
@@ -1,140 +0,0 @@
-From: Alessandro Ghedini <al3xbio at gmail.com>
-Date: Mon, 3 Jan 2011 15:35:53 +0100
-Subject: [PATCH] use system libfaad
-
-Make build system use system libfaad instead of bundled one
----
- plugins/aac/Makefile.am | 13 +-------
- plugins/aac/Makefile.in | 70 +++--------------------------------------------
- 2 files changed, 6 insertions(+), 77 deletions(-)
-
-diff --git a/plugins/aac/Makefile.am b/plugins/aac/Makefile.am
-index afef6c5..a614941 100644
---- a/plugins/aac/Makefile.am
-+++ b/plugins/aac/Makefile.am
-@@ -1,18 +1,9 @@
- if HAVE_AAC
- aacdir = $(libdir)/$(PACKAGE)
- pkglib_LTLIBRARIES = aac.la
--aac_la_SOURCES = aac.c aac_parser.c aac_parser.h\
--mp4ff/mp4atom.c\
--mp4ff/mp4ff.c\
--mp4ff/mp4meta.c\
--mp4ff/mp4sample.c\
--mp4ff/mp4tagupdate.c\
--mp4ff/mp4util.c\
--mp4ff/mp4ff.h\
--mp4ff/mp4ffint.h\
--mp4ff/mp4ff_int_types.h
-+aac_la_SOURCES = aac.c aac_parser.c aac_parser.h
-
--aac_la_LDFLAGS = -module
-+aac_la_LDFLAGS = -module -lfaad
-
- aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS)
- AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING
-diff --git a/plugins/aac/Makefile.in b/plugins/aac/Makefile.in
-index 6baaa3e..daebdd2 100644
---- a/plugins/aac/Makefile.in
-+++ b/plugins/aac/Makefile.in
-@@ -70,13 +70,8 @@ am__installdirs = "$(DESTDIR)$(pkglibdir)"
- LTLIBRARIES = $(pkglib_LTLIBRARIES)
- am__DEPENDENCIES_1 =
- @HAVE_AAC_TRUE at aac_la_DEPENDENCIES = $(am__DEPENDENCIES_1)
--am__aac_la_SOURCES_DIST = aac.c aac_parser.c aac_parser.h \
-- mp4ff/mp4atom.c mp4ff/mp4ff.c mp4ff/mp4meta.c \
-- mp4ff/mp4sample.c mp4ff/mp4tagupdate.c mp4ff/mp4util.c \
-- mp4ff/mp4ff.h mp4ff/mp4ffint.h mp4ff/mp4ff_int_types.h
-- at HAVE_AAC_TRUE@am_aac_la_OBJECTS = aac.lo aac_parser.lo mp4atom.lo \
-- at HAVE_AAC_TRUE@ mp4ff.lo mp4meta.lo mp4sample.lo \
-- at HAVE_AAC_TRUE@ mp4tagupdate.lo mp4util.lo
-+am__aac_la_SOURCES_DIST = aac.c aac_parser.c aac_parser.h
-+ at HAVE_AAC_TRUE@am_aac_la_OBJECTS = aac.lo aac_parser.lo
- aac_la_OBJECTS = $(am_aac_la_OBJECTS)
- aac_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
- --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(aac_la_LDFLAGS) \
-@@ -311,18 +306,9 @@ top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
- @HAVE_AAC_TRUE at aacdir = $(libdir)/$(PACKAGE)
- @HAVE_AAC_TRUE at pkglib_LTLIBRARIES = aac.la
-- at HAVE_AAC_TRUE@aac_la_SOURCES = aac.c aac_parser.c aac_parser.h\
-- at HAVE_AAC_TRUE@mp4ff/mp4atom.c\
-- at HAVE_AAC_TRUE@mp4ff/mp4ff.c\
-- at HAVE_AAC_TRUE@mp4ff/mp4meta.c\
-- at HAVE_AAC_TRUE@mp4ff/mp4sample.c\
-- at HAVE_AAC_TRUE@mp4ff/mp4tagupdate.c\
-- at HAVE_AAC_TRUE@mp4ff/mp4util.c\
-- at HAVE_AAC_TRUE@mp4ff/mp4ff.h\
-- at HAVE_AAC_TRUE@mp4ff/mp4ffint.h\
-- at HAVE_AAC_TRUE@mp4ff/mp4ff_int_types.h
--
-- at HAVE_AAC_TRUE@aac_la_LDFLAGS = -module
-+ at HAVE_AAC_TRUE@aac_la_SOURCES = aac.c aac_parser.c aac_parser.h
-+
-+ at HAVE_AAC_TRUE@aac_la_LDFLAGS = -module -lfaad
- @HAVE_AAC_TRUE at aac_la_LIBADD = $(LDADD) $(FAAD2_LIBS)
- @HAVE_AAC_TRUE at AM_CFLAGS = $(CFLAGS) -std=c99 -DUSE_MP4FF -DUSE_TAGGING
- all: all-am
-@@ -401,12 +387,6 @@ distclean-compile:
-
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aac.Plo at am__quote@
- @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/aac_parser.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4atom.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4ff.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4meta.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4sample.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4tagupdate.Plo at am__quote@
-- at AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/mp4util.Plo at am__quote@
-
- .c.o:
- @am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
-@@ -429,48 +409,6 @@ distclean-compile:
- @AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
- @am__fastdepCC_FALSE@ $(LTCOMPILE) -c -o $@ $<
-
--mp4atom.lo: mp4ff/mp4atom.c
-- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4atom.lo -MD -MP -MF $(DEPDIR)/mp4atom.Tpo -c -o mp4atom.lo `test -f 'mp4ff/mp4atom.c' || echo '$(srcdir)/'`mp4ff/mp4atom.c
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mp4atom.Tpo $(DEPDIR)/mp4atom.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff/mp4atom.c' object='mp4atom.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4atom.lo `test -f 'mp4ff/mp4atom.c' || echo '$(srcdir)/'`mp4ff/mp4atom.c
--
--mp4ff.lo: mp4ff/mp4ff.c
-- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4ff.lo -MD -MP -MF $(DEPDIR)/mp4ff.Tpo -c -o mp4ff.lo `test -f 'mp4ff/mp4ff.c' || echo '$(srcdir)/'`mp4ff/mp4ff.c
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mp4ff.Tpo $(DEPDIR)/mp4ff.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff/mp4ff.c' object='mp4ff.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4ff.lo `test -f 'mp4ff/mp4ff.c' || echo '$(srcdir)/'`mp4ff/mp4ff.c
--
--mp4meta.lo: mp4ff/mp4meta.c
-- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4meta.lo -MD -MP -MF $(DEPDIR)/mp4meta.Tpo -c -o mp4meta.lo `test -f 'mp4ff/mp4meta.c' || echo '$(srcdir)/'`mp4ff/mp4meta.c
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mp4meta.Tpo $(DEPDIR)/mp4meta.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff/mp4meta.c' object='mp4meta.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4meta.lo `test -f 'mp4ff/mp4meta.c' || echo '$(srcdir)/'`mp4ff/mp4meta.c
--
--mp4sample.lo: mp4ff/mp4sample.c
-- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4sample.lo -MD -MP -MF $(DEPDIR)/mp4sample.Tpo -c -o mp4sample.lo `test -f 'mp4ff/mp4sample.c' || echo '$(srcdir)/'`mp4ff/mp4sample.c
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mp4sample.Tpo $(DEPDIR)/mp4sample.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff/mp4sample.c' object='mp4sample.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4sample.lo `test -f 'mp4ff/mp4sample.c' || echo '$(srcdir)/'`mp4ff/mp4sample.c
--
--mp4tagupdate.lo: mp4ff/mp4tagupdate.c
-- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4tagupdate.lo -MD -MP -MF $(DEPDIR)/mp4tagupdate.Tpo -c -o mp4tagupdate.lo `test -f 'mp4ff/mp4tagupdate.c' || echo '$(srcdir)/'`mp4ff/mp4tagupdate.c
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mp4tagupdate.Tpo $(DEPDIR)/mp4tagupdate.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff/mp4tagupdate.c' object='mp4tagupdate.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4tagupdate.lo `test -f 'mp4ff/mp4tagupdate.c' || echo '$(srcdir)/'`mp4ff/mp4tagupdate.c
--
--mp4util.lo: mp4ff/mp4util.c
-- at am__fastdepCC_TRUE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -MT mp4util.lo -MD -MP -MF $(DEPDIR)/mp4util.Tpo -c -o mp4util.lo `test -f 'mp4ff/mp4util.c' || echo '$(srcdir)/'`mp4ff/mp4util.c
-- at am__fastdepCC_TRUE@ $(am__mv) $(DEPDIR)/mp4util.Tpo $(DEPDIR)/mp4util.Plo
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ source='mp4ff/mp4util.c' object='mp4util.lo' libtool=yes @AMDEPBACKSLASH@
-- at AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-- at am__fastdepCC_FALSE@ $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS) -c -o mp4util.lo `test -f 'mp4ff/mp4util.c' || echo '$(srcdir)/'`mp4ff/mp4util.c
--
- mostlyclean-libtool:
- -rm -f *.lo
-
---
diff --git a/debian/patches/series b/debian/patches/series
index df4429d..527f73b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,4 +5,3 @@
0005-use-system-libmms.patch
0006-use-system-libadplug.patch
0007-use-system-libdca.patch
-0008-use-system-libfaad.patch
--
deadbeef packaging
More information about the pkg-multimedia-commits
mailing list