From f412f891869add0b0ecef6a9f2008f64c5acca63 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 13 Feb 2024 17:21:43 +0100 Subject: serdisplib: update to 2.02 --- package/serdisplib/Makefile | 5 +-- package/serdisplib/patches/patch-Makefile_in | 12 ------ package/serdisplib/patches/patch-configure | 22 ---------- .../patch-include_serdisplib_serdisp_control_h | 12 ------ package/serdisplib/patches/patch-src_Makefile_in | 12 ------ .../serdisplib/patches/patch-src_serdisp_connect_c | 21 ---------- .../patches/patch-src_serdisp_connect_usb_c | 39 ------------------ .../serdisplib/patches/patch-src_serdisp_control_c | 48 ---------------------- .../serdisplib/patches/patch-src_serdisp_tools_c | 30 -------------- 9 files changed, 2 insertions(+), 199 deletions(-) delete mode 100644 package/serdisplib/patches/patch-Makefile_in delete mode 100644 package/serdisplib/patches/patch-configure delete mode 100644 package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h delete mode 100644 package/serdisplib/patches/patch-src_Makefile_in delete mode 100644 package/serdisplib/patches/patch-src_serdisp_connect_c delete mode 100644 package/serdisplib/patches/patch-src_serdisp_connect_usb_c delete mode 100644 package/serdisplib/patches/patch-src_serdisp_control_c delete mode 100644 package/serdisplib/patches/patch-src_serdisp_tools_c diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 804eb68f8..9a3a9cde2 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -4,9 +4,9 @@ include ${ADK_TOPDIR}/rules.mk PKG_NAME:= serdisplib -PKG_VERSION:= 1.97.8 +PKG_VERSION:= 2.02 PKG_RELEASE:= 1 -PKG_HASH:= b64738f2fd6a28f6d659945282a4a95eeaaabb0a5867f8a87b8cceb01ce1d029 +PKG_HASH:= 447b74007dc157b0378044245649850b26432b9185b6540ff681fcb0765c4d8b PKG_DESCR:= display drivers (serial, parallel, usb) PKG_SECTION:= sys/serial PKG_DEPENDS:= libusb-compat @@ -22,7 +22,6 @@ $(eval $(call PKG_template,SERDISPLIB,serdisplib,${PKG_VERSION}-${PKG_RELEASE},$ INSTALL_STYLE:= manual -CONFIGURE_ENV+= PACKAGE_VERSION_MAJOR=1 PACKAGE_VERSION_MINOR=97 CONFIGURE_ARGS+= --enable-libusb TARGET_CFLAGS+= ${TARGET_CPPFLAGS} diff --git a/package/serdisplib/patches/patch-Makefile_in b/package/serdisplib/patches/patch-Makefile_in deleted file mode 100644 index a140feb5e..000000000 --- a/package/serdisplib/patches/patch-Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- serdisplib-1.97.8.orig/Makefile.in 2008-07-30 23:05:37.000000000 +0200 -+++ serdisplib-1.97.8/Makefile.in 2009-05-30 18:04:39.430445031 +0200 -@@ -20,7 +20,7 @@ CC = @CC@ - MAKE=@MAKE@ - - --subdirs = src tools -+subdirs = src - - - all: diff --git a/package/serdisplib/patches/patch-configure b/package/serdisplib/patches/patch-configure deleted file mode 100644 index b4ea718bd..000000000 --- a/package/serdisplib/patches/patch-configure +++ /dev/null @@ -1,22 +0,0 @@ -$Id$ ---- serdisplib-1.97.8.orig/configure 2008-07-19 00:40:38.000000000 +0200 -+++ serdisplib-1.97.8/configure 2009-05-30 18:04:39.526453915 +0200 -@@ -2661,18 +2661,6 @@ echo "${ECHO_T}no" >&6 - fi - - --# split version information --PACKAGE_VERSION_TEMP=${PACKAGE_VERSION/\./\ } --PACKAGE_VERSION_MAJOR=${PACKAGE_VERSION_TEMP/\ *} --PACKAGE_VERSION_MINTEMP=${PACKAGE_VERSION_TEMP/*\ } --if test "${PACKAGE_VERSION_TEMP/*\.*/\.}" = "\."; then -- PACKAGE_VERSION_MINOR=${PACKAGE_VERSION_MINTEMP/\.*} -- PACKAGE_VERSION_SUBMINOR=${PACKAGE_VERSION_MINTEMP/*\.} --else -- PACKAGE_VERSION_MINOR=$PACKAGE_VERSION_MINTEMP -- PACKAGE_VERSION_SUBMINOR="" --fi -- - - - diff --git a/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h b/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h deleted file mode 100644 index d8c819a34..000000000 --- a/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h +++ /dev/null @@ -1,12 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/include/serdisplib/serdisp_control.h 2008-07-31 00:55:12.000000000 +0200 -+++ serdisplib-1.97.8/include/serdisplib/serdisp_control.h 2009-05-31 16:24:16.000000000 +0200 -@@ -42,7 +42,7 @@ - - #define SERDISP_VERSION_MAJOR 1 /**< \brief major version of serdisplib \hideinitializer */ - #define SERDISP_VERSION_MINOR 97 /**< \brief minor version of serdisplib \hideinitializer */ --#define SERDISP_VERSION_EXTRA 8 /**< \brief extra version postfix (ignored) \hideinitializer */ -+#define SERDISP_VERSION_EXTRA /**< \brief extra version postfix (ignored) \hideinitializer */ - - /** \hideinitializer - * \brief calculates a serdisplib version code diff --git a/package/serdisplib/patches/patch-src_Makefile_in b/package/serdisplib/patches/patch-src_Makefile_in deleted file mode 100644 index ad9c6a9c7..000000000 --- a/package/serdisplib/patches/patch-src_Makefile_in +++ /dev/null @@ -1,12 +0,0 @@ -$Id$ ---- serdisplib-1.97.8.orig/src/Makefile.in 2008-07-30 23:05:37.000000000 +0200 -+++ serdisplib-1.97.8/src/Makefile.in 2009-05-30 18:04:39.534451861 +0200 -@@ -126,7 +126,7 @@ endif - - .SUFFIXES : .c .o - --all: libraries programs -+all: libraries - - libraries: library.static library.shared - diff --git a/package/serdisplib/patches/patch-src_serdisp_connect_c b/package/serdisplib/patches/patch-src_serdisp_connect_c deleted file mode 100644 index fae45be6f..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_connect_c +++ /dev/null @@ -1,21 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_connect.c 2008-07-20 09:50:41.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_connect.c 2009-05-31 16:27:03.000000000 +0200 -@@ -304,7 +304,7 @@ serdisp_CONN_t* SDCONN_open(const char s - sdcd->sdcdev = (sdcdev == 0 || strlen((char*)sdcdev) > 0) ? (char*)sdcdev : SERDISP_DEFAULTDEVICE; - - /* split into protocol and device name */ -- idx = index(sdcd->sdcdev, ':'); -+ idx = strchr(sdcd->sdcdev, ':'); - if (!idx) { - devname = sdcd->sdcdev; - /* look if a default connection type can be found for given device */ -@@ -1405,7 +1405,7 @@ serdisp_CONN_t* SDCONN_import_PP(int dir - int SDCONN_getsignalindex(const char str[], short conntype, short hardwaretype) { - int i; - int n = strlen(str); -- char* idxpos = index(str, ','); -+ char* idxpos = strchr(str, ','); - - if (idxpos) - n = serdisp_ptrstrlen(idxpos, str); diff --git a/package/serdisplib/patches/patch-src_serdisp_connect_usb_c b/package/serdisplib/patches/patch-src_serdisp_connect_usb_c deleted file mode 100644 index c400ce875..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_connect_usb_c +++ /dev/null @@ -1,39 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_connect_usb.c 2008-07-30 23:44:23.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_connect_usb.c 2009-05-31 16:28:11.000000000 +0200 -@@ -220,7 +220,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - #endif - - devname = (char*)sdcdev; -- idx = index(devname, ':'); -+ idx = strchr(devname, ':'); - - if (serdisp_ptrdistance(idx, devname) >= 18) { - sd_error(SERDISP_ENXIO, "%s(): invalid protocol (too long)", __func__); -@@ -230,7 +230,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - sdtools_strncpy(protocol, devname, serdisp_ptrdistance(idx, devname)); - devname = (idx+1); - -- idx = index(devname, ':'); -+ idx = strchr(devname, ':'); - - if (idx) { - if (serdisp_ptrdistance(idx, devname) >= 8) { -@@ -242,7 +242,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - occurrence = (int)strtol(buffer, 0, 10); - } - -- idx = index(devname, '/'); -+ idx = strchr(devname, '/'); - if (idx && serdisp_ptrdistance(idx, devname) < 7) { - sdtools_strncpy(buffer, devname, serdisp_ptrdistance(idx, devname)); - vendorID = (int)strtol(buffer, &endptr, 16); -@@ -254,7 +254,7 @@ serdisp_CONN_t* SDCONNusb_open(const cha - - - if (vendorID != -1) { -- idx = index(devname, '/'); -+ idx = strchr(devname, '/'); - if (!idx) idx = devname + strlen(devname); - if (serdisp_ptrdistance(idx, devname) < 7) { - sdtools_strncpy(buffer, devname, serdisp_ptrdistance(idx, devname)); diff --git a/package/serdisplib/patches/patch-src_serdisp_control_c b/package/serdisplib/patches/patch-src_serdisp_control_c deleted file mode 100644 index f881ab3fe..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_control_c +++ /dev/null @@ -1,48 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_control.c 2008-07-30 01:04:44.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_control.c 2009-05-30 18:07:14.100111588 +0200 -@@ -450,7 +450,7 @@ serdisp_t* serdisp_init(serdisp_CONN_t* - } - - if (found) { -- char* idxpos = index(patternptr, '='); -+ char* idxpos = strchr(patternptr, '='); - int keylen = patternlen; - - /* '=' found and position not outside patternlen? */ -@@ -568,7 +568,7 @@ serdisp_t* serdisp_init(serdisp_CONN_t* - * \since 1.98 - */ - long serdisp_getversioncode(void) { -- return (long) SERDISP_VERSION_CODE; -+ return (long)SERDISP_VERSION_CODE; - } - - -@@ -1831,7 +1831,7 @@ int serdisp_setupwirings(serdisp_t* dd, - while( (patternptr = sdtools_nextpattern(patternptr, ',', &patternlen, &patternborder)) ) { - char* valueptr = 0; - int valuelen = 0; -- char* idxpos = index(patternptr, ':'); -+ char* idxpos = strchr(patternptr, ':'); - int keylen = patternlen; - - int tabidxkey = 0, tabidxvalue; -@@ -2003,7 +2003,7 @@ int serdisp_setupoptions(serdisp_t* dd, - while( (optionptr = sdtools_nextpattern(optionptr, ';', &optionlen, &optionborder)) ) { - char* valueptr = 0; - int valuelen = 0; -- char* idxpos = index(optionptr, '='); -+ char* idxpos = strchr(optionptr, '='); - int keylen = optionlen; - - int stdoptidx; /* index of an option found in standard options */ -@@ -2072,7 +2072,7 @@ int serdisp_setupoptions(serdisp_t* dd, - int definefound = 0; - - while( !definefound && (defineptr = sdtools_nextpattern(defineptr, ',', &definelen, &defineborder)) ) { -- char* defineidxpos = index(defineptr, '='); -+ char* defineidxpos = strchr(defineptr, '='); - int definekeylen = definelen; - char* definevalueptr = 0; - int definevaluelen = 0; diff --git a/package/serdisplib/patches/patch-src_serdisp_tools_c b/package/serdisplib/patches/patch-src_serdisp_tools_c deleted file mode 100644 index 6b972fafc..000000000 --- a/package/serdisplib/patches/patch-src_serdisp_tools_c +++ /dev/null @@ -1,30 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- serdisplib-1.97.8.orig/src/serdisp_tools.c 2008-07-17 01:44:52.000000000 +0200 -+++ serdisplib-1.97.8/src/serdisp_tools.c 2009-05-31 16:26:39.000000000 +0200 -@@ -688,7 +688,7 @@ int sdtools_isinelemlist(const char* ele - - if (strlen(lefttrimmedelemlist) == 0) return -1; - -- indexpos = index(lefttrimmedelemlist, ','); -+ indexpos = strchr(lefttrimmedelemlist, ','); - - /* this should never occur but to be sure: catch it and return 0 in such a case (invalid elemlist!) */ - if (indexpos == lefttrimmedelemlist) -@@ -762,7 +762,7 @@ char* sdtools_nextpattern(const char* st - char* idxpos; - - if (*len >= 0) { /* *len < 0: return first parameter, else: not first parameter */ -- idxpos = index(strstart, delim); -+ idxpos = strchr(strstart, delim); - if ( !idxpos || (((long)idxpos) >= (((long)strstart) + *border)) ) { - /* no more delim or found delim out of view => no more param */ - *len = -1; *border = 0; -@@ -783,7 +783,7 @@ char* sdtools_nextpattern(const char* st - *border -= n; - *len -= n; - -- idxpos = index(strstart, delim); -+ idxpos = strchr(strstart, delim); - - if ( idxpos && ((long)idxpos < ((long)strstart + (*border))) ) { - *len = serdisp_ptrstrlen(idxpos, strstart); -- cgit v1.2.3