From 885ab4018512d4636cc2e4bdc1def5eb59ecced2 Mon Sep 17 00:00:00 2001 From: heitbaum Date: Wed, 23 Dec 2020 15:22:30 +0000 Subject: [PATCH] lcdd: update to HEAD 2020-07-21 --- packages/addons/service/lcdd/changelog.txt | 3 ++ packages/addons/service/lcdd/package.mk | 8 ++-- .../lcdd-0.5.6-dm140_henlar_v0.2.patch | 12 +++--- .../lcdd-fix-compilation-with-gcc10.patch | 42 ------------------- 4 files changed, 13 insertions(+), 52 deletions(-) delete mode 100644 packages/addons/service/lcdd/patches/lcdd-fix-compilation-with-gcc10.patch diff --git a/packages/addons/service/lcdd/changelog.txt b/packages/addons/service/lcdd/changelog.txt index 46c21fefef..8f15896826 100644 --- a/packages/addons/service/lcdd/changelog.txt +++ b/packages/addons/service/lcdd/changelog.txt @@ -1,3 +1,6 @@ +108 +- Update to 0.5dev+2020-07-21 + 107 - Update to 0.5dev+2018-11-04 diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk index 2b07071973..eacf3c39c8 100644 --- a/packages/addons/service/lcdd/package.mk +++ b/packages/addons/service/lcdd/package.mk @@ -2,10 +2,10 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lcdd" -PKG_VERSION="e08546c13a4157ed98cd4a8e9086e7acd66f93c0" -PKG_SHA256="23d0fd14e16767d4907d724404b96216c0c7338c6206760e53cf6a7662dd3af2" -PKG_VERSION_DATE="0.5dev+2018-11-04" -PKG_REV="107" +PKG_VERSION="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1" +PKG_SHA256="442f60fc7c26847508e7fb99d901e905016c136d0f6eb320e3262bef20f39452" +PKG_VERSION_DATE="0.5dev+2020-07-21" +PKG_REV="108" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://lcdproc.org/" diff --git a/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch b/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch index d32bd0d3f3..999ceeeb31 100644 --- a/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch +++ b/packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch @@ -25,12 +25,12 @@ index 14ffcf7..3a63297 100644 [ icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,] [ joy,lb216,lcdm001,lcterm,linux_input,lirc,lis,MD8800,mdm166a,] [ ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,] -@@ -23,7 +23,7 @@ AC_ARG_ENABLE(drivers, +@@ -23,7 +23,7 @@ drivers="$enableval", drivers=[bayrad,CFontz,CFontzPacket,curses,CwLnx,glk,lb216,lcdm001,MtxOrb,pyramid,text]) --allDrivers=[bayrad,CFontz,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,futaba,g15,glcd,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,linux_input,lirc,lis,MD8800,mdm166a,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,Olimex_MOD_LCD1x9,picolcd,pyramid,sdeclcd,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,t6963,text,tyan,ula200,vlsys_m428,xosd,rawserial,yard2LCD] -+allDrivers=[bayrad,CFontz,CFontzPacket,curses,CwLnx,dm140,ea65,EyeboxOne,futaba,g15,glcd,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,joy,lb216,lcdm001,lcterm,linux_input,lirc,lis,MD8800,mdm166a,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,Olimex_MOD_LCD1x9,picolcd,pyramid,sdeclcd,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,t6963,text,tyan,ula200,vlsys_m428,xosd,rawserial,yard2LCD] +-allDrivers=[bayrad,CFontz,CFontzPacket,curses,CwLnx,ea65,EyeboxOne,futaba,g15,glcd,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,joy,jw002,lb216,lcdm001,lcterm,linux_input,lirc,lis,MD8800,mdm166a,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,Olimex_MOD_LCD1x9,picolcd,pyramid,sdeclcd,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,t6963,text,tyan,ula200,vlsys_m428,xosd,rawserial,yard2LCD] ++allDrivers=[bayrad,CFontz,CFontzPacket,curses,CwLnx,dm140,ea65,EyeboxOne,futaba,g15,glcd,glcdlib,glk,hd44780,i2500vfd,icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,joy,jw002,lb216,lcdm001,lcterm,linux_input,lirc,lis,MD8800,mdm166a,ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,Olimex_MOD_LCD1x9,picolcd,pyramid,sdeclcd,sed1330,sed1520,serialPOS,serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,t6963,text,tyan,ula200,vlsys_m428,xosd,rawserial,yard2LCD] if test "$debug" = yes; then allDrivers=["${allDrivers},debug"] fi @@ -49,12 +49,12 @@ diff --git a/server/drivers/Makefile.am b/server/drivers/Makefile.am index f82df85..0d98570 100644 --- a/server/drivers/Makefile.am +++ b/server/drivers/Makefile.am -@@ -23,7 +23,7 @@ AM_LDFLAGS = @LDSHARED@ +@@ -23,7 +23,7 @@ lcdexecbindir = $(pkglibdir) lcdexecbin_PROGRAMS = @DRIVERS@ --EXTRA_PROGRAMS = bayrad CFontz CFontzPacket curses CwLnx debug ea65 EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd icp_a106 imon imonlcd IOWarrior irman irtrans joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD Olimex_MOD_LCD1x9 picolcd pyramid rawserial sdeclcd sed1330 sed1520 serialPOS serialVFD shuttleVFD sli stv5730 SureElec svga t6963 text tyan ula200 vlsys_m428 xosd yard2LCD -+EXTRA_PROGRAMS = bayrad CFontz CFontzPacket curses CwLnx debug dm140 ea65 EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd icp_a106 imon imonlcd IOWarrior irman irtrans joy lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD Olimex_MOD_LCD1x9 picolcd pyramid rawserial sdeclcd sed1330 sed1520 serialPOS serialVFD shuttleVFD sli stv5730 SureElec svga t6963 text tyan ula200 vlsys_m428 xosd yard2LCD +-EXTRA_PROGRAMS = bayrad CFontz CFontzPacket curses CwLnx debug ea65 EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd icp_a106 imon imonlcd IOWarrior irman irtrans joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD Olimex_MOD_LCD1x9 picolcd pyramid rawserial sdeclcd sed1330 sed1520 serialPOS serialVFD shuttleVFD sli stv5730 SureElec svga t6963 text tyan ula200 vlsys_m428 xosd yard2LCD ++EXTRA_PROGRAMS = bayrad CFontz CFontzPacket curses CwLnx debug dm140 ea65 EyeboxOne futaba g15 glcd glcdlib glk hd44780 i2500vfd icp_a106 imon imonlcd IOWarrior irman irtrans joy jw002 lb216 lcdm001 lcterm linux_input lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD Olimex_MOD_LCD1x9 picolcd pyramid rawserial sdeclcd sed1330 sed1520 serialPOS serialVFD shuttleVFD sli stv5730 SureElec svga t6963 text tyan ula200 vlsys_m428 xosd yard2LCD noinst_LIBRARIES = libLCD.a libbignum.a futaba_CFLAGS = @LIBUSB_CFLAGS@ @LIBUSB_1_0_CFLAGS@ $(AM_CFLAGS) diff --git a/packages/addons/service/lcdd/patches/lcdd-fix-compilation-with-gcc10.patch b/packages/addons/service/lcdd/patches/lcdd-fix-compilation-with-gcc10.patch deleted file mode 100644 index 53dce70bd8..0000000000 --- a/packages/addons/service/lcdd/patches/lcdd-fix-compilation-with-gcc10.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 084126b03f29b33ab3e657c66e8c6a439f27f8e1 Mon Sep 17 00:00:00 2001 -From: Harald Geyer -Date: Mon, 10 Feb 2020 13:15:10 +0100 -Subject: [PATCH] Fix compilation with GCC >= 10.x - -Starting with GCC >= 10.x, -fno-common is used as default -instead of -fcommon. This patch fixes the compilation. - -Closes: #148 - -Suggested-by: Conrad Kostecki -Signed-off-by: Harald Geyer ---- - clients/lcdproc/iface.c | 1 + - clients/lcdproc/iface.h | 2 +- - 2 files changed, 2 insertions(+), 1 deletion(-) - -diff --git a/clients/lcdproc/iface.c b/clients/lcdproc/iface.c -index 40e50cb7..1ac355bd 100644 ---- a/clients/lcdproc/iface.c -+++ b/clients/lcdproc/iface.c -@@ -32,6 +32,7 @@ - #define UNSET_INT -1 - #define UNSET_STR "\01" - -+IfaceInfo iface[MAX_INTERFACES]; - - static int iface_count = 0; /* number of interfaces */ - static char unit_label[10] = "B"; /* default unit label is Bytes */ -diff --git a/clients/lcdproc/iface.h b/clients/lcdproc/iface.h -index cc6dbaaf..c1bd6b5b 100644 ---- a/clients/lcdproc/iface.h -+++ b/clients/lcdproc/iface.h -@@ -18,7 +18,7 @@ - /** max number of interfaces in multi-interface mode */ - #define MAX_INTERFACES 3 - --IfaceInfo iface[MAX_INTERFACES]; /* interface info */ -+extern IfaceInfo iface[MAX_INTERFACES]; /* interface info */ - - /** Update screen content */ - int iface_screen(int rep, int display, int *flags_ptr);