diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-04-11 14:02:19 -0700 |
---|---|---|
committer | Martin Jansa <Martin.Jansa@gmail.com> | 2017-04-24 11:00:50 +0200 |
commit | f93fcdc4f10d4c8bacf76e36ac6ff2e271560c61 (patch) | |
tree | 98e300f3d3e6d0fef8ca8d17467081e68a2de1a0 /meta-oe | |
parent | f013940ce9cb8d3d5e90c52b3acf6c6d27265092 (diff) | |
download | meta-openembedded-f93fcdc4f10d4c8bacf76e36ac6ff2e271560c61.tar.gz |
lcdproc: Upgrade to 0.5.8
Use github to fetch from
Unify inc file back into main recipe
README is now called README.md so adjust the lic checksum
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch | 43 | ||||
-rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb | 23 | ||||
-rw-r--r-- | meta-oe/recipes-extended/lcdproc/lcdproc_git.bb (renamed from meta-oe/recipes-extended/lcdproc/lcdproc5.inc) | 32 |
3 files changed, 68 insertions, 30 deletions
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch b/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch new file mode 100644 index 000000000..abdedad5d --- /dev/null +++ b/meta-oe/recipes-extended/lcdproc/lcdproc/0001-include-asm-ioctl.h-explicitly.patch | |||
@@ -0,0 +1,43 @@ | |||
1 | From b5ca64c7398d516e9845d849e8306df7ac024bc4 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 11 Apr 2017 13:59:34 -0700 | ||
4 | Subject: [PATCH] include asm/ioctl.h explicitly | ||
5 | |||
6 | Needed for _IOC* defines | ||
7 | |||
8 | helps compiling with musl where this file is | ||
9 | not included indirectly | ||
10 | |||
11 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
12 | --- | ||
13 | server/drivers/hd44780-pifacecad.c | 1 + | ||
14 | server/drivers/hd44780-spi.c | 1 + | ||
15 | 2 files changed, 2 insertions(+) | ||
16 | |||
17 | diff --git a/server/drivers/hd44780-pifacecad.c b/server/drivers/hd44780-pifacecad.c | ||
18 | index 43db19c..e2798ad 100644 | ||
19 | --- a/server/drivers/hd44780-pifacecad.c | ||
20 | +++ b/server/drivers/hd44780-pifacecad.c | ||
21 | @@ -54,6 +54,7 @@ | ||
22 | #include <unistd.h> | ||
23 | #include <fcntl.h> | ||
24 | #include <sys/ioctl.h> | ||
25 | +#include <asm/ioctl.h> | ||
26 | #include <stdint.h> | ||
27 | #include <linux/spi/spidev.h> | ||
28 | |||
29 | diff --git a/server/drivers/hd44780-spi.c b/server/drivers/hd44780-spi.c | ||
30 | index 5f94333..8a4015b 100644 | ||
31 | --- a/server/drivers/hd44780-spi.c | ||
32 | +++ b/server/drivers/hd44780-spi.c | ||
33 | @@ -29,6 +29,7 @@ | ||
34 | #include <unistd.h> | ||
35 | #include <fcntl.h> | ||
36 | #include <sys/ioctl.h> | ||
37 | +#include <asm/ioctl.h> | ||
38 | #include <stdint.h> | ||
39 | #include <linux/spi/spidev.h> | ||
40 | |||
41 | -- | ||
42 | 2.12.2 | ||
43 | |||
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb b/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb deleted file mode 100644 index f57e9dfc6..000000000 --- a/meta-oe/recipes-extended/lcdproc/lcdproc_0.5.6.bb +++ /dev/null | |||
@@ -1,23 +0,0 @@ | |||
1 | require lcdproc5.inc | ||
2 | |||
3 | SRC_URI[md5sum] = "df4f5c2c7285eaf6979b9c7768b4877f" | ||
4 | SRC_URI[sha256sum] = "bd2f43c30ff43b30f43110abe6b4a5bc8e0267cb9f57fa97cc5e5ef9488b984a" | ||
5 | |||
6 | PACKAGECONFIG ?= "" | ||
7 | PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," | ||
8 | PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid" | ||
9 | |||
10 | LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" | ||
11 | |||
12 | do_install_append () { | ||
13 | # binaries | ||
14 | install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc | ||
15 | |||
16 | # configuration files | ||
17 | install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf | ||
18 | } | ||
19 | |||
20 | PACKAGES =+ "lcdvc" | ||
21 | CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf" | ||
22 | FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc" | ||
23 | |||
diff --git a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc b/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb index 680f558fa..96bc826fd 100644 --- a/meta-oe/recipes-extended/lcdproc/lcdproc5.inc +++ b/meta-oe/recipes-extended/lcdproc/lcdproc_git.bb | |||
@@ -7,20 +7,32 @@ LICENSE = "GPLv2+" | |||
7 | DEPENDS = "ncurses lirc" | 7 | DEPENDS = "ncurses lirc" |
8 | 8 | ||
9 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ | 9 | LIC_FILES_CHKSUM = "file://COPYING;md5=18810669f13b87348459e611d31ab760 \ |
10 | file://README;beginline=60;md5=637e042cdd3671ba00e78b58ede45d3b" | 10 | file://README.md;beginline=107;md5=5c927ce1742d6d5cddc45b7ad6230f75" |
11 | 11 | ||
12 | SRC_URI = "${SOURCEFORGE_MIRROR}/lcdproc/${BP}.tar.gz" | 12 | BASEPV = "0.5.8" |
13 | PV = "${BASEPV}+git${SRCPV}" | ||
14 | SRCREV = "f5156e2e41bb418f14761afea22eee8efb49fb85" | ||
15 | SRC_URI = "git://github.com/lcdproc/lcdproc;branch=lcdproc-${BASEPV} \ | ||
16 | file://0001-include-asm-ioctl.h-explicitly.patch \ | ||
17 | " | ||
13 | 18 | ||
14 | inherit autotools update-rc.d | 19 | S = "${WORKDIR}/git" |
15 | 20 | ||
16 | LCD_DRIVERS ?= "all" | 21 | inherit autotools pkgconfig update-rc.d |
22 | |||
23 | LCD_DRIVERS ?= "all,!irman,!svga" | ||
17 | LCD_DEFAULT_DRIVER ?= "curses" | 24 | LCD_DEFAULT_DRIVER ?= "curses" |
18 | 25 | ||
19 | PACKAGECONFIG ??= "usb" | 26 | PACKAGECONFIG ??= "usb" |
20 | PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0" | 27 | PACKAGECONFIG[usb] = "--enable-libusb,--disable-libusb,virtual/libusb0" |
21 | PACKAGECONFIG[ftdi] = "--enable-libftdi,--disable-libftdi,libftdi" | 28 | PACKAGECONFIG[ftdi] = "--enable-libftdi,--disable-libftdi,libftdi" |
29 | PACKAGECONFIG[g15] = ",,libg15 g15daemon libg15render," | ||
30 | PACKAGECONFIG[hid] = "--enable-libhid,--disable-libhid,libhid" | ||
31 | PACKAGECONFIG[png] = "--enable-libpng,--disable-libpng,libpng" | ||
32 | |||
33 | LCD_DRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'g15', '', ',!g15', d)}" | ||
22 | 34 | ||
23 | EXTRA_OECONF = "--enable-drivers=${LCD_DRIVERS}" | 35 | EXTRA_OECONF = "--enable-drivers='${LCD_DRIVERS}'" |
24 | 36 | ||
25 | do_install () { | 37 | do_install () { |
26 | # binaries | 38 | # binaries |
@@ -46,9 +58,14 @@ do_install () { | |||
46 | for i in server/drivers/*.so; do | 58 | for i in server/drivers/*.so; do |
47 | install -m 0644 $i ${D}${libdir}/lcdproc/ | 59 | install -m 0644 $i ${D}${libdir}/lcdproc/ |
48 | done | 60 | done |
61 | # binaries | ||
62 | install -D -m 0755 clients/lcdvc/lcdvc ${D}${sbindir}/lcdvc | ||
63 | |||
64 | # configuration files | ||
65 | install -D -m 0644 ${S}/clients/lcdvc/lcdvc.conf ${D}${sysconfdir}/lcdvc.conf | ||
49 | } | 66 | } |
50 | 67 | ||
51 | PACKAGES =+ "lcdd" | 68 | PACKAGES =+ "lcdd lcdvc" |
52 | 69 | ||
53 | RRECOMMENDS_${PN} = "lcdd" | 70 | RRECOMMENDS_${PN} = "lcdd" |
54 | 71 | ||
@@ -58,6 +75,8 @@ FILES_lcdd = "${sysconfdir}/LCDd.conf \ | |||
58 | 75 | ||
59 | CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" | 76 | CONFFILES_lcdd = "${sysconfdir}/LCDd.conf" |
60 | CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf" | 77 | CONFFILES_${PN} = "${sysconfdir}/lcdproc.conf" |
78 | CONFFILES_lcdvc = "${sysconfdir}/lcdvc.conf" | ||
79 | FILES_lcdvc = "${sysconfdir}/lcdvc.conf ${sbindir}/lcdvc" | ||
61 | 80 | ||
62 | # Driver packages | 81 | # Driver packages |
63 | 82 | ||
@@ -78,4 +97,3 @@ python populate_packages_prepend() { | |||
78 | } | 97 | } |
79 | 98 | ||
80 | PACKAGES_DYNAMIC += "^lcdd-driver-.*" | 99 | PACKAGES_DYNAMIC += "^lcdd-driver-.*" |
81 | |||