From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 09EB015827B for ; Sat, 16 Aug 2025 08:22:48 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange x25519) (No client certificate requested) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id EA793340E92 for ; Sat, 16 Aug 2025 08:22:47 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 97238110562; Sat, 16 Aug 2025 08:22:39 +0000 (UTC) Received: from smtp.gentoo.org (dev.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) (No client certificate requested) by bobolink.gentoo.org (Postfix) with ESMTPS id 8D4A1110562 for ; Sat, 16 Aug 2025 08:22:39 +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 4344934076D for ; Sat, 16 Aug 2025 08:22:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D0E9335F for ; Sat, 16 Aug 2025 08:22:37 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1755332507.698f5907056ebf1e2606b3f5aafd3fecb0491330.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/virglrenderer/, media-libs/virglrenderer/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/virglrenderer/files/0001-mesa-util-use-c11-alignof-instead-of-our-own.patch media-libs/virglrenderer/files/virglrenderer-fix-clang-warning-about-typeof.patch media-libs/virglrenderer/virglrenderer-1.1.1-r1.ebuild X-VCS-Directories: media-libs/virglrenderer/ media-libs/virglrenderer/files/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 698f5907056ebf1e2606b3f5aafd3fecb0491330 X-VCS-Branch: master Date: Sat, 16 Aug 2025 08:22:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5755628b-dca3-4e1e-ae82-750e890b184b X-Archives-Hash: f2ccdef7febc2b1a00a639aade433d32 commit: 698f5907056ebf1e2606b3f5aafd3fecb0491330 Author: Brahmajit Das listout xyz> AuthorDate: Sun Aug 10 10:34:09 2025 +0000 Commit: Joonas Niilola gentoo 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.xyz> Part-of: https://github.com/gentoo/gentoo/pull/43403 Closes: https://github.com/gentoo/gentoo/pull/43403 Signed-off-by: Joonas Niilola 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 +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: +--- 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 + #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 +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 +Part-of: +--- 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 )