| 1 |
commit: 0644d83de67b352bf88de744264143d5ad1bd4ce |
| 2 |
Author: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Mar 22 12:44:39 2018 +0000 |
| 4 |
Commit: Guilherme Amadio <amadio <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Mar 22 14:23:31 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0644d83d |
| 7 |
|
| 8 |
sci-physics/root: do not look for ftgl and gl2ps with USE=-opengl |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
| 11 |
|
| 12 |
.../root/files/root-6.12.04-no-opengl.patch | 23 ++++++++++++++++++++++ |
| 13 |
sci-physics/root/root-6.12.06-r1.ebuild | 1 + |
| 14 |
2 files changed, 24 insertions(+) |
| 15 |
|
| 16 |
diff --git a/sci-physics/root/files/root-6.12.04-no-opengl.patch b/sci-physics/root/files/root-6.12.04-no-opengl.patch |
| 17 |
new file mode 100644 |
| 18 |
index 00000000000..319020222e5 |
| 19 |
--- /dev/null |
| 20 |
+++ b/sci-physics/root/files/root-6.12.04-no-opengl.patch |
| 21 |
@@ -0,0 +1,23 @@ |
| 22 |
+diff --git a/cmake/modules/SearchInstalledSoftware.cmake b/cmake/modules/SearchInstalledSoftware.cmake |
| 23 |
+index a68c462eb3..1e82e57241 100644 |
| 24 |
+--- a/cmake/modules/SearchInstalledSoftware.cmake |
| 25 |
++++ b/cmake/modules/SearchInstalledSoftware.cmake |
| 26 |
+@@ -499,7 +499,7 @@ if(opengl) |
| 27 |
+ endif() |
| 28 |
+ |
| 29 |
+ #---Check for gl2ps ------------------------------------------------------------------ |
| 30 |
+-if(NOT builtin_gl2ps) |
| 31 |
++if(gl2ps AND NOT builtin_gl2ps) |
| 32 |
+ message(STATUS "Looking for gl2ps") |
| 33 |
+ find_Package(gl2ps) |
| 34 |
+ if(NOT GL2PS_FOUND) |
| 35 |
+@@ -999,7 +999,7 @@ if(globus) |
| 36 |
+ endif() |
| 37 |
+ |
| 38 |
+ #---Check for ftgl if needed---------------------------------------------------------- |
| 39 |
+-if(NOT builtin_ftgl) |
| 40 |
++if(ftgl AND NOT builtin_ftgl) |
| 41 |
+ find_package(FTGL) |
| 42 |
+ if(NOT FTGL_FOUND) |
| 43 |
+ if(fail-on-missing) |
| 44 |
+ |
| 45 |
|
| 46 |
diff --git a/sci-physics/root/root-6.12.06-r1.ebuild b/sci-physics/root/root-6.12.06-r1.ebuild |
| 47 |
index c0815302e7d..1908822d66c 100644 |
| 48 |
--- a/sci-physics/root/root-6.12.06-r1.ebuild |
| 49 |
+++ b/sci-physics/root/root-6.12.06-r1.ebuild |
| 50 |
@@ -114,6 +114,7 @@ PATCHES=( |
| 51 |
"${FILESDIR}"/${PN}-6.00.01-dotfont.patch |
| 52 |
"${FILESDIR}"/${PN}-6.11.02-hsimple.patch |
| 53 |
"${FILESDIR}"/${PN}-6.12.04-no-ocaml.patch |
| 54 |
+ "${FILESDIR}"/${PN}-6.12.04-no-opengl.patch |
| 55 |
"${FILESDIR}"/${PN}-6.12.04-z3.patch |
| 56 |
) |
Archives