diff --git a/recipes-graphics/userland/userland/0001-set-VMCS_INSTALL_PREFIX-to-usr.patch b/recipes-graphics/userland/userland/0001-set-VMCS_INSTALL_PREFIX-to-usr.patch deleted file mode 100644 index 5165288..0000000 --- a/recipes-graphics/userland/userland/0001-set-VMCS_INSTALL_PREFIX-to-usr.patch +++ /dev/null @@ -1,28 +0,0 @@ -From b653ef9e770bd9e4976c058405b94b75873d2508 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 9 Aug 2015 23:58:17 -0700 -Subject: [PATCH 01/13] set VMCS_INSTALL_PREFIX to /usr - -in OE we dont use /opt/vc but standard prefix - -Signed-off-by: Khem Raj ---- - makefiles/cmake/vmcs.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/makefiles/cmake/vmcs.cmake b/makefiles/cmake/vmcs.cmake -index 0f8641b..e9d576d 100644 ---- a/makefiles/cmake/vmcs.cmake -+++ b/makefiles/cmake/vmcs.cmake -@@ -10,7 +10,7 @@ INCLUDE(CPack) - if (ANDROID) - SET(VMCS_INSTALL_PREFIX "/vendor/brcm/islands" CACHE PATH "Prefix prepended to install directories" FORCE) - else() -- SET(VMCS_INSTALL_PREFIX "/opt/vc" CACHE PATH "Prefix prepended to install directories" FORCE) -+ SET(VMCS_INSTALL_PREFIX "/usr" CACHE PATH "Prefix prepended to install directories" FORCE) - endif() - - SET(CMAKE_INSTALL_PREFIX "${VMCS_INSTALL_PREFIX}" CACHE INTERNAL "Prefix --- -2.7.4 - 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" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "703a2c4b35e23ee44ad84db6b9c3f89c0a627143" +SRCREV = "17c28b9d1d234893b73adeb95efc4959b617fc85" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ - file://0001-set-VMCS_INSTALL_PREFIX-to-usr.patch \ file://0002-cmake-generate-and-install-pkgconfig-files.patch \ file://0003-Allow-applications-to-set-next-resource-handle.patch \ file://0004-wayland-Add-support-for-the-Wayland-winsys.patch \ @@ -41,7 +40,8 @@ S = "${WORKDIR}/git" inherit cmake pkgconfig EXTRA_OECMAKE = "-DCMAKE_BUILD_TYPE=Release -DCMAKE_EXE_LINKER_FLAGS='-Wl,--no-as-needed' \ - " + -DVMCS_INSTALL_PREFIX=${exec_prefix} \ +" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}"