Merge pull request #9448 from heitbaum/pkg

Package updates
2025-07-24 11:16:51 +00:00 · 2024-10-29 19:48:29 +01:00 · 2024-10-29 19:48:29 +01:00 · b6790c80ee
commit b6790c80ee
parent aacdbf8a0c 44db9c9eed
6 changed files with 39 additions and 34 deletions
--- a/packages/audio/libopenmpt/package.mk
+++ b/packages/audio/libopenmpt/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libopenmpt"
-PKG_VERSION="0.7.10"
-PKG_SHA256="093713c1c1024f4f10c4779a66ceb2af51fb7c908a9e99feb892d04019220ba1"
+PKG_VERSION="0.7.11"
+PKG_SHA256="53a798b8c6e2e1f695e8ad05e93a0c1b53199e5aa9981837c41696b370520767"
 PKG_LICENSE="BSD"
 PKG_SITE="https://lib.openmpt.org/libopenmpt/"
 PKG_URL="https://lib.openmpt.org/files/libopenmpt/src/${PKG_NAME}-${PKG_VERSION}+release.autotools.tar.gz"
--- a/packages/devel/libcap/package.mk
+++ b/packages/devel/libcap/package.mk
@ -4,8 +4,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="libcap"
-PKG_VERSION="2.70"
-PKG_SHA256="23a6ef8aadaf1e3e875f633bb2d116cfef8952dba7bc7c569b13458e1952b30f"
+PKG_VERSION="2.71"
+PKG_SHA256="b7006c9af5168315f35fc734bf1a8d2aa70766bd8b8c4340962e05b19c35b900"
 PKG_LICENSE="GPL"
 PKG_SITE="https://git.kernel.org/pub/scm/libs/libcap/libcap.git/log/"
 PKG_URL="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${PKG_NAME}-${PKG_VERSION}.tar.xz"
--- a/packages/python/devel/setuptools/package.mk
+++ b/packages/python/devel/setuptools/package.mk
@ -3,8 +3,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="setuptools"
-PKG_VERSION="75.2.0"
-PKG_SHA256="753bb6ebf1f465a1912e19ed1d41f403a79173a9acf66a42e7e6aec45c3c16ec"
+PKG_VERSION="75.3.0"
+PKG_SHA256="fba5dd4d766e97be1b1681d98712680ae8f2f26d7881245f2ce9e40714f1a686"
 PKG_LICENSE="OSS"
 PKG_SITE="https://pypi.org/project/setuptools"
 PKG_URL="https://files.pythonhosted.org/packages/source/${PKG_NAME:0:1}/${PKG_NAME}/${PKG_NAME,,}-${PKG_VERSION}.tar.gz"
--- a/packages/python/devel/waf/package.mk
+++ b/packages/python/devel/waf/package.mk
@ -2,8 +2,8 @@
 # Copyright (C) 2019-present Team LibreELEC (https://libreelec.tv)

 PKG_NAME="waf"
-PKG_VERSION="2.1.2"
-PKG_SHA256="170cd93799843da4d058f4918592266244e477441ec5044e97b3df71839fa7b9"
+PKG_VERSION="2.1.3"
+PKG_SHA256="d580873e9461c55fb91fa03d21eb9872c3acbdec6793448ab50746958d3d7757"
 PKG_LICENSE="MIT"
 PKG_SITE="https://waf.io"
 PKG_URL="https://waf.io/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
--- a/packages/x11/lib/xtrans/patches/0001-Revert-is_numeric-Add-TRANS_SERVER-to-required-ifdef.patch
+++ b/packages/x11/lib/xtrans/patches/0001-Revert-is_numeric-Add-TRANS_SERVER-to-required-ifdef.patch
@ -1,26 +0,0 @@
-From 7bbfdbdce20179acac2581fa7441594e1942a4c7 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sat, 19 Oct 2024 12:01:05 +0000
-Subject: [PATCH] Revert "is_numeric: Add TRANS_SERVER to required ifdefs"
-
-This reverts commit 0f153064bfa4bb69e86f3f2383f2f421f2360319.
---
- Xtranssock.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Xtranssock.c b/Xtranssock.c
-index c9823bd..e380e70 100644
--- a/Xtranssock.c
-+++ b/Xtranssock.c
-@@ -196,7 +196,7 @@ static Sockettrans2dev Sockettrans2devtab[] = {
- static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
- #endif
- 
-#if (defined(TCPCONN) && defined(TRANS_SERVER)) || defined(TRANS_REOPEN)
-+#if defined(TCPCONN) || defined(TRANS_REOPEN)
- static int
- is_numeric (const char *str)
- {
-- 
-2.43.0
-
--- a/packages/x11/lib/xtrans/patches/xtrans-23-is_numeric-Add-defined-IPv6-to-checks.patch
+++ b/packages/x11/lib/xtrans/patches/xtrans-23-is_numeric-Add-defined-IPv6-to-checks.patch
@ -0,0 +1,31 @@
+From c4207a952484ae1e128da75c87d0a7defba8cdb4 Mon Sep 17 00:00:00 2001
+From: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue, 22 Oct 2024 14:44:46 -0700
+Subject: [PATCH] is_numeric: Add !defined(IPv6) to checks
+
+Fixes builds without IPv6 support, since old IPv4 code uses is_numeric()
+
+Closes: #6
+Fixes: 0f15306 ("is_numeric: Add TRANS_SERVER to required ifdefs")
+Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+---
+ Xtranssock.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Xtranssock.c b/Xtranssock.c
+index c9823bd..a313b46 100644
+--- a/Xtranssock.c
+++ b/Xtranssock.c
+@@ -196,7 +196,8 @@ static Sockettrans2dev Sockettrans2devtab[] = {
+ static int TRANS(SocketINETClose) (XtransConnInfo ciptr);
+ #endif
+ 
+-#if (defined(TCPCONN) && defined(TRANS_SERVER)) || defined(TRANS_REOPEN)
+#if (defined(TCPCONN) && defined(TRANS_SERVER)) || defined(TRANS_REOPEN) || \
+    !defined(IPv6)
+ static int
+ is_numeric (const char *str)
+ {
+-- 
+GitLab
+