* [gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/files/, sys-power/bbswitch/
@ 2017-07-24 20:42 NP Hardass
0 siblings, 0 replies; 3+ messages in thread
From: NP Hardass @ 2017-07-24 20:42 UTC (permalink / raw
To: gentoo-commits
commit: 1b0fc3aa8f51619ce45cf39ed1c27910bba3c1ac
Author: NP-Hardass <NP-Hardass <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 24 20:39:22 2017 +0000
Commit: NP Hardass <np-hardass <AT> gentoo <DOT> org>
CommitDate: Mon Jul 24 20:42:24 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b0fc3aa
sys-power/bbswitch: Bump to 0.8-r1 and fix compiling w/ kernel 4.12, #623736
Package-Manager: Portage-2.3.6, Repoman-2.3.3
sys-power/bbswitch/bbswitch-0.8-r1.ebuild | 54 ++++++++++++++++++++++
sys-power/bbswitch/bbswitch-9999.ebuild | 54 ++++++++++++++++++++++
.../bbswitch/files/bbswitch-0.8-kernel-4.12.patch | 18 ++++++++
sys-power/bbswitch/metadata.xml | 4 +-
4 files changed, 128 insertions(+), 2 deletions(-)
diff --git a/sys-power/bbswitch/bbswitch-0.8-r1.ebuild b/sys-power/bbswitch/bbswitch-0.8-r1.ebuild
new file mode 100644
index 00000000000..bb29cb2fd85
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-0.8-r1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
+ EGIT_BRANCH="develop"
+else
+ PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+ SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+
+SLOT="0"
+LICENSE="GPL-3+"
+IUSE=""
+
+DEPEND="
+ virtual/linux-sources
+ sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="bbswitch(acpi)"
+
+pkg_setup() {
+ linux-mod_pkg_setup
+
+ BUILD_TARGETS="default"
+ BUILD_PARAMS="KVERSION=${KV_FULL}"
+}
+
+src_prepare() {
+ # Fix build failure, bug #513542
+ sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile || die
+
+ default
+}
+
+src_install() {
+ einstalldocs
+
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+
+ linux-mod_src_install
+}
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
new file mode 100644
index 00000000000..bb29cb2fd85
--- /dev/null
+++ b/sys-power/bbswitch/bbswitch-9999.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-mod
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
+ EGIT_BRANCH="develop"
+else
+ PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+ SRC_URI="https://github.com/Bumblebee-Project/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
+HOMEPAGE="https://github.com/Bumblebee-Project/bbswitch"
+
+SLOT="0"
+LICENSE="GPL-3+"
+IUSE=""
+
+DEPEND="
+ virtual/linux-sources
+ sys-kernel/linux-headers
+"
+RDEPEND=""
+
+MODULE_NAMES="bbswitch(acpi)"
+
+pkg_setup() {
+ linux-mod_pkg_setup
+
+ BUILD_TARGETS="default"
+ BUILD_PARAMS="KVERSION=${KV_FULL}"
+}
+
+src_prepare() {
+ # Fix build failure, bug #513542
+ sed -i 's/^KDIR.*$/KDIR\ \:= \/usr\/src\/linux/g' Makefile || die
+
+ default
+}
+
+src_install() {
+ einstalldocs
+
+ insinto /etc/modprobe.d
+ newins "${FILESDIR}"/bbswitch.modprobe bbswitch.conf
+
+ linux-mod_src_install
+}
diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
new file mode 100644
index 00000000000..1db623d583e
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch
@@ -0,0 +1,18 @@
+diff -uNr bbswitch-0.8/bbswitch.c bbswitch-0.8-new/bbswitch.c
+--- bbswitch-0.8/bbswitch.c 2013-12-04 18:22:06.000000000 -0500
++++ bbswitch-0.8-new/bbswitch.c 2017-07-08 01:11:54.588545766 -0400
+@@ -31,7 +31,14 @@
+ #include <linux/pci.h>
+ #include <linux/acpi.h>
+ #include <linux/module.h>
++#include <linux/version.h>
++
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0)
++#include <linux/uaccess.h>
++#else
+ #include <asm/uaccess.h>
++#endif
++
+ #include <linux/suspend.h>
+ #include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
diff --git a/sys-power/bbswitch/metadata.xml b/sys-power/bbswitch/metadata.xml
index 8a332bf34a0..437e2daa175 100644
--- a/sys-power/bbswitch/metadata.xml
+++ b/sys-power/bbswitch/metadata.xml
@@ -18,8 +18,8 @@
<name>Proxy Maintainers</name>
</maintainer>
<longdescription>
- Kernel module which automatically detects the required ACPI calls for two
- kinds of Optimus laptops for safe disabling/enabling the discrete graphics card.
+ Kernel module which automatically detects the required ACPI calls for two
+ kinds of Optimus laptops for safe disabling/enabling the discrete graphics card.
</longdescription>
<upstream>
<remote-id type="github">Bumblebee-Project/bbswitch</remote-id>
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/files/, sys-power/bbswitch/
@ 2020-04-06 18:42 Piotr Karbowski
0 siblings, 0 replies; 3+ messages in thread
From: Piotr Karbowski @ 2020-04-06 18:42 UTC (permalink / raw
To: gentoo-commits
commit: b8a4109655d335052fff129b206061ecb5ad845a
Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Mon Apr 6 18:40:41 2020 +0000
Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Mon Apr 6 18:42:10 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8a41096
sys-power/bbswitch-0.8-r3: kernel 5.6 support; $CC fixes.
Closes: https://bugs.gentoo.org/715500
Closes: https://bugs.gentoo.org/702730
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
...bbswitch-9999.ebuild => bbswitch-0.8-r3.ebuild} | 13 +++---
sys-power/bbswitch/bbswitch-9999.ebuild | 11 +++--
.../bbswitch/files/bbswitch-0.8-kernel-5.6.patch | 52 ++++++++++++++++++++++
3 files changed, 67 insertions(+), 9 deletions(-)
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-0.8-r3.ebuild
similarity index 78%
copy from sys-power/bbswitch/bbswitch-9999.ebuild
copy to sys-power/bbswitch/bbswitch-0.8-r3.ebuild
index ad44354463c..90af8d53240 100644
--- a/sys-power/bbswitch/bbswitch-9999.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8-r3.ebuild
@@ -1,18 +1,21 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-mod
+inherit linux-mod toolchain-funcs
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
EGIT_BRANCH="develop"
else
- PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+ 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"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="amd64 x86"
fi
DESCRIPTION="Toggle discrete NVIDIA Optimus graphics card"
@@ -34,7 +37,7 @@ pkg_setup() {
linux-mod_pkg_setup
BUILD_TARGETS="default"
- BUILD_PARAMS="KVERSION=${KV_FULL}"
+ BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
}
src_prepare() {
diff --git a/sys-power/bbswitch/bbswitch-9999.ebuild b/sys-power/bbswitch/bbswitch-9999.ebuild
index ad44354463c..7efe9cf7ccd 100644
--- a/sys-power/bbswitch/bbswitch-9999.ebuild
+++ b/sys-power/bbswitch/bbswitch-9999.ebuild
@@ -1,16 +1,19 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit linux-mod
+inherit linux-mod toolchain-funcs
if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/Bumblebee-Project/${PN}.git"
EGIT_BRANCH="develop"
else
- PATCHES=( "${FILESDIR}/${PN}-0.8-kernel-4.12.patch" )
+ 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"
KEYWORDS="~amd64 ~x86"
fi
@@ -34,7 +37,7 @@ pkg_setup() {
linux-mod_pkg_setup
BUILD_TARGETS="default"
- BUILD_PARAMS="KVERSION=${KV_FULL}"
+ BUILD_PARAMS="KVERSION=${KV_FULL} CC=$(tc-getCC)"
}
src_prepare() {
diff --git a/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch b/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
new file mode 100644
index 00000000000..aa95a21cdb0
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-0.8-kernel-5.6.patch
@@ -0,0 +1,52 @@
+From c2f808efeb0820edf23dbb66362ad3091321253f Mon Sep 17 00:00:00 2001
+From: Mateusz Mandera <mateusz.mandera@protonmail.com>
+Date: Tue, 31 Mar 2020 15:11:30 +0200
+Subject: [PATCH] Use proc_ops structure for kernel version >= 5.6.0
+
+Since 5.6.0, proc_create requires a proc_ops* argument
+instead of file_operations*.
+---
+ bbswitch.c | 13 +++++++++++++
+ 1 file changed, 13 insertions(+)
+
+diff --git a/bbswitch.c b/bbswitch.c
+index d64cdae..9ca0e42 100644
+--- a/bbswitch.c
++++ b/bbswitch.c
+@@ -42,6 +42,9 @@
+ #include <linux/suspend.h>
+ #include <linux/seq_file.h>
+ #include <linux/pm_runtime.h>
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++#include <linux/proc_fs.h>
++#endif
+
+ #define BBSWITCH_VERSION "0.8"
+
+@@ -382,6 +385,15 @@ static int bbswitch_pm_handler(struct notifier_block *nbp,
+ return 0;
+ }
+
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,6,0)
++static struct proc_ops bbswitch_fops = {
++ .proc_open = bbswitch_proc_open,
++ .proc_read = seq_read,
++ .proc_write = bbswitch_proc_write,
++ .proc_lseek = seq_lseek,
++ .proc_release= single_release
++};
++#else
+ static struct file_operations bbswitch_fops = {
+ .open = bbswitch_proc_open,
+ .read = seq_read,
+@@ -389,6 +401,7 @@ static struct file_operations bbswitch_fops = {
+ .llseek = seq_lseek,
+ .release= single_release
+ };
++#endif
+
+ static struct notifier_block nb = {
+ .notifier_call = &bbswitch_pm_handler
+--
+2.26.0
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/files/, sys-power/bbswitch/
@ 2022-05-27 21:24 Pacho Ramos
0 siblings, 0 replies; 3+ messages in thread
From: Pacho Ramos @ 2022-05-27 21:24 UTC (permalink / raw
To: gentoo-commits
commit: 3dd7021076f7c2c94af6ba4311a424beed56c005
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 21:22:23 2022 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Fri May 27 21:23:53 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3dd70210
sys-power/bbswitch: Fix compat with kernel 5.18
Closes: https://bugs.gentoo.org/847481
Thanks-to: Joe Kappus
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild | 4 +++-
sys-power/bbswitch/files/bbswitch-kernel-5.18.patch | 19 +++++++++++++++++++
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
index 63147964328f..2aa21af88733 100644
--- a/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
+++ b/sys-power/bbswitch/bbswitch-0.8_p20211129.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=7
+EAPI=8
inherit linux-mod toolchain-funcs
@@ -31,6 +31,8 @@ RDEPEND=""
MODULE_NAMES="bbswitch(acpi)"
+PATCHES=( "${FILESDIR}/${PN}-kernel-5.18.patch" )
+
pkg_setup() {
linux-mod_pkg_setup
diff --git a/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch b/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch
new file mode 100644
index 000000000000..07cecd4cdf41
--- /dev/null
+++ b/sys-power/bbswitch/files/bbswitch-kernel-5.18.patch
@@ -0,0 +1,19 @@
+diff -u -r bbswitch-0.8/bbswitch.c bbswitch-0.8-5.18/bbswitch.c
+--- bbswitch-0.8/bbswitch.c 2022-05-24 20:26:22.184553495 +0000
++++ bbswitch-0.8-5.18/bbswitch.c 2022-05-24 20:29:00.797008130 +0000
+@@ -264,10 +264,15 @@
+ pci_disable_device(dis_dev);
+ do {
+ struct acpi_device *ad = NULL;
++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 18, 0)
++ ad = acpi_fetch_acpi_dev(dis_handle);
++ if (!ad) {
++#else
+ int r;
+
+ r = acpi_bus_get_device(dis_handle, &ad);
+ if (r || !ad) {
++#endif
+ pr_warn("Cannot get ACPI device for PCI device\n");
+ break;
+ }
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-05-27 21:24 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2022-05-27 21:24 [gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/files/, sys-power/bbswitch/ Pacho Ramos
-- strict thread matches above, loose matches on Subject: below --
2020-04-06 18:42 Piotr Karbowski
2017-07-24 20:42 NP Hardass
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox