Bump buidlroot version to 2018.02.6

2018-10-22 14:55:59 +02:00
parent 222960cedb
commit bec94fdb63
6150 changed files with 84803 additions and 117446 deletions
--- a/bsp/buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch
+++ b/bsp/buildroot/package/lcdproc/0001-Add-missing-ioctl-header.patch
@@ -0,0 +1,50 @@
+From 6267665454501512ac054202b38e4e6a72fa284b Mon Sep 17 00:00:00 2001
+From: Baruch Siach <baruch@tkos.co.il>
+Date: Fri, 8 Sep 2017 14:19:11 +0300
+Subject: [PATCH] Add missing ioctl header
+
+The spidev.h header uses macros from linux/ioctl.h. Add this header
+explicitly since some libc, like musl, do not include it implicitly.
+This fixes the following build failure:
+
+In file included from .../sysroot/usr/include/sys/ioctl.h:7:0,
+                 from hd44780-spi.c:31:
+hd44780-spi.c: In function ‘spi_transfer’:
+hd44780-spi.c:89:24: error: ‘_IOC_SIZEBITS’ undeclared (first use in this function)
+  status = ioctl(p->fd, SPI_IOC_MESSAGE(1), &xfer);
+                        ^
+Signed-off-by: Baruch Siach <baruch@tkos.co.il>
+---
+Upstream status: https://github.com/lcdproc/lcdproc/pull/90
+
+ server/drivers/hd44780-pifacecad.c | 1 +
+ server/drivers/hd44780-spi.c       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/server/drivers/hd44780-pifacecad.c b/server/drivers/hd44780-pifacecad.c
+index a73b9f9b1f82..55139124d852 100644
+--- a/server/drivers/hd44780-pifacecad.c
+++ b/server/drivers/hd44780-pifacecad.c
+@@ -54,6 +54,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+#include <linux/ioctl.h>
+ #include <stdint.h>
+ #include <linux/spi/spidev.h>
+ 
+diff --git a/server/drivers/hd44780-spi.c b/server/drivers/hd44780-spi.c
+index 791156f87a26..74c85fb014aa 100644
+--- a/server/drivers/hd44780-spi.c
+++ b/server/drivers/hd44780-spi.c
+@@ -29,6 +29,7 @@
+ #include <unistd.h>
+ #include <fcntl.h>
+ #include <sys/ioctl.h>
+#include <linux/ioctl.h>
+ #include <stdint.h>
+ #include <linux/spi/spidev.h>
+ 
+-- 
+2.14.1
+
--- a/bsp/buildroot/package/lcdproc/0002-musl.patch
+++ b/bsp/buildroot/package/lcdproc/0002-musl.patch
@@ -1,102 +0,0 @@
-Fix musl build
-
-Partly downloaded from
-http://lists.omnipotent.net/pipermail/lcdproc/2015-November/014291.html
-http://lists.omnipotent.net/pipermail/lcdproc/2015-November/014281.html
-
-Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
-
-diff -uNr lcdproc-0.5.7.org/clients/lcdproc/machine.h lcdproc-0.5.7/clients/lcdproc/machine.h
--- lcdproc-0.5.7.org/clients/lcdproc/machine.h	2012-08-19 16:29:07.000000000 +0200
-+++ lcdproc-0.5.7/clients/lcdproc/machine.h	2016-01-30 14:07:33.641802847 +0100
-@@ -12,6 +12,7 @@
- #ifndef _lcdproc_machine_h_
- #define _lcdproc_machine_h_
- 
-+#include <time.h>
- #include "shared/LL.h"
- 
- #ifndef LOADAVG_NSTATS
-diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-pifacecad.c lcdproc-0.5.7/server/drivers/hd44780-pifacecad.c
--- lcdproc-0.5.7.org/server/drivers/hd44780-pifacecad.c	2014-03-23 11:22:09.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/hd44780-pifacecad.c	2016-01-30 14:12:03.521279729 +0100
-@@ -54,6 +54,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <linux/ioctl.h>
- #include <stdint.h>
- #include <linux/spi/spidev.h>
- 
-diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-rpi.c lcdproc-0.5.7/server/drivers/hd44780-rpi.c
--- lcdproc-0.5.7.org/server/drivers/hd44780-rpi.c	2014-03-23 11:22:09.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/hd44780-rpi.c	2016-01-30 14:04:10.288112853 +0100
-@@ -285,7 +285,7 @@
- 
- 	/* Unmap and free memory */
- 	if (gpio_map != NULL)
-		munmap((caddr_t) gpio_map, GPIO_BLOCK_SIZE);
-+		munmap((void *) gpio_map, GPIO_BLOCK_SIZE);
- 	if (p->rpi_gpio != NULL)
- 		free(p->rpi_gpio);
- 	p->rpi_gpio = NULL;
-diff -uNr lcdproc-0.5.7.org/server/drivers/hd44780-spi.c lcdproc-0.5.7/server/drivers/hd44780-spi.c
--- lcdproc-0.5.7.org/server/drivers/hd44780-spi.c	2014-03-23 11:22:09.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/hd44780-spi.c	2016-01-30 14:11:11.604763500 +0100
-@@ -29,6 +29,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/ioctl.h>
-+#include <linux/ioctl.h>
- #include <stdint.h>
- #include <linux/spi/spidev.h>
- 
-diff -uNr lcdproc-0.5.7.org/server/drivers/mtc_s16209x.c lcdproc-0.5.7/server/drivers/mtc_s16209x.c
--- lcdproc-0.5.7.org/server/drivers/mtc_s16209x.c	2011-08-14 14:29:16.000000000 +0200
-+++ lcdproc-0.5.7/server/drivers/mtc_s16209x.c	2016-01-30 14:13:10.691122839 +0100
-@@ -49,6 +49,7 @@
- #include <fcntl.h>
- #include <string.h>
- #include <errno.h>
-+#include <sys/file.h>
- 
- #ifdef HAVE_CONFIG_H
- # include "config.h"
-diff -uNr lcdproc-0.5.7.org/server/drivers/rawserial.c lcdproc-0.5.7/server/drivers/rawserial.c
--- lcdproc-0.5.7.org/server/drivers/rawserial.c	2014-03-23 11:22:10.000000000 +0100
-+++ lcdproc-0.5.7/server/drivers/rawserial.c	2016-01-30 14:03:43.465779507 +0100
-@@ -60,13 +60,13 @@
- 	/** \name Event loop timing. refresh_time and refresh_delta form the
- 	 * event loop timing mechanism for configurable update rates.
- 	 *@{*/
-	uint refresh_time;		/**< time at the last screen update */
-	uint refresh_delta;		/**< time step to next screen update */
-+	unsigned int refresh_time;		/**< time at the last screen update */
-+	unsigned int refresh_delta;		/**< time step to next screen update */
- 	/**@}*/
- } PrivateData;
- 
- /* Local prototypes */
-static uint get_millisecond_time(void);
-+static unsigned int get_millisecond_time(void);
- 
- 
- /* Vars for the server core */
-@@ -303,7 +303,7 @@
- 	PrivateData *p = drvthis->private_data;
- 	char out[LCD_MAX_WIDTH * LCD_MAX_HEIGHT];
- 
-	uint currentTime = get_millisecond_time();
-+	unsigned int currentTime = get_millisecond_time();
- 	int t_delta = currentTime - p->refresh_time;
- 
- 	/*
-@@ -415,7 +415,7 @@
-  *
-  * \return  int with current millisecond time.
-  */
-static uint
-+static unsigned int
- get_millisecond_time(void)
- {
- 	struct timeval ts;
--- a/bsp/buildroot/package/lcdproc/lcdproc.hash
+++ b/bsp/buildroot/package/lcdproc/lcdproc.hash
@@ -1,2 +1,3 @@
 # Locally computed:
 sha256  843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804  lcdproc-0.5.7.tar.gz
+sha256  d48a915496c96ff775b377d2222de3150ae5172bfb84a6ec9f9ceab962f97b83  lcdproc-0.5.9.tar.gz
--- a/bsp/buildroot/package/lcdproc/lcdproc.mk
+++ b/bsp/buildroot/package/lcdproc/lcdproc.mk
@@ -4,15 +4,13 @@
 #
 ################################################################################

-LCDPROC_VERSION = 0.5.7
-LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION)
-LCDPROC_LICENSE = GPLv2+
+LCDPROC_VERSION = 0.5.9
+LCDPROC_SITE = https://github.com/lcdproc/lcdproc/releases/download/v$(LCDPROC_VERSION)
+LCDPROC_LICENSE = GPL-2.0+
 LCDPROC_LICENSE_FILES = COPYING
 LCDPROC_MAKE = $(MAKE1)

-LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS) \
-	--with-ft-prefix="$(STAGING_DIR)/usr" \
-	--with-ft-exec-prefix="$(STAGING_DIR)/usr"
+LCDPROC_CONF_OPTS = --enable-drivers=$(BR2_PACKAGE_LCDPROC_DRIVERS)

 ifeq ($(BR2_PACKAGE_LCDPROC_MENUS),y)
 LCDPROC_CONF_OPTS += --enable-lcdproc-menus
@@ -20,4 +18,14 @@ endif

 LCDPROC_DEPENDENCIES = freetype ncurses zlib

+LCDPROC_CONF_ENV += ac_cv_path_FT2_CONFIG=$(STAGING_DIR)/usr/bin/freetype-config
+
+ifeq ($(BR2_PACKAGE_LIBPNG),y)
+LCDPROC_DEPENDENCIES += libpng
+LCDPROC_CONF_ENV += ac_cv_path__png_config=$(STAGING_DIR)/usr/bin/libpng-config
+LCDPROC_CONF_OPTS += --enable-libpng
+else
+LCDPROC_CONF_OPTS += --disable-libpng
+endif
+
 $(eval $(autotools-package))