From 1cd31f169fab4ab0ce45617c161da3fec9f7359d Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 31 May 2009 17:53:55 +0200 Subject: fix regressions from ipkg rework - remove old glib1 lib - rename glib2 -> glib - rename libgdbm -> gdbm - remove obsoleted wireless-tools, use iw - remove upstream unmaintained slurm make allmodconfig runs through on Debian/lenny amd64 for alix1c target --- package/serdisplib/Makefile | 3 ++ .../patch-include_serdisplib_serdisp_control_h | 12 +++++++ .../serdisplib/patches/patch-src_serdisp_connect_c | 21 ++++++++++++ .../patches/patch-src_serdisp_connect_usb_c | 39 ++++++++++++++++++++++ .../serdisplib/patches/patch-src_serdisp_tools_c | 30 +++++++++++++++++ 5 files changed, 105 insertions(+) create mode 100644 package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h create mode 100644 package/serdisplib/patches/patch-src_serdisp_connect_c create mode 100644 package/serdisplib/patches/patch-src_serdisp_connect_usb_c create mode 100644 package/serdisplib/patches/patch-src_serdisp_tools_c (limited to 'package/serdisplib') diff --git a/package/serdisplib/Makefile b/package/serdisplib/Makefile index 1605298e1..903ac2204 100644 --- a/package/serdisplib/Makefile +++ b/package/serdisplib/Makefile @@ -9,6 +9,8 @@ PKG_NAME:= serdisplib PKG_VERSION:= 1.97.8 PKG_RELEASE:= 1 PKG_MD5SUM:= 2aa91c43d01d2dfc9fbc1116e3063ae1 +PKG_DESCR:= display drivers (serial, parallel, USB) +PKG_SECTION:= misc PKG_URL:= http://serdisplib.sourceforge.net PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=serdisplib/} @@ -16,6 +18,7 @@ include ${TOPDIR}/mk/package.mk $(eval $(call PKG_template,SERDISPLIB,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) +CONFIGURE_ENV+= PACKAGE_VERSION_MAJOR=1 PACKAGE_VERSION_MINOR=97 CONFIGURE_STYLE:= gnu CONFIGURE_ARGS+= --enable-libusb BUILD_STYLE:= auto diff --git a/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h b/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h new file mode 100644 index 000000000..d8c819a34 --- /dev/null +++ b/package/serdisplib/patches/patch-include_serdisplib_serdisp_control_h @@ -0,0 +1,12 @@ +$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_serdisp_connect_c b/package/serdisplib/patches/patch-src_serdisp_connect_c new file mode 100644 index 000000000..fae45be6f --- /dev/null +++ b/package/serdisplib/patches/patch-src_serdisp_connect_c @@ -0,0 +1,21 @@ +$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 new file mode 100644 index 000000000..c400ce875 --- /dev/null +++ b/package/serdisplib/patches/patch-src_serdisp_connect_usb_c @@ -0,0 +1,39 @@ +$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_tools_c b/package/serdisplib/patches/patch-src_serdisp_tools_c new file mode 100644 index 000000000..6b972fafc --- /dev/null +++ b/package/serdisplib/patches/patch-src_serdisp_tools_c @@ -0,0 +1,30 @@ +$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