lcdd: update to 466edd3

packages/addons/service/lcdd/changelog.txt

@@ -1,3 +1,6 @@
+104:
+- Update to 466edd3
+
 103:
 - Update to 0.5.8
 

packages/addons/service/lcdd/package.mk

@@ -17,13 +17,13 @@
 ################################################################################
 
 PKG_NAME="lcdd"
-PKG_VERSION="0.5.8"
+PKG_VERSION="466edd3"
-PKG_REV="103"
+PKG_REV="104"
 PKG_ARCH="any"
 PKG_LICENSE="GPL"
 PKG_SITE="http://lcdproc.org/"
-PKG_URL="https://github.com/lcdproc/lcdproc/archive/lcdproc-$PKG_VERSION.tar.gz"
+PKG_URL="https://github.com/lcdproc/lcdproc/archive/$PKG_VERSION.tar.gz"
-PKG_SOURCE_DIR="lcdproc-lcdproc-$PKG_VERSION*"
+PKG_SOURCE_DIR="lcdproc-$PKG_VERSION*"
 PKG_DEPENDS_TARGET="toolchain freetype libftdi1 libhid libugpio libusb netbsd-curses serdisplib"
 PKG_SECTION="service"
 PKG_SHORTDESC="LCDproc: Software to display system information from your Linux/*BSD box on a LCD"

packages/addons/service/lcdd/patches/lcdd-0.5.6-dm140_henlar_v0.2.patch

@@ -59,13 +59,13 @@ index f82df85..0d98570 100644
  
  futaba_CFLAGS =      @LIBUSB_CFLAGS@ @LIBUSB_1_0_CFLAGS@ $(AM_CFLAGS)
 @@ -89,6 +89,7 @@ CFontzPacket_SOURCES = lcd.h lcd_lib.h CFontzPacket.c CFontzPacket.h CFontz-char
- curses_SOURCES =     lcd.h curses_drv.h curses_drv.c report.h
+ curses_SOURCES =     lcd.h curses_drv.h curses_drv.c
- CwLnx_SOURCES =      lcd.h lcd_lib.h CwLnx.c CwLnx.h report.h
+ CwLnx_SOURCES =      lcd.h lcd_lib.h CwLnx.c CwLnx.h
- debug_SOURCES =      lcd.h report.h debug.c debug.h
+ debug_SOURCES =      lcd.h debug.c debug.h
 +dm140_SOURCES =      lcd.h led.c libvfd.h led.h dm140.c dm140.h report.h
- ea65_SOURCES =       lcd.h ea65.h ea65.c report.h
+ ea65_SOURCES =       lcd.h ea65.h ea65.c
- EyeboxOne_SOURCES =  lcd.h lcd_lib.h EyeboxOne.c EyeboxOne.h report.h
+ EyeboxOne_SOURCES =  lcd.h lcd_lib.h EyeboxOne.c EyeboxOne.h
- futaba_SOURCES =     lcd.h futaba.c futaba.h report.h
+ futaba_SOURCES =     lcd.h futaba.c futaba.h
 diff --git a/server/drivers/dm140.c b/server/drivers/dm140.c
 new file mode 100644
 index 0000000..56f9219
@@ -92,7 +92,7 @@ index 0000000..56f9219
 +#include "lcd.h"
 +#include "dm140.h"
 +
-+#include "report.h"
++#include "shared/report.h"
 +#include "lcd_lib.h"
 +#include "libvfd.h"
 +#include "led.h"
@@ -392,7 +392,7 @@ index 0000000..0bb565c
 +#include <string.h>
 +#include "lcd.h"
 +#include "libvfd.h"
-+#include "report.h"
++#include "shared/report.h"
 +#include "dm140.h"
 +
 +

packages/addons/service/lcdd/patches/lcdd-0.5.6-libftdi1.patch

@@ -1,16 +1,3 @@
-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
@@ -42,9 +29,9 @@ index 5d3e97a..6c26a19 100644
 --- a/server/drivers/lis.c
 +++ b/server/drivers/lis.c
 @@ -42,7 +42,7 @@
+ #include <errno.h>
  #include <pthread.h>
  
- #include <usb.h>
 -#include <ftdi.h>
 +#include <libftdi1/ftdi.h>
  
@@ -55,9 +42,9 @@ index cbdde40..a84eb49 100644
 --- a/server/drivers/ula200.c
 +++ b/server/drivers/ula200.c
 @@ -31,7 +31,7 @@
+ #include <string.h>
  #include <errno.h>
  
- #include <usb.h>
 -#include <ftdi.h>
 +#include <libftdi1/ftdi.h>