| 1 |
commit: 1ef1b1f83c095b4d59dc8e9c822df6dbeb40bdca |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 25 21:27:34 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 25 21:35:39 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ef1b1f8 |
| 7 |
|
| 8 |
media-libs/mesa: Fix more libglvnd issues |
| 9 |
|
| 10 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 11 |
|
| 12 |
media-libs/mesa/mesa-19.2.0.ebuild | 11 ++++++++--- |
| 13 |
media-libs/mesa/mesa-9999.ebuild | 11 ++++++++--- |
| 14 |
2 files changed, 16 insertions(+), 6 deletions(-) |
| 15 |
|
| 16 |
diff --git a/media-libs/mesa/mesa-19.2.0.ebuild b/media-libs/mesa/mesa-19.2.0.ebuild |
| 17 |
index 53a94beb608..27301deb54b 100644 |
| 18 |
--- a/media-libs/mesa/mesa-19.2.0.ebuild |
| 19 |
+++ b/media-libs/mesa/mesa-19.2.0.ebuild |
| 20 |
@@ -243,6 +243,7 @@ x86? ( |
| 21 |
usr/lib*/libGLESv2.so.2.0.0 |
| 22 |
usr/lib*/libGL.so.1.2.0 |
| 23 |
usr/lib*/libOSMesa.so.8.0.0 |
| 24 |
+ libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) |
| 25 |
)" |
| 26 |
|
| 27 |
llvm_check_deps() { |
| 28 |
@@ -503,6 +504,8 @@ multilib_src_compile() { |
| 29 |
|
| 30 |
multilib_src_install() { |
| 31 |
meson_src_install |
| 32 |
+ |
| 33 |
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc |
| 34 |
} |
| 35 |
|
| 36 |
multilib_src_install_all() { |
| 37 |
@@ -514,9 +517,11 @@ multilib_src_test() { |
| 38 |
} |
| 39 |
|
| 40 |
pkg_postinst() { |
| 41 |
- # Switch to the xorg implementation. |
| 42 |
- echo |
| 43 |
- eselect opengl set --use-old ${OPENGL_DIR} |
| 44 |
+ if ! use libglvnd; then |
| 45 |
+ # Switch to the xorg implementation. |
| 46 |
+ echo |
| 47 |
+ eselect opengl set --use-old ${OPENGL_DIR} |
| 48 |
+ fi |
| 49 |
} |
| 50 |
|
| 51 |
# $1 - VIDEO_CARDS flag (check skipped for "--") |
| 52 |
|
| 53 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 54 |
index 53a94beb608..27301deb54b 100644 |
| 55 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 56 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 57 |
@@ -243,6 +243,7 @@ x86? ( |
| 58 |
usr/lib*/libGLESv2.so.2.0.0 |
| 59 |
usr/lib*/libGL.so.1.2.0 |
| 60 |
usr/lib*/libOSMesa.so.8.0.0 |
| 61 |
+ libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) |
| 62 |
)" |
| 63 |
|
| 64 |
llvm_check_deps() { |
| 65 |
@@ -503,6 +504,8 @@ multilib_src_compile() { |
| 66 |
|
| 67 |
multilib_src_install() { |
| 68 |
meson_src_install |
| 69 |
+ |
| 70 |
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc |
| 71 |
} |
| 72 |
|
| 73 |
multilib_src_install_all() { |
| 74 |
@@ -514,9 +517,11 @@ multilib_src_test() { |
| 75 |
} |
| 76 |
|
| 77 |
pkg_postinst() { |
| 78 |
- # Switch to the xorg implementation. |
| 79 |
- echo |
| 80 |
- eselect opengl set --use-old ${OPENGL_DIR} |
| 81 |
+ if ! use libglvnd; then |
| 82 |
+ # Switch to the xorg implementation. |
| 83 |
+ echo |
| 84 |
+ eselect opengl set --use-old ${OPENGL_DIR} |
| 85 |
+ fi |
| 86 |
} |
| 87 |
|
| 88 |
# $1 - VIDEO_CARDS flag (check skipped for "--") |
Archives