[gentoo-commits] repo/gentoo:master commit in: media-libs/virglrenderer/, media-libs/virglrenderer/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/virglrenderer/, media-libs/virglrenderer/files/

[Matthias Maier]

commit:     ba122d83e6a0978c304e4ceac959103bdda2183e
Author:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
AuthorDate: Wed May  3 06:23:28 2017 +0000
Commit:     Matthias Maier <tamiko <AT> gentoo <DOT> org>
CommitDate: Wed May  3 06:23:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ba122d83

media-libs/virglrenderer: apply forgotten patch, bug #600138

Thanks to Alex Omskiy for porting the patch.

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 .../virglrenderer/files/virglrenderer-0.6.0-libdrm.patch       | 10 ++++++++++
 media-libs/virglrenderer/virglrenderer-0.6.0.ebuild            |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch b/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch
new file mode 100644
index 00000000000..17bc3bce0a8
--- /dev/null
+++ b/media-libs/virglrenderer/files/virglrenderer-0.6.0-libdrm.patch
@@ -0,0 +1,10 @@
+diff -Naur virglrenderer-0.5.0.orig/src/Makefile.am virglrenderer-0.5.0/src/Makefile.am
+--- virglrenderer-0.5.0.orig/src/Makefile.am	2016-04-11 11:23:51.000000000 +0600
++++ virglrenderer-0.5.0/src/Makefile.am	2016-11-18 04:44:32.278594781 +0600
+@@ -1,5 +1,6 @@
+ SUBDIRS := gallium/auxiliary
+ AM_LDFLAGS = -lm \
++	$(LIBDRM_LIBS) \
+ 	$(GBM_LIBS) \
+ 	$(EPOXY_LIBS) \
+ 	$(CODE_COVERAGE_LDFLAGS)

diff --git a/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild b/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
index ea5be9b16eb..f8d5cdf82c7 100644
--- a/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-0.6.0.ebuild
@@ -28,6 +28,10 @@ DEPEND="${RDEPEND}
 	>=x11-misc/util-macros-1.8
 	test? ( >=dev-libs/check-0.9.4 )"
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.6.0-libdrm.patch
+)
+
 src_prepare() {
 	default
 	[[ -e configure ]] || eautoreconf

[gentoo-commits] repo/gentoo:master commit in: media-libs/virglrenderer/, media-libs/virglrenderer/files/

[Joonas Niilola]

commit:     698f5907056ebf1e2606b3f5aafd3fecb0491330
Author:     Brahmajit Das <listout <AT> listout <DOT> xyz>
AuthorDate: Sun Aug 10 10:34:09 2025 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Aug 16 08:21:47 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=698f5907

media-libs/virglrenderer: amdgpu_renderer.c: Fix error: extension used

Bug: https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/627
Closes: https://bugs.gentoo.org/961270
Signed-off-by: Brahmajit Das <listout <AT> listout.xyz>
Part-of: https://github.com/gentoo/gentoo/pull/43403
Closes: https://github.com/gentoo/gentoo/pull/43403
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 ...a-util-use-c11-alignof-instead-of-our-own.patch | 34 ++++++++++++++++++++++
 ...glrenderer-fix-clang-warning-about-typeof.patch | 26 +++++++++++++++++
 .../virglrenderer/virglrenderer-1.1.1-r1.ebuild    |  7 +++++
 3 files changed, 67 insertions(+)

diff --git a/media-libs/virglrenderer/files/0001-mesa-util-use-c11-alignof-instead-of-our-own.patch b/media-libs/virglrenderer/files/0001-mesa-util-use-c11-alignof-instead-of-our-own.patch
new file mode 100644
index 000000000000..704440ff88f8
--- /dev/null
+++ b/media-libs/virglrenderer/files/0001-mesa-util-use-c11-alignof-instead-of-our-own.patch
@@ -0,0 +1,34 @@
+From 4ee18a4d5a14d63ff758bf94df04cd1d4e570074 Mon Sep 17 00:00:00 2001
+From: Erik Faye-Lund <erik.faye-lund@collabora.com>
+Date: Tue, 7 Jun 2022 16:33:02 +0200
+Subject: [PATCH] mesa/util: use c11 alignof instead of our own
+
+...with an exception for MSVC, which doesn't have stdalign.h, so let's
+add a definition for that.
+
+Taken from https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16908
+
+Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1542>
+--- a/src/mesa/util/macros.h
++++ b/src/mesa/util/macros.h
+@@ -442,13 +442,11 @@ enum pipe_debug_type
+    PIPE_DEBUG_TYPE_CONFORMANCE,
+ };
+ 
+-#if !defined(alignof) && !defined(__cplusplus)
+-#if __STDC_VERSION__ >= 201112L
+-#define alignof(t) _Alignof(t)
+-#elif defined(_MSC_VER)
+-#define alignof(t) __alignof(t)
++#ifndef __cplusplus
++#ifdef _MSC_VER
++#define alignof _Alignof
+ #else
+-#define alignof(t) __alignof__(t)
++#include <stdalign.h>
+ #endif
+ #endif
+ 
+-- 
+2.50.1
+

diff --git a/media-libs/virglrenderer/files/virglrenderer-fix-clang-warning-about-typeof.patch b/media-libs/virglrenderer/files/virglrenderer-fix-clang-warning-about-typeof.patch
new file mode 100644
index 000000000000..2744b913fac6
--- /dev/null
+++ b/media-libs/virglrenderer/files/virglrenderer-fix-clang-warning-about-typeof.patch
@@ -0,0 +1,26 @@
+https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1547
+From: Dmitry Osipenko <dmitry.osipenko@collabora.com>
+Date: Mon, 11 Aug 2025 13:17:56 +0300
+Subject: [PATCH] drm: amdgpu: Fix clang warning about typeof() extension
+
+AMDGPU nctx code uses typeof(), which is a GCC extension. Clang supports
+typeof(), but emits a warning that breaks compilation because -Werror is
+enabled by default. Silence the clang warning about typeof() like we do it
+for drm_utils.
+
+Closes: https://gitlab.freedesktop.org/virgl/virglrenderer/-/issues/627
+Signed-off-by: Dmitry Osipenko <dmitry.osipenko@collabora.com>
+Part-of: <https://gitlab.freedesktop.org/virgl/virglrenderer/-/merge_requests/1547>
+--- a/src/drm/amdgpu/amdgpu_renderer.c
++++ b/src/drm/amdgpu/amdgpu_renderer.c
+@@ -51,6 +51,7 @@
+ 
+ #if defined(__clang__)
+ #pragma GCC diagnostic ignored "-Wgnu-zero-variadic-macro-arguments"
++#pragma GCC diagnostic ignored "-Wlanguage-extension-token"
+ #endif
+ 
+ #if 0
+-- 
+GitLab
+

diff --git a/media-libs/virglrenderer/virglrenderer-1.1.1-r1.ebuild b/media-libs/virglrenderer/virglrenderer-1.1.1-r1.ebuild
index 2746bb17e4d8..b6231d51d1e0 100644
--- a/media-libs/virglrenderer/virglrenderer-1.1.1-r1.ebuild
+++ b/media-libs/virglrenderer/virglrenderer-1.1.1-r1.ebuild
@@ -37,6 +37,13 @@ DEPEND="
 	sys-kernel/linux-headers
 "
 
+PATCHES=(
+	# ALready in main, can be dropped in newer versions
+	"${FILESDIR}/0001-mesa-util-use-c11-alignof-instead-of-our-own.patch"
+	# bug 961270
+	"${FILESDIR}/${PN}-fix-clang-warning-about-typeof.patch"
+)
+
 src_configure() {
 	local -a gpus=()
 	use video_cards_amdgpu && gpus+=( amdgpu-experimental )