From owner-svn-ports-all@freebsd.org Sun Feb 17 17:03:51 2019 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 BD52114D53A4; Sun, 17 Feb 2019 17:03:50 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 516E475E93; Sun, 17 Feb 2019 17:03:48 +0000 (UTC) (envelope-from jbeich@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 114CA21478; Sun, 17 Feb 2019 17:03:45 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x1HH3iNh053001; Sun, 17 Feb 2019 17:03:44 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x1HH3ini053000; Sun, 17 Feb 2019 17:03:44 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201902171703.x1HH3ini053000@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Sun, 17 Feb 2019 17:03:44 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r493172 - head/multimedia/ffmpeg X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/multimedia/ffmpeg X-SVN-Commit-Revision: 493172 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 516E475E93 X-Spamd-Bar: -- Authentication-Results: mx1.freebsd.org X-Spamd-Result: default: False [-2.96 / 15.00]; local_wl_from(0.00)[FreeBSD.org]; NEURAL_HAM_MEDIUM(-1.00)[-0.998,0]; NEURAL_HAM_SHORT(-0.96)[-0.964,0]; ASN(0.00)[asn:11403, ipnet:2610:1c1:1::/48, country:US]; NEURAL_HAM_LONG(-1.00)[-0.999,0] 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, 17 Feb 2019 17:03:51 -0000 Author: jbeich Date: Sun Feb 17 17:03:44 2019 New Revision: 493172 URL: https://svnweb.freebsd.org/changeset/ports/493172 Log: multimedia/ffmpeg: unbreak "make makesum" after r493156 ====> Two or more enabled options conflict with each other =====> Option SVTAV1 conflicts with SVTVP9 (select only one) ======> Both vendor patches cannot be applied at the same time =====> Option SVTVP9 conflicts with SVTAV1 (select only one) ======> Both vendor patches cannot be applied at the same time *** Error code 1 Modified: head/multimedia/ffmpeg/Makefile (contents, props changed) Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Sun Feb 17 17:03:32 2019 (r493171) +++ head/multimedia/ffmpeg/Makefile Sun Feb 17 17:03:44 2019 (r493172) @@ -414,10 +414,11 @@ SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 SVTAV1_CONFIGURE_ON= --enable-libsvtav1 SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/37a5b96/ffmpeg_plugin/:svtav1 SVTAV1_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 -SVTAV1_PREVENTS= SVTVP9 -SVTAV1_PREVENTS_MSG= Both vendor patches cannot be applied at the same time .if make(makesum) .MAKEFLAGS: WITH+=SVTAV1 +.else +SVTAV1_PREVENTS= SVTVP9 +SVTAV1_PREVENTS_MSG= Only one SVT vendor patch can be applied at the same time .endif # svt-vp9 @@ -425,10 +426,11 @@ SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9 SVTVP9_CONFIGURE_ON= --enable-libsvtvp9 SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/2437369/ffmpeg_plugin/:svtvp9 SVTVP9_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 -SVTVP9_PREVENTS= SVTAV1 -SVTVP9_PREVENTS_MSG= ${SVTAV1_PREVENTS_MSG} .if make(makesum) .MAKEFLAGS: WITH+=SVTVP9 +.else +SVTVP9_PREVENTS= SVTAV1 +SVTVP9_PREVENTS_MSG= ${SVTAV1_PREVENTS_MSG} .endif # tensorflow