diff options
| author | Thomas Zander <riggs@FreeBSD.org> | 2018-10-28 16:28:15 +0000 |
|---|---|---|
| committer | Thomas Zander <riggs@FreeBSD.org> | 2018-10-28 16:28:15 +0000 |
| commit | 5b633a3df0d8662ca17226300d89649973c69e81 (patch) | |
| tree | 67a7bedaa6e9811f46553dca0fd8ba8c75bdaab8 /multimedia | |
| parent | a67ebd8cdb8ef2bff718e94d0e1e70bcab8bf0bd (diff) | |
Unbreak build on 12-BETA after OpenSSL 1.1.1 import into base
PR: 232707
Submitted by: fluffy
MFH: 2018Q4
Notes
Notes:
svn path=/head/; revision=483316
Diffstat (limited to 'multimedia')
| -rw-r--r-- | multimedia/ffmpeg/Makefile | 2 | ||||
| -rw-r--r-- | multimedia/ffmpeg/files/patch-configure | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile index 308441e0e45a..19a479a4c945 100644 --- a/multimedia/ffmpeg/Makefile +++ b/multimedia/ffmpeg/Makefile @@ -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/ diff --git a/multimedia/ffmpeg/files/patch-configure b/multimedia/ffmpeg/files/patch-configure index dd9547cf6d8a..946736bf4e07 100644 --- a/multimedia/ffmpeg/files/patch-configure +++ b/multimedia/ffmpeg/files/patch-configure @@ -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 |