From patchwork Sun Sep 8 18:26:15 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rutherther X-Patchwork-Id: 67773 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 C829F27BBEA; Sun, 8 Sep 2024 19:27: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 9D3E827BBE9 for ; Sun, 8 Sep 2024 19:27:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1snMcq-0006bS-SB; Sun, 08 Sep 2024 14:27:04 -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 1snMcm-0006Ze-Be for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:00 -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 1snMcm-00026k-3B for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27: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=wQWkSrl+4T3rLP0/nb3jgl9+SRIktV/Y6c4zYdLbRuc=; b=NSVEiRNjxY6E6I1u3bvMyW3FUO9qj81DYLw99t/hgJ5GDI0ELhGSPMNJ7jDKdFwmQKTTZTeZ2aww81SqplRZwHFYZXFJhAJnUb5AyFzNHCTh3Qa08RTtZhuGF1y6kTiwlZt26ERi2ReSxick7EhrvEUrVt7exqJ83iFeq2nKr757QmTRM8F+t2vh1HR8Y/u8wOMR1MlTVxOC+NEeUJFZ6PTpsW4aErJSiPPvhWxHAHd79AND/yCa0Qv8zkkHGylofZ9FnbEJUww4VGGvZsefR8s8tfTTwM4NbP7X5eTlxB9mQtjHkUZy8LAIeceXIORZBNU5GqZHWylLGHdAjv7Bpw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1snMco-0003q9-8y for guix-patches@gnu.org; Sun, 08 Sep 2024 14:27:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#73124] [PATCH v2 1/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 18:27:02 +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.172581998914683 (code B ref 73124); Sun, 08 Sep 2024 18:27:02 +0000 Received: (at 73124) by debbugs.gnu.org; 8 Sep 2024 18:26:29 +0000 Received: from localhost ([127.0.0.1]:60035 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcH-0003ol-D7 for submit@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:29 -0400 Received: from mail-40134.protonmail.ch ([185.70.40.134]:19053) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1snMcD-0003oI-Oy for 73124@debbugs.gnu.org; Sun, 08 Sep 2024 14:26:26 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com; s=protonmail3; t=1725819976; x=1726079176; bh=wQWkSrl+4T3rLP0/nb3jgl9+SRIktV/Y6c4zYdLbRuc=; 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=XjmcYZBdjw/OzsdoRUcJJxYzWPEHvsn6c1zXSLvOqgXZGWpbJENeGFSmZSJ+dp21e Wzblg7HPp9tdOD+SK6U1wlvGhFSlr7vBG1NiergTQpkOiJkrgnQSWyVksuLCvwEQan VrN1PJWmI/w7B+fR/Egnz1H0JwpCWN6qLNiahJN5StzL5QnOftvZofIvVwmq2cBRlg iMtdbt/OdidRitjRhhxN0ZIh4MplYBv/J/ApCvhbqrkMqWA+ZQw2C6AgWbu0pKZGtD fmwYHh0FCbON+vg/rzLDLsV3VabT7V0EUtdaaBJNP453fAZ+3YDWJlEiiz5sI2tlGk b2wlVFOfQLi7g== Date: Sun, 08 Sep 2024 18:26:15 +0000 Message-ID: In-Reply-To: References: Feedback-ID: 8107604:user:proton X-Pm-Message-ID: 2f05714028bf966a4a255cb3dfd6750772fe1b7e 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 * gnu/packages/wm.scm: remove wlroots patch wlroots-hwdata-fallback.patch, since it's no longer necessary as hwdata package has "share/pkgconfig/hwdata.pc" * gnu/packages/patches/wlroots-hwdata-fallback.patch: Remove unused patch * gnu/local.mk: Remove reference of removed gnu/packages/patches/wlroots-hwdata-fallback.patch Change-Id: I4be3e203b99f1d8e4d837164d55a8c06c8fc71ee --- 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 7d7ac3498f..30ae699550 100644 --- a/gnu/packages/wm.scm +++ b/gnu/packages/wm.scm @@ -1735,9 +1735,7 @@ (define-public wlroots (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")) - ;; This patch can be removed once hwdata in Guix supports pkg-config - (patches (search-patches "wlroots-hwdata-fallback.patch")))) + (base32 "0niigjpy8xxrnw3v9b3bsksw2q3yy3qsa2xx0aazwpycw5zrff83")))) (build-system meson-build-system) (arguments `(#:phases