diff options
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/Manifest.gz | bin | 66482 -> 66474 bytes | |||
-rw-r--r-- | media-libs/libglvnd/Manifest | 7 | ||||
-rw-r--r-- | media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch | 219 | ||||
-rw-r--r-- | media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild | 56 | ||||
-rw-r--r-- | media-libs/mesa/Manifest | 8 | ||||
-rw-r--r-- | media-libs/mesa/mesa-19.2.0_rc4.ebuild | 543 |
6 files changed, 833 insertions, 0 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 145fbcd8ea48..1feb319ce00d 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest index bf4434decf83..a08b7a0bbb23 100644 --- a/media-libs/libglvnd/Manifest +++ b/media-libs/libglvnd/Manifest @@ -1,4 +1,11 @@ +<<<<<<< HEAD +AUX libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch 6596 BLAKE2B 0528a825fbbfe8c7530e841c1542a9a4d3e08159abc379f09df3789ccbde583243c1ed478ab14638ffef7b7949090a24b2a9204cb5b4641f8b9bef4e1540bd3d SHA512 5c3ea6d4f0c683945ff2178fe43cc2ac3876bba5f66dc9291a8129213ba3235a732fe86b53bfeeb5df08134ed782967027b7387c12e9bc1a1be795e0c1400a55 +DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7 DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c +EBUILD libglvnd-1.1.1-r1.ebuild 1050 BLAKE2B e01e103c7c4a719cfce84ffd9fe061646cecaac2a3cbdb34fbdf316f373c3f25c3dc398d3437aba41887a08c454f1c6799ff9221bee2d4c31a6f9ee5108d237a SHA512 fb754f35e79185a66351fbe62e82d4613a9c2a218c05354d58d5648e1358a3f29ae3018bfafcaa7487bec3a528c7354f16d57d16733563473138f35a868e034c +======= +DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c +>>>>>>> next EBUILD libglvnd-1.2.0.ebuild 1155 BLAKE2B 9d48e9c1637a31fb33d99cf674c22c73f7e2b7d8a746d3644c8b6113fe982b9848f3936f4900aa312d30c89dc4b1898da4daba6ccfaab694fee37a728f63ef2f SHA512 40c9c5e70595266c6835bece0765191767b5e3811fe49e86e94821cb44914351f812c7f4e9c7619ec8892f165b669fc9001e29a9c866304a081d81a33313d455 EBUILD libglvnd-9999.ebuild 1199 BLAKE2B 029902c0c826c0ee71314c1a9c24fe022a04327bf5addd80bc937e9007bcd4e043a29dd94de5810b4d385ecbb68229d27ac05aa51d9c7a1417a61076f77dda74 SHA512 9b84a3b424481d5c069444bb76e2d2c9572b058e245ef4145a6833ad891b6aac3e95417e5c844da7ee7ec2fc8471871bba4dc4441f02c2e21308482def70169d MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c diff --git a/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch b/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch new file mode 100644 index 000000000000..02996f4f3d34 --- /dev/null +++ b/media-libs/libglvnd/files/libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch @@ -0,0 +1,219 @@ +From 0dfaea2bcb7cdcc785f95e244223bd004a2d7fba Mon Sep 17 00:00:00 2001 +From: Kyle Brenneman <kbrenneman@nvidia.com> +Date: Tue, 3 Sep 2019 08:13:34 -0600 +Subject: [PATCH] Add pkg-config files for EGL, GL, GLES, and GLX. + +This preserves the names from Mesa's gl, glesv1_cm, glesv2, and egl pkgconfig +data, and for compatibility with that, gl.pc gives you libGL. + +Also added glx.pc and opengl.pc for libglvnd's libGLX and libOpenGL libraries. +If newer applications want to explicitly depend on libGLX and the appropriate +rendering API they can ask for the new pkgconfig names. + +Note that the version numbers in each file are the API versions that each +library exposes, not the libglvnd package version. +--- + configure.ac | 6 ++++++ + src/EGL/Makefile.am | 3 +++ + src/EGL/egl.pc.in | 10 ++++++++++ + src/GL/Makefile.am | 3 +++ + src/GL/gl.pc.in | 10 ++++++++++ + src/GLESv1/Makefile.am | 2 ++ + src/GLESv1/glesv1_cm.pc.in | 10 ++++++++++ + src/GLESv2/Makefile.am | 2 ++ + src/GLESv2/glesv2.pc.in | 10 ++++++++++ + src/GLX/Makefile.am | 2 ++ + src/GLX/glx.pc.in | 10 ++++++++++ + src/OpenGL/Makefile.am | 2 ++ + src/OpenGL/opengl.pc.in | 10 ++++++++++ + 13 files changed, 80 insertions(+) + create mode 100644 src/EGL/egl.pc.in + create mode 100644 src/GL/gl.pc.in + create mode 100644 src/GLESv1/glesv1_cm.pc.in + create mode 100644 src/GLESv2/glesv2.pc.in + create mode 100644 src/GLX/glx.pc.in + create mode 100644 src/OpenGL/opengl.pc.in + +diff --git a/configure.ac b/configure.ac +index cdbb138..7feec30 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -324,11 +324,17 @@ AC_CONFIG_FILES([Makefile + include/Makefile + src/Makefile + src/GL/Makefile ++ src/GL/gl.pc ++ src/OpenGL/opengl.pc + src/OpenGL/Makefile ++ src/GLESv1/glesv1_cm.pc + src/GLESv1/Makefile ++ src/GLESv2/glesv2.pc + src/GLESv2/Makefile ++ src/GLX/glx.pc + src/GLX/Makefile + src/EGL/Makefile ++ src/EGL/egl.pc + src/GLdispatch/Makefile + src/GLdispatch/vnd-glapi/Makefile + src/util/Makefile +diff --git a/src/EGL/Makefile.am b/src/EGL/Makefile.am +index 5c036dc..c55c83e 100644 +--- a/src/EGL/Makefile.am ++++ b/src/EGL/Makefile.am +@@ -106,3 +106,6 @@ g_egldispatchstubs.c : $(GENERATE_DEPS) + g_egldispatchstubs.h : $(GENERATE_DEPS) + $(AM_V_GEN)$(PYTHON) $(GENERATE_DISPATCH_SCRIPT) header $(GENERATE_LIST_FILES) > $@ + endif ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = egl.pc +diff --git a/src/EGL/egl.pc.in b/src/EGL/egl.pc.in +new file mode 100644 +index 0000000..ffae9e2 +--- /dev/null ++++ b/src/EGL/egl.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: egl ++Description: EGL library and headers ++Version: 1.5 ++Libs: -L${libdir} -lEGL ++Cflags: -I${includedir} +diff --git a/src/GL/Makefile.am b/src/GL/Makefile.am +index ecdcbd0..225fdcb 100644 +--- a/src/GL/Makefile.am ++++ b/src/GL/Makefile.am +@@ -70,3 +70,6 @@ libGL_la_LIBADD += ../GLdispatch/libGLdispatch.la + libGL_la_LIBADD += ../GLdispatch/vnd-glapi/libglapi_gl.la + libGL_la_LIBADD += ../util/libutils_misc.la + libGL_la_LIBADD += @LIB_DL@ ++ ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = gl.pc +diff --git a/src/GL/gl.pc.in b/src/GL/gl.pc.in +new file mode 100644 +index 0000000..0eaa149 +--- /dev/null ++++ b/src/GL/gl.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: gl ++Description: Legacy OpenGL and GLX library and headers ++Version: 1.2 ++Libs: -L${libdir} -lGL ++Cflags: -I${includedir} +diff --git a/src/GLESv1/Makefile.am b/src/GLESv1/Makefile.am +index d20017d..88e07bc 100644 +--- a/src/GLESv1/Makefile.am ++++ b/src/GLESv1/Makefile.am +@@ -38,3 +38,5 @@ libGLESv1_CM_la_LIBADD = \ + ../GLdispatch/vnd-glapi/libglapi_glesv1.la \ + ../util/libutils_misc.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glesv1_cm.pc +diff --git a/src/GLESv1/glesv1_cm.pc.in b/src/GLESv1/glesv1_cm.pc.in +new file mode 100644 +index 0000000..daa247f +--- /dev/null ++++ b/src/GLESv1/glesv1_cm.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: glesv1_cm ++Description: OpenGL ES-CM v1 library and headers ++Version: 1.0 ++Libs: -L${libdir} -lGLESv1_CM ++Cflags: -I${includedir} +diff --git a/src/GLESv2/Makefile.am b/src/GLESv2/Makefile.am +index a9c2351..f40e06f 100644 +--- a/src/GLESv2/Makefile.am ++++ b/src/GLESv2/Makefile.am +@@ -38,3 +38,5 @@ libGLESv2_la_LIBADD = \ + ../GLdispatch/vnd-glapi/libglapi_glesv2.la \ + ../util/libutils_misc.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glesv2.pc +diff --git a/src/GLESv2/glesv2.pc.in b/src/GLESv2/glesv2.pc.in +new file mode 100644 +index 0000000..a9fe839 +--- /dev/null ++++ b/src/GLESv2/glesv2.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: gles2 ++Description: OpenGL ES v2/v3 library and headers ++Version: 3.2 ++Libs: -L${libdir} -lGLESv2 ++Cflags: -I${includedir} +diff --git a/src/GLX/Makefile.am b/src/GLX/Makefile.am +index 030836b..0d19674 100644 +--- a/src/GLX/Makefile.am ++++ b/src/GLX/Makefile.am +@@ -69,3 +69,5 @@ libGLX_la_SOURCES = \ + libglxmapping.c \ + libglxproto.c + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = glx.pc +diff --git a/src/GLX/glx.pc.in b/src/GLX/glx.pc.in +new file mode 100644 +index 0000000..1561181 +--- /dev/null ++++ b/src/GLX/glx.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: glx ++Description: GLX library and headers ++Version: 1.4 ++Libs: -L${libdir} -lGLX ++Cflags: -I${includedir} +diff --git a/src/OpenGL/Makefile.am b/src/OpenGL/Makefile.am +index 647d9e4..4b34dd5 100644 +--- a/src/OpenGL/Makefile.am ++++ b/src/OpenGL/Makefile.am +@@ -47,3 +47,5 @@ libOpenGL_la_LIBADD = \ + ../GLdispatch/vnd-glapi/libglapi_opengl.la \ + ../util/libutils_misc.la + ++pkgconfigdir = $(libdir)/pkgconfig ++pkgconfig_DATA = opengl.pc +diff --git a/src/OpenGL/opengl.pc.in b/src/OpenGL/opengl.pc.in +new file mode 100644 +index 0000000..d560c06 +--- /dev/null ++++ b/src/OpenGL/opengl.pc.in +@@ -0,0 +1,10 @@ ++prefix=@prefix@ ++exec_prefix=${prefix} ++libdir=@libdir@ ++includedir=@includedir@ ++ ++Name: opengl ++Description: OpenGL (without GLX) headers and interface ++Version: 4.5 ++Libs: -L${libdir} -lOpenGL ++Cflags: -I${includedir} +-- +2.21.0 + diff --git a/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild new file mode 100644 index 000000000000..090fdd736c49 --- /dev/null +++ b/media-libs/libglvnd/libglvnd-1.1.1-r1.ebuild @@ -0,0 +1,56 @@ +# Copyright 2018-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) +inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1 + +DESCRIPTION="The GL Vendor-Neutral Dispatch library" +HOMEPAGE="https://github.com/NVIDIA/libglvnd" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + KEYWORDS="~amd64" + SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz" +fi + +LICENSE="MIT" +SLOT="0" +IUSE="" + +RDEPEND=" + !media-libs/mesa[-libglvnd(-)] + !<media-libs/mesa-19.2.0_rc1 + x11-libs/libX11[${MULTILIB_USEDEP}] + " +DEPEND="${PYTHON_DEPS} + ${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + ECONF_SOURCE=${S} econf +} + +multilib_src_install() { + default + find "${D}" -name '*.la' -delete || die +} + +multilib_src_test() { + emake check +} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 06d061f5f1be..10d7c3100f14 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,8 +1,16 @@ DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d DIST mesa-19.1.7.tar.xz 10941152 BLAKE2B 6be14ddac404668bdd8b7b8756388019c3610ac41b65a7723a419b97b7eccbca666ad6d904f4cde186c4b171e056636a8a6a5727e30963c8fa177d7861bd6cfb SHA512 0865b5f91e5daa00e1da2b3d8b65fe5d2ff6332372bf8fec7d671d05d8d64ec5a7abea1858cdfc506c76b7226d2bea0af3426565f156b796d8e0f949ea33dc15 +<<<<<<< HEAD +DIST mesa-19.2.0-rc4.tar.xz 11458940 BLAKE2B e173143f01efbbe98e11d37be4e66ac5d1fb739f15796cd25b6fee3b86cb384803e21d9b65880f7b0ccbd51f956e5cf5c99a2edbf5ec1ff472a90cf26bb7640b SHA512 a00422b4278951e4706671fe1507d5ba323a3badaceb03649dde425216fbb3cd83a21785374c75135e90fc5c6c67963f8aad0c33dac1cedaed3b69f2cd9f1c9b +EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d +EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112 +EBUILD mesa-19.2.0_rc4.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d +EBUILD mesa-9999.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d +======= DIST mesa-19.2.0.tar.xz 11464180 BLAKE2B f2f260e9efb928532501ff4f1c0137621f954991ef6d30fbdc61c28fb95e3ddb9e81276d345bc7bff6871e603dcbb29073b788427d0dea565dfa9b7f8b88966d SHA512 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0 EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112 EBUILD mesa-19.2.0.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a EBUILD mesa-9999.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a +>>>>>>> next MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72 diff --git a/media-libs/mesa/mesa-19.2.0_rc4.ebuild b/media-libs/mesa/mesa-19.2.0_rc4.ebuild new file mode 100644 index 000000000000..b7b3a5803880 --- /dev/null +++ b/media-libs/mesa/mesa-19.2.0_rc4.ebuild @@ -0,0 +1,543 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_5 python3_6 python3_7 ) + +inherit llvm meson multilib-minimal pax-utils python-any-r1 + +OPENGL_DIR="xorg-x11" + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT=" + !test? ( test ) +" + +RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm + lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind + vdpau vulkan vulkan-overlay wayland +X xa xvmc" + +REQUIRED_USE=" + d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + gles1? ( egl ) + gles2? ( egl ) + vulkan? ( dri3 + || ( video_cards_i965 video_cards_iris video_cards_radeonsi ) + video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + wayland? ( egl gbm ) + video_cards_freedreno? ( gallium ) + video_cards_intel? ( classic ) + video_cards_i915? ( || ( classic gallium ) ) + video_cards_i965? ( classic ) + video_cards_iris? ( gallium ) + video_cards_lima? ( gallium ) + video_cards_nouveau? ( || ( classic gallium ) ) + video_cards_panfrost? ( gallium ) + video_cards_radeon? ( || ( classic gallium ) + gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) + video_cards_r100? ( classic ) + video_cards_r200? ( classic ) + video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r600? ( gallium ) + video_cards_radeonsi? ( gallium llvm ) + video_cards_vc4? ( gallium ) + video_cards_virgl? ( gallium ) + video_cards_vivante? ( gallium gbm ) + video_cards_vmware? ( gallium ) + xa? ( X ) + xvmc? ( X ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99" +RDEPEND=" + !app-eselect/eselect-mesa + >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + libglvnd? ( + media-libs/libglvnd[${MULTILIB_USEDEP}] + !app-eselect/eselect-opengl + ) + !libglvnd? ( + >=app-eselect/eselect-opengl-1.3.0 + ) + gallium? ( + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) + ) + wayland? ( + >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}] + >=dev-libs/wayland-protocols-1.8 + ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + + video_cards_intel? ( + !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + ) + video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) + vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes:=[${MULTILIB_USEDEP}] + ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="10" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:10[${MULTILIB_USEDEP}] + sys-devel/llvm:9[${MULTILIB_USEDEP}] + sys-devel/llvm:8[${MULTILIB_USEDEP}] + sys-devel/llvm:7[${MULTILIB_USEDEP}] + ) + sys-devel/llvm:=[${MULTILIB_USEDEP}] +" +LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} +CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} +RDEPEND="${RDEPEND} + llvm? ( + opencl? ( + video_cards_r600? ( + ${CLANG_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${CLANG_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${CLANG_DEPSTR} + ) + ) + ) + ) + !opencl? ( + video_cards_r600? ( + ${LLVM_DEPSTR_AMDGPU} + ) + !video_cards_r600? ( + video_cards_radeonsi? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + !video_cards_r600? ( + !video_cards_radeonsi? ( + video_cards_radeon? ( + ${LLVM_DEPSTR_AMDGPU} + ) + ) + ) + !video_cards_r600? ( + !video_cards_radeon? ( + !video_cards_radeonsi? ( + ${LLVM_DEPSTR} + ) + ) + ) + ) + ) +" +unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} + +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind ) + X? ( + x11-libs/libXrandr[${MULTILIB_USEDEP}] + x11-base/xorg-proto + ) +" +BDEPEND=" + ${PYTHON_DEPS} + opencl? ( + >=sys-devel/gcc-4.6 + ) + sys-devel/bison + sys-devel/flex + sys-devel/gettext + virtual/pkgconfig + $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if use xvmc; then + if ! use video_cards_r600 && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau" + fi + fi + + if ! use gallium; then + use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium" + use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium" + use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium" + use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium" + use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium" + use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium" + use xa && ewarn "Ignoring USE=xa since USE does not contain gallium" + use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium" + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi +} + +python_check_deps() { + has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + if use classic; then + # Intel code + dri_driver_enable video_cards_i915 i915 + dri_driver_enable video_cards_i965 i965 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + dri_driver_enable video_cards_intel i915 i965 + fi + + # Nouveau code + dri_driver_enable video_cards_nouveau nouveau + + # ATI code + dri_driver_enable video_cards_r100 r100 + dri_driver_enable video_cards_r200 r200 + if ! use video_cards_r100 && \ + ! use video_cards_r200; then + dri_driver_enable video_cards_radeon r100 r200 + fi + fi + + emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") ) + + if use gallium; then + emesonargs+=( + $(meson_use llvm) + $(meson_use lm-sensors lmsensors) + $(meson_use unwind libunwind) + ) + + if use video_cards_iris || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=false) + fi + + if use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_use vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=false) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=false) + fi + + if use video_cards_r600 || + use video_cards_nouveau; then + emesonargs+=($(meson_use xvmc gallium-xvmc)) + else + emesonargs+=(-Dgallium-xvmc=false) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable video_cards_lima lima + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable video_cards_nouveau nouveau + + # Only one i915 driver (classic vs gallium). Default to classic. + if ! use classic; then + gallium_enable video_cards_i915 i915 + if ! use video_cards_i915 && \ + ! use video_cards_i965; then + gallium_enable video_cards_intel i915 + fi + fi + + gallium_enable video_cards_iris iris + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_virgl virgl + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + fi + + if use vulkan; then + vulkan_enable video_cards_i965 intel + vulkan_enable video_cards_iris intel + vulkan_enable video_cards_radeonsi amd + fi + + # x86 hardened pax_kernel needs glx-rts, bug 240956 + if [[ ${ABI} == x86 ]]; then + emesonargs+=( $(meson_use pax_kernel glx-read-only-text) ) + fi + + if use gallium; then + gallium_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa gallium none) ) + else + dri_driver_enable -- swrast + emesonargs+=( -Dosmesa=$(usex osmesa classic none) ) + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=true + $(meson_use dri3) + $(meson_use egl) + $(meson_use gbm) + $(meson_use gles1) + $(meson_use gles2) + $(meson_use libglvnd glvnd) + $(meson_use selinux) + -Dvalgrind=$(usex valgrind auto false) + -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + $(meson_use vulkan-overlay vulkan-overlay-layer) + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_install() { + meson_src_install +} + +multilib_src_install_all() { + einstalldocs +} + +multilib_src_test() { + meson test -v -C "${BUILD_DIR}" -t 100 +} + +pkg_postinst() { + # Switch to the xorg implementation. + echo + eselect opengl set --use-old ${OPENGL_DIR} +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +dri_driver_enable() { + if [[ $1 == -- ]] || use $1; then + shift + DRI_DRIVERS+=("$@") + fi +} + +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} |