From e0024a1c96588c6a630ee0977194f06e7bbffa4d Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Tue, 22 Oct 2024 13:17:53 +0000 Subject: [PATCH 1/3] libgpiod: update to 2.2 --- .../addon-depends/system-tools-depends/libgpiod/package.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk b/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk index 3dc884d109..40862af937 100644 --- a/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk +++ b/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk @@ -2,8 +2,8 @@ # Copyright (C) 2021-present Team LibreELEC (https://libreelec.tv) PKG_NAME="libgpiod" -PKG_VERSION="2.1.3" -PKG_SHA256="8d80ea022ae78122aa525308e7423b83064bff278fcd9cd045b94b4f81f8057d" +PKG_VERSION="2.2" +PKG_SHA256="ae35329db7027c740e90c883baf27c26311f0614e6a7b115771b28188b992aec" PKG_LICENSE="GPLv2+" PKG_SITE="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/about/" PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${PKG_VERSION}.tar.gz" From f71c39f40eaacc97bb8c43554e06640ea088d45b Mon Sep 17 00:00:00 2001 From: Rudi Heitbaum Date: Sat, 14 Dec 2024 08:52:34 +0000 Subject: [PATCH 2/3] libgpiod: build with pic and used by lcdd --- .../{system-tools-depends => }/libgpiod/package.mk | 2 ++ 1 file changed, 2 insertions(+) rename packages/addons/addon-depends/{system-tools-depends => }/libgpiod/package.mk (96%) diff --git a/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk b/packages/addons/addon-depends/libgpiod/package.mk similarity index 96% rename from packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk rename to packages/addons/addon-depends/libgpiod/package.mk index 40862af937..781b8420bb 100644 --- a/packages/addons/addon-depends/system-tools-depends/libgpiod/package.mk +++ b/packages/addons/addon-depends/libgpiod/package.mk @@ -10,4 +10,6 @@ PKG_URL="https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libg PKG_DEPENDS_TARGET="toolchain" PKG_LONGDESC="Tools for interacting with the linux GPIO character device." PKG_TOOLCHAIN="autotools" +PKG_BUILD_FLAGS="+pic" + PKG_CONFIGURE_OPTS_TARGET="--enable-tools --disable-shared" From 5ebd83a3f3b58eba6f355ed284123bd4025f935a Mon Sep 17 00:00:00 2001 From: heitbaum Date: Fri, 7 Jan 2022 10:08:55 +0000 Subject: [PATCH 3/3] lcdd: update to githash 71877ee and addon (1) fixes: - https://github.com/lcdproc/lcdproc/commit/71877ee059a238400b5f6b41cee7c43a3df00334 - hd44780/gpiod: rewrite to support libgpiod2 - https://github.com/lcdproc/lcdproc as 214 --- packages/addons/service/lcdd/package.mk | 20 +++---- .../lcdd/patches/lcdd-0.5.6-libftdi1.patch | 52 ------------------- 2 files changed, 10 insertions(+), 62 deletions(-) delete mode 100644 packages/addons/service/lcdd/patches/lcdd-0.5.6-libftdi1.patch diff --git a/packages/addons/service/lcdd/package.mk b/packages/addons/service/lcdd/package.mk index 099f250051..b8f32654c6 100644 --- a/packages/addons/service/lcdd/package.mk +++ b/packages/addons/service/lcdd/package.mk @@ -2,15 +2,15 @@ # Copyright (C) 2016-present Team LibreELEC (https://libreelec.tv) PKG_NAME="lcdd" -PKG_VERSION="9ec9ba4e5dda653288bc55d2898723aa2c2ad9c1" -PKG_SHA256="442f60fc7c26847508e7fb99d901e905016c136d0f6eb320e3262bef20f39452" -PKG_VERSION_DATE="0.5dev+2020-07-21" -PKG_REV="0" +PKG_VERSION="71877ee059a238400b5f6b41cee7c43a3df00334" +PKG_SHA256="e910c7d748b58cc57543dc8845f8b2bcd0592dddd58bd72a55a58e90e6bfd861" +PKG_VERSION_DATE="0.5dev+2024-12-14" +PKG_REV="1" PKG_ARCH="any" PKG_LICENSE="GPL" PKG_SITE="http://lcdproc.org/" PKG_URL="https://github.com/lcdproc/lcdproc/archive/${PKG_VERSION}.tar.gz" -PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb ncurses serdisplib" +PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libgpiod 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." @@ -21,13 +21,13 @@ PKG_IS_ADDON="yes" PKG_ADDON_NAME="LCDproc" PKG_ADDON_TYPE="xbmc.service" -PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=${SYSROOT_PREFIX}/usr \ - --enable-libusb \ - --enable-libftdi \ - --disable-libX11 \ +PKG_CONFIGURE_OPTS_TARGET="--enable-drivers=all \ + --enable-freetype \ --enable-libhid \ + --enable-libftdi \ --disable-libpng \ - --enable-drivers=all" + --enable-libusb \ + --disable-libX11" pre_configure_target() { CFLAGS+=" -O3" diff --git a/packages/addons/service/lcdd/patches/lcdd-0.5.6-libftdi1.patch b/packages/addons/service/lcdd/patches/lcdd-0.5.6-libftdi1.patch deleted file mode 100644 index f58a6fa700..0000000000 --- a/packages/addons/service/lcdd/patches/lcdd-0.5.6-libftdi1.patch +++ /dev/null @@ -1,52 +0,0 @@ -diff --git a/server/drivers/hd44780-low.h b/server/drivers/hd44780-low.h -index 47acf45..6faa830 100644 ---- a/server/drivers/hd44780-low.h -+++ b/server/drivers/hd44780-low.h -@@ -26,7 +26,7 @@ - #endif - - #ifdef HAVE_LIBFTDI --# include -+# include - #endif - - /** \name Symbolic names for connection types -diff --git a/server/drivers/i2500vfd.c b/server/drivers/i2500vfd.c -index d896a69..7fe74f2 100644 ---- a/server/drivers/i2500vfd.c -+++ b/server/drivers/i2500vfd.c -@@ -32,7 +32,7 @@ - #include - #include - #include --#include -+#include - - #include "lcd.h" - #include "i2500vfd.h" -diff --git a/server/drivers/lis.c b/server/drivers/lis.c -index 5d3e97a..6c26a19 100644 ---- a/server/drivers/lis.c -+++ b/server/drivers/lis.c -@@ -42,7 +42,7 @@ - #include - #include - --#include -+#include - - #include "lcd.h" - #include "lis.h" -diff --git a/server/drivers/ula200.c b/server/drivers/ula200.c -index cbdde40..a84eb49 100644 ---- a/server/drivers/ula200.c -+++ b/server/drivers/ula200.c -@@ -31,7 +31,7 @@ - #include - #include - --#include -+#include - - #include "lcd.h" - #include "ula200.h"