gentoo auto-resync : 12:05:2023 - 23:49:59

3 files changed, 54 insertions, 3 deletions

diff --git a/media-libs/mesa-amber/Manifest b/media-libs/mesa-amber/Manifest
index 0bb3a5eed14f..3c5316fe83e1 100644
--- a/media-libs/mesa-amber/Manifest
+++ b/media-libs/mesa-amber/Manifest
@@ -1,3 +1,4 @@
+AUX mesa-amber-i915c.patch 1990 BLAKE2B 7b15d0e0aab853c8f2ce3e66fcf705c21e45d045f4f6090524d051f8d3498826240ec6626e7ffeecb0c939d1cb94bd6fb95da05a3d9b742d5c861948af15d9da SHA512 163e80342f6df7706d7db4defc0c5814db92e03fcec675e6729a05ba1b3907e3233a9bd6f40629bde5dcf7afbf397e40f774c2298ad2f9b3948a6db63f801893
 DIST mesa-21.3.9.tar.xz 16607716 BLAKE2B 79669f9492c505b1729c526adf5a8261737b6088bdf01db654a0dca8ba22600ec985b574edfeee3a28c76e6e0f815782362973876e1d75b58f4417f45df70add SHA512 4cec6f4f50f444fcd327f7c40f8899c2f265e348e121455262b540b1f890a1468bbea59965af0876c548fa97aa0a05a1b23fa6ca7d308bd60328cfdeab757684
-EBUILD mesa-amber-21.3.9.ebuild 5038 BLAKE2B 4a06f975ab913dbbf39d1b3eb276b7f4dff5e99bff15910eeb2580efec035dd8f0fba554d9b55487e7513df94606f9bbed437fb9fb858fc6b08c483414c19c14 SHA512 a6b98b5a67f5076e492e6d71c8032de68ba0ab780a675901323987f028e6802776185a06a449c2526e6397f82d7825e645469b1e744cd1990ec137caf2b78c51
+EBUILD mesa-amber-21.3.9-r1.ebuild 5088 BLAKE2B 6f810cd58849e662bbaeb27f48e51204b5ff27170f04a22a4089d9ebdc614155dc7f3cc77049b2f88aba23a1213b95ec734b5bac9e4e7b1f9d215acdbf7ee959 SHA512 d7e81103df5e9ca49079de47fbadf7f2fb19e3ccbc2d38c276f238761998b15cf2a50513f03e9bee931354f6caa0627c759520ee3409aabb53b1cb2475be4bc2
 MISC metadata.xml 656 BLAKE2B 8a726ee17f42aac678464a5461bde2b570c3c4852900baaf3813eba86735d5879e782ee400c4c278bfe97ce69b0f80fe641ebed1455e65b60d14cfbba9700e68 SHA512 2168c3e6eac6cacff4fa261e06893359ef9d30481c61db09ad804fc47eee0c664c24edaa154ae0deab325fc45b0cbbfe620086044aefffd1db726cca4677482c
diff --git a/media-libs/mesa-amber/files/mesa-amber-i915c.patch b/media-libs/mesa-amber/files/mesa-amber-i915c.patch
new file mode 100644
index 000000000000..826f8cb3ca86
--- /dev/null
+++ b/media-libs/mesa-amber/files/mesa-amber-i915c.patch
@@ -0,0 +1,46 @@
+
+This patch is fixed the issue created when /usr/lib/dri/i915_dri.so is renamed to /usr/lib/dri/i915c_dri.so
+by mesa-amber/mesa-amber-21.3.9.ebuild
+
+Without this patch the driver cannot be loaded using the environment variable MESA_LOADER_DRIVER_OVERRIDE="i915c"
+as that mechanism expects to find the __driDriverGetExtensions_i915c:
+
+MESA-LOADER: dlopen(/usr/lib/dri/i915c_dri.so)
+MESA-LOADER: driver does not expose __driDriverGetExtensions_i915c(): /usr/lib/dri/i915c_dri.so: undefined symbol: __driDriverGetExtensions_i915c
+MESA-LOADER: dlopen(/usr/lib/dri/swrast_dri.so)
+
+This patch adds the __driDriverGetExtensions_i915c symbol by simply cloning the code for the original
+__driDriverGetExtensions_i915 symbol.
+
+Allan Mondor
+bugs.gentoo@acmondor.ca
+
+
+diff -w -ruN mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.c mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.c
+--- mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.c	2022-06-08 12:13:35.000000000 -0600
++++ mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.c	2022-08-23 11:32:19.151578025 -0600
+@@ -1290,6 +1290,13 @@
+    return i915_driver_extensions;
+ }
+ 
++PUBLIC const __DRIextension **__driDriverGetExtensions_i915c(void)
++{
++   globalDriverAPI = &i915_driver_api;
++
++   return i915_driver_extensions;
++}
++
+ PUBLIC const __DRIextension **__driDriverGetExtensions_i830(void)
+ {
+    globalDriverAPI = &i915_driver_api;
+diff -w -ruN mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.h mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.h
+--- mesa-21.3.9.org/src/mesa/drivers/dri/i915/intel_screen.h	2022-06-08 12:13:35.000000000 -0600
++++ mesa-21.3.9/src/mesa/drivers/dri/i915/intel_screen.h	2022-08-23 11:31:54.047576393 -0600
+@@ -160,6 +160,7 @@
+ 
+ const __DRIextension **__driDriverGetExtensions_i830(void);
+ const __DRIextension **__driDriverGetExtensions_i915(void);
++const __DRIextension **__driDriverGetExtensions_i915c(void);
+ extern const __DRI2fenceExtension intelFenceExtension;
+ 
+ extern GLboolean
diff --git a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild b/media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild
index 205882acd06b..9c94daeeb8f3 100644
--- a/media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
+++ b/media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{9..11} )
 
@@ -94,8 +94,12 @@ x86? (
 	usr/lib/libGLX_amber.so.0.0.0
 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-i915c.patch
+)
+
 python_check_deps() {
-	has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+	python_has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
 }
 
 pkg_setup() {