umip: Fix build incompatibilities
PATCH 1/2 umip: Fix build incompatibilities
musl exposes some build issues which require portable code.
Signed-off-by Khem Raj <[email protected]>
--- ...GCLD-with-SIGCHLD-and-include-sys-types.h.patch | 49 +++++++ ...READ_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch | 143 +++++++++++++++++++++ meta-oe/recipes-connectivity/umip/umip_1.0.bb | 2 + 3 files changed, 194 insertions(+) create mode 100644 meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch create mode 100644 meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch
meta-oe/recipes-connectivity/umip/files/0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch new file +49 -0
@@ -0,0 +1,49 @@ +From f567740cf64978ac9db014c786b6d0267b244f33 Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Sun, 4 Mar 2018 22:30:30 -0800 +Subject: [PATCH 1/2] replace SIGCLD with SIGCHLD and include sys/types.h + +Fixes +main.c:129:10: error: 'SIGCLD' undeclared (first use in this function); did you mean 'SIGCHLD'? + signal(SIGCLD, sig_child); + ^~~~~~ + SIGCHLD + +main.c:125:2: warning: implicit declaration of function 'umask' [-Wimplicit-function-declaration] + umask(0); + ^~~~~ + +Signed-off-by: Khem Raj <[email protected]> +--- +Upstream-Status: Pending + + src/main.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/src/main.c b/src/main.c +index 3cf4072..cd34196 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -31,6 +31,7 @@ + #include <sys/ioctl.h> + #include <sys/wait.h> + #include <sys/param.h> ++#include <sys/types.h> + #include <pthread.h> + #include <fcntl.h> + #include <unistd.h> +@@ -126,9 +127,9 @@ static void daemon_start(int ignsigcld) + + if (ignsigcld) { + #ifdef SIGTSTP +- signal(SIGCLD, sig_child); ++ signal(SIGCHLD, sig_child); + #else +- signal(SIGCLD, SIG_IGN); ++ signal(SIGCHLD, SIG_IGN); + #endif + } + } +-- +2.16.2 +
meta-oe/recipes-connectivity/umip/files/0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch new file +143 -0
143 lines not on this page · raw message
meta-oe/recipes-connectivity/umip/umip_1.0.bb +2 -0
@@ -14,6 +14,8 @@ SRC_URI = "git://github.com/jlanza/umip \ file://mip6d \ file://mip6d.service \ file://0001-Add-format-string-to-fprintf-call.patch \ + file://0001-replace-SIGCLD-with-SIGCHLD-and-include-sys-types.h.patch \ + file://0002-replace-PTHREAD_MUTEX_FAST_NP-with-PTHREAD_MUTEX_NOR.patch \ " SRCREV = "7d67209cd1bba2dd0e183a0fa07eeef07964dd14"
Signature · 1 line
2.16.2
PATCH 2/2 mpv: Adjust for the recent waf bbclass updates
waf bbclass now expects waf to be an executable script
in ${S} before do_configure, otherwise it ends up in ugly python stack traces
Signed-off-by Khem Raj <[email protected]>
--- meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
meta-oe/recipes-multimedia/mplayer/mpv_0.26.0.bb +4 -3
@@ -16,7 +16,7 @@ LICENSE_FLAGS = "commercial" SRC_URI = " \ https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz;name=mpv \ - http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;subdir=${BPN}-${PV} \ + http://www.freehackers.org/~tnagy/release/waf-1.8.12;name=waf;downloadfilename=waf;subdir=${BPN}-${PV} \ " SRC_URI[mpv.md5sum] = "038d0b660de07ff645ad6a741704ecab" SRC_URI[mpv.sha256sum] = "daf3ef358d5f260f2269f7caabce27f446c291457ec330077152127133b71b46"
@@ -64,9 +64,10 @@ EXTRA_OECONF = " \ ${PACKAGECONFIG_CONFARGS} \ " -do_configure_prepend () { - ln -sf waf-1.8.12 ${S}/waf +adjust_waf_perms() { chmod +x ${S}/waf } +do_patch[postfuncs] += "adjust_waf_perms" + FILES_${PN} += "${datadir}/icons"
Signature · 1 line
2.16.2