svn commit: r372953 - in head/multimedia: ffmpeg ffmpeg24
Thomas Zander
riggs at FreeBSD.org
Thu Nov 20 19:34:20 UTC 2014
Author: riggs
Date: Thu Nov 20 19:34:19 2014
New Revision: 372953
URL: https://svnweb.freebsd.org/changeset/ports/372953
QAT: https://qat.redports.org/buildarchive/r372953/
Log:
Un-break non-default OPTION OPENSSL
PR: 195202
Submitted by: jbeich at vfemail.net
Modified:
head/multimedia/ffmpeg/Makefile
head/multimedia/ffmpeg24/Makefile
Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile Thu Nov 20 18:35:57 2014 (r372952)
+++ head/multimedia/ffmpeg/Makefile Thu Nov 20 19:34:19 2014 (r372953)
@@ -143,6 +143,10 @@ OPENCV_CONFIGURE_ENABLE= libopencv
OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
+# openssl
+OPENSSL_USE= OPENSSL=yes
+OPENSSL_CONFIGURE_ENABLE= openssl
+
# opus
OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
OPUS_CONFIGURE_ENABLE= libopus
@@ -214,7 +218,6 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${PK
# ssl
.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
-USE_OPENSSL= yes
FFMPEG_NONFREE= yes
.endif
Modified: head/multimedia/ffmpeg24/Makefile
==============================================================================
--- head/multimedia/ffmpeg24/Makefile Thu Nov 20 18:35:57 2014 (r372952)
+++ head/multimedia/ffmpeg24/Makefile Thu Nov 20 19:34:19 2014 (r372953)
@@ -150,6 +150,10 @@ OPENCV_CONFIGURE_ENABLE= libopencv
OPENJPEG_LIB_DEPENDS= libopenjpeg.so:${PORTSDIR}/graphics/openjpeg15
OPENJPEG_CONFIGURE_ENABLE= libopenjpeg
+# openssl
+OPENSSL_USE= OPENSSL=yes
+OPENSSL_CONFIGURE_ENABLE= openssl
+
# opus
OPUS_LIB_DEPENDS= libopus.so:${PORTSDIR}/audio/opus
OPUS_CONFIGURE_ENABLE= libopus
@@ -221,7 +225,6 @@ DATADIR= ${PREFIX}/share/${PORTNAME}${PK
# ssl
.if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
-USE_OPENSSL= yes
FFMPEG_NONFREE= yes
.endif
More information about the svn-ports-all
mailing list