Attachment 149627 Details for Bug 195202 – fix

[patch] fix

openssl.diff (text/plain), 1.42 KB, created by Jan Beich on 2014-11-20 03:38:23 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2014-11-20 03:38:23 UTC

Size: 1.42 KB

patch

obsolete

>Index: multimedia/ffmpeg/Makefile
>===================================================================
>--- multimedia/ffmpeg/Makefile	(revision 372830)
>+++ multimedia/ffmpeg/Makefile	(working copy)
>@@ -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}${PKGNAMESUFFI
> 
> # ssl
> .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
>-USE_OPENSSL=	yes
> FFMPEG_NONFREE=	yes
> .endif
> 
>Index: multimedia/ffmpeg24/Makefile
>===================================================================
>--- multimedia/ffmpeg24/Makefile	(revision 372830)
>+++ multimedia/ffmpeg24/Makefile	(working copy)
>@@ -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}${PKGNAMESUFFI
> 
> # ssl
> .if ${PORT_OPTIONS:MOPENSSL} && empty(PORT_OPTIONS:MGNUTLS)
>-USE_OPENSSL=	yes
> FFMPEG_NONFREE=	yes
> .endif
>

Actions: View | Diff

Attachments on bug 195202: 149627