6 files changed, 56 insertions, 11 deletions

diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index 37db5753a466..3dfcc3a4f294 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	raspberrypi-userland
-PORTVERSION=	20160306
+PORTVERSION=	20161026
 CATEGORIES=	misc
 
 MAINTAINER=	mikael.urankar@gmail.com
@@ -17,13 +17,15 @@ CONFLICTS_INSTALL=	libglesv2 libEGL
 USE_GITHUB=	yes
 GH_ACCOUNT=	gonzoua
 GH_PROJECT=	userland
-GH_TAGNAME=	c702cd3
+GH_TAGNAME=	e143b48
 
 USE_LDCONFIG=	yes
 
-USES=		cmake:outsource
+USES=		cmake:outsource pkgconfig shebangfix
 CMAKE_ARGS+=	-DVMCS_INSTALL_PREFIX=${PREFIX} \
 		-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
 
 OPTIONS_DEFINE=	EXAMPLES DEBUG
 EXAMPLES_DESC=	Install test applications source code (hello_pi)
diff --git a/misc/raspberrypi-userland/distinfo b/misc/raspberrypi-userland/distinfo
index aebe8fa1c649..8102950dcda6 100644
--- a/misc/raspberrypi-userland/distinfo
+++ b/misc/raspberrypi-userland/distinfo
@@ -1,2 +1,3 @@
-SHA256 (gonzoua-userland-20160306-c702cd3_GH0.tar.gz) = 2b0864427414742778c7df81e177053ca15df508e79cdd6b4629f8f89cb90a34
-SIZE (gonzoua-userland-20160306-c702cd3_GH0.tar.gz) = 32888794
+TIMESTAMP = 1477482408
+SHA256 (gonzoua-userland-20161026-e143b48_GH0.tar.gz) = 488fed2e3adcc761cae10288eb7af95d1cda762f4be3562a85c2b22f50631175
+SIZE (gonzoua-userland-20161026-e143b48_GH0.tar.gz) = 32906666
diff --git a/misc/raspberrypi-userland/files/patch-CMakeLists.txt b/misc/raspberrypi-userland/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ac2915a65a75
--- /dev/null
+++ b/misc/raspberrypi-userland/files/patch-CMakeLists.txt
@@ -0,0 +1,11 @@
+--- CMakeLists.txt.orig	2016-10-30 UTC
++++ CMakeLists.txt
+@@ -116,7 +116,7 @@ if(PKG_CONFIG_FOUND)
+ 	foreach(PCFILE bcm_host.pc  egl.pc  glesv2.pc  vg.pc brcmegl.pc  brcmglesv2.pc  brcmvg.pc )
+ 		configure_file("pkgconfig/${PCFILE}.in" "${PCFILE}" @ONLY)
+ 		install(FILES       "${CMAKE_CURRENT_BINARY_DIR}/${PCFILE}"
+-			DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig")
++			DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig")
+ 	endforeach()
+ endif()
+ # Remove cache entry, if one added by command line
diff --git a/misc/raspberrypi-userland/files/patch-host__applications_linux_apps_dtoverlay_CMakeLists.txt b/misc/raspberrypi-userland/files/patch-host__applications_linux_apps_dtoverlay_CMakeLists.txt
new file mode 100644
index 000000000000..36bbbbf8e776
--- /dev/null
+++ b/misc/raspberrypi-userland/files/patch-host__applications_linux_apps_dtoverlay_CMakeLists.txt
@@ -0,0 +1,15 @@
+--- host_applications/linux/apps/dtoverlay/CMakeLists.txt.orig	2016-10-30 UTC
++++ host_applications/linux/apps/dtoverlay/CMakeLists.txt
+@@ -22,12 +22,4 @@ add_custom_command(TARGET dtoverlay POST
+ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dtparam DESTINATION bin)
+ 
+ set(DTOVERLAY_SCRIPTS dtoverlay-pre dtoverlay-post)
+-foreach(_script ${DTOVERLAY_SCRIPTS})
+-   add_custom_command(
+-     TARGET dtoverlay
+-     COMMAND ${CMAKE_COMMAND}
+-     -E copy ${CMAKE_CURRENT_SOURCE_DIR}/${_script}
+-     ${CMAKE_BINARY_DIR}/../../bin/${_script}
+-   )
+-endforeach()
+ install(PROGRAMS ${DTOVERLAY_SCRIPTS} DESTINATION bin)
diff --git a/misc/raspberrypi-userland/files/patch-host__applications_linux_apps_hello__pi_Makefile.include b/misc/raspberrypi-userland/files/patch-host__applications_linux_apps_hello__pi_Makefile.include
index f84e35e77d56..add819abf48b 100644
--- a/misc/raspberrypi-userland/files/patch-host__applications_linux_apps_hello__pi_Makefile.include
+++ b/misc/raspberrypi-userland/files/patch-host__applications_linux_apps_hello__pi_Makefile.include
@@ -4,8 +4,8 @@
  
  LDFLAGS+=-L$(SDKSTAGE)/opt/vc/lib/ -lGLESv2 -lEGL -lopenmaxil -lbcm_host -lvcos -lvchiq_arm -lpthread -lrt -lm -L../libs/ilclient -L../libs/vgfont
  
--INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I../libs/ilclient -I../libs/vgfont
-+INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I../libs/ilclient -I../libs/vgfont -ILOCALBASE/include/freetype2/
+-INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont
++INCLUDES+=-I$(SDKSTAGE)/opt/vc/include/ -I$(SDKSTAGE)/opt/vc/include/interface/vcos/pthreads -I$(SDKSTAGE)/opt/vc/include/interface/vmcs_host/linux -I./ -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/ilclient -I$(SDKSTAGE)/opt/vc/src/hello_pi/libs/vgfont -ILOCALBASE/include/freetype2
  
  all: $(BIN) $(LIB)
  
diff --git a/misc/raspberrypi-userland/pkg-plist b/misc/raspberrypi-userland/pkg-plist
index 95e2834e218f..d4223846ab71 100644
--- a/misc/raspberrypi-userland/pkg-plist
+++ b/misc/raspberrypi-userland/pkg-plist
@@ -9,6 +9,11 @@ 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
@@ -189,7 +194,6 @@ 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_hostreq_defs.h
 include/interface/vmcs_host/vc_ilcs_defs.h
 include/interface/vmcs_host/vc_imageconv_defs.h
 include/interface/vmcs_host/vc_sdtv.h
@@ -207,7 +211,7 @@ 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/vchostreq.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
@@ -220,9 +224,14 @@ 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
@@ -261,6 +270,13 @@ 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
@@ -287,7 +303,6 @@ sbin/vcfiled
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft_2d.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hello_fft_2d_bitmap.h
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_4096k.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_1024k.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_128k.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_16k.hex
@@ -297,6 +312,7 @@ sbin/vcfiled
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_256k.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_2k.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_32k.hex
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_4096k.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_4k.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_512.hex
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/hex/shader_512k.hex
@@ -307,7 +323,6 @@ sbin/vcfiled
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/mailbox.h
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft.qinc
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_4096k.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_1024k.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_128k.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_16k.qasm
@@ -318,6 +333,7 @@ sbin/vcfiled
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_256k.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_2k.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_32k.qasm
+%%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_4096k.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_4k.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_512.qasm
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/hello_pi/hello_fft/qasm/gpu_fft_512k.qasm