<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[117914] trunk/dports/audio/libfdk-aac</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/117914">117914</a></dd>
<dt>Author</dt> <dd>devans@macports.org</dd>
<dt>Date</dt> <dd>2014-03-16 21:46:42 -0700 (Sun, 16 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>libfdk-aac: fix +universal build for i386+ppc[+ppc64], maintainer update (#42881).</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsaudiolibfdkaacPortfile">trunk/dports/audio/libfdk-aac/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>trunk/dports/audio/libfdk-aac/files/</li>
<li><a href="#trunkdportsaudiolibfdkaacfilesfdkaacppcdiff">trunk/dports/audio/libfdk-aac/files/fdk-aac-ppc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsaudiolibfdkaacPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/audio/libfdk-aac/Portfile (117913 => 117914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libfdk-aac/Portfile 2014-03-17 03:28:35 UTC (rev 117913)
+++ trunk/dports/audio/libfdk-aac/Portfile 2014-03-17 04:46:42 UTC (rev 117914)
</span><span class="lines">@@ -5,6 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name libfdk-aac
</span><span class="cx"> version 0.1.3
</span><ins>+revision 1
</ins><span class="cx"> categories audio
</span><span class="cx"> license Restrictive
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -23,9 +24,7 @@
</span><span class="cx"> checksums rmd160 e9e4898e1af3315e106a255d2f0655ea49968341 \
</span><span class="cx"> sha256 a9cb872802cfb7a2aff7a549c114c547d1e518dd60c2f85942229cc20c0d0c8d
</span><span class="cx">
</span><del>-platform powerpc {
- configure.cppflags-append -D__powerpc__
-}
</del><ins>+patchfiles fdk-aac-ppc.diff
</ins><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://sourceforge.net/projects/opencore-amr/files/fdk-aac/
</span></span></pre></div>
<a id="trunkdportsaudiolibfdkaacfilesfdkaacppcdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/audio/libfdk-aac/files/fdk-aac-ppc.diff (0 => 117914)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/audio/libfdk-aac/files/fdk-aac-ppc.diff (rev 0)
+++ trunk/dports/audio/libfdk-aac/files/fdk-aac-ppc.diff 2014-03-17 04:46:42 UTC (rev 117914)
</span><span class="lines">@@ -0,0 +1,340 @@
</span><ins>+--- libFDK/include/FDK_archdef.h
++++ libFDK/include/FDK_archdef.h
+@@ -107,6 +107,10 @@ amm-info@iis.fraunhofer.de
+ #define __arm__
+ #endif
+
++#if defined(_ARCH_PPC) && !defined(__powerpc__)
++#define __powerpc__ 1
++#endif
++
+
+
+ /* Define __ARM_ARCH_5TE__ if armv5te features are supported */
+@@ -158,7 +162,7 @@ amm-info@iis.fraunhofer.de
+ /* Define preferred Multiplication type */
+ #if defined(FDK_HIGH_PERFORMANCE) && !defined(FDK_HIGH_QUALITY) /* FDK_HIGH_PERFORMANCE */
+
+-#if defined(__mips__) || defined(__powerpc__) || defined(__sh__)
++#if defined(__mips__) || defined(__sh__)
+ #define ARCH_PREFER_MULT_16x16
+ #undef SINETABLE_16BIT
+ #undef POW2COEFF_16BIT
+@@ -201,6 +205,14 @@ amm-info@iis.fraunhofer.de
+ #define POW2COEFF_16BIT
+ #define LDCOEFF_16BIT
+
++#elif defined(__powerpc__)
++#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)! <<<<
+--- libFDK/include/clz.h
++++ libFDK/include/clz.h
+@@ -103,6 +103,9 @@ amm-info@iis.fraunhofer.de
+ #elif defined(__x86__) /* cppp replaced: elif */
+ #include "x86/clz_x86.h"
+
++#elif defined(__powerpc__)
++#include "ppc/clz_ppc.h"
++
+ #endif /* all cores */
+
+
+--- libFDK/include/common_fix.h
++++ libFDK/include/common_fix.h
+@@ -226,7 +226,7 @@ FDK_INLINE FIXP_SGL fAbs(FIXP_SGL x)
+ { return fixabs_S(x); }
+
+ /* workaround for TI C6x compiler but not for TI ARM9E compiler */
+-#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__)
++#if (!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__LP64__)
+ FDK_INLINE INT fAbs(INT x)
+ { return fixabs_I(x); }
+ #endif
+@@ -336,7 +336,7 @@ FDK_INLINE FIXP_SGL fMax(FIXP_SGL a, FIXP_SGL b)
+ { return fixmax_S(a,b); }
+
+ /* workaround for TI C6x compiler but not for TI ARM9E */
+-#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__x86_64__)) || (FIX_FRACT == 1)
++#if ((!defined(__TI_COMPILER_VERSION__) || defined(__TI_TMS470_V5__)) && !defined(__LP64__)) || (FIX_FRACT == 1)
+ FDK_INLINE INT fMax(INT a, INT b)
+ { return fixmax_I(a,b); }
+ FDK_INLINE INT fMin(INT a, INT b)
+--- libFDK/include/fixmul.h
++++ libFDK/include/fixmul.h
+@@ -104,6 +104,9 @@ amm-info@iis.fraunhofer.de
+ #elif defined(__x86__) /* cppp replaced: elif */
+ #include "x86/fixmul_x86.h"
+
++#elif defined(__powerpc__)
++#include "ppc/fixmul_ppc.h"
++
+ #endif /* all cores */
+
+ /*************************************************************************
+--- /dev/null
++++ libFDK/include/ppc/clz_ppc.h
+@@ -0,0 +1,102 @@
++
++/* -----------------------------------------------------------------------------------------------------------
++Software License for The Fraunhofer FDK AAC Codec Library for Android
++
++\xA9 Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur F\xF6rderung 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@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__) */
+--- /dev/null
++++ libFDK/include/ppc/fixmul_ppc.h
+@@ -0,0 +1,115 @@
++
++/* -----------------------------------------------------------------------------------------------------------
++Software License for The Fraunhofer FDK AAC Codec Library for Android
++
++\xA9 Copyright 1995 - 2013 Fraunhofer-Gesellschaft zur F\xF6rderung 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@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__) */
+--- libSYS/include/machine_type.h
++++ libSYS/include/machine_type.h
+@@ -154,15 +154,15 @@ amm-info@iis.fraunhofer.de
+
+ typedef signed int INT;
+ typedef unsigned int UINT;
+-#ifdef __x86_64__
++#ifdef __LP64__
+ /* force FDK long-datatypes to 4 byte */
+ /* jdr: Use defines to avoid type alias problems on 64 bit machines. */
+ #define LONG INT
+ #define ULONG UINT
+-#else /* __x86_64__ */
++#else /* __LP64__ */
+ typedef signed long LONG;
+ typedef unsigned long ULONG;
+-#endif /* __x86_64__ */
++#endif /* __LP64__ */
+ typedef signed short SHORT;
+ typedef unsigned short USHORT;
+ typedef signed char SCHAR;
+--- libSYS/src/genericStds.cpp
++++ libSYS/src/genericStds.cpp
+@@ -92,10 +92,10 @@ amm-info@iis.fraunhofer.de
+
+ #define _CRT_SECURE_NO_WARNINGS
+
+-#include "genericStds.h"
+-
+ #include <math.h>
+
++#include "genericStds.h"
++
+ /* library info */
+ #define SYS_LIB_VL0 1
+ #define SYS_LIB_VL1 3
</ins></span></pre>
</div>
</div>
</body>
</html>