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 62F927A211 for ; Sun, 16 Apr 2017 19:25:34 +0000 (UTC) Received: by mail.netbsd.org (Postfix, from userid 605) id 01B5D84D7F; Sun, 16 Apr 2017 19:25:34 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 8600D84D74 for ; Sun, 16 Apr 2017 19:25:33 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id p86yod6uRWEx for ; Sun, 16 Apr 2017 19:25:33 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 03CF884CDA for ; Sun, 16 Apr 2017 19:25:33 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 6057FFBE4; Sun, 16 Apr 2017 19:25:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_14923707255650" MIME-Version: 1.0 Date: Sun, 16 Apr 2017 19:25:25 +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: <20170416192525.6057FFBE4@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_14923707255650 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: skrll Date: Sun Apr 16 19:25:25 UTC 2017 Modified Files: pkgsrc/misc/raspberrypi-userland: Makefile distinfo Added Files: pkgsrc/misc/raspberrypi-userland/patches: patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c Log Message: Deal with scandir prototype differences. Fixes pkg/52146 To generate a diff of this commit: cvs rdiff -u -r1.10 -r1.11 pkgsrc/misc/raspberrypi-userland/Makefile cvs rdiff -u -r1.8 -r1.9 pkgsrc/misc/raspberrypi-userland/distinfo cvs rdiff -u -r0 -r1.3 \ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_14923707255650 Content-Disposition: inline Content-Length: 3521 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.10 pkgsrc/misc/raspberrypi-userland/Makefile:1.11 --- pkgsrc/misc/raspberrypi-userland/Makefile:1.10 Thu Jan 12 05:49:54 2017 +++ pkgsrc/misc/raspberrypi-userland/Makefile Sun Apr 16 19:25:25 2017 @@ -1,7 +1,8 @@ -# $NetBSD: Makefile,v 1.10 2017/01/12 05:49:54 skrll Exp $ +# $NetBSD: Makefile,v 1.11 2017/04/16 19:25:25 skrll Exp $ # DISTNAME= userland-20170109 +PKGREVISION= 1 PKGNAME= raspberrypi-${DISTNAME} CATEGORIES= misc MASTER_SITES= ${MASTER_SITE_GITHUB:=jaredmcneill/} Index: pkgsrc/misc/raspberrypi-userland/distinfo diff -u pkgsrc/misc/raspberrypi-userland/distinfo:1.8 pkgsrc/misc/raspberrypi-userland/distinfo:1.9 --- pkgsrc/misc/raspberrypi-userland/distinfo:1.8 Thu Jan 12 05:49:54 2017 +++ pkgsrc/misc/raspberrypi-userland/distinfo Sun Apr 16 19:25:25 2017 @@ -1,10 +1,11 @@ -$NetBSD: distinfo,v 1.8 2017/01/12 05:49:54 skrll Exp $ +$NetBSD: distinfo,v 1.9 2017/04/16 19:25:25 skrll Exp $ SHA1 (userland-20170109-734d76b0675685e9ec9148694f2cc00f58e5ebc0.tar.gz) = 6d5db24f38e40a2aed866c8b96cd88074a4dc93b RMD160 (userland-20170109-734d76b0675685e9ec9148694f2cc00f58e5ebc0.tar.gz) = 0ac98329e36095fad45017d972eb0a14b7f3b30b SHA512 (userland-20170109-734d76b0675685e9ec9148694f2cc00f58e5ebc0.tar.gz) = 937591729ee19ee56722b354565163b07a23ba76d211c3bf5f340789e8fef334f18066448d59e4acd1147abfb7bd7c4c1a7fba6917a4072a59e2c17afd774e73 Size (userland-20170109-734d76b0675685e9ec9148694f2cc00f58e5ebc0.tar.gz) = 32917687 bytes SHA1 (patch-host__applications_linux_apps_dtmerge_dtmerge.c) = 732dc54db48d43b97d558cd938617418bc0c3655 +SHA1 (patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c) = e6605a31f65b49b8993af3eff91aa523ae8acff6 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 Added files: 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.3 --- /dev/null Sun Apr 16 19:25:25 2017 +++ pkgsrc/misc/raspberrypi-userland/patches/patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c Sun Apr 16 19:25:25 2017 @@ -0,0 +1,31 @@ +$NetBSD: patch-host__applications_linux_apps_dtoverlay_dtoverlay__main.c,v 1.3 2017/04/16 19:25:25 skrll Exp $ + +--- host_applications/linux/apps/dtoverlay/dtoverlay_main.c.orig 2017-01-07 08:24:37.000000000 +0000 ++++ host_applications/linux/apps/dtoverlay/dtoverlay_main.c +@@ -36,6 +36,10 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI + + #include + ++#ifdef __NetBSD__ ++#include ++#endif ++ + #include "dtoverlay.h" + #include "utils.h" + +@@ -1006,8 +1010,15 @@ int seq_filter(const struct dirent *de) + return (sscanf(de->d_name, "%d_", &num) == 1); + } + ++#if defined (__NetBSD__) && __NetBSD_Version__-0 >= 799005100 + int seq_compare(const struct dirent **de1, const struct dirent **de2) + { ++#else ++int seq_compare(const void *d1, const void *d2) ++{ ++ const struct dirent * const *de1 = d1; ++ const struct dirent * const *de2 = d2; ++#endif + int num1 = atoi((*de1)->d_name); + int num2 = atoi((*de2)->d_name); + if (num1 < num2) --_----------=_14923707255650--