From 028cf5897c4760de0c25bf5dc8eef58946d50d62 Mon Sep 17 00:00:00 2001 From: Sven Haardiek Date: Wed, 6 Sep 2017 16:48:55 +0200 Subject: [PATCH] lcdproc: bump to version 0.5.9 This commit bumps lcdproc to version 0.5.9, and switches to the new upstream on github. The new version also compiles with musl without any patches. Signed-off-by: Sven Haardiek Signed-off-by: Thomas Petazzoni --- package/lcdproc/0002-musl.patch | 102 -------------------------------- package/lcdproc/lcdproc.hash | 1 + package/lcdproc/lcdproc.mk | 4 +- 3 files changed, 3 insertions(+), 104 deletions(-) delete mode 100644 package/lcdproc/0002-musl.patch diff --git a/package/lcdproc/0002-musl.patch b/package/lcdproc/0002-musl.patch deleted file mode 100644 index d0425fd5b2..0000000000 --- a/package/lcdproc/0002-musl.patch +++ /dev/null @@ -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 - -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 - #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 - #include - #include -+#include - #include - #include - -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 - #include - #include -+#include - #include - #include - -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 - #include - #include -+#include - - #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; diff --git a/package/lcdproc/lcdproc.hash b/package/lcdproc/lcdproc.hash index ea39a9b492..00f685448d 100644 --- a/package/lcdproc/lcdproc.hash +++ b/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 diff --git a/package/lcdproc/lcdproc.mk b/package/lcdproc/lcdproc.mk index e602088fa8..e5b6172b15 100644 --- a/package/lcdproc/lcdproc.mk +++ b/package/lcdproc/lcdproc.mk @@ -4,8 +4,8 @@ # ################################################################################ -LCDPROC_VERSION = 0.5.7 -LCDPROC_SITE = http://downloads.sourceforge.net/project/lcdproc/lcdproc/$(LCDPROC_VERSION) +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) -- 2.30.2