[SCM] fdk-aac/master: New package.

toots at users.alioth.debian.org toots at users.alioth.debian.org
Sun Aug 17 01:11:00 UTC 2014


The following commit has been merged in the master branch:
commit 4cee4781a2fb9f5010b0cd080114661e942eb121
Author: Romain Beauxis <toots at rastageeks.org>
Date:   Mon Aug 11 20:03:04 2014 -0500

    New package.

diff --git a/debian/changelog b/debian/changelog
index 96cef8d..11ac4dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+fdk-aac (0.1.3+20140816-1) unstable; urgency=medium
+
+  * Update to latest upstream.
+  * Fix FTBFS on mips, sparc and s390x.
+  * Bump standards version to 3.9.5
+
+ -- Romain Beauxis <toots at rastageeks.org>  Mon, 11 Aug 2014 19:42:04 -0500
+
 fdk-aac (0.1.3-1) unstable; urgency=medium
 
   * Team upload.
diff --git a/debian/control b/debian/control
index 04882ed..f593617 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Romain Beauxis <toots at rastageeks.org>
 Homepage: https://github.com/mstorsjo/fdk-aac
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
 Build-Depends: debhelper (>= 9), dh-autoreconf
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/fdk-aac.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-multimedia/fdk-aac.git;a=summary
diff --git a/debian/patches/disable_warning b/debian/patches/disable_warning
new file mode 100644
index 0000000..4e5af99
--- /dev/null
+++ b/debian/patches/disable_warning
@@ -0,0 +1,16 @@
+Index: fdk-aac/libFDK/include/fixmul.h
+===================================================================
+--- fdk-aac.orig/libFDK/include/fixmul.h	2014-08-11 19:43:32.720073933 -0500
++++ fdk-aac/libFDK/include/fixmul.h	2014-08-11 19:45:50.488712172 -0500
+@@ -149,11 +149,6 @@
+ 
+ #if !defined(FUNCTION_fixmulBitExact_DD)
+ #define FUNCTION_fixmulBitExact_DD
+-#if defined(_MSC_VER) || defined(__CC_ARM) || defined(__ANALOG_EXTENSIONS__) || defined(__TI_COMPILER_VERSION__) || defined(__XTENSA__)
+-#pragma message ("Extremely slow implementation of fixmulBitExact_DD !!")
+-#else
+-#warning Extremely slow implementation of fixmulBitExact_DD !!
+-#endif
+ inline LONG fixmulBitExact_DD (const LONG a, const LONG b)
+ {
+   return ( (LONG) ((((INT64)a) * b) >> 32) ) << 1;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7ddd8b6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_warning
diff --git a/debian/rules b/debian/rules
index 5a59eae..a0b6a50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,10 @@
 #!/usr/bin/make -f
 
+ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
+	CFLAGS+= -mips32r2
+	export CFLAGS
+endif
+
 %:
 	dh $@ --parallel --with autoreconf
 

-- 
fdk-aac packaging



More information about the pkg-multimedia-commits mailing list