[Armadeus-commitlog] SF.net SVN: armadeus:[987] trunk/buildroot/package/lcd4linux

[<jo...@us...>]

Revision: 987
          http://armadeus.svn.sourceforge.net/armadeus/?rev=987&view=rev
Author:   jorasse
Date:     2009-01-04 22:07:10 +0000 (Sun, 04 Jan 2009)

Log Message:
-----------
[buildroot] upgrade to lcd4linux 0.10.1-RC2 and fix compilation failure

Modified Paths:
--------------
    trunk/buildroot/package/lcd4linux/lcd4linux.mk
    trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch

Modified: trunk/buildroot/package/lcd4linux/lcd4linux.mk
===================================================================
--- trunk/buildroot/package/lcd4linux/lcd4linux.mk	2009-01-04 19:30:08 UTC (rev 986)
+++ trunk/buildroot/package/lcd4linux/lcd4linux.mk	2009-01-04 22:07:10 UTC (rev 987)
@@ -4,9 +4,9 @@
 #
 #############################################################
 
-LCD4LINUX_VER:=0.10.0
+LCD4LINUX_VER:=0.10.1-RC2
 LCD4LINUX_SOURCE:=lcd4linux-$(LCD4LINUX_VER).tar.gz
-LCD4LINUX_SITE:=http://puzzle.dl.sourceforge.net/lcd4linux/
+LCD4LINUX_SITE:=http://ssl.bulix.org/projects/lcd4linux/raw-attachment/wiki/Download/
 LCD4LINUX_DIR:=$(BUILD_DIR)/lcd4linux-$(LCD4LINUX_VER)
 LCD4LINUX_CAT:=zcat
 LCD4LINUX_BINARY:=lcd4linux

Modified: trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch
===================================================================
--- trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch	2009-01-04 19:30:08 UTC (rev 986)
+++ trunk/buildroot/package/lcd4linux/lcd4linux_armadeus.patch	2009-01-04 22:07:10 UTC (rev 987)
@@ -1,15 +1,15 @@
 diff -uprN lcd4linux-0.10.0/configure lcd4linux-0.10.0.armadeus/configure
 --- lcd4linux-0.10.0/configure	2005-06-10 13:21:49.000000000 +0200
 +++ lcd4linux-0.10.0.armadeus/configure	2005-09-11 20:39:47.000000000 +0200
-@@ -5893,7 +5893,7 @@ for driver in $drivers; do
-          NULL="yes"
+@@ -7242,7 +7242,7 @@ for driver in $drivers; do
+          picoLCD="yes"
           PNG="yes"
           PPM="yes"
--	 ROUTERBOARD="yes"
-+	 ROUTERBOARD="no"
+-         ROUTERBOARD="yes"
++         ROUTERBOARD="no"
+          SAMPLE="yes"
  	 SERDISPLIB="yes"
           SIMPLELCD="yes"
-          T6963="yes"
 diff -uprN lcd4linux-0.10.0/drv_generic_parport.c lcd4linux-0.10.0.armadeus/drv_generic_parport.c
 --- lcd4linux-0.10.0/drv_generic_parport.c	2005-05-08 06:32:44.000000000 +0200
 +++ lcd4linux-0.10.0.armadeus/drv_generic_parport.c	2005-09-11 20:46:27.000000000 +0200
@@ -177,26 +177,5 @@
  
  #ifdef USE_OLD_UDELAY
  
-@@ -158,7 +159,7 @@
- #include "udelay.h"
  
- #ifdef USE_OLD_UDELAY
--
-+coucou
- unsigned long loops_per_usec;
  
- void ndelay(const unsigned long nsec)
-diff -uprN lcd4linux-0.10.0/udelay.h lcd4linux-0.10.0.armadeus/udelay.h
---- lcd4linux-0.10.0/udelay.h	2005-05-08 06:32:45.000000000 +0200
-+++ lcd4linux-0.10.0.armadeus/udelay.h	2005-09-11 20:03:25.000000000 +0200
-@@ -76,7 +76,10 @@
- /* REP NOP (PAUSE) is a good thing to insert into busy-wait loops. */
- static inline void rep_nop(void)
- {
-+/*
-     __asm__ __volatile__("rep; nop");
-+*/
-+    __asm__ __volatile__("nop");
- }
- 
- 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.