[packages_10.03.2] lcd4linux: merge r28088, r28090, r28313, r28469, r28522, r28951
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 16:49:19 +0000 (16:49 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 5 Feb 2012 16:49:19 +0000 (16:49 +0000)
SVN-Revision: 30295

utils/lcd4linux/Config.in
utils/lcd4linux/Makefile
utils/lcd4linux/files/lcd4linux.conf [deleted file]
utils/lcd4linux/files/lcd4linux.init
utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch [new file with mode: 0644]

index 03d139361a714345cdd7c0eed09bc05416a85de3..94fa254357351269a921520d425510a6921c4b1f 100644 (file)
-config LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       bool
-
-config LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       bool
+if PACKAGE_lcd4linux-custom
 
-config LCD4LINUX_NEEDS_libdbus
+config LCD4LINUX_CUSTOM_NEEDS_libdbus
        bool
-       select PACKAGE_libdbus
 
-#config LCD4LINUX_NEEDS_libftdi
+#config LCD4LINUX_CUSTOM_NEEDS_libftdi
 #      bool
-#      select PACKAGE_libftdi
 
-config LCD4LINUX_NEEDS_libgd
+config LCD4LINUX_CUSTOM_NEEDS_libgd
        bool
-       select PACKAGE_libgd
-       default y if !LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_NEEDS_libiconv
+config LCD4LINUX_CUSTOM_NEEDS_libiconv
        bool
-       select PACKAGE_libiconv
 
-config LCD4LINUX_NEEDS_libmysqlclient
+config LCD4LINUX_CUSTOM_NEEDS_libmpdclient
        bool
-       select PACKAGE_libmysqlclient
 
-config LCD4LINUX_NEEDS_libncurses
+config LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
        bool
-       select PACKAGE_libncurses
 
-config LCD4LINUX_NEEDS_libnmeap
+config LCD4LINUX_CUSTOM_NEEDS_libncurses
        bool
-       select PACKAGE_libnmeap
 
-config LCD4LINUX_NEEDS_libsqlite3
+config LCD4LINUX_CUSTOM_NEEDS_libnmeap
        bool
-       select PACKAGE_libsqlite3
 
-config LCD4LINUX_NEEDS_libusb
+config LCD4LINUX_CUSTOM_NEEDS_libsqlite3
        bool
-       select PACKAGE_libusb
 
-config LCD4LINUX_NEEDS_libvncserver
+config LCD4LINUX_CUSTOM_NEEDS_libusb
        bool
-       select PACKAGE_libvncserver
 
-#config LCD4LINUX_NEEDS_libX11
+config LCD4LINUX_CUSTOM_NEEDS_libvncserver
+       bool
+
+#config LCD4LINUX_CUSTOM_NEEDS_libX11
 #      bool
-#      select PACKAGE_libX11
 
-config LCD4LINUX_NEEDS_ppp
+config LCD4LINUX_CUSTOM_NEEDS_ppp
        bool
-       select PACKAGE_ppp
 
-config LCD4LINUX_NEEDS_python
+config LCD4LINUX_CUSTOM_NEEDS_python
        bool
-       select PACKAGE_python
 
-config LCD4LINUX_NEEDS_serdisplib
+config LCD4LINUX_CUSTOM_NEEDS_serdisplib
        bool
-       select PACKAGE_serdisplib
 
-config LCD4LINUX_NEEDS_st2205tool
+config LCD4LINUX_CUSTOM_NEEDS_st2205tool
        bool
-       select PACKAGE_st2205tool
-
 
-comment "LCD4Linux Drivers ---"
 
-comment "WARNING: no drivers selected, the 'Sample' driver will be used !!!"
-       depends !LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
+comment "Drivers ---"
 
-config LCD4LINUX_DRV_BeckmannEgle
+config LCD4LINUX_CUSTOM_DRIVER_BeckmannEgle
        bool
        prompt "BeckmannEgle"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_BWCT
+config LCD4LINUX_CUSTOM_DRIVER_BWCT
        bool
        prompt "BWCT"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_CrystalFontz
+config LCD4LINUX_CUSTOM_DRIVER_CrystalFontz
        bool
        prompt "CrystalFontz"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_Curses
+config LCD4LINUX_CUSTOM_DRIVER_Curses
        bool
        prompt "Curses"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libncurses
+       select LCD4LINUX_CUSTOM_NEEDS_libncurses
 
-config LCD4LINUX_DRV_Cwlinux
+config LCD4LINUX_CUSTOM_DRIVER_Cwlinux
        bool
        prompt "Cwlinux"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_D4D
+config LCD4LINUX_CUSTOM_DRIVER_D4D
        bool
        prompt "D4D"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_EA232graphic
+config LCD4LINUX_CUSTOM_DRIVER_EA232graphic
        bool
        prompt "EA232graphic"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_G15
+config LCD4LINUX_CUSTOM_DRIVER_G15
        bool
        prompt "G15"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_GLCD2USB
+config LCD4LINUX_CUSTOM_DRIVER_GLCD2USB
        bool
        prompt "GLCD2USB"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_HD44780
+config LCD4LINUX_CUSTOM_DRIVER_HD44780
        bool
        prompt "HD44780"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
        depends BROKEN
 
-config LCD4LINUX_DRV_HD44780-I2C
+config LCD4LINUX_CUSTOM_DRIVER_HD44780-I2C
        bool
        prompt "HD44780-I2C"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
        depends BROKEN
 
-config LCD4LINUX_DRV_IRLCD
+config LCD4LINUX_CUSTOM_DRIVER_IRLCD
        bool
        prompt "IRLCD"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_LCD2USB
+config LCD4LINUX_CUSTOM_DRIVER_LCD2USB
        bool
        prompt "LCD2USB"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_LCDLinux
+config LCD4LINUX_CUSTOM_DRIVER_LCDLinux
        bool
        prompt "LCDLinux"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
        depends BROKEN
 
-config LCD4LINUX_DRV_LCDTerm
+config LCD4LINUX_CUSTOM_DRIVER_LCDTerm
        bool
        prompt "LCDTerm"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_LEDMatrix
+config LCD4LINUX_CUSTOM_DRIVER_LEDMatrix
        bool
        prompt "LEDMatrix"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_LPH7508
+config LCD4LINUX_CUSTOM_DRIVER_LPH7508
        bool
        prompt "LPH7508"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_LUIse
+config LCD4LINUX_CUSTOM_DRIVER_LUIse
        bool
        prompt "LUIse"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
-       #select LCD4LINUX_NEEDS_libluise
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
+       #select LCD4LINUX_CUSTOM_NEEDS_libluise
        depends BROKEN
 
-config LCD4LINUX_DRV_LW_ABP
+config LCD4LINUX_CUSTOM_DRIVER_LW_ABP
        bool
        prompt "LW_ABP"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_M50530
+config LCD4LINUX_CUSTOM_DRIVER_M50530
        bool
        prompt "M50530"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_MatrixOrbital
+config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbital
        bool
        prompt "MatrixOrbital"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_MatrixOrbitalGX
+config LCD4LINUX_CUSTOM_DRIVER_MatrixOrbitalGX
        bool
        prompt "MatrixOrbitalGX"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_MilfordInstruments
+config LCD4LINUX_CUSTOM_DRIVER_MilfordInstruments
        bool
        prompt "MilfordInstruments"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_Noritake
+config LCD4LINUX_CUSTOM_DRIVER_Newhaven
+       bool
+       prompt "Newhaven"
+
+config LCD4LINUX_CUSTOM_DRIVER_Noritake
        bool
        prompt "Noritake"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_NULL
+config LCD4LINUX_CUSTOM_DRIVER_NULL
        bool
        prompt "NULL"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
        default y
 
-config LCD4LINUX_DRV_Pertelian
+config LCD4LINUX_CUSTOM_DRIVER_Pertelian
        bool
        prompt "Pertelian"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_PHAnderson
+config LCD4LINUX_CUSTOM_DRIVER_PHAnderson
        bool
        prompt "PHAnderson"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_PICGraphic
+config LCD4LINUX_CUSTOM_DRIVER_PICGraphic
        bool
        prompt "PICGraphic"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_picoLCD
+config LCD4LINUX_CUSTOM_DRIVER_picoLCD
        bool
        prompt "picoLCD"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_picoLCDGraphic
+config LCD4LINUX_CUSTOM_DRIVER_picoLCDGraphic
        bool
        prompt "picoLCDGraphic"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_PNG
+config LCD4LINUX_CUSTOM_DRIVER_PNG
        bool
        prompt "PNG"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_PPM
+config LCD4LINUX_CUSTOM_DRIVER_PPM
        bool
        prompt "PPM"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_RouterBoard
+config LCD4LINUX_CUSTOM_DRIVER_RouterBoard
        bool
        prompt "RouterBoard"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
        depends on TARGET_rb532
 
-config LCD4LINUX_DRV_serdisplib
+config LCD4LINUX_CUSTOM_DRIVER_serdisplib
        bool
        prompt "serdisplib"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
-       select LCD4LINUX_NEEDS_serdisplib
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_serdisplib
 
-config LCD4LINUX_DRV_ShuttleVFD
+config LCD4LINUX_CUSTOM_DRIVER_ShuttleVFD
        bool
        prompt "ShuttleVFD"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_SimpleLCD
+config LCD4LINUX_CUSTOM_DRIVER_SimpleLCD
        bool
        prompt "SimpleLCD"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-config LCD4LINUX_DRV_st2205
+config LCD4LINUX_CUSTOM_DRIVER_st2205
        bool
        prompt "st2205"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
-       select LCD4LINUX_NEEDS_st2205tool
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_st2205tool
 
-config LCD4LINUX_DRV_T6963
+config LCD4LINUX_CUSTOM_DRIVER_T6963
        bool
        prompt "T6963"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libgd
+       select LCD4LINUX_CUSTOM_NEEDS_libgd
 
-config LCD4LINUX_DRV_Trefon
+config LCD4LINUX_CUSTOM_DRIVER_Trefon
        bool
        prompt "Trefon"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-#config LCD4LINUX_DRV_ULA200
+#config LCD4LINUX_CUSTOM_DRIVER_ULA200
 #      bool
 #      prompt "ULA200"
-#      select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-#      select LCD4LINUX_NEEDS_libftdi
-#      select LCD4LINUX_NEEDS_libusb
+#      select LCD4LINUX_CUSTOM_NEEDS_libftdi
+#      select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_USBHUB
+config LCD4LINUX_CUSTOM_DRIVER_USBHUB
        bool
        prompt "USBHUB"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_USBLCD
+config LCD4LINUX_CUSTOM_DRIVER_USBLCD
        bool
        prompt "USBLCD"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libusb
+       select LCD4LINUX_CUSTOM_NEEDS_libusb
 
-config LCD4LINUX_DRV_VNC
+config LCD4LINUX_CUSTOM_DRIVER_VNC
        bool
        prompt "VNC"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-       select LCD4LINUX_NEEDS_libvncserver
+       select LCD4LINUX_CUSTOM_NEEDS_libvncserver
 
-config LCD4LINUX_DRV_WincorNixdorf
+config LCD4LINUX_CUSTOM_DRIVER_WincorNixdorf
        bool
        prompt "WincorNixdorf"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
 
-#config LCD4LINUX_DRV_X11
+#config LCD4LINUX_CUSTOM_DRIVER_X11
 #      bool
 #      prompt "X11"
-#      select LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER
-#      select LCD4LINUX_NEEDS_libgd
-#      select LCD4LINUX_NEEDS_libX11
-
+#      select LCD4LINUX_CUSTOM_NEEDS_libgd
+#      select LCD4LINUX_CUSTOM_NEEDS_libX11
 
-comment "LCD4Linux Plugins ---"
 
-comment "WARNING: no plugins selected, the 'sample' plugin will be used !!!"
-       depends !LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
+comment "Plugins ---"
 
-config LCD4LINUX_PLUGIN_apm
+config LCD4LINUX_CUSTOM_PLUGIN_apm
        bool
        prompt "apm"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_asterisk
+config LCD4LINUX_CUSTOM_PLUGIN_asterisk
        bool
        prompt "asterisk"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_button_exec
+config LCD4LINUX_CUSTOM_PLUGIN_button_exec
        bool
        prompt "button_exec"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_cpuinfo
+config LCD4LINUX_CUSTOM_PLUGIN_cpuinfo
        bool
        prompt "cpuinfo"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
        default y
 
-config LCD4LINUX_PLUGIN_dbus
+config LCD4LINUX_CUSTOM_PLUGIN_dbus
        bool
        prompt "dbus"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       select LCD4LINUX_NEEDS_libdbus
+       select LCD4LINUX_CUSTOM_NEEDS_libdbus
 
-config LCD4LINUX_PLUGIN_diskstats
+config LCD4LINUX_CUSTOM_PLUGIN_diskstats
        bool
        prompt "diskstats"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_dvb
+config LCD4LINUX_CUSTOM_PLUGIN_dvb
        bool
        prompt "dvb"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_event
+config LCD4LINUX_CUSTOM_PLUGIN_event
        bool
        prompt "event"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_exec
+config LCD4LINUX_CUSTOM_PLUGIN_exec
        bool
        prompt "exec"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       
-config LCD4LINUX_PLUGIN_fifo
+
+config LCD4LINUX_CUSTOM_PLUGIN_fifo
        bool
        prompt "fifo"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_file
+config LCD4LINUX_CUSTOM_PLUGIN_file
        bool
        prompt "file"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_gps
+config LCD4LINUX_CUSTOM_PLUGIN_gps
        bool
        prompt "gps"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       select LCD4LINUX_NEEDS_libnmeap
+       select LCD4LINUX_CUSTOM_NEEDS_libnmeap
 
-config LCD4LINUX_PLUGIN_hddtemp
+config LCD4LINUX_CUSTOM_PLUGIN_hddtemp
        bool
        prompt "hddtemp"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_huawei
+config LCD4LINUX_CUSTOM_PLUGIN_huawei
        bool
        prompt "huawei"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_i2c_sensors
+config LCD4LINUX_CUSTOM_PLUGIN_i2c_sensors
        bool
        prompt "i2c_sensors"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_iconv
+config LCD4LINUX_CUSTOM_PLUGIN_iconv
        bool
        prompt "iconv"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       select LCD4LINUX_NEEDS_libiconv
+       select LCD4LINUX_CUSTOM_NEEDS_libiconv
 
-config LCD4LINUX_PLUGIN_imon
+config LCD4LINUX_CUSTOM_PLUGIN_imon
        bool
        prompt "imon"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_isdn
+config LCD4LINUX_CUSTOM_PLUGIN_isdn
        bool
        prompt "isdn"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_kvv
+config LCD4LINUX_CUSTOM_PLUGIN_kvv
        bool
        prompt "kvv"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_loadavg
+config LCD4LINUX_CUSTOM_PLUGIN_loadavg
        bool
        prompt "loadavg"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
        default y
 
-config LCD4LINUX_PLUGIN_meminfo
+config LCD4LINUX_CUSTOM_PLUGIN_meminfo
        bool
        prompt "meminfo"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
        default y
 
-config LCD4LINUX_PLUGIN_mpd
+config LCD4LINUX_CUSTOM_PLUGIN_mpd
        bool
        prompt "mpd"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
+       select LCD4LINUX_CUSTOM_NEEDS_libmpdclient
 
-config LCD4LINUX_PLUGIN_mpris_dbus
+config LCD4LINUX_CUSTOM_PLUGIN_mpris_dbus
        bool
        prompt "mpris_dbus"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       select LCD4LINUX_NEEDS_libdbus
+       select LCD4LINUX_CUSTOM_NEEDS_libdbus
 
-config LCD4LINUX_PLUGIN_mysql
+config LCD4LINUX_CUSTOM_PLUGIN_mysql
        bool
        prompt "mysql"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       select LCD4LINUX_NEEDS_libmysqlclient
+       select LCD4LINUX_CUSTOM_NEEDS_libmysqlclient
 
-config LCD4LINUX_PLUGIN_netdev
+config LCD4LINUX_CUSTOM_PLUGIN_netdev
        bool
        prompt "netdev"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_netinfo
+config LCD4LINUX_CUSTOM_PLUGIN_netinfo
        bool
        prompt "netinfo"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_pop3
+config LCD4LINUX_CUSTOM_PLUGIN_pop3
        bool
        prompt "pop3"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_ppp
+config LCD4LINUX_CUSTOM_PLUGIN_ppp
        bool
        prompt "ppp"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       select LCD4LINUX_NEEDS_ppp
+       select LCD4LINUX_CUSTOM_NEEDS_ppp
 
-config LCD4LINUX_PLUGIN_proc_stat
+config LCD4LINUX_CUSTOM_PLUGIN_proc_stat
        bool
        prompt "proc_stat"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
        default y
 
-#config LCD4LINUX_PLUGIN_python
+#config LCD4LINUX_CUSTOM_PLUGIN_python
 #      bool
 #      prompt "python"
-#      select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-#      select LCD4LINUX_NEEDS_python
+#      select LCD4LINUX_CUSTOM_NEEDS_python
 
-config LCD4LINUX_PLUGIN_qnaplog
+config LCD4LINUX_CUSTOM_PLUGIN_qnaplog
        bool
        prompt "qnaplog"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
-       select LCD4LINUX_NEEDS_libsqlite3
+       select LCD4LINUX_CUSTOM_NEEDS_libsqlite3
 
-config LCD4LINUX_PLUGIN_seti
+config LCD4LINUX_CUSTOM_PLUGIN_seti
        bool
        prompt "seti"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_statfs
+config LCD4LINUX_CUSTOM_PLUGIN_statfs
        bool
        prompt "statfs"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_uname
+config LCD4LINUX_CUSTOM_PLUGIN_uname
        bool
        prompt "uname"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_uptime
+config LCD4LINUX_CUSTOM_PLUGIN_uptime
        bool
        prompt "uptime"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
        default y
 
-config LCD4LINUX_PLUGIN_w1retap
+config LCD4LINUX_CUSTOM_PLUGIN_w1retap
        bool
        prompt "w1retap"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
 
-config LCD4LINUX_PLUGIN_wireless
+config LCD4LINUX_CUSTOM_PLUGIN_wireless
        bool
        prompt "wireless"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
        depends BROKEN
 
-config LCD4LINUX_PLUGIN_xmms
+config LCD4LINUX_CUSTOM_PLUGIN_xmms
        bool
        prompt "xmms"
-       select LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN
+
+endif
index f330feea7024dbd429ea0432e7f7d94d8ad97caf..9d8295b31a9995101f4a6dcb7a158077f33ee5cd 100644 (file)
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007-2010 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,9 +8,9 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lcd4linux
-PKG_REV:=1144
+PKG_REV:=1159
 PKG_VERSION:=r$(PKG_REV)
-PKG_RELEASE:=1
+PKG_RELEASE:=3
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=https://ssl.bulix.org/svn/lcd4linux/trunk/
@@ -18,69 +18,6 @@ PKG_SOURCE_SUBDIR:=lcd4linux-$(PKG_VERSION)
 PKG_SOURCE_VERSION:=$(PKG_REV)
 PKG_SOURCE_PROTO:=svn
 
-PKG_FIXUP:=libtool
-PKG_INSTALL:=1
-
-PKG_BUILD_DEPENDS:= \
-       libdbus \
-       libgd \
-       libmysqlclient \
-       libncurses \
-       libnmeap \
-       libsqlite3 \
-       libvncserver \
-       ppp \
-       serdisplib \
-       st2205tool \
-#      libftdi \
-#      libmpdclient \
-#      libX11 \
-#      python \
-
-include $(INCLUDE_DIR)/package.mk
-include $(INCLUDE_DIR)/nls.mk
-
-define Package/lcd4linux
-  SECTION:=utils
-  CATEGORY:=Utilities
-  DEPENDS:= \
-       +LCD4LINUX_NEEDS_libdbus:libdbus \
-       +LCD4LINUX_NEEDS_libgd:libgd \
-       $(if $(ICONV_FULL),+LCD4LINUX_NEEDS_libiconv:libiconv-full) \
-       +LCD4LINUX_NEEDS_libmysqlclient:libmysqlclient \
-       +LCD4LINUX_NEEDS_libncurses:libncurses \
-       +LCD4LINUX_NEEDS_libnmeap:libnmeap \
-       +LCD4LINUX_NEEDS_libsqlite3:libsqlite3 \
-       +LCD4LINUX_NEEDS_libusb:libusb \
-       +LCD4LINUX_NEEDS_libvncserver:libvncserver \
-       +LCD4LINUX_NEEDS_serdisplib:serdisplib \
-       +LCD4LINUX_NEEDS_st2205tool:st2205tool \
-#      +LCD4LINUX_NEEDS_libftdi:libftdi \
-#      +LCD4LINUX_NEEDS_libmpdclient:libmpdclient \
-#      +LCD4LINUX_NEEDS_libX11:libX11 \
-#      +LCD4LINUX_NEEDS_python:python
-  TITLE:=LCD display utility
-  URL:=http://lcd4linux.bulix.org/
-  MENU:=1
-  MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
-endef
-
-define Package/lcd4linux/config
-       menu "Configuration"
-               depends on PACKAGE_lcd4linux
-               source "$(SOURCE)/Config.in"
-       endmenu
-endef
-
-define Package/lcd4linux/description
- LCD4Linux is a small program that grabs information from the kernel and 
- some subsystems and displays it on an external liquid crystal display.
-endef
-
-define Package/lcd4linux/conffiles
-/etc/lcd4linux.conf
-endef
-
 LCD4LINUX_DRIVERS:= \
        BeckmannEgle \
        BWCT \
@@ -92,19 +29,20 @@ LCD4LINUX_DRIVERS:= \
        G15 \
        GLCD2USB \
        IRLCD \
-       HD44780 \
-       HD44780-I2C \
+       $(if $(CONFIG_BROKEN),HD44780) \
+       $(if $(CONFIG_BROKEN),HD44780-I2C) \
        LCD2USB \
-       LCDLinux \
+       $(if $(CONFIG_BROKEN),LCDLinux) \
        LCDTerm \
        LEDMatrix \
        LPH7508 \
-       LUIse \
+       $(if $(CONFIG_BROKEN),LUIse) \
        LW_ABP \
        M50530 \
        MatrixOrbital \
        MatrixOrbitalGX \
        MilfordInstruments \
+       Newhaven \
        Noritake \
        NULL \
        Pertelian \
@@ -114,19 +52,19 @@ LCD4LINUX_DRIVERS:= \
        picoLCDGraphic \
        PNG \
        PPM \
-       RouterBoard \
+       $(if $(CONFIG_TARGET_rb532),RouterBoard) \
        serdisplib \
        ShuttleVFD \
        SimpleLCD \
        st2205 \
        T6963 \
        Trefon \
-       ULA200 \
        USBHUB \
        USBLCD \
        VNC \
        WincorNixdorf \
-       X11 \
+#      ULA200 \
+#      X11 \
 
 LCD4LINUX_PLUGINS:= \
        apm \
@@ -159,73 +97,214 @@ LCD4LINUX_PLUGINS:= \
        pop3 \
        ppp \
        proc_stat \
-       python \
        qnaplog \
        seti \
        statfs \
        uname \
        uptime \
        w1retap \
-       wireless \
+       $(if $(CONFIG_BROKEN),wireless) \
        xmms \
+#      python \
 
-LCD4LINUX_CONFIGURE_DRIVERS:= \
-       $(foreach c, $(LCD4LINUX_DRIVERS), \
-           $(if $(CONFIG_LCD4LINUX_DRV_$(c)),$(c),) \
-       )
+PKG_FIXUP:=libtool
+PKG_INSTALL:=1
 
-LCD4LINUX_CONFIGURE_PLUGINS:= \
-       $(foreach c, $(LCD4LINUX_PLUGINS), \
-           $(if $(CONFIG_LCD4LINUX_PLUGIN_$(c)),$(c),) \
-       )
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 
-ifeq ($(CONFIG_LCD4LINUX_HAS_AT_LEAST_ONE_DRIVER),)
-  LCD4LINUX_CONFIGURE_DRIVERS:=Sample
-endif
+PKG_BUILD_DEPENDS:= \
+       libdbus \
+       libgd \
+       libmpdclient \
+       libmysqlclient \
+       libncurses \
+       libnmeap \
+       libsqlite3 \
+       libvncserver \
+       ppp \
+       serdisplib \
+       st2205tool \
+#      libftdi \
+#      libX11 \
+#      python \
+
+PKG_CONFIG_DEPENDS:= \
+       $(patsubst %,CONFIG_LCD4LINUX_CUSTOM_DRIVER_%,$(LCD4LINUX_DRIVERS)) \
+       $(patsubst %,CONFIG_LCD4LINUX_CUSTOM_PLUGIN_%,$(LCD4LINUX_PLUGINS)) \
+
+include $(INCLUDE_DIR)/package.mk
+include $(INCLUDE_DIR)/nls.mk
+
+define Package/lcd4linux/Default
+  SECTION:=utils
+  CATEGORY:=Utilities
+  MAINTAINER:=Jonathan McCrohan <jmccrohan@gmail.com>
+  TITLE:=LCD display utility
+  URL:=http://lcd4linux.bulix.org/
+endef
+
+define Package/lcd4linux/Default/description
+ LCD4Linux is a small program that grabs information from the kernel and 
+ some subsystems and displays it on an external liquid crystal display.
+endef
+
+
+define Package/lcd4linux-custom
+$(call Package/lcd4linux/Default)
+  DEPENDS:= \
+       +LCD4LINUX_CUSTOM_NEEDS_libdbus:libdbus \
+       +LCD4LINUX_CUSTOM_NEEDS_libgd:libgd \
+       $(if $(ICONV_FULL),+LCD4LINUX_CUSTOM_NEEDS_libiconv:libiconv-full) \
+       +LCD4LINUX_CUSTOM_NEEDS_libmpdclient:libmpdclient \
+       +LCD4LINUX_CUSTOM_NEEDS_libmysqlclient:libmysqlclient \
+       +LCD4LINUX_CUSTOM_NEEDS_libncurses:libncurses \
+       +LCD4LINUX_CUSTOM_NEEDS_libsqlite3:libsqlite3 \
+       +LCD4LINUX_CUSTOM_NEEDS_libusb:libusb \
+       +LCD4LINUX_CUSTOM_NEEDS_libvncserver:libvncserver \
+       +LCD4LINUX_CUSTOM_NEEDS_serdisplib:serdisplib \
+       +LCD4LINUX_CUSTOM_NEEDS_st2205tool:st2205tool \
+#      +LCD4LINUX_CUSTOM_NEEDS_libftdi:libftdi \
+#      +LCD4LINUX_CUSTOM_NEEDS_libX11:libX11 \
+#      +LCD4LINUX_CUSTOM_NEEDS_python:python
+  MENU:=1
+  PROVIDES:=lcd4linux
+  VARIANT=custom
+endef
+
+define Package/lcd4linux-custom/config
+       source "$(SOURCE)/Config.in"
+endef
+
+define Package/lcd4linux-custom/description
+$(call Package/lcd4linux/Default/description)
+ .
+ This package contains a customized version of LCD4Linux.
+endef
+
+
+define Package/lcd4linux-full
+$(call Package/lcd4linux/Default)
+  DEPENDS:= @DEVEL \
+       +libdbus \
+       +libgd \
+       $(if $(ICONV_FULL),+libiconv-full) \
+       +libmpdclient \
+       +libmysqlclient \
+       +libncurses \
+       +libsqlite3 \
+       +libusb \
+       +libvncserver \
+       +serdisplib \
+       +st2205tool \
+#      +libftdi \
+#      +libX11 \
+#      +python
+  PROVIDES:=lcd4linux
+  VARIANT=full
+endef
+
+define Package/lcd4linux-full/description
+$(call Package/lcd4linux/Default/description)
+ .
+ This package contains a version of LCD4Linux built with all supported
+ drivers and plugins.
+endef
 
-ifeq ($(CONFIG_LCD4LINUX_HAS_AT_LEAST_ONE_PLUGIN),)
-  LCD4LINUX_CONFIGURE_PLUGINS:=sample
-endif
 
 CONFIGURE_ARGS+= \
        --disable-rpath \
-       --with-drivers="$(strip $(LCD4LINUX_CONFIGURE_DRIVERS))" \
-       --with-plugins="$(strip $(LCD4LINUX_CONFIGURE_PLUGINS))" \
 
 EXTRA_LDFLAGS+= -Wl,-rpath-link,$(STAGING_DIR)/usr/lib
 
-ifneq ($(CONFIG_LCD4LINUX_NEEDS_libiconv),)
-  CONFIGURE_ARGS+= \
-       --with-libiconv-prefix="$(ICONV_PREFIX)"
-else
+ifeq ($(BUILD_VARIANT),custom)
+
+  LCD4LINUX_CUSTOM_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
+    $(if $(CONFIG_LCD4LINUX_CUSTOM_DRIVER_$(c)),$(c),) \
+ ))
+  ifeq ($(LCD4LINUX_CUSTOM_DRIVER),)
+    LCD4LINUX_CUSTOM_DRIVERS:=Sample
+  endif
+
+  LCD4LINUX_CUSTOM_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
+    $(if $(CONFIG_LCD4LINUX_CUSTOM_PLUGIN_$(c)),$(c)) \
+  ))
+  ifeq ($(LCD4LINUX_CUSTOM_PLUGINS),)
+    LCD4LINUX_CUSTOM_PLUGINS:=sample
+  endif
+
   CONFIGURE_ARGS+= \
-       --without-libiconv-prefix
+       --with-drivers="$(LCD4LINUX_CUSTOM_DRIVERS)" \
+       --with-plugins="$(LCD4LINUX_CUSTOM_PLUGINS)" \
+
+  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libiconv),)
+    CONFIGURE_ARGS+= --with-libiconv-prefix="$(ICONV_PREFIX)"
+  else
+    CONFIGURE_ARGS+= --without-libiconv-prefix
+  endif
+
+  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libmysqlclient),)
+    EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
+  endif
+
+#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_python),)
+#    CONFIGURE_ARGS+= --with-python
+#  else
+    CONFIGURE_ARGS+= --without-python
+#  endif
+
+#  ifneq ($(CONFIG_LCD4LINUX_CUSTOM_NEEDS_libX11),)
+#    CONFIGURE_ARGS+= --with-x
+#  else
+    CONFIGURE_ARGS+= --without-x
+#  endif
+
 endif
 
-ifneq ($(CONFIG_LCD4LINUX_NEEDS_libmysqlclient),)
+ifeq ($(BUILD_VARIANT),full)
+
+  LCD4LINUX_FULL_DRIVERS:= $(strip $(foreach c, $(LCD4LINUX_DRIVERS), \
+    $(c) \
+  ))
+
+  LCD4LINUX_FULL_PLUGINS:= $(strip $(foreach c, $(LCD4LINUX_PLUGINS), \
+    $(c) \
+  ))
+
+  CONFIGURE_ARGS+= \
+       --with-drivers="$(LCD4LINUX_FULL_DRIVERS)" \
+       --with-plugins="$(LCD4LINUX_FULL_PLUGINS)" \
+       --with-libiconv-prefix="$(ICONV_PREFIX)" \
+       --without-python \
+       --without-x \
+
   EXTRA_LDFLAGS+= -L$(STAGING_DIR)/usr/lib/mysql
-endif
 
-ifneq ($(CONFIG_LCD4LINUX_NEEDS_python),)
-  CONFIGURE_ARGS+= --with-python
-else
-  CONFIGURE_ARGS+= --without-python
 endif
 
-ifneq ($(CONFIG_LCD4LINUX_NEEDS_libX11),)
-  CONFIGURE_ARGS+= --with-x
-else
-  CONFIGURE_ARGS+= --without-x
-endif
 
+define Package/lcd4linux/conffiles
+/etc/lcd4linux.conf
+endef
 
 define Package/lcd4linux/install
        $(INSTALL_DIR) $(1)/usr/bin
        $(CP) $(PKG_INSTALL_DIR)/usr/bin/lcd4linux $(1)/usr/bin/
        $(INSTALL_DIR) $(1)/etc
-       $(INSTALL_CONF) ./files/lcd4linux.conf $(1)/etc/
+       $(INSTALL_CONF) $(PKG_BUILD_DIR)/lcd4linux.conf.sample $(1)/etc/lcd4linux.conf
        $(INSTALL_DIR) $(1)/etc/init.d
        $(INSTALL_BIN) ./files/lcd4linux.init $(1)/etc/init.d/lcd4linux
+       $(SED) "s|^\(Display 'GLCD2USB'\)|#\1|g" \
+           -e "s|^\(Layout 'TestLayer'\)|#\1|g" \
+           -e "s|^#\(Display 'Image'\)|\1|g" \
+           -e "s|^#\(Layout 'Default'\)|\1|g" \
+            $(1)/etc/lcd4linux.conf
 endef
 
-$(eval $(call BuildPackage,lcd4linux))
+Package/lcd4linux-custom/conffiles = $(Package/lcd4linux/conffiles)
+Package/lcd4linux-custom/install = $(Package/lcd4linux/install)
+
+Package/lcd4linux-full/conffiles = $(Package/lcd4linux/conffiles)
+Package/lcd4linux-full/install = $(Package/lcd4linux/install)
+
+$(eval $(call BuildPackage,lcd4linux-custom))
+$(eval $(call BuildPackage,lcd4linux-full))
diff --git a/utils/lcd4linux/files/lcd4linux.conf b/utils/lcd4linux/files/lcd4linux.conf
deleted file mode 100644 (file)
index a8a70f3..0000000
+++ /dev/null
@@ -1,1224 +0,0 @@
-#  $Id: lcd4linux.conf.sample 759 2007-02-04 05:55:58Z michael $
-#  $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/lcd4linux.conf.sample $
-
-
-Variables {
-   tick 500
-   tack 100
-   minute 60000
-}
-
-Display G15 {
-    Driver 'G-15'
-    Font   '6x8'
-    Contrast 10
-    Inverted 0
-    UInput '/dev/input/uinput'
-    SingleKeyPress 1
-}
-
-
-Display SerDispLib {
-    Driver 'serdisplib'
-    Port 'PAR:/dev/parports/0'
-    #Port '/dev/tts/0' 
-    Model 'OPTREX323'
-    Options ''
-}
-
-
-Display Trefon {
-    Driver 'TREFON'
-    Size '16x2'
-    Backlight 1
-    Icons 1
-}
-
-
-Display LCD-Linux {
-    Driver 'LCD-Linux'
-    Size '20x2'
-    UseBusy 0
-}
-
-Display LCD2USB {
-    Driver 'LCD2USB'
-    Size '20x2'
-    Backlight 1
-    Icons 1
-}
-
-
-Display LCD2041 {
-    Driver 'MatrixOrbital'
-    Model 'LCD2041'
-    Port '/dev/tts/0'
-    Speed 19200
-    Contrast 160
-}
-
-Display LK202 {
-    Driver 'MatrixOrbital'
-    Model 'LK202-24-USB'
-    Port '/dev/tts/USB0'
-    Speed 19200
-    Contrast 256/2
-}
-
-Display LK204 {
-    Driver 'MatrixOrbital'
-    Model 'LK204-24-USB'
-    Port '/dev/usb/tts/0'
-#   Port '/dev/tts/0'
-    Speed 19200
-    Contrast 256/2
-}
-
-
-Display MI240 {
-    Driver 'MilfordInstruments'
-    Model 'MI240'
-    Port '/dev/tts/0'
-    Speed 19200
-}
-
-
-Display CW12232 {
-    Driver 'Cwlinux'
-    Model 'CW12232'
-    Port '/dev/usb/tts/0'
-    Speed 19200
-    Brightness 2
-    Icons 1
-}
-
-
-Display CF631 {
-    Driver 'Crystalfontz'
-    Model '631'
-    Port '/dev/tts/USB0'
-    Speed 115200
-    Contrast 95
-    Backlight 50
-    Icons 1
-}
-
-Display CF632 {
-    Driver 'Crystalfontz'
-    Model '632'
-    Port '/dev/tts/0'
-    Speed 19200
-    Icons 1
-}
-
-Display CF633 {
-    Icons 1
-    Driver 'Crystalfontz'
-    Model '633'
-    Port '/dev/tts/0'
-    Speed 19200
-    Contrast 16
-    Backlight 50
-}
-
-Display CF635 {
-    Icons 1
-    Driver 'Crystalfontz'
-    Model '635'
-    Port '/dev/ttyUSB0'
-    Speed 115200
-    Contrast 100
-    Backlight 128
-}
-
-Display Curses {
-    Driver 'Curses'
-    Size '20x6'
-}
-
-# generic HD44780 display (LCD4Linux wiring)
-Display HD44780-generic {
-    Driver 'HD44780'
-    Model 'generic'
-    Port '/dev/parports/0'     
-    Size '8x2'
-    asc255bug 0
-    GPOs 8
-    Wire {
-       RW      'GND'
-       RS      'AUTOFD'
-       ENABLE  'STROBE'
-       ENABLE2 'GND'
-       GPO     'INIT'
-       POWER   'GND'
-    }
-}
-
-# generic HD44780 display (WinAmp wiring)
-Display HD44780-winamp {
-    Driver 'HD44780'
-    Model 'generic'
-    UseBusy 1
-    Port '/dev/parports/0'     
-    Size '20x4'
-    asc255bug 1
-    Wire {
-       RW      'AUTOFD'
-       RS      'INIT'
-       ENABLE  'STROBE'
-       ENABLE2 'GND'
-       GPO     'GND'
-       POWER   'GND'
-    }
-    Timing {
-       # fuzz timings by value (100 = no change)
-       fuzz 100
-       # low-level communication [ns]
-       CY 1000  # Enable cycle time
-       PW  450  # Enable pulse width
-       AS  140  # Address setup time
-       AH   20  # Address hold time
-       # HD44780 execution timings [us]
-       INIT1 4100  # first init sequence: 4.1 msec
-       INIT2  100  # second init sequence: 100 usec
-       EXEC    80  # normal execution time
-       WRCG   120  # CG RAM Write
-       CLEAR 2250  # Clear Display
-       HOME  2250  # Return Cursor Home
-       ONOFF 2250  # Display On/Off Control
-       # GPO timing [ns]
-       GPO_ST  20  # 74HCT573 set-up time
-       GPO_PW 230  # 74HCT573 enable pulse width
-       # Power supply timing [ms]
-       POWER  500  # power-on delay
-    }
-}
-
-# HD44780 display 4-Bit mode
-Display HD44780-4bit {
-    Driver 'HD44780'
-    Model 'generic'
-    Port '/dev/parports/0'     
-    Size '16x1'
-    Bits 4
-    UseBusy 0
-    asc255bug 0
-    Wire {
-        RW     'GND'
-        RS     'DB4'
-        ENABLE 'DB6'
-        GPO    'GND'
-    }
-}
-
-# Dual-HD44780 display from Pollin
-Display WDC2704M {
-    Driver 'HD44780'
-    Model 'generic'
-    Controllers 2
-    UseBusy 1
-    Port '/dev/parports/0'     
-    Size '27x4'
-    Wire {
-       RW      'AUTOFD'
-       RS      'INIT'
-       ENABLE  'STROBE'
-       ENABLE2 'SLCTIN'
-       GPO     'GND'
-       POWER   'GND'
-    }
-}
-
-# HD44780 display from www.kernelconcepts.de
-Display HD44780-kernelconcepts {
-    Driver 'HD44780'
-    Model 'HD66712'
-    UseBusy 1
-    Port '/dev/parports/0'     
-    Size '20x4'
-    Wire {
-       RW      'AUTOFD'
-       RS      'INIT'
-       ENABLE  'STROBE'
-       ENABLE2 'GND'
-       GPO     'GND'
-       POWER   'GND'
-    }
-}
-
-Display picoLCD {
-    Driver 'picoLCD'
-    Size     '20x2'
-    Contrast  0
-    Backlight 1
-    Icons     1
-}
-
-Display SC1602D {
-    Driver 'HD44780'
-    Port '/dev/parports/0'     
-    Bits '8'
-    Size '16x2'
-    asc255bug 0
-    Icons 1
-    Wire {
-       RW     'GND'
-       RS     'AUTOFD'
-       ENABLE 'STROBE'
-       GPO    'INIT'
-       POWER  'GND'
-    }
-}
-
-
-Display LCM-162 {
-    Driver 'HD44780'
-    Model 'LCM-162'
-#   Bus 'parport'
-    Port '/dev/parports/0'     
-    Size '16x2'
-    UseBusy 1
-    asc255bug 0
-    Icons 1
-}
-
-
-Display HD44780-I2C {
-    Driver 'HD44780'
-    Model 'generic'
-    Bus 'i2c'
-    Port '/dev/i2c-0'
-    Device '70'
-    Bits '4'
-    Size '20x4'
-    asc255bug 0
-    Icons 1
-    Wire {
-        RW     'DB5'
-        RS     'DB4'
-        ENABLE 'DB6'
-        GPO    'GND'
-    }
-}
-
-
-Display LCDTerm {
-    Driver 'LCDTerm
-    Port '/dev/tts/0'
-    Speed 19200
-    Size '20x4'
-    Icons 1
-}
-
-Display SimpleLCD {
-    Driver 'SimpleLCD'
-    Port '/dev/tts/0'
-    Speed 1200
-    Options 0
-    Size '20x2'
-}
-
-Display BA63 {
-    Driver   'WincorNixdorf'
-    Model    'BA63'
-    Port     '/dev/tts/0'
-#   Port     '/dev/tts/USB0'
-    Speed     9600
-    BarChar   219
-    SelfTest  0
-}
-
-Display M50530-24x8 {
-    Driver 'M50530'
-    Port '/dev/parports/0'     
-#   Port '0x378'
-    Size '24x8'
-    Font '5x7'
-    Duty 2
-    Wire.RW   'INIT'
-    Wire.EX   'STROBE'
-    Wire.IOC1 'SLCTIN'
-    Wire.IOC2 'AUTOFD'
-    Wire.GPO  'GND'
-    UseBusy    1
-    Timing.fuzz 100
-}
-
-
-Display CT20x4 {
-    Driver 'Beckmann+Egle'
-    Model 'CT20x4'
-    Port '/dev/tts/0'
-#    Size '16x2'
-#    Contrast 7
-#    Backlight 1
-    Icons 1
-}
-
-
-Display USBLCD {
-    Driver 'USBLCD'
-#   Port '/dev/lcd0'
-    Port 'libusb'
-    Size '20x4'
-    asc255bug 1
-    Icons 1
-}
-
-
-Display BWCT {
-    Driver 'BWCT'
-    Size '20x4'
-    Contrast 220
-    asc255bug 1
-    Icons 1
-}
-
-
-Display T6963-240x64 {
-    Driver 'T6963'
-    Port '/dev/parports/0'
-    Size '240x64'
-    DualScan 0
-    Cell 6
-    Wire.CE 'STROBE'
-    Wire.CD 'SLCTIN'
-    Wire.RD 'AUTOFD'
-    Wire.WR 'INIT'
-    Timing.fuzz 120
-    Font '6x8'
-}
-
-Display T6963-240x128 {
-    Driver 'T6963'
-    Port '/dev/parports/0'
-    Size '240x128'
-    DualScan 0
-    Cell 6
-    Wire.CE 'STROBE'
-    Wire.CD 'SLCTIN'
-    Wire.RD 'AUTOFD'
-    Wire.WR 'INIT'
-    Timing.fuzz 120
-    Font '6x8'
-}
-
-Display T6963-240x128D {
-    Driver 'T6963'
-    Port '/dev/parports/0'
-    Size '240x128'
-    DualScan 1
-    Cell 6
-    Wire.CE 'STROBE'
-    Wire.CD 'SLCTIN'
-    Wire.RD 'AUTOFD'
-    Wire.WR 'INIT'
-    Timing.fuzz 120
-    Font '6x8'
-}
-
-
-Display LPH7508 {
-    Driver 'LPH7508'
-    Port   '/dev/parports/0'
-    Font   '6x8'
-    Contrast 15
-    Inverted 0
-}
-
-Display LPH7508-serdisplib {
-    Driver 'serdisplib'
-    Port 'PAR:/dev/parports/0'
-    Model 'LPH7508'
-}
-
-Display ctinclud {
-   Driver  'serdisplib'
-   Port    'USB:7c0/1501'
-   Model   'CTINCLUD'
-   Options ''
-   Inverted 0
-}
-
-Display XWindow {
-    Driver 'X11'
-    Size   '120x32'
-    Font   '5x8'
-    Pixel  '4+1'
-    Gap    '-1x-1'
-    Border 20
-#   Foreground '#000000'
-#   Background '#80d000'
-#   Halfground '#70c000'
-    Foreground '000000cc'
-    Background '00000022'
-    Basecolor  '80d000'
-}
-
-Display Image {
-    Driver 'Image'
-#   Format 'PPM'
-    Format 'PNG'
-    Size   '120x32'
-    Font   '6x8'
-    Pixel  '4+1'
-    Gap    '-1x-1'
-    Border 20
-#   Foreground '#000000'
-#   Background '#80d000'
-#   Halfground '#70c000'
-    Foreground '000000cc'
-    Background '00000022'
-    Basecolor  '80d000'
-}
-
-#Plugin KVV {
-#    StationID '12_701'
-#    Refresh 30
-#    Proxy 'igate'
-#    Port 8080;
-#}
-
-Plugin Seti {
-    Directory '/root/setiathome-3.08.i686-pc-linux-gnu'
-}
-
-
-Plugin MySQL {
-    server 'gsmlandia.com'     # if none, localhost assumed
-    port 3306                  # if none, MySQL default assumed
-    user 'lcd4linux'           # if none, lcd4linux unix owner assumed
-    password 'lcd4linux'       # if none, empty password assumed
-    database 'lcd4linux'       # MUST be specified
-}
-
-Plugin Pop3 {
-   server1 'localhost'
-   port1 110
-   user1 'michael'
-   password1 'secret'
-}
-
-
-Widget OS {
-    class 'Text'
-    expression '*** '.uname('sysname').' '.uname('release').' ***'
-    width 20
-    align 'M'
-    style 'bold'
-    speed 50   
-    update tick
-}
-
-Widget CPU {
-    class  'Text'
-    expression  uname('machine')
-    prefix 'CPU '
-    width  9
-    align  'L'
-    style test::onoff(7)>0?'bold':'norm'
-    update tick
-}
-
-
-Widget CPUinfo {
-    class  'Text'
-    expression  cpuinfo('model name')
-    prefix ''
-    width  20
-    align  'M'
-    speed 100  
-    update tick
-}
-
-
-Widget RAM {
-    class  'Text'
-    expression meminfo('MemTotal')/1024
-    postfix ' MB RAM'  
-    width  11
-    precision 0
-    align  'R'
-    update tick
-}
-
-Widget Busy {
-    class 'Text'
-    expression proc_stat::cpu('busy', 500)
-    prefix 'Busy'      
-    postfix '%'        
-    width 9    
-    precision 1
-    align 'R'  
-    update tick        
-}      
-
-Widget BusyBar {
-    class 'Bar'
-    expression  proc_stat::cpu('busy',   500)
-    expression2 proc_stat::cpu('system', 500)
-    length 10  
-    direction 'E'
-    update tack
-}
-
-Widget Load {
-    class 'Text'
-    expression loadavg(1)
-    prefix 'Load'
-    postfix loadavg(1)>1.0?'!':' '
-    width 10
-    precision 1
-    align 'R'
-    update tick
-}
-
-Widget LoadBar {
-    class 'Bar'
-    expression  loadavg(1)
-    max 2.0
-    length 10  
-    direction 'E'
-    update tack
-}
-
-
-Widget Disk {
-    class 'Text'
-    # disk.[rw]blk return blocks, we assume a blocksize of 512
-    # to get the number in kB/s we would do blk*512/1024, which is blk/2 
-    # expression (proc_stat::disk('.*', 'rblk', 500)+proc_stat::disk('.*', 'wblk', 500))/2
-    # with kernel 2.6, disk_io disappeared from /proc/stat but moved to /proc/diskstat
-    # therefore you have to use another function called 'diskstats':
-    expression diskstats('hd.', 'read_sectors', 500) + diskstats('hd.', 'write_sectors', 500)
-    prefix 'disk'
-    postfix ' '
-    width 10   
-    precision 0
-    align 'R'  
-    update tick        
-}      
-
-Widget DiskBar {
-    class 'Bar'
-    #expression  proc_stat::disk('.*', 'rblk', 500)
-    #expression2 proc_stat::disk('.*', 'wblk', 500)
-    # for kernel 2.6:
-    expression  diskstats('hd.', 'read_sectors',  500)
-    expression2 diskstats('hd.', 'write_sectors', 500)
-    length 14  
-    direction 'E'
-    update tack
-}
-
-Widget Eth0 {
-    class 'Text'
-    expression (netdev('eth0', 'Rx_bytes', 500)+netdev('eth0', 'Tx_bytes', 500))/1024
-    prefix 'eth0'
-    postfix ' '
-    width 10   
-    precision 0
-    align 'R'  
-    update tick        
-}      
-
-Widget Eth0Bar {
-    class 'Bar'
-    expression  netdev('eth0', 'Rx_bytes', 500)
-    expression2 netdev('eth0', 'Tx_bytes', 500)
-    length 14  
-    direction 'E'
-    update tack
-}
-
-Widget PPP {
-    class 'Text'
-    expression (ppp('Rx:0', 500)+ppp('Tx:0', 500))
-    prefix 'PPP'
-    width 9
-    precision 0
-    align 'R'
-    update tick
-}
-
-Widget Temp {
-    class 'Text'
-    expression i2c_sensors('temp_input3')*1.0324-67
-    prefix 'Temp'
-    width 9
-    precision 1
-    align 'R'
-    update tick
-}
-
-Widget TempBar {
-    class 'Bar'
-    expression  i2c_sensors('temp_input3')*1.0324-67
-    min 40
-    max 80
-    length 10
-    direction 'E'
-    update tack
-}
-
-Widget MySQLtest1 {
-    class 'Text'
-    expression MySQL::query('SELECT id FROM table1')
-    width 20
-    align 'R'
-    prefix 'MySQL test:'
-    update minute
-}
-
-Widget MySQLtest2 {
-    class 'Text'
-    expression MySQL::status()
-    width 20
-    align 'M'
-    prefix 'Status: '
-    update minute
-}
-
-Widget Uptime {
-    class 'Text'
-    expression uptime('%d days %H:%M:%S')
-    width 20
-    align 'R'
-    prefix 'Up '
-    update 1000
-}
-
-
-# debugging widgets 
-
-Widget BarTest {
-    class 'Bar'
-    # test::bar(barno,maxval,startval,delta) - move a test value between 0 and max.
-    # delta= step to change value by each time it's read.
-    # barno - ten different test bar values can be set up, with barno=0..9
-    # if delta=0, just returns the value of bar n instead of changing it.
-    expression test::bar(0,30,25,1)
-    expression2 test::bar(1,30,0,1)
-    length 8
-    # max 50
-    direction 'E'
-    update 10
-}
-
-Widget BarTestVal {
-    class 'Text'
-    expression test::bar(0,100,50,0)
-    prefix 'Test '
-    width 9
-    update 200
-}
-
-Widget LightningTest {
-    class 'icon'
-    speed 500
-    visible test::onoff(0)
-    bitmap {
-        row1 '...***'
-        row2 '..***.'
-        row3 '.***..'
-        row4 '.****.'
-        row5 '..**..'
-        row6 '.**...'
-        row7 '**....'
-        row8 '*.....'
-    }
-}
-
-
-# Icons
-
-Widget Heartbeat {
-    class 'Icon'
-    speed 800
-    Bitmap {
-       Row1 '.....|.....'
-       Row2 '.*.*.|.*.*.'
-       Row3 '*****|*.*.*'
-       Row4 '*****|*...*'
-       Row5 '.***.|.*.*.'
-       Row6 '.***.|.*.*.'
-       Row7 '..*..|..*..'
-       Row8 '.....|.....'
-    }
-}
-
-Widget EKG {
-    class 'Icon'
-    speed 50
-    Bitmap {
-       Row1 '.....|.....|.....|.....|.....|.....|.....|.....'
-       Row2 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
-       Row3 '.....|....*|...*.|..*..|.*...|*....|.....|.....'
-       Row4 '.....|....*|...**|..**.|.**..|**...|*....|.....'
-       Row5 '.....|....*|...**|..**.|.**..|**...|*....|.....'
-       Row6 '.....|....*|...*.|..*.*|.*.*.|*.*..|.*...|*....'
-       Row7 '*****|*****|****.|***..|**..*|*..**|..***|.****'
-       Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
-    }
-}
-Widget Karo {
-    class 'Icon'
-    speed 200
-    Bitmap {
-       Row1 '.....|.....|.....|.....|..*..|.....|.....|.....'
-       Row2 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
-       Row3 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
-       Row4 '.....|..*..|.*.*.|*...*|.....|*...*|.*.*.|..*..'
-       Row5 '.....|.....|..*..|.*.*.|*...*|.*.*.|..*..|.....'
-       Row6 '.....|.....|.....|..*..|.*.*.|..*..|.....|.....'
-       Row7 '.....|.....|.....|.....|..*..|.....|.....|.....'
-       Row8 '.....|.....|.....|.....|.....|.....|.....|.....'
-    }
-}
-Widget Heart {
-    class 'Icon'
-    speed 250
-    Bitmap {
-       Row1 '.....|.....|.....|.....|.....|.....'
-       Row2 '.*.*.|.....|.*.*.|.....|.....|.....'
-       Row3 '*****|.*.*.|*****|.*.*.|.*.*.|.*.*.'
-       Row4 '*****|.***.|*****|.***.|.***.|.***.'
-       Row5 '.***.|.***.|.***.|.***.|.***.|.***.'
-       Row6 '.***.|..*..|.***.|..*..|..*..|..*..'
-       Row7 '..*..|.....|..*..|.....|.....|.....'
-       Row8 '.....|.....|.....|.....|.....|.....'
-    }
-}
-Widget Blob {
-    class 'Icon'
-    speed 250
-    Bitmap {
-       Row1 '.....|.....|.....'
-       Row2 '.....|.....|.***.'
-       Row3 '.....|.***.|*...*'
-       Row4 '..*..|.*.*.|*...*'
-       Row5 '.....|.***.|*...*'
-       Row6 '.....|.....|.***.'
-       Row7 '.....|.....|.....'
-       Row8 '.....|.....|.....'
-    }
-}
-Widget Wave {
-    class 'Icon'
-    speed 100
-    Bitmap {
-       Row1 '..**.|.**..|**...|*....|.....|.....|.....|.....|....*|...**'
-       Row2 '.*..*|*..*.|..*..|.*...|*....|.....|.....|....*|...*.|..*..'
-       Row3 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
-       Row4 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
-       Row5 '*....|....*|...*.|..*..|.*...|*....|....*|...*.|..*..|.*...'
-       Row6 '.....|.....|....*|...*.|..*..|.*..*|*..*.|..*..|.*...|*....'
-       Row7 '.....|.....|.....|....*|...**|..**.|.**..|**...|*....|.....'
-       Row8 '.....|.....|.....|.....|.....|.....|.....|.....|.....|.....'
-    }
-}
-Widget Squirrel {
-    class 'Icon'
-    speed 100
-    Bitmap {
-       Row1 '.....|.....|.....|.....|.....|.....'
-       Row2 '.....|.....|.....|.....|.....|.....'
-       Row3 '.....|.....|.....|.....|.....|.....'
-       Row4 '**...|.**..|..**.|...**|....*|.....'
-       Row5 '*****|*****|*****|*****|*****|*****'
-       Row6 '...**|..**.|.**..|**...|*....|.....'
-       Row7 '.....|.....|.....|.....|.....|.....'
-       Row8 '.....|.....|.....|.....|.....|.....'
-    }
-}
-
-Widget Lightning {
-    class 'icon'
-    speed 100
-    visible cpu('busy', 500)-50
-    bitmap {
-        row1 '...***'
-        row2 '..***.'
-        row3 '.***..'
-        row4 '.****.'
-        row5 '..**..'
-        row6 '.**...'
-        row7 '**....'
-        row8 '*.....'
-    }
-}
-
-Widget Rain {
-    class 'icon'
-    speed 200
-    bitmap {
-       row1 '...*.|.....|.....|.*...|....*|..*..|.....|*....'
-       row2 '*....|...*.|.....|.....|.*...|....*|..*..|.....'
-       row3 '.....|*....|...*.|.....|.....|.*...|....*|..*..'
-       row4 '..*..|.....|*....|...*.|.....|.....|.*...|....*'
-       row5 '....*|..*..|.....|*....|...*.|.....|.....|.*...'
-       row6 '.*...|....*|..*..|.....|*....|...*.|.....|.....'
-       row7 '.....|.*...|....*|..*..|.....|*....|...*.|.....'
-       row8 '.....|.....|.*...|....*|..*..|.....|*....|...*.'
-    }
-}
-
-Widget Timer {
-    class 'Icon'
-    speed 50
-    Bitmap {
-       Row1 '.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|'
-       Row2 '.***.|.*+*.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.*++.|.+++.|.+*+.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|.+**.|'
-       Row3 '*****|**+**|**++*|**+++|**++.|**++.|**+++|**+++|**+++|**+++|**+++|+++++|+++++|++*++|++**+|++***|++**.|++**.|++***|++***|++***|++***|++***|*****|'
-       Row4 '*****|**+**|**+**|**+**|**+++|**+++|**+++|**+++|**+++|**+++|+++++|+++++|+++++|++*++|++*++|++*++|++***|++***|++***|++***|++***|++***|*****|*****|'
-       Row5 '*****|*****|*****|*****|*****|***++|***++|**+++|*++++|+++++|+++++|+++++|+++++|+++++|+++++|+++++|+++++|+++**|+++**|++***|+****|*****|*****|*****|'
-       Row6 '.***.|.***.|.***.|.***.|.***.|.***.|.**+.|.*++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.+++.|.++*.|.+**.|.***.|.***.|.***.|.***.|'
-       Row7 '.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|'
-       Row8 '.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|.....|'
-
-
-    }
-}
-
-Widget Test {
-    class 'Text'
-    expression '1234567890123456789012345678901234567890'
-    width 40
-    foreground 'ff0000ff'
-}
-
-Widget Test1 {
-    class 'Text'
-    expression 'ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890'
-    width 40
-    align 'M'
-    speed 100
-}
-
-Widget Test2 {
-    class 'Text'
-    expression '1234567890abcdefghijklmnopqrstuvwxyz'
-    width 40
-    align 'M'
-    speed 150
-}
-
-Widget GPO_Val1 {
-    class 'Text'
-    expression LCD::GPO(1)
-    prefix 'GPO#1'
-    width 10
-    precision 0
-    align 'R'
-    update tick
-}
-
-Widget GPI_Val1 {
-    class 'Text'
-    expression LCD::GPI(1)
-    prefix 'GPI#1'
-    width 10
-    precision 0
-    align 'R'
-    update tick
-}
-
-Widget GPO_Val4 {
-    class 'Text'
-    expression LCD::GPO(4)
-    prefix 'GPO#4'
-    width 10
-    precision 0
-    align 'R'
-    update tick
-}
-
-Widget GPO_Test1 {
-    class 'GPO'
-    expression 255*test::onoff(1)
-    update 300
-}
-
-Widget GPO_Test255 {
-    class 'GPO'
-    expression test::bar(0,255, 0, 1)
-    update 100
-}
-
-Widget ImageTest {
-    class 'Image'
-    file 'tux.png'
-    update 1000
-    visible 1
-    inverted 0
-}
-
-Widget KVV {
-    class 'Text'
-    expression kvv::line(0).' '.kvv::station(0)
-    width 11
-
-    align 'L'
-    update tick
-    Foreground 'ffff00'
-    style 'bold'
-}
-
-Widget KVV_TIME {
-    class 'Text'
-    expression kvv::time_str(0)
-    width 2
-
-    align 'R'
-    update tick
-    foreground kvv::time(0) < 2 ? 'FF0000' : ( kvv::time(0) < 5 ? 'FFFF00' : '00FF00' )
-    style 'bold'
-}
-
-Layout Default {
-    Row1 {
-       Col1  'OS'
-    }
-    Row2 {
-       Col1  'CPU'
-       Col10 'RAM'
-    }
-    Row3 {
-       Col1  'Busy'
-       Col10 'Rain'
-       Col11 'BusyBar'
-    }
-    Row4 {
-       Col1 'Load'
-       Col11 'LoadBar'
-    }
-    Row5 {
-       Col1  'Disk'
-       Col11 'DiskBar'
-    }
-    Row6 {
-       Col1  'Eth0'
-       Col11 'Eth0Bar'
-    }
-}
-
-Layout TestLayer {
-    Row1 {
-       Col1  'OS'
-    }
-    Row2 {
-       Col1  'CPU'
-       Col10 'RAM'
-    }
-    Row3 {
-       Col1  'Busy'
-       Col10 'Rain'
-       Col11 'BusyBar'
-    }
-    Row4 {
-       Col1 'Load'
-       Col11 'LoadBar'
-    }
-    Row5 {
-       Col1  'Disk'
-       Col11 'DiskBar'
-    }
-    Row6 {
-       Col1  'Eth0'
-       Col11 'Eth0Bar'
-    }
-    Layer 2 {
-       X1.Y1 'ImageTest'
-    }
-}
-
-Layout TestImage {
-    Layer 2 {
-       X1.Y1 'ImageTest'
-    }
-}
-
-Layout L24x8 {
-    Row1 {
-       Col1  'Load'
-       Col11 'BusyBar'
-    }
-    Row2 {
-    }
-}
-
-Layout L8x2 {
-    Row1 {
-       Col1  'Busy'
-    }
-    Row2 {
-       Col1 'BarTest'
-    }
-}
-
-Layout L16x1 {
-    Row1 {
-       Col1  'Busy'
-       Col11 'BusyBar'
-    }
-}
-
-Layout L16x2 {
-    Row1 {
-       Col1  'Busy'
-       Col11 'BusyBar'
-    }
-    Row2 {
-       Col1  'Disk'
-       #Col11 'DiskBar'
-       Col11 'BarTest'
-    }
-}
-
-Layout L20x2 {
-    Row1 {
-        Col1  'CPUinfo'
-    }
-    Row2 {
-       Col1  'Busy'
-       Col11 'BusyBar'
-    }
-}
-
-Layout L40x2 {
-    Row1 {
-       Col1  'OS'
-       Col21  'Busy'
-       Col31 'BusyBar'
-    }
-    Row2 {
-       Col1  'CPU'
-       Col10 'RAM'
-       Col21 'Load'
-       Col31 'LoadBar'
-    }
-}
-
-Layout Test {
-    Row01.Col1 'Test1'
-    Row02.Col1 'Test1'
-    Row03.Col1 'Test1'
-    Row04.Col1 'Test1'
-    Row05.Col1 'Test1'
-    Row06.Col1 'Test1'
-    Row07.Col1 'Test1'
-    Row08.Col1 'Test1'
-    Row09.Col1 'Test1'
-    Row10.Col1 'Test1'
-    Row11.Col1 'Test1'
-    Row12.Col1 'Test1'
-    Row13.Col1 'Test1'
-    Row14.Col1 'Test1'
-    Row15.Col1 'Test1'
-    Row16.Col1 'Test1'
-    Row17.Col1 'Test1'
-    Row18.Col1 'Test1'
-    Row19.Col1 'Test1'
-    Row20.Col1 'Test1'
-    Row21.Col1 'Test1'
-    Row22.Col1 'Test1'
-    Row23.Col1 'Test1'
-    Row24.Col1 'Test1'
-}
-
-Layout Test2 {
-    Row01.Col1 'Test1'
-    #Row02.Col1 'Rain'
-    Row02.Col1 'Test2'
-    Row03.Col1 'Test1'
-    Row04.Col1 'Test2'
-    Row05.Col1 'Test1'
-    Row06.Col1 'Test2'
-    Row07.Col1 'Test1'
-    Row08.Col1 'Test2'
-}
-
-Layout TestGPO {
-    Row1.Col1  'GPO_Val1'
-    Row1.Col10 'GPI_Val1'
-    Row2.Col1  'GPO_Val4'
-    GPO1       'GPO_Test255'
-    GPO4       'GPO_Test1'
-}
-
-Layout TestIcons {
-    Row1.Col1 'Timer'
-    Row1.Col2 'Rain'
-    Row1.Col3 'Squirrel'
-    Row1.Col4 'Wave'
-    Row1.Col5 'Blob'
-    Row1.Col6 'Heart'
-    Row1.Col7 'Karo'
-    Row1.Col8 'EKG'
-}
-
-Layout testMySQL {
-       Row1 {
-               Col1 'MySQLtest1'
-       }
-       Row2 {
-               Col1 'MySQLtest2'
-       }
-}
-
-Layout Debug {
-    #Row09.Col1 'Test'
-    Row09.Col1 'Heartbeat'
-}
-
-
-
-#Display 'SerDispLib'
-#Display 'LCD-Linux'
-#Display 'LCD2041'
-#Display 'LK202'
-#Display 'LK204'
-#Display 'MI240'
-#Display 'CW12232'
-#Display 'HD44780-generic'
-#Display 'HD44780-WinAmp'
-#Display 'HD44780-4bit'
-#Display 'WDC2704M'
-#Display 'SC1602D'
-#Display 'LCM-162'
-#Display 'CF631'
-#Display 'CF632'
-#Display 'CF633'
-#Display 'Curses'
-#Display 'M50530-24x8'
-#Display 'LCDTerm'
-#Display 'SimpleLCD'
-#Display 'BA63'
-#Display 'CT20x4'
-#Display 'T6963-240x64'
-#Display 'T6963-240x128'
-#Display 'T6963-240x128D'
-#Display 'XWindow'
-#Display 'USBLCD'
-#Display 'BWCT'
-#Display 'Image'
-#Display 'Trefon'
-#Display 'LCD2USB'
-#Display 'LPH7508-serdisplib'
-#Display 'LPH7508'
-#Display 'ctinclud'
-Display 'picoLCD'
-
-#Layout 'Default'
-#Layout 'TestLayer'
-#Layout 'TestImage'
-#Layout 'L8x2'
-#Layout 'L16x1'
-#Layout 'L16x2'
-Layout 'L20x2'
-#Layout 'L40x2'
-#Layout 'Test'
-#Layout 'Test2'
-#Layout 'TestGPO'
-#Layout 'Debug'
-#Layout 'TestIcons'
index 93ad4652565ff646887566bbb5f122e3feee6859..ec56a0922b2bae0662336e78a4b0fa5a90b1e6a8 100644 (file)
@@ -1,18 +1,15 @@
 #!/bin/sh /etc/rc.common
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2011 OpenWrt.org
+
 START=98
 
-NAME=lcd4linux
-BIN_F=/usr/bin/$NAME
-PID_F=/var/run/lcd4linux.pid
-SSD=start-stop-daemon
-OPTIONS="-q -p $PID_F -f /etc/lcd4linux.conf"
+SERVICE_USE_PID=1
 
 start() {
-       $SSD -S -q -p $PID_F -b -x $BIN_F -- $OPTIONS
+       service_start /usr/bin/lcd4linux -o /tmp/lcd4linux.png -q
 }
 
 stop() {
-       $SSD -K -q -p $PID_F
+       service_stop /usr/bin/lcd4linux
 }
 
diff --git a/utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch b/utils/lcd4linux/patches/110-uclibc-logarithm-fix.patch
new file mode 100644 (file)
index 0000000..9deba8c
--- /dev/null
@@ -0,0 +1,11 @@
+--- a/plugin_netinfo.c
++++ b/plugin_netinfo.c
+@@ -264,7 +264,7 @@
+     sin = get_netmask(arg1);
+     if (NULL != sin) {
+       logval = (long double) (get_netmask(arg1)->sin_addr.s_addr);
+-      netlen = (int) rint(log2l(logval) / log2l(2.0));
++      netlen = (int) rint(log2f(logval) / log2f(2.0));
+       qprintf(value, sizeof(value), "/%d", netlen);
+     } else {
+       qprintf(value, sizeof(value), "/?");