V4 for musl

meta-openpli/recipes-connectivity/samba/wsdd/wsdd.c

@@ -49,7 +49,12 @@
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <sys/ioctl.h>
+
+#ifdef __GLIBC__
 #include <sys/poll.h>
+#else
+#include <poll.h>
+#endif
 
 #include <time.h>
 #include <pthread.h>

meta-openpli/recipes-multimedia/dvd+rw-tools/dvd+rw-tools_7.1.bb

@@ -13,7 +13,7 @@ SRC_URI = "http://fy.chalmers.se/~appro/linux/DVD+RW/tools/dvd+rw-tools-${PV}.ta
            file://08-cdrkit-code.dpatch;apply=yes \
            file://09-cdrkit-doc.dpatch;apply=yes \
            file://10-includes.dpatch;apply=yes \
-           file://fix-glibc2.28_major.patch \
+           file://add-major-minor.patch \
           "
 
 do_configure() {

meta-openpli/recipes-multimedia/dvd+rw-tools/files/add-major-minor.patch

@@ -0,0 +1,11 @@
+add 'minor' and 'major' for glibc and musl
+--- a/growisofs.c	2021-06-17 15:06:03.161597057 +0200
++++ b/growisofs.c	2021-06-17 15:04:34.601229248 +0200
+@@ -440,6 +440,7 @@
+ #include <string.h>
+ #include <fcntl.h>
+ #include <sys/types.h>
++#include <sys/sysmacros.h>
+ #include <sys/stat.h>
+ #include <assert.h>
+ #include "mp.h"

meta-openpli/recipes-multimedia/tuxtxt/files/0001-libtuxtxt-add-function-prototype-for-writeproc.patch

@@ -0,0 +1,28 @@
+From f0752587e4ebf12bc835aee5c9e96a22ded00ea9 Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 17 Jun 2021 12:40:36 +0200
+Subject: [PATCH 1/4] libtuxtxt: add function prototype for writeproc()
+
+silence build warning about implicit declaration
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ tuxtxt_common.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/tuxtxt_common.h b/tuxtxt_common.h
+index 7fa5168..1e72b5f 100644
+--- a/tuxtxt_common.h
++++ b/tuxtxt_common.h
+@@ -23,6 +23,8 @@
+
+ #include <linux/input.h>
+
++void writeproc(const char* dest, const char *value);
++
+ const char *ObjectSource[] =
+ {
+ 	"(illegal)",
+-- 
+2.17.1
+

meta-openpli/recipes-multimedia/tuxtxt/files/0001-tuxtxt-enigma2-fix-warning-and-build-with-musl.patch

@@ -0,0 +1,33 @@
+From 874596b1768a0e9fdc1919fd9b28be0575fd205f Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Tue, 15 Jun 2021 00:17:39 +0200
+Subject: [PATCH 1/2] tuxtxt-enigma2: fix warning and build with musl
+
+fix
+ | ../git/tuxtxt/tuxtxt.c:215:15: error: storage size of 's' isn't known
+ |   215 |   struct stat s;
+ |       |               ^
+
+With glibc this is only:
+ warning: implicit declaration of function 'stat' [-Wimplicit-function-declaration]
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ tuxtxt.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tuxtxt.h b/tuxtxt.h
+index 7f40b09..c99ae5d 100644
+--- a/tuxtxt.h
++++ b/tuxtxt.h
+@@ -40,6 +40,7 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <sys/types.h>
++#include <sys/stat.h>
+ #include <sys/time.h>
+ #include <ctype.h>
+
+-- 
+2.17.1
+

meta-openpli/recipes-multimedia/tuxtxt/files/0002-libtuxtxt-fix-build-warnings.patch

@@ -0,0 +1,41 @@
+From 1f31172bd370875da49a6538911e2259e29154b5 Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 17 Jun 2021 11:24:55 +0200
+Subject: [PATCH 2/4] libtuxtxt: fix build warnings
+
+In file included from ../git/libtuxtxt/libtuxtxt.c:40:
+../git/libtuxtxt/tuxtxt_common.h: In function 'tuxtxt_RenderCharIntern':
+../git/libtuxtxt/tuxtxt_common.h:4372:14:
+ warning: comparison of distinct pointer types lacks a cast
+ 4372 |       if ((p > pstart) && (memcmp(p-4,bgra[bgcolor],4)==0))
+      |              ^
+../git/libtuxtxt/tuxtxt_common.h:4387:14:
+ warning: comparison of distinct pointer types lacks a cast
+ 4387 |       if ((p > pstart) && (memcmp(p-4,bgra[fgcolor],4)==0))
+      |              ^
+../git/libtuxtxt/tuxtxt_common.h:4415:13:
+ warning: comparison of distinct pointer types lacks a cast
+ 4415 |      if ((p > pstart) && (memcmp(p-4,bgra[fgcolor],4)==0))
+      |             ^
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ tuxtxt_common.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/tuxtxt_common.h b/tuxtxt_common.h
+index 1e72b5f..5e994d7 100644
+--- a/tuxtxt_common.h
++++ b/tuxtxt_common.h
+@@ -4346,7 +4346,7 @@ void tuxtxt_RenderCharIntern(tstRenderInfo* renderinfo,int Char, tstPageAttr *At
+ 		for (Row = he; Row; Row--) /* row counts up, but down may be a little faster :) */
+ 		{
+ 			int pixtodo = (renderinfo->usettf ? renderinfo->sbit->width : curfontwidth);
+-			char *pstart = p;
++			unsigned char *pstart = p;
+
+ 			for (Bit = xfactor * (renderinfo->sbit->left + renderinfo->TTFShiftX); Bit > 0; Bit--) /* fill left margin */
+ 			{
+-- 
+2.17.1
+

meta-openpli/recipes-multimedia/tuxtxt/files/0002-tuxtxt-enigma2-try-to-guess-return-values.patch

@@ -0,0 +1,56 @@
+From 1089cc8c9adf3229f0fbd32de539f2384d7646a3 Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 17 Jun 2021 13:45:12 +0200
+Subject: [PATCH 2/2] tuxtxt-enigma2: try to guess return values
+
+  fix compiler warnings
+  The return values used here are hard to guess. Please review.
+
+../git/tuxtxt/tuxtxt.c: In function 'tuxtxt_run_ui':
+../git/tuxtxt/tuxtxt.c:267:3:
+ warning: 'return' with no value, in function returning non-void
+  267 |   return;
+      |   ^~~~~~
+../git/tuxtxt/tuxtxt.c:178:5:
+ note: declared here
+  178 | int tuxtxt_run_ui(int pid, int demux)
+      |     ^~~~~~~~~~~~~
+../git/tuxtxt/tuxtxt.c:277:3:
+ warning: 'return' with no value, in function returning non-void
+  277 |   return;
+      |   ^~~~~~
+../git/tuxtxt/tuxtxt.c:178:5:
+ note: declared here
+  178 | int tuxtxt_run_ui(int pid, int demux)
+      |     ^~~~~~~~~~~~~
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ tuxtxt.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tuxtxt.c b/tuxtxt.c
+index f550688..9907420 100644
+--- a/tuxtxt.c
++++ b/tuxtxt.c
+@@ -264,7 +264,7 @@ int tuxtxt_run_ui(int pid, int demux)
+ 	if (tuxtxt_cache.vtxtpid == -1 || renderinfo.fb == -1 || renderinfo.sx == -1 || renderinfo.ex == -1 || renderinfo.sy == -1 || renderinfo.ey == -1)
+ 	{
+ 		printf("TuxTxt <Invalid Param(s)>\n");
+-		return;
++		return -1;
+ 	}
+
+ 	/* initialisations */
+@@ -274,7 +274,7 @@ int tuxtxt_run_ui(int pid, int demux)
+ 			tuxtxt_close();
+ 		}
+ #endif
+-		return;
++		return 0;
+ 	}
+
+ 	/* main loop */
+-- 
+2.17.1
+

meta-openpli/recipes-multimedia/tuxtxt/files/0003-libtuxtxt-remove-unnecessary-unset-DEBUG-workaround.patch

@@ -0,0 +1,33 @@
+From aadba41fc81e8860fafa1fb6fb5059025a16318b Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Thu, 17 Jun 2021 10:25:14 +0200
+Subject: [PATCH 3/4] libtuxtxt: remove unnecessary unset DEBUG workaround
+
+Fix build warning about redefined DEBUG
+To disable debug just add  --without-debug  when doing configure.
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ libtuxtxt.c | 6 ------
+ 1 file changed, 6 deletions(-)
+
+diff --git a/libtuxtxt.c b/libtuxtxt.c
+index 476c7db..0376c04 100644
+--- a/libtuxtxt.c
++++ b/libtuxtxt.c
+@@ -18,12 +18,6 @@
+  *                                                                            *
+  ******************************************************************************/
+
+-#ifdef DEBUG
+-#undef DEBUG
+-#endif
+-
+-#define DEBUG 0
+-
+ #include <sys/ioctl.h>
+ #include <fcntl.h>
+
+-- 
+2.17.1
+

meta-openpli/recipes-multimedia/tuxtxt/files/0004-libtuxtxt-fix-build-with-musl.patch

@@ -0,0 +1,36 @@
+From 1bf1641c1d87749c6cdde2228f4c94fc9792941b Mon Sep 17 00:00:00 2001
+From: Andrea Adami <andrea.adami@gmail.com>
+Date: Mon, 14 Jun 2021 23:49:35 +0200
+Subject: [PATCH 4/4] libtuxtxt: fix build with musl
+
+fix
+libtuxtxt.c:47:46: error:
+ 'PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP'
+ undeclared here (not in a function);
+  did you mean 'PTHREAD_MUTEX_INITIALIZER'?
+
+Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
+---
+ libtuxtxt.c | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/libtuxtxt.c b/libtuxtxt.c
+index 0376c04..bc947e2 100644
+--- a/libtuxtxt.c
++++ b/libtuxtxt.c
+@@ -38,7 +38,12 @@
+  ******************************************************************************/
+
+ static int tuxtxt_initialized=0;
++
++#ifdef __GLIBC__
+ static pthread_mutex_t tuxtxt_control_lock = PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP;
++#else
++static pthread_mutex_t tuxtxt_control_lock = {{PTHREAD_MUTEX_RECURSIVE}};
++#endif
+ static pthread_mutex_t tuxtxt_key_queue_lock = PTHREAD_MUTEX_INITIALIZER;
+
+ int tuxtxt_init()
+-- 
+2.17.1
+

meta-openpli/recipes-multimedia/tuxtxt/libtuxtxt.bb

@@ -3,16 +3,21 @@ LICENSE = "LGPLv2.1"
 LIC_FILES_CHKSUM = "file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
 DEPENDS = "libpng freetype zlib"
 
-inherit gitpkgv
+inherit  gitpkgv
 
 GITHUB_URI ?= "git://github.com"
-SRC_URI = "${GITHUB_URI}/OpenPLi/tuxtxt.git"
+SRC_URI = "${GITHUB_URI}/OpenPLi/tuxtxt.git \
+	file://0001-libtuxtxt-add-function-prototype-for-writeproc.patch \
+	file://0002-libtuxtxt-fix-build-warnings.patch \
+	file://0003-libtuxtxt-remove-unnecessary-unset-DEBUG-workaround.patch \
+	file://0004-libtuxtxt-fix-build-with-musl.patch \
+	"
 
 S = "${WORKDIR}/git/libtuxtxt"
 
 PV = "2.0+git${SRCPV}"
 PKGV = "2.0+git${GITPKGV}"
 
-EXTRA_OECONF = "--with-boxtype=generic DVB_API_VERSION=5"
-
 inherit autotools pkgconfig
+
+EXTRA_OECONF = "--with-boxtype=generic DVB_API_VERSION=5 --without-debug"

meta-openpli/recipes-multimedia/tuxtxt/tuxtxt-enigma2.bb

@@ -7,7 +7,10 @@ DESCRIPTION = "tuxbox tuxtxt for enigma2"
 inherit gitpkgv
 
 GITHUB_URI ?= "git://github.com"
-SRC_URI = "${GITHUB_URI}/OpenPLi/tuxtxt.git"
+SRC_URI = "${GITHUB_URI}/OpenPLi/tuxtxt.git \
+	file://0001-tuxtxt-enigma2-fix-warning-and-build-with-musl.patch \
+	file://0002-tuxtxt-enigma2-try-to-guess-return-values.patch \
+	"
 
 S = "${WORKDIR}/git/tuxtxt"
 

meta-openpli/recipes-openpli/enigma2/enigma2.bb

@@ -24,19 +24,21 @@ RDEPENDS_${PN} = " \
 	alsa-conf \
 	enigma2-fonts \
 	ethtool \
-	glibc-gconv-iso8859-15 \
 	${PYTHON_RDEPS} \
 	"
 
+RDEPENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15"
+
 RRECOMMENDS_${PN} = " \
 	enigma2-plugin-skins-pli-hd \
 	hotplug-e2-helper \
-	glibc-gconv-utf-16 \
 	python-sendfile \
 	ofgwrite \
 	virtual/enigma2-mediaservice \
 	"
 
+RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-utf-16"
+
 PYTHON_RDEPS = " \
 	python-codecs \
 	python-core \
@@ -111,6 +113,7 @@ PKGV = "2.7+git${GITPKGV}"
 ENIGMA2_BRANCH ?= "develop"
 GITHUB_URI ?= "git://github.com"
 SRC_URI = "${GITHUB_URI}/OpenPLi/${BPN}.git;branch=${ENIGMA2_BRANCH}"
+SRC_URI_append_libc-musl = " file://0001-enigma2-fix-build-with-musl.patch"
 
 LDFLAGS_prepend = " -lxml2 "