Update to raspberrypi-userland 20150118nb1.

5 files changed, 248 insertions, 10 deletions

diff --git a/misc/raspberrypi-userland/Makefile b/misc/raspberrypi-userland/Makefile
index a2ac668b482..28e5235304f 100644
--- a/misc/raspberrypi-userland/Makefile
+++ b/misc/raspberrypi-userland/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/01/18 21:41:36 jmcneill Exp $
+# $NetBSD: Makefile,v 1.8 2015/01/24 12:54:15 skrll Exp $
 #
 
-DISTNAME=	raspberrypi-userland-20140329
+DISTNAME=	raspberrypi-userland-20150118
 PKGREVISION=	1
 CATEGORIES=	misc
 MASTER_SITES=	http://ftp.NetBSD.org/pub/NetBSD/misc/skrll/rpi/
diff --git a/misc/raspberrypi-userland/PLIST b/misc/raspberrypi-userland/PLIST
index bdba8253bbe..d370ed8c75e 100644
--- a/misc/raspberrypi-userland/PLIST
+++ b/misc/raspberrypi-userland/PLIST
@@ -1,7 +1,23 @@
-@comment $NetBSD: PLIST,v 1.2 2015/01/18 21:41:36 jmcneill Exp $
+@comment $NetBSD: PLIST,v 1.3 2015/01/24 12:54:15 skrll Exp $
+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/mmal_vc_diag
+bin/raspistill
+bin/raspivid
+bin/raspiyuv
 bin/tvservice
 bin/vcgencmd
 bin/vchiq_test
+bin/vcsmem
 include/EGL/egl.h
 include/EGL/eglext.h
 include/EGL/eglext_android.h
@@ -33,6 +49,48 @@ 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_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
@@ -160,17 +218,172 @@ lib/libGLESv2_static.a
 lib/libOpenVG.so
 lib/libWFC.so
 lib/libbcm_host.so
+lib/libcontainers.so
+lib/libdebug_sym.so
+lib/libdebug_sym_static.a
 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
 sbin/vcfiled
 share/install/vcfiled
+src/hello_pi/CMakeLists.txt
+src/hello_pi/Makefile.include
+src/hello_pi/README
+src/hello_pi/hello_audio/CMakeLists.txt
+src/hello_pi/hello_audio/Makefile
+src/hello_pi/hello_audio/audio.c
+src/hello_pi/hello_audio/audioplay.h
+src/hello_pi/hello_audio/sinewave.c
+src/hello_pi/hello_dispmanx/CMakeLists.txt
+src/hello_pi/hello_dispmanx/Makefile
+src/hello_pi/hello_dispmanx/dispmanx.c
+src/hello_pi/hello_encode/CMakeLists.txt
+src/hello_pi/hello_encode/Makefile
+src/hello_pi/hello_encode/encode.c
+src/hello_pi/hello_fft/gpu_fft.c
+src/hello_pi/hello_fft/gpu_fft.h
+src/hello_pi/hello_fft/gpu_fft.txt
+src/hello_pi/hello_fft/gpu_fft_base.c
+src/hello_pi/hello_fft/gpu_fft_shaders.c
+src/hello_pi/hello_fft/gpu_fft_trans.c
+src/hello_pi/hello_fft/gpu_fft_trans.h
+src/hello_pi/hello_fft/gpu_fft_twiddles.c
+src/hello_pi/hello_fft/hello_fft.c
+src/hello_pi/hello_fft/hello_fft_2d.c
+src/hello_pi/hello_fft/hello_fft_2d_bitmap.h
+src/hello_pi/hello_fft/hex/shader_1024k.hex
+src/hello_pi/hello_fft/hex/shader_128k.hex
+src/hello_pi/hello_fft/hex/shader_16k.hex
+src/hello_pi/hello_fft/hex/shader_1k.hex
+src/hello_pi/hello_fft/hex/shader_2048k.hex
+src/hello_pi/hello_fft/hex/shader_256.hex
+src/hello_pi/hello_fft/hex/shader_256k.hex
+src/hello_pi/hello_fft/hex/shader_2k.hex
+src/hello_pi/hello_fft/hex/shader_32k.hex
+src/hello_pi/hello_fft/hex/shader_4k.hex
+src/hello_pi/hello_fft/hex/shader_512.hex
+src/hello_pi/hello_fft/hex/shader_512k.hex
+src/hello_pi/hello_fft/hex/shader_64k.hex
+src/hello_pi/hello_fft/hex/shader_8k.hex
+src/hello_pi/hello_fft/hex/shader_trans.hex
+src/hello_pi/hello_fft/mailbox.c
+src/hello_pi/hello_fft/mailbox.h
+src/hello_pi/hello_fft/makefile
+src/hello_pi/hello_fft/qasm/gpu_fft.qinc
+src/hello_pi/hello_fft/qasm/gpu_fft_1024k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_128k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_16k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_1k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_2048k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_2048k.qinc
+src/hello_pi/hello_fft/qasm/gpu_fft_256.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_256k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_2k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_32k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_4k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_512.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_512k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_64k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_8k.qasm
+src/hello_pi/hello_fft/qasm/gpu_fft_ex.qinc
+src/hello_pi/hello_fft/qasm/gpu_fft_trans.qasm
+src/hello_pi/hello_font/CMakeLists.txt
+src/hello_pi/hello_font/Makefile
+src/hello_pi/hello_font/Vera.ttf
+src/hello_pi/hello_font/main.c
+src/hello_pi/hello_jpeg/CMakeLists.txt
+src/hello_pi/hello_jpeg/Makefile
+src/hello_pi/hello_jpeg/jpeg.c
+src/hello_pi/hello_jpeg/jpeg.h
+src/hello_pi/hello_teapot/CMakeLists.txt
+src/hello_pi/hello_teapot/Makefile
+src/hello_pi/hello_teapot/README.md
+src/hello_pi/hello_teapot/cube_texture_and_coords.h
+src/hello_pi/hello_teapot/models.c
+src/hello_pi/hello_teapot/models.h
+src/hello_pi/hello_teapot/teapot.obj.dat
+src/hello_pi/hello_teapot/triangle.c
+src/hello_pi/hello_teapot/triangle.h
+src/hello_pi/hello_teapot/video.c
+src/hello_pi/hello_tiger/CMakeLists.txt
+src/hello_pi/hello_tiger/Makefile
+src/hello_pi/hello_tiger/license.txt
+src/hello_pi/hello_tiger/main.c
+src/hello_pi/hello_tiger/readme.txt
+src/hello_pi/hello_tiger/tiger.c
+src/hello_pi/hello_tiger/tiger.h
+src/hello_pi/hello_triangle/CMakeLists.txt
+src/hello_pi/hello_triangle/Djenne_128_128.raw
+src/hello_pi/hello_triangle/Gaudi_128_128.raw
+src/hello_pi/hello_triangle/Lucca_128_128.raw
+src/hello_pi/hello_triangle/Makefile
+src/hello_pi/hello_triangle/cube_texture_and_coords.h
+src/hello_pi/hello_triangle/triangle.c
+src/hello_pi/hello_triangle2/CMakeLists.txt
+src/hello_pi/hello_triangle2/Makefile
+src/hello_pi/hello_triangle2/triangle2.c
+src/hello_pi/hello_video/CMakeLists.txt
+src/hello_pi/hello_video/Makefile
+src/hello_pi/hello_video/README
+src/hello_pi/hello_video/test.h264
+src/hello_pi/hello_video/video.c
+src/hello_pi/hello_videocube/CMakeLists.txt
+src/hello_pi/hello_videocube/Makefile
+src/hello_pi/hello_videocube/README.md
+src/hello_pi/hello_videocube/cube_texture_and_coords.h
+src/hello_pi/hello_videocube/triangle.c
+src/hello_pi/hello_videocube/triangle.h
+src/hello_pi/hello_videocube/video.c
+src/hello_pi/hello_world/CMakeLists.txt
+src/hello_pi/hello_world/Makefile
+src/hello_pi/hello_world/world.c
+src/hello_pi/libs/ilclient/Makefile
+src/hello_pi/libs/ilclient/ilclient.c
+src/hello_pi/libs/ilclient/ilclient.h
+src/hello_pi/libs/ilclient/ilcore.c
+src/hello_pi/libs/vgfont/Makefile
+src/hello_pi/libs/vgfont/font.c
+src/hello_pi/libs/vgfont/graphics.c
+src/hello_pi/libs/vgfont/graphics_x_private.h
+src/hello_pi/libs/vgfont/vgfont.h
+src/hello_pi/libs/vgfont/vgft.c
+src/hello_pi/libs/vgfont/vgft.h
+src/hello_pi/rebuild.sh
 @pkgdir include/interface/vmcs_host/linux/vcfiled/etc/init.d
 @pkgdir include/interface/vmcs_host/linux/vcfiled/CMakeFiles/vcfiled_lock_test.dir
 @pkgdir include/interface/vmcs_host/linux/vcfiled/CMakeFiles/vcfiled_check.dir
diff --git a/misc/raspberrypi-userland/distinfo b/misc/raspberrypi-userland/distinfo
index 85eca265edd..cebb750a124 100644
--- a/misc/raspberrypi-userland/distinfo
+++ b/misc/raspberrypi-userland/distinfo
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.4 2015/01/18 21:41:36 jmcneill Exp $
+$NetBSD: distinfo,v 1.5 2015/01/24 12:54:15 skrll Exp $
 
-SHA1 (raspberrypi-userland-20140329.tar.gz) = c555cd10773d2017039f9c456092e364a7a9d682
-RMD160 (raspberrypi-userland-20140329.tar.gz) = ba02090e4d1dc0ca027f02635f45f912383d1d2d
-Size (raspberrypi-userland-20140329.tar.gz) = 32387040 bytes
+SHA1 (raspberrypi-userland-20150118.tar.gz) = 288f9ce03ec8e1ba95ff662d2110c6ef27c65b16
+RMD160 (raspberrypi-userland-20150118.tar.gz) = 2628fa62f7459a34dd16500245d8e167ad2e786f
+Size (raspberrypi-userland-20150118.tar.gz) = 34246284 bytes
+SHA1 (patch-interface_vchiq__arm_vchiq__test.c) = 78ba7f26aa4db7c84fe53591018489c01191a94a
 SHA1 (patch-interface_vcos_CMakeLists.txt) = f96c052af9c1d10f3f386efc1b5d0006559e4e67
-SHA1 (patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt) = 09eafe7b7d2a9743b7b5d6beca43026204ea451d
+SHA1 (patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt) = 29694762b02a75749300ebfb4fe78464f2ac20ff
diff --git a/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__test.c b/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__test.c
new file mode 100644
index 00000000000..986c6713b39
--- /dev/null
+++ b/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__test.c
@@ -0,0 +1,24 @@
+$NetBSD: patch-interface_vchiq__arm_vchiq__test.c,v 1.1 2015/01/24 12:54:15 skrll Exp $
+
+--- interface/vchiq_arm/vchiq_test.c.orig	2015-01-18 10:10:36.000000000 +0000
++++ interface/vchiq_arm/vchiq_test.c
+@@ -1067,7 +1067,9 @@ do_vchi_ping_test(VCHI_SERVICE_HANDLE_T 
+    {
+       params->magic = MSG_SYNC;
+ 
++      vcos_mutex_lock(&g_mutex);
+       g_sync_mode = 1;
++      vcos_mutex_unlock(&g_mutex);
+ 
+       start = vcos_getmicrosecs();
+       for (i = 0; i < iters; i++)
+@@ -1082,7 +1084,9 @@ do_vchi_ping_test(VCHI_SERVICE_HANDLE_T 
+ 
+       vcos_sleep(10);
+ 
++      vcos_mutex_lock(&g_mutex);
+       g_sync_mode = 0;
++      vcos_mutex_unlock(&g_mutex);
+    }
+ 
+    while (vchi_msg_dequeue(service, pong_buf, sizeof(pong_buf), &actual, VCHI_FLAGS_NONE) != -1)
diff --git a/misc/raspberrypi-userland/patches/patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt b/misc/raspberrypi-userland/patches/patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt
index f52a5931519..c6e447d4bb3 100644
--- a/misc/raspberrypi-userland/patches/patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt
+++ b/misc/raspberrypi-userland/patches/patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt
@@ -1,8 +1,8 @@
-$NetBSD: patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt,v 1.1.1.1 2013/04/01 21:02:02 jmcneill Exp $
+$NetBSD: patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt,v 1.2 2015/01/24 12:54:15 skrll Exp $
 
 Don't install Linux specific init script.
 
---- interface/vmcs_host/linux/vcfiled/CMakeLists.txt.orig	2013-01-28 14:07:20.000000000 +0000
+--- interface/vmcs_host/linux/vcfiled/CMakeLists.txt.orig	2013-01-27 21:57:20.000000000 +0000
 +++ interface/vmcs_host/linux/vcfiled/CMakeLists.txt
 @@ -20,8 +20,8 @@ install(TARGETS vcfiled 
  configure_file (etc/init.d/vcfiled ${PROJECT_BINARY_DIR}/etc/init.d/vcfiled)