From d75e4fc409fe54439e0c24c14f1529fe2b4d1365 Mon Sep 17 00:00:00 2001 From: Jerome Duval Date: Thu, 28 Sep 2017 21:20:01 +0200 Subject: [PATCH] lcdproc: bump version. --- ...proc-0.5.7.recipe => lcdproc-0.5.9.recipe} | 29 +++-- ...-0.5.7.patchset => lcdproc-0.5.9.patchset} | 106 +++++++++++++----- 2 files changed, 93 insertions(+), 42 deletions(-) rename app-misc/lcdproc/{lcdproc-0.5.7.recipe => lcdproc-0.5.9.recipe} (85%) rename app-misc/lcdproc/patches/{lcdproc-0.5.7.patchset => lcdproc-0.5.9.patchset} (85%) diff --git a/app-misc/lcdproc/lcdproc-0.5.7.recipe b/app-misc/lcdproc/lcdproc-0.5.9.recipe similarity index 85% rename from app-misc/lcdproc/lcdproc-0.5.7.recipe rename to app-misc/lcdproc/lcdproc-0.5.9.recipe index a18d93ed1..0d2d8f769 100644 --- a/app-misc/lcdproc/lcdproc-0.5.7.recipe +++ b/app-misc/lcdproc/lcdproc-0.5.9.recipe @@ -2,14 +2,21 @@ SUMMARY="Client/server app to drive LCD displays" DESCRIPTION="LCDproc controls various LCD and VFD devices in a standardized way, and ships with a \ client to display various system statistics. Supports multiple platforms (Linux, *BSD, Solaris). \ Client/server model allows multiple clients to use one display." -REVISION="1" HOMEPAGE="http://www.lcdproc.org" -ARCHITECTURES="x86_gcc2" -SOURCE_URI="http://downloads.sourceforge.net/project/lcdproc/lcdproc/$portVersion/lcdproc-$portVersion.tar.gz" -CHECKSUM_SHA256="843007d377adc856529ed0c7c42c9a7563043f06b1b73add0372bba3a3029804" -PATCHES="lcdproc-$portVersion.patchset" -LICENSE="GNU GPL v2" COPYRIGHT="1998-2014 William W. Ferrell, Selene Scriven and many other contributors" +LICENSE="GNU GPL v2" +REVISION="1" +SOURCE_URI="https://github.com/lcdproc/lcdproc/releases/download/v$portVersion/lcdproc-$portVersion.tar.gz" +CHECKSUM_SHA256="d48a915496c96ff775b377d2222de3150ae5172bfb84a6ec9f9ceab962f97b83" +PATCHES="lcdproc-$portVersion.patchset" +GLOBAL_WRITABLE_FILES=" + settings/LCDd.conf keep-old + settings/lcdexec.conf keep-old + settings/lcdproc.conf keep-old + settings/lcdvc.conf keep-old +" + +ARCHITECTURES="x86_gcc2 x86 x86_64" PROVIDES=" lcdproc = $portVersion @@ -24,7 +31,6 @@ PROVIDES=" cmd:tail.pl cmd:x11amp.pl " - REQUIRES=" haiku lib:libncurses @@ -40,7 +46,6 @@ BUILD_REQUIRES=" devel:libusb_1.0 devel:libusb " - BUILD_PREREQUIRES=" cmd:aclocal cmd:autoconf @@ -63,11 +68,3 @@ INSTALL() { make install } - - -GLOBAL_WRITABLE_FILES=" - settings/LCDd.conf keep-old - settings/lcdexec.conf keep-old - settings/lcdproc.conf keep-old - settings/lcdvc.conf keep-old -" diff --git a/app-misc/lcdproc/patches/lcdproc-0.5.7.patchset b/app-misc/lcdproc/patches/lcdproc-0.5.9.patchset similarity index 85% rename from app-misc/lcdproc/patches/lcdproc-0.5.7.patchset rename to app-misc/lcdproc/patches/lcdproc-0.5.9.patchset index 6676c04a2..9ee302554 100644 --- a/app-misc/lcdproc/patches/lcdproc-0.5.7.patchset +++ b/app-misc/lcdproc/patches/lcdproc-0.5.9.patchset @@ -1,39 +1,30 @@ -From 87ee6850e13b7deadc9d270c44be6370282420dd Mon Sep 17 00:00:00 2001 +From 39888c630c7e25c0f45df3c7db6018315db7920f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 9 Nov 2015 15:39:29 +0100 Subject: picolcd: C89 fixes. diff --git a/server/drivers/picolcd.c b/server/drivers/picolcd.c -index 3cc693c..2529a97 100644 +index 401f593..e7b2a8b 100644 --- a/server/drivers/picolcd.c +++ b/server/drivers/picolcd.c -@@ -1874,14 +1874,16 @@ picolcd_send(USB_DEVICE_HANDLE * lcd, unsigned char *data, int size) +@@ -1874,6 +1874,7 @@ picolcd_send(USB_DEVICE_HANDLE * lcd, unsigned char *data, int size) if ((lcd == NULL) && (data == NULL)) return; #ifdef HAVE_LIBUSB_1_0 -- int error = 0; -- int transferred = 0; -- unsigned int timeout = 1000; /* milliseconds */ -- error = libusb_interrupt_transfer(lcd, LIBUSB_ENDPOINT_OUT + 1, data, size, &transferred, timeout); -- if (error) { -- /* can't use report here */ -- fprintf(stderr, "libusb_interrupt_transfer error %d, sent %d of %d bytes\n", -- error, transferred, size); -+ { -+ int error = 0; -+ int transferred = 0; -+ unsigned int timeout = 1000; /* milliseconds */ -+ error = libusb_interrupt_transfer(lcd, LIBUSB_ENDPOINT_OUT + 1, data, size, &transferred, timeout); -+ if (error) { -+ /* can't use report here */ -+ fprintf(stderr, "libusb_interrupt_transfer error %d, sent %d of %d bytes\n", -+ error, transferred, size); -+ } ++{ + int error = 0; + int transferred = 0; + unsigned int timeout = 1000; /* milliseconds */ +@@ -1882,6 +1883,7 @@ picolcd_send(USB_DEVICE_HANDLE * lcd, unsigned char *data, int size) + report(RPT_WARNING, "libusb_interrupt_transfer error %d, sent %d of %d bytes\n", + error, transferred, size); } ++} #else usb_interrupt_write(lcd, USB_ENDPOINT_OUT + 1, (char *)data, size, 1000); -@@ -2009,11 +2011,6 @@ picolcd_20x4_set_char(Driver *drvthis, int n, unsigned char *dat) + #endif +@@ -2008,11 +2010,6 @@ picolcd_20x4_set_char(Driver *drvthis, int n, unsigned char *dat) { PrivateData *p = drvthis->private_data; @@ -45,7 +36,7 @@ index 3cc693c..2529a97 100644 unsigned char command[6] = { OUT_REPORT_CMD, 0x00, 0x01, 0x00, 0x64, 0x40 + 8 * n }; /* 0x94 */ -@@ -2023,6 +2020,11 @@ picolcd_20x4_set_char(Driver *drvthis, int n, unsigned char *dat) +@@ -2022,6 +2019,11 @@ picolcd_20x4_set_char(Driver *drvthis, int n, unsigned char *dat) dat[4], dat[5], dat[6], dat[7] }; /* 0x95 */ @@ -58,10 +49,10 @@ index 3cc693c..2529a97 100644 picolcd_send(p->lcd, data, 13); } -- -2.2.2 +2.13.1 -From 70f9b5fee9bfbc12e9aaef5e0cf0064de01ff3ea Mon Sep 17 00:00:00 2001 +From a0bc10ba8ad19ba630c2b0cb83947942d6dabd79 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 9 Nov 2015 15:40:03 +0100 Subject: Add "machine" implementation for Haiku @@ -678,5 +669,68 @@ index 0000000..3803b6d +#endif /* __HAIKU__ */ + -- -2.2.2 +2.13.1 + + +From 89326917be2fc8f0e93338fe39a6815f34edfdd6 Mon Sep 17 00:00:00 2001 +From: Jerome Duval +Date: Thu, 28 Sep 2017 21:08:00 +0200 +Subject: Haiku: link against libnetwork. + +don't use rdynamic. + +diff --git a/configure.ac b/configure.ac +index 0c37b60..0a83923 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -33,11 +33,17 @@ case "$host" in + AC_DEFINE([DARWIN],[1],[Define if you're using Darwin/Mac OS X.]) + ac_system_host=Darwin + ;; ++*-*-*haiku*) ++ AC_DEFINE([HAIKU],[1],[Define if you're using Haiku.]) ++ ac_system_host=Haiku ++ ;; + esac + AC_DEFINE_UNQUOTED([SYSTEM_HOST], [$ac_system_host], [Set this to your system host (Linux, Solaris, OpenBSD, NetBSD, FreeBSD or Darwin)]) + + dnl treat Darwin special in Makefiles + AM_CONDITIONAL(DARWIN, test x$ac_system_host = xDarwin) ++dnl treat Haiku special in Makefiles ++AM_CONDITIONAL(HAIKU, test x$ac_system_host = xHaiku) + + AC_MSG_CHECKING([whether to enable debugging]) + AC_ARG_ENABLE(debug, +@@ -82,10 +88,10 @@ AX_CFLAGS_GCC_OPTION(-Wno-unused-function) + AX_CFLAGS_GCC_OPTION(-ftrampolines) + export CFLAGS + +-dnl Solaris +-AC_CHECK_FUNC(gethostbyname,,[AC_CHECK_LIB(nsl,gethostbyname)]) +-AC_CHECK_FUNC(connect,,[AC_CHECK_LIB(socket,connect)]) +-AC_CHECK_FUNC(inet_aton,,[AC_CHECK_LIB(resolv,inet_aton)]) ++dnl Solaris and Haiku ++AC_CHECK_FUNC(gethostbyname,,[AC_SEARCH_LIBS(gethostbyname, nsl network)]) ++AC_CHECK_FUNC(connect,,[AC_SEARCH_LIBS(connect, socket network)]) ++AC_CHECK_FUNC(inet_aton,,[AC_SEARCH_LIBS(inet_aton, resolv network)]) + AC_CHECK_LIB(kstat, kstat_open) + AC_CHECK_LIB(posix4, nanosleep) + AC_CHECK_FUNCS(getloadavg swapctl) +diff --git a/server/Makefile.am b/server/Makefile.am +index 849ab92..fef2e11 100644 +--- a/server/Makefile.am ++++ b/server/Makefile.am +@@ -9,8 +9,10 @@ LCDd_SOURCES= client.c client.h clients.c clients.h input.c input.h main.c main. + LDADD = ../shared/libLCDstuff.a commands/libLCDcommands.a @LIBPTHREAD_LIBS@ + + if !DARWIN ++if !HAIKU + AM_LDFLAGS = -rdynamic + endif ++endif + + AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/shared -DSYSCONFDIR=\"$(sysconfdir)\" + +-- +2.13.1