update buildroot to 2017.02.11
This commit is contained in:
@@ -0,0 +1,70 @@
|
||||
From 1072d60c6c8f1f51feb740527a8a056bfead9318 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 8 Oct 2015 19:53:47 +0200
|
||||
Subject: [PATCH] fbio.cpp, improxy.cpp, fbterm.cpp: fix musl compile
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
- add missing include, fixes:
|
||||
|
||||
fbio.cpp:33:8: error: ‘fd_set’ does not name a type
|
||||
static fd_set fds;
|
||||
|
||||
improxy.cpp:439:3: error: ‘fd_set’ was not declared in this scope
|
||||
|
||||
- add missing WAIT_ANY define, fixes:
|
||||
|
||||
fbterm.cpp: In member function ‘void FbTerm::processSignal(u32)’:
|
||||
fbterm.cpp:212:22: error: ‘WAIT_ANY’ was not declared in this scope
|
||||
s32 pid = waitpid(WAIT_ANY, 0, WNOHANG);
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/fbio.cpp | 1 +
|
||||
src/fbterm.cpp | 4 ++++
|
||||
src/improxy.cpp | 1 +
|
||||
3 files changed, 6 insertions(+)
|
||||
|
||||
diff --git a/src/fbio.cpp b/src/fbio.cpp
|
||||
index e5afc44..88c632c 100644
|
||||
--- a/src/fbio.cpp
|
||||
+++ b/src/fbio.cpp
|
||||
@@ -30,6 +30,7 @@
|
||||
#define NR_EPOLL_FDS 10
|
||||
s32 epollFd;
|
||||
#else
|
||||
+#include <sys/select.h>
|
||||
static fd_set fds;
|
||||
static u32 maxfd = 0;
|
||||
#endif
|
||||
diff --git a/src/fbterm.cpp b/src/fbterm.cpp
|
||||
index 38d4014..60288e4 100644
|
||||
--- a/src/fbterm.cpp
|
||||
+++ b/src/fbterm.cpp
|
||||
@@ -37,6 +37,10 @@
|
||||
#include "input_key.h"
|
||||
#include "mouse.h"
|
||||
|
||||
+#ifndef WAIT_ANY
|
||||
+#define WAIT_ANY (-1)
|
||||
+#endif
|
||||
+
|
||||
#ifdef HAVE_SIGNALFD
|
||||
// <sys/signalfd.h> offered by some systems has bug with g++
|
||||
#include "signalfd.h"
|
||||
diff --git a/src/improxy.cpp b/src/improxy.cpp
|
||||
index 3d03e66..4e046d2 100644
|
||||
--- a/src/improxy.cpp
|
||||
+++ b/src/improxy.cpp
|
||||
@@ -23,6 +23,7 @@
|
||||
#include <stdio.h>
|
||||
#include <string.h>
|
||||
#include <errno.h>
|
||||
+#include <sys/select.h>
|
||||
#include <sys/socket.h>
|
||||
#include "improxy.h"
|
||||
#include "immessage.h"
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
From a34dba99aff2994269ee347da67feb7ede9b1a67 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Seiderer <ps.report@gmx.net>
|
||||
Date: Thu, 18 Feb 2016 22:32:38 +0100
|
||||
Subject: [PATCH] mouse.cpp: fix musl compile
|
||||
|
||||
Add missing include, fixes:
|
||||
|
||||
mouse.cpp:58:37: error: 'memset' was not declared in this scope
|
||||
mouse.cpp:60:64: error: 'strncpy' was not declared in this scope
|
||||
|
||||
Signed-off-by: Peter Seiderer <ps.report@gmx.net>
|
||||
---
|
||||
src/mouse.cpp | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/src/mouse.cpp b/src/mouse.cpp
|
||||
index 0435dd9..f173137 100644
|
||||
--- a/src/mouse.cpp
|
||||
+++ b/src/mouse.cpp
|
||||
@@ -27,6 +27,7 @@ DEFINE_INSTANCE(Mouse)
|
||||
#include <stddef.h>
|
||||
#include <unistd.h>
|
||||
#include <stdlib.h>
|
||||
+#include <string.h>
|
||||
#include <gpm.h>
|
||||
#include <sys/ioctl.h>
|
||||
#include <sys/types.h>
|
||||
--
|
||||
2.1.4
|
||||
|
||||
@@ -0,0 +1,93 @@
|
||||
lib/vterm_states: fix C++11 compliance
|
||||
|
||||
In C++11, narrowing a type is no longer allowed in structure
|
||||
initializers:
|
||||
|
||||
struct foo { u16 u; };
|
||||
foo f[] = { {0}, {-1} };
|
||||
|
||||
results in the gcc-6 to whine out loudly, and fail:
|
||||
|
||||
error: narrowing conversion of ‘-1’ from ‘int’ to ‘u16 {aka short unsigned int}’ inside { } [-Wnarrowing]
|
||||
};
|
||||
^
|
||||
|
||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
|
||||
|
||||
diff -durN fbterm-1.7.0.orig/src/lib/vterm_states.cpp fbterm-1.7.0/src/lib/vterm_states.cpp
|
||||
--- fbterm-1.7.0.orig/src/lib/vterm_states.cpp 2010-10-06 06:23:08.000000000 +0200
|
||||
+++ fbterm-1.7.0/src/lib/vterm_states.cpp 2016-08-13 16:54:29.495451127 +0200
|
||||
@@ -22,6 +22,7 @@
|
||||
#include "vterm.h"
|
||||
|
||||
#define ADDSAME(len) ((len) << 8)
|
||||
+#define ENDSEQ { ((u16)-1) }
|
||||
|
||||
const VTerm::Sequence VTerm::control_sequences[] = {
|
||||
{ 0, 0, ESkeep },
|
||||
@@ -39,14 +40,14 @@
|
||||
{ 0x1B, 0, ESesc },
|
||||
{ 0x7F, 0, ESkeep },
|
||||
{ 0x9B, 0, ESsquare },
|
||||
- { -1}
|
||||
+ ENDSEQ
|
||||
};
|
||||
|
||||
const VTerm::Sequence VTerm::escape_sequences[] = {
|
||||
{ 0, 0, ESnormal },
|
||||
|
||||
// ESnormal
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
|
||||
// ESesc
|
||||
{ '[', &VTerm::clear_param, ESsquare },
|
||||
@@ -65,7 +66,7 @@
|
||||
{ '8', &VTerm::restore_cursor, ESnormal },
|
||||
{ '>', &VTerm::keypad_numeric, ESnormal },
|
||||
{ '=', &VTerm::keypad_application, ESnormal },
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
|
||||
// ESsquare
|
||||
{ '[', 0, ESfunckey },
|
||||
@@ -104,7 +105,7 @@
|
||||
{ '`', &VTerm::cursor_position_col, ESnormal },
|
||||
{ ']', &VTerm::linux_specific, ESnormal },
|
||||
{ '}', &VTerm::fbterm_specific, ESnormal },
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
|
||||
// ESnonstd
|
||||
{ '0' | ADDSAME(9), &VTerm::set_palette, ESkeep },
|
||||
@@ -112,25 +113,25 @@
|
||||
{ 'a' | ADDSAME(5), &VTerm::set_palette, ESkeep },
|
||||
{ 'P', &VTerm::begin_set_palette, ESkeep },
|
||||
{ 'R', &VTerm::reset_palette, ESnormal },
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
|
||||
// ESpercent
|
||||
{ '@', &VTerm::clear_utf8, ESnormal },
|
||||
{ 'G', &VTerm::set_utf8, ESnormal },
|
||||
{ '8', &VTerm::set_utf8, ESnormal },
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
|
||||
// EScharset
|
||||
{ '0', &VTerm::set_charset, ESnormal },
|
||||
{ 'B', &VTerm::set_charset, ESnormal },
|
||||
{ 'U', &VTerm::set_charset, ESnormal },
|
||||
{ 'K', &VTerm::set_charset, ESnormal },
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
|
||||
// EShash
|
||||
{ '8', &VTerm::screen_align, ESnormal },
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
|
||||
// ESfunckey
|
||||
- { -1 },
|
||||
+ ENDSEQ,
|
||||
};
|
||||
41
bsp/buildroot-2017.02.11/package/fbterm/0004-iconv.patch
Normal file
41
bsp/buildroot-2017.02.11/package/fbterm/0004-iconv.patch
Normal file
@@ -0,0 +1,41 @@
|
||||
Fix building against libiconv
|
||||
|
||||
Downloaded from
|
||||
https://github.com/kyak/openwrt-packages/blob/master/fbterm/patches/001-iconv.patch
|
||||
|
||||
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
|
||||
|
||||
--- a/src/lib/io.cpp
|
||||
+++ b/src/lib/io.cpp
|
||||
@@ -119,10 +119,10 @@ void IoPipe::setCodec(const s8 *up, cons
|
||||
if (!strcasecmp(up, down)) return;
|
||||
|
||||
mCodecRead = iconv_open(up, down);
|
||||
- if (mCodecRead == (void*)-1) mCodecRead = 0;
|
||||
+ if (mCodecRead == (iconv_t)(-1)) mCodecRead = 0;
|
||||
|
||||
mCodecWrite = iconv_open(down, up);
|
||||
- if (mCodecWrite == (void*)-1) mCodecWrite = 0;
|
||||
+ if (mCodecWrite == (iconv_t)(-1)) mCodecWrite = 0;
|
||||
}
|
||||
|
||||
#define BUF_SIZE 10240
|
||||
--- a/src/lib/io.h
|
||||
+++ b/src/lib/io.h
|
||||
@@ -23,6 +23,7 @@
|
||||
|
||||
#include "type.h"
|
||||
#include "instance.h"
|
||||
+#include <iconv.h>
|
||||
|
||||
class IoPipe {
|
||||
public:
|
||||
@@ -47,7 +48,7 @@ private:
|
||||
void writeIo(s8 *buf, u32 len);
|
||||
|
||||
s32 mFd;
|
||||
- void *mCodecRead, *mCodecWrite;
|
||||
+ iconv_t mCodecRead, mCodecWrite;
|
||||
s8 mBufRead[16], mBufWrite[16];
|
||||
u32 mBufLenRead, mBufLenWrite;
|
||||
};
|
||||
17
bsp/buildroot-2017.02.11/package/fbterm/Config.in
Normal file
17
bsp/buildroot-2017.02.11/package/fbterm/Config.in
Normal file
@@ -0,0 +1,17 @@
|
||||
config BR2_PACKAGE_FBTERM
|
||||
bool "fbterm"
|
||||
depends on BR2_INSTALL_LIBSTDCPP
|
||||
depends on BR2_ENABLE_LOCALE
|
||||
depends on BR2_USE_WCHAR
|
||||
depends on BR2_USE_MMU # fork()
|
||||
select BR2_PACKAGE_FONTCONFIG
|
||||
select BR2_PACKAGE_LIBERATION
|
||||
help
|
||||
fbterm is a fast terminal emulator for Linux with frame buffer
|
||||
device or VESA video card.
|
||||
|
||||
http://code.google.com/p/fbterm/
|
||||
|
||||
comment "fbterm needs a toolchain w/ C++, wchar, locale"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !(BR2_INSTALL_LIBSTDCPP && BR2_ENABLE_LOCALE && BR2_USE_WCHAR)
|
||||
2
bsp/buildroot-2017.02.11/package/fbterm/fbterm.hash
Normal file
2
bsp/buildroot-2017.02.11/package/fbterm/fbterm.hash
Normal file
@@ -0,0 +1,2 @@
|
||||
# From http://code.google.com/p/fbterm/downloads/detail?name=fbterm-1.7.0.tar.gz&can=2&q=
|
||||
sha1 dc7b7ff29212c1551f35bf7a50967454d3b8c67c fbterm-1.7.0.tar.gz
|
||||
26
bsp/buildroot-2017.02.11/package/fbterm/fbterm.mk
Normal file
26
bsp/buildroot-2017.02.11/package/fbterm/fbterm.mk
Normal file
@@ -0,0 +1,26 @@
|
||||
################################################################################
|
||||
#
|
||||
# fbterm
|
||||
#
|
||||
################################################################################
|
||||
|
||||
FBTERM_VERSION = 1.7.0
|
||||
FBTERM_SITE = https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/fbterm
|
||||
FBTERM_LICENSE = GPLv2+
|
||||
FBTERM_LICENSE_FILES = COPYING
|
||||
FBTERM_DEPENDENCIES = fontconfig liberation
|
||||
|
||||
ifeq ($(BR2_STATIC_LIBS)$(BR2_TOOLCHAIN_HAS_THREADS),yy)
|
||||
# fontconfig uses pthreads if available, but fbterm forgets to link
|
||||
# with it breaking static builds
|
||||
FBTERM_CONF_ENV += LIBS='-lpthread'
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GPM),y)
|
||||
FBTERM_DEPENDENCIES += gpm
|
||||
FBTERM_CONF_OPTS += --enable-gpm
|
||||
else
|
||||
FBTERM_CONF_OPTS += --disable-gpm
|
||||
endif
|
||||
|
||||
$(eval $(autotools-package))
|
||||
Reference in New Issue
Block a user