From 32d09365703d15d9bf39e7d054291d8ab2c6d61c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sat, 6 Feb 2016 11:54:17 -0800 Subject: userland: Upgrade to latest git master Drop upstreamed patches 0002-fix-musl-build.patch was partially upstreamed git'ify the remaining patches Change license field to BSD 3 clause, since thats what the licence it with BCM and RPI Copyrights Licence changed from Broadcom to Raspberry Pi Ltd see commit 0863709b9fb90ee1204b7fe52f69535830d3c111 Author: popcornmix Date: Mon Feb 1 21:07:02 2016 +0000 Update copyright diff --git a/LICENCE b/LICENCE index 2582681..dea4c26 100644 --- a/LICENCE +++ b/LICENCE @@ -1,4 +1,5 @@ Copyright (c) 2012, Broadcom Europe Ltd +Copyright (c) 2015, Raspberry Pi (Trading) Ltd All rights reserved. Signed-off-by: Khem Raj --- ...LINE_DECL-to-not-use-extern-inlines-in-de.patch | 45 ++++++++ .../userland/0001-fix-gcc-5.x-inlines.patch | 26 ----- .../userland/userland/0002-fix-musl-build.patch | 22 ---- .../userland/0002-musl-inspired-fixed.patch | 29 ++++++ .../0002-set-VMCS_INSTALL_PREFIX-to-usr.patch | 29 ------ ...make-generate-and-install-pkgconfig-files.patch | 114 --------------------- .../0003-fix-alloc-size-uninitialized.patch | 13 --- .../0003-set-VMCS_INSTALL_PREFIX-to-usr.patch | 28 +++++ ...make-generate-and-install-pkgconfig-files.patch | 114 +++++++++++++++++++++ recipes-graphics/userland/userland_git.bb | 15 ++- 10 files changed, 223 insertions(+), 212 deletions(-) create mode 100644 recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch delete mode 100644 recipes-graphics/userland/userland/0001-fix-gcc-5.x-inlines.patch delete mode 100644 recipes-graphics/userland/userland/0002-fix-musl-build.patch create mode 100644 recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch delete mode 100644 recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch delete mode 100644 recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch delete mode 100644 recipes-graphics/userland/userland/0003-fix-alloc-size-uninitialized.patch create mode 100644 recipes-graphics/userland/userland/0003-set-VMCS_INSTALL_PREFIX-to-usr.patch create mode 100644 recipes-graphics/userland/userland/0004-cmake-generate-and-install-pkgconfig-files.patch (limited to 'recipes-graphics') diff --git a/recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch b/recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch new file mode 100644 index 0000000..4824d1a --- /dev/null +++ b/recipes-graphics/userland/userland/0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch @@ -0,0 +1,45 @@ +From d0b146e6571585989e7149a512533fcd6532545a Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Feb 2016 11:00:25 -0800 +Subject: [PATCH 01/16] Fix VCOS_INLINE_DECL to not use extern inlines in + declarations + +Signed-off-by: Khem Raj +--- + interface/vcos/pthreads/vcos_platform_types.h | 2 +- + interface/vcos/vcos_types.h | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/interface/vcos/pthreads/vcos_platform_types.h b/interface/vcos/pthreads/vcos_platform_types.h +index 17b422d..64fb381 100644 +--- a/interface/vcos/pthreads/vcos_platform_types.h ++++ b/interface/vcos/pthreads/vcos_platform_types.h +@@ -61,7 +61,7 @@ vcos_pthreads_logging_assert(const char *file, const char *func, unsigned int li + #define VCOS_ASSERT_MSG(...) ((VCOS_ASSERT_LOGGING && !VCOS_ASSERT_LOGGING_DISABLE) ? vcos_pthreads_logging_assert(__FILE__, __func__, __LINE__, __VA_ARGS__) : (void)0) + + #define VCOS_INLINE_BODIES +-#define VCOS_INLINE_DECL extern __inline__ ++#define VCOS_INLINE_DECL extern + #define VCOS_INLINE_IMPL static __inline__ + + #ifdef __cplusplus +diff --git a/interface/vcos/vcos_types.h b/interface/vcos/vcos_types.h +index 6feb4d2..e64fd99 100644 +--- a/interface/vcos/vcos_types.h ++++ b/interface/vcos/vcos_types.h +@@ -121,10 +121,10 @@ typedef enum + #if defined(NDEBUG) + + #ifdef __GNUC__ +-# define VCOS_INLINE_DECL extern __inline__ ++# define VCOS_INLINE_DECL extern + # define VCOS_INLINE_IMPL static __inline__ + #else +-# define VCOS_INLINE_DECL static _VCOS_INLINE /* declare a func */ ++# define VCOS_INLINE_DECL extern + # define VCOS_INLINE_IMPL static _VCOS_INLINE /* implement a func inline */ + #endif + +-- +2.7.0 + diff --git a/recipes-graphics/userland/userland/0001-fix-gcc-5.x-inlines.patch b/recipes-graphics/userland/userland/0001-fix-gcc-5.x-inlines.patch deleted file mode 100644 index 57f3518..0000000 --- a/recipes-graphics/userland/userland/0001-fix-gcc-5.x-inlines.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- userland-fb11b39d97371c076eef7c85bbcab5733883a41e.orig/interface/vcos/vcos_types.h -+++ userland-fb11b39d97371c076eef7c85bbcab5733883a41e/interface/vcos/vcos_types.h -@@ -121,10 +121,10 @@ - #if defined(NDEBUG) - - #ifdef __GNUC__ --# define VCOS_INLINE_DECL extern __inline__ -+# define VCOS_INLINE_DECL extern - # define VCOS_INLINE_IMPL static __inline__ - #else --# define VCOS_INLINE_DECL static _VCOS_INLINE /* declare a func */ -+# define VCOS_INLINE_DECL extern - # define VCOS_INLINE_IMPL static _VCOS_INLINE /* implement a func inline */ - #endif - ---- userland-fb11b39d97371c076eef7c85bbcab5733883a41e.orig/interface/vcos/pthreads/vcos_platform_types.h -+++ userland-fb11b39d97371c076eef7c85bbcab5733883a41e/interface/vcos/pthreads/vcos_platform_types.h -@@ -61,7 +61,7 @@ - #define VCOS_ASSERT_MSG(...) ((VCOS_ASSERT_LOGGING && !VCOS_ASSERT_LOGGING_DISABLE) ? vcos_pthreads_logging_assert(__FILE__, __func__, __LINE__, __VA_ARGS__) : (void)0) - - #define VCOS_INLINE_BODIES --#define VCOS_INLINE_DECL extern __inline__ -+#define VCOS_INLINE_DECL extern - #define VCOS_INLINE_IMPL static __inline__ - - #ifdef __cplusplus diff --git a/recipes-graphics/userland/userland/0002-fix-musl-build.patch b/recipes-graphics/userland/userland/0002-fix-musl-build.patch deleted file mode 100644 index 2fb11e7..0000000 --- a/recipes-graphics/userland/userland/0002-fix-musl-build.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- userland-d4aa617de3b196399bb8e2ce32e181768cb52179.orig/host_applications/linux/apps/raspicam/RaspiVidYUV.c -+++ userland-d4aa617de3b196399bb8e2ce32e181768cb52179/host_applications/linux/apps/raspicam/RaspiVidYUV.c -@@ -106,8 +106,6 @@ - /// Run/record forever - #define WAIT_METHOD_FOREVER 4 - --extern FILE *stderr, *stdout; -- - int mmal_status_to_int(MMAL_STATUS_T status); - static void signal_handler(int signal_number); - ---- userland-d4aa617de3b196399bb8e2ce32e181768cb52179.orig/host_applications/linux/libs/debug_sym/debug_sym.c -+++ userland-d4aa617de3b196399bb8e2ce32e181768cb52179/host_applications/linux/libs/debug_sym/debug_sym.c -@@ -67,6 +67,8 @@ - # else - # define PAGE_SIZE 4096 - # endif -+#endif -+#ifndef PAGE_MASK - #define PAGE_MASK (~(PAGE_SIZE - 1)) - #endif - diff --git a/recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch b/recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch new file mode 100644 index 0000000..bbb670d --- /dev/null +++ b/recipes-graphics/userland/userland/0002-musl-inspired-fixed.patch @@ -0,0 +1,29 @@ +From 9856330f54c181e388df6f261c705e01500cf0bb Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 6 Feb 2016 11:03:10 -0800 +Subject: [PATCH 02/16] musl inspired fixed + +stderr and stdout are not FILE pointers as per standards +define PAGE_MASK if its not defined already + +Signed-off-by: Khem Raj +--- + host_applications/linux/libs/debug_sym/debug_sym.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/host_applications/linux/libs/debug_sym/debug_sym.c b/host_applications/linux/libs/debug_sym/debug_sym.c +index 8886f99..c7ace37 100755 +--- a/host_applications/linux/libs/debug_sym/debug_sym.c ++++ b/host_applications/linux/libs/debug_sym/debug_sym.c +@@ -67,6 +67,8 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + # else + # define PAGE_SIZE 4096 + # endif ++#endif ++#ifndef PAGE_MASK + #define PAGE_MASK (~(PAGE_SIZE - 1)) + #endif + +-- +2.7.0 + diff --git a/recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch b/recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch deleted file mode 100644 index 1c981af..0000000 --- a/recipes-graphics/userland/userland/0002-set-VMCS_INSTALL_PREFIX-to-usr.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 05554d8486050546efc3c0605015786c8b267d19 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 9 Aug 2015 23:58:17 -0700 -Subject: [PATCH 1/2] set VMCS_INSTALL_PREFIX to /usr - -in OE we dont use /opt/vc but standard prefix - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - 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.1.4 - diff --git a/recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch b/recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch deleted file mode 100644 index c644d52..0000000 --- a/recipes-graphics/userland/userland/0003-cmake-generate-and-install-pkgconfig-files.patch +++ /dev/null @@ -1,114 +0,0 @@ -From ef43e09c2d13b88c2e92cffc94b68003afcb1f13 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 9 Aug 2015 23:59:32 -0700 -Subject: [PATCH 2/2] cmake: generate and install pkgconfig files - -many packages expect packageconfig support especially for detecting EGL -libraries. This patch helps in compiling those packages on RPi - -Signed-off-by: Khem Raj ---- -Upstream-Status: Submitted - CMakeLists.txt | 10 +++++++++- - pkgconfig/bcm_host.pc.in | 10 ++++++++++ - pkgconfig/egl.pc.in | 12 ++++++++++++ - pkgconfig/glesv2.pc.in | 12 ++++++++++++ - pkgconfig/vg.pc.in | 11 +++++++++++ - 5 files changed, 54 insertions(+), 1 deletion(-) - create mode 100644 pkgconfig/bcm_host.pc.in - create mode 100644 pkgconfig/egl.pc.in - create mode 100644 pkgconfig/glesv2.pc.in - create mode 100644 pkgconfig/vg.pc.in - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d8f776c..f15dc2b 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -105,6 +105,14 @@ set(vmcs_host_apps_VERSION_MAJOR 1) - set(vmcs_host_apps_VERSION_MINOR 0) - - include_directories("${PROJECT_BINARY_DIR}") -- -+include(FindPkgConfig QUIET) -+if(PKG_CONFIG_FOUND) -+ # Produce a pkg-config file -+ foreach(PCFILE bcm_host.pc egl.pc glesv2.pc vg.pc) -+ configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) -+ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -+ endforeach() -+endif() - # Remove cache entry, if one added by command line - unset(KHRONOS_EGL_PLATFORM CACHE) -diff --git a/pkgconfig/bcm_host.pc.in b/pkgconfig/bcm_host.pc.in -new file mode 100644 -index 0000000..c7237c5 ---- /dev/null -+++ b/pkgconfig/bcm_host.pc.in -@@ -0,0 +1,10 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: bcm_host -+Description: Broadcom VideoCore host API library -+Version: 1 -+Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm -pthread -+Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM -diff --git a/pkgconfig/egl.pc.in b/pkgconfig/egl.pc.in -new file mode 100644 -index 0000000..4e3d6ac ---- /dev/null -+++ b/pkgconfig/egl.pc.in -@@ -0,0 +1,12 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: EGL -+Description: Fake EGL package for RPi -+Version: 10 -+Requires: bcm_host -+Libs: -L${libdir} -lEGL -+Cflags: -I${includedir} -+ -diff --git a/pkgconfig/glesv2.pc.in b/pkgconfig/glesv2.pc.in -new file mode 100644 -index 0000000..5900225 ---- /dev/null -+++ b/pkgconfig/glesv2.pc.in -@@ -0,0 +1,12 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: GLESv2 -+Description: Fake GL ES 2 package for RPi -+Version: 10 -+Requires: bcm_host -+Libs: -L${libdir} -lGLESv2 -+Cflags: -I${includedir} -+ -diff --git a/pkgconfig/vg.pc.in b/pkgconfig/vg.pc.in -new file mode 100644 -index 0000000..8c39c98 ---- /dev/null -+++ b/pkgconfig/vg.pc.in -@@ -0,0 +1,11 @@ -+prefix=@CMAKE_INSTALL_PREFIX@ -+exec_prefix=${prefix} -+libdir=${exec_prefix}/lib -+includedir=${prefix}/include -+ -+Name: OpenVG -+Description: Fake OpenVG package for RPi -+Version: 10 -+Requires: bcm_host -+Libs: -L${libdir} -lOpenVG -+Cflags: -I${includedir} --- -2.1.4 - diff --git a/recipes-graphics/userland/userland/0003-fix-alloc-size-uninitialized.patch b/recipes-graphics/userland/userland/0003-fix-alloc-size-uninitialized.patch deleted file mode 100644 index 7dd6436..0000000 --- a/recipes-graphics/userland/userland/0003-fix-alloc-size-uninitialized.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/host_applications/linux/apps/smem/smem.c b/host_applications/linux/apps/smem/smem.c -index f780b79..618580e 100644 ---- a/host_applications/linux/apps/smem/smem.c -+++ b/host_applications/linux/apps/smem/smem.c -@@ -192,7 +192,7 @@ int main( int argc, char **argv ) - int opt; - int opt_alloc = 0; - int opt_status = 0; -- uint32_t alloc_size; -+ uint32_t alloc_size = 0; - int opt_pid = -1; - VCSM_STATUS_T status_mode = VCSM_STATUS_NONE; - diff --git a/recipes-graphics/userland/userland/0003-set-VMCS_INSTALL_PREFIX-to-usr.patch b/recipes-graphics/userland/userland/0003-set-VMCS_INSTALL_PREFIX-to-usr.patch new file mode 100644 index 0000000..2829196 --- /dev/null +++ b/recipes-graphics/userland/userland/0003-set-VMCS_INSTALL_PREFIX-to-usr.patch @@ -0,0 +1,28 @@ +From 8792a3645822c3ee2cea74def2a48e3e7f247ee1 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 9 Aug 2015 23:58:17 -0700 +Subject: [PATCH 03/16] 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.0 + diff --git a/recipes-graphics/userland/userland/0004-cmake-generate-and-install-pkgconfig-files.patch b/recipes-graphics/userland/userland/0004-cmake-generate-and-install-pkgconfig-files.patch new file mode 100644 index 0000000..aa209b2 --- /dev/null +++ b/recipes-graphics/userland/userland/0004-cmake-generate-and-install-pkgconfig-files.patch @@ -0,0 +1,114 @@ +From 59fd98d2ee9076c08d020167e5176e2e3e669917 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 9 Aug 2015 23:59:32 -0700 +Subject: [PATCH 04/17] cmake: generate and install pkgconfig files + +many packages expect packageconfig support especially for detecting EGL +libraries. This patch helps in compiling those packages on RPi + +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 10 +++++++++- + pkgconfig/bcm_host.pc.in | 10 ++++++++++ + pkgconfig/egl.pc.in | 13 +++++++++++++ + pkgconfig/glesv2.pc.in | 12 ++++++++++++ + pkgconfig/vg.pc.in | 11 +++++++++++ + 5 files changed, 55 insertions(+), 1 deletion(-) + create mode 100644 pkgconfig/bcm_host.pc.in + create mode 100644 pkgconfig/egl.pc.in + create mode 100644 pkgconfig/glesv2.pc.in + create mode 100644 pkgconfig/vg.pc.in + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d8f776c..f15dc2b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -105,6 +105,14 @@ set(vmcs_host_apps_VERSION_MAJOR 1) + set(vmcs_host_apps_VERSION_MINOR 0) + + include_directories("${PROJECT_BINARY_DIR}") +- ++include(FindPkgConfig QUIET) ++if(PKG_CONFIG_FOUND) ++ # Produce a pkg-config file ++ foreach(PCFILE bcm_host.pc egl.pc glesv2.pc vg.pc) ++ configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY) ++ install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}" ++ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") ++ endforeach() ++endif() + # Remove cache entry, if one added by command line + unset(KHRONOS_EGL_PLATFORM CACHE) +diff --git a/pkgconfig/bcm_host.pc.in b/pkgconfig/bcm_host.pc.in +new file mode 100644 +index 0000000..c7237c5 +--- /dev/null ++++ b/pkgconfig/bcm_host.pc.in +@@ -0,0 +1,10 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: bcm_host ++Description: Broadcom VideoCore host API library ++Version: 1 ++Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm -pthread ++Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM +diff --git a/pkgconfig/egl.pc.in b/pkgconfig/egl.pc.in +new file mode 100644 +index 0000000..27a6236 +--- /dev/null ++++ b/pkgconfig/egl.pc.in +@@ -0,0 +1,13 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: EGL ++Description: Fake EGL package for RPi ++Version: 10 ++Requires: bcm_host ++Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host -lvchostif ++Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux \ ++ -I${includedir}/interface/vcos/pthreads ++ +diff --git a/pkgconfig/glesv2.pc.in b/pkgconfig/glesv2.pc.in +new file mode 100644 +index 0000000..5900225 +--- /dev/null ++++ b/pkgconfig/glesv2.pc.in +@@ -0,0 +1,12 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: GLESv2 ++Description: Fake GL ES 2 package for RPi ++Version: 10 ++Requires: bcm_host ++Libs: -L${libdir} -lGLESv2 ++Cflags: -I${includedir} ++ +diff --git a/pkgconfig/vg.pc.in b/pkgconfig/vg.pc.in +new file mode 100644 +index 0000000..8c39c98 +--- /dev/null ++++ b/pkgconfig/vg.pc.in +@@ -0,0 +1,11 @@ ++prefix=@CMAKE_INSTALL_PREFIX@ ++exec_prefix=${prefix} ++libdir=${exec_prefix}/lib ++includedir=${prefix}/include ++ ++Name: OpenVG ++Description: Fake OpenVG package for RPi ++Version: 10 ++Requires: bcm_host ++Libs: -L${libdir} -lOpenVG ++Cflags: -I${includedir} +-- +2.7.1 + diff --git a/recipes-graphics/userland/userland_git.bb b/recipes-graphics/userland/userland_git.bb index 5bf4dda..4323228 100644 --- a/recipes-graphics/userland/userland_git.bb +++ b/recipes-graphics/userland/userland_git.bb @@ -2,8 +2,8 @@ DESCRIPTION = "This repository contains the source code for the ARM side \ libraries used on Raspberry Pi. These typically are installed in /opt/vc/lib \ and includes source for the ARM side code to interface to: EGL, mmal, GLESv2,\ vcos, openmaxil, vchiq_arm, bcm_host, WFC, OpenVG." -LICENSE = "Broadcom" -LIC_FILES_CHKSUM = "file://LICENCE;md5=957f6640d5e2d2acfce73a36a56cb32f" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENCE;md5=0448d6488ef8cc380632b1569ee6d196" PR = "r5" @@ -14,15 +14,14 @@ COMPATIBLE_MACHINE = "raspberrypi" SRCBRANCH = "master" SRCFORK = "raspberrypi" -SRCREV = "40e377862410371a9962db79b81fd4f0f266430a" +SRCREV = "2a4af2192c0e161555fdb2a12e902b587166c4a6" SRC_URI = "\ git://github.com/${SRCFORK}/userland.git;protocol=git;branch=${SRCBRANCH} \ - file://0001-fix-gcc-5.x-inlines.patch \ - file://0002-fix-musl-build.patch \ - file://0003-fix-alloc-size-uninitialized.patch \ - file://0002-set-VMCS_INSTALL_PREFIX-to-usr.patch \ - file://0003-cmake-generate-and-install-pkgconfig-files.patch \ + file://0001-Fix-VCOS_INLINE_DECL-to-not-use-extern-inlines-in-de.patch \ + file://0002-musl-inspired-fixed.patch \ + file://0003-set-VMCS_INSTALL_PREFIX-to-usr.patch \ + file://0004-cmake-generate-and-install-pkgconfig-files.patch \ " S = "${WORKDIR}/git" -- cgit v1.2.3-54-g00ecf