Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bumblebee rebuild

Browse Source
This commit is contained in:
Rmys
2021-04-23 15:05:21 +03:00
committed by GitHub
parent 5fa0617c3d
commit 6dad998b77
3 changed files with 71 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
x11/misc/bumblebee/actions.py
+1
View File
@@ -9,6 +9,7 @@ from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
def setup():
autotools.autoreconf("-fiv")
autotools.configure("\
CONF_DRIVER=nvidia \
CONF_DRIVER_MODULE_NVIDIA=nvidia \
x11/misc/bumblebee/files/bumblebee-3.2.1_p20190421-gcc10.patch
+66
View File
@@ -0,0 +1,66 @@
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
x11/misc/bumblebee/pspec.xml
+4 -3
View File
@@ -11,15 +11,16 @@
<IsA>app:gui</IsA>
<Summary>a project aiming to support NVIDIA Optimus technology under Linux.</Summary>
<Description>The Bumblebee Project proudly presents version 3.0 of Bumblebee, a project aiming to support NVIDIA Optimus technology under Linux. After two months of hard work this version has finally been considered stable enough for release.</Description>
<Archive sha1sum="a715f4aa1b0c24dd4352ff7e0bc390f1e4e03cd9" type="targz">http://www.bumblebee-project.org/bumblebee-3.2.1.tar.gz</Archive>
<!-- <Archive sha1sum="a715f4aa1b0c24dd4352ff7e0bc390f1e4e03cd9" type="targz">http://www.bumblebee-project.org/bumblebee-3.2.1.tar.gz</Archive> -->
<Archive sha1sum="e98a979750fcefa1ae2217d5baaf92af895dcc91" type="targz" name="bumblebee-3.2.1.tar.gz">https://github.com/Bumblebee-Project/Bumblebee/archive/8f3d307b6aabbc2cd8444c6e5a4360f3bf2915ec.tar.gz</Archive>
<BuildDependencies>
<Dependency>libbsd-devel</Dependency>
<Dependency>libX11-devel</Dependency>
<Dependency>glib2-devel</Dependency>
</BuildDependencies>
<Patches>
<Patch level="1">bb-hexadecimal.patch</Patch>
<Patch level="1">nv-uvm-modeset.patch</Patch>
<!-- <Patch level="1">bb-hexadecimal.patch</Patch> -->
<!-- <Patch level="1">nv-uvm-modeset.patch</Patch> -->
</Patches>
</Source>
<Package>