diff options
Diffstat (limited to 'meta-html5-framework')
| -rw-r--r-- | meta-html5-framework/recipes-wam/chromium/chromium68_git.bb | 2 | ||||
| -rw-r--r-- | meta-html5-framework/recipes-wam/wam/wam_git.bb | 18 |
2 files changed, 10 insertions, 10 deletions
diff --git a/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb b/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb index 5a94e3c3..70255bf3 100644 --- a/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb +++ b/meta-html5-framework/recipes-wam/chromium/chromium68_git.bb @@ -14,7 +14,7 @@ require gn-utils.inc inherit gettext qemu -DEPENDS = "virtual/gettext wayland wayland-native pixman freetype fontconfig openssl pango cairo icu libxkbcommon libexif dbus pciutils udev libcap alsa-lib virtual/egl elfutils-native libdrm atk gperf-native gconf nss nss-native nspr nspr-native bison-native qemu-native" +DEPENDS = "virtual/gettext wayland wayland-native pixman freetype glib-2.0 fontconfig openssl pango cairo icu libxkbcommon libexif dbus pciutils udev libcap alsa-lib virtual/egl elfutils-native libdrm atk gperf-native gconf nss nss-native nspr nspr-native bison-native qemu-native" PROVIDES = "${BROWSER_APPLICATION}" diff --git a/meta-html5-framework/recipes-wam/wam/wam_git.bb b/meta-html5-framework/recipes-wam/wam/wam_git.bb index b2487dde..123c915e 100644 --- a/meta-html5-framework/recipes-wam/wam/wam_git.bb +++ b/meta-html5-framework/recipes-wam/wam/wam_git.bb @@ -3,9 +3,15 @@ AUTHOR = "Jani Hautakangas <jani.hautakangas@lge.com>" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/Apache-2.0;md5=89aea4e17d99a7cacdbeed46a0096b10" -inherit qmake5 +inherit cmake -DEPENDS = "qtbase glib-2.0 jsoncpp chromium68 wayland-ivi-extension libhomescreen libwindowmanager" +DEPENDS = "glib-2.0 jsoncpp boost chromium68 wayland-ivi-extension libhomescreen libwindowmanager" + +EXTRA_OECMAKE = "\ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX=${prefix} \ + -DPLATFORM_NAME=${@'${DISTRO}'.upper().replace('-', '_')} \ + -DCHROMIUM_SRC_DIR=${STAGING_INCDIR}/chromium68" PR="r0" @@ -14,13 +20,7 @@ RPROVIDES_${PN} += "virtual/webruntime" SRC_URI = "git://github.com/webosose/${PN}.git;branch=@6.agl.guppy;protocol=https" S = "${WORKDIR}/git" -SRCREV = "ed37e18d3b7acaecc5e40c2548b6dbda98a4f755" - -EXTRA_QMAKEVARS_PRE += "CONFIG_BUILD+=agl_service" -EXTRA_QMAKEVARS_PRE += "PREFIX=/usr" -EXTRA_QMAKEVARS_PRE += "PLATFORM=${@'PLATFORM_' + '${DISTRO}'.upper().replace('-', '_')}" -EXTRA_QMAKEVARS_PRE += "CHROMIUM_SRC_DIR=${STAGING_INCDIR}/chromium68" -OE_QMAKE_CXXFLAGS += "-Wno-unused-variable" +SRCREV = "3e9ce0d4d85a1ea1210e5453906d5bdb084dd305" do_install_append() { install -d ${D}${sysconfdir}/wam |