Changeset 15692


Ignore:
Timestamp:
2009-05-07T17:10:01+02:00 (9 years ago)
Author:
jow
Message:

[packages] Update libinklevel to 0.8.0rc2, fix usb device location

Location:
packages/libs/libinklevel
Files:
2 added
3 edited

Legend:

Unmodified
Added
Removed
  • packages/libs/libinklevel/Makefile

    r15244 r15692  
    99 
    1010PKG_NAME:=libinklevel 
    11 PKG_VERSION:=0.7.3 
     11PKG_VERSION:=0.8.0rc2 
    1212PKG_RELEASE:=1 
    1313 
    1414PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz 
    1515PKG_SOURCE_URL:=@SF/libinklevel 
    16 PKG_MD5SUM:=c7ccefec29d1d218d1aae240f6044fe1 
     16PKG_MD5SUM:=91ef91dd5c6338789ad5ae85134d7d0a 
    1717 
    1818include $(INCLUDE_DIR)/package.mk 
  • packages/libs/libinklevel/patches/001-makefile.patch

    r13614 r15692  
    1 --- libinklevel-0.7.3.orig/Makefile     2008-12-10 17:09:05.052017664 +0100 
    2 +++ libinklevel-0.7.3/Makefile  2008-12-10 19:40:44.904051107 +0100 
    3 @@ -1,7 +1,7 @@ 
    4 -DESTDIR =  
    5 -PREFIX = /usr/local 
    6 -CFLAGS += -Wall -O2 -fPIC -DPIC -I. 
    7 -CC = gcc 
    8 +#DESTDIR =  
    9 +PREFIX = /usr 
    10 +#CFLAGS += -Wall -O2 -fPIC -DPIC -I. 
    11 +#CC = gcc 
    12   
    13  all: libinklevel.so.4.0.7.3 
    14   
    15 @@ -36,5 +36,5 @@ libinklevel.so.4.0.7.3: canon.o d4lib.o  
    16                         linux.o util.o 
    17         $(CC) $(CFLAGS) -shared -Wl,-soname,libinklevel.so.4 \ 
    18                 -o libinklevel.so.4.0.7.3 canon.o d4lib.o epson_new.o \ 
    19 -               hp_new.o libinklevel.o linux.o util.o -lc -lieee1284 
    20 +               hp_new.o libinklevel.o linux.o util.o $(LIBS) 
    21   
  • packages/libs/libinklevel/patches/002-disable_parport.patch

    r13614 r15692  
    1 --- libinklevel-0.7.3.orig/linux.c      2008-12-10 17:09:05.052017664 +0100 
    2 +++ libinklevel-0.7.3/linux.c   2008-12-10 17:19:59.362144646 +0100 
    3 @@ -8,7 +8,9 @@ 
    4   
    5  #include "inklevel.h" 
     1--- a/linux.c 
     2+++ b/linux.c 
     3@@ -16,10 +16,11 @@ 
     4 #include <string.h> 
     5 #include <sys/ioctl.h> 
    66  
    77+#ifdef WITH_PARPORT 
     8 /* ieee1284.h uses HAVE_IEEE1284_H, so we undefine it */ 
     9 #undef HAVE_IEEE1284_H 
    810 #include <ieee1284.h> 
     11- 
    912+#endif 
    10   
    11  #include <stdio.h> 
    12  #include <sys/types.h> 
    13 @@ -30,7 +32,9 @@ int open_printer_device(const int port,  
     13 #include "internal.h" 
     14 #include "inklevel.h" 
     15 #include "platform_specific.h" 
     16@@ -32,7 +33,9 @@ 
    1417  
    1518 int get_device_id(const int port, const char *device_file,  
     
    2124   char device_file1[256]; 
    2225   char device_file2[256]; 
    23 @@ -39,6 +43,7 @@ int get_device_id(const int port, const  
     26@@ -41,6 +44,7 @@ int get_device_id(const int port, const  
    2427   char *c; 
    2528   int realsize; 
     
    2932     /* check if we have appropiate permissions */ 
    3033  
    31 @@ -71,7 +76,9 @@ int get_device_id(const int port, const  
     34@@ -73,7 +77,9 @@ int get_device_id(const int port, const  
    3235  
    3336     return COULD_NOT_GET_DEVICE_ID; 
     
    4043     if (port == USB) { 
    4144       sprintf(device_file1, "/dev/usb/lp%d", portnumber); 
    42 @@ -132,8 +139,10 @@ int open_printer_device(const int port,  
     45@@ -138,8 +144,10 @@ int open_printer_device(const int port,  
    4346   if (port == USB) { 
    4447     sprintf(device_file1, "/dev/usb/lp%d", portnumber); 
Note: See TracChangeset for help on using the changeset viewer.