From patchwork Sat May 14 17:55:54 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631111 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tX80KZTz9sBF for ; Sun, 15 May 2022 03:57:43 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 25FFF40915; Sat, 14 May 2022 17:57:42 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id kwfXcPuN9LWd; Sat, 14 May 2022 17:57:40 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id D48DC4090E; Sat, 14 May 2022 17:57:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 498791BF909 for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A4B48409E8 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ZMf4Wf8xVlhV for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by smtp4.osuosl.org (Postfix) with ESMTPS id D465F414CB for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout07.t-online.de (Postfix) with SMTP id 5CCD2DFF9; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd84.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-1aPaCn0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzw-0005N1-Pe; Sat, 14 May 2022 19:56:12 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:55:54 +0200 Message-Id: <20220514175612.2510884-1-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-00009E39-CECC053C/0/0 CLEAN NORMAL X-TOI-MSGID: 7624feb0-433f-4a91-9a51-b0aafef332ae Subject: [Buildroot] [PATCH 01/19] package/x11r7/xserver_xorg-server: bump version to 21.1.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Release notes: https://lists.x.org/archives/xorg-announce/2022-January/003127.html Removed patch which was applied upstream: https://gitlab.freedesktop.org/xorg/xserver/-/commit/9c66d910cae107cbcda02a8502ac5324a6eca052 Signed-off-by: Bernd Kuhls --- ...error-when-built-without-logind-plat.patch | 90 ------------------- .../xserver_xorg-server.hash | 6 +- .../xserver_xorg-server.mk | 2 +- 3 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch diff --git a/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch b/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch deleted file mode 100644 index 164c0039bd..0000000000 --- a/package/x11r7/xserver_xorg-server/0002-Fix-compilation-error-when-built-without-logind-plat.patch +++ /dev/null @@ -1,90 +0,0 @@ -From 17b6ab4d8cecf55a3784dbefbef9bfcf84ee3b1b Mon Sep 17 00:00:00 2001 -From: Jocelyn Falempe -Date: Thu, 16 Dec 2021 15:46:43 +0100 -Subject: [PATCH] Fix compilation error when built without logind/platform bus - -This was introduced by commit 8eb1396d - -Signed-off-by: Jocelyn Falempe -[Peter: from https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/827] -Signed-off-by: Peter Korsgaard ---- - hw/xfree86/common/xf86Events.c | 9 +-------- - hw/xfree86/os-support/linux/systemd-logind.c | 16 +++++++++++----- - include/systemd-logind.h | 4 ++-- - 3 files changed, 14 insertions(+), 15 deletions(-) - -diff --git a/hw/xfree86/common/xf86Events.c b/hw/xfree86/common/xf86Events.c -index 6076efa80..395bbc7b3 100644 ---- a/hw/xfree86/common/xf86Events.c -+++ b/hw/xfree86/common/xf86Events.c -@@ -383,14 +383,7 @@ xf86VTLeave(void) - xf86GPUScreens[i]->LeaveVT(xf86GPUScreens[i]); - - if (systemd_logind_controls_session()) { -- for (i = 0; i < xf86_num_platform_devices; i++) { -- if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { -- int major, minor; -- major = xf86_platform_odev_attributes(i)->major; -- minor = xf86_platform_odev_attributes(i)->minor; -- systemd_logind_drop_master(major, minor); -- } -- } -+ systemd_logind_drop_master(); - } - - if (!xf86VTSwitchAway()) -diff --git a/hw/xfree86/os-support/linux/systemd-logind.c b/hw/xfree86/os-support/linux/systemd-logind.c -index 35d5cc75b..f6a223a55 100644 ---- a/hw/xfree86/os-support/linux/systemd-logind.c -+++ b/hw/xfree86/os-support/linux/systemd-logind.c -@@ -308,13 +308,19 @@ cleanup: - * and ensure the drm_drop_master is done before - * VT_RELDISP when switching VT - */ --void systemd_logind_drop_master(int _major, int _minor) -+void systemd_logind_drop_master(void) - { -- struct systemd_logind_info *info = &logind_info; -- dbus_int32_t major = _major; -- dbus_int32_t minor = _minor; -+ int i; -+ for (i = 0; i < xf86_num_platform_devices; i++) { -+ if (xf86_platform_devices[i].flags & XF86_PDEV_SERVER_FD) { -+ dbus_int32_t major, minor; -+ struct systemd_logind_info *info = &logind_info; - -- systemd_logind_ack_pause(info, minor, major); -+ major = xf86_platform_odev_attributes(i)->major; -+ minor = xf86_platform_odev_attributes(i)->minor; -+ systemd_logind_ack_pause(info, minor, major); -+ } -+ } - } - - static DBusHandlerResult -diff --git a/include/systemd-logind.h b/include/systemd-logind.h -index a8af2b96d..5c04d0130 100644 ---- a/include/systemd-logind.h -+++ b/include/systemd-logind.h -@@ -33,7 +33,7 @@ int systemd_logind_take_fd(int major, int minor, const char *path, Bool *paus); - void systemd_logind_release_fd(int major, int minor, int fd); - int systemd_logind_controls_session(void); - void systemd_logind_vtenter(void); --void systemd_logind_drop_master(int major, int minor); -+void systemd_logind_drop_master(void); - #else - #define systemd_logind_init() - #define systemd_logind_fini() -@@ -41,7 +41,7 @@ void systemd_logind_drop_master(int major, int minor); - #define systemd_logind_release_fd(major, minor, fd) close(fd) - #define systemd_logind_controls_session() 0 - #define systemd_logind_vtenter() --#define systemd_logind_drop_master(major, minor) -+#define systemd_logind_drop_master() - #endif - - #endif --- -2.20.1 - diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash index 6008661db1..b5635b9afa 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.hash @@ -1,6 +1,6 @@ -# From https://lists.x.org/archives/xorg-announce/2021-December/003125.html -sha256 c20bf46a9fe8e74bf4e75430637e58d49a02d806609dc161462bceb1ef7e8db0 xorg-server-21.1.2.tar.xz -sha512 6d7a0d29d5be09f80ed505c4d6ae964795127525a0ab73a4eab4f601788ab3627033143e5aeb4c2565c6683dd3402084d13acab5554606fbd519c4aec0a79def xorg-server-21.1.2.tar.xz +# From https://lists.x.org/archives/xorg-announce/2022-January/003127.html +sha256 61d6aad5b6b47a116b960bd7f0cba4ee7e6da95d6bb0b127bde75d7d1acdebe5 xorg-server-21.1.3.tar.xz +sha512 cf5fed023eadda62ae732f8c4d427c272ebe005188341290f3d03147042c103b00cbb94d86a0256da815fb9b9a3da315c21a05ee0c926c1a2ff0c54ab0c0638b xorg-server-21.1.3.tar.xz # Locally calculated sha256 4cc0447a22635c7b2f1a93fec4aa94f1970fadeb72a063de006b51cf4963a06f COPYING diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 0cadba92a3..0f1779dcab 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -4,7 +4,7 @@ # ################################################################################ -XSERVER_XORG_SERVER_VERSION = 21.1.2 +XSERVER_XORG_SERVER_VERSION = 21.1.3 XSERVER_XORG_SERVER_SOURCE = xorg-server-$(XSERVER_XORG_SERVER_VERSION).tar.xz XSERVER_XORG_SERVER_SITE = https://xorg.freedesktop.org/archive/individual/xserver XSERVER_XORG_SERVER_LICENSE = MIT From patchwork Sat May 14 17:55:55 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631115 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tY85nxJz9sBF for ; Sun, 15 May 2022 03:58:36 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 0222340915; Sat, 14 May 2022 17:58:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id YVS_tDffxB4b; Sat, 14 May 2022 17:58:34 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 1105E408DB; Sat, 14 May 2022 17:58:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 1D3DE1BF909 for ; Sat, 14 May 2022 17:56:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B6B3F414CB for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id IpVxJkCxECYp for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp4.osuosl.org (Postfix) with ESMTPS id 290C3414D1 for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout10.t-online.de (Postfix) with SMTP id 7FC626620; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd86.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2G5rpx0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzw-0005N1-Vk; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:55:55 +0200 Message-Id: <20220514175612.2510884-2-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-000116DC-64B1523F/0/0 CLEAN NORMAL X-TOI-MSGID: 2953dbe2-141c-4aa3-9c9d-7d06cb8f9719 Subject: [Buildroot] [PATCH 02/19] package/x11r7/xdriver_xf86-video-amdgpu: fix glamor support X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Add configure options for glamor support following the logic of the xserver_xorg-server package: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n141 Fixes: http://autobuild.buildroot.net/results/e78/e786118db87f65bdcb913656a7b6d9b3187a212c/ http://autobuild.buildroot.net/results/a00/a0089ed3abdb0a3712524ae77fc613a4982054ed/ http://autobuild.buildroot.net/results/541/54193d198efe371bdb19ac4981d631ff1e279717/ http://autobuild.buildroot.net/results/298/298198c036931b10f7e1046176bd48310ae7455f/ http://autobuild.buildroot.net/results/4da/4da87d30e6f5a10aafae60abce1b89ed92204a4e/ http://autobuild.buildroot.net/results/74c/74ceb71bd48ea3a2bf6ff68aec0af76a11662f1f/ Signed-off-by: Bernd Kuhls --- .../xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index e7196956a3..6423c03f5f 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -15,6 +15,12 @@ XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ xorgproto \ xserver_xorg-server +ifeq ($(BR2_PACKAGE_HAS_LIBEGL)$(BR2_PACKAGE_HAS_LIBGL)$(BR2_PACKAGE_LIBEPOXY),yyy) +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS += --enable-glamor +else +XDRIVER_XF86_VIDEO_AMDGPU_CONF_OPTS += --disable-glamor +endif + # xdriver_xf86-video-amdgpu requires O_CLOEXEC XDRIVER_XF86_VIDEO_AMDGPU_CONF_ENV += CFLAGS="$(TARGET_CFLAGS) -D_GNU_SOURCE" From patchwork Sat May 14 17:55:56 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631105 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [IPv6:2605:bc80:3010::138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tVj2L9Hz9s5V for ; Sun, 15 May 2022 03:56:27 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id DC630827FD; Sat, 14 May 2022 17:56:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id GC2IzdmGoyUd; Sat, 14 May 2022 17:56:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id F16FC8291D; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id E98101BF3DE for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id D4C0F40930 for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id VM5VFI7rSTAD for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp2.osuosl.org (Postfix) with ESMTPS id 8FC27400A6 for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout09.t-online.de (Postfix) with SMTP id 6001AD884; Sat, 14 May 2022 19:56:16 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd79.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2ZkJXt0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-1J; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:55:56 +0200 Message-Id: <20220514175612.2510884-3-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-00010BFA-7B0A6331/0/0 CLEAN NORMAL X-TOI-MSGID: 97468581-b83f-4312-b99d-cb671ca00a1d Subject: [Buildroot] [PATCH 03/19] package/x11r7/xdriver_xf86-video-amdgpu: bump version to 22.0.0 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Release notes: https://lists.x.org/archives/xorg/2022-February/060928.html Reformatted license hash. Switched tarball to upstream-provided .xz format. Signed-off-by: Bernd Kuhls --- .../xdriver_xf86-video-amdgpu.hash | 10 ++++------ .../xdriver_xf86-video-amdgpu.mk | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash index 4bbfb0de71..c45ae59ee4 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.hash @@ -1,7 +1,5 @@ -# From https://lists.x.org/archives/xorg-announce/2019-October/003026.html -md5 55ad19b858e186a2cf4e91ed832c05e7 xf86-video-amdgpu-19.1.0.tar.bz2 -sha1 044a97ea2f36dd3d2d4844bb503dd4e2b2854d56 xf86-video-amdgpu-19.1.0.tar.bz2 -sha256 4f0ea4e0ae61995ac2b7c72433d31deab63b60c78763020aaa1b28696124fe5d xf86-video-amdgpu-19.1.0.tar.bz2 -sha512 ccdaa2378492da1a2f3d18fedacd1318c4708da534a8a959276a82730d5420619d83ad1ec8d7835c55655fe56123cd9bffb44e6223c5a97033c01f598af4a173 xf86-video-amdgpu-19.1.0.tar.bz2 +# From https://lists.x.org/archives/xorg/2022-February/060928.html +sha256 9d23fb602915dc3ccde92aa4d1e9485e7e54eaae2f41f485e55eb20761778266 xf86-video-amdgpu-22.0.0.tar.xz +sha512 95c64e3fef7729ced6e7adc5e81c60cc218f6d8b6604f7b290e86ff52c917426b5102decbf8be8a66c9181ccde6e5dff7083dca8cc0c493a39e82625b5c7cb2a xf86-video-amdgpu-22.0.0.tar.xz # Locally computed -sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING +sha256 58847c8e97190c401afa84b3f0b8b147379c876a184e99af2cb51bfd40ac8936 COPYING diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index 6423c03f5f..c34af6faf1 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -4,8 +4,8 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 19.1.0 -XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.bz2 +XDRIVER_XF86_VIDEO_AMDGPU_VERSION = 22.0.0 +XDRIVER_XF86_VIDEO_AMDGPU_SOURCE = xf86-video-amdgpu-$(XDRIVER_XF86_VIDEO_AMDGPU_VERSION).tar.xz XDRIVER_XF86_VIDEO_AMDGPU_SITE = http://xorg.freedesktop.org/releases/individual/driver XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING From patchwork Sat May 14 17:55:57 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631120 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tZQ09GGz9sBF for ; Sun, 15 May 2022 03:59:42 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4AFE760EE7; Sat, 14 May 2022 17:59:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4k3wlnYF0eHf; Sat, 14 May 2022 17:59:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 6102B60E77; Sat, 14 May 2022 17:59:38 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A8A011BF3DE for ; Sat, 14 May 2022 17:56:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 90178400A6 for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id FdUhUaZL8ihU for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp2.osuosl.org (Postfix) with ESMTPS id ADA0640915 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout09.t-online.de (Postfix) with SMTP id 6E470D88B; Sat, 14 May 2022 19:56:16 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd79.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-2ZkJXz0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-3d; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:55:57 +0200 Message-Id: <20220514175612.2510884-4-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00010BFA-1755A7DA/0/0 CLEAN NORMAL X-TOI-MSGID: 874eb856-32cf-48cb-8d93-bda33284b0d3 Subject: [Buildroot] [PATCH 04/19] package/x11r7/xdriver_xf86-video-amdgpu: needs libgbm X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The package depends on gbm: https://gitlab.freedesktop.org/xorg/driver/xf86-video-amdgpu/-/blob/master/configure.ac#L75 For details see http://lists.busybox.net/pipermail/buildroot/2022-April/641451.html Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-amdgpu/Config.in | 8 +++----- .../xdriver_xf86-video-amdgpu.mk | 1 + 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in index c42255f55c..fb23fc1fdf 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/Config.in +++ b/package/x11r7/xdriver_xf86-video-amdgpu/Config.in @@ -1,8 +1,7 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU bool "xf86-video-amdgpu" depends on BR2_USE_MMU # libdrm - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER - depends on BR2_PACKAGE_MESA3D_OPENGL_EGL # gbm + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_AMDGPU select BR2_PACKAGE_LIBEPOXY @@ -11,7 +10,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_AMDGPU help AMD GPU video driver -comment "xf86-video-amdgpu needs egl/opengl support from mesa3d" +comment "xf86-video-amdgpu needs GBM" depends on BR2_USE_MMU - depends on !BR2_PACKAGE_MESA3D_OPENGL_EGL || \ - !BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk index c34af6faf1..ba4ab43db2 100644 --- a/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk +++ b/package/x11r7/xdriver_xf86-video-amdgpu/xdriver_xf86-video-amdgpu.mk @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_AMDGPU_LICENSE = MIT XDRIVER_XF86_VIDEO_AMDGPU_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_AMDGPU_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server From patchwork Sat May 14 17:55:58 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631118 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tYx1jpTz9sBF for ; Sun, 15 May 2022 03:59:17 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 01F758132D; Sat, 14 May 2022 17:59:15 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id WQPLXUi8vqJA; Sat, 14 May 2022 17:59:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id EE7B7827FD; Sat, 14 May 2022 17:59:12 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id A5BC71BF3DE for ; Sat, 14 May 2022 17:56:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 7986B4090E for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RX4jgzuzfd6U for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9123E408DB for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout09.t-online.de (Postfix) with SMTP id 6BCF6D88A; Sat, 14 May 2022 19:56:16 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd79.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-2ZkJXy0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-5e; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:55:58 +0200 Message-Id: <20220514175612.2510884-5-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00010BFA-45B7399F/0/0 CLEAN NORMAL X-TOI-MSGID: d4eef387-ac09-4c91-bf82-200fe6604b0d Subject: [Buildroot] [PATCH 05/19] package/x11r7/xdriver_xf86-video-ati: fix build with newer versions of xserver X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Fixes: http://autobuild.buildroot.net/results/ccc/ccc36c8cd3530153316190f378847081cb5c1c58/ http://autobuild.buildroot.net/results/bef/bef85a6a09bdd1d1a5035ee7baac1f2d2e7e1a2e/ http://autobuild.buildroot.net/results/7d6/7d65c8085a1ae122da4acc296538f2277b3ec15e/ Signed-off-by: Bernd Kuhls --- ...dri-h-with-older-versions-of-xserver.patch | 32 +++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch diff --git a/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch b/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch new file mode 100644 index 0000000000..a969d61913 --- /dev/null +++ b/package/x11r7/xdriver_xf86-video-ati/0004-Only-include-dri-h-with-older-versions-of-xserver.patch @@ -0,0 +1,32 @@ +From 5eba006e4129e8015b822f9e1d2f1e613e252cda Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michel=20D=C3=A4nzer?= +Date: Tue, 2 Feb 2021 12:45:54 +0100 +Subject: [PATCH] Only include dri.h with older versions of xserver + +Not needed anymore with current versions. + +Downloaded from upstream commit +https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/5eba006e4129e8015b822f9e1d2f1e613e252cda + +Signed-off-by: Bernd Kuhls +--- + src/drmmode_display.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/drmmode_display.c b/src/drmmode_display.c +index 3099a729..a58f24dd 100644 +--- a/src/drmmode_display.c ++++ b/src/drmmode_display.c +@@ -45,7 +45,9 @@ + #include "radeon_glamor.h" + #include "radeon_reg.h" + ++#if XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1,19,99,1,0) + #include ++#endif + + #include "drmmode_display.h" + +-- +GitLab + From patchwork Sat May 14 17:55:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631117 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [IPv6:2605:bc80:3010::136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tYj222Mz9sBF for ; Sun, 15 May 2022 03:59:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id DEDA660E82; Sat, 14 May 2022 17:59:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Gwu7rs9qLr-e; Sat, 14 May 2022 17:59:01 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 16B4360E0F; Sat, 14 May 2022 17:59:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 478AE1BF3DE for ; Sat, 14 May 2022 17:56:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 0681182871 for ; Sat, 14 May 2022 17:56:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id awCeJuELOWnH for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1AF6E827FD for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout10.t-online.de (Postfix) with SMTP id 8D93D6625; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd86.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-2G5rq20; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-7i; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:55:59 +0200 Message-Id: <20220514175612.2510884-6-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-000116DC-F3503FC3/0/0 CLEAN NORMAL X-TOI-MSGID: 7b3fde3d-ec72-4561-ae4c-f9533776fc33 Subject: [Buildroot] [PATCH 06/19] package/x11r7/xdriver_xf86-video-ati: switch dependency from mesa3d to libgbm X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" The package depends on gbm and not mesa3d: https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/blob/master/configure.ac#L155 Remove the dependency to BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON in order to prevent a circular dependency here. This option will be removed in a follow-patch anyway because Mesa3D will drop DRI drivers in version 22.x. Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-ati/Config.in | 7 +++---- .../x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk | 1 + 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-ati/Config.in b/package/x11r7/xdriver_xf86-video-ati/Config.in index 1246014dca..81255d5a4c 100644 --- a/package/x11r7/xdriver_xf86-video-ati/Config.in +++ b/package/x11r7/xdriver_xf86-video-ati/Config.in @@ -1,15 +1,14 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_ATI bool "xf86-video-ati" depends on BR2_i386 || BR2_x86_64 # DRI radeon r100 driver - depends on BR2_PACKAGE_MESA3D + depends on BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_RADEON - select BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON select BR2_PACKAGE_XLIB_LIBXCOMPOSITE select BR2_PACKAGE_XORGPROTO help ATI video driver -comment "xf86-video-ati needs mesa3d" +comment "xf86-video-ati needs GBM" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_MESA3D + depends on !BR2_PACKAGE_HAS_LIBGBM diff --git a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk index edb8b11add..e7f5852811 100644 --- a/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk +++ b/package/x11r7/xdriver_xf86-video-ati/xdriver_xf86-video-ati.mk @@ -11,6 +11,7 @@ XDRIVER_XF86_VIDEO_ATI_LICENSE = MIT XDRIVER_XF86_VIDEO_ATI_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_ATI_DEPENDENCIES = \ libdrm \ + libgbm \ xlib_libXcomposite \ xorgproto \ xserver_xorg-server From patchwork Sat May 14 17:56:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631106 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tVw3N1cz9s5V for ; Sun, 15 May 2022 03:56:40 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id A437940917; Sat, 14 May 2022 17:56:37 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4j3P-ean47Ls; Sat, 14 May 2022 17:56:36 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 9FC25408DB; Sat, 14 May 2022 17:56:35 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 233191BF909 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 1265E827FD for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id ytjQKiG_THmC for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout05.t-online.de (mailout05.t-online.de [194.25.134.82]) by smtp1.osuosl.org (Postfix) with ESMTPS id D0164827DE for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout05.t-online.de (Postfix) with SMTP id 653CA6A9B; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd84.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-1aPaCs0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-9p; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:00 +0200 Message-Id: <20220514175612.2510884-7-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00009E39-E4925361/0/0 CLEAN NORMAL X-TOI-MSGID: 9a2cd8b8-bc65-447a-a817-61eed5b485ec Subject: [Buildroot] [PATCH 07/19] package/x11r7/xdriver_xf86-video-imx-viv: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Also fix a typo in the Config.in help text while being at it. Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-imx-viv/Config.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in index 13cee14deb..292fdd05a4 100644 --- a/package/x11r7/xdriver_xf86-video-imx-viv/Config.in +++ b/package/x11r7/xdriver_xf86-video-imx-viv/Config.in @@ -1,10 +1,9 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV bool "xf86-video-imx-viv" + depends on BR2_PACKAGE_HAS_LIBGL depends on BR2_PACKAGE_IMX_GPU_VIV_OUTPUT_X11 depends on BR2_PACKAGE_IMX_GPU_G2D depends on BR2_TOOLCHAIN_HAS_SYNC_1 # mesa3d - select BR2_PACKAGE_MESA3D # Needed in order to compile xorg with glx/dri - select BR2_PACKAGE_MESA3D_DRI_DRIVER select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help @@ -26,7 +25,10 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_IMX_VIV Don't forget to load galcore.ko and create /dev/galcore before using this driver (else, Xorg will exit with an - obscur message like "Segmentation fault at address 0xc"). + obscure message like "Segmentation fault at address 0xc"). + +comment "xf86-video-imx-viv needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL comment "xf86-video-imx-viv depends on imx-gpu-viv with X11 output" depends on BR2_arm From patchwork Sat May 14 17:56:01 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631109 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tWf6WVXz9s5V for ; Sun, 15 May 2022 03:57:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 825BB81B26; Sat, 14 May 2022 17:57:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 2YfhTnDIrt3G; Sat, 14 May 2022 17:57:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 8894281B17; Sat, 14 May 2022 17:57:13 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 5EE421BF909 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 4DA8F60E0F for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id jzATy_V9Mmj4 for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp3.osuosl.org (Postfix) with ESMTPS id 112AE60D60 for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout10.t-online.de (Postfix) with SMTP id 829BF6621; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd86.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2G5rpy0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-Bm; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:01 +0200 Message-Id: <20220514175612.2510884-8-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-000116DC-648A2989/0/0 CLEAN NORMAL X-TOI-MSGID: f97f923b-ea6f-4e49-b106-967eaf8dd2f6 Subject: [Buildroot] [PATCH 08/19] package/x11r7/xdriver_xf86-video-intel: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls --- .../xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk index d911234c92..7ed2882a5d 100644 --- a/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk +++ b/package/x11r7/xdriver_xf86-video-intel/xdriver_xf86-video-intel.mk @@ -32,11 +32,16 @@ XDRIVER_XF86_VIDEO_INTEL_DEPENDENCIES = \ xserver_xorg-server # X.org server support for DRI depends on a Mesa3D DRI driver -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),y) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += \ --enable-dri2 \ --enable-dri3 \ --enable-uxa +else +XDRIVER_XF86_VIDEO_INTEL_CONF_OPTS += \ + --disable-dri2 \ + --disable-dri3 \ + --disable-uxa endif $(eval $(autotools-package)) From patchwork Sat May 14 17:56:02 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631112 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tXQ31dRz9sBF for ; Sun, 15 May 2022 03:57:58 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E4A84409E8; Sat, 14 May 2022 17:57:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id V-1Vjxd4l-v3; Sat, 14 May 2022 17:57:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id C22F040905; Sat, 14 May 2022 17:57:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 55C7D1BF947 for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 2C3F6827DE for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id qTeVwHfaZ7fw for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by smtp1.osuosl.org (Postfix) with ESMTPS id 1DAF6827FA for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout07.t-online.de (Postfix) with SMTP id 5F774DFFA; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd84.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-1aPaCo0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-DR; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:02 +0200 Message-Id: <20220514175612.2510884-9-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-00009E39-3B4984EB/0/0 CLEAN NORMAL X-TOI-MSGID: 5c1f553d-f9fe-4f75-8cb3-5b96acc9f01f Subject: [Buildroot] [PATCH 09/19] package/x11r7/xdriver_xf86-video-mach64: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls --- .../xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk index eee8fec2e8..7b4fa80834 100644 --- a/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk +++ b/package/x11r7/xdriver_xf86-video-mach64/xdriver_xf86-video-mach64.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_MACH64_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_MACH64_AUTORECONF = YES XDRIVER_XF86_VIDEO_MACH64_DEPENDENCIES = xserver_xorg-server xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_MACH64_CONF_OPTS += --disable-dri endif From patchwork Sat May 14 17:56:03 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631108 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tWP1lxDz9s5V for ; Sun, 15 May 2022 03:57:05 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id ECF434098F; Sat, 14 May 2022 17:57:02 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id uBMNxzXQJXZ0; Sat, 14 May 2022 17:57:02 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id EE9434090E; Sat, 14 May 2022 17:57:00 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 51BD01BF947 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 3D4DB400A6 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id foKVDvWajtJf for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp2.osuosl.org (Postfix) with ESMTPS id 106A1408DB for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout10.t-online.de (Postfix) with SMTP id 854486622; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd86.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2G5rpz0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-F0; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:03 +0200 Message-Id: <20220514175612.2510884-10-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-000116DC-919598D2/0/0 CLEAN NORMAL X-TOI-MSGID: dbb8af03-d38e-49b2-830d-fa40bc216496 Subject: [Buildroot] [PATCH 10/19] package/x11r7/xdriver_xf86-video-mga: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA=y Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-mga/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-mga/Config.in b/package/x11r7/xdriver_xf86-video-mga/Config.in index 15fb3b9f87..bac5e62442 100644 --- a/package/x11r7/xdriver_xf86-video-mga/Config.in +++ b/package/x11r7/xdriver_xf86-video-mga/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_MGA bool "xf86-video-mga" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help Matrox video driver - -comment "xf86-video-mga needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk index 3c668a5c98..24f2da2cce 100644 --- a/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk +++ b/package/x11r7/xdriver_xf86-video-mga/xdriver_xf86-video-mga.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_MGA_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_MGA_AUTORECONF = YES XDRIVER_XF86_VIDEO_MGA_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_MGA_CONF_OPTS += --disable-dri endif From patchwork Sat May 14 17:56:04 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631121 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tZf589jz9sBF for ; Sun, 15 May 2022 03:59:54 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DBBF8408DB; Sat, 14 May 2022 17:59:52 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id owBbdP02_2SM; Sat, 14 May 2022 17:59:52 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id 10913409B5; Sat, 14 May 2022 17:59:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C29031BF909 for ; Sat, 14 May 2022 17:56:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 88CBC414CD for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NyRi5ROiOlAX for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp4.osuosl.org (Postfix) with ESMTPS id 99B8141484 for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout09.t-online.de (Postfix) with SMTP id 6262DD886; Sat, 14 May 2022 19:56:16 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd79.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2ZkJXu0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-H5; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:04 +0200 Message-Id: <20220514175612.2510884-11-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-00010BFA-DC14C118/0/0 CLEAN NORMAL X-TOI-MSGID: 885883ef-e431-412f-8189-654d9b8417e4 Subject: [Buildroot] [PATCH 11/19] package/x11r7/xdriver_xf86-video-nouveau: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-nouveau/Config.in | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-nouveau/Config.in b/package/x11r7/xdriver_xf86-video-nouveau/Config.in index c9fd2e3d2f..5b266b1b4a 100644 --- a/package/x11r7/xdriver_xf86-video-nouveau/Config.in +++ b/package/x11r7/xdriver_xf86-video-nouveau/Config.in @@ -1,7 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU bool "xf86-video-nouveau" - depends on BR2_PACKAGE_MESA3D - select BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_LIBDRM_NOUVEAU select BR2_PACKAGE_XORGPROTO @@ -10,5 +9,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_NOUVEAU http://nouveau.freedesktop.org -comment "xf86-video-nouveau needs mesa3d" - depends on !BR2_PACKAGE_MESA3D +comment "xf86-video-nouveau needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL From patchwork Sat May 14 17:56:05 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631113 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tXf1QyDz9sBF for ; Sun, 15 May 2022 03:58:10 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id E34C5414D1; Sat, 14 May 2022 17:58:07 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EDURstP4eppx; Sat, 14 May 2022 17:58:06 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 62761408EB; Sat, 14 May 2022 17:58:05 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 7CB001BF3DE for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 8EF70400A6 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id AXnG2ljJLxT6 for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by smtp2.osuosl.org (Postfix) with ESMTPS id 9AEEE40915 for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout07.t-online.de (Postfix) with SMTP id 60DCADFFB; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd84.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-1aPaCp0; Sat, 14 May 2022 19:56:13 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-Il; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:05 +0200 Message-Id: <20220514175612.2510884-12-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550973-00009E39-2CC86172/0/0 CLEAN NORMAL X-TOI-MSGID: 998d0826-a005-4f4f-b5e7-557783feae91 Subject: [Buildroot] [PATCH 12/19] package/x11r7/xdriver_xf86-video-openchrome: switch source to git repo X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" No functional changes here, the commit used equals version 0.6.0: https://cgit.freedesktop.org/openchrome/xf86-video-openchrome/commit/?id=5e158c76eb3a0fb0db207229697139f8da2faaae A follow-up bump will fix build errors with gcc-10. Signed-off-by: Bernd Kuhls --- .../xdriver_xf86-video-openchrome.hash | 7 ++----- .../xdriver_xf86-video-openchrome.mk | 7 ++++--- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash index 57cc9aca9c..8c1c5ac91b 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash @@ -1,6 +1,3 @@ -# From https://lists.x.org/archives/xorg-announce/2017-March/002781.html -md5 c87f164739729b00f7e1a9934420c22d xf86-video-openchrome-0.6.0.tar.bz2 -sha1 2077181ded4d86e9cbe6d3e9b1245339692e848d xf86-video-openchrome-0.6.0.tar.bz2 -sha256 da2975c6379358de52c1257710c67eb59139a7f0a1cd28d00cc64cc3e1c02f75 xf86-video-openchrome-0.6.0.tar.bz2 # Locally computed -sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING +sha256 05beeaff42ffbe41f37dbed0d6fe94d1829a9dd847cdab4068d107cfc485a62b xdriver_xf86-video-openchrome-5e158c76eb3a0fb0db207229697139f8da2faaae-br1.tar.gz +sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk index db9e11f6da..0e04f59466 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk @@ -4,11 +4,12 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 0.6.0 -XDRIVER_XF86_VIDEO_OPENCHROME_SOURCE = xf86-video-openchrome-$(XDRIVER_XF86_VIDEO_OPENCHROME_VERSION).tar.bz2 -XDRIVER_XF86_VIDEO_OPENCHROME_SITE = http://xorg.freedesktop.org/archive/individual/driver +XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 5e158c76eb3a0fb0db207229697139f8da2faaae +XDRIVER_XF86_VIDEO_OPENCHROME_SITE = https://anongit.freedesktop.org/git/openchrome/xf86-video-openchrome.git +XDRIVER_XF86_VIDEO_OPENCHROME_SITE_METHOD = git XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE_FILES = COPYING +XDRIVER_XF86_VIDEO_OPENCHROME_AUTORECONF = YES XDRIVER_XF86_VIDEO_OPENCHROME_DEPENDENCIES = \ xserver_xorg-server \ From patchwork Sat May 14 17:56:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631123 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tb81cXTz9sBF for ; Sun, 15 May 2022 04:00:20 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 7F7CB83148; Sat, 14 May 2022 18:00:18 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id EOMl430H_SQa; Sat, 14 May 2022 18:00:17 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id A80A982AAA; Sat, 14 May 2022 18:00:16 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id D7DA71BF3DE for ; Sat, 14 May 2022 17:56:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A9346414CB for ; Sat, 14 May 2022 17:56:23 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id RNJE08X0OZwy for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp4.osuosl.org (Postfix) with ESMTPS id 4AD90414E4 for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout10.t-online.de (Postfix) with SMTP id 8ACAD6624; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd86.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-2G5rq10; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-L7; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:06 +0200 Message-Id: <20220514175612.2510884-13-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-000116DC-91CE67B4/0/0 CLEAN NORMAL X-TOI-MSGID: 28902910-943c-4b3e-b7be-0898666333bf Subject: [Buildroot] [PATCH 13/19] package/x11r7/xdriver_xf86-video-openchrome: bump version to 0.6.225 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Signed-off-by: Bernd Kuhls --- .../xdriver_xf86-video-openchrome.hash | 2 +- .../xdriver_xf86-video-openchrome.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash index 8c1c5ac91b..d8cc080a32 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.hash @@ -1,3 +1,3 @@ # Locally computed -sha256 05beeaff42ffbe41f37dbed0d6fe94d1829a9dd847cdab4068d107cfc485a62b xdriver_xf86-video-openchrome-5e158c76eb3a0fb0db207229697139f8da2faaae-br1.tar.gz +sha256 037bebbe31bcca2b4f3adeefccd2a64a30e2924946a6c6646c5829f7362212ec xdriver_xf86-video-openchrome-ab03de703b91c7e0fd3e4d1ca06ad5add7f077a1-br1.tar.gz sha256 1fde58bce5cff8c32e9a0a80bfa3e60213a2767954e30a367127d5afa2884ca2 COPYING diff --git a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk index 0e04f59466..e8001004bc 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk +++ b/package/x11r7/xdriver_xf86-video-openchrome/xdriver_xf86-video-openchrome.mk @@ -4,7 +4,7 @@ # ################################################################################ -XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = 5e158c76eb3a0fb0db207229697139f8da2faaae +XDRIVER_XF86_VIDEO_OPENCHROME_VERSION = ab03de703b91c7e0fd3e4d1ca06ad5add7f077a1 XDRIVER_XF86_VIDEO_OPENCHROME_SITE = https://anongit.freedesktop.org/git/openchrome/xf86-video-openchrome.git XDRIVER_XF86_VIDEO_OPENCHROME_SITE_METHOD = git XDRIVER_XF86_VIDEO_OPENCHROME_LICENSE = MIT From patchwork Sat May 14 17:56:07 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631110 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.138; helo=smtp1.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tWs6yNFz9sBF for ; Sun, 15 May 2022 03:57:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 34D1581C44; Sat, 14 May 2022 17:57:28 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id L2AtB_vlLKYs; Sat, 14 May 2022 17:57:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp1.osuosl.org (Postfix) with ESMTP id 2CC6181B17; Sat, 14 May 2022 17:57:26 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 378851BF3DE for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 34EE660E0F for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id E3oT3lh2rxnm for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by smtp3.osuosl.org (Postfix) with ESMTPS id 53FCB60D60 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout07.t-online.de (Postfix) with SMTP id 62677DFFC; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd84.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-1aPaCq0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-N0; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:07 +0200 Message-Id: <20220514175612.2510884-14-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00009E39-BC156D23/0/0 CLEAN NORMAL X-TOI-MSGID: 1b9aa77c-7f8b-44a9-a17e-31e1e98a926d Subject: [Buildroot] [PATCH 14/19] package/x11r7/xdriver_xf86-video-openchrome: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-openchrome/Config.in | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-openchrome/Config.in b/package/x11r7/xdriver_xf86-video-openchrome/Config.in index a93d14376b..f95e959f69 100644 --- a/package/x11r7/xdriver_xf86-video-openchrome/Config.in +++ b/package/x11r7/xdriver_xf86-video-openchrome/Config.in @@ -1,6 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME bool "xf86-video-openchrome" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER + depends on BR2_PACKAGE_HAS_LIBGL select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXCOMPOSITE @@ -12,5 +12,5 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_OPENCHROME https://www.freedesktop.org/wiki/Openchrome/ -comment "xf86-video-openchrome needs a DRI driver from mesa3d" - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER +comment "xf86-video-openchrome needs an OpenGL backend" + depends on !BR2_PACKAGE_HAS_LIBGL From patchwork Sat May 14 17:56:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631107 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.136; helo=smtp3.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tW91VMzz9s5V for ; Sun, 15 May 2022 03:56:52 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 40E2A60E34; Sat, 14 May 2022 17:56:50 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id rR26uy_t3GbX; Sat, 14 May 2022 17:56:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp3.osuosl.org (Postfix) with ESMTP id 60C4460D60; Sat, 14 May 2022 17:56:48 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 467591BF3DE for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 3480B41505 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Ilf6OlKF7Mpo for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp4.osuosl.org (Postfix) with ESMTPS id 98ABD409E8 for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout09.t-online.de (Postfix) with SMTP id 647CBD887; Sat, 14 May 2022 19:56:16 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd79.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2ZkJXv0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-Oj; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:08 +0200 Message-Id: <20220514175612.2510884-15-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00010BFA-4CA807B6/0/0 CLEAN NORMAL X-TOI-MSGID: b60ce289-db7d-454c-bd8c-df0cb58be8c0 Subject: [Buildroot] [PATCH 15/19] package/x11r7/xdriver_xf86-video-r128: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Signed-off-by: Bernd Kuhls --- .../x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk index 690041d4c6..1931dbecd7 100644 --- a/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk +++ b/package/x11r7/xdriver_xf86-video-r128/xdriver_xf86-video-r128.mk @@ -11,7 +11,9 @@ XDRIVER_XF86_VIDEO_R128_LICENSE = MIT XDRIVER_XF86_VIDEO_R128_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_R128_DEPENDENCIES = xserver_xorg-server xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_R128_CONF_OPTS += --disable-dri endif From patchwork Sat May 14 17:56:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631114 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tXw0p96z9sBF for ; Sun, 15 May 2022 03:58:24 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id B354D40905; Sat, 14 May 2022 17:58:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id aSjh6EYa8RzW; Sat, 14 May 2022 17:58:20 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id 4136640926; Sat, 14 May 2022 17:58:19 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp1.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 18C5C1BF3DE for ; Sat, 14 May 2022 17:56:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp1.osuosl.org (Postfix) with ESMTP id 909BB827DE for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp1.osuosl.org ([127.0.0.1]) by localhost (smtp1.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id gdNQ_Ryxu6x3 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout07.t-online.de (mailout07.t-online.de [194.25.134.83]) by smtp1.osuosl.org (Postfix) with ESMTPS id C1AF7827FA for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) Received: from fwd84.dcpf.telekom.de (fwd84.aul.t-online.de [10.223.144.110]) by mailout07.t-online.de (Postfix) with SMTP id 64587DFFD; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd84.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-1aPaCr0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-QH; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:09 +0200 Message-Id: <20220514175612.2510884-16-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00009E39-39CC272F/0/0 CLEAN NORMAL X-TOI-MSGID: bcdc1698-5a99-452f-8d8c-aaa277e58f95 Subject: [Buildroot] [PATCH 16/19] package/x11r7/xdriver_xf86-video-sis: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS=y Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-sis/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-sis/Config.in b/package/x11r7/xdriver_xf86-video-sis/Config.in index db01cf2afe..8e00589a76 100644 --- a/package/x11r7/xdriver_xf86-video-sis/Config.in +++ b/package/x11r7/xdriver_xf86-video-sis/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SIS bool "xf86-video-sis" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help SiS and XGI video driver - -comment "xf86-video-sis needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk index f96b0a9d0e..0417f8ae71 100644 --- a/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk +++ b/package/x11r7/xdriver_xf86-video-sis/xdriver_xf86-video-sis.mk @@ -11,7 +11,9 @@ XDRIVER_XF86_VIDEO_SIS_LICENSE = MIT XDRIVER_XF86_VIDEO_SIS_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_SIS_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_SIS_CONF_OPTS += --disable-dri endif From patchwork Sat May 14 17:56:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631122 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [IPv6:2605:bc80:3010::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tZv4zx4z9sBF for ; Sun, 15 May 2022 04:00:07 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id BFE7440A76; Sat, 14 May 2022 18:00:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id iVV6XYjvVH8t; Sat, 14 May 2022 18:00:05 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id CAD9240930; Sat, 14 May 2022 18:00:03 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id C5EBA1BF3DE for ; Sat, 14 May 2022 17:56:26 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A664841484 for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8tKZFxgj3U6C for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout10.t-online.de (mailout10.t-online.de [194.25.134.21]) by smtp4.osuosl.org (Postfix) with ESMTPS id 9E3FC414E7 for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) Received: from fwd86.dcpf.telekom.de (fwd86.aul.t-online.de [10.223.144.112]) by mailout10.t-online.de (Postfix) with SMTP id 882756623; Sat, 14 May 2022 19:56:17 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd86.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzx-2G5rq00; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-SN; Sat, 14 May 2022 19:56:13 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:10 +0200 Message-Id: <20220514175612.2510884-17-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-000116DC-22113A5C/0/0 CLEAN NORMAL X-TOI-MSGID: 9e73346c-351a-46b8-805f-c96b8d699385 Subject: [Buildroot] [PATCH 17/19] package/x11r7/xdriver_xf86-video-savage: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE=y Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-savage/Config.in | 4 ---- .../xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-savage/Config.in b/package/x11r7/xdriver_xf86-video-savage/Config.in index bc6ca52370..ab6fd89845 100644 --- a/package/x11r7/xdriver_xf86-video-savage/Config.in +++ b/package/x11r7/xdriver_xf86-video-savage/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_SAVAGE bool "xf86-video-savage" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help S3 Savage video driver - -comment "xf86-video-savage needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk index 102aa2c48e..9e5bf61997 100644 --- a/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk +++ b/package/x11r7/xdriver_xf86-video-savage/xdriver_xf86-video-savage.mk @@ -12,7 +12,9 @@ XDRIVER_XF86_VIDEO_SAVAGE_LICENSE_FILES = COPYING XDRIVER_XF86_VIDEO_SAVAGE_AUTORECONF = YES XDRIVER_XF86_VIDEO_SAVAGE_DEPENDENCIES = xserver_xorg-server libdrm xorgproto -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_SAVAGE_CONF_OPTS += --disable-dri endif From patchwork Sat May 14 17:56:11 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631119 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=140.211.166.133; helo=smtp2.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tZ92Hwzz9sBF for ; Sun, 15 May 2022 03:59:29 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id 9488440915; Sat, 14 May 2022 17:59:27 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id K3JPwy2lx38m; Sat, 14 May 2022 17:59:26 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp2.osuosl.org (Postfix) with ESMTP id A12924098F; Sat, 14 May 2022 17:59:25 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp4.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id BEBB61BF909 for ; Sat, 14 May 2022 17:56:24 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id 5FC08409E8 for ; Sat, 14 May 2022 17:56:22 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y89Atztg7Out for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp4.osuosl.org (Postfix) with ESMTPS id D5891414CD for ; Sat, 14 May 2022 17:56:19 +0000 (UTC) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout09.t-online.de (Postfix) with SMTP id 6701DD888; Sat, 14 May 2022 19:56:16 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd79.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-2ZkJXw0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzx-0005N1-UV; Sat, 14 May 2022 19:56:14 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:11 +0200 Message-Id: <20220514175612.2510884-18-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00010BFA-62FE12C6/0/0 CLEAN NORMAL X-TOI-MSGID: 71cce876-a467-4b72-a2a0-d1f57c82cafd Subject: [Buildroot] [PATCH 18/19] package/x11r7/xdriver_xf86-video-tdfx: switch dependency from mesa3d to libgl X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" DRI support for this driver is provided by the xserver_xorg-server package when BR2_PACKAGE_HAS_LIBGL is enabled: https://git.busybox.net/buildroot/tree/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk#n91 Change the dependency to follow the logic of xserver_xorg-server. Build-tested using these defconfigs: BR2_PACKAGE_MESA3D=y BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_SWRAST=y BR2_PACKAGE_MESA3D_OPENGL_GLX=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX=y and BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX=y Signed-off-by: Bernd Kuhls --- package/x11r7/xdriver_xf86-video-tdfx/Config.in | 4 ---- .../x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk | 4 +++- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/package/x11r7/xdriver_xf86-video-tdfx/Config.in b/package/x11r7/xdriver_xf86-video-tdfx/Config.in index 959dc31049..14b8f0ad9e 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/Config.in +++ b/package/x11r7/xdriver_xf86-video-tdfx/Config.in @@ -1,10 +1,6 @@ config BR2_PACKAGE_XDRIVER_XF86_VIDEO_TDFX bool "xf86-video-tdfx" - depends on BR2_PACKAGE_MESA3D select BR2_PACKAGE_LIBDRM select BR2_PACKAGE_XORGPROTO help 3Dfx video driver - -comment "xf86-video-tdfx needs mesa3d" - depends on !BR2_PACKAGE_MESA3D diff --git a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk index 14c40e4d89..e687876843 100644 --- a/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk +++ b/package/x11r7/xdriver_xf86-video-tdfx/xdriver_xf86-video-tdfx.mk @@ -15,7 +15,9 @@ XDRIVER_XF86_VIDEO_TDFX_DEPENDENCIES = \ xorgproto \ xserver_xorg-server -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --enable-dri +else XDRIVER_XF86_VIDEO_TDFX_CONF_OPTS += --disable-dri endif From patchwork Sat May 14 17:56:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Kuhls X-Patchwork-Id: 1631116 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=buildroot.org (client-ip=2605:bc80:3010::137; helo=smtp4.osuosl.org; envelope-from=buildroot-bounces@buildroot.org; receiver=) Received: from smtp4.osuosl.org (smtp4.osuosl.org [IPv6:2605:bc80:3010::137]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4L0tYQ3GXmz9sBF for ; Sun, 15 May 2022 03:58:50 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by smtp4.osuosl.org (Postfix) with ESMTP id A039B40926; Sat, 14 May 2022 17:58:48 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp4.osuosl.org ([127.0.0.1]) by localhost (smtp4.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oOUVn8Yh93va; Sat, 14 May 2022 17:58:47 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by smtp4.osuosl.org (Postfix) with ESMTP id EEFB5409E8; Sat, 14 May 2022 17:58:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from smtp2.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 94B561BF3DE for ; Sat, 14 May 2022 17:56:23 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp2.osuosl.org (Postfix) with ESMTP id DF61040917 for ; Sat, 14 May 2022 17:56:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp2.osuosl.org ([127.0.0.1]) by localhost (smtp2.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id LV7t54Ozi76I for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mailout09.t-online.de (mailout09.t-online.de [194.25.134.84]) by smtp2.osuosl.org (Postfix) with ESMTPS id 94A584090E for ; Sat, 14 May 2022 17:56:20 +0000 (UTC) Received: from fwd79.dcpf.telekom.de (fwd79.aul.t-online.de [10.223.144.105]) by mailout09.t-online.de (Postfix) with SMTP id 696D3D889; Sat, 14 May 2022 19:56:16 +0200 (CEST) Received: from fli4l.lan.fli4l ([91.58.4.164]) by fwd79.t-online.de with (TLSv1:ECDHE-RSA-AES256-SHA encrypted) esmtp id 1npvzy-2ZkJXx0; Sat, 14 May 2022 19:56:14 +0200 Received: from bruckner.lan.fli4l ([192.168.1.1]:41714) by fli4l.lan.fli4l with esmtp (Exim 4.95) (envelope-from ) id 1npvzy-0005N1-0P; Sat, 14 May 2022 19:56:14 +0200 From: Bernd Kuhls To: buildroot@buildroot.org Date: Sat, 14 May 2022 19:56:12 +0200 Message-Id: <20220514175612.2510884-19-bernd.kuhls@t-online.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220514175612.2510884-1-bernd.kuhls@t-online.de> References: <20220514175612.2510884-1-bernd.kuhls@t-online.de> MIME-Version: 1.0 X-TOI-EXPURGATEID: 150726::1652550974-00010BFA-F0DF4B68/0/0 CLEAN NORMAL X-TOI-MSGID: 6ec925fc-22b3-46bf-af46-997619d8a959 Subject: [Buildroot] [PATCH 19/19] package/{mesa3d, mesa3d-headers}: bump version to 22.0.3 X-BeenThere: buildroot@buildroot.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gary Bisson , Romain Naour , "Yann E . MORIN" , =?utf-8?b?SsOpcsO0bWUgUG91aWxs?= =?utf-8?b?ZXI=?= Errors-To: buildroot-bounces@buildroot.org Sender: "buildroot" Release notes: https://lists.freedesktop.org/archives/mesa-announce/2022-April/000670.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000667.html https://lists.freedesktop.org/archives/mesa-announce/2022-March/000665.html https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html https://www.phoronix.com/scan.php?page=news_item&px=Mesa-22.0-Released Signed-off-by: Bernd Kuhls --- Config.in.legacy | 24 +++++++++ package/mesa3d-headers/mesa3d-headers.mk | 12 +---- package/mesa3d/Config.in | 69 ++---------------------- package/mesa3d/mesa3d.hash | 9 ++-- package/mesa3d/mesa3d.mk | 16 +----- 5 files changed, 35 insertions(+), 95 deletions(-) diff --git a/Config.in.legacy b/Config.in.legacy index 95b9d784d3..d9aa778f83 100644 --- a/Config.in.legacy +++ b/Config.in.legacy @@ -146,6 +146,30 @@ endif comment "Legacy options removed in 2022.05" +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 + bool "mesa DRI i915 driver removed" + select BR2_LEGACY + help + The DRI i915 driver was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 + bool "mesa DRI i965 driver removed" + select BR2_LEGACY + help + The DRI i965 driver was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU + bool "mesa DRI nouveau driver removed" + select BR2_LEGACY + help + The DRI radeon nouveau was removed upstream. + +config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON + bool "mesa DRI radeon r100 driver removed" + select BR2_LEGACY + help + The DRI radeon r100 driver was removed upstream. + config BR2_KERNEL_HEADERS_5_16 bool "kernel headers version 5.16.x are no longer supported" select BR2_LEGACY diff --git a/package/mesa3d-headers/mesa3d-headers.mk b/package/mesa3d-headers/mesa3d-headers.mk index 760c5368e5..fb3763297d 100644 --- a/package/mesa3d-headers/mesa3d-headers.mk +++ b/package/mesa3d-headers/mesa3d-headers.mk @@ -12,7 +12,7 @@ endif # Not possible to directly refer to mesa3d variables, because of # first/second expansion trickery... -MESA3D_HEADERS_VERSION = 21.3.8 +MESA3D_HEADERS_VERSION = 22.0.3 MESA3D_HEADERS_SOURCE = mesa-$(MESA3D_HEADERS_VERSION).tar.xz MESA3D_HEADERS_SITE = https://archive.mesa3d.org MESA3D_HEADERS_DL_SUBDIR = mesa3d @@ -33,19 +33,9 @@ MESA3D_HEADERS_DIRS += GL ifeq ($(BR2_PACKAGE_XORG7),y) -# Not using $(SED) because we do not want to work in-place, and $(SED) -# contains -i. -define MESA3D_HEADERS_BUILD_DRI_PC - sed -e 's:@VERSION@:$(MESA3D_HEADERS_VERSION):' \ - package/mesa3d-headers/dri.pc \ - >$(@D)/src/mesa/drivers/dri/dri.pc -endef - define MESA3D_HEADERS_INSTALL_DRI_PC $(INSTALL) -D -m 0644 $(@D)/include/GL/internal/dri_interface.h \ $(STAGING_DIR)/usr/include/GL/internal/dri_interface.h - $(INSTALL) -D -m 0644 $(@D)/src/mesa/drivers/dri/dri.pc \ - $(STAGING_DIR)/usr/lib/pkgconfig/dri.pc endef endif # Xorg diff --git a/package/mesa3d/Config.in b/package/mesa3d/Config.in index e41da562dc..7468c2c804 100644 --- a/package/mesa3d/Config.in +++ b/package/mesa3d/Config.in @@ -63,16 +63,6 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER -config BR2_PACKAGE_MESA3D_DRI_DRIVER - bool - select BR2_PACKAGE_MESA3D_DRI3 if \ - (BR2_PACKAGE_XORG7 && BR2_TOOLCHAIN_HAS_SYNC_4 && \ - !BR2_RISCV_32) - select BR2_PACKAGE_MESA3D_DRIVER - select BR2_PACKAGE_MESA3D_GBM if \ - !BR2_PACKAGE_MESA3D_OPENGL_GLX && \ - !BR2_PACKAGE_MESA3D_OPENGL_EGL - config BR2_PACKAGE_MESA3D_VULKAN_DRIVER bool select BR2_PACKAGE_MESA3D_DRIVER @@ -134,16 +124,11 @@ config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_FREEDRENO config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_I915 bool "Gallium i915 driver" depends on BR2_i386 || BR2_x86_64 - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 select BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_LIBDRM_INTEL help Support for i915-based Intel GPUs. -comment "Gallium i915: Only one i915 provider can be built" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 - config BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_IRIS bool "Gallium iris driver" depends on BR2_i386 || BR2_x86_64 @@ -330,49 +315,6 @@ comment "Gallium XvMC state tracker needs X.org and gallium drivers r600 or nouv !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_NOUVEAU \ || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_R600) -comment "DRI drivers" - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_I915 - bool "DRI i915 driver" - depends on BR2_i386 || BR2_x86_64 - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_INTEL - help - Support for i915-based Intel GPUs. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_I965 - bool "DRI i965 driver" - depends on BR2_i386 || BR2_x86_64 - depends on BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 # memfd.h - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_INTEL - help - Support for i965-based Intel GPUs. - -comment "DRI i965 driver needs a toolchain w/ headers >= 3.17" - depends on BR2_i386 || BR2_x86_64 - depends on !BR2_TOOLCHAIN_HEADERS_AT_LEAST_3_17 - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU - bool "DRI nouveau driver" - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_NOUVEAU - help - Support for Nvidia-based GPUs. - -config BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON - bool "DRI radeon r100 driver" - depends on BR2_i386 || BR2_x86_64 - # libdrm's radeon option depends on LIBDRM_HAS_ATOMIC. Propagating - # that dependency here causes a circular dependency that Kconfig - # can't see is just spurious. However, that dependency is about - # the toolchain having sync4 primitives, which is always a given - # for i386 and x86_64. - select BR2_PACKAGE_MESA3D_DRI_DRIVER - select BR2_PACKAGE_LIBDRM_RADEON - help - Legacy Radeon driver for R100 series GPUs. - comment "Vulkan drivers" config BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL @@ -406,17 +348,16 @@ comment "OpenGL API Support" config BR2_PACKAGE_MESA3D_GBM bool "gbm" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER \ - || (BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && \ + BR2_PACKAGE_MESA3D_OPENGL_EGL select BR2_PACKAGE_HAS_LIBGBM select BR2_PACKAGE_LIBGBM_HAS_FEATURE_FORMAT_MODIFIER_PLANE_COUNT select BR2_PACKAGE_LIBGBM_HAS_FEATURE_DMA_BUF help Enable Generic Buffer Management (gbm) -comment "gbm support needs a dri driver or a gallium driver w/ EGL support." - depends on !BR2_PACKAGE_MESA3D_DRI_DRIVER \ - && !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) +comment "gbm support needs a gallium driver w/ EGL support." + depends on !(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER && BR2_PACKAGE_MESA3D_OPENGL_EGL) config BR2_PACKAGE_MESA3D_OPENGL_GLX bool "OpenGL GLX" @@ -432,7 +373,7 @@ comment "OpenGL GLX support needs X11" config BR2_PACKAGE_MESA3D_OPENGL_EGL bool "OpenGL EGL" - depends on BR2_PACKAGE_MESA3D_DRI_DRIVER || BR2_PACKAGE_MESA3D_GALLIUM_DRIVER + depends on BR2_PACKAGE_MESA3D_GALLIUM_DRIVER select BR2_PACKAGE_HAS_LIBEGL if !BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_LIBGLVND_DISPATCH_EGL if BR2_PACKAGE_LIBGLVND select BR2_PACKAGE_HAS_LIBEGL_WAYLAND diff --git a/package/mesa3d/mesa3d.hash b/package/mesa3d/mesa3d.hash index 5b74e14fef..32221b8c89 100644 --- a/package/mesa3d/mesa3d.hash +++ b/package/mesa3d/mesa3d.hash @@ -1,6 +1,5 @@ -# From https://lists.freedesktop.org/archives/mesa-announce/2022-March/000666.html -sha256 e70d273bdc53a4e931871bb5550ba3900e6a3deab2fff64184107c33e92d9da7 mesa-21.3.8.tar.xz -sha512 0462c44fa8e358dafd03088411452bc172a365902795b3198df1e6cfbf1d87675ef5b72b572de7f15e5ee87b30ce5b2f217c81ea72b376962f6428c6ff83f2e9 mesa-21.3.8.tar.xz - +# From https://lists.freedesktop.org/archives/mesa-announce/2022-May/000673.html +sha256 9f2b30f5276a9abaf71aafc6979685e2636189de1a87aea2c9e69744a6d0ebb9 mesa-22.0.3.tar.xz +sha512 3982cd2fadca5349b2513885ed734c2422e3f2dced85f471f245b120ffaf018acafcd929dc5ec317f2c568bb5f619f5a3475d3a92495f766a2eefb225efcac14 mesa-22.0.3.tar.xz # License -sha256 998437f3f75f0c542046f83c1cb349408122268168fb13eb4ae6967aa18b7d98 docs/license.rst +sha256 4bc15d14dcc134b024cbdca3b5330010136ce8a427b6f8353440ce2ad7aab037 docs/license.rst diff --git a/package/mesa3d/mesa3d.mk b/package/mesa3d/mesa3d.mk index 9f375edc1f..aa6a4ac958 100644 --- a/package/mesa3d/mesa3d.mk +++ b/package/mesa3d/mesa3d.mk @@ -5,7 +5,7 @@ ################################################################################ # When updating the version, please also update mesa3d-headers -MESA3D_VERSION = 21.3.8 +MESA3D_VERSION = 22.0.3 MESA3D_SOURCE = mesa-$(MESA3D_VERSION).tar.xz MESA3D_SITE = https://archive.mesa3d.org MESA3D_LICENSE = MIT, SGI, Khronos @@ -114,11 +114,6 @@ MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_TEGRA) += tegra MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_V3D) += v3d MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VC4) += vc4 MESA3D_GALLIUM_DRIVERS-$(BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_VIRGL) += virgl -# DRI Drivers -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I915) += i915 -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_I965) += i965 -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_NOUVEAU) += nouveau -MESA3D_DRI_DRIVERS-$(BR2_PACKAGE_MESA3D_DRI_DRIVER_RADEON) += r100 # Vulkan Drivers MESA3D_VULKAN_DRIVERS-$(BR2_PACKAGE_MESA3D_VULKAN_DRIVER_INTEL) += intel @@ -133,15 +128,6 @@ MESA3D_CONF_OPTS += \ -Dgallium-extra-hud=true endif -ifeq ($(BR2_PACKAGE_MESA3D_DRI_DRIVER),) -MESA3D_CONF_OPTS += \ - -Ddri-drivers= -else -MESA3D_CONF_OPTS += \ - -Dshared-glapi=enabled \ - -Ddri-drivers=$(subst $(space),$(comma),$(MESA3D_DRI_DRIVERS-y)) -endif - ifeq ($(BR2_PACKAGE_MESA3D_VULKAN_DRIVER),) MESA3D_CONF_OPTS += \ -Dvulkan-drivers=