[oe-commits] org.oe.dev lcd4linux: add patch to build against both libusb and libusb-compat

[koen commit]

lcd4linux: add patch to build against both libusb and libusb-compat

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 159abf710e505eb360cea20e22b6f1fa84eb6e4a
ViewMTN: http://monotone.openembedded.org/revision/info/159abf710e505eb360cea20e22b6f1fa84eb6e4a
Files:
1
packages/lcd4linux/files/libusb-compat.diff
packages/lcd4linux/lcd4linux_0.10.0.bb
Diffs:

#
# mt diff -r7f92d4536c733113ce8671bb8431d1fb05dc8aa7 -r159abf710e505eb360cea20e22b6f1fa84eb6e4a
#
#
#
# add_file "packages/lcd4linux/files/libusb-compat.diff"
#  content [fa0cc8a51d2f9e70cb2d500ad1f7fc8a5bab00a1]
# 
# patch "packages/lcd4linux/lcd4linux_0.10.0.bb"
#  from [b7fec5376c401d6b3ce9a3b036920dfcf57733c4]
#    to [88dad79f87ed32ec0895aa8c75781aea20ad1307]
#
============================================================
--- packages/lcd4linux/files/libusb-compat.diff	fa0cc8a51d2f9e70cb2d500ad1f7fc8a5bab00a1
+++ packages/lcd4linux/files/libusb-compat.diff	fa0cc8a51d2f9e70cb2d500ad1f7fc8a5bab00a1
@@ -0,0 +1,95 @@
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_BWCT.c lcd4linux-0.10.1-RC2/drv_BWCT.c
+--- lcd4linux-0.10.1-RC2.orig/drv_BWCT.c	2007-02-25 13:39:09.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_BWCT.c	2008-06-22 11:57:01.000000000 +0200
+@@ -72,7 +72,6 @@
+ static usb_dev_handle *lcd;
+ static int interface;
+ 
+-extern int usb_debug;
+ extern int got_signal;
+ 
+ 
+@@ -89,7 +88,6 @@
+ 
+     info("%s: scanning USB for BWCT LCD...", Name);
+ 
+-    usb_debug = 0;
+ 
+     usb_init();
+     usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_LCD2USB.c lcd4linux-0.10.1-RC2/drv_LCD2USB.c
+--- lcd4linux-0.10.1-RC2.orig/drv_LCD2USB.c	2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_LCD2USB.c	2008-06-22 11:57:47.000000000 +0200
+@@ -98,7 +98,6 @@
+ static usb_dev_handle *lcd;
+ static int controllers = 0;
+ 
+-extern int usb_debug;
+ extern int got_signal;
+ 
+ /****************************************/
+@@ -120,7 +119,6 @@
+     if (device_id != NULL)
+ 	info("%s: scanning for device id: %s", Name, device_id);
+ 
+-    usb_debug = 0;
+ 
+     usb_init();
+     usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_picoLCD.c lcd4linux-0.10.1-RC2/drv_picoLCD.c
+--- lcd4linux-0.10.1-RC2.orig/drv_picoLCD.c	2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_picoLCD.c	2008-06-22 11:58:10.000000000 +0200
+@@ -75,7 +75,6 @@
+ static char *BufPtr;
+ 
+ static usb_dev_handle *lcd;
+-extern int usb_debug;
+ 
+ 
+ 
+@@ -97,7 +96,6 @@
+ 
+     info("%s: scanning for picoLCD...", Name);
+ 
+-    usb_debug = 0;
+ 
+     usb_init();
+     usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_Trefon.c lcd4linux-0.10.1-RC2/drv_Trefon.c
+--- lcd4linux-0.10.1-RC2.orig/drv_Trefon.c	2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_Trefon.c	2008-06-22 11:58:50.000000000 +0200
+@@ -72,7 +72,6 @@
+ static usb_dev_handle *lcd;
+ static int interface;
+ 
+-extern int usb_debug;
+ 
+ 
+ /****************************************/
+@@ -88,7 +87,6 @@
+ 
+     info("%s: scanning USB for TREFON LCD...", Name);
+ 
+-    usb_debug = 0;
+ 
+     usb_init();
+     usb_find_busses();
+diff -Nurd lcd4linux-0.10.1-RC2.orig/drv_USBLCD.c lcd4linux-0.10.1-RC2/drv_USBLCD.c
+--- lcd4linux-0.10.1-RC2.orig/drv_USBLCD.c	2007-02-25 13:39:10.000000000 +0100
++++ lcd4linux-0.10.1-RC2/drv_USBLCD.c	2008-06-22 11:58:57.000000000 +0200
+@@ -86,7 +86,6 @@
+ static usb_dev_handle *lcd;
+ static int interface;
+ 
+-extern int usb_debug;
+ 
+ #endif
+ 
+@@ -107,7 +106,6 @@
+ 
+     info("%s: scanning for USBLCD...", Name);
+ 
+-    usb_debug = 0;
+ 
+     usb_init();
+     usb_find_busses();
============================================================
--- packages/lcd4linux/lcd4linux_0.10.0.bb	b7fec5376c401d6b3ce9a3b036920dfcf57733c4
+++ packages/lcd4linux/lcd4linux_0.10.0.bb	88dad79f87ed32ec0895aa8c75781aea20ad1307
@@ -4,9 +4,10 @@ PV = "0.10.0+0.10.1-RC2"
 DEPENDS = "libusb-compat ncurses readline virtual/libx11"
 
 PV = "0.10.0+0.10.1-RC2"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/lcd4linux-0.10.1-RC2.tar.gz \
+           file://libusb-compat.diff;patch=1 \ 
            file://lcd4linux.init"
 
 S =  "${WORKDIR}/lcd4linux-0.10.1-RC2"