summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Turner <mattst88@gentoo.org>2019-03-04 08:54:14 -0800
committerMatt Turner <mattst88@gentoo.org>2019-03-04 10:28:49 -0800
commitfb942672a70feb4604ab8a5033510be3feae3a4f (patch)
tree46cb7c02d21bc1e856c4b54b405d1f0c7fbb3cff /media-libs/mesa
parentmedia-libs/libexif: rev bump to fix CVE-2018-20030 (diff)
downloadgentoo-fb942672a70feb4604ab8a5033510be3feae3a4f.tar.gz
gentoo-fb942672a70feb4604ab8a5033510be3feae3a4f.tar.bz2
gentoo-fb942672a70feb4604ab8a5033510be3feae3a4f.zip
media-libs/mesa: More libglvnd fixes
Signed-off-by: Matt Turner <mattst88@gentoo.org>
Diffstat (limited to 'media-libs/mesa')
-rw-r--r--media-libs/mesa/mesa-19.0.0_rc6.ebuild11
-rw-r--r--media-libs/mesa/mesa-9999.ebuild11
2 files changed, 18 insertions, 4 deletions
diff --git a/media-libs/mesa/mesa-19.0.0_rc6.ebuild b/media-libs/mesa/mesa-19.0.0_rc6.ebuild
index 0056e74d3ec..daf421bff7b 100644
--- a/media-libs/mesa/mesa-19.0.0_rc6.ebuild
+++ b/media-libs/mesa/mesa-19.0.0_rc6.ebuild
@@ -70,7 +70,6 @@ REQUIRED_USE="
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
RDEPEND="
!app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
@@ -80,6 +79,13 @@ RDEPEND="
>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
gallium? (
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
llvm? (
@@ -106,7 +112,6 @@ RDEPEND="
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
)
- libglvnd? ( media-libs/libglvnd )
wayland? (
>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
>=dev-libs/wayland-protocols-1.8
@@ -477,6 +482,8 @@ multilib_src_compile() {
multilib_src_install() {
meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
}
multilib_src_install_all() {
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 075bfa0b5a7..f889058acb1 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -70,7 +70,6 @@ REQUIRED_USE="
LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
RDEPEND="
!app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
>=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
@@ -80,6 +79,13 @@ RDEPEND="
>=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
>=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
gallium? (
unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
llvm? (
@@ -106,7 +112,6 @@ RDEPEND="
vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
)
- libglvnd? ( media-libs/libglvnd )
wayland? (
>=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
>=dev-libs/wayland-protocols-1.8
@@ -477,6 +482,8 @@ multilib_src_compile() {
multilib_src_install() {
meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
}
multilib_src_install_all() {