diff options
author | Paul Eggleton <paul.eggleton@linux.intel.com> | 2015-01-05 11:00:48 +0000 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2015-01-08 11:58:43 +0100 |
commit | bdb3f7f10c728d004ad3c23190183ce4ef10a1ae (patch) | |
tree | 5bbe7e9883dd9e7e8e31fc4b8a35528ef1d9ec5a | |
parent | 7858c56203afe273fdc579bb51369060b8c924e8 (diff) | |
download | meta-openembedded-bdb3f7f10c728d004ad3c23190183ce4ef10a1ae.tar.gz |
lcdproc: update to 0.5.6
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
-rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch | 21 | ||||
-rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb (renamed from meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb) | 6 |
2 files changed, 2 insertions, 25 deletions
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch deleted file mode 100644 index 061cc22f0..000000000 --- a/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | Description: With automake 1.11.3, pkglib_PROGRAMS is not valid anymore, | ||
2 | so work around this by using my_execbin_PROGRAMS. | ||
3 | Author: Andreas Moog <amoog@ubuntu.com> | ||
4 | Bug-Ubuntu: https://bugs.launchpad.net/bugs/934265 | ||
5 | |||
6 | Upstream-Status: Backport | ||
7 | |||
8 | Index: lcdproc-0.5.5/server/drivers/Makefile.am | ||
9 | =================================================================== | ||
10 | --- lcdproc-0.5.5.orig/server/drivers/Makefile.am 2012-02-26 14:04:37.000000000 +0100 | ||
11 | +++ lcdproc-0.5.5/server/drivers/Makefile.am 2012-02-26 14:13:17.764467350 +0100 | ||
12 | @@ -20,7 +20,8 @@ | ||
13 | |||
14 | ## Keep the lists sorted! | ||
15 | |||
16 | -pkglib_PROGRAMS = @DRIVERS@ | ||
17 | +my_execbindir = $(pkglibdir) | ||
18 | +my_execbin_PROGRAMS = @DRIVERS@ | ||
19 | EXTRA_PROGRAMS = bayrad CFontz CFontz633 CFontzPacket curses debug CwLnx ea65 EyeboxOne g15 glcdlib glk hd44780 icp_a106 imon imonlcd IOWarrior irman joy lb216 lcdm001 lcterm lirc lis MD8800 mdm166a ms6931 mtc_s16209x MtxOrb mx5000 NoritakeVFD picolcd pyramid sed1330 sed1520 serialPOS serialVFD shuttleVFD stv5730 SureElec svga t6963 text tyan sli ula200 xosd i2500vfd irtrans | ||
20 | noinst_LIBRARIES = libLCD.a libbignum.a | ||
21 | |||
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb index 6d66af65f..4761ef7e9 100644 --- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.5.bb +++ b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb | |||
@@ -1,9 +1,7 @@ | |||
1 | require lcdproc5.inc | 1 | require lcdproc5.inc |
2 | 2 | ||
3 | SRC_URI += "file://automake-111-fix.patch" | 3 | SRC_URI[md5sum] = "df4f5c2c7285eaf6979b9c7768b4877f" |
4 | 4 | SRC_URI[sha256sum] = "bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a" | |
5 | SRC_URI[md5sum] = "c92d4529d36eeec6d9d6fd0a4aa3ec82" | ||
6 | SRC_URI[sha256sum] = "b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42" | ||
7 | 5 | ||
8 | PACKAGECONFIG ?= "" | 6 | PACKAGECONFIG ?= "" |
9 | PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," | 7 | PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," |