[SCM] faac/master: new mp4 output module written from scratch

[fabian at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 4abf8f0ed4b8521c5e069b6dd28e30d47c47db64
Author: Fabian Greffrath <fabian at debian.org>
Date:   Mon Jul 17 21:47:20 2017 +0200

    new mp4 output module written from scratch

diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index ddd9dd1..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,21 +0,0 @@
-faac for Debian
----------------
-
-In Debian, faac is built without support for MP4 containers. This is because
-the mp4v2 library used by faac for wrapping data in MP4 containers is
-licensed under the terms of the MPL-1.1, which is incompatible with the
-(mixture of) licenses that apply for faac itself. Please note that this only
-affects the faac command line frontend, the libfaac encoding library did
-never support MP4 containers anyway.
-
-However, it is possible to locally rebuild the faac package with MP4
-support. For this, install the libmp4v2-dev package and rebuild the faac
-source package with DEB_BUILD_OPTIONS=mp4v2, e.g.:
-
-  $ DEB_BUILD_OPTIONS=mp4v2 dpkg-buildpackage -us -uc
-
-Please keep in mind the resulting binary packages will be unredistributable!
-
-For further discussion of this topic please refer to #797838.
-
- -- Fabian Greffrath <fabian at debian.org>  Mon, 30 Nov 2015 07:54:13 +0100
diff --git a/debian/rules b/debian/rules
index 43384ee..4f7c616 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,12 +3,5 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -Wl,--no-undefined
 
-ifeq (,$(filter mp4v2,$(DEB_BUILD_OPTIONS)))
-	EXT_MP4V2="ac_cv_lib_mp4v2_MP4Create=no"
-endif
-
 %:
 	dh $@
-
-override_dh_auto_configure:
-	dh_auto_configure -- --without-mp4v2 ${EXT_MP4V2}

-- 
faac packaging