From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms9.migadu.com with LMTPS id aPVIMe5/82SA5QAA9RJhRA:P1 (envelope-from ) for ; Sat, 02 Sep 2023 20:33:18 +0200 Received: from aspmx1.migadu.com ([2001:41d0:306:2d92::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id aPVIMe5/82SA5QAA9RJhRA (envelope-from ) for ; Sat, 02 Sep 2023 20:33:18 +0200 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 B08A2474A0 for ; Sat, 2 Sep 2023 20:33:17 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Kjm1P57K; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1693679598; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: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=y1MhAsSiRqENhYXLONKg8DI/M1q/VtzJlMgxtqVKGoU=; b=eKfEBj03/3QUFIybRVjcdVIkCwdwIH04R52PS4+MSZWgVk0THOH2R9ce+ccqbCYUqo2Sj+ d6P0Aobox5kUi0XFhPD8A8J8Ma65rcmIyT7ZGOEZvGfdeGii08N0LSOxfR9jS4Ns1dMz1E TqeLDAmiZujZi2wS8PQGpD5FRGez/8XtDxflxUrrMxQcOSRcG1l13acObOZPlmHEufcvCv YoppmyjX9/a+uXB6soLwzIZxJS6uJ9yAweWxcuozhpyXgMmnNnlqytxkfOSW663ujJ9GKn jlQekbldfXDGo8HA35VEzrKGqbmbt3/PWtSB4AB4ZRN8Yo8a7CCP10CY6BKZfA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1693679598; a=rsa-sha256; cv=none; b=aDCnXyfcbHBY9qVSgtcW+jbPkaeRv4+mi71Xjo/d9+gCVQ13Hurc0v1SkGJH1O2Bg38p5A FGTeBb8gLvXXgPQJ/aq1BBzAgADC0iXMEeeOQWuDFQdAcYJlr1mTyKBOsDPL3IcEMupA0h 0ZtSRtMlX2MpRD6GPS7yJxRE6B/57++yaMDuRMW/09/VhGf/8Q6W9sL73ugCtrb8B7ePVp mk8UsjQGqxQFmVhJHETi7Sd3KtfGHY0PsXsRLCHXogQ8ttKyMYBOUyf1SfHbB7cHOxEJEL jax/KBIP8z9Kun7CortA+7G9l3SPY68UC9bAb5Zvd/hCWBTVd8jyepGvNtdEYg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20221208 header.b=Kjm1P57K; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qcVQV-0004ya-4B; Sat, 02 Sep 2023 14:32:55 -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 1qcVQT-0004xg-3L for guix-patches@gnu.org; Sat, 02 Sep 2023 14:32:53 -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 1qcVQS-0004Re-Pq for guix-patches@gnu.org; Sat, 02 Sep 2023 14:32:52 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qcVQc-0001VG-4V for guix-patches@gnu.org; Sat, 02 Sep 2023 14:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64313] [PATCH] gnu: freerdp: Enalbe server build Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 02 Sep 2023 18:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64313 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: Andy Tai Cc: 64313@debbugs.gnu.org Received: via spool by 64313-submit@debbugs.gnu.org id=B64313.16936795725750 (code B ref 64313); Sat, 02 Sep 2023 18:33:02 +0000 Received: (at 64313) by debbugs.gnu.org; 2 Sep 2023 18:32:52 +0000 Received: from localhost ([127.0.0.1]:38613 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcVQS-0001Uf-3U for submit@debbugs.gnu.org; Sat, 02 Sep 2023 14:32:52 -0400 Received: from mail-qk1-x72d.google.com ([2607:f8b0:4864:20::72d]:57411) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qcVQN-0001UP-KN for 64313@debbugs.gnu.org; Sat, 02 Sep 2023 14:32:51 -0400 Received: by mail-qk1-x72d.google.com with SMTP id af79cd13be357-76f066e4fffso6369085a.2 for <64313@debbugs.gnu.org>; Sat, 02 Sep 2023 11:32:37 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1693679552; x=1694284352; darn=debbugs.gnu.org; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=y1MhAsSiRqENhYXLONKg8DI/M1q/VtzJlMgxtqVKGoU=; b=Kjm1P57KZ28AORpn+U1rmunUEQCh9saSLawMRyxkWm0twPcs2roph3Z5XH/Ho4+4gi cknN3KDP99xneF9ISWqaMDrPSJXTgtel7tmI7gTVNmINMJmZrGeG+Uqibw1HQ9xnA2r3 eV/UKeI9ujaD0RP9HgGL+eBRydNDAcE9oEPLv/I/BJvElOXez3jsFTHYSkInHmkuykIQ jm31oMnpjTxO/Pj64KosSDEYpaLKq3GwvTRgomkbTpKJ7K0YhbBobISFYtcFkoo1gYKq yc/yfA0od7ISnXHXwwi87ZCc+Nm4lwOA2HrzU6KxyN0sSsqWvDOrF9PBTAYRLlG32yLR lL3w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1693679552; x=1694284352; h=mime-version:user-agent:message-id:in-reply-to:date:references :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=y1MhAsSiRqENhYXLONKg8DI/M1q/VtzJlMgxtqVKGoU=; b=Oa7+ELOOCDrQ0l//80CjwjOADUBtpxGkGVabK2pmc3Z2QnHScYA0CBr/rlig4Q30c1 HmOvjZ1hfII3NBap4KBpYU+chKMLW5K3Vi59l7LqdAI8ZdTaFrkAfJsGk8tcklUsGh/Z A9sqKiUdEstgD7kTtoE2QpTQ6s8/Vqtx6W5AwD4co/UyyE2L08qSxAj+X7yeO8PxakcD bbOIPpjZE6Tz8+RIplyra4KEBI2sBY4ofwNIpB946AMgte/w6X+RYc9bD7SO70cPUm51 0wVB+Xkjx6vfVQ3aFZ1cIhcJjoKIkO8VnrLay8kRPwxpQvcr3hIQbxrx5gKvdch5g0iH PI0g== X-Gm-Message-State: AOJu0YwoDJAj0TcCn9WQ9tZE2K+xDjIsKZtqAtaoxIT07wHuRAmwwVeI nNxXAh0Re8cQwco2UQxOZy+rf4h4CiI= X-Google-Smtp-Source: AGHT+IHWfAcNZH3NCTRmyK8+PsUEGSMp/Bl0UeasEAjJEDOMG6WoNkNN42e5fJSApXuUZwvRAvwhMg== X-Received: by 2002:a05:620a:22a:b0:76f:1dd4:1022 with SMTP id u10-20020a05620a022a00b0076f1dd41022mr5977733qkm.43.1693679551742; Sat, 02 Sep 2023 11:32:31 -0700 (PDT) Received: from hurd (dsl-154-228.b2b2c.ca. [66.158.154.228]) by smtp.gmail.com with ESMTPSA id f14-20020a05620a15ae00b0076f21383b6csm2228391qkk.112.2023.09.02.11.32.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 02 Sep 2023 11:32:31 -0700 (PDT) From: Maxim Cournoyer References: <12b30e1ceb8e0c6e82f799447057affe7643d97f.1687849395.git.atai@atai.org> Date: Sat, 02 Sep 2023 14:32:30 -0400 In-Reply-To: (Andy Tai's message of "Tue, 27 Jun 2023 00:34:24 -0700") Message-ID: <87bkekxw75.fsf_-_@gmail.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain 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: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx2.migadu.com X-Spam-Score: -5.12 X-Migadu-Queue-Id: B08A2474A0 X-Migadu-Spam-Score: -5.12 X-TUID: HBMykAkMx8ue Hi Andy, Andy Tai writes: > * gnu/packages/rdesktop.scm (freerdp): Enable server build > [phases] (configure-flags): Enable server build flags > [inputs]: add server build dependencies and additional protocols > cairo, dbus, gsm, lame, libxdamage, opencl, openh264, openssl Please use capitalization and periods in your changelog commit message. There's no need to be a hanging indent under the file name. > --- > gnu/packages/rdesktop.scm | 102 ++++++++++++++++++++++---------------- > 1 file changed, 58 insertions(+), 44 deletions(-) > > diff --git a/gnu/packages/rdesktop.scm b/gnu/packages/rdesktop.scm > index be4fe83cdc..0855e11a11 100644 > --- a/gnu/packages/rdesktop.scm > +++ b/gnu/packages/rdesktop.scm > @@ -31,16 +31,20 @@ (define-module (gnu packages rdesktop) > #:use-module (guix utils) > #:use-module (guix build-system cmake) > #:use-module (guix build-system gnu) > + #:use-module (gnu packages audio) > #:use-module (gnu packages compression) > #:use-module (gnu packages cups) > #:use-module (gnu packages docbook) > #:use-module (gnu packages freedesktop) > #:use-module (gnu packages glib) > + #:use-module (gnu packages gtk) > #:use-module (gnu packages gstreamer) > #:use-module (gnu packages image) > #:use-module (gnu packages libusb) > #:use-module (gnu packages linux) > + #:use-module (gnu packages mp3) > #:use-module (gnu packages nettle) > + #:use-module (gnu packages opencl) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages pulseaudio) > #:use-module (gnu packages tls) > @@ -83,56 +87,66 @@ (define-public freerdp > (package > (name "freerdp") > (version "2.10.0") > - (source > - (origin > - (method git-fetch) > - (uri (git-reference > - (url "https://github.com/FreeRDP/FreeRDP") > - (commit version))) > - (file-name (git-file-name name version)) > - (sha256 > - (base32 "0j5waq4h7l5f0vrh7wmrv6r27p537qwbg7ab8j0n0ia5p4nvgjp2")))) > + (source (origin > + (method git-fetch) > + (uri (git-reference > + (url "https://github.com/FreeRDP/FreeRDP") > + (commit version))) > + (file-name (git-file-name name version)) > + (sha256 > + (base32 > + "0j5waq4h7l5f0vrh7wmrv6r27p537qwbg7ab8j0n0ia5p4nvgjp2")))) > (build-system cmake-build-system) > - (native-inputs > - (list docbook-xml > - docbook-xsl > - glib > - libxml2 > - libxslt > - pkg-config > - xmlto)) > - (inputs > - (list alsa-lib > - cups > - ffmpeg-4 > - libjpeg-turbo > - libusb > - libx11 > - libxkbfile > - libxcursor > - libxext > - libxi > - libxv > - libxrandr > - libxrender > - libxinerama > - libxshmfence > - pulseaudio > - zlib)) > + (native-inputs (list docbook-xml > + docbook-xsl > + glib > + libxml2 > + libxslt > + pkg-config > + xmlto)) > + (inputs (list alsa-lib > + cairo > + cups > + dbus > + ffmpeg-4 > + gsm > + lame > + libjpeg-turbo > + libusb > + libx11 > + libxcursor > + libxdamage > + libxext > + libxkbfile > + libxi > + libxv > + libxrandr > + libxrender > + libxinerama > + libxshmfence > + pulseaudio > + opencl-headers > + openh264 > + opensles > + openssl > + zlib)) > (propagated-inputs (list libxkbcommon openssl wayland)) > (arguments > (list #:build-type "RELEASE" > - #:configure-flags > - #~(list "-DWITH_JPEG=ON" > - #$@(if (target-x86-64?) > - #~("-DWITH_SSE2=ON") > - #~()) > - "-DWITH_PULSE=ON" > - "-DWITH_CUPS=ON" > - "-DBUILD_TESTING=ON"))) > + #:configure-flags #~(list "-DWITH_JPEG=ON" > + #$@(if (target-x86-64?) > + #~("-DWITH_SSE2=ON") > + #~()) > + "-DWITH_PULSE=ON" > + "-DWITH_CUPS=ON" > + "-DBUILD_TESTING=ON" > + "-DWITH_SERVER=ON" ;build servers > + "-DWITH_SHADOW=ON" ;build shadow server > + "-DWITH_PROXY=ON"))) ;build proxy server > (home-page "https://www.freerdp.com") > (synopsis "Remote Desktop Protocol implementation") > - (description "FreeRDP implements Microsoft's Remote Desktop Protocol. > + (description > + "FreeRDP implements Microsoft's Remote Desktop Protocol. > It consists of the @code{xfreerdp} client, libraries for client and server > functionality, and Windows Portable Runtime (WinPR), a portable implementation > of parts of the Windows API.") 'guix style' didn't improve things here in my opinion, but if it was necessary it should have been done in a separate commit to keep your functional commit changes clear and easy to review. Same goes for the sorting of inputs, ideally. Out of curiosity, how does the package closure size increases between the old and new version (guix size freerdp vs ./pre-inst-env guix size freerdp) ? Could you send a v3 with the 'guix style' changes dropped (preferred) and the sorting done in a prior commit? -- Thanks, Maxim