From owner-svn-ports-all@freebsd.org Sun Oct 28 16:28:16 2018 Return-Path: Delivered-To: svn-ports-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id DA06E10D8020; Sun, 28 Oct 2018 16:28:16 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 7EDC28BE59; Sun, 28 Oct 2018 16:28:16 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5AFC121C7A; Sun, 28 Oct 2018 16:28:16 +0000 (UTC) (envelope-from riggs@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w9SGSGOW054315; Sun, 28 Oct 2018 16:28:16 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SGSFMZ054313; Sun, 28 Oct 2018 16:28:15 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201810281628.w9SGSFMZ054313@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: riggs set sender to riggs@FreeBSD.org using -f From: Thomas Zander Date: Sun, 28 Oct 2018 16:28:15 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r483316 - in head/multimedia/ffmpeg: . files X-SVN-Group: ports-head X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in head/multimedia/ffmpeg: . files X-SVN-Commit-Revision: 483316 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2018 16:28:17 -0000 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