summaryrefslogtreecommitdiffstats
path: root/recipes-graphics/userland/userland_git.bb
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2016-05-13 09:32:32 -0700
committerAndrei Gherzan <andrei@gherzan.ro>2016-05-19 17:14:04 +0200
commitf7af12910fdacb3f949fd04d9570f66e83cb0efa (patch)
tree856c1c80b423c1b513d288b2c734acd2574490a7 /recipes-graphics/userland/userland_git.bb
parent9912d38e97671704822d1aa05312a0439cb650d3 (diff)
downloadmeta-raspberrypi-f7af12910fdacb3f949fd04d9570f66e83cb0efa.tar.gz
userland: Update to tip of tree
Drop the patch which is upstreamed slightly differently use VMCS_INSTALL_PREFIX to /usr via EXTRA_OECMAKE Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes-graphics/userland/userland_git.bb')
-rw-r--r--recipes-graphics/userland/userland_git.bb6
1 files changed, 3 insertions, 3 deletions
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb
index 0e7057e..7acd8b8 100644
--- a/recipes-graphics/userland/userland_git.bb
+++ b/recipes-graphics/userland/userland_git.bb
@@ -16,11 +16,10 @@ COMPATIBLE_MACHINE = "raspberrypi"
16 16
17SRCBRANCH = "master" 17SRCBRANCH = "master"
18SRCFORK = "raspberrypi" 18SRCFORK = "raspberrypi"
19SRCREV = "703a2c4b35e23ee44ad84db6b9c3f89c0a627143" 19SRCREV = "17c28b9d1d234893b73adeb95efc4959b617fc85"
20 20
21SRC_URI = "\ 21SRC_URI = "\
22 git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ 22 git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \
23 file://0001-set-VMCS_INSTALL_PREFIX-to-usr.patch \
24 file://0002-cmake-generate-and-install-pkgconfig-files.patch \ 23 file://0002-cmake-generate-and-install-pkgconfig-files.patch \
25 file://0003-Allow-applications-to-set-next-resource-handle.patch \ 24 file://0003-Allow-applications-to-set-next-resource-handle.patch \
26 file://0004-wayland-Add-support-for-the-Wayland-winsys.patch \ 25 file://0004-wayland-Add-support-for-the-Wayland-winsys.patch \
@@ -41,7 +40,8 @@ S = "${WORKDIR}/git"
41inherit cmake pkgconfig 40inherit cmake pkgconfig
42 41
43EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed' \ 42EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed' \
44 " 43 -DVMCS_INSTALL_PREFIX=${exec_prefix} \
44"
45 45
46PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" 46PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"
47 47