From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id ENzwDpRglmElGwEAgWs5BA (envelope-from ) for ; Thu, 18 Nov 2021 15:17:56 +0100 Received: from aspmx1.migadu.com ([2001:41d0:2:bcc0::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sEqRCpRglmGjSgAAbx9fmQ (envelope-from ) for ; Thu, 18 Nov 2021 14:17:56 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id A40F5DBBD for ; Thu, 18 Nov 2021 15:17:55 +0100 (CET) Received: from localhost ([::1]:49786 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mniEc-0004rK-TL for larch@yhetil.org; Thu, 18 Nov 2021 09:17:54 -0500 Received: from eggs.gnu.org ([209.51.188.92]:41920) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mniDq-0003Mm-93 for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:07 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51984) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mniDq-0001wt-0T for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mniDp-0000dx-SQ for bug-guix@gnu.org; Thu, 18 Nov 2021 09:17:05 -0500 X-Loop: help-debbugs@gnu.org Subject: bug#51900: [PATCH 06/11] gnu: Move eglexternalplatform and egl-wayland to (gnu packages xorg). Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: bug-guix@gnu.org Resent-Date: Thu, 18 Nov 2021 14:17:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51900 X-GNU-PR-Package: guix X-GNU-PR-Keywords: To: 51900@debbugs.gnu.org Received: via spool by 51900-submit@debbugs.gnu.org id=B51900.16372450101665 (code B ref 51900); Thu, 18 Nov 2021 14:17:05 +0000 Received: (at 51900) by debbugs.gnu.org; 18 Nov 2021 14:16:50 +0000 Received: from localhost ([127.0.0.1]:35284 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniDZ-0000Px-DC for submit@debbugs.gnu.org; Thu, 18 Nov 2021 09:16:50 -0500 Received: from mail-qv1-f49.google.com ([209.85.219.49]:46915) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mniDS-0000Ge-Pr for 51900@debbugs.gnu.org; Thu, 18 Nov 2021 09:16:43 -0500 Received: by mail-qv1-f49.google.com with SMTP id jo22so4617472qvb.13 for <51900@debbugs.gnu.org>; Thu, 18 Nov 2021 06:16:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ih+dcZ/I69RcV7ktBLMaNGPM1H6vPyhftbOIFatifko=; b=Tg/zZQPTcaqO/fWGUN1b8zcTtJRFuPisju39PTNH1cstFiGvAZyBUwWMuaSVCeQOK9 +9iBVLDAc3JKaV86UFxsK9NRagAf+nZ0tPzdIL2cM6LEGSd/oRJG7GX0ZVDzrZEIzkFy I/tJsKXc7f73Y10+R6fVsQmg3Y6Xho3R5amw6UiVxH58sXAK0rfJ86uZ8S/d9KFSvKzo tXAHAN6H9cFxPhsihI996sN1P/60W+t0Irk532qrvAusTxTeVZUwldzanghwVhRR2iC8 DqY+SoTBLCeF28jHTL/egROJUjPcze4KDZCqvR0M0PzMdrnY+FPzfEqAcXNqk5i/NkOb 7Huw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=ih+dcZ/I69RcV7ktBLMaNGPM1H6vPyhftbOIFatifko=; b=JvNj7rseLSOK/R1KwRtvp0UJ74iOUYFQvpen8hrBpaoV977BRvLzW40Bs2xQjSCd0A 6jzhso7xZ/w+eIcOPa6e+HSrS/vJZ6WW5RRINjrl56ZAj5ZMryEVEh3jtC/zWWr8z1iM lcbecyBc50k/kayMNPESKuSK52CL480EFrm3Y4bcuqsRDcL2dyxBlIa6euCPmYrrcDLU 3w4OCvhkUKEn2FGfwS9vJDaepPrwPsSxa5Nc9JMKIzKSpsvVkFSHpfIdMEcO1zjVIJaT TPY2I34svfZzAtmLo3TvhttBKC3nBNCAuKLd+3lM78A3dMMPETk5+x9+yht6S1EqqoHI nQfQ== X-Gm-Message-State: AOAM530N+TlgHHdrMdaxLgnrvqe2+3adTBMdTbXe0wB1cNGfjb1pTRRV giYJVPLwokCopINCOoIdPbR5zKMEVISAEQ== X-Google-Smtp-Source: ABdhPJw39vHpQpnXc5Ald8BKVPpzGlNpvATxAYrrRiRVRRXrlFfdYuNc9+V72PJ+/xr/4Iko9kjvEQ== X-Received: by 2002:a05:6214:27e1:: with SMTP id jt1mr65834442qvb.34.1637244997206; Thu, 18 Nov 2021 06:16:37 -0800 (PST) Received: from localhost.localdomain (dsl-10-133-135.b2b2c.ca. [72.10.133.135]) by smtp.gmail.com with ESMTPSA id h22sm1655780qkk.14.2021.11.18.06.16.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Nov 2021 06:16:36 -0800 (PST) From: Maxim Cournoyer Date: Thu, 18 Nov 2021 09:16:11 -0500 Message-Id: <20211118141616.4252-6-maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211118141616.4252-1-maxim.cournoyer@gmail.com> References: <20211118141616.4252-1-maxim.cournoyer@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-guix@gnu.org List-Id: Bug reports for GNU Guix List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Maxim Cournoyer Errors-To: bug-guix-bounces+larch=yhetil.org@gnu.org Sender: "bug-Guix" X-Migadu-Flow: FLOW_IN X-Migadu-Country: US ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1637245075; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=ih+dcZ/I69RcV7ktBLMaNGPM1H6vPyhftbOIFatifko=; b=DLTnlHw5iZuoA9rufzKgERUHOtFZpaZcgaKNmbd1U5HFF7yVaZfbrg6MOHQYK+5SsR7xHc wARozloQ9rT0AKqjybTJgwUM231H+9vq0hmZWZFVS0Ryykldfzucx60ahDxXdPhjaXsEvJ dGBNINH939bm22i8QkhTxPMfQ1krOAypmY/93F+Aty7hvIRE1epgPbMsPbseNfBsSvpEnP YJeBKP6E0rS3VWA+UFBn/HY75Wpvsh61xRJXphF0rV9Ksun+gfWV8h6vumqCGOCyfEJBsi fv6XK0br0tCQXIfqYE0FFaN1CS0C2CBkJ0By/eXM0kl7Wk2+m6VUaG0l+X0rPg== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1637245075; a=rsa-sha256; cv=none; b=OMGuAbUP1SnnEuX1v6EBq+e7rGT+zTctwdateWhNXaSmYEcp4i3lyT2T6KjiOasxWxvCT4 Nptg6euBOS3rFDnOmPPdqEFBZ49ptmXkKqgqW8QbQiFB0zb6XUf3f91WeoeYrZ62uKMG0B 1uxeqY7plo182l1ajEgVwC2oVCl6zBxfblxU0yrnBsXPFiJ67elDGwwwV9Q/1qy10XxATq I44xQVgj07o9N82DPPKUPmLcY0ZCGRqK1U+Vo51+dF8yGiJXAB2y0wHcvlV9vUETnYmCG5 gmGTsxSKLKmJHCBztgv6dSxvYWWhWlTRuxonQUEVKt9hfOkoQyb4PxI69JNA7Q== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="Tg/zZQPT"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Spam-Score: -1.36 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20210112 header.b="Tg/zZQPT"; spf=pass (aspmx1.migadu.com: domain of "bug-guix-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="bug-guix-bounces+larch=yhetil.org@gnu.org" X-Migadu-Queue-Id: A40F5DBBD X-Spam-Score: -1.36 X-Migadu-Scanner: scn0.migadu.com X-TUID: R2cVZJnGKQ2q This is to avoid a module cycle between (gnu packages xorg) and (gnu packages graphics). * gnu/packages/graphics.scm (eglexternalplatform, egl-wayland): Move to... * gnu/packages/xorg.scm: ... this file. Remove trailing #t. --- gnu/packages/graphics.scm | 79 --------------------------------------- gnu/packages/xorg.scm | 78 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 78 insertions(+), 79 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 4b4385d3ff..4014af153a 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -119,85 +119,6 @@ (define-module (gnu packages graphics) #:use-module (guix packages) #:use-module (guix utils)) -(define-public eglexternalplatform - (package - (name "eglexternalplatform") - (version "1.1") - (source - (origin - (method git-fetch) - (uri - (git-reference - (url "https://github.com/NVIDIA/eglexternalplatform") - (commit version))) - (file-name - (git-file-name name version)) - (sha256 - (base32 "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb")))) - (build-system copy-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-pkgconfig - (lambda* (#:key outputs #:allow-other-keys) - (substitute* "eglexternalplatform.pc" - (("/usr") - (assoc-ref outputs "out"))) - #t)) - (add-after 'install 'revise - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (mkdir-p (string-append out "/include/EGL")) - (rename-file - (string-append out "/interface") - (string-append out "/include/EGL")) - (mkdir-p (string-append out "/share/pkgconfig")) - (rename-file - (string-append out "/eglexternalplatform.pc") - (string-append out "/share/pkgconfig/eglexternalplatform.pc")) - (for-each delete-file-recursively - (list - (string-append out "/samples") - (string-append out "/COPYING") - (string-append out "/README.md")))) - #t))))) - (synopsis "EGL External Platform interface") - (description "EGLExternalPlatform is an specification of the EGL External -Platform interface for writing EGL platforms and their interactions with modern -window systems on top of existing low-level EGL platform implementations. This -keeps window system implementation specifics out of EGL drivers by using -application-facing EGL functions.") - (home-page "https://github.com/NVIDIA/eglexternalplatform") - (license license:expat))) - -(define-public egl-wayland - (package - (name "egl-wayland") - (version "1.1.7") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/NVIDIA/egl-wayland") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0xcx1132zwyp4qps074m72ngjlfmysi1jc2d0lp1ml1r9bllkam6")))) - (build-system meson-build-system) - (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("mesa" ,mesa) - ("wayland" ,wayland))) - (propagated-inputs - `(("eglexternalplatform" ,eglexternalplatform))) - (synopsis "EGLStream-based Wayland external platform") - (description "EGL-Wayland is an implementation of a EGL External Platform -library to add client-side Wayland support to EGL on top of EGLDevice and -EGLStream families of extensions.") - (home-page "https://github.com/NVIDIA/egl-wayland") - (license license:expat))) - (define-public mmm (package (name "mmm") diff --git a/gnu/packages/xorg.scm b/gnu/packages/xorg.scm index 187ba56cb1..0ef0cb4f4a 100644 --- a/gnu/packages/xorg.scm +++ b/gnu/packages/xorg.scm @@ -53,6 +53,7 @@ (define-module (gnu packages xorg) #:use-module (guix packages) #:use-module (guix download) #:use-module (guix git-download) + #:use-module (guix build-system copy) #:use-module (guix build-system gnu) #:use-module (guix build-system meson) #:use-module (guix build-system perl) @@ -5522,6 +5523,83 @@ (define-public xorg-server-for-tests (package (inherit xorg-server)))) +(define-public eglexternalplatform + (package + (name "eglexternalplatform") + (version "1.1") + (source + (origin + (method git-fetch) + (uri + (git-reference + (url "https://github.com/NVIDIA/eglexternalplatform") + (commit version))) + (file-name + (git-file-name name version)) + (sha256 + (base32 "0lr5s2xa1zn220ghmbsiwgmx77l156wk54c7hybia0xpr9yr2nhb")))) + (build-system copy-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-pkgconfig + (lambda* (#:key outputs #:allow-other-keys) + (substitute* "eglexternalplatform.pc" + (("/usr") + (assoc-ref outputs "out"))))) + (add-after 'install 'revise + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (mkdir-p (string-append out "/include/EGL")) + (rename-file + (string-append out "/interface") + (string-append out "/include/EGL")) + (mkdir-p (string-append out "/share/pkgconfig")) + (rename-file + (string-append out "/eglexternalplatform.pc") + (string-append out "/share/pkgconfig/eglexternalplatform.pc")) + (for-each delete-file-recursively + (list + (string-append out "/samples") + (string-append out "/COPYING") + (string-append out "/README.md"))))))))) + (synopsis "EGL External Platform interface") + (description "EGLExternalPlatform is an specification of the EGL External +Platform interface for writing EGL platforms and their interactions with modern +window systems on top of existing low-level EGL platform implementations. This +keeps window system implementation specifics out of EGL drivers by using +application-facing EGL functions.") + (home-page "https://github.com/NVIDIA/eglexternalplatform") + (license license:expat))) + +(define-public egl-wayland + (package + (name "egl-wayland") + (version "1.1.7") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/NVIDIA/egl-wayland") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xcx1132zwyp4qps074m72ngjlfmysi1jc2d0lp1ml1r9bllkam6")))) + (build-system meson-build-system) + (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("mesa" ,mesa) + ("wayland" ,wayland))) + (propagated-inputs + `(("eglexternalplatform" ,eglexternalplatform))) + (synopsis "EGLStream-based Wayland external platform") + (description "EGL-Wayland is an implementation of a EGL External Platform +library to add client-side Wayland support to EGL on top of EGLDevice and +EGLStream families of extensions.") + (home-page "https://github.com/NVIDIA/egl-wayland") + (license license:expat))) + (define-public xorg-server-xwayland (package/inherit xorg-server (name "xorg-server-xwayland") -- 2.33.1