mirror of
https://github.com/LibreELEC/LibreELEC.tv.git
synced 2025-07-24 11:16:51 +00:00
Merge pull request #990 from awiouy/lcdd
lcdd: update to upstream 1554506
This commit is contained in:
commit
4b0e759a3d
@ -1,2 +1,5 @@
|
||||
100
|
||||
101:
|
||||
- Update to upstream 1554506
|
||||
|
||||
100:
|
||||
- Initial addon
|
||||
|
@ -17,13 +17,13 @@
|
||||
################################################################################
|
||||
|
||||
PKG_NAME="lcdd"
|
||||
PKG_VERSION="0.5.7-cvs20140217"
|
||||
PKG_REV="100"
|
||||
PKG_VERSION="1554506"
|
||||
PKG_REV="101"
|
||||
PKG_ARCH="any"
|
||||
PKG_LICENSE="GPL"
|
||||
PKG_SITE="http://lcdproc.org/"
|
||||
PKG_URL="$DISTRO_SRC/lcdproc-$PKG_VERSION.tar.xz"
|
||||
PKG_SOURCE_DIR="lcdproc-$PKG_VERSION"
|
||||
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 libusb netbsd-curses serdisplib"
|
||||
PKG_SECTION="service"
|
||||
PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD"
|
||||
|
File diff suppressed because it is too large
Load Diff
@ -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 );
|
||||
}
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user