From a6098bbffed3a89d368f9ee777d3af17f088da22 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 22 Oct 2016 18:43:40 +0100 Subject: make sure nvidia-drm module does not brake optimus as nvidia-modeset module did --- x11-misc/bumblebee/bumblebee-3.2.1-r2.ebuild | 94 ---------------------- x11-misc/bumblebee/bumblebee-3.2.1-r3.ebuild | 94 ++++++++++++++++++++++ ....2.1-handle-nvidia-modeset-and-nvidia-drm.patch | 15 ++++ .../bumblebee-3.2.1-handle-nvidia-modeset.patch | 14 ---- 4 files changed, 109 insertions(+), 108 deletions(-) delete mode 100644 x11-misc/bumblebee/bumblebee-3.2.1-r2.ebuild create mode 100644 x11-misc/bumblebee/bumblebee-3.2.1-r3.ebuild create mode 100644 x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch delete mode 100644 x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset.patch (limited to 'x11-misc') diff --git a/x11-misc/bumblebee/bumblebee-3.2.1-r2.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1-r2.ebuild deleted file mode 100644 index e3b80418..00000000 --- a/x11-misc/bumblebee/bumblebee-3.2.1-r2.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2013 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.2.1.ebuild,v 1.1 2013/05/26 18:55:23 pacho Exp $ - -EAPI=5 -inherit eutils multilib readme.gentoo systemd user - -DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets" -HOMEPAGE="http://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee" -SRC_URI="http://bumblebee-project.org/${P}.tar.gz" - -SLOT="0" -LICENSE="GPL-3" -KEYWORDS="amd64 x86" - -IUSE="+bbswitch +primus video_cards_nouveau video_cards_nvidia" - -RDEPEND=" - virtual/opengl - x11-misc/virtualgl:= - primus? ( x11-misc/primus ) - bbswitch? ( sys-power/bbswitch ) -" -DEPEND="${RDEPEND} - dev-libs/glib:2 - dev-libs/libbsd - sys-apps/help2man - virtual/pkgconfig - x11-libs/libX11 -" - -src_prepare() { - # Dirty fix for issue https://github.com/Bumblebee-Project/Bumblebee/issues/699 - # cherry picked from https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56 - epatch "${FILESDIR}/${P}-handle-nvidia-modeset.patch" -} - -src_configure() { - DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group. - You may need to setup your /etc/bumblebee/bumblebee.conf" - - if use video_cards_nvidia ; then - # Get paths to GL libs for all ABIs - local nvlib="" - for i in $(get_all_libdirs) ; do - nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib" - done - - local nvpref="/usr/$(get_libdir)/opengl/nvidia" - local xorgpref="/usr/$(get_libdir)/xorg/modules" - ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \ - CONF_LDPATH_NVIDIA=${nvlib#:} \ - CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}" - fi - - econf \ - --docdir=/usr/share/doc/"${PF}" \ - ${ECONF_PARAMS} -} - -src_install() { - newconfd "${FILESDIR}"/bumblebee.confd bumblebee - newinitd "${FILESDIR}"/bumblebee.initd bumblebee - newenvd "${FILESDIR}"/bumblebee.envd 99bumblebee - systemd_dounit scripts/systemd/bumblebeed.service - - # Kogaion: tweak default settings - sed -i "s:TurnCardOffAtExit=.*:TurnCardOffAtExit=true:g" \ - "${S}/conf/bumblebee.conf" || die - - readme.gentoo_create_doc - - default - - if use bbswitch; then - # This is much better than the udev rule below - doinitd "${FILESDIR}/bbswitch-setup" - sed -i "s:need xdm:need bbswitch-setup xdm:" \ - "${ED}/etc/init.d/bumblebee" || die - fi - # Downstream says: this is just plain wrong, how about - # the situation in where the user has bumblebee installed - # but they are not actually on an Optimus system? This - # disables the nvidia driver forever. - ## - rm "${ED}/lib/udev/rules.d/99-bumblebee-nvidia-dev.rules" || die -} - -pkg_preinst() { - use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia - use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau - - enewgroup bumblebee -} diff --git a/x11-misc/bumblebee/bumblebee-3.2.1-r3.ebuild b/x11-misc/bumblebee/bumblebee-3.2.1-r3.ebuild new file mode 100644 index 00000000..8700ac23 --- /dev/null +++ b/x11-misc/bumblebee/bumblebee-3.2.1-r3.ebuild @@ -0,0 +1,94 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/bumblebee-3.2.1.ebuild,v 1.1 2013/05/26 18:55:23 pacho Exp $ + +EAPI=5 +inherit eutils multilib readme.gentoo systemd user + +DESCRIPTION="Service providing elegant and stable means of managing Optimus graphics chipsets" +HOMEPAGE="http://bumblebee-project.org https://github.com/Bumblebee-Project/Bumblebee" +SRC_URI="http://bumblebee-project.org/${P}.tar.gz" + +SLOT="0" +LICENSE="GPL-3" +KEYWORDS="amd64 x86" + +IUSE="+bbswitch +primus video_cards_nouveau video_cards_nvidia" + +RDEPEND=" + virtual/opengl + x11-misc/virtualgl:= + primus? ( x11-misc/primus ) + bbswitch? ( sys-power/bbswitch ) +" +DEPEND="${RDEPEND} + dev-libs/glib:2 + dev-libs/libbsd + sys-apps/help2man + virtual/pkgconfig + x11-libs/libX11 +" + +src_prepare() { + # Dirty fix for issue https://github.com/Bumblebee-Project/Bumblebee/issues/699 + # cherry picked from https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56 + epatch "${FILESDIR}/${P}-handle-nvidia-modeset-and-nvidia-drm.patch" +} + +src_configure() { + DOC_CONTENTS="In order to use Bumblebee, add your user to 'bumblebee' group. + You may need to setup your /etc/bumblebee/bumblebee.conf" + + if use video_cards_nvidia ; then + # Get paths to GL libs for all ABIs + local nvlib="" + for i in $(get_all_libdirs) ; do + nvlib="${nvlib}:/usr/${i}/opengl/nvidia/lib" + done + + local nvpref="/usr/$(get_libdir)/opengl/nvidia" + local xorgpref="/usr/$(get_libdir)/xorg/modules" + ECONF_PARAMS="CONF_DRIVER=nvidia CONF_DRIVER_MODULE_NVIDIA=nvidia \ + CONF_LDPATH_NVIDIA=${nvlib#:} \ + CONF_MODPATH_NVIDIA=${nvpref}/lib,${nvpref}/extensions,${xorgpref}/drivers,${xorgpref}" + fi + + econf \ + --docdir=/usr/share/doc/"${PF}" \ + ${ECONF_PARAMS} +} + +src_install() { + newconfd "${FILESDIR}"/bumblebee.confd bumblebee + newinitd "${FILESDIR}"/bumblebee.initd bumblebee + newenvd "${FILESDIR}"/bumblebee.envd 99bumblebee + systemd_dounit scripts/systemd/bumblebeed.service + + # Kogaion: tweak default settings + sed -i "s:TurnCardOffAtExit=.*:TurnCardOffAtExit=true:g" \ + "${S}/conf/bumblebee.conf" || die + + readme.gentoo_create_doc + + default + + if use bbswitch; then + # This is much better than the udev rule below + doinitd "${FILESDIR}/bbswitch-setup" + sed -i "s:need xdm:need bbswitch-setup xdm:" \ + "${ED}/etc/init.d/bumblebee" || die + fi + # Downstream says: this is just plain wrong, how about + # the situation in where the user has bumblebee installed + # but they are not actually on an Optimus system? This + # disables the nvidia driver forever. + ## + rm "${ED}/lib/udev/rules.d/99-bumblebee-nvidia-dev.rules" || die +} + +pkg_preinst() { + use video_cards_nvidia || rm "${ED}"/etc/bumblebee/xorg.conf.nvidia + use video_cards_nouveau || rm "${ED}"/etc/bumblebee/xorg.conf.nouveau + + enewgroup bumblebee +} diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch new file mode 100644 index 00000000..e71dd086 --- /dev/null +++ b/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset-and-nvidia-drm.patch @@ -0,0 +1,15 @@ +diff -Nur a/src/module.c b/src/module.c +--- a/src/module.c 2013-04-26 16:49:03.022174178 +0100 ++++ b/src/module.c 2016-10-22 18:41:42.151021720 +0100 +@@ -96,7 +96,10 @@ + int retries = 30; + bb_log(LOG_INFO, "Unloading %s driver\n", driver); + char *mod_argv[] = { +- "rmmod", ++ "modprobe", ++ "-r", ++ "nvidia_modeset", ++ "nvidia_drm", + driver, + NULL + }; diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset.patch deleted file mode 100644 index 742a5d8e..00000000 --- a/x11-misc/bumblebee/files/bumblebee-3.2.1-handle-nvidia-modeset.patch +++ /dev/null @@ -1,14 +0,0 @@ -diff -Nur a/src/module.c b/src/module.c ---- a/src/module.c 2013-04-26 16:49:03.022174178 +0100 -+++ b/src/module.c 2016-09-19 18:50:43.080311387 +0100 -@@ -96,7 +96,9 @@ - int retries = 30; - bb_log(LOG_INFO, "Unloading %s driver\n", driver); - char *mod_argv[] = { -- "rmmod", -+ "modprobe", -+ "-r", -+ "nvidia_modeset", - driver, - NULL - }; -- cgit v1.2.3