Received: from mail.netbsd.org (mail.netbsd.org [199.233.217.200]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.netbsd.org", Issuer "Postmaster NetBSD.org" (verified OK)) by mollari.NetBSD.org (Postfix) with ESMTPS id ED2FB7A170 for ; Tue, 1 Nov 2016 16:45:29 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 9EA63855B5; Tue, 1 Nov 2016 16:45:29 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 2B220855B4 for ; Tue, 1 Nov 2016 16:45:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id GJhEtTCNJCsC for ; Tue, 1 Nov 2016 16:45:28 +0000 (UTC) Received: from cvs.NetBSD.org (unknown [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 3781A84CE9 for ; Tue, 1 Nov 2016 16:45:28 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 357BFFBA4; Tue, 1 Nov 2016 16:45:28 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1478018728143660" MIME-Version: 1.0 Date: Tue, 1 Nov 2016 16:45:28 +0000 From: "Nick Hudson" Subject: CVS commit: pkgsrc/misc/raspberrypi-userland To: pkgsrc-changes@NetBSD.org Reply-To: skrll@netbsd.org X-Mailer: log_accum Message-Id: <20161101164528.357BFFBA4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk This is a multi-part message in MIME format. --_----------=_1478018728143660 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: skrll Date: Tue Nov 1 16:45:28 UTC 2016 Modified Files: pkgsrc/misc/raspberrypi-userland: Makefile PLIST distinfo Added Files: pkgsrc/misc/raspberrypi-userland/patches: patch-host__applications_linux_apps_dtmerge_dtmerge.c patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c patch-host__applications_linux_apps_tvservice_tvservice.c patch-interface_vchiq__arm_vchiq__lib.c Removed Files: pkgsrc/misc/raspberrypi-userland/patches: patch-interface_vchiq__arm_vchiq__test.c Log Message: Update to latest raspberrypi userland sources To generate a diff of this commit: cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/raspberrypi-userland/Makefile cvs rdiff -u -r1.3 -r1.4 pkgsrc/misc/raspberrypi-userland/PLIST cvs rdiff -u -r1.6 -r1.7 pkgsrc/misc/raspberrypi-userland/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtmerge_dtmerge.c \ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c \ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_tvservice_tvservice.c \ pkgsrc/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__lib.c cvs rdiff -u -r1.1 -r0 \ pkgsrc/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__test.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1478018728143660 Content-Disposition: inline Content-Length: 10936 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/misc/raspberrypi-userland/Makefile diff -u pkgsrc/misc/raspberrypi-userland/Makefile:1.8 pkgsrc/misc/raspberrypi-userland/Makefile:1.9 --- pkgsrc/misc/raspberrypi-userland/Makefile:1.8 Sat Jan 24 12:54:15 2015 +++ pkgsrc/misc/raspberrypi-userland/Makefile Tue Nov 1 16:45:27 2016 @@ -1,16 +1,20 @@ -# $NetBSD: Makefile,v 1.8 2015/01/24 12:54:15 skrll Exp $ +# $NetBSD: Makefile,v 1.9 2016/11/01 16:45:27 skrll Exp $ # -DISTNAME= raspberrypi-userland-20150118 -PKGREVISION= 1 +DISTNAME= userland-20161101 +PKGNAME= raspberrypi-${DISTNAME} CATEGORIES= misc -MASTER_SITES= http://ftp.NetBSD.org/pub/NetBSD/misc/skrll/rpi/ +MASTER_SITES= ${MASTER_SITE_GITHUB:=jaredmcneill/} +GITHUB_PROJECT= userland +GITHUB_TAG= f23cb469c938c6035ebd9a285257743f9a2f9de1 MAINTAINER= jmcneill@NetBSD.org HOMEPAGE= http://github.com/jaredmcneill/userland COMMENT= Various libraries for the Raspberry Pi LICENSE= modified-bsd +EXTRACT_USING= bsdtar + ONLY_FOR_PLATFORM= NetBSD-*-*arm* USE_LANGUAGES= c c++ Index: pkgsrc/misc/raspberrypi-userland/PLIST diff -u pkgsrc/misc/raspberrypi-userland/PLIST:1.3 pkgsrc/misc/raspberrypi-userland/PLIST:1.4 --- pkgsrc/misc/raspberrypi-userland/PLIST:1.3 Sat Jan 24 12:54:15 2015 +++ pkgsrc/misc/raspberrypi-userland/PLIST Tue Nov 1 16:45:27 2016 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.3 2015/01/24 12:54:15 skrll Exp $ +@comment $NetBSD: PLIST,v 1.4 2016/11/01 16:45:27 skrll Exp $ bin/containers_check_frame_int bin/containers_datagram_receiver bin/containers_datagram_sender @@ -10,13 +10,20 @@ 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 @@ -53,6 +60,7 @@ include/interface/mmal/core/mmal_buffer_ 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 @@ -187,7 +195,6 @@ include/interface/vmcs_host/vc_fileservi 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 @@ -205,7 +212,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 @@ -218,9 +225,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 @@ -235,6 +247,13 @@ lib/libvchostif.a lib/libvcilcs.a lib/libvcos.so lib/libvcsm.so +lib/pkgconfig/bcm_host.pc +lib/pkgconfig/brcmegl.pc +lib/pkgconfig/brcmglesv2.pc +lib/pkgconfig/brcmvg.pc +lib/pkgconfig/egl.pc +lib/pkgconfig/glesv2.pc +lib/pkgconfig/vg.pc lib/plugins/reader_asf.so lib/plugins/reader_avi.so lib/plugins/reader_binary.so @@ -295,6 +314,7 @@ src/hello_pi/hello_fft/hex/shader_256.he 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_4096k.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 @@ -315,6 +335,7 @@ src/hello_pi/hello_fft/qasm/gpu_fft_256. 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_4096k.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 @@ -330,6 +351,8 @@ 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_mmal_encode/Makefile +src/hello_pi/hello_mmal_encode/mmal_encode.c src/hello_pi/hello_teapot/CMakeLists.txt src/hello_pi/hello_teapot/Makefile src/hello_pi/hello_teapot/README.md Index: pkgsrc/misc/raspberrypi-userland/distinfo diff -u pkgsrc/misc/raspberrypi-userland/distinfo:1.6 pkgsrc/misc/raspberrypi-userland/distinfo:1.7 --- pkgsrc/misc/raspberrypi-userland/distinfo:1.6 Tue Nov 3 23:49:48 2015 +++ pkgsrc/misc/raspberrypi-userland/distinfo Tue Nov 1 16:45:27 2016 @@ -1,9 +1,12 @@ -$NetBSD: distinfo,v 1.6 2015/11/03 23:49:48 agc Exp $ +$NetBSD: distinfo,v 1.7 2016/11/01 16:45:27 skrll Exp $ -SHA1 (raspberrypi-userland-20150118.tar.gz) = 288f9ce03ec8e1ba95ff662d2110c6ef27c65b16 -RMD160 (raspberrypi-userland-20150118.tar.gz) = 2628fa62f7459a34dd16500245d8e167ad2e786f -SHA512 (raspberrypi-userland-20150118.tar.gz) = 6f19df44721d36635ff0560c0cb6c6f2fb15a45b8a06c5dc3f9c57ce784b2b1d6a8ef234758ecef80b82b6e04f44fc239b90529ff7506e5fbea06469809a1527 -Size (raspberrypi-userland-20150118.tar.gz) = 34246284 bytes -SHA1 (patch-interface_vchiq__arm_vchiq__test.c) = 78ba7f26aa4db7c84fe53591018489c01191a94a +SHA1 (userland-20161101-f23cb469c938c6035ebd9a285257743f9a2f9de1.tar.gz) = e0158b3b092dd26ccc0367abf1afb34a5b09a0be +RMD160 (userland-20161101-f23cb469c938c6035ebd9a285257743f9a2f9de1.tar.gz) = da8aa921c71939936c1fcd592d34c792ff898347 +SHA512 (userland-20161101-f23cb469c938c6035ebd9a285257743f9a2f9de1.tar.gz) = fc056c69cb4168cd6492c207a53ac5f234ea6dbb530d80546d00594ea9feafa36fdf326809f7e43ffffbdabbc25c8e44cc62fa4c5d36cb05ba7f8bf49404426d +Size (userland-20161101-f23cb469c938c6035ebd9a285257743f9a2f9de1.tar.gz) = 32911758 bytes +SHA1 (patch-host__applications_linux_apps_dtmerge_dtmerge.c) = 732dc54db48d43b97d558cd938617418bc0c3655 +SHA1 (patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c) = 203f016d379724cf66b114e8bfee7eb8e43c1e23 +SHA1 (patch-host__applications_linux_apps_tvservice_tvservice.c) = 2cc304252c102d46603f6649eb959984e9d44b1f +SHA1 (patch-interface_vchiq__arm_vchiq__lib.c) = a9535aa96ba3374f2a559899c6baff9ddc935f3f SHA1 (patch-interface_vcos_CMakeLists.txt) = f96c052af9c1d10f3f386efc1b5d0006559e4e67 SHA1 (patch-interface_vmcs__host_linux_vcfiled_CMakeLists.txt) = 29694762b02a75749300ebfb4fe78464f2ac20ff Added files: Index: pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtmerge_dtmerge.c diff -u /dev/null pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtmerge_dtmerge.c:1.1 --- /dev/null Tue Nov 1 16:45:28 2016 +++ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtmerge_dtmerge.c Tue Nov 1 16:45:28 2016 @@ -0,0 +1,12 @@ +$NetBSD: patch-host__applications_linux_apps_dtmerge_dtmerge.c,v 1.1 2016/11/01 16:45:28 skrll Exp $ + +--- host_applications/linux/apps/dtmerge/dtmerge.c.orig 2016-11-01 11:24:50.000000000 +0000 ++++ host_applications/linux/apps/dtmerge/dtmerge.c +@@ -26,6 +26,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + */ + + #include ++#include + #include + #include + Index: pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c diff -u /dev/null pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c:1.1 --- /dev/null Tue Nov 1 16:45:28 2016 +++ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c Tue Nov 1 16:45:28 2016 @@ -0,0 +1,16 @@ +$NetBSD: patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c,v 1.1 2016/11/01 16:45:28 skrll Exp $ + +--- host_applications/linux/apps/dtoverlay/dtoverlay_main.c.orig 2016-11-01 11:24:50.000000000 +0000 ++++ host_applications/linux/apps/dtoverlay/dtoverlay_main.c +@@ -1006,8 +1006,10 @@ int seq_filter(const struct dirent *de) + return (sscanf(de->d_name, "%d_", &num) == 1); + } + +-int seq_compare(const struct dirent **de1, const struct dirent **de2) ++int seq_compare(const void *d1, const void *d2) + { ++ const struct dirent * const *de1 = d1; ++ const struct dirent * const *de2 = d2; + int num1 = atoi((*de1)->d_name); + int num2 = atoi((*de2)->d_name); + if (num1 < num2) Index: pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_tvservice_tvservice.c diff -u /dev/null pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_tvservice_tvservice.c:1.1 --- /dev/null Tue Nov 1 16:45:28 2016 +++ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_tvservice_tvservice.c Tue Nov 1 16:45:28 2016 @@ -0,0 +1,13 @@ +$NetBSD: patch-host__applications_linux_apps_tvservice_tvservice.c,v 1.1 2016/11/01 16:45:28 skrll Exp $ + +--- host_applications/linux/apps/tvservice/tvservice.c.orig 2016-11-01 11:58:40.068142335 +0000 ++++ host_applications/linux/apps/tvservice/tvservice.c +@@ -426,7 +426,7 @@ static const char *status_mode( TV_DISPL + } + } + //This is the format's aspect ratio +- tmp = status_sprintf(mode_str, MAX_STATUS_STR_LENGTH, &offset, " %s", aspect_ratio_sd_str(tvstate->display.sdtv.display_options.aspect)); ++ tmp = status_sprintf(mode_str, MAX_STATUS_STR_LENGTH, &offset, " %s", aspect_ratio_str(tvstate->display.sdtv.display_options.aspect)); + } else if (tvstate->state & VC_LCD_ATTACHED_DEFAULT) { + status_sprintf(mode_str, MAX_STATUS_STR_LENGTH, &offset, "LCD"); + } else { Index: pkgsrc/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__lib.c diff -u /dev/null pkgsrc/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__lib.c:1.1 --- /dev/null Tue Nov 1 16:45:28 2016 +++ pkgsrc/misc/raspberrypi-userland/patches/patch-interface_vchiq__arm_vchiq__lib.c Tue Nov 1 16:45:28 2016 @@ -0,0 +1,13 @@ +$NetBSD: patch-interface_vchiq__arm_vchiq__lib.c,v 1.1 2016/11/01 16:45:28 skrll Exp $ + +--- interface/vchiq_arm/vchiq_lib.c.orig 2016-11-01 11:24:50.000000000 +0000 ++++ interface/vchiq_arm/vchiq_lib.c +@@ -1526,7 +1526,7 @@ completion_thread(void *arg) + + while (1) + { +- int count, i; ++ int ret, i; + + while ((unsigned int)args.msgbufcount < vcos_countof(msgbufs)) + { --_----------=_1478018728143660--