tekui: switch to github

Use -devel branch on github and fix OE patch.

Signed-off-by: Stefano Babic <sbabic@denx.de>

recipes-lua/tekui/files/0001-Fix-config-for-OE.patch

@@ -1,13 +1,15 @@
-From 54b0fc6c15cd4b9dcc9a5a9a39e6be2398128eb8 Mon Sep 17 00:00:00 2001
-From: Kas User <kas@example.com>
-Date: Mon, 7 May 2018 10:51:03 +0200
+From fdb15577a039f059871af318361c5d53de0e22e9 Mon Sep 17 00:00:00 2001
+From: Stefano Babic <sbabic@denx.de>
+Date: Fri, 12 Oct 2018 12:00:50 +0200
 Subject: [PATCH] Fix config for OE
 
-Signed-off-by: Kas User <kas@example.com>
+Signed-off-by: Stefano Babic <sbabic@denx.de>
 ---
- config | 31 +++++++++++++++++--------------
- 1 file changed, 17 insertions(+), 14 deletions(-)
+ config | 54 +++++++++++++++++++++---------------------------------
+ 1 file changed, 21 insertions(+), 33 deletions(-)
 
+diff --git a/config b/config
+index 63c980a..b7e0b8f 100644
 --- a/config
 +++ b/config
 @@ -27,7 +27,7 @@ DISPLAY_DRIVER ?= x11
@@ -19,40 +21,27 @@ Signed-off-by: Kas User <kas@example.com>
  
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  # For Windows using MinGW:
-@@ -117,8 +117,8 @@ TEKUI_LIBS =
- PNG_DIR = $(PREFIX)
- PNG_INCDIR = $(PNG_DIR)/include
- PNG_LIBDIR = $(PNG_DIR)/lib
--# TEKUI_DEFS += -DENABLE_PNG -I$(PNG_INCDIR)
--# TEKUI_LIBS += -L$(PNG_LIBDIR) -lpng # $(CC_LD_RT)$(PNG_LIBDIR)
-+TEKUI_DEFS += -DENABLE_PNG -I$(PNG_INCDIR)
-+TEKUI_LIBS += -L$(PNG_LIBDIR) -lpng # $(CC_LD_RT)$(PNG_LIBDIR)
- 
- TEKLIB_DEFS = -DENABLE_LAZY_SINGLETON
- 
-@@ -129,15 +129,17 @@ TEKLIB_DEFS = -DENABLE_LAZY_SINGLETON
+@@ -127,14 +127,15 @@ TEKLIB_DEFS = -DENABLE_LAZY_SINGLETON
  #------------------------------------------------------------------------------
  
  PREFIX ?= /usr/local
 -LUAVER ?= 5.1
-+BASELIB ?= /lib
 +LUAVER ?= `pkg-config --modversion lua | cut -d'.' -f1,2`
  
  LUA_DIR = $(PREFIX)
  LUA_INCDIR = $(LUA_DIR)/include
--LUA_DEFS = -I$(LUA_INCDIR) -I/usr/include/lua$(LUAVER)
-+#LUA_DEFS = -I$(LUA_INCDIR) -I/usr/include/lua$(LUAVER)
+-LUA_DEFS = -I$(LUA_INCDIR)
++#LUA_DEFS = -I$(LUA_INCDIR)
+ # other known paths - better comment out what is inappropriate:
+-LUA_DEFS += -I/usr/include/lua$(LUAVER)
+-LUA_DEFS += -I/usr/local/include/lua51
++#LUA_DEFS += -I/usr/include/lua$(LUAVER)
++#LUA_DEFS += -I/usr/local/include/lua51
 +LUA_DEFS = `pkg-config --cflags lua` #$(LUA_DIR)/include
- # some known paths in distributions and toolchains:
--LUA_DEFS += -I/usr/local/include/lua51 -I/usr/include/lua5.1
-+#LUA_DEFS += -I/usr/local/include/lua51 -I/usr/include/lua5.1
  
--LUA_LIB = $(PREFIX)/lib/lua/$(LUAVER)
-+LUA_LIB = $(PREFIX)$(BASELIB)/lua/$(LUAVER)
+ LUA_LIB = $(PREFIX)/lib/lua/$(LUAVER)
  LUA_SHARE = $(PREFIX)/share/lua/$(LUAVER)
- SYS_LUA_LIB = $(PREFIX)/lib/lua/$(LUAVER)
- SYS_LUA_SHARE = $(PREFIX)/share/lua/$(LUAVER)
-@@ -146,11 +148,13 @@ SYS_LUA_SHARE = $(PREFIX)/share/lua/$(LU
+@@ -145,11 +146,15 @@ SYS_LUA_SHARE = $(PREFIX)/share/lua/$(LUAVER)
  # Libraries:
  #------------------------------------------------------------------------------
  
@@ -64,37 +53,73 @@ Signed-off-by: Kas User <kas@example.com>
 +#FREETYPE_DIR = $(PREFIX)
 +#FREETYPE_INCDIR = $(FREETYPE_DIR)/include
 +#FREETYPE_LIBDIR = $(FREETYPE_DIR)/lib
-+FREETYPE_INCDIR = `pkg-config --cflags freetype2`
 +#FREETYPE_LIBS = -L$(FREETYPE_LIBDIR) -lfreetype # $(CC_LD_RT)$(FREETYPE_LIBDIR)
++#FREETYPE_DEFS = -I$(FREETYPE_INCDIR)/freetype2 `freetype-config --cflags`
++
++FREETYPE_INCDIR = `pkg-config --cflags freetype2`
 +FREETYPE_LIBS = `pkg-config --libs freetype2`
 +FREETYPE_DEFS = $(FREETYPE_INCDIR)
  
  # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
  # X11 defines and libraries:
-@@ -170,7 +174,7 @@ XFT_DIR = $(X11_DIR)
- XFT_INCDIR = $(XFT_DIR)/include
- XFT_LIBDIR = $(XFT_DIR)/lib
- XFT_LIBS = -L$(XFT_LIBDIR) -lXft # $(CC_LD_RT)$(XFT_LIBDIR)
--XFT_DEFS = -I$(XFT_INCDIR) -DENABLE_XFT
-+XFT_DEFS = -I$(XFT_INCDIR) # -DENABLE_XFT
- 
+@@ -174,7 +179,8 @@ XFT_DEFS = -I$(XFT_INCDIR) -DENABLE_XFT
  FONTCONFIG_DIR = $(PREFIX)
  FONTCONFIG_INCDIR = $(FONTCONFIG_DIR)/include
-@@ -254,7 +258,7 @@ LUAARCH = -m64 # -m32 for 32bit, -m64 fo
+ FONTCONFIG_LIBDIR = $(FONTCONFIG_DIR)/lib
+-FONTCONFIG_LIBS = -L$(FONTCONFIG_LIBDIR) -lfontconfig # $(CC_LD_RT)$(FONTCONFIG_LIBDIR)
++#FONTCONFIG_LIBS = -L$(FONTCONFIG_LIBDIR) -lfontconfig # $(CC_LD_RT)$(FONTCONFIG_LIBDIR)
++FONTCONFIG_LIBS = -L$(FONTCONFIG_LIBDIR) # -lfontconfig $(CC_LD_RT)$(FONTCONFIG_LIBDIR)
+ FONTCONFIG_DEFS = -I$(FONTCONFIG_INCDIR)
+ 
+ # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+@@ -237,7 +243,7 @@ MODDIR = $(BINDIR)/mod
+ #------------------------------------------------------------------------------
+ 
+ DEBUG = -DTDEBUG=5 -g # TDEBUG: the lower, the more verbose. 5 = WARN
+-WARN = -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-long-long -Wno-unused-value
++WARN = -Wall -Wextra -Wno-unused-parameter -Wno-unused-function -Wno-long-long # -Wno-unused-value
+ OPT = -O2 -fno-strict-aliasing
+ INCL = -I. -Iinclude -I$(INCDIR)
+ LIBCFLAGS = $(DEBUG) $(WARN) $(OPT) $(INCL) $(EXTRADEFS) $(CPPFLAGS) $(CFLAGS)
+@@ -250,7 +256,8 @@ BINCFLAGS = $(DEBUG) $(WARN) $(OPT) $(INCL) $(EXTRADEFS) $(LDFLAGS)
  # Build tools:
  #------------------------------------------------------------------------------
  
 -AR = $(CROSS_COMPILE)ar rcu
++#AR = $(CROSS_COMPILE)ar rcu
 +AR = ar rcu
  RM = rm -f
  RMDIR = rm -rf
  MKDIR = mkdir -p
-@@ -262,7 +266,7 @@ ECHO = echo
+@@ -258,27 +265,8 @@ ECHO = echo
  INSTALL_B = install
  INSTALL_F = install
  INSTALL_D = install -d
 -INSTALL_S = install -s
+-STRIP = $(CROSS_COMPILE)strip
 +INSTALL_S = install
  
+-#------------------------------------------------------------------------------
+-# Lua/tekUI standalone executable: not needed by default, only for 'make tools'
+-#------------------------------------------------------------------------------
+-
+-# Lua distribution path:
+-LUADISTDIR = $(BASEDIR)/../lua-5.1.5
+-# Linux:
+-LUAEXE_DEFS = $(X11_DEFS) $(TEKUI_DEFS) -DLUA_USE_LINUX
+-LUAEXE_LIBS = $(X11_LIBS) -lreadline -lm -ldl -pthread
+-# Mac OS X:
+-# LUAEXE_DEFS = $(X11_DEFS) $(TEKUI_DEFS) -DLUA_USE_MACOSX
+-# LUAEXE_LIBS = $(X11_LIBS) -lreadline
+-# Windows:
+-# LUAEXE_DEFS = $(TEKUI_DEFS)
+-# LUAEXE_LIBS = $(WIN_LIBS)
+-# FreeBSD:
+-# LUAEXE_DEFS = $(X11_DEFS) $(TEKUI_DEFS) -DLUA_USE_LINUX
+-# LUAEXE_LIBS = -Wl,-E $(X11_LIBS) -lreadline -lm -pthread
+ 
  #------------------------------------------------------------------------------
  # Predefined targets:
+-- 
+2.17.1
+

recipes-lua/tekui/tekui_1.12.bb

@@ -12,20 +12,18 @@
 #   doc/copyright.html
 #   src/display_rawfb/vnc/COPYING
 LICENSE = "MIT"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=f8640872a50cd4ee663b8fb2f603b854 \
-                    file://tek/ui/font/COPYRIGHT.TXT;md5=27d7484b1e18d0ee4ce538644a3f04be \
-                    file://doc/copyright.html;md5=e0ef847c1e1b62ee80317a79b7cd99de \
-                    file://src/display_rawfb/vnc/COPYING;md5=361b6b837cad26c6900a926b62aada5f"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=a12f233f3497ee1f8a18dddfde5a7fc3"
 
-SRC_URI = "http://tekui.neoscientists.org/releases/tekui-1.12-r1.tgz \
-           file://0001-Fix-config-for-OE.patch \
+SRC_URI = " \
+	git://github.com/sbabic/tekUI.git;protocol=https;branch=tekui-devel \
+        file://0001-Fix-config-for-OE.patch \
 	"
-SRC_URI[md5sum] = "cf67e1aa5583ee22e5f63ad2b297e2c9"
-SRC_URI[sha256sum] = "d3130a9403e05b8322e47b5e8c0716f5ccf2956ecae6e1268b05085a774b0894"
+
+SRCREV = "b0a20f57e47548099e443d54fc6fb33666543b72"
 
 PR = "r1"
 
-S = "${WORKDIR}/${BP}-${PR}"
+S = "${WORKDIR}/git"
 
 PACKAGES += "${PN}-examples"
 FILES_${PN} = "${libdir} ${datadir}/lua"