pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/multimedia/ffmpeg2 Added gnutls and opeenssl as options
details: https://anonhg.NetBSD.org/pkgsrc/rev/7f64cf71f9e6
branches: trunk
changeset: 646566:7f64cf71f9e6
user: adam <adam%pkgsrc.org@localhost>
date: Wed Feb 11 12:51:41 2015 +0000
description:
Added gnutls and opeenssl as options
diffstat:
multimedia/ffmpeg2/options.mk | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diffs (59 lines):
diff -r 15cdece1fe65 -r 7f64cf71f9e6 multimedia/ffmpeg2/options.mk
--- a/multimedia/ffmpeg2/options.mk Wed Feb 11 12:36:00 2015 +0000
+++ b/multimedia/ffmpeg2/options.mk Wed Feb 11 12:51:41 2015 +0000
@@ -1,10 +1,10 @@
-# $NetBSD: options.mk,v 1.5 2014/11/30 19:08:50 adam Exp $
+# $NetBSD: options.mk,v 1.6 2015/02/11 12:51:41 adam Exp $
# Global and legacy options
PKG_OPTIONS_VAR= PKG_OPTIONS.ffmpeg2
-PKG_SUPPORTED_OPTIONS= ass faac fdk-aac lame libvpx opencore-amr theora \
- vorbis x264 x265 xvid
+PKG_SUPPORTED_OPTIONS= ass faac fdk-aac gnutls lame libvpx opencore-amr \
+ openssl theora vorbis x264 x265 xvid
PKG_SUGGESTED_OPTIONS= lame ass libvpx theora vorbis x264 xvid
# Add VDPAU if it is available
@@ -52,11 +52,18 @@
.include "../../audio/fdk-aac/buildlink3.mk"
.endif
+# GnuTLS support
+.if !empty(PKG_OPTIONS:Mgnutls)
+CONFIGURE_ARGS+= --enable-gnutls
+.include "../../security/gnutls/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-gnutls
+.endif
+
# opencore-amr option
.if !empty(PKG_OPTIONS:Mopencore-amr)
CONFIGURE_ARGS+= --enable-libopencore-amrnb
CONFIGURE_ARGS+= --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
@@ -64,13 +71,20 @@
# 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
CONFIGURE_ARGS+= --disable-libopencore-amrwb
.endif
+# OpenSSL support
+.if !empty(PKG_OPTIONS:Mopenssl)
+CONFIGURE_ARGS+= --enable-openssl
+.include "../../security/openssl/buildlink3.mk"
+.else
+CONFIGURE_ARGS+= --disable-openssl
+.endif
+
# OGG Theora support
.if !empty(PKG_OPTIONS:Mtheora)
CONFIGURE_ARGS+= --enable-libtheora
Home |
Main Index |
Thread Index |
Old Index