gentoo auto-resync : 07:08:2024 - 12:37:20

3 files changed, 68 insertions, 0 deletions

diff --git a/gui-libs/egl-gbm/Manifest b/gui-libs/egl-gbm/Manifest
index 15faed8c926e..e892bc0d1659 100644
--- a/gui-libs/egl-gbm/Manifest
+++ b/gui-libs/egl-gbm/Manifest
@@ -1,5 +1,7 @@
 AUX 15_nvidia_gbm.json 96 BLAKE2B ed3c97a8df4e80b969b479c46472143b81a986a9009d6cf9faed0bc99e59f977d0a9260204252151befe2d3454eac05c584776464d86aae263040f209df5ca8b SHA512 6a3e3bffb0f5352b4d8738f7b18003579664f69e062e2f50e5b8189f06a1161ee651d66e83dcb1b9338751908b4e410cbf9b98fc2e58c18269b66e3c2f2f3e34
 AUX egl-gbm-1.1.0-werror.patch 220 BLAKE2B c93b535d6f17ea35c39b61b8f655a1b9378b18260fcae319f22d94c28ec932557303d97b9e0b435006964ec5cc6a660e9e89b4823000893221dfe07a16efde39 SHA512 0c5eeea9eaaea637200314363da1cf1873a44b939287b27b0156cc05a99c274e311848ce6b69ce39df1fcf1b44deba5ec227d871db87a8785e7d0d27b447a066
+AUX egl-gbm-1.1.1-abi-check.patch 1049 BLAKE2B d26364ae3f93ac5de20c0a741314930db5c8880c37ed9e5e97f11e5f19bf2f1b613a1c87d593446bcfe98c030429d04d285c3137609fe328fb08e319cacd79ef SHA512 0ceea234cf4e7ccc457b45069a38e8c9240138f74d1d5012e64be736eac886d2648e628a039b45776b9a6e6fe9b9089f62f9a8e9ac3bc294abeeb380944923ce
 DIST egl-gbm-1.1.1.tar.gz 17888 BLAKE2B 65296a51623a77f10ef897b87c9cdbc9ef3cc721bded5289e9fa5e83f4cffbcdf7f7068480eeeaa9a9f7f958dbf04ebfe4b057fd252002117d597dac17d4451a SHA512 43650ec1681d9bdc9d8e559f5d9e38c1b09ceac6b3cec3b12ecf24d5f24d47cefaa87e50c3783dc491671d7bf85aa0a2da89ce09420cb716192356975c0d529a
+EBUILD egl-gbm-1.1.1-r2.ebuild 766 BLAKE2B 4317f3ed2d3e8ea53bb323f3f631eab87dac89b54009521b8891ea56699bbc04891abc8a6602dfff5f21b3cedd79c4db6d90b90ea5b2e0647873d21b18526027 SHA512 3aa1e009a28a01f155358d2cfedd1b133b32dfdf15e11038bc9ef319db2de005ad53a43c307348685c72079635e4f5d5ab994662de2795e7c97c0de9161e3b0a
 EBUILD egl-gbm-1.1.1.ebuild 712 BLAKE2B 834f11b9e05903c78326ed09b696b8e31c6093683d0ddad3129c5aa80cdad6338d2e1ed5a3a16a5265f401ff5411909173b845d98bc0dd488815a923df67e67e SHA512 94068e307d4d583afb60b7c720fde3ba14d70a38ef47143e925fbf1522a9db605c5213bbed042b75eaa394aa3b45b6ad6d121b733aed168fc72dd5c98f9bf174
 MISC metadata.xml 325 BLAKE2B b7fe17481f96e0fabd321b64090bc12c09ee61de8251531a0853c668b799522480f700fd2382e16bf6aa956c3aa6d3dd0ceff76a27355994b7517cbce7d25094 SHA512 8a3bdde2a17fcec7bbc55af10d33774e4fa648a88949b06ea9f5c7c8c83b2a05c67a3a8cdfcff44eac757639184b790b17b55a574d449cd0a5186b7a5414e5df
diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.1-r2.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.1-r2.ebuild
new file mode 100644
index 000000000000..e24fa8e90dfd
--- /dev/null
+++ b/gui-libs/egl-gbm/egl-gbm-1.1.1-r2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib
+
+DESCRIPTION="GBM EGL external platform library"
+HOMEPAGE="https://github.com/NVIDIA/egl-gbm/"
+SRC_URI="
+	https://github.com/NVIDIA/egl-gbm/archive/${PV}.tar.gz
+		-> ${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+
+RDEPEND="
+	media-libs/mesa[gbm(+),${MULTILIB_USEDEP}]
+	x11-libs/libdrm[${MULTILIB_USEDEP}]
+"
+DEPEND="
+	${RDEPEND}
+	>=gui-libs/eglexternalplatform-1.1-r1
+	media-libs/libglvnd
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.1.0-werror.patch
+	"${FILESDIR}"/${P}-abi-check.patch
+)
+
+src_install() {
+	meson-multilib_src_install
+
+	insinto /usr/share/egl/egl_external_platform.d
+	doins "${FILESDIR}"/15_nvidia_gbm.json
+}
diff --git a/gui-libs/egl-gbm/files/egl-gbm-1.1.1-abi-check.patch b/gui-libs/egl-gbm/files/egl-gbm-1.1.1-abi-check.patch
new file mode 100644
index 000000000000..8d46edb71b0f
--- /dev/null
+++ b/gui-libs/egl-gbm/files/egl-gbm-1.1.1-abi-check.patch
@@ -0,0 +1,27 @@
+Backport required to function properly with >=nvidia-drivers-560,
+but no release with this change has been made yet.
+
+https://github.com/NVIDIA/egl-gbm/commit/1352ca845fb78b28e3a097586abee2bcf2dbafb8
+From: Kyle Brenneman <kbrenneman@nvidia.com>
+Date: Fri, 12 Apr 2024 09:10:23 -0600
+Subject: [PATCH] Fix the ABI version check.
+
+The EGL_EXTERNAL_PLATFORM_VERSION_CHECK macro checks whether the given
+version is older than EGL_EXTERNAL_PLATFORM_VERSION_MAJOR/MINOR, not
+newer.
+
+That's correct for using it in EGL_EXTERNAL_PLATFORM_HAS, since it'll
+check whether the build-time version supports a given feature, but it's
+wrong for checking the ABI version that the driver reports.
+
+Instead, use EGL_EXTERNAL_PLATFORM_VERSION_CMP.
+--- a/src/gbm-platform.c
++++ b/src/gbm-platform.c
+@@ -167,5 +167,6 @@
+ {
+     if (!platform ||
+-        !EGL_EXTERNAL_PLATFORM_VERSION_CHECK(major, minor)) {
++        !EGL_EXTERNAL_PLATFORM_VERSION_CMP(major, minor,
++            GBM_EXTERNAL_VERSION_MAJOR, GBM_EXTERNAL_VERSION_MINOR)) {
+         return EGL_FALSE;
+     }