From patchwork Sun Sep 8 17:30:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67771 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 677B327BBEA; Sun, 8 Sep 2024 18:31:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, SPF_HELO_PASS autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D30FB27BBE2 for ; Sun, 8 Sep 2024 18:31:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snLkc-0002wN-Aa; Sun, 08 Sep 2024 13:31:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1snLkb-0002vq-2y for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:01 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1snLka-0005ri-Lr for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:From:Date:To:Subject; bh=jevIJ1ngxPmu2jeWtsMIVPt3wpYm4b10P3D7V6KFE/4=; b=JSyZgc9HP+V0z5mJTp09pcH75FsN9V+xWj/6fCy0SxnldJ3/20aoPckK/oR1McPyxJ9t5n4WYbpvrBzWd0euay+3AeOAT49XgLn+GXGGuAQUBZqCDwAcH1F5JcTsma+Lfw87XcOgij8be9dW9uHjcR/Vjjb0a4ZoBngnHoa6ntsEm5zmWq1L3uOMhwxBe+bGKdOS/eSTVxC1GqbgxlhFmVFBCu7Ls91PUGF+kq4+n0nmBtR77WmEYlcI8DTvdiMI6z0LNLuJw95sfD8742oYfzYSK2akVVIjkUdtID+psHjGyiOtOsVVCz33EzqM8LxpPPlTs0sXjnkVVV9f6b+yQA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snLkd-0000wA-28 for guix-patches@gnu.org; Sun, 08 Sep 2024 13:31:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH 3/3] gnu: wlroots: Remove hwdata patch Resent-From: Rutherther Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 08 Sep 2024 17:31:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 73124 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 73124@debbugs.gnu.org Cc: John Kehayias , Rutherther Received: via spool by 73124-submit@debbugs.gnu.org id=B73124.17258166393555 (code B ref 73124); Sun, 08 Sep 2024 17:31:03 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 17:30:39 +0000 Received: from localhost ([127.0.0.1]:59993 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLkF-0000vF-CP for submit@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:39 -0400 Received: from mail-40131.protonmail.ch ([185.70.40.131]:61089) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snLkD-0000v0-An for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 13:30:38 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725816627; x=1726075827; bh=jevIJ1ngxPmu2jeWtsMIVPt3wpYm4b10P3D7V6KFE/4=; h=Date:To:From:Cc:Subject:Message-ID:In-Reply-To:References: Feedback-ID:From:To:Cc:Date:Subject:Reply-To:Feedback-ID: Message-ID:BIMI-Selector; b=rgQJ+VVuYbKvsz87rVvcS9BTpkIeEWH0XWJRNV1j57KmABIFyEX4TvIqt3WcEkK6/ JOLtD3hUo4rxZH1nP9zezYANshNimRZKtmdp0f5rYuu320bSr9mu+xdoixPa4s/l/m N9PO4ibQW3aN5XhiKd7dlUULeEdwgMt6H8RXgf993v04MooROuqDIoL0Q0Z+jEW1S2 FhZEtb77A+RKVLzSQaRKR4+3u6jna5WC1r8eQVb3xQrgwN/GzarGH1ufFHXH2tT5IZ hjtWf706ZvUHbNzpBV74MMgMFo8ZsH8/o2D+BS6l3xCB4R1GpMPYxxBN8Ht3YhstjH rDsnMIEBVGfXg== Date: Sun, 08 Sep 2024 17:30:21 +0000 Message-ID: <8259a901ab9814e5614b47eda2ccec3fd2577d12.1725815893.git.rutherther@protonmail.com> In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 46ade36010f5f5104837624b49fde46d3ee02c68 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Rutherther X-ACL-Warn: , Rutherther via Guix-patches X-Patchwork-Original-From: Rutherther via Guix-patches via From: Rutherther Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches Hwdata has been updated and outputs "share/pkgconfig/hwdata.pc", this patch is no longer necessary. Change-Id: Ie4c8cd26fa5c1162004f096f037c658b103b02ae --- gnu/local.mk | 1 - .../patches/wlroots-hwdata-fallback.patch | 46 ------------------- gnu/packages/wm.scm | 4 +- 3 files changed, 1 insertion(+), 50 deletions(-) delete mode 100644 gnu/packages/patches/wlroots-hwdata-fallback.patch diff --git a/gnu/local.mk b/gnu/local.mk index cf42e2b6da..4a2b1c1dbe 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2288,7 +2288,6 @@ dist_patch_DATA = \ %D%/packages/patches/webrtc-audio-processing-x86-no-sse.patch \ %D%/packages/patches/webrtc-for-telegram-desktop-unbundle-libsrtp.patch \ %D%/packages/patches/websocketpp-fix-for-cmake-3.15.patch \ - %D%/packages/patches/wlroots-hwdata-fallback.patch \ %D%/packages/patches/wmctrl-64-fix.patch \ %D%/packages/patches/wmfire-dont-inline-draw-fire.patch \ %D%/packages/patches/wmfire-update-for-new-gdk-versions.patch \ diff --git a/gnu/packages/patches/wlroots-hwdata-fallback.patch b/gnu/packages/patches/wlroots-hwdata-fallback.patch deleted file mode 100644 index 6468c7cbf3..0000000000 --- a/gnu/packages/patches/wlroots-hwdata-fallback.patch +++ /dev/null @@ -1,46 +0,0 @@ -backend/drm: add hardcoded hwdata path fallback - -Add hardcoded fallback "/usr/share/hwdata/pnp.ids" as a -temporary solution to get things working in Guix until -hwdata ships with pkg-config file. - -diff --git a/backend/drm/meson.build b/backend/drm/meson.build -index 6fcb2c15..ed95360a 100644 ---- a/backend/drm/meson.build -+++ b/backend/drm/meson.build -@@ -1,8 +1,7 @@ - hwdata = dependency( - 'hwdata', -- required: 'drm' in backends, -+ required: false, - native: true, -- not_found_message: 'Required for the DRM backend.', - ) - - libdisplay_info = dependency( -@@ -19,15 +18,21 @@ libliftoff = dependency( - required: false, - ) - --if not (hwdata.found() and libdisplay_info.found() and features['session']) -+if hwdata.found() -+ hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') -+ pnp_ids = files(hwdata_dir / 'pnp.ids') -+else -+ pnp_ids = files('/usr/share/hwdata/pnp.ids') -+endif -+ -+if not (libdisplay_info.found() and features['session']) - subdir_done() - endif - --hwdata_dir = hwdata.get_variable(pkgconfig: 'pkgdatadir') - pnpids_c = custom_target( - 'pnpids.c', - output: 'pnpids.c', -- input: files(hwdata_dir / 'pnp.ids'), -+ input: pnp_ids, - feed: true, - capture: true, - command: files('gen_pnpids.sh'), - diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm index 238f4138ab..ed998101e7 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1735,8 +1735,7 @@ (define-public wlroots-0.18 (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f")) - (patches (search-patches "wlroots-hwdata-fallback.patch")))) + (base32 "13avi2805wrfkghgc7ar273p61svmm85k3g3hg9bf2gaxsz6f91f")))) (build-system meson-build-system) (arguments `(#:phases @@ -1790,7 +1789,6 @@ (define-public wlroots-0.17 (version "0.17.4") (source (origin - (inherit (package-source wlroots-0.18)) (method git-fetch) (uri (git-reference (url "https://gitlab.freedesktop.org/wlroots/wlroots")