import bumblebee from deprecated repo

7 files changed, 67 insertions, 0 deletions

diff --git a/x11-misc/bumblebee/files/bbswitch-setup b/x11-misc/bumblebee/files/bbswitch-setup
new file mode 100644
index 00000000..7f6c7249
--- /dev/null
+++ b/x11-misc/bumblebee/files/bbswitch-setup
@@ -0,0 +1,20 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+start() {
+	# workaround the fact that udev may have loaded nvidia or nouveau
+	# and bbswitch refuses to turn off the card.
+	ebegin "Setting up bbswitch"
+	# make sure that the nvidia and nouveau modules are
+	# removed, then reload bbswitch.
+	for mod in nvidia nouveau; do
+		modprobe -r ${mod} 2> /dev/null  # best effort
+	done
+	# reload bbswitch now
+	modprobe -r bbswitch
+	modprobe bbswitch  # this inherits the options
+	eend 0
+}
+
diff --git a/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch b/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch
new file mode 100644
index 00000000..06adda98
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee-3.0.1-remove-wait.patch
@@ -0,0 +1,12 @@
+diff --git a/src/module.c b/src/module.c
+index 06f8872..55fa70e 100644
+--- a/src/module.c
++++ b/src/module.c
+@@ -96,7 +96,6 @@ int module_unload(char *driver) {
+     bb_log(LOG_INFO, "Unloading %s driver\n", driver);
+     char *mod_argv[] = {
+       "rmmod",
+-      "--wait",
+       driver,
+       NULL
+     };
\ No newline at end of file
diff --git a/x11-misc/bumblebee/files/bumblebee.confd b/x11-misc/bumblebee/files/bumblebee.confd
new file mode 100644
index 00000000..1c70206d
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/bumblebee
+
+BUMBLEBEE_EXTRA_OPTS="--use-syslog"
\ No newline at end of file
diff --git a/x11-misc/bumblebee/files/bumblebee.envd b/x11-misc/bumblebee/files/bumblebee.envd
new file mode 100644
index 00000000..e19cc56a
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.envd
@@ -0,0 +1,3 @@
+# Comment this out if you are using VirtualGL also for other purposes and this
+# slows down things for you.
+VGL_READBACK="pbo"
diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
new file mode 100644
index 00000000..0a9fbb79
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.initd
@@ -0,0 +1,23 @@
+#!/sbin/runscript
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/bumblebee/files/bumblebee.initd,v 1.2 2012/06/04 19:46:24 pacho Exp $
+
+depend() {
+	need xdm vgl
+}
+
+PIDFILE="${PIDFILE:-/var/run/bumblebee.pid}"
+
+start() {
+	ebegin "Starting BumbleBee Daemon"
+		start-stop-daemon -S -p "${PIDFILE}" -x /usr/sbin/bumblebeed -- -D ${BUMBLEBEE_EXTRA_OPTS} --pidfile "${PIDFILE}"
+	eend $?
+}
+
+stop() {
+
+	ebegin "Stopping BumbleBee Daemon"
+		start-stop-daemon -K -p "${PIDFILE}" -R SIGTERM/10
+	eend $?
+}
diff --git a/x11-misc/bumblebee/files/bumblebee.nouveau-confd b/x11-misc/bumblebee/files/bumblebee.nouveau-confd
new file mode 100644
index 00000000..1c70206d
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.nouveau-confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/bumblebee
+
+BUMBLEBEE_EXTRA_OPTS="--use-syslog"
\ No newline at end of file
diff --git a/x11-misc/bumblebee/files/bumblebee.nvidia-confd b/x11-misc/bumblebee/files/bumblebee.nvidia-confd
new file mode 100644
index 00000000..53d2006a
--- /dev/null
+++ b/x11-misc/bumblebee/files/bumblebee.nvidia-confd
@@ -0,0 +1,3 @@
+# /etc/conf.d/bumblebee
+
+BUMBLEBEE_EXTRA_OPTS="--use-syslog -l /usr/lib/opengl/nvidia/lib:/usr/lib/opengl/nvidia/extensions:/usr/lib64/opengl/nvidia/lib:/usr/lib32/opengl/nvidia/lib:/usr/lib64/opengl/nvidia/extensions:/usr/lib32/opengl/nvidia/extensions"
\ No newline at end of file