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 19557139695 for ; Mon, 24 Jul 2017 20:42:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1F9EBE0DF9; Mon, 24 Jul 2017 20:42:33 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 DE780E0DF9 for ; Mon, 24 Jul 2017 20:42:32 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 291CE34181B for ; Mon, 24 Jul 2017 20:42:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C46DB74C1 for ; Mon, 24 Jul 2017 20:42:29 +0000 (UTC) From: "NP Hardass" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "NP Hardass" Message-ID: <1500928944.1b0fc3aa8f51619ce45cf39ed1c27910bba3c1ac.np-hardass@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-power/bbswitch/files/, sys-power/bbswitch/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-power/bbswitch/bbswitch-0.8-r1.ebuild sys-power/bbswitch/bbswitch-9999.ebuild sys-power/bbswitch/files/bbswitch-0.8-kernel-4.12.patch sys-power/bbswitch/metadata.xml X-VCS-Directories: sys-power/bbswitch/ sys-power/bbswitch/files/ X-VCS-Committer: np-hardass X-VCS-Committer-Name: NP Hardass X-VCS-Revision: 1b0fc3aa8f51619ce45cf39ed1c27910bba3c1ac X-VCS-Branch: master Date: Mon, 24 Jul 2017 20:42:29 +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-Archives-Salt: 42a1f6cb-fdb4-4d61-95b0-217166ad0856 X-Archives-Hash: b0885be5a281b1df51f54847b0596ebf commit: 1b0fc3aa8f51619ce45cf39ed1c27910bba3c1ac Author: NP-Hardass gentoo org> AuthorDate: Mon Jul 24 20:39:22 2017 +0000 Commit: NP Hardass gentoo 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 + #include + #include ++#include ++ ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(4,12,0) ++#include ++#else + #include ++#endif ++ + #include + #include + #include 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 @@ Proxy Maintainers - 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. Bumblebee-Project/bbswitch