git: 20a2ff573498 - main - misc/raspberrypi-userland: Avoid CONFLICTS with mesa-libs

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Thu, 16 Jun 2022 14:08:11 UTC
The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=20a2ff573498fb0c81360ca7f032ce7d5fb4e980

commit 20a2ff573498fb0c81360ca7f032ce7d5fb4e980
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-06-16 14:02:34 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-06-16 14:02:34 +0000

    misc/raspberrypi-userland: Avoid CONFLICTS with mesa-libs
    
    - Bump PORTREVISION for package change
    
    PR:             225053
    Submitted by:   Robert Clausecker <fuz@fuz.su>
---
 misc/raspberrypi-userland/Makefile                |  15 +-
 misc/raspberrypi-userland/pkg-message             |   3 +
 misc/raspberrypi-userland/pkg-plist               | 566 +++++++++++-----------
 multimedia/libcec/Makefile                        |   3 +-
 multimedia/omxplayer/Makefile                     |   2 +-
 multimedia/omxplayer/files/patch-Makefile         |   4 +-
 multimedia/omxplayer/files/patch-Makefile.include |   4 +-
 7 files changed, 300 insertions(+), 297 deletions(-)

diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index 9060c401731a..16a3ab38a667 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	raspberrypi-userland
 PORTVERSION=	20161026
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	misc
 
 MAINTAINER=	ports@FreeBSD.org
@@ -12,18 +12,16 @@ LICENSE=	BSD3CLAUSE
 
 ONLY_FOR_ARCHS=	armv6 armv7
 
-CONFLICTS_INSTALL=	libglvnd
+USES=		cmake:noninja pkgconfig shebangfix
 
-USES=		cmake pkgconfig shebangfix
-
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/share/vc/lib
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	gonzoua
 GH_PROJECT=	userland
 GH_TAGNAME=	e143b48
 
-CMAKE_ARGS+=	-DVMCS_INSTALL_PREFIX=${PREFIX} \
+CMAKE_ARGS+=	-DVMCS_INSTALL_PREFIX=${PREFIX}/share/vc \
 		-DCMAKE_TOOLCHAIN_FILE=${WRKSRC}/makefiles/cmake/toolchains/arm-freebsd.cmake
 SHEBANG_FILES=	host_applications/linux/apps/dtoverlay/dtoverlay-post \
 		host_applications/linux/apps/dtoverlay/dtoverlay-pre
@@ -37,7 +35,7 @@ DEBUG_CFLAGS_OFF=	-DNDEBUG
 LLD_UNSAFE=	yes
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/opt/vc|${PREFIX}|g" \
+	@${REINPLACE_CMD} -e "s|/opt/vc|${PREFIX}/share/vc|g" \
 		${WRKSRC}/makefiles/cmake/vmcs.cmake \
 		${WRKSRC}/host_applications/linux/apps/hello_pi/Makefile.include
 	@${REINPLACE_CMD} -e "s|CMAKE_C_COMPILER cc|CMAKE_C_COMPILER ${CC}|g" \
@@ -60,6 +58,7 @@ post-patch:
 
 post-install-EXAMPLES-on:
 	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-	@(cd ${WRKSRC}/host_applications/linux/apps/hello_pi && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/hello_pi)
+	(cd ${WRKSRC}/host_applications/linux/apps/hello_pi && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}/hello_pi)
+	${FIND} ${STAGEDIR}${EXAMPLESDIR}/hello_pi \( -name \*.bak -o -name \*.orig \) -delete
 
 .include <bsd.port.mk>
diff --git a/misc/raspberrypi-userland/pkg-message b/misc/raspberrypi-userland/pkg-message
new file mode 100644
index 000000000000..94d8c068782e
--- /dev/null
+++ b/misc/raspberrypi-userland/pkg-message
@@ -0,0 +1,3 @@
+Don't forget to include the path ${LOCALBASE}/share/vc/lib in the
+environment variable LD_LIBRARY_PATH so other ports can use these
+libs.
diff --git a/misc/raspberrypi-userland/pkg-plist b/misc/raspberrypi-userland/pkg-plist
index d4223846ab71..db4471c6c79b 100644
--- a/misc/raspberrypi-userland/pkg-plist
+++ b/misc/raspberrypi-userland/pkg-plist
@@ -1,283 +1,3 @@
-bin/containers_check_frame_int
-bin/containers_datagram_receiver
-bin/containers_datagram_sender
-bin/containers_dump_pktfile
-bin/containers_rtp_decoder
-bin/containers_stream_client
-bin/containers_stream_server
-bin/containers_test
-bin/containers_test_bits
-bin/containers_test_uri
-bin/containers_uri_pipe
-bin/dtmerge
-bin/dtoverlay
-bin/dtoverlay-post
-bin/dtoverlay-pre
-bin/dtparam
-bin/mmal_vc_diag
-bin/raspistill
-bin/raspivid
-bin/raspividyuv
-bin/raspiyuv
-bin/tvservice
-bin/vcgencmd
-bin/vchiq_test
-bin/vcmailbox
-bin/vcsmem
-include/EGL/egl.h
-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
-include/IL/OMX_Audio.h
-include/IL/OMX_Broadcom.h
-include/IL/OMX_Component.h
-include/IL/OMX_Core.h
-include/IL/OMX_ILCS.h
-include/IL/OMX_IVCommon.h
-include/IL/OMX_Image.h
-include/IL/OMX_Index.h
-include/IL/OMX_Other.h
-include/IL/OMX_Types.h
-include/IL/OMX_Video.h
-include/KHR/khrplatform.h
-include/VG/openvg.h
-include/VG/vgext.h
-include/VG/vgplatform.h
-include/VG/vgu.h
-include/WF/wfc.h
-include/WF/wfcplatform.h
-include/bcm_host.h
-include/interface/mmal/core/mmal_buffer_private.h
-include/interface/mmal/core/mmal_clock_private.h
-include/interface/mmal/core/mmal_component_private.h
-include/interface/mmal/core/mmal_core_private.h
-include/interface/mmal/core/mmal_events_private.h
-include/interface/mmal/core/mmal_port_private.h
-include/interface/mmal/mmal.h
-include/interface/mmal/mmal_buffer.h
-include/interface/mmal/mmal_clock.h
-include/interface/mmal/mmal_common.h
-include/interface/mmal/mmal_component.h
-include/interface/mmal/mmal_encodings.h
-include/interface/mmal/mmal_events.h
-include/interface/mmal/mmal_format.h
-include/interface/mmal/mmal_logging.h
-include/interface/mmal/mmal_metadata.h
-include/interface/mmal/mmal_parameters.h
-include/interface/mmal/mmal_parameters_audio.h
-include/interface/mmal/mmal_parameters_camera.h
-include/interface/mmal/mmal_parameters_clock.h
-include/interface/mmal/mmal_parameters_common.h
-include/interface/mmal/mmal_parameters_video.h
-include/interface/mmal/mmal_pool.h
-include/interface/mmal/mmal_port.h
-include/interface/mmal/mmal_queue.h
-include/interface/mmal/mmal_types.h
-include/interface/mmal/util/mmal_component_wrapper.h
-include/interface/mmal/util/mmal_connection.h
-include/interface/mmal/util/mmal_default_components.h
-include/interface/mmal/util/mmal_graph.h
-include/interface/mmal/util/mmal_il.h
-include/interface/mmal/util/mmal_list.h
-include/interface/mmal/util/mmal_param_convert.h
-include/interface/mmal/util/mmal_util.h
-include/interface/mmal/util/mmal_util_params.h
-include/interface/mmal/util/mmal_util_rational.h
-include/interface/mmal/vc/mmal_vc_api.h
-include/interface/mmal/vc/mmal_vc_api_drm.h
-include/interface/mmal/vc/mmal_vc_client_priv.h
-include/interface/mmal/vc/mmal_vc_msgnames.h
-include/interface/mmal/vc/mmal_vc_msgs.h
-include/interface/mmal/vc/mmal_vc_opaque_alloc.h
-include/interface/mmal/vc/mmal_vc_shm.h
-include/interface/vchi/common/endian.h
-include/interface/vchi/connections/connection.h
-include/interface/vchi/message_drivers/message.h
-include/interface/vchi/vchi.h
-include/interface/vchi/vchi_cfg.h
-include/interface/vchi/vchi_cfg_internal.h
-include/interface/vchi/vchi_common.h
-include/interface/vchi/vchi_mh.h
-include/interface/vchiq_arm/vchiq.h
-include/interface/vchiq_arm/vchiq_cfg.h
-include/interface/vchiq_arm/vchiq_if.h
-include/interface/vchiq_arm/vchiq_ioctl.h
-include/interface/vchiq_arm/vchiq_test.h
-include/interface/vchiq_arm/vchiq_test_if.h
-include/interface/vchiq_arm/vchiq_util.h
-include/interface/vcos/generic/vcos_common.h
-include/interface/vcos/generic/vcos_deprecated.h
-include/interface/vcos/generic/vcos_generic_blockpool.h
-include/interface/vcos/generic/vcos_generic_event_flags.h
-include/interface/vcos/generic/vcos_generic_named_sem.h
-include/interface/vcos/generic/vcos_generic_quickslow_mutex.h
-include/interface/vcos/generic/vcos_generic_reentrant_mtx.h
-include/interface/vcos/generic/vcos_generic_tls.h
-include/interface/vcos/generic/vcos_joinable_thread_from_plain.h
-include/interface/vcos/generic/vcos_latch_from_sem.h
-include/interface/vcos/generic/vcos_mem_from_malloc.h
-include/interface/vcos/generic/vcos_mutexes_are_reentrant.h
-include/interface/vcos/generic/vcos_thread_reaper.h
-include/interface/vcos/pthreads/vcos_futex_mutex.h
-include/interface/vcos/pthreads/vcos_platform.h
-include/interface/vcos/pthreads/vcos_platform_types.h
-include/interface/vcos/user_nodefs.h
-include/interface/vcos/vcos.h
-include/interface/vcos/vcos_assert.h
-include/interface/vcos/vcos_atomic_flags.h
-include/interface/vcos/vcos_attr.h
-include/interface/vcos/vcos_blockpool.h
-include/interface/vcos/vcos_build_info.h
-include/interface/vcos/vcos_cfg.h
-include/interface/vcos/vcos_cmd.h
-include/interface/vcos/vcos_ctype.h
-include/interface/vcos/vcos_dlfcn.h
-include/interface/vcos/vcos_event.h
-include/interface/vcos/vcos_event_flags.h
-include/interface/vcos/vcos_init.h
-include/interface/vcos/vcos_inttypes.h
-include/interface/vcos/vcos_isr.h
-include/interface/vcos/vcos_legacy_isr.h
-include/interface/vcos/vcos_logging.h
-include/interface/vcos/vcos_logging_control.h
-include/interface/vcos/vcos_lowlevel_thread.h
-include/interface/vcos/vcos_mem.h
-include/interface/vcos/vcos_mempool.h
-include/interface/vcos/vcos_msgqueue.h
-include/interface/vcos/vcos_mutex.h
-include/interface/vcos/vcos_named_semaphore.h
-include/interface/vcos/vcos_once.h
-include/interface/vcos/vcos_queue.h
-include/interface/vcos/vcos_quickslow_mutex.h
-include/interface/vcos/vcos_reentrant_mutex.h
-include/interface/vcos/vcos_semaphore.h
-include/interface/vcos/vcos_stdbool.h
-include/interface/vcos/vcos_stdint.h
-include/interface/vcos/vcos_string.h
-include/interface/vcos/vcos_thread.h
-include/interface/vcos/vcos_thread_attr.h
-include/interface/vcos/vcos_timer.h
-include/interface/vcos/vcos_tls.h
-include/interface/vcos/vcos_types.h
-include/interface/vctypes/vc_display_types.h
-include/interface/vctypes/vc_image_types.h
-include/interface/vmcs_host/khronos/IL/OMX_Audio.h
-include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
-include/interface/vmcs_host/khronos/IL/OMX_Component.h
-include/interface/vmcs_host/khronos/IL/OMX_Core.h
-include/interface/vmcs_host/khronos/IL/OMX_ILCS.h
-include/interface/vmcs_host/khronos/IL/OMX_IVCommon.h
-include/interface/vmcs_host/khronos/IL/OMX_Image.h
-include/interface/vmcs_host/khronos/IL/OMX_Index.h
-include/interface/vmcs_host/khronos/IL/OMX_Other.h
-include/interface/vmcs_host/khronos/IL/OMX_Types.h
-include/interface/vmcs_host/khronos/IL/OMX_Video.h
-include/interface/vmcs_host/linux/vcfiled/vcfiled_check.h
-include/interface/vmcs_host/linux/vchost_config.h
-include/interface/vmcs_host/vc_cec.h
-include/interface/vmcs_host/vc_cecservice.h
-include/interface/vmcs_host/vc_cecservice_defs.h
-include/interface/vmcs_host/vc_cma.h
-include/interface/vmcs_host/vc_dispmanx.h
-include/interface/vmcs_host/vc_dispmanx_types.h
-include/interface/vmcs_host/vc_dispservice_defs.h
-include/interface/vmcs_host/vc_dispservice_x_defs.h
-include/interface/vmcs_host/vc_fileservice_defs.h
-include/interface/vmcs_host/vc_gencmd_defs.h
-include/interface/vmcs_host/vc_hdmi.h
-include/interface/vmcs_host/vc_hdmi_property.h
-include/interface/vmcs_host/vc_ilcs_defs.h
-include/interface/vmcs_host/vc_imageconv_defs.h
-include/interface/vmcs_host/vc_sdtv.h
-include/interface/vmcs_host/vc_service_common.h
-include/interface/vmcs_host/vc_tvservice.h
-include/interface/vmcs_host/vc_tvservice_defs.h
-include/interface/vmcs_host/vc_vchi_audioserv_defs.h
-include/interface/vmcs_host/vc_vchi_bufman.h
-include/interface/vmcs_host/vc_vchi_bufman_defs.h
-include/interface/vmcs_host/vc_vchi_dispmanx.h
-include/interface/vmcs_host/vc_vchi_fileservice_defs.h
-include/interface/vmcs_host/vc_vchi_filesys.h
-include/interface/vmcs_host/vc_vchi_gencmd.h
-include/interface/vmcs_host/vcfilesys.h
-include/interface/vmcs_host/vcfilesys_defs.h
-include/interface/vmcs_host/vcgencmd.h
-include/interface/vmcs_host/vchost.h
-include/interface/vmcs_host/vchost_platform_config.h
-include/interface/vmcs_host/vcilcs.h
-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
-lib/libOpenVG.so
-lib/libWFC.so
-lib/libbcm_host.so
-lib/libbrcmEGL.so
-lib/libbrcmGLESv2.so
-lib/libbrcmOpenVG.so
-lib/libbrcmWFC.so
-lib/libcontainers.so
-lib/libdebug_sym.so
-lib/libdebug_sym_static.a
-lib/libdtovl.so
-lib/libkhrn_client.a
-lib/libkhrn_static.a
-lib/libmmal.so
-lib/libmmal_components.so
-lib/libmmal_core.so
-lib/libmmal_util.so
-lib/libmmal_vc_client.so
-lib/libopenmaxil.so
-lib/libvcfiled_check.a
-lib/libvchiq_arm.so
-lib/libvchostif.a
-lib/libvcilcs.a
-lib/libvcos.so
-lib/libvcsm.so
-lib/plugins/reader_asf.so
-lib/plugins/reader_avi.so
-lib/plugins/reader_binary.so
-lib/plugins/reader_flv.so
-lib/plugins/reader_metadata_id3.so
-lib/plugins/reader_mkv.so
-lib/plugins/reader_mp4.so
-lib/plugins/reader_mpga.so
-lib/plugins/reader_ps.so
-lib/plugins/reader_qsynth.so
-lib/plugins/reader_raw_video.so
-lib/plugins/reader_rcv.so
-lib/plugins/reader_rtp.so
-lib/plugins/reader_rtsp.so
-lib/plugins/reader_rv9.so
-lib/plugins/reader_simple.so
-lib/plugins/reader_wav.so
-lib/plugins/writer_asf.so
-lib/plugins/writer_avi.so
-lib/plugins/writer_binary.so
-lib/plugins/writer_dummy.so
-lib/plugins/writer_mp4.so
-lib/plugins/writer_raw_video.so
-lib/plugins/writer_simple.so
-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
-libdata/pkgconfig/vg.pc
-sbin/vcfiled
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/CMakeLists.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/Makefile.include
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/README
@@ -403,6 +123,286 @@ 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/install/vcfiled
-@dir include/interface/vcos/glibc
-@dir include/interface/vmcs_host/linux/vcfiled/etc/init.d
+share/vc/bin/containers_check_frame_int
+share/vc/bin/containers_datagram_receiver
+share/vc/bin/containers_datagram_sender
+share/vc/bin/containers_dump_pktfile
+share/vc/bin/containers_rtp_decoder
+share/vc/bin/containers_stream_client
+share/vc/bin/containers_stream_server
+share/vc/bin/containers_test
+share/vc/bin/containers_test_bits
+share/vc/bin/containers_test_uri
+share/vc/bin/containers_uri_pipe
+share/vc/bin/dtmerge
+share/vc/bin/dtoverlay
+share/vc/bin/dtoverlay-post
+share/vc/bin/dtoverlay-pre
+share/vc/bin/dtparam
+share/vc/bin/mmal_vc_diag
+share/vc/bin/raspistill
+share/vc/bin/raspivid
+share/vc/bin/raspividyuv
+share/vc/bin/raspiyuv
+share/vc/bin/tvservice
+share/vc/bin/vcgencmd
+share/vc/bin/vchiq_test
+share/vc/bin/vcmailbox
+share/vc/bin/vcsmem
+share/vc/include/EGL/egl.h
+share/vc/include/EGL/eglext.h
+share/vc/include/EGL/eglext_android.h
+share/vc/include/EGL/eglext_brcm.h
+share/vc/include/EGL/eglext_nvidia.h
+share/vc/include/EGL/eglplatform.h
+share/vc/include/GLES/gl.h
+share/vc/include/GLES/glext.h
+share/vc/include/GLES/glplatform.h
+share/vc/include/GLES2/gl2.h
+share/vc/include/GLES2/gl2ext.h
+share/vc/include/GLES2/gl2platform.h
+share/vc/include/IL/OMX_Audio.h
+share/vc/include/IL/OMX_Broadcom.h
+share/vc/include/IL/OMX_Component.h
+share/vc/include/IL/OMX_Core.h
+share/vc/include/IL/OMX_ILCS.h
+share/vc/include/IL/OMX_IVCommon.h
+share/vc/include/IL/OMX_Image.h
+share/vc/include/IL/OMX_Index.h
+share/vc/include/IL/OMX_Other.h
+share/vc/include/IL/OMX_Types.h
+share/vc/include/IL/OMX_Video.h
+share/vc/include/KHR/khrplatform.h
+share/vc/include/VG/openvg.h
+share/vc/include/VG/vgext.h
+share/vc/include/VG/vgplatform.h
+share/vc/include/VG/vgu.h
+share/vc/include/WF/wfc.h
+share/vc/include/WF/wfcplatform.h
+share/vc/include/bcm_host.h
+share/vc/include/interface/mmal/core/mmal_buffer_private.h
+share/vc/include/interface/mmal/core/mmal_clock_private.h
+share/vc/include/interface/mmal/core/mmal_component_private.h
+share/vc/include/interface/mmal/core/mmal_core_private.h
+share/vc/include/interface/mmal/core/mmal_events_private.h
+share/vc/include/interface/mmal/core/mmal_port_private.h
+share/vc/include/interface/mmal/mmal.h
+share/vc/include/interface/mmal/mmal_buffer.h
+share/vc/include/interface/mmal/mmal_clock.h
+share/vc/include/interface/mmal/mmal_common.h
+share/vc/include/interface/mmal/mmal_component.h
+share/vc/include/interface/mmal/mmal_encodings.h
+share/vc/include/interface/mmal/mmal_events.h
+share/vc/include/interface/mmal/mmal_format.h
+share/vc/include/interface/mmal/mmal_logging.h
+share/vc/include/interface/mmal/mmal_metadata.h
+share/vc/include/interface/mmal/mmal_parameters.h
+share/vc/include/interface/mmal/mmal_parameters_audio.h
+share/vc/include/interface/mmal/mmal_parameters_camera.h
+share/vc/include/interface/mmal/mmal_parameters_clock.h
+share/vc/include/interface/mmal/mmal_parameters_common.h
+share/vc/include/interface/mmal/mmal_parameters_video.h
+share/vc/include/interface/mmal/mmal_pool.h
+share/vc/include/interface/mmal/mmal_port.h
+share/vc/include/interface/mmal/mmal_queue.h
+share/vc/include/interface/mmal/mmal_types.h
+share/vc/include/interface/mmal/util/mmal_component_wrapper.h
+share/vc/include/interface/mmal/util/mmal_connection.h
+share/vc/include/interface/mmal/util/mmal_default_components.h
+share/vc/include/interface/mmal/util/mmal_graph.h
+share/vc/include/interface/mmal/util/mmal_il.h
+share/vc/include/interface/mmal/util/mmal_list.h
+share/vc/include/interface/mmal/util/mmal_param_convert.h
+share/vc/include/interface/mmal/util/mmal_util.h
+share/vc/include/interface/mmal/util/mmal_util_params.h
+share/vc/include/interface/mmal/util/mmal_util_rational.h
+share/vc/include/interface/mmal/vc/mmal_vc_api.h
+share/vc/include/interface/mmal/vc/mmal_vc_api_drm.h
+share/vc/include/interface/mmal/vc/mmal_vc_client_priv.h
+share/vc/include/interface/mmal/vc/mmal_vc_msgnames.h
+share/vc/include/interface/mmal/vc/mmal_vc_msgs.h
+share/vc/include/interface/mmal/vc/mmal_vc_opaque_alloc.h
+share/vc/include/interface/mmal/vc/mmal_vc_shm.h
+share/vc/include/interface/vchi/common/endian.h
+share/vc/include/interface/vchi/connections/connection.h
+share/vc/include/interface/vchi/message_drivers/message.h
+share/vc/include/interface/vchi/vchi.h
+share/vc/include/interface/vchi/vchi_cfg.h
+share/vc/include/interface/vchi/vchi_cfg_internal.h
+share/vc/include/interface/vchi/vchi_common.h
+share/vc/include/interface/vchi/vchi_mh.h
+share/vc/include/interface/vchiq_arm/vchiq.h
+share/vc/include/interface/vchiq_arm/vchiq_cfg.h
+share/vc/include/interface/vchiq_arm/vchiq_if.h
+share/vc/include/interface/vchiq_arm/vchiq_ioctl.h
+share/vc/include/interface/vchiq_arm/vchiq_test.h
+share/vc/include/interface/vchiq_arm/vchiq_test_if.h
+share/vc/include/interface/vchiq_arm/vchiq_util.h
+share/vc/include/interface/vcos/generic/vcos_common.h
+share/vc/include/interface/vcos/generic/vcos_deprecated.h
+share/vc/include/interface/vcos/generic/vcos_generic_blockpool.h
+share/vc/include/interface/vcos/generic/vcos_generic_event_flags.h
+share/vc/include/interface/vcos/generic/vcos_generic_named_sem.h
+share/vc/include/interface/vcos/generic/vcos_generic_quickslow_mutex.h
+share/vc/include/interface/vcos/generic/vcos_generic_reentrant_mtx.h
+share/vc/include/interface/vcos/generic/vcos_generic_tls.h
+share/vc/include/interface/vcos/generic/vcos_joinable_thread_from_plain.h
+share/vc/include/interface/vcos/generic/vcos_latch_from_sem.h
+share/vc/include/interface/vcos/generic/vcos_mem_from_malloc.h
+share/vc/include/interface/vcos/generic/vcos_mutexes_are_reentrant.h
+share/vc/include/interface/vcos/generic/vcos_thread_reaper.h
+share/vc/include/interface/vcos/pthreads/vcos_futex_mutex.h
+share/vc/include/interface/vcos/pthreads/vcos_platform.h
+share/vc/include/interface/vcos/pthreads/vcos_platform_types.h
+share/vc/include/interface/vcos/user_nodefs.h
+share/vc/include/interface/vcos/vcos.h
+share/vc/include/interface/vcos/vcos_assert.h
+share/vc/include/interface/vcos/vcos_atomic_flags.h
+share/vc/include/interface/vcos/vcos_attr.h
+share/vc/include/interface/vcos/vcos_blockpool.h
+share/vc/include/interface/vcos/vcos_build_info.h
+share/vc/include/interface/vcos/vcos_cfg.h
+share/vc/include/interface/vcos/vcos_cmd.h
+share/vc/include/interface/vcos/vcos_ctype.h
+share/vc/include/interface/vcos/vcos_dlfcn.h
+share/vc/include/interface/vcos/vcos_event.h
+share/vc/include/interface/vcos/vcos_event_flags.h
+share/vc/include/interface/vcos/vcos_init.h
+share/vc/include/interface/vcos/vcos_inttypes.h
+share/vc/include/interface/vcos/vcos_isr.h
+share/vc/include/interface/vcos/vcos_legacy_isr.h
+share/vc/include/interface/vcos/vcos_logging.h
+share/vc/include/interface/vcos/vcos_logging_control.h
+share/vc/include/interface/vcos/vcos_lowlevel_thread.h
+share/vc/include/interface/vcos/vcos_mem.h
+share/vc/include/interface/vcos/vcos_mempool.h
+share/vc/include/interface/vcos/vcos_msgqueue.h
+share/vc/include/interface/vcos/vcos_mutex.h
+share/vc/include/interface/vcos/vcos_named_semaphore.h
+share/vc/include/interface/vcos/vcos_once.h
+share/vc/include/interface/vcos/vcos_queue.h
+share/vc/include/interface/vcos/vcos_quickslow_mutex.h
+share/vc/include/interface/vcos/vcos_reentrant_mutex.h
+share/vc/include/interface/vcos/vcos_semaphore.h
+share/vc/include/interface/vcos/vcos_stdbool.h
+share/vc/include/interface/vcos/vcos_stdint.h
+share/vc/include/interface/vcos/vcos_string.h
+share/vc/include/interface/vcos/vcos_thread.h
+share/vc/include/interface/vcos/vcos_thread_attr.h
+share/vc/include/interface/vcos/vcos_timer.h
+share/vc/include/interface/vcos/vcos_tls.h
+share/vc/include/interface/vcos/vcos_types.h
+share/vc/include/interface/vctypes/vc_display_types.h
+share/vc/include/interface/vctypes/vc_image_types.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Audio.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Broadcom.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Component.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Core.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_ILCS.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_IVCommon.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Image.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Index.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Other.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Types.h
+share/vc/include/interface/vmcs_host/khronos/IL/OMX_Video.h
+share/vc/include/interface/vmcs_host/linux/vcfiled/vcfiled_check.h
+share/vc/include/interface/vmcs_host/linux/vchost_config.h
+share/vc/include/interface/vmcs_host/vc_cec.h
+share/vc/include/interface/vmcs_host/vc_cecservice.h
+share/vc/include/interface/vmcs_host/vc_cecservice_defs.h
+share/vc/include/interface/vmcs_host/vc_cma.h
+share/vc/include/interface/vmcs_host/vc_dispmanx.h
+share/vc/include/interface/vmcs_host/vc_dispmanx_types.h
+share/vc/include/interface/vmcs_host/vc_dispservice_defs.h
+share/vc/include/interface/vmcs_host/vc_dispservice_x_defs.h
+share/vc/include/interface/vmcs_host/vc_fileservice_defs.h
+share/vc/include/interface/vmcs_host/vc_gencmd_defs.h
+share/vc/include/interface/vmcs_host/vc_hdmi.h
+share/vc/include/interface/vmcs_host/vc_hdmi_property.h
+share/vc/include/interface/vmcs_host/vc_ilcs_defs.h
+share/vc/include/interface/vmcs_host/vc_imageconv_defs.h
+share/vc/include/interface/vmcs_host/vc_sdtv.h
+share/vc/include/interface/vmcs_host/vc_service_common.h
+share/vc/include/interface/vmcs_host/vc_tvservice.h
+share/vc/include/interface/vmcs_host/vc_tvservice_defs.h
+share/vc/include/interface/vmcs_host/vc_vchi_audioserv_defs.h
+share/vc/include/interface/vmcs_host/vc_vchi_bufman.h
+share/vc/include/interface/vmcs_host/vc_vchi_bufman_defs.h
+share/vc/include/interface/vmcs_host/vc_vchi_dispmanx.h
+share/vc/include/interface/vmcs_host/vc_vchi_fileservice_defs.h
+share/vc/include/interface/vmcs_host/vc_vchi_filesys.h
+share/vc/include/interface/vmcs_host/vc_vchi_gencmd.h
+share/vc/include/interface/vmcs_host/vcfilesys.h
+share/vc/include/interface/vmcs_host/vcfilesys_defs.h
+share/vc/include/interface/vmcs_host/vcgencmd.h
+share/vc/include/interface/vmcs_host/vchost.h
+share/vc/include/interface/vmcs_host/vchost_platform_config.h
+share/vc/include/interface/vmcs_host/vcilcs.h
+share/vc/include/interface/vmcs_host/vcilcs_common.h
+share/vc/include/vcinclude/common.h
+share/vc/include/vcinclude/vc_image_types.h
+share/vc/include/vcinclude/vcore.h
+share/vc/lib/libEGL.so
+share/vc/lib/libEGL_static.a
+share/vc/lib/libGLESv2.so
+share/vc/lib/libGLESv2_static.a
+share/vc/lib/libOpenVG.so
+share/vc/lib/libWFC.so
+share/vc/lib/libbcm_host.so
+share/vc/lib/libbrcmEGL.so
+share/vc/lib/libbrcmGLESv2.so
+share/vc/lib/libbrcmOpenVG.so
+share/vc/lib/libbrcmWFC.so
+share/vc/lib/libcontainers.so
+share/vc/lib/libdebug_sym.so
+share/vc/lib/libdebug_sym_static.a
+share/vc/lib/libdtovl.so
+share/vc/lib/libkhrn_client.a
+share/vc/lib/libkhrn_static.a
+share/vc/lib/libmmal.so
+share/vc/lib/libmmal_components.so
+share/vc/lib/libmmal_core.so
+share/vc/lib/libmmal_util.so
+share/vc/lib/libmmal_vc_client.so
+share/vc/lib/libopenmaxil.so
+share/vc/lib/libvcfiled_check.a
+share/vc/lib/libvchiq_arm.so
+share/vc/lib/libvchostif.a
+share/vc/lib/libvcilcs.a
+share/vc/lib/libvcos.so
+share/vc/lib/libvcsm.so
+share/vc/lib/plugins/reader_asf.so
+share/vc/lib/plugins/reader_avi.so
+share/vc/lib/plugins/reader_binary.so
+share/vc/lib/plugins/reader_flv.so
+share/vc/lib/plugins/reader_metadata_id3.so
+share/vc/lib/plugins/reader_mkv.so
+share/vc/lib/plugins/reader_mp4.so
+share/vc/lib/plugins/reader_mpga.so
+share/vc/lib/plugins/reader_ps.so
+share/vc/lib/plugins/reader_qsynth.so
+share/vc/lib/plugins/reader_raw_video.so
+share/vc/lib/plugins/reader_rcv.so
+share/vc/lib/plugins/reader_rtp.so
+share/vc/lib/plugins/reader_rtsp.so
+share/vc/lib/plugins/reader_rv9.so
+share/vc/lib/plugins/reader_simple.so
+share/vc/lib/plugins/reader_wav.so
+share/vc/lib/plugins/writer_asf.so
+share/vc/lib/plugins/writer_avi.so
+share/vc/lib/plugins/writer_binary.so
+share/vc/lib/plugins/writer_dummy.so
+share/vc/lib/plugins/writer_mp4.so
+share/vc/lib/plugins/writer_raw_video.so
+share/vc/lib/plugins/writer_simple.so
+share/vc/libdata/pkgconfig/bcm_host.pc
+share/vc/libdata/pkgconfig/brcmegl.pc
+share/vc/libdata/pkgconfig/brcmglesv2.pc
+share/vc/libdata/pkgconfig/brcmvg.pc
+share/vc/libdata/pkgconfig/egl.pc
+share/vc/libdata/pkgconfig/glesv2.pc
+share/vc/libdata/pkgconfig/vg.pc
+share/vc/sbin/vcfiled
+share/vc/share/install/vcfiled
+@dir share/vc/include/interface/vcos/glibc
+@dir share/vc/include/interface/vmcs_host/linux/vcfiled/etc/init.d
diff --git a/multimedia/libcec/Makefile b/multimedia/libcec/Makefile
index bffadf03396f..985f76c09d07 100644
--- a/multimedia/libcec/Makefile
+++ b/multimedia/libcec/Makefile
@@ -3,6 +3,7 @@
 PORTNAME=	libcec
 PORTVERSION=	6.0.2
 DISTVERSIONPREFIX=	libcec-
+PORTREVISION=	1
 CATEGORIES=	multimedia
 
 MAINTAINER=	sunpoet@FreeBSD.org
@@ -42,7 +43,7 @@ RPI_DESC=	Build libcec support for Raspberry Pi
 PYTHON_BUILD_DEPENDS=	swig:devel/swig
 PYTHON_CMAKE_BOOL_OFF=	SKIP_PYTHON_WRAPPER
 PYTHON_USES=		python:build
-RPI_CMAKE_ON=		-DRPI_INCLUDE_DIR=${LOCALBASE}/include -DRPI_LIB_DIR=${LOCALBASE}/lib
+RPI_CMAKE_ON=		-DRPI_INCLUDE_DIR=${LOCALBASE}/share/vc/include -DRPI_LIB_DIR=${LOCALBASE}/share/vc/lib
 RPI_LIB_DEPENDS=	libbcm_host.so:misc/raspberrypi-userland
 X11_USE_OFF=		XORG=x11,xorgproto,xrandr
 X11_USES_OFF=		xorg
diff --git a/multimedia/omxplayer/Makefile b/multimedia/omxplayer/Makefile
index 0f612f679f3d..7df638ea8e38 100644
--- a/multimedia/omxplayer/Makefile
+++ b/multimedia/omxplayer/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	omxplayer
 PORTVERSION=	20161004
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	multimedia
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
diff --git a/multimedia/omxplayer/files/patch-Makefile b/multimedia/omxplayer/files/patch-Makefile
index 46eb1104e76c..bdea4a3d2637 100644
--- a/multimedia/omxplayer/files/patch-Makefile
+++ b/multimedia/omxplayer/files/patch-Makefile
@@ -5,10 +5,10 @@
  CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG  -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST
  
 -LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
-+LDFLAGS+=-L./ -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
++LDFLAGS+=-L./ -L$(LOCALBASE)/share/vc/lib -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -lasound
  
 -INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include
-+INCLUDES+=-I./ -Ilinux -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/include/dbus-1.0/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ffmpeg
++INCLUDES+=-I./ -Ilinux -I$(LOCALBASE)/share/vc/include -I$(LOCALBASE)/include/dbus-1.0 -I$(LOCALBASE)/include/dbus-1.0/include -I$(LOCALBASE)/include/freetype2 -I$(LOCALBASE)/include/ffmpeg
  
  DIST ?= omxplayer-dist
  
diff --git a/multimedia/omxplayer/files/patch-Makefile.include b/multimedia/omxplayer/files/patch-Makefile.include
index 161cf0337962..1baaafde3eea 100644
--- a/multimedia/omxplayer/files/patch-Makefile.include
+++ b/multimedia/omxplayer/files/patch-Makefile.include
@@ -42,5 +42,5 @@
 -#INCLUDES		+= -isystem$(SDKSTAGE)/usr/include -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -isystem$(SDKSTAGE)/usr/include/freetype2
 -INCLUDES		+= -isystem$(SDKSTAGE)/opt/vc/include -isystem$(SYSROOT)/usr/include -isystem$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -Ipcre/build -Iboost-trunk -Ifreetype2/include
 +CFLAGS			+= -fomit-frame-pointer
-+LDFLAGS			+= -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg
-+INCLUDES		+= -I$(LOCALBASE)/include -I$(LOCALBASE)/include/interface/vcos/pthreads -I$(LOCALBASE)/include/interface/vmcs_host/linux -I$(LOCALBASE)/lib/dbus-1.0/include
++LDFLAGS			+= -L$(LOCALBASE)/share/vc/lib -L$(LOCALBASE)/lib -L$(LOCALBASE)/lib/ffmpeg
++INCLUDES		+= -I$(LOCALBASE)/share/vc/include -I$(LOCALBASE)/include -I$(LOCALBASE)/share/vc/include/interface/vcos/pthreads -I$(LOCALBASE)/share/vc/include/interface/vmcs_host/linux -I$(LOCALBASE)/lib/dbus-1.0/include