From patchwork Tue Jun 27 07:34:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Tai X-Patchwork-Id: 51386 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 E11CA27BBE9; Tue, 27 Jun 2023 08:35:20 +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=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=unavailable 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 6391127BBE2 for ; Tue, 27 Jun 2023 08:35:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qE3EC-0004US-60; Tue, 27 Jun 2023 03:35:08 -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 1qE3E6-0004UD-IW for guix-patches@gnu.org; Tue, 27 Jun 2023 03:35:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qE3E6-0001BJ-93 for guix-patches@gnu.org; Tue, 27 Jun 2023 03:35:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qE3E6-00082i-4E for guix-patches@gnu.org; Tue, 27 Jun 2023 03:35:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#64313] [PATCH v2] gnu: freerdp: Enable server build References: <12b30e1ceb8e0c6e82f799447057affe7643d97f.1687849395.git.atai@atai.org> In-Reply-To: <12b30e1ceb8e0c6e82f799447057affe7643d97f.1687849395.git.atai@atai.org> Resent-From: Andy Tai Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 27 Jun 2023 07:35: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: 64313@debbugs.gnu.org Cc: Andy Tai Received: via spool by 64313-submit@debbugs.gnu.org id=B64313.168785127630882 (code B ref 64313); Tue, 27 Jun 2023 07:35:02 +0000 Received: (at 64313) by debbugs.gnu.org; 27 Jun 2023 07:34:36 +0000 Received: from localhost ([127.0.0.1]:47520 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qE3Dg-000821-4G for submit@debbugs.gnu.org; Tue, 27 Jun 2023 03:34:36 -0400 Received: from mail-oo1-f46.google.com ([209.85.161.46]:46300) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qE3Dd-00081l-Mc for 64313@debbugs.gnu.org; Tue, 27 Jun 2023 03:34:34 -0400 Received: by mail-oo1-f46.google.com with SMTP id 006d021491bc7-564e4656fecso379532eaf.0 for <64313@debbugs.gnu.org>; Tue, 27 Jun 2023 00:34:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687851268; x=1690443268; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:from:to:cc:subject:date:message-id:reply-to; bh=CRapuw5WR++iEgpTNNh2Hz+fIqLAs3iLDBzp0eWwPhc=; b=COQIaIj8fy7lYPMm5dTYcHJnn+0H+6GxWkPWTA6lMuJ/oup5kH5lTLl8hgH/TNpZiX R+MBd/i0zoYdVgkCEnD5SXW1TySNZYJ01b5HVOvWCRF0iyWU4fXbkLpNZV+g5JRvObPf c9e1WmmMwGNAM67FtXJoPlc3PmDH0OmIUnMls2yhOr55UxJ7uMkNatCh6aJ7krGSuk3e D7uYY6UY1czWAikbLV1sSC5KIpuTZ6VIaEp5TPXj+JC7Vs2Udk+kXsoJSGhJJerphHq0 KATZz7a1g1soxAvNh22k/Q6K4IpP9o2vO8NO2Jh7jeHRMC4NsEvCHf69srbFv937Yy9v Hdhw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687851268; x=1690443268; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=CRapuw5WR++iEgpTNNh2Hz+fIqLAs3iLDBzp0eWwPhc=; b=ZeUYI10tjVr2mcmj7OpHlrWkHXcrAJe0LCC8dr+9d8wGSe8M1Y6qH974ygoO+TPETz FHNbSmvHXwdpoHlPeERQbB/uqOQALAjLjly7aNmbSrdYWTgIrtqoxDNWhpa6Qg/A+lbN v1H0grU11febODBpZGCCL57BUNuwzxePxHp2HppJIXjvQ32nO9lWZZ+gZjc/UrGpdIQA tiwHkB5ddpN4eYcaLBpRhaPkwS998wtsjvywKHPqCoI2H2+5l1K7Dd4QRbV+WoHNE+QY lDop8KjzdJWe+8kCHqTeuOPhRYvhBcKFlFfudqdrBNVFb62CujPPI3KAhFRvnouYw1c9 xJoQ== X-Gm-Message-State: AC+VfDy+hraxcnB16RT6ZnkOS5GZKox5lu7LQvSUuge4IYYChZ2joVDU AiCwkhi7b1nshHsrWxRVkTS+nfDgT/I= X-Google-Smtp-Source: ACHHUZ6367S+ff/UuUJMQTX/7c0A5RAiX5RRo9Iqz5rcsYgAPgZ/vry0dhdSsEdf9vaQKHUaZTJ5YQ== X-Received: by 2002:a05:6358:e92f:b0:133:7f9:303f with SMTP id gk47-20020a056358e92f00b0013307f9303fmr4655981rwb.23.1687851267504; Tue, 27 Jun 2023 00:34:27 -0700 (PDT) Received: from localhost.localdomain ([98.37.226.98]) by smtp.googlemail.com with ESMTPSA id j11-20020a63ec0b000000b00502f4c62fd3sm5229633pgh.33.2023.06.27.00.34.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 27 Jun 2023 00:34:27 -0700 (PDT) From: Andy Tai Date: Tue, 27 Jun 2023 00:34:24 -0700 Message-Id: X-Mailer: git-send-email 2.40.1 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: , 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/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 --- gnu/packages/rdesktop.scm | 102 ++++++++++++++++++++++---------------- 1 file changed, 58 insertions(+), 44 deletions(-) base-commit: ac86174e22fcd762893bd4515786b1376af9397b 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.")