mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
lcdproc: remove package
This commit is contained in:
parent
7b3f9ce9f4
commit
2974e17bce
@ -384,7 +384,6 @@ show_config() {
|
||||
config_message="$config_message\n - ALSA support:\t\t\t $ALSA_SUPPORT"
|
||||
config_message="$config_message\n - Pulseaudio support:\t\t\t $PULSEAUDIO_SUPPORT"
|
||||
config_message="$config_message\n - Bluetooth support:\t\t\t $BLUETOOTH_SUPPORT"
|
||||
config_message="$config_message\n - LCD drivers:\t\t\t\t $LCD_DRIVER"
|
||||
|
||||
for config_driver in $ADDITIONAL_DRIVERS; do
|
||||
config_message="$config_message\n - Include driver:\t\t\t $config_driver"
|
||||
|
@ -153,19 +153,6 @@
|
||||
# build and install iSCSI support - iscsistart (yes / no)
|
||||
ISCSI_SUPPORT="yes"
|
||||
|
||||
# LCD driver to Use - Possible drivers are ( Comma seperated:
|
||||
# bayrad,CFontz,CFontz633,CFontzPacket,curses,CwLnx,dm140,
|
||||
# ea65,EyeboxOne,g15,glcd,glcdlib,glk,hd44780,i2500vfd,
|
||||
# icp_a106,imon,imonlcd,IOWarrior,irman,irtrans,
|
||||
# joy,lb216,lcdm001,lcterm,lirc,lis,MD8800,mdm166a,
|
||||
# ms6931,mtc_s16209x,MtxOrb,mx5000,NoritakeVFD,
|
||||
# picolcd,pyramid,sed1330,sed1520,serialPOS,
|
||||
# serialVFD,shuttleVFD,sli,stv5730,SureElec,svga,vlsys_m428
|
||||
# 'all' compiles all drivers;
|
||||
# 'all,!xxx,!yyy' de-selects previously selected drivers
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="irtrans,imon,imonlcd,mdm166a,MtxOrb,lis,dm140,hd44780,CFontz,SureElec,vlsys_m428,serialVFD,shuttleVFD"
|
||||
|
||||
# Support for partitioning and formating disks in initramfs (yes / no)
|
||||
# This adds support for parted and mkfs.ext3/4 to initramfs for OEM usage
|
||||
INITRAMFS_PARTED_SUPPORT="no"
|
||||
|
@ -1,76 +0,0 @@
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2016 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="lcdproc"
|
||||
PKG_VERSION="0.5.7-cvs20140217"
|
||||
PKG_REV="1"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://lcdproc.org/"
|
||||
# PKG_URL="$SOURCEFORGE_SRC/lcdproc/lcdproc/$PKG_VERSION/$PKG_NAME-$PKG_VERSION.tar.gz"
|
||||
PKG_URL="$DISTRO_SRC/$PKG_NAME-$PKG_VERSION.tar.xz"
|
||||
PKG_DEPENDS_TARGET="toolchain libusb libhid libftdi1"
|
||||
PKG_SECTION="system"
|
||||
PKG_SHORTDESC="lcdproc: Software to display system information from your Linux/*BSD box on a LCD"
|
||||
PKG_LONGDESC="LCDproc 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."
|
||||
|
||||
PKG_IS_ADDON="no"
|
||||
PKG_AUTORECONF="yes"
|
||||
|
||||
IFS=$','
|
||||
for i in $LCD_DRIVER; do
|
||||
case $i in
|
||||
glcd) PKG_DEPENDS_TARGET="$PKG_DEPENDS_TARGET freetype serdisplib"
|
||||
;;
|
||||
*)
|
||||
esac
|
||||
done
|
||||
unset IFS
|
||||
|
||||
PKG_CONFIGURE_OPTS_TARGET="--with-ft-prefix=$SYSROOT_PREFIX/usr --enable-libusb --enable-drivers=$LCD_DRIVER,!curses,!svga --enable-seamless-hbars"
|
||||
|
||||
pre_make_target() {
|
||||
# dont build parallel
|
||||
MAKEFLAGS=-j1
|
||||
}
|
||||
|
||||
post_makeinstall_target() {
|
||||
rm -rf $INSTALL/etc/lcd*.conf
|
||||
rm -rf $INSTALL/usr/bin
|
||||
|
||||
sed -e "s|^DriverPath=.*$|DriverPath=/usr/lib/lcdproc/|" \
|
||||
-e "s|^#Foreground=.*$|Foreground=no|" \
|
||||
-e "s|^#ServerScreen=.*$|ServerScreen=blank|" \
|
||||
-e "s|^#Backlight=.*$|Backlight=open|" \
|
||||
-e "s|^#Heartbeat=.*$|Heartbeat=open|" \
|
||||
-e "s|^#TitleSpeed=.*$|TitleSpeed=4|" \
|
||||
-e "s|^#Hello=\" Welcome to\"|Hello=\"Welcome to\"|" \
|
||||
-e "s|^#Hello=\" LCDproc!\"|Hello=\"$DISTRONAME\"|" \
|
||||
-e "s|^#GoodBye=\"Thanks for using\"|GoodBye=\"Thanks for using\"|" \
|
||||
-e "s|^#GoodBye=\" LCDproc!\"|GoodBye=\"$DISTRONAME\"|" \
|
||||
-e "s|^#normal_font=.*$|normal_font=/usr/share/fonts/liberation/LiberationMono-Bold.ttf|" \
|
||||
-i $INSTALL/etc/LCDd.conf
|
||||
|
||||
mkdir -p $INSTALL/usr/lib/libreelec
|
||||
cp $PKG_DIR/scripts/lcd-wrapper $INSTALL/usr/lib/libreelec
|
||||
|
||||
}
|
||||
|
||||
post_install() {
|
||||
enable_service lcdd.service
|
||||
}
|
File diff suppressed because it is too large
Load Diff
@ -1,65 +0,0 @@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 7c053d2..dcb0c4d 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -314,7 +314,7 @@ AC_MSG_RESULT($enable_libftdi)
|
||||
|
||||
if test "$enable_libftdi" = "yes"; then
|
||||
ifdef([PKG_CHECK_MODULES],
|
||||
- [PKG_CHECK_MODULES(LIBFTDI, libftdi >= 0.8,
|
||||
+ [PKG_CHECK_MODULES(LIBFTDI, libftdi1 >= 0.8,
|
||||
[AC_DEFINE(HAVE_LIBFTDI, [1], [Define to 1 if you have libftdi])],
|
||||
[ enable_libftdi=no ])],
|
||||
[AC_MSG_WARN([pkg-config not (fully) installed; drivers requiring libftdi may not be built])])
|
||||
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 <ftdi.h>
|
||||
+# include <libftdi1/ftdi.h>
|
||||
#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 <stdio.h>
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
-#include <ftdi.h>
|
||||
+#include <libftdi1/ftdi.h>
|
||||
|
||||
#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 <pthread.h>
|
||||
|
||||
#include <usb.h>
|
||||
-#include <ftdi.h>
|
||||
+#include <libftdi1/ftdi.h>
|
||||
|
||||
#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 <errno.h>
|
||||
|
||||
#include <usb.h>
|
||||
-#include <ftdi.h>
|
||||
+#include <libftdi1/ftdi.h>
|
||||
|
||||
#include "lcd.h"
|
||||
#include "ula200.h"
|
@ -1,56 +0,0 @@
|
||||
diff -Naur lcdproc-0.5.7-cvs20140217/server/drivers/dm140.c lcdproc-0.5.7-cvs20140217.patch/server/drivers/dm140.c
|
||||
--- lcdproc-0.5.7-cvs20140217/server/drivers/dm140.c 2014-12-24 01:37:27.439628078 +0100
|
||||
+++ lcdproc-0.5.7-cvs20140217.patch/server/drivers/dm140.c 2014-12-24 01:41:34.556853466 +0100
|
||||
@@ -81,10 +81,17 @@
|
||||
return -1;
|
||||
}
|
||||
|
||||
- if((p->fd = OpenHID(drvthis))< 0)
|
||||
+ if ((p->fd = OpenHID(drvthis)) < 0)
|
||||
{
|
||||
- report(RPT_INFO, "Device for Vendor[%s] Product[%s] was not found, exiting\n", p->pszVendor, p->pszProduct);
|
||||
- return -1;
|
||||
+ report(RPT_INFO, "Device for Vendor[%s] Product[%s] was not found\n", p->pszVendor, p->pszProduct);
|
||||
+ p->pszVendor = "1509";
|
||||
+ p->pszProduct = "925d";
|
||||
+ if ((p->fd = OpenHID(drvthis)) < 0)
|
||||
+ {
|
||||
+ report(RPT_INFO, "Device for Vendor[%s] Product[%s] was not found\n", p->pszVendor, p->pszProduct);
|
||||
+ report(RPT_INFO, "No dm140 device found, exiting\n");
|
||||
+ return -1;
|
||||
+ }
|
||||
}
|
||||
|
||||
//******************************************************
|
||||
diff -Naur lcdproc-0.5.7-cvs20140217/server/drivers/led.c lcdproc-0.5.7-cvs20140217.patch/server/drivers/led.c
|
||||
--- lcdproc-0.5.7-cvs20140217/server/drivers/led.c 2014-12-24 01:37:27.439628078 +0100
|
||||
+++ lcdproc-0.5.7-cvs20140217.patch/server/drivers/led.c 2014-12-24 01:49:38.519253308 +0100
|
||||
@@ -95,21 +95,21 @@
|
||||
//**************************************************************
|
||||
// FUNCTION: Compare
|
||||
//
|
||||
-// INPUT:
|
||||
+// INPUT:
|
||||
// const char *pszValue - string to compare
|
||||
-// short sValue - numberic value to compare
|
||||
+// short sOtherValue - numeric value to compare
|
||||
//
|
||||
// OUTPUT:
|
||||
// int - Boolean value, 0 on non match, 1 on success.
|
||||
//
|
||||
-// DESCRIPTION: Compare a character value to a numeric value.
|
||||
+// DESCRIPTION: Compare a hex value in a string to a numeric value.
|
||||
//**************************************************************
|
||||
-int Compare(const char *pszValue, short sValue)
|
||||
+int Compare(const char *pszValue, short sOtherValue)
|
||||
{
|
||||
- int iValue;
|
||||
+ short sValue;
|
||||
// convert the pszValue to a number
|
||||
- sscanf( pszValue, "%4x", &iValue);
|
||||
- return( iValue == sValue );
|
||||
+ sscanf( pszValue, "%4hx", &sValue );
|
||||
+ return( sValue == sOtherValue );
|
||||
}
|
||||
|
||||
|
@ -1,32 +0,0 @@
|
||||
#!/bin/sh
|
||||
################################################################################
|
||||
# This file is part of OpenELEC - http://www.openelec.tv
|
||||
# Copyright (C) 2009-2014 Stephan Raue (stephan@openelec.tv)
|
||||
#
|
||||
# OpenELEC is free software: you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation, either version 2 of the License, or
|
||||
# (at your option) any later version.
|
||||
#
|
||||
# OpenELEC is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
# You should have received a copy of the GNU General Public License
|
||||
# along with OpenELEC. If not, see <http://www.gnu.org/licenses/>.
|
||||
################################################################################
|
||||
|
||||
if [ -f /storage/.cache/services/lcdd.conf ]; then
|
||||
. /storage/.cache/services/lcdd.conf
|
||||
|
||||
if [ "$LCD_DRIVER" == "none" ]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
LCDCONF=/etc/LCDd.conf
|
||||
if [ -f /storage/.config/LCDd.conf ]; then
|
||||
LCDCONF=/storage/.config/LCDd.conf
|
||||
fi
|
||||
exec /usr/sbin/LCDd -f -c $LCDCONF -d $LCD_DRIVER
|
||||
fi
|
@ -1,16 +0,0 @@
|
||||
[Unit]
|
||||
Description=LCDProc
|
||||
ConditionPathExists=|/storage/.cache/services/lcdd.conf
|
||||
After=multi-user.target
|
||||
|
||||
[Service]
|
||||
EnvironmentFile=-/storage/.cache/services/lcdd.conf
|
||||
ExecStart=/bin/sh -c 'exec /usr/lib/libreelec/lcd-wrapper'
|
||||
TimeoutStopSec=1s
|
||||
Restart=always
|
||||
RestartSec=5
|
||||
StartLimitInterval=30
|
||||
StartLimitBurst=5
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
@ -109,9 +109,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="no"
|
||||
|
||||
|
@ -117,9 +117,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="yes"
|
||||
|
||||
|
@ -117,9 +117,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="yes"
|
||||
|
||||
|
@ -127,9 +127,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="yes"
|
||||
|
||||
|
@ -115,9 +115,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="yes"
|
||||
|
||||
|
@ -121,9 +121,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="yes"
|
||||
|
||||
|
@ -115,9 +115,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# Amlogic IR remote support (yes / no)
|
||||
AMREMOTE_SUPPORT="yes"
|
||||
|
||||
|
@ -136,9 +136,6 @@
|
||||
# build and install ATV IR remote support (yes / no)
|
||||
ATVCLIENT_SUPPORT="no"
|
||||
|
||||
# "none" for disable LCD support
|
||||
LCD_DRIVER="none"
|
||||
|
||||
# build with swap support (yes / no)
|
||||
SWAP_SUPPORT="no"
|
||||
|
||||
|
@ -178,9 +178,6 @@ $SCRIPTS/install network
|
||||
# Remote support
|
||||
[ "$REMOTE_SUPPORT" = "yes" ] && $SCRIPTS/install remote
|
||||
|
||||
# LCD support
|
||||
[ ! "$LCD_DRIVER" = "none" ] && $SCRIPTS/install lcdproc
|
||||
|
||||
# Virtual image creation support
|
||||
[ "$PROJECT" = Virtual ] && $SCRIPTS/install virtual
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user