diff options
-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 061cc22f0c..0000000000 --- a/meta-oe/recipes-extended/lcdproc/lcdproc/automake-111-fix.patch +++ /dev/null @@ -1,21 +0,0 @@ -Description: With automake 1.11.3, pkglib_PROGRAMS is not valid anymore, - so work around this by using my_execbin_PROGRAMS. -Author: Andreas Moog <amoog@ubuntu.com> -Bug-Ubuntu: https://bugs.launchpad.net/bugs/934265 - -Upstream-Status: Backport - -Index: lcdproc-0.5.5/server/drivers/Makefile.am -=================================================================== ---- lcdproc-0.5.5.orig/server/drivers/Makefile.am 2012-02-26 14:04:37.000000000 +0100 -+++ lcdproc-0.5.5/server/drivers/Makefile.am 2012-02-26 14:13:17.764467350 +0100 -@@ -20,7 +20,8 @@ - - ## Keep the lists sorted! - --pkglib_PROGRAMS = @DRIVERS@ -+my_execbindir = $(pkglibdir) -+my_execbin_PROGRAMS = @DRIVERS@ - 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 - noinst_LIBRARIES = libLCD.a libbignum.a - 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 6d66af65fc..4761ef7e9b 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 @@ require lcdproc5.inc -SRC_URI += "file://automake-111-fix.patch" - -SRC_URI[md5sum] = "c92d4529d36eeec6d9d6fd0a4aa3ec82" -SRC_URI[sha256sum] = "b136b47d7bf585a003334f432d8730a36ef5ed1cd520084b919667d825e48d42" +SRC_URI[md5sum] = "df4f5c2c7285eaf6979b9c7768b4877f" +SRC_URI[sha256sum] = "bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a" PACKAGECONFIG ?= "" PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," |