Attachment #214912 for bug #225053





PORTNAME=	raspberrypi-userland
PORTVERSION=	20161026
PORTREVISION=	1
CATEGORIES=	misc

MAINTAINER=	ports@FreeBSD.org


ONLY_FOR_ARCHS=	armv6 armv7

CONFLICTS_INSTALL=	libglvnd

USES=		cmake pkgconfig shebangfix

USE_LDCONFIG=	yes

		${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)

Added Link Here

(-)b/misc/raspberrypi-userland/files/10_rpi.json (+6 lines)
1	{
2	"file_format_version" : "1.0.0",
3	"ICD" : {
4	"library_path" : "libEGL_rpi.so.0"
5	}
6	}

Added Link Here

(-)b/misc/raspberrypi-userland/files/patch-host__applications_android_apps_vidtex_CMakeLists.txt (+10 lines)
1	Generic GL libraries may come from Mesa or libglvnd
2
3	--- host_applications/android/apps/vidtex/CMakeLists.txt.orig 2016-10-24 19:59:54 UTC
4	+++ host_applications/android/apps/vidtex/CMakeLists.txt
5	@@ -9,4 +9,4 @@ set (VIDTEX_SOURCES
6	svp.c
7	vidtex.c)
8	add_executable(vidtex ${VIDTEX_SOURCES})
9	-target_link_libraries(vidtex GLESv2 EGL m bcm_host mmal_core mmal_components mmal_util mmal_vc_client vcos)
10	+target_link_libraries(vidtex brcmGLESv2 brcmEGL m bcm_host mmal_core mmal_components mmal_util mmal_vc_client vcos)




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})




bin/vchiq_test
bin/vcmailbox
bin/vcsmem
@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
@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

include/IL/OMX_Other.h
include/IL/OMX_Types.h
include/IL/OMX_Video.h
@comment include/KHR/khrplatform.h
include/VG/openvg.h
include/VG/vgext.h
include/VG/vgplatform.h

include/vcinclude/common.h
include/vcinclude/vc_image_types.h
include/vcinclude/vcore.h
@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

libdata/pkgconfig/brcmegl.pc
libdata/pkgconfig/brcmglesv2.pc
libdata/pkgconfig/brcmvg.pc
@comment libdata/pkgconfig/egl.pc
@comment libdata/pkgconfig/glesv2.pc
libdata/pkgconfig/vg.pc
sbin/vcfiled
%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/CMakeLists.txt

%%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

Return to bug 225053

Lines 3-8 Link Here

(-)b/misc/raspberrypi-userland/Makefile (-2 / +6 lines)
3		3
4	PORTNAME= raspberrypi-userland	4	PORTNAME= raspberrypi-userland
5	PORTVERSION= 20161026	5	PORTVERSION= 20161026
		6	PORTREVISION= 1
6	CATEGORIES= misc	7	CATEGORIES= misc
7		8
8	MAINTAINER= ports@FreeBSD.org	9	MAINTAINER= ports@FreeBSD.org
Lines 12-19 LICENSE= BSD3CLAUSE Link Here
12		13
13	ONLY_FOR_ARCHS= armv6 armv7	14	ONLY_FOR_ARCHS= armv6 armv7
14		15
15	CONFLICTS_INSTALL= libglvnd
16
17	USES= cmake pkgconfig shebangfix	16	USES= cmake pkgconfig shebangfix
18		17
19	USE_LDCONFIG= yes	18	USE_LDCONFIG= yes
Lines 58-63 post-patch: Link Here
58	${WRKSRC}/host_applications/linux/apps/hello_pi/${file}	57	${WRKSRC}/host_applications/linux/apps/hello_pi/${file}
59	.endfor	58	.endfor
60		59
		60	post-install:
		61	${MKDIR} ${STAGEDIR}${PREFIX}/share/glvnd/egl_vendor.d
		62	${INSTALL_DATA} ${FILESDIR}/10_rpi.json \
		63	${STAGEDIR}${PREFIX}/share/glvnd/egl_vendor.d
		64
61	post-install-EXAMPLES-on:	65	post-install-EXAMPLES-on:
62	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}	66	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
63	@(cd ${WRKSRC}/host_applications/linux/apps/hello_pi && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/hello_pi)	67	@(cd ${WRKSRC}/host_applications/linux/apps/hello_pi && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/hello_pi)

Added Link Here

(-)b/misc/raspberrypi-userland/files/patch-interface_khronos_CMakeLists.txt (+43 lines)
1	libglvnd expects vendor suffix after GL name
2
3	--- interface/khronos/CMakeLists.txt.orig 2016-10-24 19:59:54 UTC
4	+++ interface/khronos/CMakeLists.txt
5	@@ -54,25 +54,28 @@ set(CLIENT_SOURCE
6	common/khrn_int_hash.c
7	common/khrn_client_cache.c)
8
9	-add_library(EGL ${SHARED} ${EGL_SOURCE})
10	-add_library(GLESv2 ${SHARED} ${GLES_SOURCE})
11	+add_library(EGL_rpi ${SHARED} ${EGL_SOURCE})
12	+add_library(GLESv2_rpi ${SHARED} ${GLES_SOURCE})
13	add_library(OpenVG ${SHARED} ${VG_SOURCE})
14	add_library(WFC ${SHARED} ${WFC_SOURCE})
15	add_library(khrn_client ${CLIENT_SOURCE})
16
17	+set_target_properties(EGL_rpi PROPERTIES SOVERSION 0)
18	+set_target_properties(GLESv2_rpi PROPERTIES SOVERSION 0)
19	+
20	# TODO do we need EGL_static and GLESv2_static now that khrn_static exists?
21	-add_library(EGL_static STATIC ${EGL_SOURCE})
22	-add_library(GLESv2_static STATIC ${GLES_SOURCE})
23	+add_library(brcmEGL_static STATIC ${EGL_SOURCE})
24	+add_library(brcmGLESv2_static STATIC ${GLES_SOURCE})
25	add_library(khrn_static STATIC
26	${EGL_SOURCE} ${GLES_SOURCE} ${VG_SOURCE} ${WFC_SOURCE} ${CLIENT_SOURCE})
27
28	-target_link_libraries(EGL khrn_client vchiq_arm vcos bcm_host -lm)
29	-target_link_libraries(GLESv2 EGL khrn_client vcos)
30	-target_link_libraries(WFC EGL)
31	-target_link_libraries(OpenVG EGL)
32	+target_link_libraries(EGL_rpi khrn_client vchiq_arm vcos bcm_host -lm)
33	+target_link_libraries(GLESv2_rpi EGL_rpi khrn_client vcos)
34	+target_link_libraries(WFC EGL_rpi)
35	+target_link_libraries(OpenVG EGL_rpi)
36
37	-install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib)
38	-install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib)
39	+install(TARGETS EGL_rpi GLESv2_rpi OpenVG WFC khrn_client DESTINATION lib)
40	+install(TARGETS brcmEGL_static brcmGLESv2_static khrn_static DESTINATION lib)
41
42	# recommended names to use to avoid conflicts with mesa libs
43	add_library(brcmEGL ${SHARED} ${EGL_SOURCE})

Lines 24-41 bin/vcgencmd Link Here

(-)b/misc/raspberrypi-userland/pkg-plist (-16 / +21 lines)
24	bin/vchiq_test	24	bin/vchiq_test
25	bin/vcmailbox	25	bin/vcmailbox
26	bin/vcsmem	26	bin/vcsmem
27	include/EGL/egl.h	27	@comment include/EGL/egl.h
28	include/EGL/eglext.h	28	@comment include/EGL/eglext.h
29	include/EGL/eglext_android.h	29	include/EGL/eglext_android.h
30	include/EGL/eglext_brcm.h	30	include/EGL/eglext_brcm.h
31	include/EGL/eglext_nvidia.h	31	include/EGL/eglext_nvidia.h
32	include/EGL/eglplatform.h	32	@comment include/EGL/eglplatform.h
33	include/GLES/gl.h	33	@comment include/GLES/gl.h
34	include/GLES/glext.h	34	@comment include/GLES/glext.h
35	include/GLES/glplatform.h	35	@comment include/GLES/glplatform.h
36	include/GLES2/gl2.h	36	@comment include/GLES2/gl2.h
37	include/GLES2/gl2ext.h	37	@comment include/GLES2/gl2ext.h
38	include/GLES2/gl2platform.h	38	@comment include/GLES2/gl2platform.h
39	include/IL/OMX_Audio.h	39	include/IL/OMX_Audio.h
40	include/IL/OMX_Broadcom.h	40	include/IL/OMX_Broadcom.h
41	include/IL/OMX_Component.h	41	include/IL/OMX_Component.h
Lines 47-53 include/IL/OMX_Index.h Link Here
47	include/IL/OMX_Other.h	47	include/IL/OMX_Other.h
48	include/IL/OMX_Types.h	48	include/IL/OMX_Types.h
49	include/IL/OMX_Video.h	49	include/IL/OMX_Video.h
50	include/KHR/khrplatform.h	50	@comment include/KHR/khrplatform.h
51	include/VG/openvg.h	51	include/VG/openvg.h
52	include/VG/vgext.h	52	include/VG/vgext.h
53	include/VG/vgplatform.h	53	include/VG/vgplatform.h
Lines 217-231 include/interface/vmcs_host/vcilcs_common.h Link Here
217	include/vcinclude/common.h	217	include/vcinclude/common.h
218	include/vcinclude/vc_image_types.h	218	include/vcinclude/vc_image_types.h
219	include/vcinclude/vcore.h	219	include/vcinclude/vcore.h
220	lib/libEGL.so	220	@comment lib/libEGL.so
221	lib/libEGL_static.a	221	lib/libEGL_rpi.so
222	lib/libGLESv2.so	222	lib/libEGL_rpi.so.0
223	lib/libGLESv2_static.a	223	@comment lib/libGLESv2.so
		224	lib/libGLESv2_rpi.so
		225	lib/libGLESv2_rpi.so.0
224	lib/libOpenVG.so	226	lib/libOpenVG.so
225	lib/libWFC.so	227	lib/libWFC.so
226	lib/libbcm_host.so	228	lib/libbcm_host.so
227	lib/libbrcmEGL.so	229	lib/libbrcmEGL.so
		230	lib/libbrcmEGL_static.a
228	lib/libbrcmGLESv2.so	231	lib/libbrcmGLESv2.so
		232	lib/libbrcmGLESv2_static.a
229	lib/libbrcmOpenVG.so	233	lib/libbrcmOpenVG.so
230	lib/libbrcmWFC.so	234	lib/libbrcmWFC.so
231	lib/libcontainers.so	235	lib/libcontainers.so
Lines 274-281 libdata/pkgconfig/bcm_host.pc Link Here
274	libdata/pkgconfig/brcmegl.pc	278	libdata/pkgconfig/brcmegl.pc
275	libdata/pkgconfig/brcmglesv2.pc	279	libdata/pkgconfig/brcmglesv2.pc
276	libdata/pkgconfig/brcmvg.pc	280	libdata/pkgconfig/brcmvg.pc
277	libdata/pkgconfig/egl.pc	281	@comment libdata/pkgconfig/egl.pc
278	libdata/pkgconfig/glesv2.pc	282	@comment libdata/pkgconfig/glesv2.pc
279	libdata/pkgconfig/vg.pc	283	libdata/pkgconfig/vg.pc
280	sbin/vcfiled	284	sbin/vcfiled
281	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/CMakeLists.txt	285	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/CMakeLists.txt
Lines 403-408 sbin/vcfiled Link Here
403	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/libs/vgfont/vgft.c	407	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/libs/vgfont/vgft.c
404	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/libs/vgfont/vgft.h	408	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/libs/vgfont/vgft.h
405	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/rebuild.sh	409	%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/rebuild.sh
		410	share/glvnd/egl_vendor.d/10_rpi.json
406	share/install/vcfiled	411	share/install/vcfiled
407	@dir include/interface/vcos/glibc	412	@dir include/interface/vcos/glibc
408	@dir include/interface/vmcs_host/linux/vcfiled/etc/init.d	413	@dir include/interface/vmcs_host/linux/vcfiled/etc/init.d