Attachment 214912 Details for Bug 225053 – (naive) libglvnd support

[patch] (naive) libglvnd support

rpi.glvnd.diff (text/plain), 7.62 KB, created by Jan Beich on 2020-05-27 11:35:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2020-05-27 11:35:41 UTC

Size: 7.62 KB

patch

obsolete

>From 0d8d9d0c957497abbc414a371b1e87c5eccd9d66 Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Wed, 27 May 2020 11:05:36 +0000
>Subject: [PATCH] misc/raspberrypi-userland: adapt to libglvnd
>
>PR:		225053
>---
> misc/raspberrypi-userland/Makefile            |  8 +++-
> misc/raspberrypi-userland/files/10_rpi.json   |  6 +++
> ...cations_android_apps_vidtex_CMakeLists.txt | 10 +++++
> .../patch-interface_khronos_CMakeLists.txt    | 43 +++++++++++++++++++
> misc/raspberrypi-userland/pkg-plist           | 37 +++++++++-------
> 5 files changed, 86 insertions(+), 18 deletions(-)
> create mode 100644 misc/raspberrypi-userland/files/10_rpi.json
> create mode 100644 misc/raspberrypi-userland/files/patch-host__applications_android_apps_vidtex_CMakeLists.txt
> create mode 100644 misc/raspberrypi-userland/files/patch-interface_khronos_CMakeLists.txt
>
>diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
>index debc068232e6..92c3df142375 100644
>--- a/misc/raspberrypi-userland/Makefile
>+++ b/misc/raspberrypi-userland/Makefile
>@@ -3,6 +3,7 @@
> 
> PORTNAME=	raspberrypi-userland
> PORTVERSION=	20161026
>+PORTREVISION=	1
> CATEGORIES=	misc
> 
> MAINTAINER=	ports@FreeBSD.org
>@@ -12,8 +13,6 @@ LICENSE=	BSD3CLAUSE
> 
> ONLY_FOR_ARCHS=	armv6 armv7
> 
>-CONFLICTS_INSTALL=	libglvnd
>-
> USES=		cmake pkgconfig shebangfix
> 
> USE_LDCONFIG=	yes
>@@ -58,6 +57,11 @@ post-patch:
> 		${WRKSRC}/host_applications/linux/apps/hello_pi/${file}
> .endfor
> 
>+post-install:
>+	${MKDIR} ${STAGEDIR}${PREFIX}/share/glvnd/egl_vendor.d
>+	${INSTALL_DATA} ${FILESDIR}/10_rpi.json \
>+		${STAGEDIR}${PREFIX}/share/glvnd/egl_vendor.d
>+
> post-install-EXAMPLES-on:
> 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
> 	@(cd ${WRKSRC}/host_applications/linux/apps/hello_pi && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/hello_pi)
>diff --git a/misc/raspberrypi-userland/files/10_rpi.json b/misc/raspberrypi-userland/files/10_rpi.json
>new file mode 100644
>index 000000000000..05f8d03b26c7
>--- /dev/null
>+++ b/misc/raspberrypi-userland/files/10_rpi.json
>@@ -0,0 +1,6 @@
>+{
>+    "file_format_version" : "1.0.0",
>+    "ICD" : {
>+        "library_path" : "libEGL_rpi.so.0"
>+    }
>+}
>diff --git a/misc/raspberrypi-userland/files/patch-host__applications_android_apps_vidtex_CMakeLists.txt b/misc/raspberrypi-userland/files/patch-host__applications_android_apps_vidtex_CMakeLists.txt
>new file mode 100644
>index 000000000000..34b15176cffd
>--- /dev/null
>+++ b/misc/raspberrypi-userland/files/patch-host__applications_android_apps_vidtex_CMakeLists.txt
>@@ -0,0 +1,10 @@
>+Generic GL libraries may come from Mesa or libglvnd
>+
>+--- host_applications/android/apps/vidtex/CMakeLists.txt.orig	2016-10-24 19:59:54 UTC
>++++ host_applications/android/apps/vidtex/CMakeLists.txt
>+@@ -9,4 +9,4 @@ set (VIDTEX_SOURCES
>+    svp.c
>+    vidtex.c)
>+ add_executable(vidtex ${VIDTEX_SOURCES})
>+-target_link_libraries(vidtex GLESv2 EGL m bcm_host mmal_core mmal_components mmal_util mmal_vc_client vcos)
>++target_link_libraries(vidtex brcmGLESv2 brcmEGL m bcm_host mmal_core mmal_components mmal_util mmal_vc_client vcos)
>diff --git a/misc/raspberrypi-userland/files/patch-interface_khronos_CMakeLists.txt b/misc/raspberrypi-userland/files/patch-interface_khronos_CMakeLists.txt
>new file mode 100644
>index 000000000000..7704dc785169
>--- /dev/null
>+++ b/misc/raspberrypi-userland/files/patch-interface_khronos_CMakeLists.txt
>@@ -0,0 +1,43 @@
>+libglvnd expects vendor suffix after GL name
>+
>+--- interface/khronos/CMakeLists.txt.orig	2016-10-24 19:59:54 UTC
>++++ interface/khronos/CMakeLists.txt
>+@@ -54,25 +54,28 @@ set(CLIENT_SOURCE
>+    common/khrn_int_hash.c
>+    common/khrn_client_cache.c)
>+ 
>+-add_library(EGL ${SHARED} ${EGL_SOURCE})
>+-add_library(GLESv2 ${SHARED} ${GLES_SOURCE})
>++add_library(EGL_rpi ${SHARED} ${EGL_SOURCE})
>++add_library(GLESv2_rpi ${SHARED} ${GLES_SOURCE})
>+ add_library(OpenVG ${SHARED} ${VG_SOURCE})
>+ add_library(WFC ${SHARED} ${WFC_SOURCE})
>+ add_library(khrn_client ${CLIENT_SOURCE})
>+ 
>++set_target_properties(EGL_rpi PROPERTIES SOVERSION 0)
>++set_target_properties(GLESv2_rpi PROPERTIES SOVERSION 0)
>++
>+ # TODO do we need EGL_static and GLESv2_static now that khrn_static exists?
>+-add_library(EGL_static STATIC ${EGL_SOURCE})
>+-add_library(GLESv2_static STATIC ${GLES_SOURCE})
>++add_library(brcmEGL_static STATIC ${EGL_SOURCE})
>++add_library(brcmGLESv2_static STATIC ${GLES_SOURCE})
>+ add_library(khrn_static STATIC
>+    ${EGL_SOURCE} ${GLES_SOURCE} ${VG_SOURCE} ${WFC_SOURCE} ${CLIENT_SOURCE})
>+ 
>+-target_link_libraries(EGL khrn_client vchiq_arm vcos bcm_host -lm)
>+-target_link_libraries(GLESv2 EGL khrn_client vcos)
>+-target_link_libraries(WFC EGL)
>+-target_link_libraries(OpenVG EGL)
>++target_link_libraries(EGL_rpi khrn_client vchiq_arm vcos bcm_host -lm)
>++target_link_libraries(GLESv2_rpi EGL_rpi khrn_client vcos)
>++target_link_libraries(WFC EGL_rpi)
>++target_link_libraries(OpenVG EGL_rpi)
>+ 
>+-install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib)
>+-install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib)
>++install(TARGETS EGL_rpi GLESv2_rpi OpenVG WFC khrn_client DESTINATION lib)
>++install(TARGETS brcmEGL_static brcmGLESv2_static khrn_static DESTINATION lib)
>+ 
>+ # recommended names to use to avoid conflicts with mesa libs
>+ add_library(brcmEGL ${SHARED} ${EGL_SOURCE})
>diff --git a/misc/raspberrypi-userland/pkg-plist b/misc/raspberrypi-userland/pkg-plist
>index d4223846ab71..e419216a9968 100644
>--- a/misc/raspberrypi-userland/pkg-plist
>+++ b/misc/raspberrypi-userland/pkg-plist
>@@ -24,18 +24,18 @@ bin/vcgencmd
> bin/vchiq_test
> bin/vcmailbox
> bin/vcsmem
>-include/EGL/egl.h
>-include/EGL/eglext.h
>+@comment include/EGL/egl.h
>+@comment include/EGL/eglext.h
> include/EGL/eglext_android.h
> include/EGL/eglext_brcm.h
> include/EGL/eglext_nvidia.h
>-include/EGL/eglplatform.h
>-include/GLES/gl.h
>-include/GLES/glext.h
>-include/GLES/glplatform.h
>-include/GLES2/gl2.h
>-include/GLES2/gl2ext.h
>-include/GLES2/gl2platform.h
>+@comment include/EGL/eglplatform.h
>+@comment include/GLES/gl.h
>+@comment include/GLES/glext.h
>+@comment include/GLES/glplatform.h
>+@comment include/GLES2/gl2.h
>+@comment include/GLES2/gl2ext.h
>+@comment include/GLES2/gl2platform.h
> include/IL/OMX_Audio.h
> include/IL/OMX_Broadcom.h
> include/IL/OMX_Component.h
>@@ -47,7 +47,7 @@ include/IL/OMX_Index.h
> include/IL/OMX_Other.h
> include/IL/OMX_Types.h
> include/IL/OMX_Video.h
>-include/KHR/khrplatform.h
>+@comment include/KHR/khrplatform.h
> include/VG/openvg.h
> include/VG/vgext.h
> include/VG/vgplatform.h
>@@ -217,15 +217,19 @@ include/interface/vmcs_host/vcilcs_common.h
> include/vcinclude/common.h
> include/vcinclude/vc_image_types.h
> include/vcinclude/vcore.h
>-lib/libEGL.so
>-lib/libEGL_static.a
>-lib/libGLESv2.so
>-lib/libGLESv2_static.a
>+@comment lib/libEGL.so
>+lib/libEGL_rpi.so
>+lib/libEGL_rpi.so.0
>+@comment lib/libGLESv2.so
>+lib/libGLESv2_rpi.so
>+lib/libGLESv2_rpi.so.0
> lib/libOpenVG.so
> lib/libWFC.so
> lib/libbcm_host.so
> lib/libbrcmEGL.so
>+lib/libbrcmEGL_static.a
> lib/libbrcmGLESv2.so
>+lib/libbrcmGLESv2_static.a
> lib/libbrcmOpenVG.so
> lib/libbrcmWFC.so
> lib/libcontainers.so
>@@ -274,8 +278,8 @@ libdata/pkgconfig/bcm_host.pc
> libdata/pkgconfig/brcmegl.pc
> libdata/pkgconfig/brcmglesv2.pc
> libdata/pkgconfig/brcmvg.pc
>-libdata/pkgconfig/egl.pc
>-libdata/pkgconfig/glesv2.pc
>+@comment libdata/pkgconfig/egl.pc
>+@comment libdata/pkgconfig/glesv2.pc
> libdata/pkgconfig/vg.pc
> sbin/vcfiled
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/CMakeLists.txt
>@@ -403,6 +407,7 @@ sbin/vcfiled
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/libs/vgfont/vgft.c
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/libs/vgfont/vgft.h
> %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/rebuild.sh
>+share/glvnd/egl_vendor.d/10_rpi.json
> share/install/vcfiled
> @dir include/interface/vcos/glibc
> @dir include/interface/vmcs_host/linux/vcfiled/etc/init.d

Actions: View | Diff

Attachments on bug 225053: 205725 | 214912 | 234432