Gentoo Archives: gentoo-commits

From: Pacho Ramos <pacho@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/
Date: Thu, 08 Jul 2021 13:01:57
Message-Id: 1625749123.c405d8dcf9203c4505bc9a7e8fd57a503fdb30df.pacho@gentoo
1 commit: c405d8dcf9203c4505bc9a7e8fd57a503fdb30df
2 Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jul 8 12:58:43 2021 +0000
4 Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
5 CommitDate: Thu Jul 8 12:58:43 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c405d8dc
7
8 sys-power/bbswitch: Update live ebuild
9
10 Package-Manager: Portage-3.0.20, Repoman-3.0.3
11 Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
12
13 sys-power/bbswitch/bbswitch-9999.ebuild | 14 ++++++--------
14 1 file changed, 6 insertions(+), 8 deletions(-)
15
16 diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
17 index 7efe9cf7ccd..1c9b2ba061f 100644
18 --- a/sys-power/bbswitch/bbswitch-9999.ebuild
19 +++ b/sys-power/bbswitch/bbswitch-9999.ebuild
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2020 Gentoo Authors
22 +# Copyright 1999-2021 Gentoo Authors
23 # Distributed under the terms of the GNU General Public License v2
24
25 EAPI=7
26 @@ -10,12 +10,10 @@ if [[ ${PV} == 9999 ]]; then
27 EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
28 EGIT_BRANCH="develop"
29 else
30 - PATCHES=(
31 - "${FILESDIR}/${PN}-0.8-kernel-4.12.patch"
32 - "${FILESDIR}/${PN}-0.8-kernel-5.6.patch"
33 - )
34 - SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
35 + COMMIT="ddbd243638c7bc2baecf43a78aff46cdc12e9b2e"
36 + SRC_URI="https://github.com/Bumblebee-Project/bbswitch/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
37 KEYWORDS="~amd64 ~x86"
38 + S="${WORKDIR}/bbswitch-${COMMIT}"
39 fi
40
41 DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
42 @@ -41,8 +39,8 @@ pkg_setup() {
43 }
44
45 src_prepare() {
46 - # Fix build failure, bug #513542
47 - sed "s%^KDIR :=.*%KDIR := ${KERNEL_DIR}%g" -i Makefile || die
48 + # Fix build failure, bug #513542 and bug #761370
49 + sed "s%^KDIR :=.*%KDIR := ${KV_OUT_DIR:-$KERNEL_DIR}%g" -i Makefile || die
50
51 default
52 }