From patchwork Sun Jul 8 09:36:52 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stefano Babic X-Patchwork-Id: 940925 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=googlegroups.com (client-ip=2a00:1450:400c:c09::23c; helo=mail-wm0-x23c.google.com; envelope-from=swupdate+bncbcxploxj6ikrbq5wq7nakgqejghgjqy@googlegroups.com; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=googlegroups.com header.i=@googlegroups.com header.b="tZs1fXJM"; dkim-atps=neutral Received: from mail-wm0-x23c.google.com (mail-wm0-x23c.google.com [IPv6:2a00:1450:400c:c09::23c]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41NjzV0hCwz9s3q for ; Sun, 8 Jul 2018 19:37:09 +1000 (AEST) Received: by mail-wm0-x23c.google.com with SMTP id l4-v6sf12574675wmc.7 for ; Sun, 08 Jul 2018 02:37:09 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1531042627; cv=pass; d=google.com; s=arc-20160816; b=ehf9aY/r1HX3xcBBuxutBc8PhxJ6HMDe9V/M4T1vPVMaNSfmEWVtdWRtbB4xIBdEvR iji6Y0sXvoUM96/Za2aSU6BqHNg+JI/n4xIgDkktuCpTjPhgFzc9AXX63C3SdihtcUfp Ww+yr9+V0tp55BOK9Nh8MTAssuldenvwWfRmvhbY6setYaHY05o6hExwAcEl4JliZEvf A40VIuC9Hqb9WIPmnBUYL+Z8kWJ/stzd4V5gECUSk2gzPAob2ZIJ+VY5TVY52t54v5AQ qAw6yAJGeFAwrPEKUuVUPHJuZ19Xkw3vcTLPN2Am5vv7mbhq7fVq4Qg/J/wLEncAg7Re qPkQ== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:arc-authentication-results :arc-message-signature:mime-version:sender:dkim-signature :arc-authentication-results; bh=MSX3ubWsU7NopUkOWHRF7TY0THUbygm1wTBWKtZaKmE=; b=bXn6I1FWT42PswcDiyN+FtmeZybNuxA1zsAgN6IetY5rTZEcezic8WtRHeBXikOfc7 zEfCX9fHxqyxzrp7NXc04+/UrJUc+yaVjliBnrJ+M+gB+XEhBKCWC1bYTsq+QsKHosh2 3Rfg85S7YsJdI3Pn7MypSCTiVknjSp8+5zD/+zpSDCgE8N/frG6WQNZZXL2alT+W6fL1 LhGx1CXeSYHADq+A66L/5Dnkp+B/vQ3d36T+ll6D1U9WTwlMPX5q6sn4Z0EU9OSujhA6 in3ayIwt+iRojcRfh/qd2Muh0C3NJXhlO22dzf13XV7FoXiE0RUzxZHT8SFNeBYAdXRV Gs6g== ARC-Authentication-Results: i=2; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20161025; h=sender:mime-version:from:to:cc:subject:date:message-id:in-reply-to :references:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=MSX3ubWsU7NopUkOWHRF7TY0THUbygm1wTBWKtZaKmE=; b=tZs1fXJMWCa4Q58SSfSdOjvtZg/9+l1LQjwAzcdWrt5r9+DBPuLXXZXMAmHP5nRvNQ Wq+RS4uTWTU6/ciB6d6+o+504iz/Eu5B/1xBw1QKKSGiayO9aEwcspengnpUb8PDvsw8 itumwtRJ9JYfCCGa6zdq1zzZxsBL59Zs1kdlnupj97Kl070J4QiA2UMDYy0TVKkHLw8N 6SxzFNztkvmFzrGoDujxlXp2P9ydnXvocB7lHpRRDVKyETHAgpTFEUnBC/lw14mOWQt8 3epUkZwJpQ12oCLseG47EU7T5ZN2ABBtPJ8OLJwI1ETT7fLokN/46vCDPE6n4MZnzKiR jhWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=sender:x-gm-message-state:mime-version:from:to:cc:subject:date :message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :x-spam-checked-in-group:list-post:list-help:list-archive :list-subscribe:list-unsubscribe; bh=MSX3ubWsU7NopUkOWHRF7TY0THUbygm1wTBWKtZaKmE=; b=G3CWZ9WayPbXYfeDksKrLilEfcWxSqJScXJm2YjzAZM4TFTT6gZdlUrKPRn7JdEzAc toIHv0ld+hhB2HR9lAqsLl1TA6PRjyXRH+zx2CF9ZCvKc/Mg6cDoEY6/Af7aMwdfFW37 7eKsxLEI3LwfBMQysnERiXW22R6d9eFJ2avuB5UF38yO8fFRQAEBYcls+KHWbqx6cx8W 9k9GVVo+If+/d7OYbkSWExgN+4t5kNn+teFpM6uWyPwmp952uTh6MpgOZXiVk2AWvgYA Oh5ROWnVKTXpb5ATBZJ6cZ0Vq1EkcDk9Rk2TVjor45dVSmYjPcO6Ef6jzQUZgkG8vDh3 0fcw== Sender: swupdate@googlegroups.com X-Gm-Message-State: APt69E271DTDYMUhuaIwttWUp/0odiz0Op65cjHEqh1QfxVWq581exST Ru1Y4fw729HjK2JhKBjeFIQ= X-Google-Smtp-Source: AAOMgpdrn0fLuXKloTxfgEBidQqmbLHkWLQMPKksqRSofRFdrOG86jOCeCoAMs3KCXz0/JY/dIziOw== X-Received: by 2002:adf:eece:: with SMTP id a14-v6mr125849wrp.1.1531042627364; Sun, 08 Jul 2018 02:37:07 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: swupdate@googlegroups.com Received: by 2002:a1c:308c:: with SMTP id w134-v6ls2323367wmw.11.gmail; Sun, 08 Jul 2018 02:37:06 -0700 (PDT) X-Received: by 2002:a1c:6a01:: with SMTP id f1-v6mr1033208wmc.18.1531042626859; Sun, 08 Jul 2018 02:37:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531042626; cv=none; d=google.com; s=arc-20160816; b=vFLFZFpovoqJk0aSUOB85jzAZ2ycJwTf+zx5NwFFATS+dOOvEcfs7PI/ngviPKJf/R 7aZElZC8d0rDYhLaSq1+vYWiB8LNKy/1R9+U3npmasCOxDwW8mOawFp3QNsJuBHXJnsJ 9r+X8Ug0+It+xBgQvIAez+M6zXRqJk4r3YlRjKlz2L2TCYOCh33K3cZaJd3bfkpDsHPh lR98U6qnk9r6OEGxLJRHVEEx4eCP9YWdMC96MiZ36egQ8QaXeLP3nYU+IYO1ZqJ/xpjQ wvTtExTwQxnzJu7iXSHAlREjQY/6AytunYQu1OrY0IPRahxCTFj/nJJnzrSW0CA5vL2C Srug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=65u1+JYxTHKRAh0ojgN855rIozZpElZjGkJDxws4wkY=; b=fkVhXyYt8TWgk21wEnmnS5gqSbub8x0LpX22b6Gg927Cqp/FDFvpycNpitvzoV4zWo gh6dHOTk7I5NdGCfCQyjalVpahXN0HEQ+J3+OjL4oWZp6NhtgvOd3jCuWXfxqRsi6bFy xhsngYnWKO1TxKRFftqKTuaUk8vDC5H35uk3/Gp+a7VMxl7CTNPI2Cr8m+hK+mY1dMOn B7Son9i0jsGxFnKjusnvxnRg8rMAfh6QjcqoaCo5EivJBhh3mxlkZyhY/unaheCq47nf HZPF2zCnI4Q9OocBVfqE/7iXJ1Vwzc+5GJeRu4j4ScZru9AhwZRzLdKOv8qWLHIUm7Ex SPXA== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Received: from mail-out.m-online.net (mail-out.m-online.net. [212.18.0.10]) by gmr-mx.google.com with ESMTPS id q9-v6si86509wmc.4.2018.07.08.02.37.06 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 08 Jul 2018 02:37:06 -0700 (PDT) Received-SPF: neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) client-ip=212.18.0.10; Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 41NjzQ4bBTz1qtNv; Sun, 8 Jul 2018 11:37:06 +0200 (CEST) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 41NjzQ4QDfz1qqkC; Sun, 8 Jul 2018 11:37:06 +0200 (CEST) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id 3WT6CWVFbOEI; Sun, 8 Jul 2018 11:37:05 +0200 (CEST) Received: from babic.homelinux.org (host-88-217-136-221.customer.m-online.net [88.217.136.221]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPS; Sun, 8 Jul 2018 11:37:05 +0200 (CEST) Received: from localhost (mail.babic.homelinux.org [127.0.0.1]) by babic.homelinux.org (Postfix) with ESMTP id A6BC6454038F; Sun, 8 Jul 2018 11:37:04 +0200 (CEST) X-Virus-Scanned: Debian amavisd-new at babic.homelinux.org Received: from babic.homelinux.org ([127.0.0.1]) by localhost (mail.babic.homelinux.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id DpBMwh6kM8qf; Sun, 8 Jul 2018 11:37:01 +0200 (CEST) Received: from papero.fritz.box (papero.fritz.box [192.168.178.132]) by babic.homelinux.org (Postfix) with ESMTP id BA9A34540633; Sun, 8 Jul 2018 11:37:01 +0200 (CEST) From: Stefano Babic To: swupdate@googlegroups.com Cc: Stefano Babic Subject: [swupdate] [[meta-swupdate] [PATCH] 2/7] lua: add tekui Date: Sun, 8 Jul 2018 11:36:52 +0200 Message-Id: <1531042617-6503-2-git-send-email-sbabic@denx.de> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531042617-6503-1-git-send-email-sbabic@denx.de> References: <1531042617-6503-1-git-send-email-sbabic@denx.de> X-Original-Sender: sbabic@denx.de X-Original-Authentication-Results: gmr-mx.google.com; spf=neutral (google.com: 212.18.0.10 is neither permitted nor denied by best guess record for domain of sbabic@denx.de) smtp.mailfrom=sbabic@denx.de Precedence: list Mailing-list: list swupdate@googlegroups.com; contact swupdate+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: swupdate@googlegroups.com X-Google-Group-Id: 605343134186 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , TekUI is a small, freestanding and portable graphical user interface (GUI) toolkit written in Lua and C. Due to its small footprint, it is a good choice to build a GUI for the rescue system. Signed-off-by: Stefano Babic --- .../tekui/files/0001-Fix-config-for-OE.patch | 101 +++++++++++++++++++++ recipes-lua/tekui/tekui_1.12.bb | 50 ++++++++++ 2 files changed, 151 insertions(+) create mode 100644 recipes-lua/tekui/files/0001-Fix-config-for-OE.patch create mode 100644 recipes-lua/tekui/tekui_1.12.bb diff --git a/recipes-lua/tekui/files/0001-Fix-config-for-OE.patch b/recipes-lua/tekui/files/0001-Fix-config-for-OE.patch new file mode 100644 index 0000000..5e92064 --- /dev/null +++ b/recipes-lua/tekui/files/0001-Fix-config-for-OE.patch @@ -0,0 +1,101 @@ +From 54b0fc6c15cd4b9dcc9a5a9a39e6be2398128eb8 Mon Sep 17 00:00:00 2001 +From: Kas User +Date: Mon, 7 May 2018 10:51:03 +0200 +Subject: [PATCH] Fix config for OE + +Signed-off-by: Kas User +--- + config | 31 +++++++++++++++++-------------- + 1 file changed, 17 insertions(+), 14 deletions(-) + +diff --git a/config b/config +index 8664568..31e65a2 100644 +--- a/config ++++ b/config +@@ -27,7 +27,7 @@ DISPLAY_DRIVER ?= x11 + # Uncomment TSYS_POSIX if your platform is not listed in include/tek/config.h + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +-CC = $(CROSS_COMPILE)gcc -fpic # -DTSYS_POSIX ++CC ?= $(CROSS_COMPILE)gcc -fpic # -DTSYS_POSIX + + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + # 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,13 +129,14 @@ TEKLIB_DEFS = -DENABLE_LAZY_SINGLETON + #------------------------------------------------------------------------------ + + PREFIX ?= /usr/local +-LUAVER ?= 5.1 ++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 = `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_SHARE = $(PREFIX)/share/lua/$(LUAVER) +@@ -146,11 +147,13 @@ SYS_LUA_SHARE = $(PREFIX)/share/lua/$(LUAVER) + # Libraries: + #------------------------------------------------------------------------------ + +-FREETYPE_DIR = $(PREFIX) +-FREETYPE_INCDIR = $(FREETYPE_DIR)/include +-FREETYPE_LIBDIR = $(FREETYPE_DIR)/lib +-FREETYPE_LIBS = -L$(FREETYPE_LIBDIR) -lfreetype # $(CC_LD_RT)$(FREETYPE_LIBDIR) +-FREETYPE_DEFS = -I$(FREETYPE_INCDIR)/freetype2 `freetype-config --cflags` ++#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_LIBS = `pkg-config --libs freetype2` ++FREETYPE_DEFS = $(FREETYPE_INCDIR) + + # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + # X11 defines and libraries: +@@ -170,7 +173,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 + + FONTCONFIG_DIR = $(PREFIX) + FONTCONFIG_INCDIR = $(FONTCONFIG_DIR)/include +@@ -254,7 +257,7 @@ LUAARCH = -m64 # -m32 for 32bit, -m64 for 64bit architecture + # Build tools: + #------------------------------------------------------------------------------ + +-AR = $(CROSS_COMPILE)ar rcu ++AR = ar rcu + RM = rm -f + RMDIR = rm -rf + MKDIR = mkdir -p +@@ -262,7 +265,7 @@ ECHO = echo + INSTALL_B = install + INSTALL_F = install + INSTALL_D = install -d +-INSTALL_S = install -s ++INSTALL_S = install + + #------------------------------------------------------------------------------ + # Predefined targets: +-- +2.7.4 + diff --git a/recipes-lua/tekui/tekui_1.12.bb b/recipes-lua/tekui/tekui_1.12.bb new file mode 100644 index 0000000..ff00991 --- /dev/null +++ b/recipes-lua/tekui/tekui_1.12.bb @@ -0,0 +1,50 @@ +# Recipe created by recipetool +# This is the basis of a recipe and may need further editing in order to be fully functional. +# (Feel free to remove these comments when editing.) + +# WARNING: the following LICENSE and LIC_FILES_CHKSUM values are best guesses - it is +# your responsibility to verify that the values are complete and correct. +# +# The following license files were not able to be identified and are +# represented as "Unknown" below, you will need to check them yourself: +# COPYRIGHT +# tek/ui/font/COPYRIGHT.TXT +# 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" + +SRC_URI = "http://tekui.neoscientists.org/releases/tekui-1.12-r1.tgz \ + file://0001-Fix-config-for-OE.patch \ + " +SRC_URI[md5sum] = "cf67e1aa5583ee22e5f63ad2b297e2c9" +SRC_URI[sha256sum] = "d3130a9403e05b8322e47b5e8c0716f5ccf2956ecae6e1268b05085a774b0894" + +PR = "r1" + +S = "${WORKDIR}/${PN}-${PV}-${PR}" + +PACKAGES += "${PN}-examples" +FILES_${PN} = "${libdir} ${datadir}/lua" + +inherit pkgconfig + +# NOTE: the following library dependencies are unknown, ignoring: imgload display_directfb tekc tek region imgcache tekdebug utf8 display_win visual exec hal display_rawfb cachemanager display_x11 pixconv +# (this is based on recipes that have previously been built and packaged) +# NOTE: some of these dependencies may be optional, check the Makefile and/or upstream documentation +DEPENDS = "libx11 readline lua freetype libpng fontconfig" +DEPENDS = "lua freetype libpng fontconfig" +RDEPENDS_${PN} += "lua" + +EXTRA_OEMAKE = 'PREFIX=${D}/usr DISPLAY_DRIVER=rawfb CROSS_COMPILE=${TARGET_PREFIX} CC="${CC} -fpic"' + +do_compile () { + oe_runmake all +} + +do_install () { + oe_runmake install +}