1 |
commit: 2ad1f67c386f54b5f559dc50a88a9d838567a79e |
2 |
Author: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Sep 26 02:53:23 2019 +0000 |
4 |
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Sep 26 02:53:23 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2ad1f67c |
7 |
|
8 |
media-libs/mesa: Version bump 19.2.0 final |
9 |
|
10 |
Package-Manager: Portage-2.3.76, Repoman-2.3.17 |
11 |
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org> |
12 |
|
13 |
media-libs/mesa/Manifest | 2 +- |
14 |
.../mesa/{mesa-19.2.0_rc4.ebuild => mesa-19.2.0.ebuild} | 15 ++++++++++----- |
15 |
2 files changed, 11 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest |
18 |
index feb6595..e5b55b7 100644 |
19 |
--- a/media-libs/mesa/Manifest |
20 |
+++ b/media-libs/mesa/Manifest |
21 |
@@ -1,3 +1,3 @@ |
22 |
DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d |
23 |
DIST mesa-19.1.4.tar.xz 10938008 BLAKE2B 4745fc7e844397378fe1adf61bcd5b54aad11ec0b375ced85fd80ced01227432b491ad8b7ba7d9013190cfbb451bc11cdb7c8af0e1f298dd5d793d3ce43aa92b SHA512 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5 |
24 |
-DIST mesa-19.2.0-rc4.tar.xz 11458940 BLAKE2B e173143f01efbbe98e11d37be4e66ac5d1fb739f15796cd25b6fee3b86cb384803e21d9b65880f7b0ccbd51f956e5cf5c99a2edbf5ec1ff472a90cf26bb7640b SHA512 a00422b4278951e4706671fe1507d5ba323a3badaceb03649dde425216fbb3cd83a21785374c75135e90fc5c6c67963f8aad0c33dac1cedaed3b69f2cd9f1c9b |
25 |
+DIST mesa-19.2.0.tar.xz 11464180 BLAKE2B f2f260e9efb928532501ff4f1c0137621f954991ef6d30fbdc61c28fb95e3ddb9e81276d345bc7bff6871e603dcbb29073b788427d0dea565dfa9b7f8b88966d SHA512 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0 |
26 |
|
27 |
diff --git a/media-libs/mesa/mesa-19.2.0_rc4.ebuild b/media-libs/mesa/mesa-19.2.0.ebuild |
28 |
similarity index 97% |
29 |
rename from media-libs/mesa/mesa-19.2.0_rc4.ebuild |
30 |
rename to media-libs/mesa/mesa-19.2.0.ebuild |
31 |
index fb451b1..3993821 100644 |
32 |
--- a/media-libs/mesa/mesa-19.2.0_rc4.ebuild |
33 |
+++ b/media-libs/mesa/mesa-19.2.0.ebuild |
34 |
@@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do |
35 |
done |
36 |
|
37 |
IUSE="${IUSE_VIDEO_CARDS} |
38 |
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm |
39 |
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm |
40 |
lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind |
41 |
vdpau vulkan vulkan-overlay wayland +X xa xvmc" |
42 |
|
43 |
@@ -77,7 +77,7 @@ RDEPEND=" |
44 |
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] |
45 |
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] |
46 |
libglvnd? ( |
47 |
- media-libs/libglvnd[${MULTILIB_USEDEP}] |
48 |
+ >=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}] |
49 |
!app-eselect/eselect-opengl |
50 |
) |
51 |
!libglvnd? ( |
52 |
@@ -243,6 +243,7 @@ x86? ( |
53 |
usr/lib*/libGLESv2.so.2.0.0 |
54 |
usr/lib*/libGL.so.1.2.0 |
55 |
usr/lib*/libOSMesa.so.8.0.0 |
56 |
+ libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 ) |
57 |
)" |
58 |
|
59 |
PATCHES=( |
60 |
@@ -512,6 +513,8 @@ multilib_src_compile() { |
61 |
|
62 |
multilib_src_install() { |
63 |
meson_src_install |
64 |
+ |
65 |
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc |
66 |
} |
67 |
|
68 |
multilib_src_install_all() { |
69 |
@@ -523,9 +526,11 @@ multilib_src_test() { |
70 |
} |
71 |
|
72 |
pkg_postinst() { |
73 |
- # Switch to the xorg implementation. |
74 |
- echo |
75 |
- eselect opengl set --use-old ${OPENGL_DIR} |
76 |
+ if ! use libglvnd; then |
77 |
+ # Switch to the xorg implementation. |
78 |
+ echo |
79 |
+ eselect opengl set --use-old ${OPENGL_DIR} |
80 |
+ fi |
81 |
} |
82 |
|
83 |
# $1 - VIDEO_CARDS flag (check skipped for "--") |