From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5A1B2158041 for ; Sat, 16 Mar 2024 09:47:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 794B7E29F2; Sat, 16 Mar 2024 09:47:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58CAEE29F2 for ; Sat, 16 Mar 2024 09:47:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3BF28335DC2 for ; Sat, 16 Mar 2024 09:47:50 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A07E7118C for ; Sat, 16 Mar 2024 09:47:48 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1710582464.724f0706fd7bf2f584dffbb3bb5fb71d482d0f98.juippis@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-astronomy/siril/, sci-astronomy/siril/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch sci-astronomy/siril/siril-1.2.1.ebuild X-VCS-Directories: sci-astronomy/siril/files/ sci-astronomy/siril/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: 724f0706fd7bf2f584dffbb3bb5fb71d482d0f98 X-VCS-Branch: master Date: Sat, 16 Mar 2024 09:47:48 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: baf444bf-b469-4857-bd95-82039c4f3b16 X-Archives-Hash: 666afc8d002eca729a404a61b8b45513 commit: 724f0706fd7bf2f584dffbb3bb5fb71d482d0f98 Author: Mario Haustein hrz tu-chemnitz de> AuthorDate: Fri Feb 16 21:05:48 2024 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Sat Mar 16 09:47:44 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=724f0706 sci-astronomy/siril: fix build on musl Closes: https://bugs.gentoo.org/924664 Signed-off-by: Mario Haustein hrz.tu-chemnitz.de> Closes: https://github.com/gentoo/gentoo/pull/35331 Signed-off-by: Joonas Niilola gentoo.org> .../siril/files/siril-1.2-fseek64-musl.patch | 52 ++++++++++++++++++++++ sci-astronomy/siril/siril-1.2.1.ebuild | 1 + 2 files changed, 53 insertions(+) diff --git a/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch b/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch new file mode 100644 index 000000000000..310ae0cdb6d3 --- /dev/null +++ b/sci-astronomy/siril/files/siril-1.2-fseek64-musl.patch @@ -0,0 +1,52 @@ +From 7f09478f4522b65b476c788a696159e5a4974286 Mon Sep 17 00:00:00 2001 +From: Natanael Copa +Date: Wed, 13 Dec 2023 21:00:08 +0100 +Subject: [PATCH] Clean up and fix fseek64/ftell64 +Upstream: https://gitlab.com/free-astro/siril/-/merge_requests/606 + +Test for the exception systems, GNU and Windows, and then fall back to +standard POSIX. + +This fixes build with musl libc, which does not have fseeko64/ftello64. + +Fixes https://gitlab.com/free-astro/siril/-/issues/1241 +--- a/src/io/avi_pipp/pipp_utf8.h ++++ b/src/io/avi_pipp/pipp_utf8.h +@@ -31,27 +31,15 @@ + #endif + + // 64-bit fseek for various platforms +-#ifdef __linux__ +-#define fseek64 fseeko64 // Linux +-#define ftell64 ftello64 // Linux +-#elif defined (OS_OSX) +-#define fseek64 fseeko // OS X +-#define ftell64 ftello // OS X +-#elif defined(BSD) +-#define fseek64 fseeko // DragonFly BSD, FreeBSD, OpenBSD, NetBSD +-#define ftell64 ftello // DragonFly BSD, FreeBSD, OpenBSD, NetBSD +-#elif defined (__FreeBSD_kernel__) && defined (__GLIBC__) +-#define fseek64 fseeko64 // KFreeBSD +-#define ftell64 ftello64 // KFreeBSD +-#elif defined (__gnu_hurd__) +-#define fseek64 fseeko64 // GNU/Hurd +-#define ftell64 ftello64 // GNU/Hurd +-#elif defined(__CYGWIN__) +-#define fseek64 fseeko // CYGWIN +-#define ftell64 ftello // CYGWIN +-#else ++#if defined(__GLIBC__) || defined(__gnu_hurd__) ++#define fseek64 fseeko64 // GNU ++#define ftell64 ftello64 // GNU ++#elif defined(_WIN32) + #define fseek64 _fseeki64 // Windows + #define ftell64 _ftelli64 // Windows ++#else // POSIX ++#define fseek64 fseeko // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl ++#define ftell64 ftello // OS X, DragonFly BSD, FreeBSD, OpenBSD, NetBSD, musl + #endif + + #endif // PIPP_UTF8_H +-- +GitLab + diff --git a/sci-astronomy/siril/siril-1.2.1.ebuild b/sci-astronomy/siril/siril-1.2.1.ebuild index f230b3469ec6..090db889b8d2 100644 --- a/sci-astronomy/siril/siril-1.2.1.ebuild +++ b/sci-astronomy/siril/siril-1.2.1.ebuild @@ -52,6 +52,7 @@ BDEPEND="dev-build/cmake PATCHES=( "${FILESDIR}/${PN}-docfiles.patch" + "${FILESDIR}/${PN}-1.2-fseek64-musl.patch" ) DOCS=( README.md NEWS ChangeLog AUTHORS )