From owner-svn-ports-branches@freebsd.org Sun Oct 28 17:52:05 2018 Return-Path: Delivered-To: svn-ports-branches@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 620C610DB8CA; Sun, 28 Oct 2018 17:52:05 +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 17A448F251; Sun, 28 Oct 2018 17:52:05 +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 D2D2222AE1; Sun, 28 Oct 2018 17:52:04 +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 w9SHq4K7000318; Sun, 28 Oct 2018 17:52:04 GMT (envelope-from riggs@FreeBSD.org) Received: (from riggs@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w9SHq4H6000316; Sun, 28 Oct 2018 17:52:04 GMT (envelope-from riggs@FreeBSD.org) Message-Id: <201810281752.w9SHq4H6000316@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 17:52:04 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-branches@freebsd.org Subject: svn commit: r483320 - in branches/2018Q4/multimedia/ffmpeg: . files X-SVN-Group: ports-branches X-SVN-Commit-Author: riggs X-SVN-Commit-Paths: in branches/2018Q4/multimedia/ffmpeg: . files X-SVN-Commit-Revision: 483320 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-branches@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for all the branches of the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Oct 2018 17:52:05 -0000 Author: riggs Date: Sun Oct 28 17:52:04 2018 New Revision: 483320 URL: https://svnweb.freebsd.org/changeset/ports/483320 Log: MFH: r482030 r482658 r482928 r483316 Enable XCB option by default Rationale: - XCB offers a comfortable screen capturing function via ffmpeg -f x11grab - In the default package libxcb is installed as a dependency of libX11 anyway, hence no need to disable it for ffmpeg specifically PR: 231215 Reported by: vermaden@interia.pl multimedia/ffmpeg: unbreak ALSA=off after r468844 https://ffmpeg.org/pipermail/ffmpeg-devel/2018-September/234516.html PR: 232498 multimedia/ffmpeg: Do not set DATADIR twice PR: 232637 Unbreak build on 12-BETA after OpenSSL 1.1.1 import into base PR: 232707 Submitted by: fluffy Approved by: ports-secteam (riggs) Modified: branches/2018Q4/multimedia/ffmpeg/Makefile branches/2018Q4/multimedia/ffmpeg/files/patch-configure Directory Properties: branches/2018Q4/ (props changed) Modified: branches/2018Q4/multimedia/ffmpeg/Makefile ============================================================================== --- branches/2018Q4/multimedia/ffmpeg/Makefile Sun Oct 28 17:29:13 2018 (r483319) +++ branches/2018Q4/multimedia/ffmpeg/Makefile Sun Oct 28 17:52:04 2018 (r483320) @@ -3,7 +3,7 @@ PORTNAME= ffmpeg PORTVERSION= 4.0.2 -PORTREVISION= 5 +PORTREVISION= 8 PORTEPOCH= 1 CATEGORIES= multimedia audio ipv6 net MASTER_SITES= https://ffmpeg.org/releases/ @@ -39,7 +39,7 @@ OPTIONS_DEFINE= ALSA AMR_NB AMR_WB AOM ASS BEIGNET BS2 OPTIONS_DEFAULT= FONTCONFIG FREETYPE FREI0R GMP GNUTLS ICONV \ OPENCV OPTIMIZED_CFLAGS OPUS RTCPU THEORA V4L VAAPI VDPAU \ - VORBIS VPX X264 X265 XVID + VORBIS VPX X264 X265 XCB XVID .if !exists(${.CURDIR:H:H}/net/srt) # https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/a2fc8dbae853 Modified: branches/2018Q4/multimedia/ffmpeg/files/patch-configure ============================================================================== --- branches/2018Q4/multimedia/ffmpeg/files/patch-configure Sun Oct 28 17:29:13 2018 (r483319) +++ branches/2018Q4/multimedia/ffmpeg/files/patch-configure Sun Oct 28 17:52:04 2018 (r483320) @@ -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