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 669E515939F for ; Sun, 7 Jul 2024 00:34:11 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8FD542BC0C6; Sun, 7 Jul 2024 00:34:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 721C72BC0C6 for ; Sun, 7 Jul 2024 00:34:10 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (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 6285C342F8D for ; Sun, 7 Jul 2024 00:34:09 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 989901BD7 for ; Sun, 7 Jul 2024 00:34:07 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1720312377.721607c73a226d3f993c3462dab9a45ecf350969.sam@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: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 721607c73a226d3f993c3462dab9a45ecf350969 X-VCS-Branch: master Date: Sun, 7 Jul 2024 00:34:07 +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: 0b3b54f0-4f05-465d-9aba-72f1e75fd2af X-Archives-Hash: c7c103faa88a2b94fae808dc6c2ac00e commit: 721607c73a226d3f993c3462dab9a45ecf350969 Author: Leonardo Hernández Hernández proton me> AuthorDate: Sat Jun 15 02:26:33 2024 +0000 Commit: Sam James gentoo org> CommitDate: Sun Jul 7 00:32:57 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=721607c7 media-video/ffmpeg: fix VariableOrderWrong Signed-off-by: Leonardo Hernández Hernández proton.me> Signed-off-by: Sam James gentoo.org> media-video/ffmpeg/ffmpeg-9999.ebuild | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index e6491c785ef4..322b5a1d739b 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -60,7 +60,7 @@ else # Release fi FFMPEG_REVISION="${PV#*_p}" -SLOT="0/${FFMPEG_SUBSLOT}" +S=${WORKDIR}/${P/_/-} LICENSE=" !gpl? ( LGPL-2.1 ) gpl? ( GPL-2 ) @@ -84,6 +84,7 @@ LICENSE=" ) samba? ( GPL-3 ) " +SLOT="0/${FFMPEG_SUBSLOT}" if [ "${PV#9999}" = "${PV}" ] ; then KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi @@ -373,8 +374,6 @@ RESTRICT=" gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) " -S=${WORKDIR}/${P/_/-} - PATCHES=( "${FILESDIR}"/chromium-r2.patch "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch