From 50681dc9e809cdcb54430c485fd307cd8e1046ba Mon Sep 17 00:00:00 2001
From: reed <reed@pkgsrc.org>
Date: Fri, 16 Apr 2010 15:49:12 +0000
Subject: Add opencore-arm option. Not enabled by default for ffmpeg.

It worked for me to play a "Adaptive Multi-Rate Codec (GSM telephony)" file
using ffplay.
---
 mk/defaults/options.description |  1 +
 multimedia/ffmpeg/Makefile      |  4 ++--
 multimedia/ffmpeg/options.mk    | 24 ++++++++++++++++++++++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/mk/defaults/options.description b/mk/defaults/options.description
index 86b55ba7e93..af120f536a9 100644
--- a/mk/defaults/options.description
+++ b/mk/defaults/options.description
@@ -358,6 +358,7 @@ ogg			Enable Ogg support.
 oniguruma		Support regular expressions via the oniguruma library.
 online-tests		Requiring Internet connectivity for "make test".
 openal			Enable OpenAL support.
+opencore-amr		Enable OpenCORE Adaptive Multi-Rate speech codecs.
 openexr			Use OpenEXR as imaging library.
 opengl			Use OpenGL as display library.
 opengrok-build		Enable building of OpenGrok from source.
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index f48e4b9d774..366c20b31ea 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2010/04/02 11:19:40 jmmv Exp $
+# $NetBSD: Makefile,v 1.59 2010/04/16 15:49:12 reed Exp $
 
-PKGREVISION=	6
+PKGREVISION=	7
 
 MAINTAINER=	ahoka@NetBSD.org
 HOMEPAGE=	http://ffmpeg.mplayerhq.hu/
diff --git a/multimedia/ffmpeg/options.mk b/multimedia/ffmpeg/options.mk
index 694c59f1656..4de1ce0b6fc 100644
--- a/multimedia/ffmpeg/options.mk
+++ b/multimedia/ffmpeg/options.mk
@@ -1,9 +1,9 @@
-# $NetBSD: options.mk,v 1.14 2009/08/05 11:22:17 ahoka Exp $
+# $NetBSD: options.mk,v 1.15 2010/04/16 15:49:12 reed Exp $
 
 # Global and legacy options
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.ffmpeg
-PKG_SUPPORTED_OPTIONS=	theora xvid faad faac x264
+PKG_SUPPORTED_OPTIONS=	theora xvid faad faac x264 opencore-amr
 PKG_SUGGESTED_OPTIONS=	theora xvid x264
 #PKG_OPTIONS_OPTIONAL_GROUPS=	aac-decoder
 #PKG_OPTIONS_GROUP.aac-decoder=	faad faac
@@ -32,6 +32,26 @@ CONFIGURE_ARGS+=	--enable-libfaac \
 .include "../../audio/faac/buildlink3.mk"
 .endif
 
+###
+### opencore-amr option
+###
+
+.if !empty(PKG_OPTIONS:Mopencore-amr)
+CONFIGURE_ARGS+=  --enable-libopencore-amrnb --enable-libopencore-amrwb
+
+# "The OpenCORE external libraries are under the Apache License
+# 2.0. That license is incompatible with the LGPL v2.1 and the GPL
+# v2, but not with version 3 of those licenses. So to combine the
+# OpenCORE libraries with FFmpeg, the license version needs to be
+# upgraded by passing --enable-version3 to configure."
+CONFIGURE_ARGS+=	--enable-version3
+# TODO: LICENSE
+
+.include "../../audio/opencore-amr/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=  --disable-libopencore-amrnb --disable-libopencore-amrwb
+.endif
+
 ###
 ### OGG Theora support
 ###
-- 
cgit v1.2.3