From patchwork Fri May 24 04:31:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 64861 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 74F1627BBEA; Fri, 24 May 2024 05:33: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=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 A422A27BBE2 for ; Fri, 24 May 2024 05:33:19 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAMc1-0003wn-T8; Fri, 24 May 2024 00:33:01 -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 1sAMbv-0003tl-Km for guix-patches@gnu.org; Fri, 24 May 2024 00:32:56 -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 1sAMbv-0004pL-CQ for guix-patches@gnu.org; Fri, 24 May 2024 00:32:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAMc1-0003E1-OT for guix-patches@gnu.org; Fri, 24 May 2024 00:33:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71161] [PATCH 1/5] gnu: Add plog. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 04:33:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71161@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 71161-submit@debbugs.gnu.org id=B71161.171652512512338 (code B ref 71161); Fri, 24 May 2024 04:33:01 +0000 Received: (at 71161) by debbugs.gnu.org; 24 May 2024 04:32:05 +0000 Received: from localhost ([127.0.0.1]:34715 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMb7-0003Cw-9h for submit@debbugs.gnu.org; Fri, 24 May 2024 00:32:05 -0400 Received: from mail.envs.net ([5.199.136.28]:54200) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMb4-0003Cq-I6 for 71161@debbugs.gnu.org; Fri, 24 May 2024 00:32:03 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 386AB38A369D; Fri, 24 May 2024 04:31:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1716525115; bh=bsakdb6QiZhYQXmz7kVjVmVki1pfs2QBE8yPXS/1r/I=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VFJB78eNJKNFELck4MFW/Hxj2JHXbg8rNUXSgDQiwb0ewitjxSpeFh5j81A1W5jau z8DZ++GTOtsJ9/h0BuztRvCYdJWJREeW40sYrUTTb0eWm9bPRzu89At/sYhy/abJvs xiik1ZCkjAwe2kVe+YZlkaHbTsWy85jARoVnsaGAzkS8z3EO+Mv4un2rrW3JjeVEIc eXDKR6c5j7QkKXlkHosaCmtgpAVGMyXHFF5hE/ljtWDXA1G3N4QudkvCG0BSehQVjD 0gafJ1zfi5NsfOnLuAitNkjCvKfh2lSgFagjGdb+7CdxeruHzPX/DZsXLJklfnej3i 0r7v08DSLixnOtFzfqTjdH7PN7VSv5CGF7CdS77YjsXH250KPG7mj1EFKMpsj4aD+b I7N9WksuXMmZc8LWU4l4LaLyDVK7IrJCkQxzJKx2yXCPBZ8arlDlkzXM8O3nTn1BAV 7YZ0DFladgyybqiY5KfZoiSlI1dtr7nORmOvr3GbmlbOL6E4doE3a3YSZL/T9bifHd TGjj8hIDGUSjGOFm56sJ7UWJIlAAsawzIpeCSBm86gdXmGlaJPdpe6rnwff3loj6T4 3T+I/5c+DN2VaP0WkfyQAEurgRGO9AVA6J9lnIvs+aDTCzlJZhha3eIlybRfl2Xn1h ZoAlM1gX7xoY5P+LYpjf/5S8= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id OlDTt6wy9u88; Fri, 24 May 2024 04:31:50 +0000 (UTC) Received: from localhost (unknown [36.170.58.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 24 May 2024 04:31:49 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id e550f404; Fri, 24 May 2024 04:31:53 +0000 (UTC) Date: Fri, 24 May 2024 12:31:42 +0800 Message-ID: <07e5093bc880250e4662e66f58c57c80c3490520.1716524546.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/logging.scm (plog): New variable. Change-Id: Ibb90ffc6342d099d3ca5e8e1694b0128d78f5d4c --- gnu/packages/logging.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/logging.scm b/gnu/packages/logging.scm index a757c22154..9cc28279d7 100644 --- a/gnu/packages/logging.scm +++ b/gnu/packages/logging.scm @@ -119,6 +119,31 @@ (define-public glog command line.") (license license:bsd-3))) +(define-public plog + (package + (name "plog") + (version "1.1.10") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/SergiusTheBest/plog") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1kxqz3vn98y1qij60sxn0ldv5q2xh2zbp7v8cd9m21sf1yp636im")))) + (build-system cmake-build-system) + (arguments + (list #:configure-flags + #~'("-DPLOG_BUILD_TESTS=ON"))) + (home-page "https://github.com/SergiusTheBest/plog") + (synopsis "C++ logging library") + (description + "Plog is a C++ logging library that is designed to be simple, small and +flexible. It is created as an alternative to existing large libraries and +provides some unique features such as CSV log format and wide string support.") + (license license:expat))) + ;; This is the legacy version of the tailon package. The new version, written ;; in Go in available here: https://github.com/gvalkov/tailon. (define-public tailon From patchwork Fri May 24 04:31:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 64860 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 0C35927BBEA; Fri, 24 May 2024 05:33:12 +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=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 7AE8327BBE2 for ; Fri, 24 May 2024 05:33:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAMc0-0003w7-TI; Fri, 24 May 2024 00:33:00 -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 1sAMbv-0003tp-RO for guix-patches@gnu.org; Fri, 24 May 2024 00:32:56 -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 1sAMbv-0004pQ-IS for guix-patches@gnu.org; Fri, 24 May 2024 00:32:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAMc2-0003E8-7x for guix-patches@gnu.org; Fri, 24 May 2024 00:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71161] [PATCH 2/5] gnu: Add libjuice. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 04:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71161@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 71161-submit@debbugs.gnu.org id=B71161.171652512912359 (code B ref 71161); Fri, 24 May 2024 04:33:02 +0000 Received: (at 71161) by debbugs.gnu.org; 24 May 2024 04:32:09 +0000 Received: from localhost ([127.0.0.1]:34721 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbA-0003DG-RJ for submit@debbugs.gnu.org; Fri, 24 May 2024 00:32:09 -0400 Received: from mail.envs.net ([5.199.136.28]:43558) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMb8-0003D2-1J for 71161@debbugs.gnu.org; Fri, 24 May 2024 00:32:06 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id AC1ED38A369E; Fri, 24 May 2024 04:31:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1716525118; bh=dmzuQsYPJFB2+WUUnZ/IENfP1q4z0HVbwdHSr515LFY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=AZ/3jJZiLqHCNbjYUHqFBOFPCxmHt5UXgdNGCEXq6/SAe55Sx+5ib26AxR+I+2thI lYkx7+SmQBYloAkDQhtv5Y5b9t/GHlxEsVeRZ8PTxepJR5RulULhbfgMWaldomj9hN syQTFtsvxCLm6yPCPI36pWqFnRqbuz3LuSDuIDjXZQ4mSW71AXVs7ck3pYOcZOl5Wq VzGOsM6t0WB68nD1HV/Z6eXtARxY+Z4QfGawwllBbQNOieqYWEqWkm1pIew+a5kZuh qZ+ztBCN46y1oIs2w/10VOER8cVt6Hi9i0HUK60OfZr2cGER/a56PQYL+yQbzmGqeZ z+fp4dQUJGCEG7vsakGmwvhVVd1rxISwC19jeER17Jc/yMZt2080pc/TdW+HWlM8CK sWaIemuE6oS8KVxugwZ8QgXvAmfz4bWab8WKvJoBQ4Kp9+LJhDQAjZLNjfbdDFe3py us2ct8n3anK8+olomv2CbSk5jxmcHAUYHbJY8N/bSvFpZPaLO9/TuTZ17Sbrru8yxw NRjvFwVXgoD8wusNC5bJTklx42j5Go+lmm9yO7paZbgG6A6kK3nWslsZHwOmB0skug tBb0MRoGf+4GCk+1HMw5EfTYaTVODHybof4xd2OJsGQZdcq2GMU/jZe9yTmKaybvZq ujrPj/ypjGisWISy/KrsC3zU= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id N_fPxN5noBYB; Fri, 24 May 2024 04:31:55 +0000 (UTC) Received: from localhost (unknown [36.170.58.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 24 May 2024 04:31:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2be27713; Fri, 24 May 2024 04:31:53 +0000 (UTC) Date: Fri, 24 May 2024 12:31:43 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/web.scm (libjuice): New variable. Change-Id: I5ad910e687cc20d356800e5c4ac02d5158f122f3 --- gnu/packages/web.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index cbf270ec6b..b9d1f42f00 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -2141,6 +2141,29 @@ (define-public wwwoffle changes, and much more.") (license license:gpl2+))) +(define-public libjuice + (package + (name "libjuice") + (version "1.4.2") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/paullouisageneau/libjuice") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "035kqyp5bcawzkpqpjb1qjwqf0dp2gm9h2j9py5iiahcvfjwh70i")))) + (build-system cmake-build-system) + (arguments (list #:tests? #f)) ; requires internet access + (home-page "https://github.com/paullouisageneau/libjuice") + (synopsis "UDP Interactive Connectivity Establishment library") + (description "@code{libjuice} allows to open bidirectionnal User Datagram +Protocol (UDP) streams with Network Address Translator (NAT) traversal. It's a +simplified implementation of the Interactive Connectivity Establishment (ICE) +protocol, client-side and server-side, written in C without dependencies for +POSIX platforms.") + (license license:mpl2.0))) (define-public liboauth (package (name "liboauth") From patchwork Fri May 24 04:31:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 64862 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 1609627BBE9; Fri, 24 May 2024 05:33:27 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 72EBA27BBE2 for ; Fri, 24 May 2024 05:33:25 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAMc2-0003x7-K0; Fri, 24 May 2024 00:33:02 -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 1sAMbw-0003ts-7O for guix-patches@gnu.org; Fri, 24 May 2024 00:32:58 -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 1sAMbv-0004pY-Vc for guix-patches@gnu.org; Fri, 24 May 2024 00:32:55 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAMc2-0003EF-Ly for guix-patches@gnu.org; Fri, 24 May 2024 00:33:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71161] [PATCH 3/5] gnu: Add libdatachannel. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 04:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71161@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 71161-submit@debbugs.gnu.org id=B71161.171652513012365 (code B ref 71161); Fri, 24 May 2024 04:33:02 +0000 Received: (at 71161) by debbugs.gnu.org; 24 May 2024 04:32:10 +0000 Received: from localhost ([127.0.0.1]:34723 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbB-0003DI-Dj for submit@debbugs.gnu.org; Fri, 24 May 2024 00:32:09 -0400 Received: from mail.envs.net ([5.199.136.28]:43566) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMb9-0003DA-Lq for 71161@debbugs.gnu.org; Fri, 24 May 2024 00:32:08 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 539D338A369D; Fri, 24 May 2024 04:32:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1716525120; bh=PiK4FKLcga1D/hL4MKLPTdb7TCu6+CdKRxXP55et5dg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H0nXdiyAVU3upGUY6A/yDgGb+SD/CScgYrUaeBQX+Ahc/+jGdRs9bsqaGckKAJsKn 1S0qYuyQriwQ6i1CYrvQwnx8t11JFw/u7NRcUc6l4y2D2u35lzeS30rAcCjqzT4bU/ c4sfYBByHkv1gERVgqYLbBVvvqwfHXXPF+GW7s8B7EzLDVp78FVrVtBevjzvYFncXH Ce7LKePpy1NOOxmpWwleZwgB7dE0wvDsRPlDnslHY1a8IF7QlaRfXpBMF7TYbbZvCI BJRzfJr7L8ej3x1+lxpMGx2RzodYUAnNVhFXn+N1RBUgTOjYIiKOxCZ8AWehFUPBib RSF5jQo7+94DPAKIe2jZlFDdQBoYiTUsvoG5ZGboHiUq4sOXYBE4e+RG2EhvwmG2Rq RTQLIPBwfrO98RS4ARuYAHHWFgsrxGjR7j2TEOGi3vMp85hHWukylwANzIrM/WS3Fe Y5LIQKc16XoeYJVAXrEHbP7ahKvsqVEbDjzMZReIQvDUW8l6Y2KvgD1X8w/vD4RL5+ c9zXxxHEoC/bt6WwSffFNUOnrFlMy3vNcBBJ9TmJvd3hEac2dNooAc3oWdJ28EeONV /oK4UTLTKSXZ4NOdI5wMYEaqKojhWpPNkv+nLgVcAsIObkmnE93pXVi+ztgttogS1I 1CsGVFUCsY1fcnr5WCN8PgMA= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id pRRgcpzOyV6A; Fri, 24 May 2024 04:31:56 +0000 (UTC) Received: from localhost (unknown [36.170.58.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 24 May 2024 04:31:55 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id 2c4d66da; Fri, 24 May 2024 04:31:53 +0000 (UTC) Date: Fri, 24 May 2024 12:31:44 +0800 Message-ID: <56c0896017d9ae5c570dcb30217126296073fd23.1716524546.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/web.scm (libdatachannel): New variable. Change-Id: Idc8996eec5160574649575a5519c6510baf194a5 --- gnu/packages/web.scm | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm index b9d1f42f00..39c35d6970 100644 --- a/gnu/packages/web.scm +++ b/gnu/packages/web.scm @@ -169,6 +169,7 @@ (define-module (gnu packages web) #:use-module (gnu packages libunwind) #:use-module (gnu packages linux) #:use-module (gnu packages lisp-xyz) + #:use-module (gnu packages logging) #:use-module (gnu packages lsof) #:use-module (gnu packages lua) #:use-module (gnu packages mail) @@ -200,6 +201,7 @@ (define-module (gnu packages web) #:use-module (gnu packages serialization) #:use-module (gnu packages skribilo) #:use-module (gnu packages sphinx) + #:use-module (gnu packages telephony) #:use-module (gnu packages texinfo) #:use-module (gnu packages textutils) #:use-module (gnu packages time) @@ -2164,6 +2166,34 @@ (define-public libjuice protocol, client-side and server-side, written in C without dependencies for POSIX platforms.") (license license:mpl2.0))) + +(define-public libdatachannel + (package + (name "libdatachannel") + (version "0.21.1") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/paullouisageneau/libdatachannel") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "11icbyd71dw5ywjdviq580xvad24yfsjj3c5zpjqsxc883i40dxi")))) + (build-system cmake-build-system) + (arguments + (list #:tests? #f ; requires internet access + #:configure-flags + #~'("-DPREFER_SYSTEM_LIB=ON"))) + (inputs (list libjuice libsrtp nlohmann-json openssl plog usrsctp)) + (home-page "https://libdatachannel.org/") + (synopsis "WebRTC Data Channels and WebSockets library") + (description "@code{libdatachannel} is a standalone implementation of WebRTC +Data Channels, WebRTC Media Transport, and WebSockets in C++17 with C bindings +for POSIX platforms. WebRTC is a W3C and IETF standard enabling real-time +peer-to-peer data and media exchange between two devices.") + (license license:mpl2.0))) + (define-public liboauth (package (name "liboauth") From patchwork Fri May 24 04:31:45 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 64863 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 C80A127BBEA; Fri, 24 May 2024 05:33:33 +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=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 1011127BBE2 for ; Fri, 24 May 2024 05:33:30 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAMc5-0003yN-CG; Fri, 24 May 2024 00:33:05 -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 1sAMbw-0003uI-TR for guix-patches@gnu.org; Fri, 24 May 2024 00:32:58 -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 1sAMbw-0004ph-GN for guix-patches@gnu.org; Fri, 24 May 2024 00:32:56 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAMc3-0003EM-5z for guix-patches@gnu.org; Fri, 24 May 2024 00:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71161] [PATCH 4/5] gnu: qrcodegen-cpp: Update to 1.8.0. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 04:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71161@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 71161-submit@debbugs.gnu.org id=B71161.171652513812384 (code B ref 71161); Fri, 24 May 2024 04:33:03 +0000 Received: (at 71161) by debbugs.gnu.org; 24 May 2024 04:32:18 +0000 Received: from localhost ([127.0.0.1]:34729 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbI-0003Dg-0y for submit@debbugs.gnu.org; Fri, 24 May 2024 00:32:17 -0400 Received: from mail.envs.net ([5.199.136.28]:43572) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbE-0003DU-G6 for 71161@debbugs.gnu.org; Fri, 24 May 2024 00:32:14 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 2922038A369D; Fri, 24 May 2024 04:32:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1716525125; bh=128xV4LyoAdKh8I+JmXiEt5gHiwWzcw2UMyDpjj8R5Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=n5VQwqQ5HcOx+5UgkOaedPAnfXEyUcbkHHbL6eLfEglPWrvYf5btuUQWKCD1ayGnC GjCVS9ZGGXAQgvrHm/mqWZP63zsv3DIQh33fNMx66/ax6qn40g4FQg9l/3knvKnKsr xMagSFG1KXKDFJZiU1dlEk2Yhqn1CkI9i3YQm0AJIvhO0N9kA95CJn8CJ9bbLQnC5c FOXV/qAeikfbmhbcmyAsx/dhzaboakl4Foib01m1Jlsr70szQtEIiTO+lyHomDxX/E bJFPMIVqWt1iv1dDzlwzNYGtTlD6qt6WOl4RRGZHuBTnV1S1uuLc1VjN86WOfEWNdy eyWiNSAUFHmedsgkb4ftQ3wtCvmwjFuxBCYo+filD0FSCRzJr9GxlM9iG41bH6o4un dGi4c8dfiQ1yyzVzD9ZCk4S7JiEv9hLCJZ6w5YkbzMs1wPL3lvQSnHrLKZpQcxLLM1 s3vigE9gHhjmpAkNX4XN5OsugJVBzwSMn83rP9YqRSB3710DZIbrm+zwCgN5ubOFy9 VSXXhXVu7jjHLJjNzopnfjCeHwo4MhV/2puWUNrPr/ftq0HmG7xGvY31+a+p0uW/n1 Ng00J6GTHHfCmly/xoJqlNYqZDZD1afDanNNtwwIXZYAMejqQL8rxAwJW80WJGNvMJ rrlmQN/rNJ66DE+iIGKEWGA0= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id 7acLtTU_kffN; Fri, 24 May 2024 04:32:00 +0000 (UTC) Received: from localhost (unknown [36.170.58.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 24 May 2024 04:31:59 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id e4d3087b; Fri, 24 May 2024 04:31:53 +0000 (UTC) Date: Fri, 24 May 2024 12:31:45 +0800 Message-ID: <3b02d61e346c00d171fb17f85fddb99c411f2227.1716524546.git.iyzsong@member.fsf.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/aidc.scm (qrcodegen-cpp): Update to 1.8.0. [source]: Use qrcodegen-cpp-cmake.patch. [build-system]: Switch to cmake-build-system. [arguments]: Enable tests and build shared libraries. * gnu/packages/patches/qrcodegen-cpp-make-install.patch: Remove file. * gnu/packages/patches/qrcodegen-cpp-cmake.patch: New file. * gnu/local.mk (dist_patch_DATA): Register patch. Change-Id: I0272a28ab2cda89700b5523e96f3014eff7ebf65 --- gnu/local.mk | 2 +- gnu/packages/aidc.scm | 22 +- .../patches/qrcodegen-cpp-cmake.patch | 506 ++++++++++++++++++ .../patches/qrcodegen-cpp-make-install.patch | 448 ---------------- 4 files changed, 514 insertions(+), 464 deletions(-) create mode 100644 gnu/packages/patches/qrcodegen-cpp-cmake.patch delete mode 100644 gnu/packages/patches/qrcodegen-cpp-make-install.patch diff --git a/gnu/local.mk b/gnu/local.mk index d76c0d1e39..508a79cbad 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1974,7 +1974,7 @@ dist_patch_DATA = \ %D%/packages/patches/qemu-glibc-2.27.patch \ %D%/packages/patches/qemu-glibc-2.30.patch \ %D%/packages/patches/qemu-fix-agent-paths.patch \ - %D%/packages/patches/qrcodegen-cpp-make-install.patch \ + %D%/packages/patches/qrcodegen-cpp-cmake.patch \ %D%/packages/patches/qtbase-absolute-runpath.patch \ %D%/packages/patches/qtbase-find-tools-in-PATH.patch \ %D%/packages/patches/qtbase-qmake-fix-includedir.patch \ diff --git a/gnu/packages/aidc.scm b/gnu/packages/aidc.scm index b0fc1b30d9..bc9c47a480 100644 --- a/gnu/packages/aidc.scm +++ b/gnu/packages/aidc.scm @@ -228,30 +228,22 @@ (define-public zbar (define-public qrcodegen-cpp (package (name "qrcodegen-cpp") - (version "1.6.0") + (version "1.8.0") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/nayuki/QR-Code-generator") (commit (string-append "v" version)))) (file-name (git-file-name name version)) - (patches (search-patches "qrcodegen-cpp-make-install.patch")) + (patches (search-patches "qrcodegen-cpp-cmake.patch")) (sha256 (base32 - "0iq9sv9na0vg996aqrxrjn9rrbiyy7sc9vslw945p3ky22pw3lql")))) - (build-system gnu-build-system) + "0dk9ci5gchxa8gh0hyhlj3d5jwxqlnfm85xyp791ldaia14bkj39")))) + (build-system cmake-build-system) (arguments - `(#:tests? #f ; no test suite - #:make-flags - (list (string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; No ./configure script - ;; Only build the C++ variant. - (add-after 'unpack 'chdir - (lambda _ - (chdir "cpp") - #t))))) + (list #:configure-flags + #~'("-DBUILD_TESTS=ON" + "-DBUILD_SHARED_LIBS=ON"))) (synopsis "QR Code generator library") (description "qrcodegen-cpp is a QR code generator library in C++. The project also offers Java, Javascript, Python, C, and Rust implementations.") diff --git a/gnu/packages/patches/qrcodegen-cpp-cmake.patch b/gnu/packages/patches/qrcodegen-cpp-cmake.patch new file mode 100644 index 0000000000..aa0716f173 --- /dev/null +++ b/gnu/packages/patches/qrcodegen-cpp-cmake.patch @@ -0,0 +1,506 @@ +From 283d6a4bae95f42aaccd9ddd06d16c2e33ed4abf Mon Sep 17 00:00:00 2001 +From: Vitaly Zaitsev +Date: Thu, 21 Apr 2022 15:36:23 +0200 +Subject: [PATCH 1/2] Implemented CMake build support. + +Co-authored-by: leha-bot +Signed-off-by: Vitaly Zaitsev +--- + CMakeLists.txt | 235 +++++++++++++++++++++++++++++ + c/Makefile | 88 ----------- + cmake/qrcodegen-config.cmake.in | 4 + + cmake/qrcodegen.pc.in | 11 ++ + cmake/qrcodegencpp-config.cmake.in | 4 + + cmake/qrcodegencpp.pc.in | 11 ++ + cpp/Makefile | 84 ----------- + 7 files changed, 265 insertions(+), 172 deletions(-) + create mode 100644 CMakeLists.txt + delete mode 100644 c/Makefile + create mode 100644 cmake/qrcodegen-config.cmake.in + create mode 100644 cmake/qrcodegen.pc.in + create mode 100644 cmake/qrcodegencpp-config.cmake.in + create mode 100644 cmake/qrcodegencpp.pc.in + delete mode 100644 cpp/Makefile + +diff --git a/CMakeLists.txt b/CMakeLists.txt +new file mode 100644 +index 0000000..b07197f +--- /dev/null ++++ b/CMakeLists.txt +@@ -0,0 +1,235 @@ ++# ============================== ++# === Project initialization === ++# ============================== ++ ++cmake_minimum_required(VERSION 3.12) ++ ++project(QR-Code-generator ++ VERSION 1.8.0 ++ DESCRIPTION "High-quality QR Code generator library in Java, TypeScript/JavaScript, Python, C++, C, Rust" ++ HOMEPAGE_URL "https://www.nayuki.io/page/qr-code-generator-library" ++ LANGUAGES C CXX ++) ++ ++set(CMAKE_CXX_STANDARD 11) ++set(CMAKE_CXX_STANDARD_REQUIRED ON) ++ ++# ======================= ++# === Project options === ++# ======================= ++ ++option(BUILD_EXAMPLES "Build examples and demos" OFF) ++option(BUILD_TESTS "Build and run unit tests" OFF) ++ ++# ======================= ++# === Paths detection === ++# ======================= ++ ++include(GNUInstallDirs) ++ ++# ============================ ++# === CMake config helpers === ++# ============================ ++ ++include(CMakePackageConfigHelpers) ++ ++# ======================== ++# === C library target === ++# ======================== ++ ++set(QRCODEGEN_NAME "qrcodegen") ++ ++set(QRCODEGEN_SOURCES ++ c/qrcodegen.c ++) ++ ++set(QRCODEGEN_HEADERS ++ c/qrcodegen.h ++) ++ ++add_library(${QRCODEGEN_NAME} ++ ${QRCODEGEN_SOURCES} ++ ${QRCODEGEN_HEADERS} ++) ++ ++target_include_directories(${QRCODEGEN_NAME} PUBLIC ++ $ ++ $ ++) ++ ++set_property(TARGET ${QRCODEGEN_NAME} PROPERTY PUBLIC_HEADER ${QRCODEGEN_HEADERS}) ++set_property(TARGET ${QRCODEGEN_NAME} PROPERTY VERSION ${CMAKE_PROJECT_VERSION}) ++set_property(TARGET ${QRCODEGEN_NAME} PROPERTY SOVERSION 1) ++ ++install(TARGETS ${QRCODEGEN_NAME} ++ EXPORT ${QRCODEGEN_NAME}-targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${QRCODEGEN_NAME} ++) ++ ++configure_package_config_file(cmake/${QRCODEGEN_NAME}-config.cmake.in ++ ${QRCODEGEN_NAME}-config.cmake ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${QRCODEGEN_NAME} ++) ++write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGEN_NAME}-config-version.cmake ++ COMPATIBILITY ExactVersion ++) ++ ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGEN_NAME}-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGEN_NAME}-config-version.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${QRCODEGEN_NAME} ++) ++ ++install(EXPORT ${QRCODEGEN_NAME}-targets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${QRCODEGEN_NAME} ++ NAMESPACE ${QRCODEGEN_NAME}:: ++) ++ ++configure_file(cmake/${QRCODEGEN_NAME}.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGEN_NAME}.pc ++ @ONLY ++) ++ ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGEN_NAME}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++) ++ ++# ========================= ++# === C examples target === ++# ========================= ++ ++if(BUILD_EXAMPLES) ++ set(QRCODEGENDEMO_SOURCES ++ c/qrcodegen-demo.c ++ ) ++ ++ add_executable(${QRCODEGEN_NAME}-demo ++ ${QRCODEGENDEMO_SOURCES} ++ ) ++ ++ target_link_libraries(${QRCODEGEN_NAME}-demo PRIVATE ++ ${QRCODEGEN_NAME} ++ ) ++endif() ++ ++# ====================== ++# === C tests target === ++# ====================== ++ ++if (BUILD_TESTS) ++ set(QRCODEGENTEST_SOURCES ++ c/qrcodegen-test.c ++ ) ++ ++ add_library(${QRCODEGEN_NAME}-testable OBJECT ++ ${QRCODEGEN_SOURCES} ++ ${QRCODEGEN_HEADERS} ++ ) ++ ++ target_compile_options(${QRCODEGEN_NAME}-testable PUBLIC ++ -DQRCODEGEN_TEST ++ ) ++ ++ add_executable(${QRCODEGEN_NAME}-test ++ ${QRCODEGENTEST_SOURCES} ++ ) ++ ++ target_link_libraries(${QRCODEGEN_NAME}-test PRIVATE ++ ${QRCODEGEN_NAME}-testable ++ ) ++ ++ add_test(NAME ${QRCODEGEN_NAME}-test COMMAND ${QRCODEGEN_NAME}-test) ++endif() ++ ++# ========================== ++# === C++ library target === ++# ========================== ++ ++set(QRCODEGENCPP_NAME "qrcodegencpp") ++ ++set(QRCODEGENCPP_SOURCES ++ cpp/qrcodegen.cpp ++) ++ ++set(QRCODEGENCPP_HEADERS ++ cpp/qrcodegen.hpp ++) ++ ++add_library(${QRCODEGENCPP_NAME} ++ ${QRCODEGENCPP_SOURCES} ++ ${QRCODEGENCPP_HEADERS} ++) ++ ++target_include_directories(${QRCODEGENCPP_NAME} PUBLIC ++ $ ++ $ ++) ++ ++set_property(TARGET ${QRCODEGENCPP_NAME} PROPERTY PUBLIC_HEADER ${QRCODEGENCPP_HEADERS}) ++set_property(TARGET ${QRCODEGENCPP_NAME} PROPERTY VERSION ${CMAKE_PROJECT_VERSION}) ++set_property(TARGET ${QRCODEGENCPP_NAME} PROPERTY SOVERSION 1) ++ ++install(TARGETS ${QRCODEGENCPP_NAME} ++ EXPORT ${QRCODEGENCPP_NAME}-targets ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ BUNDLE DESTINATION ${CMAKE_INSTALL_BINDIR} ++ PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${QRCODEGENCPP_NAME} ++) ++ ++configure_package_config_file(cmake/${QRCODEGENCPP_NAME}-config.cmake.in ++ ${QRCODEGENCPP_NAME}-config.cmake ++ INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${QRCODEGENCPP_NAME} ++) ++write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGENCPP_NAME}-config-version.cmake ++ COMPATIBILITY ExactVersion ++) ++ ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGENCPP_NAME}-config.cmake ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGENCPP_NAME}-config-version.cmake ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${QRCODEGENCPP_NAME} ++) ++ ++install(EXPORT ${QRCODEGENCPP_NAME}-targets ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${QRCODEGENCPP_NAME} ++ NAMESPACE ${QRCODEGENCPP_NAME}:: ++) ++ ++configure_file(cmake/${QRCODEGENCPP_NAME}.pc.in ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGENCPP_NAME}.pc ++ @ONLY ++) ++ ++install(FILES ++ ${CMAKE_CURRENT_BINARY_DIR}/${QRCODEGENCPP_NAME}.pc ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig ++) ++ ++# =========================== ++# === C++ examples target === ++# =========================== ++ ++if(BUILD_EXAMPLES) ++ set(QRCODEGENCPPDEMO_SOURCES ++ cpp/QrCodeGeneratorDemo.cpp ++ ) ++ ++ add_executable(${QRCODEGENCPP_NAME}-demo ++ ${QRCODEGENCPPDEMO_SOURCES} ++ ) ++ ++ target_link_libraries(${QRCODEGENCPP_NAME}-demo PRIVATE ++ ${QRCODEGENCPP_NAME} ++ ) ++endif() ++ ++# ==================== ++# === Tests export === ++# ==================== ++ ++if (BUILD_TESTS) ++ enable_testing() ++endif() +diff --git a/c/Makefile b/c/Makefile +deleted file mode 100644 +index 661b1f7..0000000 +--- a/c/Makefile ++++ /dev/null +@@ -1,88 +0,0 @@ +-# +-# Makefile for QR Code generator (C) +-# +-# Copyright (c) Project Nayuki. (MIT License) +-# https://www.nayuki.io/page/qr-code-generator-library +-# +-# Permission is hereby granted, free of charge, to any person obtaining a copy of +-# this software and associated documentation files (the "Software"), to deal in +-# the Software without restriction, including without limitation the rights to +-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +-# the Software, and to permit persons to whom the Software is furnished to do so, +-# subject to the following conditions: +-# - The above copyright notice and this permission notice shall be included in +-# all copies or substantial portions of the Software. +-# - The Software is provided "as is", without warranty of any kind, express or +-# implied, including but not limited to the warranties of merchantability, +-# fitness for a particular purpose and noninfringement. In no event shall the +-# authors or copyright holders be liable for any claim, damages or other +-# liability, whether in an action of contract, tort or otherwise, arising from, +-# out of or in connection with the Software or the use or other dealings in the +-# Software. +-# +- +- +-# ---- Configuration options ---- +- +-# External/implicit variables: +-# - CC: The C compiler, such as gcc or clang. +-# - CFLAGS: Any extra user-specified compiler flags (can be blank). +- +-# Recommended compiler flags: +-CFLAGS += -std=c99 -O +- +-# Extra flags for diagnostics: +-# CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +- +- +-# ---- Controlling make ---- +- +-# Clear default suffix rules +-.SUFFIXES: +- +-# Don't delete object files +-.SECONDARY: +- +-# Stuff concerning goals +-.DEFAULT_GOAL = all +-.PHONY: all clean +- +- +-# ---- Targets to build ---- +- +-LIB = qrcodegen +-LIBFILE = lib$(LIB).a +-LIBOBJ = qrcodegen.o +-MAINS = qrcodegen-demo qrcodegen-test +- +-# Build all binaries +-all: $(LIBFILE) $(MAINS) +- +-# Delete build output +-clean: +- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) +- rm -rf .deps +- +-# Executable files +-%: %.o $(LIBFILE) +- $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) +- +-# Special executable +-qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c) +- $(CC) $(CFLAGS) $(LDFLAGS) -DQRCODEGEN_TEST -o $@ $^ +- +-# The library +-$(LIBFILE): $(LIBOBJ) +- $(AR) -crs $@ -- $^ +- +-# Object files +-%.o: %.c .deps/timestamp +- $(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< +- +-# Have a place to store header dependencies automatically generated by compiler +-.deps/timestamp: +- mkdir -p .deps +- touch .deps/timestamp +- +-# Make use of said dependencies if available +--include .deps/*.d +diff --git a/cmake/qrcodegen-config.cmake.in b/cmake/qrcodegen-config.cmake.in +new file mode 100644 +index 0000000..0b82c63 +--- /dev/null ++++ b/cmake/qrcodegen-config.cmake.in +@@ -0,0 +1,4 @@ ++@PACKAGE_INIT@ ++ ++include("${CMAKE_CURRENT_LIST_DIR}/@QRCODEGEN_NAME@-targets.cmake") ++check_required_components(@QRCODEGEN_NAME@) +diff --git a/cmake/qrcodegen.pc.in b/cmake/qrcodegen.pc.in +new file mode 100644 +index 0000000..c68955b +--- /dev/null ++++ b/cmake/qrcodegen.pc.in +@@ -0,0 +1,11 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@QRCODEGEN_NAME@ ++ ++Name: @QRCODEGEN_NAME@ ++Description: @CMAKE_PROJECT_DESCRIPTION@ ++Version: @CMAKE_PROJECT_VERSION@ ++ ++Libs: -L${libdir} -l@QRCODEGEN_NAME@ ++Cflags: -I${includedir} +diff --git a/cmake/qrcodegencpp-config.cmake.in b/cmake/qrcodegencpp-config.cmake.in +new file mode 100644 +index 0000000..3d18f99 +--- /dev/null ++++ b/cmake/qrcodegencpp-config.cmake.in +@@ -0,0 +1,4 @@ ++@PACKAGE_INIT@ ++ ++include("${CMAKE_CURRENT_LIST_DIR}/@QRCODEGENCPP_NAME@-targets.cmake") ++check_required_components(@QRCODEGENCPP_NAME@) +diff --git a/cmake/qrcodegencpp.pc.in b/cmake/qrcodegencpp.pc.in +new file mode 100644 +index 0000000..89db084 +--- /dev/null ++++ b/cmake/qrcodegencpp.pc.in +@@ -0,0 +1,11 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@ ++includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@/@QRCODEGENCPP_NAME@ ++ ++Name: @QRCODEGENCPP_NAME@ ++Description: @CMAKE_PROJECT_DESCRIPTION@ ++Version: @CMAKE_PROJECT_VERSION@ ++ ++Libs: -L${libdir} -l@QRCODEGENCPP_NAME@ ++Cflags: -I${includedir} +diff --git a/cpp/Makefile b/cpp/Makefile +deleted file mode 100644 +index 57dc0bf..0000000 +--- a/cpp/Makefile ++++ /dev/null +@@ -1,84 +0,0 @@ +-# +-# Makefile for QR Code generator (C++) +-# +-# Copyright (c) Project Nayuki. (MIT License) +-# https://www.nayuki.io/page/qr-code-generator-library +-# +-# Permission is hereby granted, free of charge, to any person obtaining a copy of +-# this software and associated documentation files (the "Software"), to deal in +-# the Software without restriction, including without limitation the rights to +-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of +-# the Software, and to permit persons to whom the Software is furnished to do so, +-# subject to the following conditions: +-# - The above copyright notice and this permission notice shall be included in +-# all copies or substantial portions of the Software. +-# - The Software is provided "as is", without warranty of any kind, express or +-# implied, including but not limited to the warranties of merchantability, +-# fitness for a particular purpose and noninfringement. In no event shall the +-# authors or copyright holders be liable for any claim, damages or other +-# liability, whether in an action of contract, tort or otherwise, arising from, +-# out of or in connection with the Software or the use or other dealings in the +-# Software. +-# +- +- +-# ---- Configuration options ---- +- +-# External/implicit variables: +-# - CXX: The C++ compiler, such as g++ or clang++. +-# - CXXFLAGS: Any extra user-specified compiler flags (can be blank). +- +-# Recommended compiler flags: +-CXXFLAGS += -std=c++11 -O +- +-# Extra flags for diagnostics: +-# CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address +- +- +-# ---- Controlling make ---- +- +-# Clear default suffix rules +-.SUFFIXES: +- +-# Don't delete object files +-.SECONDARY: +- +-# Stuff concerning goals +-.DEFAULT_GOAL = all +-.PHONY: all clean +- +- +-# ---- Targets to build ---- +- +-LIB = qrcodegencpp +-LIBFILE = lib$(LIB).a +-LIBOBJ = qrcodegen.o +-MAINS = QrCodeGeneratorDemo +- +-# Build all binaries +-all: $(LIBFILE) $(MAINS) +- +-# Delete build output +-clean: +- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) +- rm -rf .deps +- +-# Executable files +-%: %.o $(LIBFILE) +- $(CXX) $(CXXFLAGS) $(LDFLAGS) -o $@ $< -L . -l $(LIB) +- +-# The library +-$(LIBFILE): $(LIBOBJ) +- $(AR) -crs $@ -- $^ +- +-# Object files +-%.o: %.cpp .deps/timestamp +- $(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< +- +-# Have a place to store header dependencies automatically generated by compiler +-.deps/timestamp: +- mkdir -p .deps +- touch .deps/timestamp +- +-# Make use of said dependencies if available +--include .deps/*.d +-- +2.41.0 + diff --git a/gnu/packages/patches/qrcodegen-cpp-make-install.patch b/gnu/packages/patches/qrcodegen-cpp-make-install.patch deleted file mode 100644 index 4da619d3c8..0000000000 --- a/gnu/packages/patches/qrcodegen-cpp-make-install.patch +++ /dev/null @@ -1,448 +0,0 @@ -Make the library installable. Patch copied from pull request: - -https://github.com/nayuki/QR-Code-generator/pull/72 - -From 1625fc1665e1f83eb73c0f5670dcfda96dc0b3e4 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 3 Dec 2019 11:57:24 +0100 -Subject: [PATCH 1/7] Do not append to C/XX/FLAGS but just set them if not - defined already - ---- - c/Makefile | 2 +- - cpp/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/c/Makefile b/c/Makefile -index fd0c367..b27449c 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -29,7 +29,7 @@ - # - CFLAGS: Any extra user-specified compiler flags (can be blank). - - # Recommended compiler flags: --CFLAGS += -std=c99 -O -+CFLAGS ?= -std=c99 -O - - # Extra flags for diagnostics: - # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address -diff --git a/cpp/Makefile b/cpp/Makefile -index f83c512..666f976 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -29,7 +29,7 @@ - # - CXXFLAGS: Any extra user-specified compiler flags (can be blank). - - # Recommended compiler flags: --CXXFLAGS += -std=c++11 -O -+CXXFLAGS ?= -std=c++11 -O - - # Extra flags for diagnostics: - # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address - -From 2e496a0f59d5c6782c1e3e2a3ca36d0272b384f3 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 3 Dec 2019 11:59:59 +0100 -Subject: [PATCH 2/7] Make use of -fPIC parameter when building' - ---- - c/Makefile | 2 +- - cpp/Makefile | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/c/Makefile b/c/Makefile -index b27449c..bf79462 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -77,7 +77,7 @@ $(LIBFILE): $(LIBOBJ) - - # Object files - %.o: %.c .deps/timestamp -- $(CC) $(CFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< -+ $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - - # Have a place to store header dependencies automatically generated by compiler - .deps/timestamp: -diff --git a/cpp/Makefile b/cpp/Makefile -index 666f976..f37cf66 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -73,7 +73,7 @@ $(LIBFILE): $(LIBOBJ) - - # Object files - %.o: %.cpp .deps/timestamp -- $(CXX) $(CXXFLAGS) -c -o $@ -MMD -MF .deps/$*.d $< -+ $(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - - # Have a place to store header dependencies automatically generated by compiler - .deps/timestamp: - -From 29489faaa5a3b014c5c2d95ca34033df470de73c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 3 Dec 2019 12:07:19 +0100 -Subject: [PATCH 3/7] Generate both shared and static libraries - ---- - c/Makefile | 14 ++++++++++---- - cpp/Makefile | 14 ++++++++++---- - 2 files changed, 20 insertions(+), 8 deletions(-) - -diff --git a/c/Makefile b/c/Makefile -index bf79462..38eda2d 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -51,16 +51,19 @@ CFLAGS ?= -std=c99 -O - # ---- Targets to build ---- - - LIB = qrcodegen --LIBFILE = lib$(LIB).a -+ARFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+# Bump the soname number when the ABI changes and gets incompatible -+SO_NAME = $(LIBFILE).1 - LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker - - # Build all binaries --all: $(LIBFILE) $(MAINS) -+all: $(LIBFILE) $(ARFILE) $(MAINS) - - # Delete build output - clean: -- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) -+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - - # Executable files -@@ -72,9 +75,12 @@ qrcodegen-test: qrcodegen-test.c $(LIBOBJ:%.o=%.c) - $(CC) $(CFLAGS) -DQRCODEGEN_TEST -o $@ $^ - - # The library --$(LIBFILE): $(LIBOBJ) -+$(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - -+$(LIBFILE): $(LIBOBJ) -+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ - # Object files - %.o: %.c .deps/timestamp - $(CC) $(CFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< -diff --git a/cpp/Makefile b/cpp/Makefile -index f37cf66..606cdad 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -51,16 +51,19 @@ CXXFLAGS ?= -std=c++11 -O - # ---- Targets to build ---- - - LIB = qrcodegen --LIBFILE = lib$(LIB).a -+ARFILE = lib$(LIB).a -+LIBFILE = lib$(LIB).so -+# Bump the soname number when the ABI changes and gets incompatible -+SO_NAME = $(LIBFILE).1 - LIBOBJ = QrCode.o - MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker - - # Build all binaries --all: $(LIBFILE) $(MAINS) -+all: $(LIBFILE) $(ARFILE) $(MAINS) - - # Delete build output - clean: -- rm -f -- $(LIBOBJ) $(LIBFILE) $(MAINS:=.o) $(MAINS) -+ rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - - # Executable files -@@ -68,9 +71,12 @@ clean: - $(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) - - # The library --$(LIBFILE): $(LIBOBJ) -+$(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - -+$(LIBFILE): $(LIBOBJ) -+ $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ - # Object files - %.o: %.cpp .deps/timestamp - $(CXX) $(CXXFLAGS) -fPIC -c -o $@ -MMD -MF .deps/$*.d $< - -From 064f38d6a8dc0a457728a47ee4ca1e927e46d5ec Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 3 Dec 2019 12:45:34 +0100 -Subject: [PATCH 4/7] Create install targets for C and CPP - ---- - c/Makefile | 26 ++++++++++++++++++++++++++ - cpp/Makefile | 27 +++++++++++++++++++++++++++ - 2 files changed, 53 insertions(+) - -diff --git a/c/Makefile b/c/Makefile -index 38eda2d..7521944 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -34,6 +34,8 @@ CFLAGS ?= -std=c99 -O - # Extra flags for diagnostics: - # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address - -+# Version information -+VERSION = 1.5.0 - - # ---- Controlling make ---- - -@@ -55,9 +57,15 @@ ARFILE = lib$(LIB).a - LIBFILE = lib$(LIB).so - # Bump the soname number when the ABI changes and gets incompatible - SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = qrcodegen.h - LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker - -+# define paths to install -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen -+LIBDIR ?= $(DESTDIR)/usr/lib -+ - # Build all binaries - all: $(LIBFILE) $(ARFILE) $(MAINS) - -@@ -66,6 +74,24 @@ clean: - rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - -+install-shared: $(LIBFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ rm -f $(LIBDIR)/$(SO_NAME) -+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) -+ rm -f $(LIBDIR)/$(LIBFILE) -+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) -+ -+install-static: $(ARFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ -+install-header: $(HEADERS) -+ install -d $(INCLUDEDIR) || true -+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ -+ -+install: install-shared install-static install-header -+ - # Executable files - %: %.o $(LIBFILE) - $(CC) $(CFLAGS) -o $@ $< -L . -l $(LIB) -diff --git a/cpp/Makefile b/cpp/Makefile -index 606cdad..3271bd8 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -34,6 +34,8 @@ CXXFLAGS ?= -std=c++11 -O - # Extra flags for diagnostics: - # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address - -+# Version information -+VERSION = 1.5.0 - - # ---- Controlling make ---- - -@@ -55,9 +57,16 @@ ARFILE = lib$(LIB).a - LIBFILE = lib$(LIB).so - # Bump the soname number when the ABI changes and gets incompatible - SO_NAME = $(LIBFILE).1 -+REAL_NAME = $(LIBFILE).$(VERSION) -+HEADERS = QrCode.hpp - LIBOBJ = QrCode.o - MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker - -+# define paths to install -+INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen -+LIBDIR ?= $(DESTDIR)/usr/lib -+ -+ - # Build all binaries - all: $(LIBFILE) $(ARFILE) $(MAINS) - -@@ -66,6 +75,24 @@ clean: - rm -f -- $(LIBOBJ) $(LIBFILE) $(ARFILE) $(MAINS:=.o) $(MAINS) - rm -rf .deps - -+install-shared: $(LIBFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ rm -f $(LIBDIR)/$(SO_NAME) -+ ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) -+ rm -f $(LIBDIR)/$(LIBFILE) -+ ln -s $(SO_NAME) $(LIBDIR)/$(LIBFILE) -+ -+install-static: $(ARFILE) -+ install -d $(LIBDIR) || true -+ install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ -+install-header: $(HEADERS) -+ install -d $(INCLUDEDIR) || true -+ install -m 0644 $(HEADERS) $(INCLUDEDIR)/ -+ -+install: install-shared install-static install-header -+ - # Executable files - %: %.o $(LIBFILE) - $(CXX) $(CXXFLAGS) -o $@ $< -L . -l $(LIB) - -From a635ff4654f94ab26b458c46a8841543e5bc8c67 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 3 Dec 2019 12:50:39 +0100 -Subject: [PATCH 5/7] Rename cpp library to qrcodegencpp to avoid conflict - ---- - cpp/Makefile | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cpp/Makefile b/cpp/Makefile -index 3271bd8..42fa4ff 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -52,7 +52,7 @@ VERSION = 1.5.0 - - # ---- Targets to build ---- - --LIB = qrcodegen -+LIB = qrcodegencpp - ARFILE = lib$(LIB).a - LIBFILE = lib$(LIB).so - # Bump the soname number when the ABI changes and gets incompatible - -From c073e7dfad6454dfd725a69c347f8272d29ea41c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 7 Jan 2020 09:18:59 +0100 -Subject: [PATCH 6/7] Add PREFIX variable and few minor fixes from code review - ---- - c/Makefile | 9 +++++---- - cpp/Makefile | 9 +++++---- - 2 files changed, 10 insertions(+), 8 deletions(-) - -diff --git a/c/Makefile b/c/Makefile -index 7521944..874933e 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -29,7 +29,7 @@ - # - CFLAGS: Any extra user-specified compiler flags (can be blank). - - # Recommended compiler flags: --CFLAGS ?= -std=c99 -O -+CFLAGS += -std=c99 - - # Extra flags for diagnostics: - # CFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address -@@ -63,8 +63,9 @@ LIBOBJ = qrcodegen.o - MAINS = qrcodegen-demo qrcodegen-test qrcodegen-worker - - # define paths to install --INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen --LIBDIR ?= $(DESTDIR)/usr/lib -+PREFIX ?= /usr/local -+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include/qrcodegen -+LIBDIR ?= $(DESTDIR)$(PREFIX)/lib - - # Build all binaries - all: $(LIBFILE) $(ARFILE) $(MAINS) -@@ -105,7 +106,7 @@ $(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - - $(LIBFILE): $(LIBOBJ) -- $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ $(CC) $(CFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ - - # Object files - %.o: %.c .deps/timestamp -diff --git a/cpp/Makefile b/cpp/Makefile -index 42fa4ff..f8d9b7f 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -29,7 +29,7 @@ - # - CXXFLAGS: Any extra user-specified compiler flags (can be blank). - - # Recommended compiler flags: --CXXFLAGS ?= -std=c++11 -O -+CXXFLAGS += -std=c++11 - - # Extra flags for diagnostics: - # CXXFLAGS += -g -Wall -Wextra -Wpedantic -Wconversion -Wsign-conversion -fsanitize=undefined,address -@@ -63,8 +63,9 @@ LIBOBJ = QrCode.o - MAINS = QrCodeGeneratorDemo QrCodeGeneratorWorker - - # define paths to install --INCLUDEDIR ?= $(DESTDIR)/usr/include/qrcodegen --LIBDIR ?= $(DESTDIR)/usr/lib -+PREFIX ?= /usr/local -+INCLUDEDIR ?= $(DESTDIR)$(PREFIX)/include/qrcodegen -+LIBDIR ?= $(DESTDIR)$(PREFIX)/lib - - - # Build all binaries -@@ -102,7 +103,7 @@ $(ARFILE): $(LIBOBJ) - $(AR) -crs $@ -- $^ - - $(LIBFILE): $(LIBOBJ) -- $(CC) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ -+ $(CXX) $(CXXFLAGS) -shared -Wl,-soname,$(SO_NAME) $(LDFLAGS) -o $@ $^ - - # Object files - %.o: %.cpp .deps/timestamp - -From b43c1de5cc874535a7f549cef437f6849528e455 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Chv=C3=A1tal?= -Date: Tue, 7 Jan 2020 13:12:32 +0100 -Subject: [PATCH 7/7] Install static and shared library as an executable - ---- - c/Makefile | 4 ++-- - cpp/Makefile | 4 ++-- - 2 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/c/Makefile b/c/Makefile -index 874933e..631cc71 100644 ---- a/c/Makefile -+++ b/c/Makefile -@@ -77,7 +77,7 @@ clean: - - install-shared: $(LIBFILE) - install -d $(LIBDIR) || true -- install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) - rm -f $(LIBDIR)/$(SO_NAME) - ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) - rm -f $(LIBDIR)/$(LIBFILE) -@@ -85,7 +85,7 @@ install-shared: $(LIBFILE) - - install-static: $(ARFILE) - install -d $(LIBDIR) || true -- install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ install -m 0755 $(ARFILE) $(LIBDIR)/$(ARFILE) - - install-header: $(HEADERS) - install -d $(INCLUDEDIR) || true -diff --git a/cpp/Makefile b/cpp/Makefile -index f8d9b7f..bbd861e 100644 ---- a/cpp/Makefile -+++ b/cpp/Makefile -@@ -78,7 +78,7 @@ clean: - - install-shared: $(LIBFILE) - install -d $(LIBDIR) || true -- install -m 0644 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) -+ install -m 0755 $(LIBFILE) $(LIBDIR)/$(REAL_NAME) - rm -f $(LIBDIR)/$(SO_NAME) - ln -s $(REAL_NAME) $(LIBDIR)/$(SO_NAME) - rm -f $(LIBDIR)/$(LIBFILE) -@@ -86,7 +86,7 @@ install-shared: $(LIBFILE) - - install-static: $(ARFILE) - install -d $(LIBDIR) || true -- install -m 0644 $(ARFILE) $(LIBDIR)/$(ARFILE) -+ install -m 0755 $(ARFILE) $(LIBDIR)/$(ARFILE) - - install-header: $(HEADERS) - install -d $(INCLUDEDIR) || true From patchwork Fri May 24 04:31:46 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "ashish.is--- via Guix-patches\" via" X-Patchwork-Id: 64864 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 DCB1027BBE9; Fri, 24 May 2024 05:33:38 +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.6 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED,URIBL_SBL_A 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 6CDB927BBE2 for ; Fri, 24 May 2024 05:33:37 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sAMc2-0003wq-6u; Fri, 24 May 2024 00:33:02 -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 1sAMbx-0003ue-8r for guix-patches@gnu.org; Fri, 24 May 2024 00:32:58 -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 1sAMbw-0004pn-Sx for guix-patches@gnu.org; Fri, 24 May 2024 00:32:57 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1sAMc3-0003EV-Iv for guix-patches@gnu.org; Fri, 24 May 2024 00:33:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#71161] [PATCH 5/5] gnu: obs: Update to 30.1.2. Resent-From: iyzsong@envs.net Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 24 May 2024 04:33:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 71161 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 71161@debbugs.gnu.org Cc: =?utf-8?b?5a6L5paH5q2m?= Received: via spool by 71161-submit@debbugs.gnu.org id=B71161.171652513812391 (code B ref 71161); Fri, 24 May 2024 04:33:03 +0000 Received: (at 71161) by debbugs.gnu.org; 24 May 2024 04:32:18 +0000 Received: from localhost ([127.0.0.1]:34731 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbK-0003Dm-1F for submit@debbugs.gnu.org; Fri, 24 May 2024 00:32:18 -0400 Received: from mail.envs.net ([5.199.136.28]:43580) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1sAMbG-0003DV-MJ for 71161@debbugs.gnu.org; Fri, 24 May 2024 00:32:15 -0400 Received: from localhost (mail.envs.net [127.0.0.1]) by mail.envs.net (Postfix) with ESMTP id 5615A38A36A0; Fri, 24 May 2024 04:32:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=envs.net; s=modoboa; t=1716525127; bh=o9GdTCTycTq56EbYlB/Cg0QouyIY09t0dAVmOQ+nQf8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Km31OVbMO0xbzaxCKFwizS6BZqTfIN2Q7HNHFW2ieIITcQN2dkCAXOJ3Upol2zoQs WFQ4g6mltYcxN3ly1HmDw9ti/RVb25lkc+UlFiOg/k/QQork5wENwnfR4w333oYcnm wl/VDnn5vWaGORNVtUF3E5xGVh2qPS6nNh+2w0bZa08SyM7B5/rqUX4fQM4sI9g24G +4gBqUpxI1DC4RNvtCk7qwVBRgJ77IOa046213OZrFaX9LUTkXex250fUCi0r7ghgO SzHM89TZ6OEh09k9Ydjs5eW99PHc2oILDSNHpqoJ4/6mGXhKoqm6f98qWXqf//PZSH glmOLmckTFAmLKTY0zDsZ3Z6kmWfJuWoGOzKkDAWFmlGxCfTuPlai7er1c3wMHUIlb mDDbg8ZIGifI7lDcncpBx+b47Nh40rPo1ekRND/00JT/CkkdHU8L1b22CHUizsLs5M CKU7AsMo6IALv0UepW0kgvFnbaoZaKlKfQ8fs62M2MZ8iZJAPLyYAal7KN8E8zMxuT 8Slk2k6qW5Vxmzeyun1uZUAiV5HO0489GulmQCq1K1apaiXe7UQLXGlNOiuyXR5ttu JQsdITb+j7J536xpKMYztexQF0qmhIALiBN/gUTrUZCcgZnr8Lce5lxDB9WQ4IiOnl BQ1vZcSYy5T1EAMUqgf/nQiQ= X-Virus-Scanned: Debian amavisd-new at mail.envs.net Received: from mail.envs.net ([127.0.0.1]) by localhost (mail.envs.net [127.0.0.1]) (amavisd-new, port 10026) with ESMTP id ImsRiXdO4FZ0; Fri, 24 May 2024 04:32:04 +0000 (UTC) Received: from localhost (unknown [36.170.58.241]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mail.envs.net (Postfix) with ESMTPSA; Fri, 24 May 2024 04:32:00 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by localhost (OpenSMTPD) with ESMTP id c44b0daa; Fri, 24 May 2024 04:31:54 +0000 (UTC) Date: Fri, 24 May 2024 12:31:46 +0800 Message-ID: X-Mailer: git-send-email 2.41.0 In-Reply-To: References: 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: iyzsong@envs.net X-ACL-Warn: , iyzsong--- via Guix-patches X-Patchwork-Original-From: iyzsong--- via Guix-patches via From: "ashish.is--- via Guix-patches\" via" 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 From: 宋文武 * gnu/packages/video.scm (obs): Update to 30.1.2. [arguments]: Add "-DENABLE_QSV11=OFF" to configure-flags. Add MESA to LD_LIBRARY_PATH for 'obs'. [inputs]: Add libdatachannel, qrcodegen-cpp and vulkan-headers. Replace ffmpeg-4 with ffmpeg, Qt 5 with Qt 6. Change-Id: Id74c52512eb18727b0c8c8a0a7ed4c892a5e76c2 --- gnu/packages/video.scm | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/gnu/packages/video.scm b/gnu/packages/video.scm index 2e7ba6d10e..3782198a17 100644 --- a/gnu/packages/video.scm +++ b/gnu/packages/video.scm @@ -109,6 +109,7 @@ (define-module (gnu packages video) #:use-module (guix build-system waf) #:use-module (guix build-system trivial) #:use-module (gnu packages) + #:use-module (gnu packages aidc) #:use-module (gnu packages algebra) #:use-module (gnu packages assembly) #:use-module (gnu packages audio) @@ -3965,7 +3966,7 @@ (define-public v4l-utils (define-public obs (package (name "obs") - (version "29.1.3") + (version "30.1.2") (source (origin (method git-fetch) (uri (git-reference @@ -3975,7 +3976,7 @@ (define-public obs (file-name (git-file-name name version)) (sha256 (base32 - "192p7m3g8ynbkq3s894w6a0w6gix3k237q5jwqrrr8idwfwwyh0g")) + "02pm6397h7l0xhdpscbh1kq8y98zx236z95wvw60kbhq38s0i0ik")) (patches (search-patches "obs-modules-location.patch")))) (build-system cmake-build-system) @@ -3986,6 +3987,7 @@ (define-public obs "-DENABLE_UNIT_TESTS=ON" "-DENABLE_NEW_MPEGTS_OUTPUT=OFF" "-DENABLE_AJA=OFF" + "-DENABLE_QSV11=OFF" ;; Browser plugin requires cef, but it is not packaged yet. ;; "-DBUILD_BROWSER=OFF") @@ -3998,6 +4000,9 @@ (define-public obs `("QT_PLUGIN_PATH" ":" prefix (,plugin-path)) `("LD_LIBRARY_PATH" ":" prefix (,(string-append #$(this-package-input "vlc") + "/lib") + ;; TODO: Remove this once our mesa has glvnd support. + ,(string-append #$(this-package-input "mesa") "/lib")))))))))) (native-search-paths (list (search-path-specification @@ -4017,12 +4022,13 @@ (define-public obs bash-minimal curl eudev - ffmpeg-4 + ffmpeg fontconfig freetype glib jack-1 jansson + libdatachannel libglvnd libva libx264 @@ -4036,12 +4042,13 @@ (define-public obs pipewire pulseaudio python - qtbase-5 - qtsvg-5 - qtx11extras - qtwayland-5 + qrcodegen-cpp + qtbase + qtsvg + qtwayland speexdsp v4l-utils + vulkan-headers vlc wayland wayland-protocols