direwolf: update to 1.7.

This commit is contained in:
classabbyamp 2023-11-09 15:31:12 -05:00
parent d3e2a66485
commit e8eabc48bf
No known key found for this signature in database
GPG key ID: 6BE0755918A4C7F5
2 changed files with 2 additions and 46 deletions

View file

@ -1,44 +0,0 @@
upstreamed in wb2osz/direwolf#394
From 81f2f53675b3a965baa4dad13ee913eec26ce9d1 Mon Sep 17 00:00:00 2001
From: classabbyamp <dev@placeviolette.net>
Date: Mon, 16 May 2022 02:23:26 -0400
Subject: [PATCH] fix compilation on musl
this should allow for compilation on musl libc
possibly fixes #150
---
src/decode_aprs.c | 4 ----
src/direwolf.h | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/src/direwolf.h b/src/direwolf.h
index efc329b..ca12266 100644
--- a/src/direwolf.h
+++ b/src/direwolf.h
@@ -282,7 +282,7 @@ char *strtok_r(char *str, const char *delim, char **saveptr);
char *strcasestr(const char *S, const char *FIND);
-#if defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
+#if ! defined(__GLIBC__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
// strlcpy and strlcat should be in string.h and the C library.
--
2.36.1
--- a/src/decode_aprs.c
+++ b/src/decode_aprs.c
@@ -3930,11 +3930,7 @@
* models before getting to the more generic APY.
*/
-#if defined(__WIN32__) || defined(__OpenBSD__) || defined(__FreeBSD__) || defined(__APPLE__)
qsort (tocalls, num_tocalls, sizeof(struct tocalls_s), tocall_cmp);
-#else
- qsort (tocalls, num_tocalls, sizeof(struct tocalls_s), (__compar_fn_t)tocall_cmp);
-#endif
}
else {
if ( ! A->g_quiet) {

View file

@ -1,6 +1,6 @@
# Template file for 'direwolf'
pkgname=direwolf
version=1.6
version=1.7
revision=1
build_style=cmake
configure_args="-DFORCE_SSE=1 -DRUN_NEON=advanced"
@ -11,5 +11,5 @@ license="GPL-2.0-or-later"
homepage="https://github.com/wb2osz/direwolf"
changelog="https://raw.githubusercontent.com/wb2osz/direwolf/master/CHANGES.md"
distfiles="https://github.com/wb2osz/direwolf/archive/refs/tags/${version}.tar.gz"
checksum=208b0563c9b339cbeb0e1feb52dc18ae38295c40c0009d6381fc4acb68fdf660
checksum=6301f6a43e5db9ef754765875592a58933f6b78585e9272afc850acf7c5914be
python_version=3