| 1 |
commit: 14b419aebb9fb2508182bb4b0405ef7884f6c2d7 |
| 2 |
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jul 1 20:19:40 2019 +0000 |
| 4 |
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jul 1 20:23:55 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=14b419ae |
| 7 |
|
| 8 |
media-libs/mesa: Drop USE=pic |
| 9 |
|
| 10 |
Upstream commit 20294dceebc2 ("mesa: Enable asm unconditionally, now |
| 11 |
that gen_matypes is gone.") removed the -Dasm= option. I have no |
| 12 |
information about when or why the 'pic' USE flag was added, so worst |
| 13 |
case I'll at least find out why it's needed by removing it now... |
| 14 |
|
| 15 |
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org> |
| 16 |
|
| 17 |
media-libs/mesa/mesa-9999.ebuild | 19 ++++++------------- |
| 18 |
1 file changed, 6 insertions(+), 13 deletions(-) |
| 19 |
|
| 20 |
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild |
| 21 |
index 0fd4ae716a5..cd10f97cc60 100644 |
| 22 |
--- a/media-libs/mesa/mesa-9999.ebuild |
| 23 |
+++ b/media-libs/mesa/mesa-9999.ebuild |
| 24 |
@@ -37,7 +37,7 @@ done |
| 25 |
|
| 26 |
IUSE="${IUSE_VIDEO_CARDS} |
| 27 |
+classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm |
| 28 |
- lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind |
| 29 |
+ lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind |
| 30 |
vdpau vulkan vulkan-overlay wayland xa xvmc" |
| 31 |
|
| 32 |
REQUIRED_USE=" |
| 33 |
@@ -230,13 +230,11 @@ EGIT_CHECKOUT_DIR=${S} |
| 34 |
|
| 35 |
QA_WX_LOAD=" |
| 36 |
x86? ( |
| 37 |
- !pic? ( |
| 38 |
- usr/lib*/libglapi.so.0.0.0 |
| 39 |
- usr/lib*/libGLESv1_CM.so.1.0.0 |
| 40 |
- usr/lib*/libGLESv2.so.2.0.0 |
| 41 |
- usr/lib*/libGL.so.1.2.0 |
| 42 |
- usr/lib*/libOSMesa.so.8.0.0 |
| 43 |
- ) |
| 44 |
+ usr/lib*/libglapi.so.0.0.0 |
| 45 |
+ usr/lib*/libGLESv1_CM.so.1.0.0 |
| 46 |
+ usr/lib*/libGLESv2.so.2.0.0 |
| 47 |
+ usr/lib*/libGL.so.1.2.0 |
| 48 |
+ usr/lib*/libOSMesa.so.8.0.0 |
| 49 |
)" |
| 50 |
|
| 51 |
llvm_check_deps() { |
| 52 |
@@ -452,11 +450,6 @@ multilib_src_configure() { |
| 53 |
emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) |
| 54 |
fi |
| 55 |
|
| 56 |
- # on abi_x86_32 hardened we need to have asm disable |
| 57 |
- if [[ ${ABI} == x86* ]] && use pic; then |
| 58 |
- emesonargs+=( -Dasm=false ) |
| 59 |
- fi |
| 60 |
- |
| 61 |
if use gallium; then |
| 62 |
gallium_enable -- swrast |
| 63 |
emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) |
Archives