From owner-svn-ports-all@freebsd.org Fri Jul 24 04:10:32 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C3CF636E81C; Fri, 24 Jul 2020 04:10:32 +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) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 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 4BCbMr4R0dz4b1T; Fri, 24 Jul 2020 04:10:32 +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 7CA6F2449B; Fri, 24 Jul 2020 04:10:32 +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 06O4AWF3027320; Fri, 24 Jul 2020 04:10:32 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 06O4AWPF027319; Fri, 24 Jul 2020 04:10:32 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202007240410.06O4AWPF027319@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 24 Jul 2020 04:10:32 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r542999 - head/multimedia/ffmpeg X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: head/multimedia/ffmpeg X-SVN-Commit-Revision: 542999 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.33 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: Fri, 24 Jul 2020 04:10:32 -0000 Author: jbeich Date: Fri Jul 24 04:10:31 2020 New Revision: 542999 URL: https://svnweb.freebsd.org/changeset/ports/542999 Log: multimedia/ffmpeg: revert r538687 after r541984/r542846 SVT patches no longer need to be applied in a specific order to enable more than one SVT encoder. PR: 248166 Submitted by: VVD MFH: 2020Q3 (simplify future MFHs) Modified: head/multimedia/ffmpeg/Makefile (contents, props changed) head/multimedia/ffmpeg/distinfo (contents, props changed) Modified: head/multimedia/ffmpeg/Makefile ============================================================================== --- head/multimedia/ffmpeg/Makefile Fri Jul 24 04:07:14 2020 (r542998) +++ head/multimedia/ffmpeg/Makefile Fri Jul 24 04:10:31 2020 (r542999) @@ -7,9 +7,6 @@ PORTEPOCH= 1 CATEGORIES= multimedia audio net MASTER_SITES= https://ffmpeg.org/releases/ -PATCH_SITES= ${SVTHEVC_PATCH_SITES_} ${SVTAV1_PATCH_SITES_} ${SVTVP9_PATCH_SITES_} -PATCHFILES= ${SVTHEVC_PATCHFILES_} ${SVTAV1_PATCHFILES_} ${SVTVP9_PATCHFILES_} - MAINTAINER= multimedia@FreeBSD.org COMMENT= Realtime audio/video encoder/converter and streaming server @@ -455,32 +452,42 @@ SRT_CONFIGURE_ENABLE= libsrt # svt-av1 SVTAV1_LIB_DEPENDS= libSvtAv1Enc.so:multimedia/svt-av1 -SVTAV1_CONFIGURE_ENABLE= libsvtav1 -SVTAV1_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1 -SVTAV1_PATCHFILES_= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 +SVTAV1_CONFIGURE_ON= --enable-libsvtav1 +SVTAV1_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-AV1/raw/v0.8.4/ffmpeg_plugin/:svtav1 +SVTAV1_PATCHFILES= 0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch:-p1:svtav1 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) # https://github.com/OpenVisualCloud/SVT-AV1/issues/691 SVTAV1_LDFLAGS= -fuse-ld=lld .endif +.if make(makesum) +.MAKEFLAGS: WITH+=SVTAV1 +.endif # svt-hevc SVTHEVC_LIB_DEPENDS= libSvtHevcEnc.so:multimedia/svt-hevc -SVTHEVC_CONFIGURE_ENABLE= libsvthevc -SVTHEVC_PATCH_SITES_= https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc -SVTHEVC_PATCHFILES_= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ +SVTHEVC_CONFIGURE_ON= --enable-libsvthevc +SVTHEVC_PATCH_SITES= https://github.com/Intel/SVT-HEVC/raw/v1.4.3/ffmpeg_plugin/:svthevc +SVTHEVC_PATCHFILES= 0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch:-p1:svthevc \ 0002-doc-Add-libsvt_hevc-encoder-docs.patch:-p1:svthevc .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) SVTHEVC_LDFLAGS= -fuse-ld=lld .endif +.if make(makesum) +.MAKEFLAGS: WITH+=SVTHEVC +.endif # svt-vp9 SVTVP9_LIB_DEPENDS= libSvtVp9Enc.so:multimedia/svt-vp9 -SVTVP9_CONFIGURE_ENABLE= libsvtvp9 -SVTVP9_PATCH_SITES_= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.2/ffmpeg_plugin/:svtvp9 -SVTVP9_PATCHFILES_= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 +SVTVP9_CONFIGURE_ON= --enable-libsvtvp9 +SVTVP9_PATCH_SITES= https://github.com/OpenVisualCloud/SVT-VP9/raw/v0.2.2/ffmpeg_plugin/:svtvp9 +SVTVP9_PATCHFILES= master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch:-p1:svtvp9 .if exists(/usr/bin/ld.lld) && (${/usr/bin/ld:L:tA} != /usr/bin/ld.lld) SVTVP9_LDFLAGS= -fuse-ld=lld .endif +.if make(makesum) +.MAKEFLAGS: WITH+=SVTVP9 +.endif + # tensorflow TENSORFLOW_LIB_DEPENDS= libtensorflow.so:science/tensorflow TENSORFLOW_CONFIGURE_ENABLE= libtensorflow Modified: head/multimedia/ffmpeg/distinfo ============================================================================== --- head/multimedia/ffmpeg/distinfo Fri Jul 24 04:07:14 2020 (r542998) +++ head/multimedia/ffmpeg/distinfo Fri Jul 24 04:10:31 2020 (r542999) @@ -1,11 +1,11 @@ TIMESTAMP = 1594463972 SHA256 (ffmpeg-4.3.1.tar.xz) = ad009240d46e307b4e03a213a0f49c11b650e445b1f8be0dda2a9212b34d2ffb SIZE (ffmpeg-4.3.1.tar.xz) = 9379424 +SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719 +SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023 SHA256 (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 878757eb6d7072521caaeb71f1453ec3fc0f91a12936ef302e1625184787c6a6 SIZE (0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch) = 22103 SHA256 (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 1499e419dda72b1604dc5e3959668f3843292ff56bfba78734e31510ba576de0 SIZE (0002-doc-Add-libsvt_hevc-encoder-docs.patch) = 5332 -SHA256 (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 5e960b4dab495437082d0838a40a8cae9b67d1cef1ffd57da960afaa2bfd3719 -SIZE (0001-Add-ability-for-ffmpeg-to-run-svt-av1.patch) = 25023 SHA256 (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = b74be6d805672210e226e7c0b403f88b0ee8a53c732c9bdc873c4b44aeb75c96 SIZE (master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch) = 33465