summaryrefslogtreecommitdiff
path: root/x11-misc/bumblebee/files
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-07-08 15:03:58 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-07-08 15:03:58 +0100
commit814f4cf860e299a046b649eaee5463427984c09c (patch)
tree74c45f097899310e599dad6b8df5b63e0f085bc0 /x11-misc/bumblebee/files
parent7f0ccc917c7abe6223784c703d86cd14755691fb (diff)
gentoo resync : 08.07.2021
Diffstat (limited to 'x11-misc/bumblebee/files')
-rw-r--r--x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch66
-rw-r--r--x11-misc/bumblebee/files/bumblebee.initd23
2 files changed, 0 insertions, 89 deletions
diff --git a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch b/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
deleted file mode 100644
index 7d02226521e4..000000000000
--- a/x11-misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-Author: Andreas Beckmann <anbe@debian.org>
-Description: fix FTBFS with gcc-10
- gcc-10 defaults to -fno-common
- see https://gcc.gnu.org/gcc-10/porting_to.html
-Bug-Debian: https://bugs.debian.org/957058
-
---- a/src/bbconfig.h
-+++ b/src/bbconfig.h
-@@ -103,7 +103,7 @@ enum bb_pm_method {
- PM_VGASWITCHEROO,
- PM_METHODS_COUNT /* not a method but a marker for the end */
- };
--const char *bb_pm_method_string[PM_METHODS_COUNT];
-+extern const char *bb_pm_method_string[PM_METHODS_COUNT];
-
- /* String buffer size */
- #define BUFFER_SIZE 1024
---- a/src/switch/switching.h
-+++ b/src/switch/switching.h
-@@ -60,10 +60,10 @@ void switcheroo_off(void);
-
- /* number of switchers as defined in switching.c */
- #define SWITCHERS_COUNT 2
--struct switching_method switching_methods[SWITCHERS_COUNT];
-+extern struct switching_method switching_methods[SWITCHERS_COUNT];
-
- /* A switching method that can be used or NULL if none */
--struct switching_method *switcher;
-+extern struct switching_method *switcher;
-
- struct switching_method *switcher_detect(const char *name, struct switch_info);
- enum switch_state switch_status(void);
---- a/src/bbsecondary.h
-+++ b/src/bbsecondary.h
-@@ -21,7 +21,7 @@
- #pragma once
-
- /* PCI Bus ID of the discrete video card */
--struct pci_bus_id *pci_bus_id_discrete;
-+extern struct pci_bus_id *pci_bus_id_discrete;
-
- /// Start the X server by fork-exec, turn card on if needed.
- bool start_secondary(bool);
---- a/src/switch/switching.c
-+++ b/src/switch/switching.c
-@@ -31,6 +31,8 @@ struct switching_method switching_method
- switcheroo_on, switcheroo_off}
- };
-
-+struct switching_method *switcher = NULL;
-+
- /**
- * Enumerates through available switching methods and try a method
- *
---- a/src/bbsecondary.c
-+++ b/src/bbsecondary.c
-@@ -37,6 +37,9 @@
- #include "pci.h"
- #include "module.h"
-
-+/* PCI Bus ID of the discrete video card */
-+struct pci_bus_id *pci_bus_id_discrete;
-+
- /**
- * Substitutes DRIVER in the passed path
- * @param x_conf_file A path to be processed
diff --git a/x11-misc/bumblebee/files/bumblebee.initd b/x11-misc/bumblebee/files/bumblebee.initd
deleted file mode 100644
index b9296538a80b..000000000000
--- a/x11-misc/bumblebee/files/bumblebee.initd
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need xdm
- want 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 $?
-}