[SCM] fdk-aac/master: Fix FTBFS..
toots at users.alioth.debian.org
toots at users.alioth.debian.org
Mon Aug 18 15:24:35 UTC 2014
The following commit has been merged in the master branch:
commit 7bfaf72a36c6996200c2b3df455dd0d6838c3e0f
Author: Romain Beauxis <toots at rastageeks.org>
Date: Sun Aug 17 09:38:29 2014 -0500
Fix FTBFS..
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/debian/changelog b/debian/changelog
index 11ac4dd..4f29b2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+fdk-aac (0.1.3+20140816-2) unstable; urgency=medium
+
+ * Fix FTBFS for real this time:
+ * Added missing powerpc ASM files.
+ * Add missing #defines for sparc and s390x.
+ * Add correct CPPFLAGS for mips.
+
+ -- Romain Beauxis <toots at rastageeks.org> Sun, 17 Aug 2014 09:37:14 -0500
+
fdk-aac (0.1.3+20140816-1) unstable; urgency=medium
* Update to latest upstream.
diff --git a/debian/patches/add_more_arch b/debian/patches/add_more_arch
new file mode 100644
index 0000000..3e6d8f3
--- /dev/null
+++ b/debian/patches/add_more_arch
@@ -0,0 +1,27 @@
+Index: fdk-aac/libFDK/include/FDK_archdef.h
+===================================================================
+--- fdk-aac.orig/libFDK/include/FDK_archdef.h 2014-08-17 09:43:50.000000000 -0500
++++ fdk-aac/libFDK/include/FDK_archdef.h 2014-08-17 09:44:04.000000000 -0500
+@@ -213,6 +213,22 @@
+ #define LDCOEFF_16BIT
+ #define WINDOWTABLE_16BIT
+
++#elif defined(__sparc__)
++#define ARCH_PREFER_MULT_32x32
++#define ARCH_PREFER_MULT_32x16
++#define SINETABLE_16BIT
++#define POW2COEFF_16BIT
++#define LDCOEFF_16BIT
++#define WINDOWTABLE_16BIT
++
++#elif defined(__s390x__)
++#define ARCH_PREFER_MULT_32x32
++#define ARCH_PREFER_MULT_32x16
++#define SINETABLE_16BIT
++#define POW2COEFF_16BIT
++#define LDCOEFF_16BIT
++#define WINDOWTABLE_16BIT
++
+ #else
+
+ #error >>>> Please set architecture characterization defines for your platform (FDK_HIGH_PERFORMANCE)! <<<<
diff --git a/debian/patches/disable_warning b/debian/patches/disable_warning
deleted file mode 100644
index 4e5af99..0000000
--- a/debian/patches/disable_warning
+++ /dev/null
@@ -1,16 +0,0 @@
-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/missing_ppc_files b/debian/patches/missing_ppc_files
new file mode 100644
index 0000000..750113f
--- /dev/null
+++ b/debian/patches/missing_ppc_files
@@ -0,0 +1,225 @@
+Index: fdk-aac/libFDK/include/ppc/clz_ppc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ fdk-aac/libFDK/include/ppc/clz_ppc.h 2014-08-17 09:47:08.085652728 -0500
+@@ -0,0 +1,100 @@
++oftware License for The Fraunhofer FDK AAC Codec Library for Android
++
++� Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur F�rderung der angewandten Forschung e.V.
++ All rights reserved.
++
++ 1. INTRODUCTION
++The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements
++the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio.
++This FDK AAC Codec software is intended to be used on a wide variety of Android devices.
++
++AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual
++audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by
++independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part
++of the MPEG specifications.
++
++Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer)
++may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners
++individually for the purpose of encoding or decoding bit streams in products that are compliant with
++the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license
++these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec
++software may already be covered under those patent licenses when it is used for those licensed purposes only.
++
++Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality,
++are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional
++applications information and documentation.
++
++2. COPYRIGHT LICENSE
++
++Redistribution and use in source and binary forms, with or without modification, are permitted without
++payment of copyright license fees provided that you satisfy the following conditions:
++
++You must retain the complete text of this software license in redistributions of the FDK AAC Codec or
++your modifications thereto in source code form.
++
++You must retain the complete text of this software license in the documentation and/or other materials
++provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form.
++You must make available free of charge copies of the complete source code of the FDK AAC Codec and your
++modifications thereto to recipients of copies in binary form.
++
++The name of Fraunhofer may not be used to endorse or promote products derived from this library without
++prior written permission.
++
++You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec
++software or your modifications thereto.
++
++Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software
++and the date of any change. For modified versions of the FDK AAC Codec, the term
++"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term
++"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android."
++
++3. NO PATENT LICENSE
++
++NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer,
++ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with
++respect to this software.
++
++You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized
++by appropriate patent licenses.
++
++4. DISCLAIMER
++
++This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors
++"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties
++of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
++CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages,
++including but not limited to procurement of substitute goods or services; loss of use, data, or profits,
++or business interruption, however caused and on any theory of liability, whether in contract, strict
++liability, or tort (including negligence), arising in any way out of the use of this software, even if
++advised of the possibility of such damage.
++
++5. CONTACT INFORMATION
++
++Fraunhofer Institute for Integrated Circuits IIS
++Attention: Audio and Multimedia Departments - FDK AAC LL
++Am Wolfsmantel 33
++91058 Erlangen, Germany
++
++www.iis.fraunhofer.de/amm
++amm-info at iis.fraunhofer.de
++----------------------------------------------------------------------------------------------------------- */
++
++/*************************** Fraunhofer IIS FDK Tools **********************
++
++ Author(s):
++ Description: fixed point intrinsics
++
++******************************************************************************/
++
++#if defined(__powerpc__) && (defined(__GNUC__) || defined(__xlC__))
++
++#define FUNCTION_fixnormz_D
++
++inline INT fixnormz_D(LONG value)
++{
++ INT result;
++ __asm__ ("cntlzw %0, %1" : "=r" (result) : "r" (value));
++ return result;
++}
++
++#endif /* __powerpc__ && (__GNUC__ || __xlC__) */
+Index: fdk-aac/libFDK/include/ppc/fixmul_ppc.h
+===================================================================
+--- /dev/null 1970-01-01 00:00:00.000000000 +0000
++++ fdk-aac/libFDK/include/ppc/fixmul_ppc.h 2014-08-17 09:46:43.542491994 -0500
+@@ -0,0 +1,115 @@
++
++/* -----------------------------------------------------------------------------------------------------------
++Software License for The Fraunhofer FDK AAC Codec Library for Android
++
++� Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur F�rderung der angewandten Forschung e.V.
++ All rights reserved.
++
++ 1. INTRODUCTION
++The Fraunhofer FDK AAC Codec Library for Android ("FDK AAC Codec") is software that implements
++the MPEG Advanced Audio Coding ("AAC") encoding and decoding scheme for digital audio.
++This FDK AAC Codec software is intended to be used on a wide variety of Android devices.
++
++AAC's HE-AAC and HE-AAC v2 versions are regarded as today's most efficient general perceptual
++audio codecs. AAC-ELD is considered the best-performing full-bandwidth communications codec by
++independent studies and is widely deployed. AAC has been standardized by ISO and IEC as part
++of the MPEG specifications.
++
++Patent licenses for necessary patent claims for the FDK AAC Codec (including those of Fraunhofer)
++may be obtained through Via Licensing (www.vialicensing.com) or through the respective patent owners
++individually for the purpose of encoding or decoding bit streams in products that are compliant with
++the ISO/IEC MPEG audio standards. Please note that most manufacturers of Android devices already license
++these patent claims through Via Licensing or directly from the patent owners, and therefore FDK AAC Codec
++software may already be covered under those patent licenses when it is used for those licensed purposes only.
++
++Commercially-licensed AAC software libraries, including floating-point versions with enhanced sound quality,
++are also available from Fraunhofer. Users are encouraged to check the Fraunhofer website for additional
++applications information and documentation.
++
++2. COPYRIGHT LICENSE
++
++Redistribution and use in source and binary forms, with or without modification, are permitted without
++payment of copyright license fees provided that you satisfy the following conditions:
++
++You must retain the complete text of this software license in redistributions of the FDK AAC Codec or
++your modifications thereto in source code form.
++
++You must retain the complete text of this software license in the documentation and/or other materials
++provided with redistributions of the FDK AAC Codec or your modifications thereto in binary form.
++You must make available free of charge copies of the complete source code of the FDK AAC Codec and your
++modifications thereto to recipients of copies in binary form.
++
++The name of Fraunhofer may not be used to endorse or promote products derived from this library without
++prior written permission.
++
++You may not charge copyright license fees for anyone to use, copy or distribute the FDK AAC Codec
++software or your modifications thereto.
++
++Your modified versions of the FDK AAC Codec must carry prominent notices stating that you changed the software
++and the date of any change. For modified versions of the FDK AAC Codec, the term
++"Fraunhofer FDK AAC Codec Library for Android" must be replaced by the term
++"Third-Party Modified Version of the Fraunhofer FDK AAC Codec Library for Android."
++
++3. NO PATENT LICENSE
++
++NO EXPRESS OR IMPLIED LICENSES TO ANY PATENT CLAIMS, including without limitation the patents of Fraunhofer,
++ARE GRANTED BY THIS SOFTWARE LICENSE. Fraunhofer provides no warranty of patent non-infringement with
++respect to this software.
++
++You may use this FDK AAC Codec software or modifications thereto only for purposes that are authorized
++by appropriate patent licenses.
++
++4. DISCLAIMER
++
++This FDK AAC Codec software is provided by Fraunhofer on behalf of the copyright holders and contributors
++"AS IS" and WITHOUT ANY EXPRESS OR IMPLIED WARRANTIES, including but not limited to the implied warranties
++of merchantability and fitness for a particular purpose. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
++CONTRIBUTORS BE LIABLE for any direct, indirect, incidental, special, exemplary, or consequential damages,
++including but not limited to procurement of substitute goods or services; loss of use, data, or profits,
++or business interruption, however caused and on any theory of liability, whether in contract, strict
++liability, or tort (including negligence), arising in any way out of the use of this software, even if
++advised of the possibility of such damage.
++
++5. CONTACT INFORMATION
++
++Fraunhofer Institute for Integrated Circuits IIS
++Attention: Audio and Multimedia Departments - FDK AAC LL
++Am Wolfsmantel 33
++91058 Erlangen, Germany
++
++www.iis.fraunhofer.de/amm
++amm-info at iis.fraunhofer.de
++----------------------------------------------------------------------------------------------------------- */
++
++/*************************** Fraunhofer IIS FDK Tools **********************
++
++ Author(s):
++ Description: fixed point intrinsics
++
++******************************************************************************/
++
++#if defined(__powerpc__) && (defined(__GNUC__) || defined(__xlC__))
++
++#define FUNCTION_fixmuldiv2_DD
++
++#define FUNCTION_fixmuldiv2BitExact_DD
++#define fixmuldiv2BitExact_DD(a,b) fixmuldiv2_DD(a,b)
++
++#define FUNCTION_fixmulBitExact_DD
++#define fixmulBitExact_DD(a,b) fixmul_DD(a,b)
++
++#define FUNCTION_fixmuldiv2BitExact_DS
++#define fixmuldiv2BitExact_DS(a,b) fixmuldiv2_DS(a,b)
++
++#define FUNCTION_fixmulBitExact_DS
++#define fixmulBitExact_DS(a,b) fixmul_DS(a,b)
++
++
++inline INT fixmuldiv2_DD (const INT a, const INT b)
++{
++ INT result;
++ __asm__ ("mulhw %0, %1, %2" : "=r" (result) : "r" (a), "r" (b));
++ return result;
++}
++
++#endif /* __powerpc__ && (__GNUC__ || __xlC__) */
diff --git a/debian/patches/series b/debian/patches/series
index 7ddd8b6..5471e36 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
-disable_warning
+add_more_arch
+missing_ppc_files
diff --git a/debian/rules b/debian/rules
index a0b6a50..1543177 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
#!/usr/bin/make -f
ifneq (,$(findstring mips,$(DEB_HOST_ARCH)))
- CFLAGS+= -mips32r2
- export CFLAGS
+ CPPFLAGS+= -mips32r2
+ export CPPFLAGS
endif
%:
--
fdk-aac packaging
More information about the pkg-multimedia-commits
mailing list