aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim P <jim@pingle.org>2012-01-06 07:38:05 -0800
committerJim P <jim@pingle.org>2012-01-06 07:38:05 -0800
commit0cb23378c4190ab7506e0e516e57bf53abe0ba83 (patch)
treebfa3f47a136522920949f09ea16071f475ad7ae3
parent3e5325aa98b76edbb45ccb89273f97f7c5751105 (diff)
parent3ee714452a28b147f2323ba22a953f9f60e61b98 (diff)
downloadpfsense-packages-0cb23378c4190ab7506e0e516e57bf53abe0ba83.tar.gz
pfsense-packages-0cb23378c4190ab7506e0e516e57bf53abe0ba83.tar.bz2
pfsense-packages-0cb23378c4190ab7506e0e516e57bf53abe0ba83.zip
Merge pull request #181 from mdima/master
Adds the sdeclcd driver.
-rw-r--r--config/lcdproc-dev/lcdproc.inc3
-rw-r--r--config/lcdproc-dev/lcdproc.xml15
-rw-r--r--config/lcdproc-dev/lcdproc_screens.xml2
-rw-r--r--pkg_config.8.xml2
-rw-r--r--pkg_config.8.xml.amd642
5 files changed, 18 insertions, 6 deletions
diff --git a/config/lcdproc-dev/lcdproc.inc b/config/lcdproc-dev/lcdproc.inc
index cf2e6e12..14e5dc73 100644
--- a/config/lcdproc-dev/lcdproc.inc
+++ b/config/lcdproc-dev/lcdproc.inc
@@ -442,6 +442,9 @@
$config_text .= "Device={$realport}\n";
$config_text .= "Size={$lcdproc_config['size']}\n";
break;
+ case "sdeclcd":
+ $config_text .= "[{$lcdproc_config['driver']}]\n";
+ break;
case "sed1330":
$config_text .= "[{$lcdproc_config['driver']}]\n";
break;
diff --git a/config/lcdproc-dev/lcdproc.xml b/config/lcdproc-dev/lcdproc.xml
index d31c9a6d..fcb16997 100644
--- a/config/lcdproc-dev/lcdproc.xml
+++ b/config/lcdproc-dev/lcdproc.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8" ?>
<packagegui>
- <title>Services: LCDproc 0.5.4 pkg v. 0.5</title>
+ <title>Services: LCDproc 0.5.4 pkg v. 0.6</title>
<name>lcdproc</name>
- <version>0.5.4 pkg v. 0.5</version>
+ <version>0.5.4 pkg v. 0.6</version>
<savetext>Save</savetext>
<include_file>/usr/local/pkg/lcdproc.inc</include_file>
<tabs>
@@ -42,6 +42,11 @@
<prefix>/usr/local/lib/lcdproc/</prefix>
<chmod>0755</chmod>
</additional_files_needed>
+ <additional_files_needed>
+ <item>http://files.pfsense.org/misc/sdeclcd.so</item>
+ <prefix>/usr/local/lib/lcdproc/</prefix>
+ <chmod>0755</chmod>
+ </additional_files_needed>
<service>
<name>lcdproc</name>
<rcfile>lcdproc.sh</rcfile>
@@ -253,7 +258,11 @@
<option>
<value>pyramid</value>
<name>pyramid</name>
- </option>
+ </option>
+ <option>
+ <value>sdeclcd</value>
+ <name>sdeclcd (x86 only)</name>
+ </option>
<option>
<value>sed1330</value>
<name>sed1330</name>
diff --git a/config/lcdproc-dev/lcdproc_screens.xml b/config/lcdproc-dev/lcdproc_screens.xml
index 1d2318fd..0c967dff 100644
--- a/config/lcdproc-dev/lcdproc_screens.xml
+++ b/config/lcdproc-dev/lcdproc_screens.xml
@@ -2,7 +2,7 @@
<packagegui>
<title>Services: LCDproc: Screens</title>
<name>lcdproc_screens</name>
- <version>0.5.4 pkg v. 0.5</version>
+ <version>0.5.4 pkg v. 0.6</version>
<savetext>Save</savetext>
<include_file>/usr/local/pkg/lcdproc.inc</include_file>
<tabs>
diff --git a/pkg_config.8.xml b/pkg_config.8.xml
index a2435a3d..7804b937 100644
--- a/pkg_config.8.xml
+++ b/pkg_config.8.xml
@@ -1022,7 +1022,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.4 pkg v. 0.5</version>
+ <version>lcdproc-0.5.4 pkg v. 0.6</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>
diff --git a/pkg_config.8.xml.amd64 b/pkg_config.8.xml.amd64
index 2b6e0231..c81d537b 100644
--- a/pkg_config.8.xml.amd64
+++ b/pkg_config.8.xml.amd64
@@ -993,7 +993,7 @@
<descr>LCD display driver - Development version</descr>
<website>http://www.lcdproc.org/</website>
<category>Utility</category>
- <version>lcdproc-0.5.4 pkg v. 0.5</version>
+ <version>lcdproc-0.5.4 pkg v. 0.6</version>
<status>BETA</status>
<required_version>2.0</required_version>
<maintainer>michele@nt2.it</maintainer>