From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1517881-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 2B0FA158649
for <garchives@archives.gentoo.org>; Fri, 12 May 2023 17:39:22 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 2C3F0E07F9;
Fri, 12 May 2023 17:39:21 +0000 (UTC)
Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id DF1F5E07F9
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2023 17:39:20 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id DCF1F33BE91
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2023 17:39:19 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 417B6A59
for <gentoo-commits@lists.gentoo.org>; Fri, 12 May 2023 17:39:18 +0000 (UTC)
From: "Matt Turner" <mattst88@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" <mattst88@gentoo.org>
Message-ID: <1683913105.01cb5b2658d9421ab5a35e6a36c29e305e68c8f4.mattst88@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mesa-amber/files/, media-libs/mesa-amber/
X-VCS-Repository: repo/gentoo
X-VCS-Files: media-libs/mesa-amber/files/mesa-amber-i915c.patch media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
X-VCS-Directories: media-libs/mesa-amber/files/ media-libs/mesa-amber/
X-VCS-Committer: mattst88
X-VCS-Committer-Name: Matt Turner
X-VCS-Revision: 01cb5b2658d9421ab5a35e6a36c29e305e68c8f4
X-VCS-Branch: master
Date: Fri, 12 May 2023 17:39:18 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 1cacab36-899d-463b-85ef-445aa05d4189
X-Archives-Hash: 55920b9e265834c9562e68840e9a75c9
commit: 01cb5b2658d9421ab5a35e6a36c29e305e68c8f4
Author: Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Fri May 12 17:37:34 2023 +0000
Commit: Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Fri May 12 17:38:25 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01cb5b26
media-libs/mesa-amber: Fix loading i915c driver
Thanks to Allan Mondor <bugs.gentoo <AT> acmondor.ca> for the patch.
Closes: https://bugs.gentoo.org/866425
Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>
media-libs/mesa-amber/files/mesa-amber-i915c.patch | 46 ++++++++++++++++++++++
...r-21.3.9.ebuild => mesa-amber-21.3.9-r1.ebuild} | 4 ++
2 files changed, 50 insertions(+)
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
similarity index 99%
rename from media-libs/mesa-amber/mesa-amber-21.3.9.ebuild
rename to media-libs/mesa-amber/mesa-amber-21.3.9-r1.ebuild
index 6c7e27f41616..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
@@ -94,6 +94,10 @@ x86? (
usr/lib/libGLX_amber.so.0.0.0
)"
+PATCHES=(
+ "${FILESDIR}"/${PN}-i915c.patch
+)
+
python_check_deps() {
python_has_version ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
}