diff options
Diffstat (limited to 'meta-oe/recipes-extended/subsurface/subsurface_git.bb')
-rw-r--r-- | meta-oe/recipes-extended/subsurface/subsurface_git.bb | 25 |
1 files changed, 7 insertions, 18 deletions
diff --git a/meta-oe/recipes-extended/subsurface/subsurface_git.bb b/meta-oe/recipes-extended/subsurface/subsurface_git.bb index fc50eb680..1edb19e35 100644 --- a/meta-oe/recipes-extended/subsurface/subsurface_git.bb +++ b/meta-oe/recipes-extended/subsurface/subsurface_git.bb | |||
@@ -4,29 +4,18 @@ LIC_FILES_CHKSUM = "file://gpl-2.0.txt;md5=b234ee4d69f5fce4486a80fdaf4a4263" | |||
4 | 4 | ||
5 | DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf" | 5 | DEPENDS = "libdivecomputer gtk+ libxml2 glib-2.0 gconf" |
6 | 6 | ||
7 | inherit gtk-icon-cache | 7 | PNBLACKLIST[subsurface] = "Needs to be upgraded for compatibility with new libdivecomputer" |
8 | |||
9 | inherit gtk-icon-cache cmake | ||
8 | 10 | ||
9 | inherit gitpkgv | 11 | inherit gitpkgv |
10 | PKGV = "${GITPKGVTAG}" | 12 | PKGV = "${GITPKGVTAG}" |
11 | PV = "1.1" | 13 | PV = "4.2" |
12 | 14 | ||
13 | SRCREV = "bd275d73ac06823619230915a3aa29deddc996fb" | 15 | SRCREV = "f61ee20ba356ecfc4c5b247f548f52d588179c94" |
14 | SRC_URI = "git://subsurface.hohndel.org/subsurface.git \ | 16 | SRC_URI = "git://subsurface.hohndel.org/subsurface.git" |
15 | file://pkgconfig.patch \ | ||
16 | file://libm.patch" | ||
17 | S = "${WORKDIR}/git" | 17 | S = "${WORKDIR}/git" |
18 | 18 | ||
19 | EXTRA_OEMAKE = "CC='${CC}' \ | 19 | #FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg" |
20 | libdc-usr=${STAGING_INCDIR}/libdivecomputer/* \ | ||
21 | LIBDIVECOMPUTERINCLUDES=${STAGING_INCDIR}/libdivecomputer \ | ||
22 | LIBDIVECOMPUTERARCHIVE=${STAGING_LIBDIR}/libdivecomputer.a \ | ||
23 | " | ||
24 | |||
25 | do_install() { | ||
26 | oe_runmake install DESTDIR=${D} | ||
27 | rm ${D}${datadir}/icons/hicolor/icon-theme.cache | ||
28 | } | ||
29 | |||
30 | FILES_${PN} += "${datadir}/icons/hicolor/scalable/apps/subsurface.svg" | ||
31 | RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15" | 20 | RRECOMMENDS_${PN}_append_libc-glibc = " glibc-gconv-iso8859-15" |
32 | 21 | ||