summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Eden <sven.eden@gmx.de>2014-12-12 13:47:54 +0100
committerSven Eden <sven.eden@gmx.de>2014-12-12 13:47:54 +0100
commit714ab33d66ba8ed1d1c16494f2372df3e907b858 (patch)
tree6478adb8eff809294d9bdd21f64e5ed6af10e262
parentx11-misc/bumblebee-9999-r1 : temporary ebuild to use develop instead of the (... (diff)
downloadseden-714ab33d66ba8ed1d1c16494f2372df3e907b858.tar.gz
seden-714ab33d66ba8ed1d1c16494f2372df3e907b858.tar.bz2
seden-714ab33d66ba8ed1d1c16494f2372df3e907b858.zip
x11-misc/bumblebee-9999-r2 : Added experimental support patch for nvidia_uvm
-rw-r--r--x11-misc/bumblebee/ChangeLog6
-rw-r--r--x11-misc/bumblebee/Manifest5
-rw-r--r--x11-misc/bumblebee/bumblebee-9999-r2.ebuild (renamed from x11-misc/bumblebee/bumblebee-9999-r1.ebuild)1
-rw-r--r--x11-misc/bumblebee/files/nvidia-uvm-support.patch30
4 files changed, 40 insertions, 2 deletions
diff --git a/x11-misc/bumblebee/ChangeLog b/x11-misc/bumblebee/ChangeLog
index dfcc8b0..4823dae 100644
--- a/x11-misc/bumblebee/ChangeLog
+++ b/x11-misc/bumblebee/ChangeLog
@@ -2,6 +2,12 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*x11-misc/bumblebee-9999-r2 (12 Dec 2014)
+
+ 12 Dec 2014; Sven Eden <yamakuzure@gmx.net> +bumblebee-9999-r2
+ -bumblebee-9999-r1
+ Added a patch to directly support nvidia_uvm
+
*x11-misc/bumblebee-9999-r1 (11 Dec 2014)
11 Dec 2014; Sven Eden <yamakuzure@gmx.net> +bumblebee-9999-r1
diff --git a/x11-misc/bumblebee/Manifest b/x11-misc/bumblebee/Manifest
index 70e5fca..fd628da 100644
--- a/x11-misc/bumblebee/Manifest
+++ b/x11-misc/bumblebee/Manifest
@@ -1,6 +1,7 @@
AUX bumblebee.confd 60 SHA256 9e0287f542cff0fd3452a0c3d6d427a3404706c93ac9a00f4d99fe52ed596d75 SHA512 4c773002e372e1696c0922bda91a104ea0ee244eb6beac84a4e7ad2ff1aee265aa248e63c3ad55ea75cabbd36b03d9efa3f8ec3ef708346837ab6a10d6652251 WHIRLPOOL 53e0f7efcf8ceb1990feccabb2050a440ea5e279703c70c896ced4a0a042c191c4ef6c5096dd237af86ca2bcc8d61782cf057f56b6f21983dd642832f314bfbd
AUX bumblebee.envd 127 SHA256 fd6c2719f8268a03fe01df6f9ead660faa3f7aa2a63230d5a7e923a190077437 SHA512 f42bd5992a8c80d045036a689e3c33cc2bdb7d54afb03bb7f33a80fa6a9c1e05f583cdec5b3da42021c48c1b59db4664e9c850e48ada47a1887327f7b11633af WHIRLPOOL dc5d9dffd2b5219f7c6f11a917cbab004fa3ed89005357dbc1dd1eb3833d4243209c71ccc0b3abc6163c1c192e1a7de8dc1b7ce137ba43aa8f0157ecfd78857c
AUX bumblebee.initd 500 SHA256 2c84187dd9898220b60fd6ea91adfa8e6a5b5e033f55cc73c0fb395fec236e90 SHA512 f20e77021778de4ac15fd21bffe891780cecc4fe437702962c5169415a2846a6ff5a66227618177a99a6977248e1c33ce2a55290c5c6ff3a4c87c804d352048a WHIRLPOOL 58db3b5196906c8746871851ca50cf65ccab824e5352997d8608905d71f339c6865be6f29982e6c33f679cae0692030bfdc8d8841ccbfcda45a33cfba9f15932
-EBUILD bumblebee-9999-r1.ebuild 2225 SHA256 ff3e7ebe9e5da5b57a0e2d78a39dc0065bbfde1e9598b2da94fed20c6768e407 SHA512 b881c75fd7efa50910774e055fd1f0196ff773a95bfdedf7ccce54f8253913e8152eec1d6afcc20a642f8b1f02cb5b3878aa4d76507451afc5fd91e3cd19e22b WHIRLPOOL a9f013341c3cb005704355c0c021bb86f0ddcbf52311ffa3509534b90dc1821df7835d029d938f7f55c2e552efe6f48ff6f280f2ec045100046e80a974be5155
-MISC ChangeLog 303 SHA256 09e6044ea89599cd38d042173fa3676fc8b8966d734c8e9ff56198fa64d4886b SHA512 1c034407f08daa5c19d149d32a7308edb6e80987083be8ba692787505486d36fbc045b3e438fd46bd185a1053194353211c4c5ba6f56cb68de477624b4230b3a WHIRLPOOL 15e0702aaa9fe233785b4878af950adab602bb61e6f584552fc1aef12ded6aea586dff650706f9f99c89a0ad890955ee6a6bc9369bbfcb71e030dd6a2a2c5d59
+AUX nvidia-uvm-support.patch 1123 SHA256 f3c56febe2b0aec165231999c95bb64e08c7cfed124a0b29a22082f104e79113 SHA512 f41bfc520e60896c8230ff8357db10a73418ed65ed1d54a41c9c2134078be383007361488ca8fd7a579baee5a35bd49d5da1f64e8a9b3e48f24302be4c6f81dd WHIRLPOOL 4baeca6a0a0efb05ebd1a5d6281c51eda8551035a15f2d5b995d79c3e2c072f8c1b6d7d7256a9cb146403039696cb83a3054dba224f960f11eb07cc0373f2907
+EBUILD bumblebee-9999-r2.ebuild 2272 SHA256 a48be8ba1c29f225ac43f52c1b8d5dcdc9c2156bff90abf70d3ecbb0d74ac79d SHA512 a422af5239f99b7933774b15c94aa91672fafaaa78a590e20f9d6b3cb517bb02dea9169860c985306928e941fc65bd570b8883a0b62d6ef14acb2183be218b5f WHIRLPOOL a93e52689e8ec17d758ea516071e0a0525586099b3d5fd0fda5bb7ab7e71779a8ede3b83a1fd623838780af18a2ef1ab7c0a40faa51e7d3aa7e14693d2bbfda2
+MISC ChangeLog 480 SHA256 fd6a9ffa80e10d3a0006beade56d3de9e86232039cf885b76d0eefbc5874aa21 SHA512 ec6b55e21f17cea93a739438902ba18c2d22add0fa0081e203fd4e14082a4706a03ecb8ac3aa2ca501228486394ddd6213e12cc4827cf5e8df6b07ba8685fd50 WHIRLPOOL 29b9bd38c9df658654b6e99cfa16a0a0a3b5d77ea6a73c2d68c784dc552308fa0f99395e85b467f81acb11d483ab6d12d13eab7f642b767ce0a8265c2f922af5
MISC metadata.xml 828 SHA256 905455d45133c8c32abd1e8adab26a99ca26d6f334f98bcfc133ed526f04689d SHA512 8dc1137c83ba307809c7b1c8659bf5bac6a86964e74bb87f1b78c4708ebd2a36df2e3c1f6902aa3ec25b9c017ff2828cc41dbe049fc53f0ea6c6a9e0f83485b4 WHIRLPOOL ac6e8db4aa91d98467402b20b124259459355bdb338d2dfd4983dc70f78fe1b1a243eab4eccd61b443991c4c4e0c8f103e23b4d1cc4a96ebc49e214f2aa1e20d
diff --git a/x11-misc/bumblebee/bumblebee-9999-r1.ebuild b/x11-misc/bumblebee/bumblebee-9999-r2.ebuild
index 943391e..b75bb3d 100644
--- a/x11-misc/bumblebee/bumblebee-9999-r1.ebuild
+++ b/x11-misc/bumblebee/bumblebee-9999-r2.ebuild
@@ -42,6 +42,7 @@ PDEPEND="
REQUIRED_USE="|| ( video_cards_nouveau video_cards_nvidia )"
src_prepare() {
+ epatch "${FILESDIR}"/nvidia-uvm-support.patch
base_src_prepare
eautoreconf
}
diff --git a/x11-misc/bumblebee/files/nvidia-uvm-support.patch b/x11-misc/bumblebee/files/nvidia-uvm-support.patch
new file mode 100644
index 0000000..d002d80
--- /dev/null
+++ b/x11-misc/bumblebee/files/nvidia-uvm-support.patch
@@ -0,0 +1,30 @@
+--- a/src/bbsecondary.c 2013-04-26 22:49:03.018174178 +0700
++++ b/src/bbsecondary.c 2014-11-11 20:14:32.663347521 +0700
+@@ -119,6 +119,17 @@
+ if (!module_load(module_name, driver_name)) {
+ set_bb_error("Could not load GPU driver");
+ return false;
++ } else {
++ /* XXX NVIDIA UVM support */
++ if (strstr(module_name, "nvidia")) { /* We are using NVIDIA's proprietary driver */
++ char uvm_module_name[1024];
++ sprintf(uvm_module_name, "%s-uvm", module_name);
++ if (!module_load(uvm_module_name, "nvidia_uvm")) {
++ char log_string[1024];
++ sprintf(log_string, "Cannot load UVM module: %s\n", uvm_module_name);
++ bb_log(LOG_ERR, log_string);
++ }
++ }
+ }
+ }
+ return true;
+@@ -232,6 +243,10 @@
+ }
+ /* unload the driver loaded by the graphica card */
+ if (pci_get_driver(driver, pci_bus_id_discrete, sizeof driver)) {
++ /* XXX NVIDIA UVM support */
++ if (strstr(driver, "nvidia")) {
++ module_unload("nvidia_uvm");
++ }
+ module_unload(driver);
+ } \ No newline at end of file