Date: Saturday, December 30, 2017 @ 06:05:05 Author: svenstaro Revision: 276925
archrelease: copy trunk to community-x86_64 Added: bumblebee/repos/community-x86_64/0001-bb_nvidia_modeset-detection_bug699_01.patch (from rev 276924, bumblebee/trunk/0001-bb_nvidia_modeset-detection_bug699_01.patch) bumblebee/repos/community-x86_64/0002-bb_nvidia_modeset-detection_bug699_02.patch (from rev 276924, bumblebee/trunk/0002-bb_nvidia_modeset-detection_bug699_02.patch) bumblebee/repos/community-x86_64/0003-bb_nvidia_umv_detection_bug699.patch (from rev 276924, bumblebee/trunk/0003-bb_nvidia_umv_detection_bug699.patch) bumblebee/repos/community-x86_64/0004-bb_nvidia_drm_detection_bug699_01.patch (from rev 276924, bumblebee/trunk/0004-bb_nvidia_drm_detection_bug699_01.patch) bumblebee/repos/community-x86_64/0005-bb_nvidia_drm_detection_bug699_02.patch (from rev 276924, bumblebee/trunk/0005-bb_nvidia_drm_detection_bug699_02.patch) bumblebee/repos/community-x86_64/0006-bb_hexadicimal_bug573.patch (from rev 276924, bumblebee/trunk/0006-bb_hexadicimal_bug573.patch) bumblebee/repos/community-x86_64/0007-bb_mutebblogger.patch (from rev 276924, bumblebee/trunk/0007-bb_mutebblogger.patch) bumblebee/repos/community-x86_64/0008-libglvnd.patch (from rev 276924, bumblebee/trunk/0008-libglvnd.patch) bumblebee/repos/community-x86_64/PKGBUILD (from rev 276924, bumblebee/trunk/PKGBUILD) bumblebee/repos/community-x86_64/bumblebee.conf (from rev 276924, bumblebee/trunk/bumblebee.conf) bumblebee/repos/community-x86_64/bumblebee.install (from rev 276924, bumblebee/trunk/bumblebee.install) bumblebee/repos/community-x86_64/bumblebee.sysusers (from rev 276924, bumblebee/trunk/bumblebee.sysusers) Deleted: bumblebee/repos/community-x86_64/0001-bb_nvidia_modeset-detection_bug699_01.patch bumblebee/repos/community-x86_64/0002-bb_nvidia_modeset-detection_bug699_02.patch bumblebee/repos/community-x86_64/0003-bb_nvidia_umv_detection_bug699.patch bumblebee/repos/community-x86_64/0004-bb_nvidia_drm_detection_bug699_01.patch bumblebee/repos/community-x86_64/0005-bb_nvidia_drm_detection_bug699_02.patch bumblebee/repos/community-x86_64/0006-bb_hexadicimal_bug573.patch bumblebee/repos/community-x86_64/0007-bb_mutebblogger.patch bumblebee/repos/community-x86_64/0008-libglvnd.patch bumblebee/repos/community-x86_64/PKGBUILD bumblebee/repos/community-x86_64/bumblebee.conf bumblebee/repos/community-x86_64/bumblebee.install --------------------------------------------------+ 0001-bb_nvidia_modeset-detection_bug699_01.patch | 48 ++-- 0002-bb_nvidia_modeset-detection_bug699_02.patch | 112 +++++----- 0003-bb_nvidia_umv_detection_bug699.patch | 152 +++++++------- 0004-bb_nvidia_drm_detection_bug699_01.patch | 88 ++++---- 0005-bb_nvidia_drm_detection_bug699_02.patch | 218 ++++++++++----------- 0006-bb_hexadicimal_bug573.patch | 46 ++-- 0007-bb_mutebblogger.patch | 30 +- 0008-libglvnd.patch | 52 ++--- PKGBUILD | 164 ++++++++------- bumblebee.conf | 12 - bumblebee.install | 11 - bumblebee.sysusers | 1 12 files changed, 467 insertions(+), 467 deletions(-) Deleted: 0001-bb_nvidia_modeset-detection_bug699_01.patch =================================================================== --- 0001-bb_nvidia_modeset-detection_bug699_01.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0001-bb_nvidia_modeset-detection_bug699_01.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,24 +0,0 @@ -From 5636b24fa86a005a5d2e30bd794516db13ccba56 Mon Sep 17 00:00:00 2001 -From: Abuzer Rafey <abu...@rafey.ch> -Date: Tue, 8 Dec 2015 07:00:32 -0500 -Subject: [PATCH] Dirty fix for issue #699 - ---- - src/module.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/module.c b/src/module.c -index f7b99fa..6b6cb09 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -96,7 +96,9 @@ int module_unload(char *driver) { - int retries = 30; - bb_log(LOG_INFO, "Unloading %s driver\n", driver); - char *mod_argv[] = { -- "rmmod", -+ "modprobe", -+ "-r", -+ "nvidia_modeset", - driver, - NULL - }; Copied: bumblebee/repos/community-x86_64/0001-bb_nvidia_modeset-detection_bug699_01.patch (from rev 276924, bumblebee/trunk/0001-bb_nvidia_modeset-detection_bug699_01.patch) =================================================================== --- 0001-bb_nvidia_modeset-detection_bug699_01.patch (rev 0) +++ 0001-bb_nvidia_modeset-detection_bug699_01.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,24 @@ +From 5636b24fa86a005a5d2e30bd794516db13ccba56 Mon Sep 17 00:00:00 2001 +From: Abuzer Rafey <abu...@rafey.ch> +Date: Tue, 8 Dec 2015 07:00:32 -0500 +Subject: [PATCH] Dirty fix for issue #699 + +--- + src/module.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/src/module.c b/src/module.c +index f7b99fa..6b6cb09 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -96,7 +96,9 @@ int module_unload(char *driver) { + int retries = 30; + bb_log(LOG_INFO, "Unloading %s driver\n", driver); + char *mod_argv[] = { +- "rmmod", ++ "modprobe", ++ "-r", ++ "nvidia_modeset", + driver, + NULL + }; Deleted: 0002-bb_nvidia_modeset-detection_bug699_02.patch =================================================================== --- 0002-bb_nvidia_modeset-detection_bug699_02.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0002-bb_nvidia_modeset-detection_bug699_02.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,56 +0,0 @@ -From 09d537e8e5313cd0f2c7bf6620ca70454de8a04a Mon Sep 17 00:00:00 2001 -From: Abuzer Rafey <abu...@rafey.ch> -Date: Tue, 8 Dec 2015 12:01:05 -0500 -Subject: [PATCH] Added nvidia_modeset detection for issue #699 - ---- - src/module.c | 24 ++++++++++++++++++++++-- - 1 file changed, 22 insertions(+), 2 deletions(-) - -diff --git a/src/module.c b/src/module.c -index 6b6cb09..eea0139 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -92,13 +92,15 @@ int module_load(char *module_name, char *driver) { - * @return 1 if the driver is succesfully unloaded, 0 otherwise - */ - int module_unload(char *driver) { -- if (module_is_loaded(driver) == 1) { -+ -+ if (module_is_loaded(driver) == 1 && -+ module_is_loaded("nvidia_modeset") == 1) { - int retries = 30; - bb_log(LOG_INFO, "Unloading %s driver\n", driver); - char *mod_argv[] = { - "modprobe", - "-r", -- "nvidia_modeset", -+ "nvidia-modeset", - driver, - NULL - }; -@@ -111,6 +113,24 @@ int module_unload(char *driver) { - return 0; - } - } -+ else if (module_is_loaded(driver) == 1) { -+ int retries = 30; -+ bb_log(LOG_INFO, "Unloading %s driver\n", driver); -+ char *mod_argv[] = { -+ "modprobe", -+ "-r", -+ driver, -+ NULL -+ }; -+ bb_run_fork_wait(mod_argv, 10); -+ while (retries-- > 0 && module_is_loaded(driver) == 1) { -+ usleep(100000); -+ } -+ if (module_is_loaded(driver) == 1) { -+ bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); -+ return 0; -+ } -+ } - return 1; - } - Copied: bumblebee/repos/community-x86_64/0002-bb_nvidia_modeset-detection_bug699_02.patch (from rev 276924, bumblebee/trunk/0002-bb_nvidia_modeset-detection_bug699_02.patch) =================================================================== --- 0002-bb_nvidia_modeset-detection_bug699_02.patch (rev 0) +++ 0002-bb_nvidia_modeset-detection_bug699_02.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,56 @@ +From 09d537e8e5313cd0f2c7bf6620ca70454de8a04a Mon Sep 17 00:00:00 2001 +From: Abuzer Rafey <abu...@rafey.ch> +Date: Tue, 8 Dec 2015 12:01:05 -0500 +Subject: [PATCH] Added nvidia_modeset detection for issue #699 + +--- + src/module.c | 24 ++++++++++++++++++++++-- + 1 file changed, 22 insertions(+), 2 deletions(-) + +diff --git a/src/module.c b/src/module.c +index 6b6cb09..eea0139 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -92,13 +92,15 @@ int module_load(char *module_name, char *driver) { + * @return 1 if the driver is succesfully unloaded, 0 otherwise + */ + int module_unload(char *driver) { +- if (module_is_loaded(driver) == 1) { ++ ++ if (module_is_loaded(driver) == 1 && ++ module_is_loaded("nvidia_modeset") == 1) { + int retries = 30; + bb_log(LOG_INFO, "Unloading %s driver\n", driver); + char *mod_argv[] = { + "modprobe", + "-r", +- "nvidia_modeset", ++ "nvidia-modeset", + driver, + NULL + }; +@@ -111,6 +113,24 @@ int module_unload(char *driver) { + return 0; + } + } ++ else if (module_is_loaded(driver) == 1) { ++ int retries = 30; ++ bb_log(LOG_INFO, "Unloading %s driver\n", driver); ++ char *mod_argv[] = { ++ "modprobe", ++ "-r", ++ driver, ++ NULL ++ }; ++ bb_run_fork_wait(mod_argv, 10); ++ while (retries-- > 0 && module_is_loaded(driver) == 1) { ++ usleep(100000); ++ } ++ if (module_is_loaded(driver) == 1) { ++ bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); ++ return 0; ++ } ++ } + return 1; + } + Deleted: 0003-bb_nvidia_umv_detection_bug699.patch =================================================================== --- 0003-bb_nvidia_umv_detection_bug699.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0003-bb_nvidia_umv_detection_bug699.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,76 +0,0 @@ -From dbbf20a38aa2bffb10c4e8af583b34dff6bfe721 Mon Sep 17 00:00:00 2001 -From: Abuzer Rafey <abu...@rafey.ch> -Date: Wed, 9 Dec 2015 21:26:29 -0500 -Subject: [PATCH] Fix nvidia_uvm just like nvidia_modeset - ---- - src/module.c | 35 +++++++++++++++++++++++++++-------- - 1 file changed, 27 insertions(+), 8 deletions(-) - -diff --git a/src/module.c b/src/module.c -index eea0139..b5a4d79 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -93,19 +93,18 @@ int module_load(char *module_name, char *driver) { - */ - int module_unload(char *driver) { - -- if (module_is_loaded(driver) == 1 && -- module_is_loaded("nvidia_modeset") == 1) { -+ if (module_is_loaded("nvidia_uvm") == 1) { - int retries = 30; -- bb_log(LOG_INFO, "Unloading %s driver\n", driver); -+ bb_log(LOG_INFO, "Unloading nvidia_uvm driver\n"); - char *mod_argv[] = { - "modprobe", - "-r", -- "nvidia-modeset", -- driver, -+ "nvidia_uvm", -+ "nvidia_modeset", - NULL - }; - bb_run_fork_wait(mod_argv, 10); -- while (retries-- > 0 && module_is_loaded(driver) == 1) { -+ while (retries-- > 0 && module_is_loaded("nvidia_uvm") == 1) { - usleep(100000); - } - if (module_is_loaded(driver) == 1) { -@@ -113,7 +112,27 @@ int module_unload(char *driver) { - return 0; - } - } -- else if (module_is_loaded(driver) == 1) { -+ -+ else if (module_is_loaded("nvidia_modeset") == 1) { -+ int retries = 30; -+ bb_log(LOG_INFO, "Unloading nvidia_modeset driver\n"); -+ char *mod_argv[] = { -+ "modprobe", -+ "-r", -+ "nvidia_modeset", -+ NULL -+ }; -+ bb_run_fork_wait(mod_argv, 10); -+ while (retries-- > 0 && module_is_loaded("nvidia_modeset") == 1) { -+ usleep(100000); -+ } -+ if (module_is_loaded(driver) == 1) { -+ bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); -+ return 0; -+ } -+ } -+ -+ else if (module_is_loaded(driver) == 1) { - int retries = 30; - bb_log(LOG_INFO, "Unloading %s driver\n", driver); - char *mod_argv[] = { -@@ -130,7 +149,7 @@ int module_unload(char *driver) { - bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); - return 0; - } -- } -+ } - return 1; - } - Copied: bumblebee/repos/community-x86_64/0003-bb_nvidia_umv_detection_bug699.patch (from rev 276924, bumblebee/trunk/0003-bb_nvidia_umv_detection_bug699.patch) =================================================================== --- 0003-bb_nvidia_umv_detection_bug699.patch (rev 0) +++ 0003-bb_nvidia_umv_detection_bug699.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,76 @@ +From dbbf20a38aa2bffb10c4e8af583b34dff6bfe721 Mon Sep 17 00:00:00 2001 +From: Abuzer Rafey <abu...@rafey.ch> +Date: Wed, 9 Dec 2015 21:26:29 -0500 +Subject: [PATCH] Fix nvidia_uvm just like nvidia_modeset + +--- + src/module.c | 35 +++++++++++++++++++++++++++-------- + 1 file changed, 27 insertions(+), 8 deletions(-) + +diff --git a/src/module.c b/src/module.c +index eea0139..b5a4d79 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -93,19 +93,18 @@ int module_load(char *module_name, char *driver) { + */ + int module_unload(char *driver) { + +- if (module_is_loaded(driver) == 1 && +- module_is_loaded("nvidia_modeset") == 1) { ++ if (module_is_loaded("nvidia_uvm") == 1) { + int retries = 30; +- bb_log(LOG_INFO, "Unloading %s driver\n", driver); ++ bb_log(LOG_INFO, "Unloading nvidia_uvm driver\n"); + char *mod_argv[] = { + "modprobe", + "-r", +- "nvidia-modeset", +- driver, ++ "nvidia_uvm", ++ "nvidia_modeset", + NULL + }; + bb_run_fork_wait(mod_argv, 10); +- while (retries-- > 0 && module_is_loaded(driver) == 1) { ++ while (retries-- > 0 && module_is_loaded("nvidia_uvm") == 1) { + usleep(100000); + } + if (module_is_loaded(driver) == 1) { +@@ -113,7 +112,27 @@ int module_unload(char *driver) { + return 0; + } + } +- else if (module_is_loaded(driver) == 1) { ++ ++ else if (module_is_loaded("nvidia_modeset") == 1) { ++ int retries = 30; ++ bb_log(LOG_INFO, "Unloading nvidia_modeset driver\n"); ++ char *mod_argv[] = { ++ "modprobe", ++ "-r", ++ "nvidia_modeset", ++ NULL ++ }; ++ bb_run_fork_wait(mod_argv, 10); ++ while (retries-- > 0 && module_is_loaded("nvidia_modeset") == 1) { ++ usleep(100000); ++ } ++ if (module_is_loaded(driver) == 1) { ++ bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); ++ return 0; ++ } ++ } ++ ++ else if (module_is_loaded(driver) == 1) { + int retries = 30; + bb_log(LOG_INFO, "Unloading %s driver\n", driver); + char *mod_argv[] = { +@@ -130,7 +149,7 @@ int module_unload(char *driver) { + bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); + return 0; + } +- } ++ } + return 1; + } + Deleted: 0004-bb_nvidia_drm_detection_bug699_01.patch =================================================================== --- 0004-bb_nvidia_drm_detection_bug699_01.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0004-bb_nvidia_drm_detection_bug699_01.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,44 +0,0 @@ -From bcfe4dd16dd6194f1edbdc53b874a4f408343c5c Mon Sep 17 00:00:00 2001 -From: Abuzer Rafey <abu...@rafey.xyz> -Date: Wed, 13 Apr 2016 01:11:09 -0400 -Subject: [PATCH] Workaround for nvidia_drm in newer drivers - ---- - src/module.c | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/src/module.c b/src/module.c -index b5a4d79..db9736a 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -113,6 +113,25 @@ int module_unload(char *driver) { - } - } - -+ else if (module_is_loaded("nvidia_drm") == 1) { -+ int retries = 30; -+ bb_log(LOG_INFO, "Unloading nvidia_drm driver\n"); -+ char *mod_argv[] = { -+ "modprobe", -+ "-r", -+ "nvidia_drm", -+ NULL -+ }; -+ bb_run_fork_wait(mod_argv, 10); -+ while (retries-- > 0 && module_is_loaded("nvidia_drm") == 1) { -+ usleep(100000); -+ } -+ if (module_is_loaded(driver) == 1) { -+ bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); -+ return 0; -+ } -+ } -+ - else if (module_is_loaded("nvidia_modeset") == 1) { - int retries = 30; - bb_log(LOG_INFO, "Unloading nvidia_modeset driver\n"); -@@ -175,3 +194,4 @@ int module_is_available(char *module_name) { - }; - return bb_run_fork(mod_argv, 1) == EXIT_SUCCESS; - } -+ Copied: bumblebee/repos/community-x86_64/0004-bb_nvidia_drm_detection_bug699_01.patch (from rev 276924, bumblebee/trunk/0004-bb_nvidia_drm_detection_bug699_01.patch) =================================================================== --- 0004-bb_nvidia_drm_detection_bug699_01.patch (rev 0) +++ 0004-bb_nvidia_drm_detection_bug699_01.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,44 @@ +From bcfe4dd16dd6194f1edbdc53b874a4f408343c5c Mon Sep 17 00:00:00 2001 +From: Abuzer Rafey <abu...@rafey.xyz> +Date: Wed, 13 Apr 2016 01:11:09 -0400 +Subject: [PATCH] Workaround for nvidia_drm in newer drivers + +--- + src/module.c | 20 ++++++++++++++++++++ + 1 file changed, 20 insertions(+) + +diff --git a/src/module.c b/src/module.c +index b5a4d79..db9736a 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -113,6 +113,25 @@ int module_unload(char *driver) { + } + } + ++ else if (module_is_loaded("nvidia_drm") == 1) { ++ int retries = 30; ++ bb_log(LOG_INFO, "Unloading nvidia_drm driver\n"); ++ char *mod_argv[] = { ++ "modprobe", ++ "-r", ++ "nvidia_drm", ++ NULL ++ }; ++ bb_run_fork_wait(mod_argv, 10); ++ while (retries-- > 0 && module_is_loaded("nvidia_drm") == 1) { ++ usleep(100000); ++ } ++ if (module_is_loaded(driver) == 1) { ++ bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); ++ return 0; ++ } ++ } ++ + else if (module_is_loaded("nvidia_modeset") == 1) { + int retries = 30; + bb_log(LOG_INFO, "Unloading nvidia_modeset driver\n"); +@@ -175,3 +194,4 @@ int module_is_available(char *module_name) { + }; + return bb_run_fork(mod_argv, 1) == EXIT_SUCCESS; + } ++ Deleted: 0005-bb_nvidia_drm_detection_bug699_02.patch =================================================================== --- 0005-bb_nvidia_drm_detection_bug699_02.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0005-bb_nvidia_drm_detection_bug699_02.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,109 +0,0 @@ -From fcfe596eb13f62ca9dd7de272a5a87ae843b2a00 Mon Sep 17 00:00:00 2001 -From: Abuzer Rafey <abu...@rafey.xyz> -Date: Wed, 13 Apr 2016 03:09:12 -0400 -Subject: [PATCH] Simplify module_unload - ---- - src/module.c | 72 ++++++++++-------------------------------------------------- - 1 file changed, 12 insertions(+), 60 deletions(-) - -diff --git a/src/module.c b/src/module.c -index db9736a..38e2daa 100644 ---- a/src/module.c -+++ b/src/module.c -@@ -93,56 +93,27 @@ int module_load(char *module_name, char *driver) { - */ - int module_unload(char *driver) { - -- if (module_is_loaded("nvidia_uvm") == 1) { -- int retries = 30; -- bb_log(LOG_INFO, "Unloading nvidia_uvm driver\n"); -- char *mod_argv[] = { -- "modprobe", -- "-r", -- "nvidia_uvm", -- "nvidia_modeset", -- NULL -- }; -- bb_run_fork_wait(mod_argv, 10); -- while (retries-- > 0 && module_is_loaded("nvidia_uvm") == 1) { -- usleep(100000); -- } -- if (module_is_loaded(driver) == 1) { -- bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); -- return 0; -- } -- } -+ char uvm[] = "nvidia_uvm"; -+ char drm[] = "nvidia_drm"; -+ char modeset[] = "nvidia_modeset"; -+ int uvm_is_loaded = module_is_loaded(uvm); -+ int drm_is_loaded = module_is_loaded(drm); -+ int modeset_is_loaded = module_is_loaded(modeset); - -- else if (module_is_loaded("nvidia_drm") == 1) { -+ if (uvm_is_loaded || drm_is_loaded || modeset_is_loaded || *driver == 1) { - int retries = 30; -- bb_log(LOG_INFO, "Unloading nvidia_drm driver\n"); -+ bb_log(LOG_INFO, "Unloading UVM/DRM/MODESET driver\n"); - char *mod_argv[] = { - "modprobe", - "-r", -+ "nvidia_uvm", - "nvidia_drm", -- NULL -- }; -- bb_run_fork_wait(mod_argv, 10); -- while (retries-- > 0 && module_is_loaded("nvidia_drm") == 1) { -- usleep(100000); -- } -- if (module_is_loaded(driver) == 1) { -- bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); -- return 0; -- } -- } -- -- else if (module_is_loaded("nvidia_modeset") == 1) { -- int retries = 30; -- bb_log(LOG_INFO, "Unloading nvidia_modeset driver\n"); -- char *mod_argv[] = { -- "modprobe", -- "-r", - "nvidia_modeset", -+ driver, - NULL - }; - bb_run_fork_wait(mod_argv, 10); -- while (retries-- > 0 && module_is_loaded("nvidia_modeset") == 1) { -+ while (retries-- > 0 && module_is_loaded(driver) == 1) { - usleep(100000); - } - if (module_is_loaded(driver) == 1) { -@@ -150,26 +121,7 @@ int module_unload(char *driver) { - return 0; - } - } -- -- else if (module_is_loaded(driver) == 1) { -- int retries = 30; -- bb_log(LOG_INFO, "Unloading %s driver\n", driver); -- char *mod_argv[] = { -- "modprobe", -- "-r", -- driver, -- NULL -- }; -- bb_run_fork_wait(mod_argv, 10); -- while (retries-- > 0 && module_is_loaded(driver) == 1) { -- usleep(100000); -- } -- if (module_is_loaded(driver) == 1) { -- bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); -- return 0; -- } -- } -- return 1; -+ return 1; - } - - /** Copied: bumblebee/repos/community-x86_64/0005-bb_nvidia_drm_detection_bug699_02.patch (from rev 276924, bumblebee/trunk/0005-bb_nvidia_drm_detection_bug699_02.patch) =================================================================== --- 0005-bb_nvidia_drm_detection_bug699_02.patch (rev 0) +++ 0005-bb_nvidia_drm_detection_bug699_02.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,109 @@ +From fcfe596eb13f62ca9dd7de272a5a87ae843b2a00 Mon Sep 17 00:00:00 2001 +From: Abuzer Rafey <abu...@rafey.xyz> +Date: Wed, 13 Apr 2016 03:09:12 -0400 +Subject: [PATCH] Simplify module_unload + +--- + src/module.c | 72 ++++++++++-------------------------------------------------- + 1 file changed, 12 insertions(+), 60 deletions(-) + +diff --git a/src/module.c b/src/module.c +index db9736a..38e2daa 100644 +--- a/src/module.c ++++ b/src/module.c +@@ -93,56 +93,27 @@ int module_load(char *module_name, char *driver) { + */ + int module_unload(char *driver) { + +- if (module_is_loaded("nvidia_uvm") == 1) { +- int retries = 30; +- bb_log(LOG_INFO, "Unloading nvidia_uvm driver\n"); +- char *mod_argv[] = { +- "modprobe", +- "-r", +- "nvidia_uvm", +- "nvidia_modeset", +- NULL +- }; +- bb_run_fork_wait(mod_argv, 10); +- while (retries-- > 0 && module_is_loaded("nvidia_uvm") == 1) { +- usleep(100000); +- } +- if (module_is_loaded(driver) == 1) { +- bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); +- return 0; +- } +- } ++ char uvm[] = "nvidia_uvm"; ++ char drm[] = "nvidia_drm"; ++ char modeset[] = "nvidia_modeset"; ++ int uvm_is_loaded = module_is_loaded(uvm); ++ int drm_is_loaded = module_is_loaded(drm); ++ int modeset_is_loaded = module_is_loaded(modeset); + +- else if (module_is_loaded("nvidia_drm") == 1) { ++ if (uvm_is_loaded || drm_is_loaded || modeset_is_loaded || *driver == 1) { + int retries = 30; +- bb_log(LOG_INFO, "Unloading nvidia_drm driver\n"); ++ bb_log(LOG_INFO, "Unloading UVM/DRM/MODESET driver\n"); + char *mod_argv[] = { + "modprobe", + "-r", ++ "nvidia_uvm", + "nvidia_drm", +- NULL +- }; +- bb_run_fork_wait(mod_argv, 10); +- while (retries-- > 0 && module_is_loaded("nvidia_drm") == 1) { +- usleep(100000); +- } +- if (module_is_loaded(driver) == 1) { +- bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); +- return 0; +- } +- } +- +- else if (module_is_loaded("nvidia_modeset") == 1) { +- int retries = 30; +- bb_log(LOG_INFO, "Unloading nvidia_modeset driver\n"); +- char *mod_argv[] = { +- "modprobe", +- "-r", + "nvidia_modeset", ++ driver, + NULL + }; + bb_run_fork_wait(mod_argv, 10); +- while (retries-- > 0 && module_is_loaded("nvidia_modeset") == 1) { ++ while (retries-- > 0 && module_is_loaded(driver) == 1) { + usleep(100000); + } + if (module_is_loaded(driver) == 1) { +@@ -150,26 +121,7 @@ int module_unload(char *driver) { + return 0; + } + } +- +- else if (module_is_loaded(driver) == 1) { +- int retries = 30; +- bb_log(LOG_INFO, "Unloading %s driver\n", driver); +- char *mod_argv[] = { +- "modprobe", +- "-r", +- driver, +- NULL +- }; +- bb_run_fork_wait(mod_argv, 10); +- while (retries-- > 0 && module_is_loaded(driver) == 1) { +- usleep(100000); +- } +- if (module_is_loaded(driver) == 1) { +- bb_log(LOG_ERR, "Unloading %s driver timed out.\n", driver); +- return 0; +- } +- } +- return 1; ++ return 1; + } + + /** Deleted: 0006-bb_hexadicimal_bug573.patch =================================================================== --- 0006-bb_hexadicimal_bug573.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0006-bb_hexadicimal_bug573.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,23 +0,0 @@ -From 2073f8537412aa47755eb6f3f22a114403e5285b Mon Sep 17 00:00:00 2001 -From: Peter Wu <pe...@lekensteyn.nl> -Date: Wed, 16 Apr 2014 18:19:01 +0200 -Subject: [PATCH] Fix devices with a bus larger than 9 (GH-573) - -The `-isolateDevice` option accepts a PCI ID in decimal format, not hex. ---- - src/bbsecondary.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/bbsecondary.c b/src/bbsecondary.c -index 71a6b73..6b635ee 100644 ---- a/src/bbsecondary.c -+++ b/src/bbsecondary.c -@@ -138,7 +138,7 @@ bool start_secondary(bool need_secondary) { - if (!bb_is_running(bb_status.x_pid)) { - char pci_id[12]; - static char *x_conf_file; -- snprintf(pci_id, 12, "PCI:%02x:%02x:%o", pci_bus_id_discrete->bus, -+ snprintf(pci_id, 12, "PCI:%02d:%02d:%o", pci_bus_id_discrete->bus, - pci_bus_id_discrete->slot, pci_bus_id_discrete->func); - if (!x_conf_file) { - x_conf_file = xorg_path_w_driver(bb_config.x_conf_file, bb_config.driver); Copied: bumblebee/repos/community-x86_64/0006-bb_hexadicimal_bug573.patch (from rev 276924, bumblebee/trunk/0006-bb_hexadicimal_bug573.patch) =================================================================== --- 0006-bb_hexadicimal_bug573.patch (rev 0) +++ 0006-bb_hexadicimal_bug573.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,23 @@ +From 2073f8537412aa47755eb6f3f22a114403e5285b Mon Sep 17 00:00:00 2001 +From: Peter Wu <pe...@lekensteyn.nl> +Date: Wed, 16 Apr 2014 18:19:01 +0200 +Subject: [PATCH] Fix devices with a bus larger than 9 (GH-573) + +The `-isolateDevice` option accepts a PCI ID in decimal format, not hex. +--- + src/bbsecondary.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/bbsecondary.c b/src/bbsecondary.c +index 71a6b73..6b635ee 100644 +--- a/src/bbsecondary.c ++++ b/src/bbsecondary.c +@@ -138,7 +138,7 @@ bool start_secondary(bool need_secondary) { + if (!bb_is_running(bb_status.x_pid)) { + char pci_id[12]; + static char *x_conf_file; +- snprintf(pci_id, 12, "PCI:%02x:%02x:%o", pci_bus_id_discrete->bus, ++ snprintf(pci_id, 12, "PCI:%02d:%02d:%o", pci_bus_id_discrete->bus, + pci_bus_id_discrete->slot, pci_bus_id_discrete->func); + if (!x_conf_file) { + x_conf_file = xorg_path_w_driver(bb_config.x_conf_file, bb_config.driver); Deleted: 0007-bb_mutebblogger.patch =================================================================== --- 0007-bb_mutebblogger.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0007-bb_mutebblogger.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,15 +0,0 @@ ---- a/src/bblogger.c -+++ b/src/bblogger.c -@@ -144,7 +144,11 @@ - /* Error lines are errors. */ - if (strncmp(string, "(EE)", 4) == 0){ - if (strstr(string, "Failed to load module \"kbd\"") || -- strstr(string, "No input driver matching")) { -+ strstr(string, "Failed to load module \"mouse\"") || -+ strstr(string, "failed to set DRM interface version 1.4:") || -+ strstr(string, "No input driver matching") || -+ strstr(string, "systemd-logind: failed to get session:") || -+ strstr(string, "Server terminated successfully")) { - /* non-fatal errors */ - prio = LOG_DEBUG; - } else { Copied: bumblebee/repos/community-x86_64/0007-bb_mutebblogger.patch (from rev 276924, bumblebee/trunk/0007-bb_mutebblogger.patch) =================================================================== --- 0007-bb_mutebblogger.patch (rev 0) +++ 0007-bb_mutebblogger.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,15 @@ +--- a/src/bblogger.c ++++ b/src/bblogger.c +@@ -144,7 +144,11 @@ + /* Error lines are errors. */ + if (strncmp(string, "(EE)", 4) == 0){ + if (strstr(string, "Failed to load module \"kbd\"") || +- strstr(string, "No input driver matching")) { ++ strstr(string, "Failed to load module \"mouse\"") || ++ strstr(string, "failed to set DRM interface version 1.4:") || ++ strstr(string, "No input driver matching") || ++ strstr(string, "systemd-logind: failed to get session:") || ++ strstr(string, "Server terminated successfully")) { + /* non-fatal errors */ + prio = LOG_DEBUG; + } else { Deleted: 0008-libglvnd.patch =================================================================== --- 0008-libglvnd.patch 2017-12-30 06:04:46 UTC (rev 276924) +++ 0008-libglvnd.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,26 +0,0 @@ -From c3ccbb7f6dd00038b1cb328898a29583e3a6c9be Mon Sep 17 00:00:00 2001 -From: SolarAquarion <shlomocho...@gmail.com> -Date: Sun, 19 Feb 2017 16:53:09 -0500 -Subject: [PATCH] adding workaround for libglvnd - ---- - src/optirun.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/optirun.c b/src/optirun.c -index 65c83d4..ec72057 100644 ---- a/src/optirun.c -+++ b/src/optirun.c -@@ -203,7 +203,11 @@ static int run_primus(int argc, char **argv) { - - /* primus starts the X server when needed, fixes long-standing fork issue */ - setenv("BUMBLEBEE_SOCKET", bb_config.socket_path, 1); -- -+ -+/* primus needs this variable workaround for libglvnd enabled mesa */ -+ -+ setenv("__GLVND_DISALLOW_PATCHING", "1", 0); -+ - /* set LD_LIBRARY_PATH to primus_ld_path plus ld_path plus current LD_LIBRARY_PATH */ - setenv("PRIMUS_DISPLAY", bb_config.x_display, 0); - char *ldpath_cur = getenv("LD_LIBRARY_PATH"); Copied: bumblebee/repos/community-x86_64/0008-libglvnd.patch (from rev 276924, bumblebee/trunk/0008-libglvnd.patch) =================================================================== --- 0008-libglvnd.patch (rev 0) +++ 0008-libglvnd.patch 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,26 @@ +From c3ccbb7f6dd00038b1cb328898a29583e3a6c9be Mon Sep 17 00:00:00 2001 +From: SolarAquarion <shlomocho...@gmail.com> +Date: Sun, 19 Feb 2017 16:53:09 -0500 +Subject: [PATCH] adding workaround for libglvnd + +--- + src/optirun.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/optirun.c b/src/optirun.c +index 65c83d4..ec72057 100644 +--- a/src/optirun.c ++++ b/src/optirun.c +@@ -203,7 +203,11 @@ static int run_primus(int argc, char **argv) { + + /* primus starts the X server when needed, fixes long-standing fork issue */ + setenv("BUMBLEBEE_SOCKET", bb_config.socket_path, 1); +- ++ ++/* primus needs this variable workaround for libglvnd enabled mesa */ ++ ++ setenv("__GLVND_DISALLOW_PATCHING", "1", 0); ++ + /* set LD_LIBRARY_PATH to primus_ld_path plus ld_path plus current LD_LIBRARY_PATH */ + setenv("PRIMUS_DISPLAY", bb_config.x_display, 0); + char *ldpath_cur = getenv("LD_LIBRARY_PATH"); Deleted: PKGBUILD =================================================================== --- PKGBUILD 2017-12-30 06:04:46 UTC (rev 276924) +++ PKGBUILD 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,80 +0,0 @@ -# $Id$ -# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> - -pkgname=bumblebee -pkgver=3.2.1 -pkgrel=15 -pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" -arch=('i686' 'x86_64') -depends=('virtualgl' 'glib2' 'mesa-libgl') -makedepends=('help2man') -optdepends=('bbswitch: switch on/off discrete card' - 'nvidia: NVIDIA kernel driver' - 'nvidia-340xx: NVIDIA kernel driver for older devices' - 'nvidia-304xx: NVIDIA kernel driver for even older devices' - 'primus: faster back-end for optirun') -optdepends_x86_64=('lib32-virtualgl: run 32bit applications with optirun' - 'lib32-primus: faster back-end for optirun') -url="http://www.bumblebee-project.org" -license=("GPL3") -install='bumblebee.install' -backup=('etc/bumblebee/bumblebee.conf' - 'etc/bumblebee/xorg.conf.nouveau' - 'etc/bumblebee/xorg.conf.nvidia') -source=("http://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz" - "0001-bb_nvidia_modeset-detection_bug699_01.patch::https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56.patch" - "0002-bb_nvidia_modeset-detection_bug699_02.patch::https://github.com/arafey/Bumblebee/commit/09d537e8e5313cd0f2c7bf6620ca70454de8a04a.patch" - "0003-bb_nvidia_umv_detection_bug699.patch::https://github.com/arafey/Bumblebee/commit/dbbf20a38aa2bffb10c4e8af583b34dff6bfe721.patch" - "0004-bb_nvidia_drm_detection_bug699_01.patch::https://github.com/arafey/Bumblebee/commit/bcfe4dd16dd6194f1edbdc53b874a4f408343c5c.patch" - "0005-bb_nvidia_drm_detection_bug699_02.patch::https://github.com/arafey/Bumblebee/commit/fcfe596eb13f62ca9dd7de272a5a87ae843b2a00.patch" - "0006-bb_hexadicimal_bug573.patch::https://github.com/Bumblebee-Project/Bumblebee/commit/2073f8537412aa47755eb6f3f22a114403e5285b.patch" - "0007-bb_mutebblogger.patch" - "0008-libglvnd.patch" - "bumblebee.conf") -sha256sums=('1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e' - 'aff3528d17a77ff19b4e0a7a10682b8351456f11795f71ef62b315e774fb408a' - '70ad9b3d8e0d70a504110651c6f5f3a1b1d3c4c44eeb0fd49a4463e99124a47b' - '16fd522f412125b3c9b5709d78584744c70cb627e8baf8cd6025a71d278f79a6' - '4676606012319ce7a9e3890d6e83445ae674f5ff2994925d59ec2229fbae5a14' - '206f71c022b29a77227a3c7ba1f5cf68e219b957b5d807be9a30b6a6a7cafddc' - '0b7c1f4bb2e27d131c6c21fd7006d075584917ac4259bd9899e6eca99efc0ece' - 'cbe3e1717bc80146b87d8f2ab1158ee9e094ea5bb2ca9a4a8c09c24b086a7792' - 'b260d64a53617807afe21560db0592d114d7775b182e13fb59349f0157c8dba4' - '1c3d4f5d40245a23a5f1cb1f2f6bd4274ff3c5b3749f76a09255191328ae3193') - -build() { - cd "${srcdir}/${pkgname}-${pkgver}" - for p in ${srcdir}/*.patch; do - patch -Np1 -i "$p" - done - - ./configure \ - CONF_DRIVER_MODULE_NVIDIA=nvidia \ - CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia:/usr/lib:/usr/lib32 \ - CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg,/usr/lib/xorg/modules \ - --prefix=/usr \ - --sbindir=/usr/bin \ - --with-udev-rules=/usr/lib/udev/rules.d \ - --sysconfdir=/etc \ - --without-pidfile - make -} - -package() { - cd "${srcdir}/${pkgname}-${pkgver}" - - # Install main app - make install DESTDIR="$pkgdir" \ - completiondir=/usr/share/bash-completion/completions - - # Blacklist nvidia and nouveau modules - # Reference: https://github.com/Bumblebee-Project/Bumblebee/issues/719 - install -Dm644 "${srcdir}/bumblebee.conf" "${pkgdir}/usr/lib/modprobe.d/bumblebee.conf" - - # Install systemd unit - install -Dm644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" - sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" - - # Make bash_completion work - mv -v "$pkgdir"/usr/share/bash-completion/completions/{bumblebee,optirun} -} Copied: bumblebee/repos/community-x86_64/PKGBUILD (from rev 276924, bumblebee/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,84 @@ +# $Id$ +# Maintainer: Sven-Hendrik Haase <s...@lutzhaase.com> + +pkgname=bumblebee +pkgver=3.2.1 +pkgrel=16 +pkgdesc="NVIDIA Optimus support for Linux through VirtualGL" +arch=('x86_64') +depends=('virtualgl' 'glib2' 'mesa-libgl') +makedepends=('help2man') +optdepends=('bbswitch: switch on/off discrete card' + 'nvidia: NVIDIA kernel driver' + 'nvidia-340xx: NVIDIA kernel driver for older devices' + 'nvidia-304xx: NVIDIA kernel driver for even older devices' + 'primus: faster back-end for optirun' + 'lib32-virtualgl: run 32bit applications with optirun' + 'lib32-primus: faster back-end for optirun') +url="http://www.bumblebee-project.org" +license=("GPL3") +install=bumblebee.install +backup=('etc/bumblebee/bumblebee.conf' + 'etc/bumblebee/xorg.conf.nouveau' + 'etc/bumblebee/xorg.conf.nvidia') +source=("https://www.bumblebee-project.org/${pkgname}-${pkgver}.tar.gz" + "0001-bb_nvidia_modeset-detection_bug699_01.patch::https://github.com/arafey/Bumblebee/commit/5636b24fa86a005a5d2e30bd794516db13ccba56.patch" + "0002-bb_nvidia_modeset-detection_bug699_02.patch::https://github.com/arafey/Bumblebee/commit/09d537e8e5313cd0f2c7bf6620ca70454de8a04a.patch" + "0003-bb_nvidia_umv_detection_bug699.patch::https://github.com/arafey/Bumblebee/commit/dbbf20a38aa2bffb10c4e8af583b34dff6bfe721.patch" + "0004-bb_nvidia_drm_detection_bug699_01.patch::https://github.com/arafey/Bumblebee/commit/bcfe4dd16dd6194f1edbdc53b874a4f408343c5c.patch" + "0005-bb_nvidia_drm_detection_bug699_02.patch::https://github.com/arafey/Bumblebee/commit/fcfe596eb13f62ca9dd7de272a5a87ae843b2a00.patch" + "0006-bb_hexadicimal_bug573.patch::https://github.com/Bumblebee-Project/Bumblebee/commit/2073f8537412aa47755eb6f3f22a114403e5285b.patch" + "0007-bb_mutebblogger.patch" + "0008-libglvnd.patch" + "bumblebee.conf" + "bumblebee.sysusers") +sha256sums=('1018703b07e2f607a4641249d69478ce076ae5a1e9dd6cff5694d394fa7ee30e' + 'aff3528d17a77ff19b4e0a7a10682b8351456f11795f71ef62b315e774fb408a' + '70ad9b3d8e0d70a504110651c6f5f3a1b1d3c4c44eeb0fd49a4463e99124a47b' + '16fd522f412125b3c9b5709d78584744c70cb627e8baf8cd6025a71d278f79a6' + '4676606012319ce7a9e3890d6e83445ae674f5ff2994925d59ec2229fbae5a14' + '206f71c022b29a77227a3c7ba1f5cf68e219b957b5d807be9a30b6a6a7cafddc' + '0b7c1f4bb2e27d131c6c21fd7006d075584917ac4259bd9899e6eca99efc0ece' + 'cbe3e1717bc80146b87d8f2ab1158ee9e094ea5bb2ca9a4a8c09c24b086a7792' + 'b260d64a53617807afe21560db0592d114d7775b182e13fb59349f0157c8dba4' + '1c3d4f5d40245a23a5f1cb1f2f6bd4274ff3c5b3749f76a09255191328ae3193' + '1bc209c21b4f6d1975ede4091829baf98d20b33100b9d21061393880bb391fd8') + +build() { + cd "${srcdir}/${pkgname}-${pkgver}" + for p in ${srcdir}/*.patch; do + patch -Np1 -i "$p" + done + + ./configure \ + CONF_DRIVER_MODULE_NVIDIA=nvidia \ + CONF_LDPATH_NVIDIA=/usr/lib/nvidia:/usr/lib32/nvidia:/usr/lib:/usr/lib32 \ + CONF_MODPATH_NVIDIA=/usr/lib/nvidia/xorg,/usr/lib/xorg/modules \ + --prefix=/usr \ + --sbindir=/usr/bin \ + --with-udev-rules=/usr/lib/udev/rules.d \ + --sysconfdir=/etc \ + --without-pidfile + make +} + +package() { + cd "${srcdir}/${pkgname}-${pkgver}" + + # Install main app + make install DESTDIR="$pkgdir" \ + completiondir=/usr/share/bash-completion/completions + + # Blacklist nvidia and nouveau modules + # Reference: https://github.com/Bumblebee-Project/Bumblebee/issues/719 + install -Dm644 "${srcdir}/bumblebee.conf" "${pkgdir}/usr/lib/modprobe.d/bumblebee.conf" + + # Install systemd unit + install -Dm644 "scripts/systemd/bumblebeed.service" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" + sed -i "s/sbin/bin/" "${pkgdir}/usr/lib/systemd/system/bumblebeed.service" + + # Make bash_completion work + mv -v "$pkgdir"/usr/share/bash-completion/completions/{bumblebee,optirun} + + install -Dm644 "$srcdir"/bumblebee.sysusers "$pkgdir"/usr/lib/sysusers.d/$pkgname.conf +} Deleted: bumblebee.conf =================================================================== --- bumblebee.conf 2017-12-30 06:04:46 UTC (rev 276924) +++ bumblebee.conf 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,6 +0,0 @@ -blacklist nvidia -blacklist nvidia-drm -blacklist nvidia-modeset -blacklist nvidia-uvm -blacklist nouveau - Copied: bumblebee/repos/community-x86_64/bumblebee.conf (from rev 276924, bumblebee/trunk/bumblebee.conf) =================================================================== --- bumblebee.conf (rev 0) +++ bumblebee.conf 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,6 @@ +blacklist nvidia +blacklist nvidia-drm +blacklist nvidia-modeset +blacklist nvidia-uvm +blacklist nouveau + Deleted: bumblebee.install =================================================================== --- bumblebee.install 2017-12-30 06:04:46 UTC (rev 276924) +++ bumblebee.install 2017-12-30 06:05:05 UTC (rev 276925) @@ -1,8 +0,0 @@ -post_upgrade() { - getent group "bumblebee" &>/dev/null || groupadd -g 56 bumblebee - echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee" -} - -post_install() { - post_upgrade -} Copied: bumblebee/repos/community-x86_64/bumblebee.install (from rev 276924, bumblebee/trunk/bumblebee.install) =================================================================== --- bumblebee.install (rev 0) +++ bumblebee.install 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1,3 @@ +post_install() { + echo "Don't forget to add yourself to the 'bumblebee' group to use Bumblebee" +} Copied: bumblebee/repos/community-x86_64/bumblebee.sysusers (from rev 276924, bumblebee/trunk/bumblebee.sysusers) =================================================================== --- bumblebee.sysusers (rev 0) +++ bumblebee.sysusers 2017-12-30 06:05:05 UTC (rev 276925) @@ -0,0 +1 @@ +g bumblebee 56 -