Merge pull request #9588 from heitbaum/pkg

Package updates

packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-01_crosscompile.patch

@@ -2,8 +2,8 @@ diff --git a/Makefile b/Makefile
 index f98abbd..9d1d524 100755
 --- a/Makefile
 +++ b/Makefile
-@@ -9,13 +9,13 @@ EXEC=hid_mapper
+@@ -38,13 +38,13 @@ EXEC=hid_mapper
- VERSION=1.0
+ VERSION=2.1.0
  
  all: $(OBJS)
 -	g++ $(LDFLAGS) $(OBJS) -o $(EXEC)
@@ -17,5 +17,5 @@ index f98abbd..9d1d524 100755
 -	gcc -c $(CFLAGS) $<
 +	${CC} -c $(CFLAGS) $<
  
- deb:
+ deb: all
- 	cp $(EXEC) package/usr/bin
+ 	rm -rf package/

packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-02_Fix-key-code-reading.patch

@@ -0,0 +1,160 @@
+From 79bd13b1a56746d3a848444b5d95bb1739e3c3e2 Mon Sep 17 00:00:00 2001
+From: Diomidis Spinellis <dds@aueb.gr>
+Date: Fri, 1 Nov 2019 22:32:17 +0200
+Subject: [PATCH 1/4] Include required header file for fd_set
+
+---
+ hid.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hid.c b/hid.c
+index 42829ee..cf07c9b 100644
+--- a/hid.c
++++ b/hid.c
+@@ -17,6 +17,7 @@
+  * Author: Thibault Kummer <bob@coldsource.net>
+  */
+ 
++#include <sys/select.h>
+ #include <hid.h>
+ #include <log.h>
+ #include <fcntl.h>
+
+From 53b4b1f8570510bd158676957469b2fa05088218 Mon Sep 17 00:00:00 2001
+From: Diomidis Spinellis <dds@aueb.gr>
+Date: Fri, 1 Nov 2019 22:37:12 +0200
+Subject: [PATCH 2/4] Fix clash with built-in log function
+
+---
+ include/log.h |  4 ++--
+ log.cpp       | 12 ++++++------
+ 2 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/include/log.h b/include/log.h
+index 39c58e4..3358e74 100644
+--- a/include/log.h
++++ b/include/log.h
+@@ -33,8 +33,8 @@ typedef enum LogLevel {
+ 
+ extern int currentLogLevel;
+ 
+-void log(LogLevel severity, const char* fmt, va_list args);
+-//void log(LogLevel severity, const char* fmt, ...);
++void logmsg(LogLevel severity, const char* fmt, va_list args);
++//void logmsg(LogLevel severity, const char* fmt, ...);
+ 
+ void info(const char* fmt, ...);
+ void warn(const char* fmt, ...);
+diff --git a/log.cpp b/log.cpp
+index 8325447..a834abc 100644
+--- a/log.cpp
++++ b/log.cpp
+@@ -28,18 +28,18 @@ const char* headers[] = {
+ 	"ERRO",
+ };
+ 
+-void log(LogLevel severity, const char* fmt, va_list args) {
++void logmsg(LogLevel severity, const char* fmt, va_list args) {
+ 	if (severity < currentLogLevel) {
+ 		vfprintf(stderr, fmt, args);
+ 		putc('\n', stderr);
+ 	}
+ }
+ 
+-void log(LogLevel severity, const char* fmt, ...)
++void logmsg(LogLevel severity, const char* fmt, ...)
+ {
+ 	va_list args;
+ 	va_start(args, fmt);
+-	log(severity, fmt, args);
++	logmsg(severity, fmt, args);
+ 	va_end(args);
+ 
+ }
+@@ -48,7 +48,7 @@ void info(const char* fmt, ...)
+ {
+ 	va_list args;
+ 	va_start(args, fmt);
+-	log(LOG_INFO, fmt, args);
++	logmsg(LOG_INFO, fmt, args);
+ 	va_end(args);
+ }
+ 
+@@ -56,7 +56,7 @@ void warn(const char* fmt, ...)
+ {
+ 	va_list args;
+ 	va_start(args, fmt);
+-	log(LOG_WARN, fmt, args);
++	logmsg(LOG_WARN, fmt, args);
+ 	va_end(args);
+ }
+ 
+@@ -64,7 +64,7 @@ void error(const char* fmt, ...)
+ {
+ 	va_list args;
+ 	va_start(args, fmt);
+-	log(LOG_ERROR, fmt, args);
++	logmsg(LOG_ERROR, fmt, args);
+ 	va_end(args);
+ }
+ 
+
+From f6ca23e74bf493e379ca63b0be1a20ee3a21572d Mon Sep 17 00:00:00 2001
+From: Diomidis Spinellis <dds@aueb.gr>
+Date: Fri, 1 Nov 2019 22:38:07 +0200
+Subject: [PATCH 3/4] Add header required for strcmp
+
+---
+ hid.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hid.c b/hid.c
+index cf07c9b..563b548 100644
+--- a/hid.c
++++ b/hid.c
+@@ -24,6 +24,7 @@
+ #include <unistd.h>
+ #include <dirent.h>
+ #include <stdio.h>
++#include <string.h>
+ 
+ #define SYSFS_HIDRAW_CLASS_PATH "/sys/class/hidraw"
+ 
+
+From a38e46cf4907ef47b86bd039c430b2abd1af5712 Mon Sep 17 00:00:00 2001
+From: Diomidis Spinellis <dds@aueb.gr>
+Date: Fri, 1 Nov 2019 23:17:38 +0200
+Subject: [PATCH 4/4] Fix key code reading
+
+- Rewrite statement with undefined behavior
+- Show unknown keys
+---
+ MapReader.cpp | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/MapReader.cpp b/MapReader.cpp
+index aa86f32..02e9715 100644
+--- a/MapReader.cpp
++++ b/MapReader.cpp
+@@ -105,8 +105,10 @@ void MapReader::LoadMap(const char *filename,EventMapping *map)
+ 			
+ 			i = 0;
+ 
+-			while(i<KEY_NAME_MAXLENGTH && ptr[i]!='\0' && ptr[i]!='\n' && (!isspace(ptr[i])))
+-				key_name[i] = ptr[i++];
++			while(i<KEY_NAME_MAXLENGTH && ptr[i]!='\0' && ptr[i]!='\n' && (!isspace(ptr[i]))) {
++				key_name[i] = ptr[i];
++				i++;
++			}
+ 			
+ 			if(i==KEY_NAME_MAXLENGTH)
+ 			{
+@@ -150,7 +152,7 @@ void MapReader::LoadMap(const char *filename,EventMapping *map)
+ 				key = Keys::Lookup(key_name);
+ 				if(key<0)
+ 				{
+-					sprintf(error,"Unknown key name at line %d",line);
++					sprintf(error,"Unknown key name [%s] at line %d", key_name, line);
+ 					throw Exception("MapReader",error);
+ 				}
+ 			}

packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-03_fix-parser.patch

@@ -1,14 +0,0 @@
---- a/MapReader.cpp
-+++ b/MapReader.cpp
-@@ -106,7 +106,10 @@
- 			i = 0;
- 
- 			while(i<KEY_NAME_MAXLENGTH && ptr[i]!='\0' && ptr[i]!='\n' && (!isspace(ptr[i])))
--				key_name[i] = ptr[i++];
-+				{
-+					key_name[i] = ptr[i];
-+					i++;
-+				}
- 			
- 			if(i==KEY_NAME_MAXLENGTH)
- 			{

packages/addons/addon-depends/system-tools-depends/hid_mapper/patches/hid_mapper-03_include-sys-time.patch

@@ -2,12 +2,11 @@ diff --git a/hid.c b/hid.c
 index 2830b58..a652222 100644
 --- a/hid.c
 +++ b/hid.c
-@@ -23,6 +23,8 @@
+@@ -24,6 +24,7 @@
  #include <unistd.h>
  #include <dirent.h>
  #include <stdio.h>
 +#include <sys/time.h>
-+#include <string.h>
+ #include <string.h>
  
  #define SYSFS_HIDRAW_CLASS_PATH "/sys/class/hidraw"
- 

packages/audio/espeak-ng/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="espeak-ng"
-PKG_VERSION="1.51.1"
+PKG_VERSION="1.52.0"
-PKG_SHA256="0823df5648659dcb67915baaf99118dcc8853639f47cadaa029c174bdd768d20"
+PKG_SHA256="bb4338102ff3b49a81423da8a1a158b420124b055b60fa76cfb4b18677130a23"
 PKG_LICENSE="GPL"
 PKG_SITE="https://github.com/espeak-ng/espeak-ng"
 PKG_URL="https://github.com/espeak-ng/espeak-ng/archive/refs/tags/${PKG_VERSION}.tar.gz"

packages/audio/espeak-ng/patches/PR1858-fix-compiling-in-build-directory.patch

@@ -1,23 +0,0 @@
-From 9e6083c12a41334b2817b443d430637f01ee5fb9 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Sun, 14 Jan 2024 11:33:08 +1100
-Subject: [PATCH] fix compiling in build directory
-
-$(srcdir) was missing on includes for src/include/espeak-ng/espeak-ng.h
----
- Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 595546899..d8671efa3 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -16,7 +16,7 @@ SHARED_VERSION=2:51:1 # = *.so.1.1.51
- MKDIR=mkdir -p
- 
- AM_CFLAGS = \
--	-Isrc/include -Isrc/include/compat -I$(srcdir)/src/speechPlayer/include -I$(srcdir)/src/ucd-tools/src/include \
-+	-I$(srcdir)/src/include -Isrc/include/compat -I$(srcdir)/src/speechPlayer/include -I$(srcdir)/src/ucd-tools/src/include \
- 	-D_BSD_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200112L
- AM_CXXFLAGS =
- 

packages/debug/memtester/package.mk

@@ -2,8 +2,8 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="memtester"
-PKG_VERSION="4.5.1"
+PKG_VERSION="4.7.1"
-PKG_SHA256="1c5fc2382576c084b314cfd334d127a66c20bd63892cac9f445bc1d8b4ca5a47"
+PKG_SHA256="e427de663f7bd22d1ebee8af12506a852c010bd4fcbca1e0e6b02972d298b5bb"
 PKG_LICENSE="GPL"
 PKG_SITE="http://pyropus.ca/software/memtester/"
 PKG_URL="http://pyropus.ca/software/memtester/old-versions/memtester-${PKG_VERSION}.tar.gz"