diff options
author | Martin Jansa <Martin.Jansa@gmail.com> | 2020-01-18 11:32:14 +0100 |
---|---|---|
committer | Andrei Gherzan <andrei@gherzan.ro> | 2020-01-24 12:09:42 +0000 |
commit | 30eedfa095c5eb0d7254c2d36eb5a67b3ee34a55 (patch) | |
tree | 6c104f07c4628907985e9408a4ff524c769e93e2 /recipes-graphics | |
parent | d058d2a2cf1a40dd39ebf344faad504f3458f7b2 (diff) | |
download | meta-raspberrypi-30eedfa095c5eb0d7254c2d36eb5a67b3ee34a55.tar.gz |
userland: add pkg-config for openmaxil and add virtual/libomxil to PROVIDES
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'recipes-graphics')
-rw-r--r-- | recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch | 40 | ||||
-rw-r--r-- | recipes-graphics/userland/userland_git.bb | 2 |
2 files changed, 42 insertions, 0 deletions
diff --git a/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch b/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch new file mode 100644 index 0000000..f3fc716 --- /dev/null +++ b/recipes-graphics/userland/files/0020-openmaxil-add-pkg-config-file.patch | |||
@@ -0,0 +1,40 @@ | |||
1 | From 09c7ac4c09d91651b8e98780ec6f2e834e94ece6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Martin Jansa <martin.jansa@lge.com> | ||
3 | Date: Wed, 13 Jun 2018 18:22:22 +0000 | ||
4 | Subject: [PATCH] openmaxil: add pkg-config file | ||
5 | |||
6 | --- | ||
7 | CMakeLists.txt | 2 +- | ||
8 | pkgconfig/openmaxil.pc.in | 10 ++++++++++ | ||
9 | 2 files changed, 11 insertions(+), 1 deletion(-) | ||
10 | create mode 100644 pkgconfig/openmaxil.pc.in | ||
11 | |||
12 | diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
13 | index 673a5ad..e64e0ad 100644 | ||
14 | --- a/CMakeLists.txt | ||
15 | +++ b/CMakeLists.txt | ||
16 | @@ -133,7 +133,7 @@ include_directories("${PROJECT_BINARY_DIR}") | ||
17 | include(FindPkgConfig QUIET) | ||
18 | if(PKG_CONFIG_FOUND) | ||
19 | # Produce a pkg-config file | ||
20 | - foreach(PCFILE bcm_host.pc egl.pc glesv2.pc vg.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc ) | ||
21 | + foreach(PCFILE bcm_host.pc egl.pc glesv2.pc vg.pc brcmegl.pc brcmglesv2.pc brcmvg.pc vcsm.pc mmal.pc openmaxil.pc ) | ||
22 | configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) | ||
23 | install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" | ||
24 | DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") | ||
25 | diff --git a/pkgconfig/openmaxil.pc.in b/pkgconfig/openmaxil.pc.in | ||
26 | new file mode 100644 | ||
27 | index 0000000..8793a61 | ||
28 | --- /dev/null | ||
29 | +++ b/pkgconfig/openmaxil.pc.in | ||
30 | @@ -0,0 +1,10 @@ | ||
31 | +prefix=@CMAKE_INSTALL_PREFIX@ | ||
32 | +exec_prefix=${prefix} | ||
33 | +libdir=${exec_prefix}/lib | ||
34 | +includedir=${prefix}/include | ||
35 | + | ||
36 | +Name: openmaxil | ||
37 | +Description: Broadcom openmaxil library | ||
38 | +Version: 1 | ||
39 | +Libs: -L${libdir} -lopenmaxil -lvcos -lvchiq_arm -pthread | ||
40 | +Cflags: -I${includedir} -I${includedir}/IL -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM | ||
diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index 99a3f23..00a4b39 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb | |||
@@ -6,6 +6,7 @@ LICENSE = "BSD-3-Clause" | |||
6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" | 6 | LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" |
7 | 7 | ||
8 | PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" | 8 | PROVIDES += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "virtual/libgles2 virtual/egl", d)}" |
9 | PROVIDES += "virtual/libomxil" | ||
9 | 10 | ||
10 | RPROVIDES_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" | 11 | RPROVIDES_${PN} += "${@bb.utils.contains("MACHINE_FEATURES", "vc4graphics", "", "libgles2 egl libegl libegl1 libglesv2-2", d)}" |
11 | COMPATIBLE_MACHINE = "^rpi$" | 12 | COMPATIBLE_MACHINE = "^rpi$" |
@@ -39,6 +40,7 @@ SRC_URI = "\ | |||
39 | file://0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch \ | 40 | file://0017-khronos-backport-typedef-for-EGL_EXT_image_dma_buf_i.patch \ |
40 | file://0018-Add-EGL_IMG_context_priority-related-defines.patch \ | 41 | file://0018-Add-EGL_IMG_context_priority-related-defines.patch \ |
41 | file://0019-libfdt-Undefine-__wordsize-if-already-defined.patch \ | 42 | file://0019-libfdt-Undefine-__wordsize-if-already-defined.patch \ |
43 | file://0020-openmaxil-add-pkg-config-file.patch \ | ||
42 | " | 44 | " |
43 | S = "${WORKDIR}/git" | 45 | S = "${WORKDIR}/git" |
44 | 46 | ||