jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

packages: change depends to ncurses

Browse Source
This commit is contained in:
cvh 2017-08-18 19:25:48 +02:00
parent a7d53b0004
commit 13f69f494a
25 changed files with 94 additions and 479 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
packages/addons/addon-depends/network-tools-depends/bwm-ng/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gropp.org/?id=projects&sub=bwm-ng"
PKG_URL="https://github.com/vgropp/bwm-ng/archive/v$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses libstatgrab"
PKG_DEPENDS_TARGET="toolchain ncurses libstatgrab"
PKG_SECTION="network/analyzer"
PKG_SHORTDESC="bwm-ng: small and simple console-based live network and disk io bandwidth monitor"
PKG_LONGDESC="Bandwidth Monitor NG is a small and simple console-based live network and disk io bandwidth monitor for Linux, BSD, Solaris, Mac OS X and others."
@ -37,10 +37,6 @@ PKG_CONFIGURE_OPTS_TARGET="--with-libstatgrab \
--with-procnetdev \
--with-partitions"
pre_configure_target() {
export LIBS="-ltermcap"
}
makeinstall_target() {
: # nop
}

7
packages/addons/addon-depends/network-tools-depends/iftop/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://htop.sourceforge.net/"
PKG_URL="http://www.ex-parrot.com/pdw/iftop/download/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses libpcap libnl"
PKG_DEPENDS_TARGET="toolchain ncurses libpcap libnl"
PKG_SECTION="network/analyzer"
PKG_SHORTDESC="iftop: display bandwidth usage on an interface"
PKG_LONGDESC="iftop does for network usage what top(1) does for CPU usage. It listens to network traffic on a named interface and displays a table of current bandwidth usage by pairs of hosts. Handy for answering the question 'why is our ADSL link so slow?'."
@ -35,8 +35,7 @@ pre_build_target() {
}
pre_configure_target() {
export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/pcap"
export LIBS="-lpcap -lnl-3 -lnl-genl-3 -lncurses -ltermcap"
export LIBS="-lpcap -lnl-3 -lnl-genl-3 -lncurses"
}
makeinstall_target() {

5
packages/addons/addon-depends/network-tools-depends/irssi/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.irssi.org/"
PKG_URL="https://github.com/irssi-import/irssi/releases/download/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain glib netbsd-curses openssl"
PKG_DEPENDS_TARGET="toolchain glib ncurses openssl"
PKG_SECTION="tools"
PKG_SHORTDESC="IRC client"
PKG_LONGDESC="Irssi is a terminal based IRC client for UNIX systems"
@ -42,7 +42,6 @@ PKG_CONFIGURE_OPTS_TARGET="--with-sysroot=$SYSROOT_PREFIX \
pre_configure_target() {
export CFLAGS="$CFLAGS -I$PKG_BUILD"
export LIBS="-ltermcap"
}
makeinstall_target() {

2
packages/addons/addon-depends/network-tools-depends/lftp/patches/lftp-0001-link-readline-with-termcap.patch
View File

@ -6,7 +6,7 @@ diff -Naur a/configure b/configure
fi
readline_ld_flags="-L$readline_prefix/lib"
- readline_lib_flags="-lreadline"
+ readline_lib_flags="-lreadline -ltermcap"
+ readline_lib_flags="-lreadline -lncurses"
run_readline_test="yes"
elif test "$readline_requested" = "yes"; then
if test -n "$readline_include_dir" -a -n "$readline_lib_flags"; then

9
packages/addons/addon-depends/system-tools-depends/htop/package.mk
View File

@ -1,5 +1,5 @@
################################################################################
# This file is part of LibreELEC - https://LibreELEC.tv
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
@ -23,11 +23,10 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://hisham.hm/htop"
PKG_URL="https://github.com/hishamhm/htop/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_SECTION="tools"
PKG_SHORTDESC="An interactive process viewer for Unix"
PKG_AUTORECONF="yes"
pre_configure_target() {
export CFLAGS="$CFLAGS -fno-strict-aliasing -lncurses -lterminfo"
}
PKG_CONFIGURE_OPTS_TARGET="--disable-unicode \
HTOP_NCURSES_CONFIG_SCRIPT=ncurses-config"

142
packages/addons/addon-depends/system-tools-depends/htop/patches/htop-01_netbsd-curses_support.patch
View File

@ -1,142 +0,0 @@
From: awiouy <awiouy@gmail.com>
Date: Thu, 6 Jul 2017 18:51:24 +0200
Subject: [PATCH] htop: netbsd-curses support
diff --git a/RichString.c b/RichString.c
--- a/RichString.c
+++ b/RichString.c
@@ -18,21 +18,7 @@ in the source distribution for its full text.
#include <ctype.h>
#include <assert.h>
-#ifdef HAVE_NCURSESW_CURSES_H
-#include <ncursesw/curses.h>
-#elif HAVE_NCURSES_NCURSES_H
-#include <ncurses/ncurses.h>
-#elif HAVE_NCURSES_CURSES_H
-#include <ncurses/curses.h>
-#elif HAVE_NCURSES_H
-#include <ncurses.h>
-#elif HAVE_CURSES_H
#include <curses.h>
-#endif
-
-#ifdef HAVE_LIBNCURSESW
-#include <wctype.h>
-#endif
#define RichString_size(this) ((this)->chlen)
#define RichString_sizeVal(this) ((this).chlen)
@@ -41,19 +27,11 @@ in the source distribution for its full text.
#define RichString_beginAllocated(this) memset(&this, 0, sizeof(RichString)); (this).chptr = (this).chstr;
#define RichString_end(this) RichString_prune(&(this));
-#ifdef HAVE_LIBNCURSESW
-#define RichString_printVal(this, y, x) mvadd_wchstr(y, x, (this).chptr)
-#define RichString_printoffnVal(this, y, x, off, n) mvadd_wchnstr(y, x, (this).chptr + off, n)
-#define RichString_getCharVal(this, i) ((this).chptr[i].chars[0] & 255)
-#define RichString_setChar(this, at, ch) do{ (this)->chptr[(at)] = (CharType) { .chars = { ch, 0 } }; } while(0)
-#define CharType cchar_t
-#else
#define RichString_printVal(this, y, x) mvaddchstr(y, x, (this).chptr)
#define RichString_printoffnVal(this, y, x, off, n) mvaddchnstr(y, x, (this).chptr + off, n)
#define RichString_getCharVal(this, i) ((this).chptr[i])
#define RichString_setChar(this, at, ch) do{ (this)->chptr[(at)] = ch; } while(0)
#define CharType chtype
-#endif
typedef struct RichString_ {
int chlen;
@@ -87,41 +65,6 @@ static void RichString_extendLen(RichString* this, int len) {
#define RichString_setLen(this, len) do{ if(len < RICHSTRING_MAXLEN && this->chlen < RICHSTRING_MAXLEN) { RichString_setChar(this,len,0); this->chlen=len; } else RichString_extendLen(this,len); }while(0)
-#ifdef HAVE_LIBNCURSESW
-
-static inline void RichString_writeFrom(RichString* this, int attrs, const char* data_c, int from, int len) {
- wchar_t data[len+1];
- len = mbstowcs(data, data_c, len);
- if (len < 0)
- return;
- int newLen = from + len;
- RichString_setLen(this, newLen);
- for (int i = from, j = 0; i < newLen; i++, j++) {
- this->chptr[i] = (CharType) { .attr = attrs & 0xffffff, .chars = { (iswprint(data[j]) ? data[j] : '?') } };
- }
-}
-
-inline void RichString_setAttrn(RichString* this, int attrs, int start, int finish) {
- cchar_t* ch = this->chptr + start;
- for (int i = start; i <= finish; i++) {
- ch->attr = attrs;
- ch++;
- }
-}
-
-int RichString_findChar(RichString* this, char c, int start) {
- wchar_t wc = btowc(c);
- cchar_t* ch = this->chptr + start;
- for (int i = start; i < this->chlen; i++) {
- if (ch->chars[0] == wc)
- return i;
- ch++;
- }
- return -1;
-}
-
-#else
-
static inline void RichString_writeFrom(RichString* this, int attrs, const char* data_c, int from, int len) {
int newLen = from + len;
RichString_setLen(this, newLen);
@@ -148,8 +91,6 @@ int RichString_findChar(RichString* this, char c, int start) {
return -1;
}
-#endif
-
void RichString_prune(RichString* this) {
if (this->chlen > RICHSTRING_MAXLEN)
free(this->chptr);
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -183,36 +183,6 @@
], [$4])
])
-AC_ARG_ENABLE(unicode, [AS_HELP_STRING([--enable-unicode], [enable Unicode support])], ,enable_unicode="yes")
-if test "x$enable_unicode" = xyes; then
- HTOP_CHECK_SCRIPT([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw6-config",
- HTOP_CHECK_SCRIPT([ncursesw], [addnwstr], [HAVE_LIBNCURSESW], "ncursesw5-config",
- HTOP_CHECK_SCRIPT([ncurses], [addnwstr], [HAVE_LIBNCURSESW], "ncurses5-config",
- HTOP_CHECK_LIB([ncursesw6], [addnwstr], [HAVE_LIBNCURSESW],
- HTOP_CHECK_LIB([ncursesw], [addnwstr], [HAVE_LIBNCURSESW],
- HTOP_CHECK_LIB([ncurses], [addnwstr], [HAVE_LIBNCURSESW],
- missing_libraries="$missing_libraries libncursesw"
- AC_MSG_ERROR([You may want to use --disable-unicode or install libncursesw.])
- ))))))
-
- AC_CHECK_HEADERS([ncursesw/curses.h],[:],
- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-else
- HTOP_CHECK_SCRIPT([ncurses6], [refresh], [HAVE_LIBNCURSES], "ncurses6-config",
- HTOP_CHECK_SCRIPT([ncurses], [refresh], [HAVE_LIBNCURSES], "ncurses5-config",
- HTOP_CHECK_LIB([ncurses6], [refresh], [HAVE_LIBNCURSES],
- HTOP_CHECK_LIB([ncurses], [refresh], [HAVE_LIBNCURSES],
- missing_libraries="$missing_libraries libncurses"
- ))))
-
- AC_CHECK_HEADERS([curses.h],[:],
- [AC_CHECK_HEADERS([ncurses/curses.h],[:],
- [AC_CHECK_HEADERS([ncurses/ncurses.h],[:],
- [AC_CHECK_HEADERS([ncurses.h],[:],[missing_headers="$missing_headers $ac_header"])])])])
-fi
-
if test "$my_htop_platform" = "freebsd"; then
AC_CHECK_LIB([kvm], [kvm_open], [], [missing_libraries="$missing_libraries libkvm"])
fi

7
packages/addons/addon-depends/system-tools-depends/mc/package.mk
View File

@ -24,7 +24,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.midnight-commander.org"
PKG_URL="http://ftp.midnight-commander.org/${PKG_NAME}-${PKG_VERSION}.tar.xz"
PKG_DEPENDS_TARGET="toolchain libtool:host gettext:host glib pcre netbsd-curses"
PKG_DEPENDS_TARGET="toolchain libtool:host gettext:host glib pcre ncurses"
PKG_SECTION="tools"
PKG_SHORTDESC="mc: visual file manager"
PKG_LONGDESC="mc is a visual file manager, licensed under GNU General Public License and therefore qualifies as Free Software. It's a feature rich full-screen text mode application that allows you to copy, move and delete files and whole directory trees, search for files and run commands in the subshell. Internal viewer and editor are included"
@ -49,11 +49,6 @@ PKG_CONFIGURE_OPTS_TARGET="--sysconfdir=/storage/.kodi/addons/virtual.system-too
--without-diff-viewer \
--with-subshell"
pre_configure_target() {
export CFLAGS="$CFLAGS -I$SYSROOT_PREFIX/usr/include/ncurses"
export LDFLAGS="$(echo $LDFLAGS | sed -e "s|-Wl,--as-needed||") -ltermcap"
}
post_makeinstall_target() {
rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/locale
rm -rf $INSTALL/storage/.kodi/addons/virtual.system-tools/data/mc/help/mc.hlp.*

60
packages/addons/addon-depends/system-tools-depends/mc/patches/mc-01-ncurses-fix.patch Normal file
View File

@ -0,0 +1,60 @@
could be dropped at next bump >4.8.19
https://github.com/MidnightCommander/mc/commit/4d46a108629beb66a293672db7b44f863b6598ba
From: Thomas Dickey <dickey@his.com>
Date: Fri, 14 Apr 2017 14:06:13 +0300
Subject: [PATCH] Ticket #3697: (tty_init): unify curses initialization
...for various curses implementations.
Signed-off-by: Andrew Borodin <aborodin@vmail.ru>
---
lib/tty/tty-ncurses.c | 26 +++++++++-----------------
1 file changed, 9 insertions(+), 17 deletions(-)
diff --git a/lib/tty/tty-ncurses.c b/lib/tty/tty-ncurses.c
index a7a11f368..8e69b39f6 100644
--- a/lib/tty/tty-ncurses.c
+++ b/lib/tty/tty-ncurses.c
@@ -179,6 +179,8 @@ mc_tty_normalize_lines_char (const char *ch)
void
tty_init (gboolean mouse_enable, gboolean is_xterm)
{
+ struct termios mode;
+
initscr ();
#ifdef HAVE_ESCDELAY
@@ -194,25 +196,15 @@ tty_init (gboolean mouse_enable, gboolean is_xterm)
ESCDELAY = 200;
#endif /* HAVE_ESCDELAY */
-#ifdef NCURSES_VERSION
+ tcgetattr (STDIN_FILENO, &mode);
/* use Ctrl-g to generate SIGINT */
- cur_term->Nttyb.c_cc[VINTR] = CTRL ('g'); /* ^g */
+ mode.c_cc[VINTR] = CTRL ('g'); /* ^g */
/* disable SIGQUIT to allow use Ctrl-\ key */
- cur_term->Nttyb.c_cc[VQUIT] = NULL_VALUE;
- tcsetattr (cur_term->Filedes, TCSANOW, &cur_term->Nttyb);
-#else
- /* other curses implementation (bsd curses, ...) */
- {
- struct termios mode;
-
- tcgetattr (STDIN_FILENO, &mode);
- /* use Ctrl-g to generate SIGINT */
- mode.c_cc[VINTR] = CTRL ('g'); /* ^g */
- /* disable SIGQUIT to allow use Ctrl-\ key */
- mode.c_cc[VQUIT] = NULL_VALUE;
- tcsetattr (STDIN_FILENO, TCSANOW, &mode);
- }
-#endif /* NCURSES_VERSION */
+ mode.c_cc[VQUIT] = NULL_VALUE;
+ tcsetattr (STDIN_FILENO, TCSANOW, &mode);
+
+ /* curses remembers the "in-program" modes after this call */
+ def_prog_mode ();
tty_start_interrupt_key ();

8
packages/addons/addon-depends/system-tools-depends/nmon/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -23,11 +23,9 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://github.com/axibase/nmon"
PKG_URL="https://github.com/axibase/nmon/archive/$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_SECTION="tools"
PKG_SHORTDESC="Systems administrator, tuner, benchmark tool gives you a huge amount of important performance information in one go"
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
make_target() {
@ -40,7 +38,7 @@ make_target() {
;;
esac
CFLAGS="$CFLAGS -g -O3 -Wall -D JFS -D GETUSER -D LARGEMEM"
LDFLAGS="$LDFLAGS -lncurses -ltermcap -lm -g"
LDFLAGS="$LDFLAGS -lncurses -lm -g"
$CC -o nmon lmon*.c $CFLAGS $LDFLAGS -D $arch -D KERNEL_2_6_18
}

4
packages/addons/addon-depends/system-tools-depends/screen/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/screen/"
PKG_URL="http://ftpmirror.gnu.org/screen/$PKG_NAME-${PKG_VERSION}.tar.gz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_SECTION="shell/console"
PKG_SHORTDESC="terminal multiplexor with VT100/ANSI terminal emulation"
PKG_LONGDESC="screen is a terminal multiplexor that runs several separate screens on a single physical character-based terminal. Each virtual terminal emulates a DEC VT100 plus several ANSI X3.64 and ISO 2022 functions. Screen sessions can be detached and resumed later on a different terminal."

5
packages/addons/addon-depends/system-tools-depends/vim/package.mk
View File

@ -1,5 +1,5 @@
################################################################################
# This file is part of LibreELEC - http://www.libreelec.tv
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="VIM"
PKG_SITE="http://www.vim.org/"
PKG_URL="https://github.com/vim/vim/archive/v$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_SECTION="tools"
PKG_SHORTDESC="vim: VI IMproved"
PKG_LONGDESC="Vim is a highly configurable text editor built to enable efficient text editing."
@ -49,7 +49,6 @@ PKG_CONFIGURE_OPTS_TARGET="vim_cv_getcwd_broken=no \
pre_configure_target() {
cd ..
rm -rf .$TARGET_NAME
export LIBS="-lcurses -lterminfo"
}
make_target() {

4
packages/addons/service/lcdd/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016-2017 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -25,7 +25,7 @@ PKG_LICENSE="GPL"
PKG_SITE="http://lcdproc.org/"
PKG_URL="https://github.com/lcdproc/lcdproc/archive/$PKG_VERSION.tar.gz"
PKG_SOURCE_DIR="lcdproc-$PKG_VERSION*"
PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb netbsd-curses serdisplib"
PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb ncurses serdisplib"
PKG_SECTION="service"
PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD"
PKG_LONGDESC="LCDproc ($PKG_VERSION) is a piece of software that displays real-time system information from your Linux/*BSD box on a LCD. The server supports several serial devices: Matrix Orbital, Crystal Fontz, Bayrad, LB216, LCDM001 (kernelconcepts.de), Wirz-SLI, Cwlinux(.com) and PIC-an-LCD; and some devices connected to the LPT port: HD44780, STV5730, T6963, SED1520 and SED1330. Various clients are available that display things like CPU load, system load, memory usage, uptime, and a lot more."

4
packages/addons/service/proftpd/package.mk
View File

@ -26,7 +26,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.proftpd.org/"
PKG_URL="https://github.com/proftpd/proftpd/archive/v$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain libcap openssl netbsd-curses pcre whois"
PKG_DEPENDS_TARGET="toolchain libcap openssl ncurses pcre whois"
PKG_SECTION="service"
PKG_SHORTDESC="ProFTPD: a FTP server for linux"
PKG_LONGDESC="ProFTPD ($PKG_VERSION): is a secure and configurable FTP server with SSL/TLS support"
@ -58,7 +58,7 @@ pre_build_target() {
}
pre_configure_target() {
export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$SYSROOT_PREFIX/usr/include/ncurses -I$PKG_BUILD/.$TARGET_NAME/include/"
export CFLAGS="$CFLAGS -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -I$PKG_BUILD/.$TARGET_NAME/include/"
export LDFLAGS="$LDFLAGS -L$PKG_BUILD/.$TARGET_NAME/lib"
}

2
packages/audio/alsa-utils/package.mk
View File

@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.alsa-project.org/"
PKG_URL="ftp://ftp.alsa-project.org/pub/utils/$PKG_NAME-$PKG_VERSION.tar.bz2"
PKG_DEPENDS_TARGET="toolchain alsa-lib netbsd-curses"
PKG_DEPENDS_TARGET="toolchain alsa-lib ncurses"
PKG_SECTION="audio"
PKG_SHORTDESC="alsa-utils: Advanced Linux Sound Architecture utilities"
PKG_LONGDESC="This package includes the utilities for ALSA, like alsamixer, aplay, arecord, alsactl, iecset and speaker-test."

6
packages/databases/mysql/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -24,12 +24,10 @@ PKG_LICENSE="LGPL"
PKG_SITE="http://www.mysql.com"
PKG_URL="http://ftp.gwdg.de/pub/misc/$PKG_NAME/Downloads/MySQL-5.7/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_HOST="toolchain zlib:host"
PKG_DEPENDS_TARGET="toolchain zlib netbsd-curses openssl boost mysql:host"
PKG_DEPENDS_TARGET="toolchain zlib ncurses openssl boost mysql:host"
PKG_SECTION="database"
PKG_SHORTDESC="mysql: A database server"
PKG_LONGDESC="MySQL is a SQL (Structured Query Language) database server. SQL is the most popular database language in the world. MySQL is a client server implementation that consists of a server daemon mysqld and many different client programs/libraries."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
post_unpack() {

12
packages/databases/mysql/patches/mysql-0001-link-against-termcap.patch
View File

@ -1,12 +0,0 @@
diff -Naur a/client/CMakeLists.txt b/client/CMakeLists.txt
--- a/client/CMakeLists.txt 2016-03-28 11:06:12.000000000 -0700
+++ b/client/CMakeLists.txt 2016-05-19 02:34:38.828457442 -0700
@@ -44,7 +44,7 @@
MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc)
TARGET_LINK_LIBRARIES(mysql mysqlclient)
IF(UNIX)
- TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY})
+ TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY} termcap)
ENDIF(UNIX)
IF(NOT WITHOUT_SERVER)

4
packages/debug/gdb/package.mk
View File

@ -23,12 +23,10 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.gnu.org/software/gdb/"
PKG_URL="http://ftpmirror.gnu.org/gdb/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain zlib netbsd-curses expat"
PKG_DEPENDS_TARGET="toolchain zlib ncurses expat"
PKG_SECTION="debug"
PKG_SHORTDESC="gdb: The GNU Debugger"
PKG_LONGDESC="The purpose of a debugger such as GDB is to allow you to see what is going on ``inside'' another program while it executes--or what another program was doing at the moment it crashed."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
CC_FOR_BUILD="$HOST_CC"

1
packages/devel/ncurses/package.mk
View File

@ -46,7 +46,6 @@ PKG_CONFIGURE_OPTS_TARGET="--without-ada \
--without-dbmalloc \
--without-dmalloc \
--disable-rpath \
--disable-overwrite \
--disable-database \
--with-fallbacks=linux,screen,xterm,xterm-color \
--disable-big-core \

241
packages/lang/Python/patches/Python-2.7.11-017-link-curses-module-against-termcap.patch
View File

@ -1,241 +0,0 @@
diff -Naur a/Modules/_cursesmodule.c b/Modules/_cursesmodule.c
--- a/Modules/_cursesmodule.c 2015-12-05 11:47:13.000000000 -0800
+++ b/Modules/_cursesmodule.c 2016-04-29 01:22:41.271608696 -0700
@@ -312,7 +312,6 @@
Window_NoArgNoReturnVoidFunction(wclear)
Window_OneArgNoReturnVoidFunction(idcok, int, "i;True(1) or False(0)")
-Window_OneArgNoReturnVoidFunction(immedok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnVoidFunction(wtimeout, int, "i;delay")
Window_NoArg2TupleReturnFunction(getyx, int, "ii")
@@ -336,7 +335,6 @@
Window_OneArgNoReturnFunction(notimeout, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(scrollok, int, "i;True(1) or False(0)")
Window_OneArgNoReturnFunction(winsdelln, int, "i;nlines")
-Window_OneArgNoReturnFunction(syncok, int, "i;True(1) or False(0)")
Window_TwoArgNoReturnFunction(mvwin, int, "ii;y,x")
Window_TwoArgNoReturnFunction(mvderwin, int, "ii;y,x")
@@ -1580,7 +1578,6 @@
{"hline", (PyCFunction)PyCursesWindow_Hline, METH_VARARGS},
{"idcok", (PyCFunction)PyCursesWindow_idcok, METH_VARARGS},
{"idlok", (PyCFunction)PyCursesWindow_idlok, METH_VARARGS},
- {"immedok", (PyCFunction)PyCursesWindow_immedok, METH_VARARGS},
{"inch", (PyCFunction)PyCursesWindow_InCh, METH_VARARGS},
{"insch", (PyCFunction)PyCursesWindow_InsCh, METH_VARARGS},
{"insdelln", (PyCFunction)PyCursesWindow_winsdelln, METH_VARARGS},
@@ -1618,7 +1615,6 @@
{"subpad", (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
{"subwin", (PyCFunction)PyCursesWindow_SubWin, METH_VARARGS},
{"syncdown", (PyCFunction)PyCursesWindow_wsyncdown, METH_NOARGS},
- {"syncok", (PyCFunction)PyCursesWindow_syncok, METH_VARARGS},
{"syncup", (PyCFunction)PyCursesWindow_wsyncup, METH_NOARGS},
{"timeout", (PyCFunction)PyCursesWindow_wtimeout, METH_VARARGS},
{"touchline", (PyCFunction)PyCursesWindow_TouchLine, METH_VARARGS},
@@ -1693,16 +1689,6 @@
NoArgNoReturnVoidFunction(noqiflush)
static PyObject *
-PyCurses_filter(PyObject *self)
-{
- /* not checking for PyCursesInitialised here since filter() must
- be called before initscr() */
- filter();
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
PyCurses_Color_Content(PyObject *self, PyObject *args)
{
short color,r,g,b;
@@ -1772,19 +1758,6 @@
return PyString_FromStringAndSize(&ch, 1);
}
-static PyObject *
-PyCurses_getsyx(PyObject *self)
-{
- int x = 0;
- int y = 0;
-
- PyCursesInitialised;
-
- getsyx(y, x);
-
- return Py_BuildValue("(ii)", y, x);
-}
-
#ifdef NCURSES_MOUSE_VERSION
static PyObject *
PyCurses_GetMouse(PyObject *self)
@@ -1855,25 +1828,6 @@
return PyCursesCheckERR(halfdelay(tenths), "halfdelay");
}
-#ifndef STRICT_SYSV_CURSES
-/* No has_key! */
-static PyObject * PyCurses_has_key(PyObject *self, PyObject *args)
-{
- int ch;
-
- PyCursesInitialised;
-
- if (!PyArg_ParseTuple(args,"i",&ch)) return NULL;
-
- if (has_key(ch) == FALSE) {
- Py_INCREF(Py_False);
- return Py_False;
- }
- Py_INCREF(Py_True);
- return Py_True;
-}
-#endif /* STRICT_SYSV_CURSES */
-
static PyObject *
PyCurses_Init_Color(PyObject *self, PyObject *args)
{
@@ -2426,26 +2380,6 @@
#endif /* HAVE_CURSES_RESIZE_TERM */
static PyObject *
-PyCurses_setsyx(PyObject *self, PyObject *args)
-{
- int y,x;
-
- PyCursesInitialised;
-
- if (PyTuple_Size(args)!=2) {
- PyErr_SetString(PyExc_TypeError, "setsyx requires 2 arguments");
- return NULL;
- }
-
- if (!PyArg_ParseTuple(args, "ii;y, x", &y, &x)) return NULL;
-
- setsyx(y,x);
-
- Py_INCREF(Py_None);
- return Py_None;
-}
-
-static PyObject *
PyCurses_Start_Color(PyObject *self)
{
int code;
@@ -2539,18 +2473,6 @@
}
static PyObject *
-PyCurses_TypeAhead(PyObject *self, PyObject *args)
-{
- int fd;
-
- PyCursesInitialised;
-
- if (!PyArg_ParseTuple(args,"i;fd",&fd)) return NULL;
-
- return PyCursesCheckERR(typeahead( fd ), "typeahead");
-}
-
-static PyObject *
PyCurses_UnCtrl(PyObject *self, PyObject *args)
{
PyObject *temp;
@@ -2594,25 +2516,6 @@
return PyCursesCheckERR(ungetch(ch), "ungetch");
}
-static PyObject *
-PyCurses_Use_Env(PyObject *self, PyObject *args)
-{
- int flag;
-
- switch(PyTuple_Size(args)) {
- case 1:
- if (!PyArg_ParseTuple(args,"i;True(1), False(0)",&flag))
- return NULL;
- break;
- default:
- PyErr_SetString(PyExc_TypeError, "use_env requires 1 argument");
- return NULL;
- }
- use_env(flag);
- Py_INCREF(Py_None);
- return Py_None;
-}
-
#ifndef STRICT_SYSV_CURSES
static PyObject *
PyCurses_Use_Default_Colors(PyObject *self)
@@ -2650,21 +2553,16 @@
{"echo", (PyCFunction)PyCurses_echo, METH_VARARGS},
{"endwin", (PyCFunction)PyCurses_endwin, METH_NOARGS},
{"erasechar", (PyCFunction)PyCurses_EraseChar, METH_NOARGS},
- {"filter", (PyCFunction)PyCurses_filter, METH_NOARGS},
{"flash", (PyCFunction)PyCurses_flash, METH_NOARGS},
{"flushinp", (PyCFunction)PyCurses_flushinp, METH_NOARGS},
#ifdef NCURSES_MOUSE_VERSION
{"getmouse", (PyCFunction)PyCurses_GetMouse, METH_NOARGS},
{"ungetmouse", (PyCFunction)PyCurses_UngetMouse, METH_VARARGS},
#endif
- {"getsyx", (PyCFunction)PyCurses_getsyx, METH_NOARGS},
{"getwin", (PyCFunction)PyCurses_GetWin, METH_O},
{"has_colors", (PyCFunction)PyCurses_has_colors, METH_NOARGS},
{"has_ic", (PyCFunction)PyCurses_has_ic, METH_NOARGS},
{"has_il", (PyCFunction)PyCurses_has_il, METH_NOARGS},
-#ifndef STRICT_SYSV_CURSES
- {"has_key", (PyCFunction)PyCurses_has_key, METH_VARARGS},
-#endif
{"halfdelay", (PyCFunction)PyCurses_HalfDelay, METH_VARARGS},
{"init_color", (PyCFunction)PyCurses_Init_Color, METH_VARARGS},
{"init_pair", (PyCFunction)PyCurses_Init_Pair, METH_VARARGS},
@@ -2708,7 +2606,6 @@
{"resize_term", (PyCFunction)PyCurses_Resize_Term, METH_VARARGS},
#endif
{"savetty", (PyCFunction)PyCurses_savetty, METH_NOARGS},
- {"setsyx", (PyCFunction)PyCurses_setsyx, METH_VARARGS},
{"setupterm", (PyCFunction)PyCurses_setupterm,
METH_VARARGS|METH_KEYWORDS},
{"start_color", (PyCFunction)PyCurses_Start_Color, METH_NOARGS},
@@ -2718,10 +2615,8 @@
{"tigetnum", (PyCFunction)PyCurses_tigetnum, METH_VARARGS},
{"tigetstr", (PyCFunction)PyCurses_tigetstr, METH_VARARGS},
{"tparm", (PyCFunction)PyCurses_tparm, METH_VARARGS},
- {"typeahead", (PyCFunction)PyCurses_TypeAhead, METH_VARARGS},
{"unctrl", (PyCFunction)PyCurses_UnCtrl, METH_VARARGS},
{"ungetch", (PyCFunction)PyCurses_UngetCh, METH_VARARGS},
- {"use_env", (PyCFunction)PyCurses_Use_Env, METH_VARARGS},
#ifndef STRICT_SYSV_CURSES
{"use_default_colors", (PyCFunction)PyCurses_Use_Default_Colors, METH_NOARGS},
#endif
diff -Naur a/setup.py b/setup.py
--- a/setup.py 2016-04-28 13:18:03.397008583 -0700
+++ b/setup.py 2016-04-28 13:28:04.595779984 -0700
@@ -766,7 +766,7 @@
else:
readline_extra_link_args = ()
- readline_libs = ['readline']
+ readline_libs = ['readline', 'termcap']
if readline_termcap_library:
pass # Issue 7384: Already linked against curses or tinfo.
elif curses_library:
@@ -1359,7 +1359,7 @@
# Bug 1464056: If _curses.so links with ncursesw,
# _curses_panel.so must link with panelw.
panel_library = 'panelw'
- curses_libs = [curses_library]
+ curses_libs = [curses_library, 'termcap']
curses_incs = find_file('curses.h', inc_dirs,
[os.path.join(d, 'ncursesw') for d in inc_dirs])
exts.append( Extension('_curses', ['_cursesmodule.c'],
@@ -1373,7 +1373,7 @@
elif (self.compiler.find_library_file(lib_dirs, 'termcap')):
curses_libs = ['curses', 'termcap']
else:
- curses_libs = ['curses']
+ curses_libs = ['curses', 'termcap']
exts.append( Extension('_curses', ['_cursesmodule.c'],
libraries = curses_libs) )

4
packages/mediacenter/kodi/package.mk
View File

@ -28,8 +28,6 @@ PKG_DEPENDS_TARGET="toolchain JsonSchemaBuilder:host TexturePacker:host Python z
PKG_SECTION="mediacenter"
PKG_SHORTDESC="kodi: Kodi Mediacenter"
PKG_LONGDESC="Kodi Media Center (which was formerly named Xbox Media Center or XBMC) is a free and open source cross-platform media player and home entertainment system software with a 10-foot user interface designed for the living-room TV. Its graphical user interface allows the user to easily manage video, photos, podcasts, and music from a computer, optical disk, local network, and the internet using a remote control."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
get_graphicdrivers
@ -254,7 +252,7 @@ pre_configure_target() {
# kodi should never be built with lto
strip_lto
export LIBS="$LIBS -lz -lterminfo"
export LIBS="$LIBS -lncurses"
}
post_makeinstall_target() {

4
packages/network/bluez/package.mk
View File

@ -27,8 +27,6 @@ PKG_DEPENDS_TARGET="toolchain dbus glib readline systemd"
PKG_SECTION="network"
PKG_SHORTDESC="bluez: Bluetooth Tools and System Daemons for Linux."
PKG_LONGDESC="Bluetooth Tools and System Daemons for Linux."
PKG_IS_ADDON="no"
PKG_AUTORECONF="yes"
if [ "$DEBUG" = "yes" ]; then
@ -64,7 +62,7 @@ pre_configure_target() {
cd $PKG_BUILD
rm -rf .$TARGET_NAME
export LIBS="-ltermcap"
export LIBS="-lncurses"
}
post_makeinstall_target() {

2
packages/network/connman/patches/connman-05_link-against-ncurses.patch
View File

@ -16,7 +16,7 @@ index 41efc1f..d1d3ddc 100644
client_connmanctl_LDADD = gdbus/libgdbus-internal.la @DBUS_LIBS@ @GLIB_LIBS@ \
- -lreadline -ldl
+ -lreadline -lncurses -ltermcap -ldl
+ -lreadline -lncurses -ldl
endif
noinst_PROGRAMS += unit/test-pbkdf2-sha1 unit/test-prf-sha1 unit/test-ippool

4
packages/tools/nano/package.mk
View File

@ -23,12 +23,10 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="http://www.nano-editor.org/"
PKG_URL="http://ftpmirror.gnu.org/nano/$PKG_NAME-$PKG_VERSION.tar.gz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_SECTION="shell/texteditor"
PKG_SHORTDESC="nano: Pico editor clone with enhancements"
PKG_LONGDESC="GNU nano (Nano's ANOther editor, or Not ANOther editor) is an enhanced clone of the Pico text editor."
PKG_IS_ADDON="no"
PKG_AUTORECONF="no"
PKG_CONFIGURE_OPTS_TARGET="--disable-utf8 \

4
packages/tools/procps-ng/package.mk
View File

@ -1,6 +1,6 @@
################################################################################
# This file is part of LibreELEC - https://libreelec.tv
# Copyright (C) 2016 Team LibreELEC
# Copyright (C) 2016-present Team LibreELEC
#
# LibreELEC is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@ -23,7 +23,7 @@ PKG_ARCH="any"
PKG_LICENSE="GPL"
PKG_SITE="https://gitlab.com/procps-ng/procps"
PKG_URL="$SOURCEFORGE_SRC/$PKG_NAME/Production/$PKG_NAME-$PKG_VERSION.tar.xz"
PKG_DEPENDS_TARGET="toolchain netbsd-curses"
PKG_DEPENDS_TARGET="toolchain ncurses"
PKG_SECTION="tools"
PKG_SHORTDESC="Command line and full screen utilities for browsing procfs"
PKG_LONGDESC="Command line and full screen utilities for browsing procfs, a "pseudo" file system dynamically generated by the kernel to provide information about the status of entries in its process table."

24
packages/tools/procps-ng/patches/procps-ng-0001-netbsd-curses-fix.patch
View File

@ -1,24 +0,0 @@
diff -Naur a/top/top.c b/top/top.c
--- a/top/top.c 2015-08-08 22:54:54.310117082 -0700
+++ b/top/top.c 2016-04-22 12:17:49.833157898 -0700
@@ -715,15 +715,15 @@
the job's done until he/she/it has a change-of-heart */
STRLCPY(q->cap_bold, CHKw(q, View_NOBOLD) ? Cap_norm : tIF(enter_bold_mode))
if (CHKw(q, Show_COLORS) && max_colors > 0) {
- STRLCPY(q->capclr_sum, tparm(set_a_foreground, q->rc.summclr))
+ STRLCPY(q->capclr_sum, tiparm(set_a_foreground, q->rc.summclr))
snprintf(q->capclr_msg, sizeof(q->capclr_msg), "%s%s"
- , tparm(set_a_foreground, q->rc.msgsclr), Cap_reverse);
+ , tiparm(set_a_foreground, q->rc.msgsclr), Cap_reverse);
snprintf(q->capclr_pmt, sizeof(q->capclr_pmt), "%s%s"
- , tparm(set_a_foreground, q->rc.msgsclr), q->cap_bold);
+ , tiparm(set_a_foreground, q->rc.msgsclr), q->cap_bold);
snprintf(q->capclr_hdr, sizeof(q->capclr_hdr), "%s%s"
- , tparm(set_a_foreground, q->rc.headclr), Cap_reverse);
+ , tiparm(set_a_foreground, q->rc.headclr), Cap_reverse);
snprintf(q->capclr_rownorm, sizeof(q->capclr_rownorm), "%s%s"
- , Caps_off, tparm(set_a_foreground, q->rc.taskclr));
+ , Caps_off, tiparm(set_a_foreground, q->rc.taskclr));
} else {
q->capclr_sum[0] = '\0';
#ifdef USE_X_COLHDR