Author: pebender
Date: Thu Jan 22 19:34:46 2009
New Revision: 4311
Modified:
trunk/gar-minimyth/script/system/lcdproc/Makefile
trunk/gar-minimyth/script/system/lcdproc/checksums
trunk/gar-minimyth/script/system/lcdproc/files/lcdproc-0.5.2-picolcd_4x20.patch
Log:
- Fixed a bug introduced caused by switching from LCDproc stable to
CVS and back to stable that resulted in libusb not being linked.
Modified: trunk/gar-minimyth/script/system/lcdproc/Makefile
==============================================================================
--- trunk/gar-minimyth/script/system/lcdproc/Makefile (original)
+++ trunk/gar-minimyth/script/system/lcdproc/Makefile Thu Jan 22 19:34:46
2009
@@ -34,9 +34,8 @@
--disable-doxygen \
--disable-dot \
--disable-html-dox \
- --disable-latex-dox
-CONFIGURE_ENV = \
- libusb_config="no"
+ --disable-latex-dox \
+ --with-libusb-libraries="$(DESTDIR)$(libdir)"
else
CONFIGURE_ARGS = $(DIRPATHS) --build=$(GARBUILD) --host=$(GARHOST) \
--enable-libusb \
Modified: trunk/gar-minimyth/script/system/lcdproc/checksums
==============================================================================
--- trunk/gar-minimyth/script/system/lcdproc/checksums (original)
+++ trunk/gar-minimyth/script/system/lcdproc/checksums Thu Jan 22 19:34:46
2009
@@ -1,6 +1,6 @@
860f192d061d87dda6512b11b79daac2 download/lcdproc-0.5.2.tar.gz
67350a7cda81f03ca28d0d220e9e0805 download/lcdproc-0.5.2-irtrans.patch
-8c568b2b5ab9207b6e73df0ed59486a7 download/lcdproc-0.5.2-picolcd_4x20.patch
+217f9d06d5fe8436a48d375795db6279 download/lcdproc-0.5.2-picolcd_4x20.patch
a16c8ba13dafecf34dba9c79e203295e
download/lcdproc-0.5.2-dm140_henlar_v0.2.patch
72196e1f7f10150bf1baad8dc74a6fba
download/lcdproc-0.5.2-imonlcd_0.3_with_send_fix.patch
Modified:
trunk/gar-minimyth/script/system/lcdproc/files/lcdproc-0.5.2-picolcd_4x20.patch
==============================================================================
---
trunk/gar-minimyth/script/system/lcdproc/files/lcdproc-0.5.2-picolcd_4x20.patch
(original)
+++
trunk/gar-minimyth/script/system/lcdproc/files/lcdproc-0.5.2-picolcd_4x20.patch
Thu Jan 22 19:34:46 2009
@@ -1,7 +1,7 @@
diff -Naur lcdproc-0.5.2-old/acinclude.m4 lcdproc-0.5.2-new/acinclude.m4
---- lcdproc-0.5.2-old/acinclude.m4 2007-04-14 07:39:28.000000000 -0700
-+++ lcdproc-0.5.2-new/acinclude.m4 2009-01-21 17:03:22.000000000 -0800
-@@ -277,21 +277,12 @@
+--- lcdproc-0.5.2-old/acinclude.m4 2009-01-22 18:59:55.000000000 -0800
++++ lcdproc-0.5.2-new/acinclude.m4 2009-01-22 19:01:11.000000000 -0800
+@@ -281,21 +281,12 @@
actdrivers=["$actdrivers NoritakeVFD"]
;;
picolcd)
@@ -30,9 +30,9 @@
pyramid)
DRIVERS="$DRIVERS pyramid${SO}"
diff -Naur lcdproc-0.5.2-old/LCDd.conf lcdproc-0.5.2-new/LCDd.conf
---- lcdproc-0.5.2-old/LCDd.conf 2007-04-25 12:56:43.000000000 -0700
-+++ lcdproc-0.5.2-new/LCDd.conf 2009-01-21 17:04:20.000000000 -0800
-@@ -744,6 +744,21 @@
+--- lcdproc-0.5.2-old/LCDd.conf 2009-01-22 18:59:55.000000000 -0800
++++ lcdproc-0.5.2-new/LCDd.conf 2009-01-22 19:01:11.000000000 -0800
+@@ -758,6 +758,21 @@
Key4Light=on
Key5Light=on
@@ -54,9 +54,21 @@
## Pyramid LCD driver ##
+diff -Naur lcdproc-0.5.2-old/server/drivers/Makefile.am
lcdproc-0.5.2-new/server/drivers/Makefile.am
+--- lcdproc-0.5.2-old/server/drivers/Makefile.am 2009-01-22
18:59:55.000000000 -0800
++++ lcdproc-0.5.2-new/server/drivers/Makefile.am 2009-01-22
19:00:49.000000000 -0800
+@@ -45,7 +45,7 @@
+ mtc_s16209x_LDADD = libLCD.a
+ MtxOrb_LDADD = libLCD.a libbignum.a
+ NoritakeVFD_LDADD = libLCD.a
+-picolcd_LDADD = libLCD.a @LIBUSBLCD@
++picolcd_LDADD = libLCD.a @libusb_libs@
+ pyramid_LDADD = libLCD.a
+ serialPOS_LDADD = libLCD.a libbignum.a
+ serialVFD_LDADD = libLCD.a libbignum.a
diff -Naur lcdproc-0.5.2-old/server/drivers/picolcd.c
lcdproc-0.5.2-new/server/drivers/picolcd.c
--- lcdproc-0.5.2-old/server/drivers/picolcd.c 2007-04-14
07:38:14.000000000 -0700
-+++ lcdproc-0.5.2-new/server/drivers/picolcd.c 2009-01-21
17:03:22.000000000 -0800
++++ lcdproc-0.5.2-new/server/drivers/picolcd.c 2009-01-22
19:01:11.000000000 -0800
@@ -3,50 +3,31 @@
*
* (c) 2007 NitroSecurity, Inc.
@@ -1363,7 +1375,7 @@
+
diff -Naur lcdproc-0.5.2-old/server/drivers/picolcd.h
lcdproc-0.5.2-new/server/drivers/picolcd.h
--- lcdproc-0.5.2-old/server/drivers/picolcd.h 2007-04-14
07:38:14.000000000 -0700
-+++ lcdproc-0.5.2-new/server/drivers/picolcd.h 2009-01-21
17:03:22.000000000 -0800
++++ lcdproc-0.5.2-new/server/drivers/picolcd.h 2009-01-22
19:01:11.000000000 -0800
@@ -1,56 +1,112 @@
/*
- * Driver for picoLCD graphical displays
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"minimyth-commits" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/minimyth-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
