gentoo auto-resync : 13:08:2024 - 11:06:03

4 files changed, 2 insertions, 68 deletions

diff --git a/gui-libs/egl-gbm/Manifest b/gui-libs/egl-gbm/Manifest
index e892bc0d1659..dbed73b0dba3 100644
--- a/gui-libs/egl-gbm/Manifest
+++ b/gui-libs/egl-gbm/Manifest
@@ -1,7 +1,5 @@
 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
+DIST egl-gbm-1.1.2.tar.gz 17897 BLAKE2B b13d1eba51bea5ebf388b6f12734e3e88dcbfd7ceb51be6ce2f7def2e06f5a676d6b148cd25a559466099a1a19a9a14c5f6fae30217879f2ef6cb63d82f75e6d SHA512 03e19ec9121c3a32469d6f9fb207286b0f8e2d728f2f1c501a5b470f40119b9df4f040d9eae3177b7529cfc1416797e80c54a33552d41dccb18c74133b50dc3c
+EBUILD egl-gbm-1.1.2.ebuild 730 BLAKE2B 8d3e672508965d25a82393767da89081a8fb7cde67399709aa7c8081af7b4c8e4654bc331d3a16a668558d82ca84b86a1217ec35874f24549fa8c055c24d6908 SHA512 341baf43ed194824270ec849caf27d44e9c15e4ca569ea2b604640a2e518061a142a5c940060cda4a1add3ffd217a79fd85420478280351190607eaf3708e656
 MISC metadata.xml 325 BLAKE2B b7fe17481f96e0fabd321b64090bc12c09ee61de8251531a0853c668b799522480f700fd2382e16bf6aa956c3aa6d3dd0ceff76a27355994b7517cbce7d25094 SHA512 8a3bdde2a17fcec7bbc55af10d33774e4fa648a88949b06ea9f5c7c8c83b2a05c67a3a8cdfcff44eac757639184b790b17b55a574d449cd0a5186b7a5414e5df
diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.1.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.1.ebuild
deleted file mode 100644
index e6486609a809..000000000000
--- a/gui-libs/egl-gbm/egl-gbm-1.1.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 2021-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson
-
-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(+)]
-	x11-libs/libdrm
-	!<x11-drivers/nvidia-drivers-495.46-r20[wayland(-)]
-"
-DEPEND="
-	${RDEPEND}
-	gui-libs/eglexternalplatform
-	media-libs/libglvnd
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.0-werror.patch
-)
-
-src_install() {
-	meson_src_install
-
-	insinto /usr/share/egl/egl_external_platform.d
-	doins "${FILESDIR}"/15_nvidia_gbm.json
-}
diff --git a/gui-libs/egl-gbm/egl-gbm-1.1.1-r2.ebuild b/gui-libs/egl-gbm/egl-gbm-1.1.2.ebuild
index e24fa8e90dfd..2309eed1d1df 100644
--- a/gui-libs/egl-gbm/egl-gbm-1.1.1-r2.ebuild
+++ b/gui-libs/egl-gbm/egl-gbm-1.1.2.ebuild
@@ -28,7 +28,6 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.1.0-werror.patch
-	"${FILESDIR}"/${P}-abi-check.patch
 )
 
 src_install() {
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
deleted file mode 100644
index 8d46edb71b0f..000000000000
--- a/gui-libs/egl-gbm/files/egl-gbm-1.1.1-abi-check.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-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;
-     }