Skip to content

Commit

Permalink
Add opencore-arm option. Not enabled by default for ffmpeg.
Browse files Browse the repository at this point in the history
It worked for me to play a "Adaptive Multi-Rate Codec (GSM telephony)" file
using ffplay.
  • Loading branch information
reedjc committed Apr 16, 2010
1 parent faf5925 commit 3304f95
Show file tree
Hide file tree
Showing 3 changed files with 25 additions and 4 deletions.
1 change: 1 addition & 0 deletions mk/defaults/options.description
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
4 changes: 2 additions & 2 deletions multimedia/ffmpeg/Makefile
Original file line number Diff line number Diff line change
@@ -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= [email protected]
HOMEPAGE= http://ffmpeg.mplayerhq.hu/
Expand Down
24 changes: 22 additions & 2 deletions multimedia/ffmpeg/options.mk
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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
###
Expand Down

0 comments on commit 3304f95

Please sign in to comment.