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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AEA10139345 for ; Thu, 8 Jul 2021 13:01:57 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 13C47E0B92; Thu, 8 Jul 2021 13:01:57 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE6E5E0B92 for ; Thu, 8 Jul 2021 13:01:56 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D10E733FEF1 for ; Thu, 8 Jul 2021 13:01:55 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 448AE7C0 for ; Thu, 8 Jul 2021 13:01:54 +0000 (UTC) From: "Pacho Ramos" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" Message-ID: <1625749123.c405d8dcf9203c4505bc9a7e8fd57a503fdb30df.pacho@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-power/bbswitch/bbswitch-9999.ebuild X-VCS-Directories: sys-power/bbswitch/ X-VCS-Committer: pacho X-VCS-Committer-Name: Pacho Ramos X-VCS-Revision: c405d8dcf9203c4505bc9a7e8fd57a503fdb30df X-VCS-Branch: master Date: Thu, 8 Jul 2021 13:01:54 +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: 9b320663-f51d-4738-bbe9-7c33ff06d252 X-Archives-Hash: 4104a47a25b2bad2e270dd83b3423d9d commit: c405d8dcf9203c4505bc9a7e8fd57a503fdb30df Author: Pacho Ramos gentoo org> AuthorDate: Thu Jul 8 12:58:43 2021 +0000 Commit: Pacho Ramos gentoo org> CommitDate: Thu Jul 8 12:58:43 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c405d8dc sys-power/bbswitch: Update live ebuild Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Pacho Ramos gentoo.org> sys-power/bbswitch/bbswitch-9999.ebuild | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild index 7efe9cf7ccd..1c9b2ba061f 100644 --- a/sys-power/bbswitch/bbswitch-9999.ebuild +++ b/sys-power/bbswitch/bbswitch-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -10,12 +10,10 @@ if [[ ${PV} == 9999 ]]; then EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git" EGIT_BRANCH="develop" else - PATCHES=( - "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" - "${FILESDIR}/${PN}-0.8-kernel-5.6.patch" - ) - SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + COMMIT="ddbd243638c7bc2baecf43a78aff46cdc12e9b2e" + SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" KEYWORDS="~amd64 ~x86" + S="${WORKDIR}/bbswitch-${COMMIT}" fi DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card" @@ -41,8 +39,8 @@ pkg_setup() { } src_prepare() { - # Fix build failure, bug #513542 - sed "s%^KDIR :=.*%KDIR := ${KERNEL_DIR}%g" -i Makefile || die + # Fix build failure, bug #513542 and bug #761370 + sed "s%^KDIR :=.*%KDIR := ${KV_OUT_DIR:-$KERNEL_DIR}%g" -i Makefile || die default }