Update serdisplib to 1.97.7 (#3588)

SVN-Revision: 11724

diff --git a/libs/serdisplib/Makefile b/libs/serdisplib/Makefile
index fc43c2706e0cb6e7474b663b6029caf9f92a5ba3..150b9d10ce7b2f6d92e8e0ecddfead9ee73354b9 100644 (file)
--- a/libs/serdisplib/Makefile
+++ b/libs/serdisplib/Makefile
@@ -9,14 +9,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=serdisplib
-PKG_VERSION:=1.96
+PKG_VERSION:=1.97.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/serdisplib
-PKG_MD5SUM:=b074e02d8d63f34cba8ec45c23f63f78
-
-PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MD5SUM:=ae6ca7c14ca92b0fc9dbb5df4a05a4c7
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/libs/serdisplib/patches/100-io.patch b/libs/serdisplib/patches/100-io.patch
deleted file mode 100644 (file)
index 5b78e10..0000000
--- a/libs/serdisplib/patches/100-io.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -ru serdisplib-1.96.orig/src/serdisp_connect.c serdisplib-1.96/src/serdisp_connect.c
---- serdisplib-1.96.orig/src/serdisp_connect.c 2005-10-07 20:40:50.000000000 +0200
-+++ serdisplib-1.96/src/serdisp_connect.c      2005-12-12 18:48:58.000000000 +0200
-@@ -60,6 +60,7 @@
- /* directIO only with linux and i386 */
- #if defined(__linux__) && (defined(__i386__) || defined(__x86_64__))
-   #define __sd_linux_use_directIO__ 1
-+  #include <sys/io.h>
- #endif
- 
- 
-@@ -67,7 +68,6 @@
- #if defined(__linux__)
-   #include <linux/ppdev.h>
-   #include <linux/parport.h>
--  #include <sys/io.h>
-   #include <stdlib.h>
-   #define OUTB(_d, _p)  outb( (_d), (_p) )
-   #define INB(_p)       inb( (_p) )

diff --git a/libs/serdisplib/patches/101-test_shared.patch b/libs/serdisplib/patches/101-test_shared.patch
index af0cd5d38753f7c2dc4b426104c79d4e39b7d1ca..fbdfa468c5c54bc8cf5cfc369d0141446a819ff4 100644 (file)
--- a/libs/serdisplib/patches/101-test_shared.patch
+++ b/libs/serdisplib/patches/101-test_shared.patch
@@ -1,14 +1,13 @@
-diff -ru serdisplib-1.96.orig/src/Makefile.in serdisplib-1.96/src/Makefile.in
---- serdisplib-1.96.orig/src/Makefile.in       2005-10-19 01:12:42.000000000 +0200
-+++ serdisplib-1.96/src/Makefile.in    2005-12-12 19:18:12.000000000 +0200
-@@ -73,8 +73,8 @@
-       $(CC) -fPIC -shared -o $(LIB_DIR)/$(LIB_SHARED) $(LIB_OBJECTS)
-       cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) $(LIB_NAME).so
+--- a/src/Makefile.in
++++ b/src/Makefile.in
+@@ -103,8 +103,8 @@
+       cd $(LIB_DIR) && $(LN_S) -f $(LIB_SHARED) lib$(LIB_NAME).so.$(VERSION_MAJOR)
+       cd $(LIB_DIR) && $(LN_S) -f lib$(LIB_NAME).so.$(VERSION_MAJOR) lib$(LIB_NAME).so
  
 -testserdisp: $(LIB_DIR)/$(LIB_STATIC) $(OBJECTS)
--      $(CC) -o testserdisp $(OBJECTS) $(LIB_DIR)/$(LIB_STATIC)
+-      $(CC) -o testserdisp $(OBJECTS) $(LIB_DIR)/$(LIB_STATIC) $(TARGET_LDFLAGS) $(EXTRA_LIBS)
 +testserdisp: $(LIB_DIR)/$(LIB_SHARED) $(OBJECTS)
-+      $(CC) -o testserdisp $(OBJECTS) $(LIB_DIR)/$(LIB_SHARED)
++      $(CC) -o testserdisp $(OBJECTS) $(LIB_DIR)/$(LIB_SHARED) $(TARGET_LDFLAGS) $(EXTRA_LIBS)
  
  clean:
        /bin/rm -f $(OBJECTS) $(LIB_OBJECTS) $(LIB_DIR)/*.a $(LIB_DIR)/*.so*