From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id mLeYOiN60V5OfAAA0tVLHw (envelope-from ) for ; Fri, 29 May 2020 21:09:55 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sGpUNiN60V6JNwAAbx9fmQ (envelope-from ) for ; Fri, 29 May 2020 21:09:55 +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 65439940C73 for ; Fri, 29 May 2020 21:09:55 +0000 (UTC) Received: from localhost ([::1]:45528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jemGI-0005P3-Bd for larch@yhetil.org; Fri, 29 May 2020 17:09:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:50094) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jemG9-0005OS-Df for guix-devel@gnu.org; Fri, 29 May 2020 17:09:45 -0400 Received: from knopi.disroot.org ([178.21.23.139]:36456) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jemG6-0007Y5-Q1 for guix-devel@gnu.org; Fri, 29 May 2020 17:09:44 -0400 Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id C03B755F06; Fri, 29 May 2020 23:09:40 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zjEVf05DY5PD; Fri, 29 May 2020 23:09:38 +0200 (CEST) Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1590786577; bh=ojHl7VSODs2vZVGoQW+uemQi7byy+C/zGJ5nV0MyWS4=; h=Subject:From:To:Cc:References:Date:In-Reply-To; b=ZhpFgDF+wizaFJV6sJ/s4E0EPhqftUoDxlr8GMWIg4kBQo5gYIR+FHmp7P/z2uU/c vahFQBcbYnAe1imW2XReM0vhYCvJEkb5WlUyY/m/n54hbHAwumnDFOMz47IiUuQcA1 cfkT11vwcYqsBQ1PKv/j21Njr3WQRcPRh1K9KU84U7qcXLwJnko2/Z4IuluK1XUYJw Eypjt1VzgQous0JaACJedlTmGKeUcEPiaj0Pvj/ylv2EKTqAJPwtj+9a821d8QnofK FlY1HF2eV8CX7iDGx6c1w/Cw5t/+uSIBPIhiE/DexDYTcMsuGuDSJ0TE9o3WBwolut TT9WlBhux5GQA== From: Raghav Gururajan To: guix-devel@gnu.org References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> Autocrypt: addr=raghavgururajan@disroot.org; keydata= mQENBF6yxWcBCAClEApjrOYs8fSzDl8GBwMFtUzF6VCOVrWaGun1vvPDvk4AFzbB3ZV6+Jn8 VfEuqh3OOvSJGHL2cJoR28Q5gVqeOwupyaMWVdEt6TmDrHISyxriF426KVaJnklfMjYwIi0l /7j8bs3pDRyyR6uFrY6sYL9t6HFvevtt7NwgWL1MAEVy6txKkriyrK1h+qc13wRRgVx3tzl7 dNwYEDWd3yUDn+LESoDOlawJ7TQbO8d1K4FFHaqwyQ/SyaIfLBnMAz9Qd18MUWpDkktLh/9u jRfctouFx5BUr+uGgCHAWcII5D60lt867y5m6vp3Ua75TkVQrYTt7KSF/wm7NZ7L02fTABEB AAG0M1JhZ2hhdiBHdXJ1cmFqYW4gKFJHKSA8cmFnaGF2Z3VydXJhamFuQGRpc3Jvb3Qub3Jn PokBTgQTAQgAOBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJetePbAhsDBQsJCAcCBhUKCQgL AgQWAgMBAh4BAheAAAoJEK5u8wRtb3tXvWIH/3NiwaJfcrOoO/r4/reE0PmfgVWRpWP8uhdy ZiuBmcnyltxSmxZ1drlWpnbap5P7ssVyIlY6SrLTAeN7R0S70HAINkn7XvKpWajHShX0MR4b NeqjETNZg7gh2PTg6zfTnYD1UQqdNxnPMiJTSBZBLCAm/LhdEuigt559uoDA9ZEVLR5ycKh+ ny94NLUhmuRXpH/sb6Ey0FKmdMc47KNnkGQaySeGY88RwONgfv3/rriNbOJ1t12d2qsqkiOo znuxg5O3nT6obd7hCuq+EYwjzwSVrUZuMelO32UE4d2iePhiPBfiprVCNDGPFztJTe0Y+OQA ajj23CBgGIap/L1CpZ25AQ0EXrLFZwEIANGMTVaAiSGtpAbxRo9AHOc2kgatkAsH/ejtzNH0 mtGwtE0g5Gh0OKTI678KItanztmukKcZmBngPCwvUGGNQYzWWwsS+kBti5wJ3OForg+JtYuf /n9DjSAhnb7h1piL9Xi0drULl5ovVFRp/IPldkbT3R8pgc9VwAa0VVRP59dsgF6nPhoHjxfB p/XcA2QRnRfB2bN4BVCValJelPGYR0pSwkftFpmha4FRa0LrJtcMeh+PG20asPiKcE4sNGZT mH3keHkTfk5Tuds3ly5vlqmEKg7qY/zoS1yWQJj0j36JoX1/ravo+gUxszig80140a5bF2VU ERLcKO+Cp0lI4/8AEQEAAYkBNgQYAQgAIBYhBCdBLzSqkY3qQNKUKK5u8wRtb3tXBQJessVn AhsMAAoJEK5u8wRtb3tXqTIH/A9z70HLCZcAfnpluGj4APfi3haqdU7xvtrkN9eHJoPV7pwx y1luNRR8xg7YHkwcQ/9qEcvSicNIvhjRw5cSpyW9HGmOFyiZ7+KLf3XPUjC7pC5pIM+AAWyy D5GlyqakH1wBe8RC9/8vNyfZnmbV4PUvHoHvY/xZH+D/Afg1J2igdIebkQzzhFBC65TAKFeM NIWQkYIMKjq4u+nmv3sreqvRvlt8VYq0VSq24SFs0JJ+dEmuO3/s72122JIL0XEUS3ooGb/p 678RM2OpelLZcZSPG6vIIrQFKw6/NVjDtOY3DrNPtQ+h84UnFPUtaZyvQQwpGNjvtNzU/Ym+ NwsFm0Q= Message-ID: <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> Date: Fri, 29 May 2020 17:08:57 -0400 Mime-Version: 1.0 In-Reply-To: Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="7IK1IPes1RacrhLuycjylIIqcRW5cX9DY" Received-SPF: pass client-ip=178.21.23.139; envelope-from=raghavgururajan@disroot.org; helo=knopi.disroot.org X-detected-operating-system: by eggs.gnu.org: First seen = 2020/05/29 16:55:06 X-ACL-Warn: Detected OS = Linux 2.2.x-3.x [generic] X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=_AUTOLEARN X-Spam_action: no action X-BeenThere: guix-devel@gnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+larch=yhetil.org@gnu.org Sender: "Guix-devel" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=fail (rsa verify failed) header.d=disroot.org header.s=mail header.b=ZhpFgDF+; dmarc=fail reason="SPF not aligned (relaxed)" header.from=disroot.org (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-devel-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-devel-bounces@gnu.org X-Spam-Score: -1.51 X-TUID: 8bXJJnKtxdGl This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --7IK1IPes1RacrhLuycjylIIqcRW5cX9DY Content-Type: multipart/mixed; boundary="n0O6E4MrZrOEI5JtHXRtkEOWwWVYMtGo3"; protected-headers="v1" From: Raghav Gururajan To: guix-devel@gnu.org Cc: =?UTF-8?Q?G=c3=a1bor_Boskovits?= , Danny Milosavljevic , Tobias Geerinckx-Rice Message-ID: <7fc9e1ff-de86-56e0-386b-8e1eb9d54585@disroot.org> Subject: Re: [OUTREACHY]: Integration of desktop environments into GNU Guix References: <20200506051334.4558e7b3.raghavgururajan@disroot.org> <8c56bfdd-4080-9444-d3c2-7bd962c4c687@disroot.org> <49cc7f39-7bce-f5a1-55da-5f9bca203627@disroot.org> In-Reply-To: --n0O6E4MrZrOEI5JtHXRtkEOWwWVYMtGo3 Content-Type: multipart/mixed; boundary="------------5311D424004388015DA234CA" Content-Language: en-US This is a multi-part message in MIME format. --------------5311D424004388015DA234CA Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable @Danny > Please find the attached patches. Please ignore the cogl patch in previous email and use the one attached with this email. Regards, RG. --------------5311D424004388015DA234CA Content-Type: text/x-patch; charset=UTF-8; name="0004-gnu-cogl-Update-package-definition.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0004-gnu-cogl-Update-package-definition.patch" =46rom a3639116f5912fb957041c844050f1e4f3adeb45 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Fri, 29 May 2020 17:05:50 -0400 Subject: [PATCH 4/4] gnu: cogl: Update package definition. * gnu/packages/gnome.scm (cogl): Update package definition. [build-system]: Change from gnu to glib-or-gtk. [outputs]: New output 'doc'. [arguments]<#:configure-flags>[--enable-gtk-doc]: New flag. [--with-html-dir]: New flag. <#:phases>['patch-docbook-xml]: New phase. [native-inputs]: Add docbook-xml, gettext, gtk-doc and python-wrapper. [inputs]: Add libdrm and sdl2. Remove mesa, cairo, pango, gstreamer, gst-plugins-base and wayland. [propagated-inputs]: Add cairo, gstreamer, gst-plugins-base, mesa and wayland. [synopsis]: Modify. --- gnu/packages/gnome.scm | 124 +++++++++++++++++++++++++---------------- 1 file changed, 75 insertions(+), 49 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 54e1c940c6..a741a6a284 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -161,6 +161,7 @@ #:use-module (gnu packages rust) #:use-module (gnu packages samba) #:use-module (gnu packages scanner) + #:use-module (gnu packages sdl) #:use-module (gnu packages selinux) #:use-module (gnu packages slang) #:use-module (gnu packages speech) @@ -4711,70 +4712,95 @@ throughout GNOME for API documentation).") (source (origin (method url-fetch) - (uri (string-append "mirror://gnome/sources/cogl/" - (version-major+minor version) "/" - "cogl-" version ".tar.xz")) + (uri + (string-append "mirror://gnome/sources/cogl/" + (version-major+minor version) "/" + "cogl-" version ".tar.xz")) (sha256 (base32 "0x8v4n61q89qy27v824bqswpz6bmn801403w2q3pa1lcwk9ln4vd"))= )) ;; NOTE: mutter exports a bundled fork of cogl, so when making chang= es to ;; cogl, corresponding changes may be appropriate in mutter as well.= - (build-system gnu-build-system) + (build-system glib-or-gtk-build-system) + (outputs '("out" "doc")) + (arguments + `(#:disallowed-references (,xorg-server-for-tests) + #:configure-flags + (list + "--enable-cogl-gst" + "--enable-wayland-egl-platform" + "--enable-wayland-egl-server" + "--enable-gtk-doc" + (string-append "--with-html-dir=3D" + (assoc-ref %outputs "doc") + "/share/gtk-doc/html") + (string-append "--with-gl-libname=3D" + (assoc-ref %build-inputs "mesa") + "/lib/libGL.so")) + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (let* ((xmldoc (string-append (assoc-ref inputs "docbook-xm= l") + "/xml/dtd/docbook"))) + (with-directory-excursion "doc/reference" + (substitute* + '("cogl/cogl-docs.xml.in" + "cogl/blend-strings.xml" + "cogl-gst/cogl-gst-docs.xml.in" + "cogl-2.0-experimental/cogl-2.0-experimental-docs= =2Exml.in" + "cogl-2.0-experimental/blend-strings.xml") + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd")))) + #t))) + (add-before 'check 'start-xorg-server + (lambda* (#:key tests? inputs #:allow-other-keys) + (if tests? + (begin + ;; The test suite requires a running X server. + (system (format #f "~a/bin/Xvfb :1 +extension GLX &" + (assoc-ref inputs "xorg-server"))) + (setenv "DISPLAY" ":1") + #t) + (format #t "test suite not run~%")) + #t))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums + `(("docbook-xml" ,docbook-xml-4.1.2) + ("gettext" ,gettext-minimal) + ("glib:bin" ,glib "bin") ("gobject-introspection" ,gobject-introspection) - ("xorg-server" ,xorg-server-for-tests) - ("pkg-config" ,pkg-config))) + ("gtk-doc" ,gtk-doc) + ("pkg-config" ,pkg-config) + ("python-wrapper" ,python-wrapper) + ("xorg-server" ,xorg-server-for-tests))) + (inputs + `(("libdrm" ,libdrm))) (propagated-inputs - `(("glib" ,glib) - ("gdk-pixbuf" ,gdk-pixbuf) + `(("cairo" ,cairo) + ("glib" ,glib) + ("gdk-pixbuf+svg" ,gdk-pixbuf+svg) + ("gstreamer" ,gstreamer) + ("gst-plugins-base" ,gst-plugins-base) ("libx11" ,libx11) ("libxext" ,libxext) ("libxfixes" ,libxfixes) ("libxdamage" ,libxdamage) ("libxcomposite" ,libxcomposite) - ("libxrandr" ,libxrandr))) - (inputs - `(("mesa" ,mesa) - ("cairo" ,cairo) + ("libxrandr" ,libxrandr) + ("mesa" ,mesa) ("pango" ,pango) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) ("wayland" ,wayland))) - (arguments - `(#:disallowed-references (,xorg-server-for-tests) - #:configure-flags (list "--enable-cogl-gst" - "--enable-wayland-egl-platform" - "--enable-wayland-egl-server" - - ;; Arrange to pass an absolute file name = to - ;; dlopen for libGL.so. - (string-append "--with-gl-libname=3D" - (assoc-ref %build-inputs "= mesa") - "/lib/libGL.so")) - #:phases - (modify-phases %standard-phases - (add-before 'check 'start-xorg-server - (lambda* (#:key tests? inputs #:allow-other-keys) - (if tests? - (begin - ;; The test suite requires a running X serv= er. - (system (format #f "~a/bin/Xvfb :1 +extensi= on GLX &" - (assoc-ref inputs "xorg-ser= ver"))) - (setenv "DISPLAY" ":1") - #t) - (format #t "test suite not run~%")) - #t))))) + (synopsis "Hardware accelerated 3D graphics API") + (description "Cogl is a small library for using 3D graphics hardware= for +rendering. The API departs from the flat state machine style of OpenGL = and is +designed to make it easy to write orthogonal components that can render = without +stepping on each others toes.") (home-page "https://www.cogl3d.org") - (synopsis "Object oriented GL/GLES Abstraction/Utility Layer") - (description - "Cogl is a small library for using 3D graphics hardware to draw pre= tty -pictures. The API departs from the flat state machine style of OpenGL a= nd is -designed to make it easy to write orthogonal components that can render -without stepping on each others toes.") - (license (list license:expat ; most of the code - license:bsd-3 ; cogl/cogl-point-in-poly.c - license:sgifreeb2.0 ; cogl-path/tesselator/ - license:asl2.0)))) ; examples/android/ + (license + (list + license:expat ; most of the code + license:bsd-3 ; cogl/cogl-point-in-poly.c + license:sgifreeb2.0 ; cogl-path/tesselator/ + license:asl2.0)))) ; examples/android/ =20 (define-public clutter (package --=20 2.26.2 --------------5311D424004388015DA234CA-- --n0O6E4MrZrOEI5JtHXRtkEOWwWVYMtGo3-- --7IK1IPes1RacrhLuycjylIIqcRW5cX9DY Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- iQEzBAEBCAAdFiEEJ0EvNKqRjepA0pQorm7zBG1ve1cFAl7ReekACgkQrm7zBG1v e1eyyAf/alW+54LCA62LkeLOUKVIi9Wp93H0rv7iENi0KxXkZkddb+sQjVgw7S7v n9FELBMvYMoUoyVjlWh51lu0obJoDzpNTyiyBvwob3OH4cXHZM9NsfkxHHA+GsAS slfKTPkSk25VwKVDFPCU6dijW45vEGHRwwDnjP4XRcofFCrdrno9eieyXDn3z5Zt etGVd/SjJGU1Xsqu9FtdUW/gCOE0hDyt6PPtVLHDHohArwM5m+lD+g5lTgl8y+9s QskZfVimCwcux/Ix7r94j0vQD3dweqaH9o1cctWS7lu8x1IV+3sv0Twt3GfvAGZx 5PXPLWOqSNVqO/SoMTX8Hf3fA1tWVw== =HFW4 -----END PGP SIGNATURE----- --7IK1IPes1RacrhLuycjylIIqcRW5cX9DY--