diff --git a/packages/addons/addon-depends/system-tools-depends/screen/package.mk b/packages/addons/addon-depends/system-tools-depends/screen/package.mk index 79d9ea68dc..9004e63225 100644 --- a/packages/addons/addon-depends/system-tools-depends/screen/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/screen/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="screen" -PKG_VERSION="4.9.1" -PKG_SHA256="26cef3e3c42571c0d484ad6faf110c5c15091fbf872b06fa7aa4766c7405ac69" +PKG_VERSION="5.0.0" +PKG_SHA256="f04a39d00a0e5c7c86a55338808903082ad5df4d73df1a2fd3425976aed94971" PKG_LICENSE="GPL" PKG_SITE="https://www.gnu.org/software/screen/" PKG_URL="https://ftpmirror.gnu.org/screen/${PKG_NAME}-${PKG_VERSION}.tar.gz" @@ -13,8 +13,10 @@ PKG_BUILD_FLAGS="-sysroot -parallel" PKG_TOOLCHAIN="autotools" PKG_CONFIGURE_OPTS_TARGET="ac_cv_header_utempter_h=no \ - --enable-colors256 \ --disable-pam \ - --disable-use-locale \ --disable-telnet \ --disable-socket-dir" + +pre_configure_target() { + TARGET_CONFIGURE_OPTS=$(echo ${TARGET_CONFIGURE_OPTS} | sed -e "s|--disable-static||" -e "s|--enable-shared||") +} diff --git a/packages/addons/addon-depends/system-tools-depends/screen/patches/screen-0001.patch b/packages/addons/addon-depends/system-tools-depends/screen/patches/screen-0001.patch new file mode 100644 index 0000000000..dda4a4f67a --- /dev/null +++ b/packages/addons/addon-depends/system-tools-depends/screen/patches/screen-0001.patch @@ -0,0 +1,114 @@ +diff -Nu screen-5.0.0/display.c screen-5.0.0/display.c +--- screen-5.0.0/display.c 2024-08-28 19:55:03.000000000 +0000 ++++ screen-5.0.0/display.c 2024-08-29 18:08:34.942979909 +0000 +@@ -47,7 +47,7 @@ + #include "mark.h" + #include "misc.h" + #include "process.h" +-#include "pty.h" ++#include "screen-pty.h" + #include "resize.h" + #include "termcap.h" + #include "tty.h" +diff -Nu screen-5.0.0/Makefile.in screen-5.0.0/Makefile.in +--- screen-5.0.0/Makefile.in 2024-08-28 19:55:03.000000000 +0000 ++++ screen-5.0.0/Makefile.in 2024-08-29 18:10:05.120409357 +0000 +@@ -66,7 +66,7 @@ + $(CC) $(LDFLAGS) -o $@ $(OFILES) $(LIBS) + + .c.o: +- $(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ ++ $(CC) -c -I$(srcdir) $(CPPFLAGS) $(CFLAGS) $< -o $@ + + check: $(TESTBIN) + for f in $(TESTBIN); do \ +@@ -197,12 +197,12 @@ + logfile.h mark.h input.h + tty.o: tty.c config.h screen.h os.h ansi.h sched.h acls.h comm.h layer.h \ + term.h image.h canvas.h display.h layout.h viewport.h window.h logfile.h \ +- fileio.h misc.h pty.h telnet.h tty.h ++ fileio.h misc.h screen-pty.h telnet.h tty.h + term.o: term.c term.h + window.o: window.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h fileio.h help.h \ +- input.h mark.h misc.h process.h pty.h resize.h telnet.h termcap.h tty.h \ ++ input.h mark.h misc.h process.h screen-pty.h resize.h telnet.h termcap.h tty.h \ + utmp.h + utmp.o: utmp.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ +@@ -229,7 +229,7 @@ + display.o: display.c config.h screen.h os.h ansi.h sched.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h winmsg.h winmsgbuf.h winmsgcond.h backtick.h encoding.h mark.h \ +- misc.h process.h pty.h resize.h termcap.h tty.h ++ misc.h process.h screen-pty.h resize.h termcap.h tty.h + comm.o: comm.c config.h os.h screen.h ansi.h sched.h acls.h comm.h \ + layer.h term.h image.h canvas.h display.h layout.h viewport.h window.h \ + logfile.h +diff -Nu screen-5.0.0/pty.c screen-5.0.0/pty.c +--- screen-5.0.0/pty.c 2024-08-28 19:55:03.000000000 +0000 ++++ screen-5.0.0/pty.c 2024-08-29 18:09:06.889919017 +0000 +@@ -28,7 +28,7 @@ + + #include "config.h" + +-#include "pty.h" ++#include "screen-pty.h" + + #include + +diff -Nu screen-5.0.0/pty.h screen-5.0.0/pty.h +--- screen-5.0.0/pty.h 2024-08-28 19:55:03.000000000 +0000 ++++ screen-5.0.0/pty.h 1970-01-01 00:00:00.000000000 +0000 +@@ -1,11 +0,0 @@ +-#ifndef SCREEN_PTY_H +-#define SCREEN_PTY_H +- +-int OpenPTY (char **); +-int ClosePTY (int); +- +-/* global variables */ +- +-extern int pty_preopen; +- +-#endif /* SCREEN_PTY_H */ +diff -Nu screen-5.0.0/screen-pty.h screen-5.0.0/screen-pty.h +--- screen-5.0.0/screen-pty.h 1970-01-01 00:00:00.000000000 +0000 ++++ screen-5.0.0/screen-pty.h 2024-08-28 19:55:03.000000000 +0000 +@@ -0,0 +1,11 @@ ++#ifndef SCREEN_PTY_H ++#define SCREEN_PTY_H ++ ++int OpenPTY (char **); ++int ClosePTY (int); ++ ++/* global variables */ ++ ++extern int pty_preopen; ++ ++#endif /* SCREEN_PTY_H */ +diff -Nu screen-5.0.0/tty.c screen-5.0.0/tty.c +--- screen-5.0.0/tty.c 2024-08-28 19:55:03.000000000 +0000 ++++ screen-5.0.0/tty.c 2024-08-29 18:09:19.073355563 +0000 +@@ -44,7 +44,7 @@ + #include "screen.h" + #include "fileio.h" + #include "misc.h" +-#include "pty.h" ++#include "screen-pty.h" + #include "telnet.h" + #include "tty.h" + +diff -Nu screen-5.0.0/window.c screen-5.0.0/window.c +--- screen-5.0.0/window.c 2024-08-28 19:55:03.000000000 +0000 ++++ screen-5.0.0/window.c 2024-08-29 18:14:12.542433618 +0000 +@@ -48,7 +48,7 @@ + #include "mark.h" + #include "misc.h" + #include "process.h" +-#include "pty.h" ++#include "screen-pty.h" + #include "resize.h" + #include "telnet.h" + #include "termcap.h" diff --git a/packages/addons/addon-depends/system-tools-depends/screen/patches/screen-01_fix_gcc-14_build.patch b/packages/addons/addon-depends/system-tools-depends/screen/patches/screen-01_fix_gcc-14_build.patch deleted file mode 100644 index f7142ee0ab..0000000000 --- a/packages/addons/addon-depends/system-tools-depends/screen/patches/screen-01_fix_gcc-14_build.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/pty.c b/pty.c -index 6791fd5..9ef1471 100644 ---- a/pty.c -+++ b/pty.c -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - - #if defined(__OpenBSD__) - #include /* for openpty() */