From patchwork Thu Apr 3 06:38:20 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: guix-patches--- via X-Patchwork-Id: 41211 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 1CFBB27BBE9; Thu, 3 Apr 2025 07:46: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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 5F68B27BBE2 for ; Thu, 3 Apr 2025 07:46:09 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u0EKz-0008Va-8i; Thu, 03 Apr 2025 02:46: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 1u0EKw-0008V4-50 for guix-patches@gnu.org; Thu, 03 Apr 2025 02:46:02 -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 1u0EKv-00023s-Se for guix-patches@gnu.org; Thu, 03 Apr 2025 02:46:01 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=yga6p2NPrPqbdiadDkV6bOmKdEKs2cX8UR7l7NqK898=; b=GoKMtjeWM3K0lwlDfp8YdLy6o0mNcpQPpMfd4BB7pUZfWCJzsb3CySJ2JQrw9KmqceOIvfg/tTCzjNUAYzD5f5rv3sJNY3IAINAPHgtwWa0AW2PFfNFdYcdvwgwIyU/8jp3h63dySLMAR/bLX1RBY7vA0VN7S7RRL/Pop6fC4SHN4gU+qANdb4CjuoEMq2hF/1AfGQT6mVn4H7LJwEzA2gxiAZblNnAOpcq6nXVzICop9sePJlhQiIs1n10tilSgfemlG16x0xLQcBWtsYfuOe+PzN4pDjp8QPC7XtmcasbR2Lx7bEG37kUMmiUiYzMZTR6pILjR1Mm1qUTDteaXtQ==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u0EKv-0004oD-N7; Thu, 03 Apr 2025 02:46:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76757] [PATCH 2/5] gnu: lunasvg: Make compatible with plutovg 1.0.0. Resent-From: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: code@greghogan.com, guix-patches@gnu.org Resent-Date: Thu, 03 Apr 2025 06:46:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76757 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 76757@debbugs.gnu.org Cc: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong , zhengjunjie@iscas.ac.cn, Greg Hogan X-Debbugs-Original-Xcc: Greg Hogan Received: via spool by 76757-submit@debbugs.gnu.org id=B76757.174366271118410 (code B ref 76757); Thu, 03 Apr 2025 06:46:01 +0000 Received: (at 76757) by debbugs.gnu.org; 3 Apr 2025 06:45:11 +0000 Received: from localhost ([127.0.0.1]:60611 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0EK7-0004mp-3h for submit@debbugs.gnu.org; Thu, 03 Apr 2025 02:45:11 -0400 Received: from layka.disroot.org ([178.21.23.139]:58144) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u0EK4-0004kA-An for 76757@debbugs.gnu.org; Thu, 03 Apr 2025 02:45:09 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 7EBF925C6C; Thu, 3 Apr 2025 08:45:06 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id ohscVoWhQarC; Thu, 3 Apr 2025 08:45:05 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1743662705; bh=+dsszfysTCrnIBvqUz2cLlfdCybLmYnCwUuflLk5rwc=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=S4CKueKWsM2FHg2No59V358sPu85fEphFBm/NgOO/NJ/juBmrVDzYAs9iSVeKyt41 rgw9d4rMz9ZpqzaYtmDPf9qgZVVhk00vS9XksG+NTn0EBEvPukJp2oESSh953YbBEI +/cX5xEZQUTF4096Tz3ZXW6F9JFIgeuco8Mh4qqNh1mdz0ELC1/DSXaqcQhQtCkMsW Xz+FKn5Eni1SDWcSbD+lSwd1AElgybWQAnx2uxSP7ca7436u1hcvekrNExTSd46SDs Za0dZ39aDRvWcJYa/SVonD76uSyvjm16xjQL2rKfzWDpttd8b7ZX47vkop4fF8E9Es vFCT+IqEvARNQ== Date: Thu, 3 Apr 2025 15:38:20 +0900 Message-ID: In-Reply-To: <13709da2a297cfb981e25186c1e247aa5db72193.1743662198.git.mcsinyx@disroot.org> References: <13709da2a297cfb981e25186c1e247aa5db72193.1743662198.git.mcsinyx@disroot.org> 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: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong X-ACL-Warn: , =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong_via_Guix-patches?= X-Patchwork-Original-From: guix-patches--- via From: 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 * gnu/packages/patches/lunasvg-plutovg-1.0.0.patch: New file. * gnu/packages/cpp.scm (lunasvg): [patches]: Add patch. * gnu/local.mk (dist_patch_DATA): Register patch. References: https://github.com/sammycage/lunasvg/commit/472cead775098c16d211d2d018aa4445543da6af Change-Id: Ice3d36a312b1b0f57c1f41841fddfc65b9d83593 --- The dependency bump takes place right after the packaged release without any change to the callers. gnu/local.mk | 1 + gnu/packages/cpp.scm | 3 +- .../patches/lunasvg-plutovg-1.0.0.patch | 31 +++++++++++++++++++ 3 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/lunasvg-plutovg-1.0.0.patch diff --git a/gnu/local.mk b/gnu/local.mk index f0b0a9593f59..31f37bfcb866 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1823,6 +1823,7 @@ dist_patch_DATA = \ %D%/packages/patches/lua-5.4-liblua-so.patch \ %D%/packages/patches/lugaru-fix-sound.patch \ %D%/packages/patches/luit-posix.patch \ + %D%/packages/patches/lunasvg-plutovg-1.0.0.patch \ %D%/packages/patches/lxc-no-static-bin.patch \ %D%/packages/patches/mactelnet-remove-init.patch \ %D%/packages/patches/mailutils-variable-lookup.patch \ diff --git a/gnu/packages/cpp.scm b/gnu/packages/cpp.scm index 86d60f3a9baa..ba1eeb64a90f 100644 --- a/gnu/packages/cpp.scm +++ b/gnu/packages/cpp.scm @@ -561,7 +561,8 @@ (define-public lunasvg (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "14ppk3k6sdbf3lwhv2gjqy32vwa7ck9jcj9xfk0fxwfqbvbp6608")))) + (base32 "14ppk3k6sdbf3lwhv2gjqy32vwa7ck9jcj9xfk0fxwfqbvbp6608")) + (patches (search-patches "lunasvg-plutovg-1.0.0.patch")))) (build-system cmake-build-system) (inputs (list plutovg)) (arguments diff --git a/gnu/packages/patches/lunasvg-plutovg-1.0.0.patch b/gnu/packages/patches/lunasvg-plutovg-1.0.0.patch new file mode 100644 index 000000000000..e8c3ae2e43c2 --- /dev/null +++ b/gnu/packages/patches/lunasvg-plutovg-1.0.0.patch @@ -0,0 +1,31 @@ +commit 472cead775098c16d211d2d018aa4445543da6af +Author: Samuel Ugochukwu +Date: 2025-03-17 09:43:58 +0100 + + Bump plutovg version to 1.0.0 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 08cee283b43f..b72d704667d7 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,7 +6,7 @@ set(LUNASVG_VERSION_MICRO 1) + + project(lunasvg LANGUAGES CXX VERSION ${LUNASVG_VERSION_MAJOR}.${LUNASVG_VERSION_MINOR}.${LUNASVG_VERSION_MICRO}) + +-find_package(plutovg 0.0.4 QUIET) ++find_package(plutovg 1.0.0 QUIET) + if(NOT plutovg_FOUND) + add_subdirectory(plutovg) + endif() +diff --git a/meson.build b/meson.build +index a243219f9059..d6707d541024 100644 +--- a/meson.build ++++ b/meson.build +@@ -7,7 +7,7 @@ project('lunasvg', 'cpp', + + plutovg_dep = dependency('plutovg', + required: true, +- version: '>=0.0.4', ++ version: '>=1.0.0', + fallback: ['plutovg', 'plutovg_dep'] + ) From patchwork Thu Apr 3 06:38:26 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: guix-patches--- via X-Patchwork-Id: 41212 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 CBDF827BBE9; Thu, 3 Apr 2025 07:52:13 +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=-7.4 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2, RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL,RCVD_IN_VALIDITY_SAFE, 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 B250C27BBE2 for ; Thu, 3 Apr 2025 07:52:11 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u0EQn-0000W8-94; Thu, 03 Apr 2025 02:52: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 1u0EQl-0000Vr-3Z for guix-patches@gnu.org; Thu, 03 Apr 2025 02:52:03 -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 1u0EQk-0003BS-Os for guix-patches@gnu.org; Thu, 03 Apr 2025 02:52:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=AqMd23cUQT1V0AumgN9yONztkzjZh2oRr8NECB+ta94=; b=uhUIhf828EidFp/p8CHH0ba14qkXONn3S+MQmaOb3EGohi6754f+k90bLyI0IgOzT9g3PPf/wOmboilqG5pzmBLUM9kJQu/eQbr+VXSmkIxRsYeQY77vEpbkxKB5SGn6WcfByn0FuaegqBvtQEKGywRLZjW/9V0gqXXbZzPlpNW9g+Jn+Xb87n74HUA8NQpnb98drT+jxOqH6M9dnITr/MRZg6P1Joa4Sh6ZcgIheFR/Qhmi3TX6GdWnwhf/0cj1/MDkb7RMDqb6vdGPs1YBK9CTve7J77/cTAFNcjiHTDZFDTcZpebGlPXKluZE2LTWMJNTFLJYDMmBxdieKpDN+A==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u0EQk-00053J-JE for guix-patches@gnu.org; Thu, 03 Apr 2025 02:52:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#76757] [PATCH 5/5] gnu: Add sdl3-image. Resent-From: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 03 Apr 2025 06:52:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 76757 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch moreinfo To: 76757@debbugs.gnu.org Cc: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong , zhengjunjie@iscas.ac.cn Received: via spool by 76757-submit@debbugs.gnu.org id=B76757.174366307519358 (code B ref 76757); Thu, 03 Apr 2025 06:52:02 +0000 Received: (at 76757) by debbugs.gnu.org; 3 Apr 2025 06:51:15 +0000 Received: from localhost ([127.0.0.1]:60626 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u0EPy-00052A-IR for submit@debbugs.gnu.org; Thu, 03 Apr 2025 02:51:14 -0400 Received: from layka.disroot.org ([178.21.23.139]:43554) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u0EPv-000520-C1 for 76757@debbugs.gnu.org; Thu, 03 Apr 2025 02:51:12 -0400 Received: from mail01.disroot.lan (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 6962925CBC; Thu, 3 Apr 2025 08:51:10 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from layka.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavis, port 10024) with ESMTP id O0k9wG7GX4N0; Thu, 3 Apr 2025 08:51:09 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1743663069; bh=G3T/114VIvOKkGhtoiXJutATA+Ur7tOhgJZ8O5k4jVg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=dj28I/MrE3x11/YVgUiqW/SgExf3RWNF/qojIB2z2eJ3cK0mL82dhlONyS6qInDmX NjMo3GyG5cCZKPVKeb5RqU00owMsiOT8zs5dAgFitua8H+zEja9KNCXwLBFGUAfyB+ XMrCpaJlo3XWwSl/JwinTw+5AbKUyZPMFOYVQCnSwF+QhF+QSMVQvVmf62XlS242ZO mZSUcxqnMnjQf+7V8h43F3lNL9c6NgahnFV7+efcB3dTFnHa/98kCNuyWWuWpVJdGt 7eecubgxD3kSlJZfAVSBTQgAQHYto00KhNkHITKVBNnpQbiFkgrGSU/VD6du8qXo7r aW7T77cyIVdkw== Date: Thu, 3 Apr 2025 15:38:26 +0900 Message-ID: <9302c446ca95b15b14e08ebd114f732e2a0e579b.1743662198.git.mcsinyx@disroot.org> In-Reply-To: <13709da2a297cfb981e25186c1e247aa5db72193.1743662198.git.mcsinyx@disroot.org> References: <13709da2a297cfb981e25186c1e247aa5db72193.1743662198.git.mcsinyx@disroot.org> 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: =?utf-8?b?Tmd1eeG7hW4=?= Gia Phong X-ACL-Warn: , =?utf-8?q?Nguy=E1=BB=85n_Gia_Phong_via_Guix-patches?= X-Patchwork-Original-From: guix-patches--- via From: 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 * gnu/packages/sdl.scm (sdl3-image): New variable. Change-Id: I744f515aa7b4c814db86d21209ea31666b19ef3f --- On 2025-04-02 at 14:49, Z572 wrote: > > + (arguments '(#:configure-flags '("-DSDLIMAGE_AVIF_SHARED=OFF" > > + "-DSDLIMAGE_TIF_SHARED=OFF" > > + "-DSDLIMAGE_WEBP_SHARED=OFF" > > why set them? What happens if you don't set it? Tests would fail to dynamically look up the shared libraries somehow. I assume the same happens to non-tests too. Since the linked libraries in Guix are shared object, this does not risks linking to them statically. I added a brief comment above the flags. gnu/packages/sdl.scm | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/gnu/packages/sdl.scm b/gnu/packages/sdl.scm index ebc27596d8f1..71f94bf11b22 100644 --- a/gnu/packages/sdl.scm +++ b/gnu/packages/sdl.scm @@ -713,6 +713,29 @@ (define-public sdl3-gfx (license license:zlib) (properties '((upstream-name . "SDL3_gfx"))))) +(define-public sdl3-image + (package (inherit sdl2-image) + (name "sdl3-image") + (version "3.2.4") + (source + (origin + (method url-fetch) + (uri + (string-append "https://www.libsdl.org/projects/SDL_image/release/" + "SDL3_image-" version ".tar.gz")) + (sha256 + (base32 "10n1rxyswchd8vppalh2bl3ah5fww5chd5cdvnhds7r60invs9d7")))) + (build-system cmake-build-system) + (arguments + ;; Link the libraries instead of dlopening them. + '(#:configure-flags '("-DSDLIMAGE_AVIF_SHARED=OFF" + "-DSDLIMAGE_TIF_SHARED=OFF" + "-DSDLIMAGE_WEBP_SHARED=OFF" + "-DSDLIMAGE_TESTS=ON"))) + (propagated-inputs + (list sdl3 libavif libjpeg-turbo libpng libtiff libwebp)) + (properties '((upstream-name . "SDL3_image"))))) + (define-public sdl3-ttf (package (inherit sdl2-ttf) (name "sdl3-ttf")