From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 30A4115808B for ; Sun, 20 Mar 2022 13:13:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 85FCAE07F1; Sun, 20 Mar 2022 13:13:18 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C4D0FE07F0 for ; Sun, 20 Mar 2022 13:13:17 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7A995342D1E for ; Sun, 20 Mar 2022 13:13:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 176E632E for ; Sun, 20 Mar 2022 13:13:15 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1647781990.72ee9c1e094d3f3a2ca5201733eb94f01b1ce6c7.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-video/ffmpeg/ffmpeg-9999.ebuild X-VCS-Directories: media-video/ffmpeg/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 72ee9c1e094d3f3a2ca5201733eb94f01b1ce6c7 X-VCS-Branch: master Date: Sun, 20 Mar 2022 13:13:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: e991115f-4afd-40ca-887f-55ff30cd295f X-Archives-Hash: d05133d9685b6de79d3cc4f623707761 commit: 72ee9c1e094d3f3a2ca5201733eb94f01b1ce6c7 Author: Adel KARA SLIMANE zegrapher com> AuthorDate: Thu Mar 17 13:09:31 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sun Mar 20 13:13:10 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72ee9c1e media-video/ffmpeg: do not apply vmaf models patch on -9999 Their path needs to be given by hand now See https://github.com/FFmpeg/FFmpeg/commit/3d29724c008d8f27fecf85757152789b074e8ef9 Signed-off-by: Adel KARA SLIMANE zegrapher.com> Closes: https://github.com/gentoo/gentoo/pull/24621 Signed-off-by: Joonas Niilola gentoo.org> media-video/ffmpeg/ffmpeg-9999.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 1f70d55ec169..89a0768ff91c 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -339,8 +339,6 @@ src_prepare() { export revision=git-N-${FFMPEG_REVISION} fi - eapply "${FILESDIR}/vmaf-models-default-path.patch" - default echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die }