Browse Source

Merge pull request #9916 from neheb/lcd4

lcd4linux: Switch to git
lilik-openwrt-22.03
Rosen Penev 5 years ago
committed by GitHub
parent
commit
5561faad48
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 65 deletions
  1. +20
    -28
      utils/lcd4linux/Makefile
  2. +0
    -11
      utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch
  3. +0
    -24
      utils/lcd4linux/patches/160-uinput_defs.patch
  4. +1
    -1
      utils/lcd4linux/patches/170-add-generic-spidev-driver.patch
  5. +1
    -1
      utils/lcd4linux/patches/172-add-TEW673GRU-driver.patch

+ 20
- 28
utils/lcd4linux/Makefile View File

@ -8,15 +8,25 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=lcd4linux
PKG_REV:=1204
PKG_VERSION:=r$(PKG_REV)
PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION)
PKG_SOURCE_VERSION:=$(PKG_REV)
PKG_SOURCE_PROTO:=svn
PKG_SOURCE_PROTO:=git
PKG_SOURCE_URL:=https://github.com/feckert/lcd4linux
PKG_SOURCE_DATE:=2019-07-19
PKG_SOURCE_VERSION:=0b83bb3a81e7e7f5c0aa1daa6f5b9abca538fd47
PKG_MIRROR_HASH:=26a3469bce0648b276e2c818add7049685c7f461ea9669d23730dfc3a96d9934
PKG_MAINTAINER:=Florian Eckert <fe@dev.tdt.de>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_PARALLEL:=1
PKG_CONFIG_DEPENDS:= \
$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_DRIVER_%,$(LCD4LINUX_DRIVERS)) \
$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_PLUGIN_%,$(LCD4LINUX_PLUGINS)) \
LCD4LINUX_DRIVERS:= \
ASTUSB \
@ -112,22 +122,7 @@ LCD4LINUX_PLUGINS:= \
w1retap \
$(if $(CONFIG_BROKEN),wireless) \
xmms \
# python \
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
PKG_BUILD_DEPENDS:= \
ppp \
# libftdi \
# libX11 \
# python \
PKG_CONFIG_DEPENDS:= \
$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_DRIVER_%,$(LCD4LINUX_DRIVERS)) \
$(patsubst %,CONFIG_LCD4LINUX_CUSTOM_PLUGIN_%,$(LCD4LINUX_PLUGINS)) \
# python
include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/nls.mk
@ -135,7 +130,6 @@ include $(INCLUDE_DIR)/nls.mk
define Package/lcd4linux/Default
SECTION:=utils
CATEGORY:=Utilities
PKG_MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
TITLE:=LCD display utility
URL:=http://lcd4linux.bulix.org/
endef
@ -204,12 +198,10 @@ endef
CONFIGURE_ARGS+= \
--disable-rpath \
--disable-rpath
TARGET_CFLAGS += -std=gnu89
EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
ifeq ($(BUILD_VARIANT),custom)
LCD4LINUX_CUSTOM_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
@ -269,7 +261,7 @@ ifeq ($(BUILD_VARIANT),full)
--with-plugins="$(LCD4LINUX_FULL_PLUGINS)" \
--with-libiconv-prefix="$(ICONV_PREFIX)" \
--without-python \
--without-x \
--without-x
EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql


+ 0
- 11
utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch View File

@ -1,11 +0,0 @@
--- a/plugin_netinfo.c
+++ b/plugin_netinfo.c
@@ -264,7 +264,7 @@ static void my_netmask_short(RESULT * re
sin = get_netmask(arg1);
if (NULL != sin) {
logval = (long double) (get_netmask(arg1)->sin_addr.s_addr);
- netlen = (int) rint(log2l(logval) / log2l(2.0));
+ netlen = (int) rint(log2f(logval) / log2f(2.0));
qprintf(value, sizeof(value), "/%d", netlen);
} else {
qprintf(value, sizeof(value), "/?");

+ 0
- 24
utils/lcd4linux/patches/160-uinput_defs.patch View File

@ -1,24 +0,0 @@
--- a/drv_G15.c
+++ b/drv_G15.c
@@ -42,6 +42,7 @@
#include <usb.h>
#include <fcntl.h>
+#include <linux/version.h>
#include <linux/input.h>
#include <linux/uinput.h>
@@ -269,8 +270,13 @@ void drv_G15_initKeyHandling(char *devic
}
memset(&device, 0, sizeof(device));
strncpy(device.name, "G15 Keys", UINPUT_MAX_NAME_SIZE);
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,0)
device.id.bustype = BUS_USB;
device.id.version = 4;
+#else
+ device.idbus = BUS_USB;
+ device.idversion = 4;
+#endif
ioctl(uinput_fd, UI_SET_EVBIT, EV_KEY);

+ 1
- 1
utils/lcd4linux/patches/170-add-generic-spidev-driver.patch View File

@ -1,6 +1,6 @@
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,6 +71,8 @@ drv_generic_i2c.c \
@@ -72,6 +72,8 @@ drv_generic_i2c.c \
drv_generic_i2c.h \
drv_generic_keypad.c \
drv_generic_keypad.h \


+ 1
- 1
utils/lcd4linux/patches/172-add-TEW673GRU-driver.patch View File

@ -68,7 +68,7 @@
#endif
--- a/Makefile.am
+++ b/Makefile.am
@@ -119,6 +119,7 @@ drv_ShuttleVFD.c \
@@ -120,6 +120,7 @@ drv_ShuttleVFD.c \
drv_SimpleLCD.c \
drv_T6963.c \
drv_TeakLCM.c \


Loading…
Cancel
Save