Attachment 198654 Details for Bug 232707 – [UNBREAK] multimedia/ffmpeg: unbreak on 12-BETA with SSL option

[patch] [UNBREAK] multimedia/ffmpeg: unbreak on 12-BETA with SSL option

ffmpeg.diff (text/plain), 1.42 KB, created by Dima Panov on 2018-10-26 11:12:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Dima Panov

Created: 2018-10-26 11:12:05 UTC

Size: 1.42 KB

patch

obsolete

>Index: multimedia/ffmpeg/Makefile
>===================================================================
>--- multimedia/ffmpeg/Makefile	(revision 482997)
>+++ multimedia/ffmpeg/Makefile	(working copy)
>@@ -3,7 +3,7 @@
> 
> PORTNAME=	ffmpeg
> PORTVERSION=	4.0.2
>-PORTREVISION=	7
>+PORTREVISION=	8
> PORTEPOCH=	1
> CATEGORIES=	multimedia audio ipv6 net
> MASTER_SITES=	https://ffmpeg.org/releases/
>Index: multimedia/ffmpeg/files/patch-configure
>===================================================================
>--- multimedia/ffmpeg/files/patch-configure	(revision 482997)
>+++ multimedia/ffmpeg/files/patch-configure	(working copy)
>@@ -14,6 +14,14 @@
>  cpu="generic"
>  intrinsics="none"
>  
>+@@ -6122,6 +6117,7 @@
>+                                die "ERROR: OpenMAX IL headers not found"; } && enable omx
>+ enabled openssl           && { check_pkg_config openssl openssl openssl/ssl.h OPENSSL_init_ssl ||
>+                                check_pkg_config openssl openssl openssl/ssl.h SSL_library_init ||
>++                               check_lib openssl openssl/ssl.h OPENSSL_init_ssl -lssl -lcrypto ||
>+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto ||
>+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl32 -leay32 ||
>+                                check_lib openssl openssl/ssl.h SSL_library_init -lssl -lcrypto -lws2_32 -lgdi32 ||
> @@ -6234,8 +6229,10 @@ else
>  EOF
>  fi

Actions: View | Diff

Attachments on bug 232707: 198654