[SCM] fdk-aac/master: Drop debian/patches/missing_ppc_files
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Jan 16 19:46:23 UTC 2016
The following commit has been merged in the master branch:
commit 287883964757f059ccbd5e45656255616169d910
Author: Alessio Treglia <alessio.treglia at smartodds.co.uk>
Date: Sat Jan 16 17:47:58 2016 +0000
Drop debian/patches/missing_ppc_files
No longer required.
diff --git a/debian/patches/missing_ppc_files b/debian/patches/missing_ppc_files
deleted file mode 100644
index 750113f..0000000
--- a/debian/patches/missing_ppc_files
+++ /dev/null
@@ -1,225 +0,0 @@
-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 5471e36..06db283 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
add_more_arch
-missing_ppc_files
--
fdk-aac packaging
More information about the pkg-multimedia-commits
mailing list