svn commit: r483316 - in head/multimedia/ffmpeg: . files

[Thomas Zander]

Author: riggs
Date: Sun Oct 28 16:28:15 2018
New Revision: 483316
URL: https://svnweb.freebsd.org/changeset/ports/483316

Log:
  Unbreak build on 12-BETA after OpenSSL 1.1.1 import into base
  
  PR:		232707
  Submitted by:	fluffy
  MFH:		2018Q4

Modified:
  head/multimedia/ffmpeg/Makefile
  head/multimedia/ffmpeg/files/patch-configure

Modified: head/multimedia/ffmpeg/Makefile
==============================================================================
--- head/multimedia/ffmpeg/Makefile	Sun Oct 28 16:26:41 2018	(r483315)
+++ head/multimedia/ffmpeg/Makefile	Sun Oct 28 16:28:15 2018	(r483316)
@@ -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/

Modified: head/multimedia/ffmpeg/files/patch-configure
==============================================================================
--- head/multimedia/ffmpeg/files/patch-configure	Sun Oct 28 16:26:41 2018	(r483315)
+++ head/multimedia/ffmpeg/files/patch-configure	Sun Oct 28 16:28:15 2018	(r483316)
@@ -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