From 3848553917f5699b2144072a13d539fe5db7e824 Mon Sep 17 00:00:00 2001 From: czarkoff Date: Thu, 12 Jan 2017 16:43:43 +0000 Subject: [PATCH] Update to fdk-aac 0.1.5. --- audio/fdk-aac/Makefile | 5 ++--- audio/fdk-aac/distinfo | 4 ++-- .../patches/patch-libFDK_include_FDK_archdef_h | 8 ++++---- .../patch-libFDK_include_mips_cplx_mul_h | 18 ------------------ 4 files changed, 8 insertions(+), 27 deletions(-) delete mode 100644 audio/fdk-aac/patches/patch-libFDK_include_mips_cplx_mul_h diff --git a/audio/fdk-aac/Makefile b/audio/fdk-aac/Makefile index 4b9b118d9c5..b7d05d738bd 100644 --- a/audio/fdk-aac/Makefile +++ b/audio/fdk-aac/Makefile @@ -1,8 +1,7 @@ -# $OpenBSD: Makefile,v 1.8 2016/03/11 20:28:21 naddy Exp $ +# $OpenBSD: Makefile,v 1.9 2017/01/12 16:43:43 czarkoff Exp $ COMMENT = modified Fraunhofer FDK AAC encoder and decoder -DISTNAME = fdk-aac-0.1.4 -REVISION = 0 +DISTNAME = fdk-aac-0.1.5 CATEGORIES = audio HOMEPAGE = http://sourceforge.net/projects/opencore-amr/ MAINTAINER = Dmitrij D. Czarkoff diff --git a/audio/fdk-aac/distinfo b/audio/fdk-aac/distinfo index 1730b7b762d..6123d05af87 100644 --- a/audio/fdk-aac/distinfo +++ b/audio/fdk-aac/distinfo @@ -1,2 +1,2 @@ -SHA256 (fdk-aac-0.1.4.tar.gz) = WRD+eIZ3yhNTLj9Ht6+qAdcjNNRqLV4dHwgPEXP/Fas= -SIZE (fdk-aac-0.1.4.tar.gz) = 1986515 +SHA256 (fdk-aac-0.1.5.tar.gz) = IWRZKme0Z+WyD9za9b1MUGhRmQZzkcb8rU+lUhybTdc= +SIZE (fdk-aac-0.1.5.tar.gz) = 2091081 diff --git a/audio/fdk-aac/patches/patch-libFDK_include_FDK_archdef_h b/audio/fdk-aac/patches/patch-libFDK_include_FDK_archdef_h index 91b37150324..da1fc1a61aa 100644 --- a/audio/fdk-aac/patches/patch-libFDK_include_FDK_archdef_h +++ b/audio/fdk-aac/patches/patch-libFDK_include_FDK_archdef_h @@ -1,7 +1,7 @@ -$OpenBSD: patch-libFDK_include_FDK_archdef_h,v 1.1 2015/05/18 09:48:39 czarkoff Exp $ ---- libFDK/include/FDK_archdef.h.orig Sat May 16 07:30:14 2015 -+++ libFDK/include/FDK_archdef.h Sat May 16 07:30:17 2015 -@@ -205,7 +205,7 @@ amm-info@iis.fraunhofer.de +$OpenBSD: patch-libFDK_include_FDK_archdef_h,v 1.2 2017/01/12 16:43:43 czarkoff Exp $ +--- libFDK/include/FDK_archdef.h.orig Wed Jan 11 09:46:00 2017 ++++ libFDK/include/FDK_archdef.h Thu Jan 12 16:54:44 2017 +@@ -212,7 +212,7 @@ amm-info@iis.fraunhofer.de #define POW2COEFF_16BIT #define LDCOEFF_16BIT diff --git a/audio/fdk-aac/patches/patch-libFDK_include_mips_cplx_mul_h b/audio/fdk-aac/patches/patch-libFDK_include_mips_cplx_mul_h deleted file mode 100644 index dcad8cb3c47..00000000000 --- a/audio/fdk-aac/patches/patch-libFDK_include_mips_cplx_mul_h +++ /dev/null @@ -1,18 +0,0 @@ -$OpenBSD: patch-libFDK_include_mips_cplx_mul_h,v 1.2 2015/08/13 08:57:27 jasper Exp $ - -https://github.com/mstorsjo/fdk-aac/pull/34: -Only enable code using mips32/mips64 instructions if the compiler is targetting -this ISA. (integer madd and msub instructions aren't available in the -``canonical'' mips ISAs) - ---- libFDK/include/mips/cplx_mul.h.orig Wed Mar 11 15:27:03 2015 -+++ libFDK/include/mips/cplx_mul.h Wed Aug 12 11:47:59 2015 -@@ -89,7 +89,7 @@ amm-info@iis.fraunhofer.de - ******************************************************************************/ - - --#if defined(__GNUC__) && defined(__mips__) && __mips_isa_rev < 6 -+#if defined(__GNUC__) && defined(__mips_isa_rev) && __mips_isa_rev < 6 - - - //#define FUNCTION_cplxMultDiv2_32x16