From 34cb8379294df3eedd449e24241fcb638dcd7264 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 3 Feb 2016 20:33:34 -0800 Subject: userland: Define PROJECT_APIVER and rprovide libgles2 libgl These are needed for pkgconfig to have correct version number which is checked by many configure systems e.g. cogl to decide on support for wayland-egl rprovides are expected by cogl as well to define runtime deps on libgles2 and libgl Signed-off-by: Khem Raj --- .../userland/0016-define-PROJECT_APIVER.patch | 33 ++++++++++++++++++++++ recipes-graphics/userland/userland_git.bb | 3 ++ 2 files changed, 36 insertions(+) create mode 100644 recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch (limited to 'recipes-graphics') diff --git a/recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch b/recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch new file mode 100644 index 0000000..63a35eb --- /dev/null +++ b/recipes-graphics/userland/userland/0016-define-PROJECT_APIVER.patch @@ -0,0 +1,33 @@ +From 56072d7282e7daf65f58fa897f1f76268ae88121 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Feb 2016 11:06:26 -0800 +Subject: [PATCH 16/16] define PROJECT_APIVER + +this helps in compiling components which use packageconfig to poke for +library versions and requiring minimum supported version + +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 6 ++++++ + 1 file changed, 6 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b240ef6..aa5e14f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -2,6 +2,12 @@ cmake_minimum_required(VERSION 2.8) + + project(vmcs_host_apps) + ++SET(PROJECT_VER_MAJOR 1) ++SET(PROJECT_VER_MINOR 0) ++SET(PROJECT_VER_PATCH 0) ++SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}") ++SET(PROJECT_APIVER "${PROJECT_VER}") ++ + set(BUILD_MMAL TRUE) + set(BUILD_MMAL_APPS TRUE) + set(vmcs_root ${PROJECT_SOURCE_DIR}) +-- +2.7.0 + diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index d78a7c9..5ea48e1 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb @@ -10,6 +10,8 @@ PR = "r5" PROVIDES = "virtual/libgles2 \ virtual/egl" +RPROVIDES_${PN} += "libgles2 libgl" + COMPATIBLE_MACHINE = "raspberrypi" SRCBRANCH = "master" @@ -33,6 +35,7 @@ SRC_URI = "\ file://0013-zero-out-wl-buffers-in-egl_surface_free.patch \ file://0014-initialize-front-back-wayland-buffers.patch \ file://0015-Remove-RPC_FLUSH.patch \ + file://0016-define-PROJECT_APIVER.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf