Received: by mail.netbsd.org (Postfix, from userid 605) id F228B84D6F; Tue, 10 Sep 2019 18:14:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7974F84DBC for ; Tue, 10 Sep 2019 18:14:19 +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 T1DXPQ9JIM32 for ; Tue, 10 Sep 2019 18:14:18 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9A68884DB8 for ; Tue, 10 Sep 2019 18:14:18 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 9159BFBF4; Tue, 10 Sep 2019 18:14:18 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_156813925844700" MIME-Version: 1.0 Date: Tue, 10 Sep 2019 18:14:18 +0000 From: "Benny Siegert" Subject: CVS commit: [pkgsrc-2019Q2] pkgsrc/x11/libdrm To: pkgsrc-changes@NetBSD.org Reply-To: bsiegert@netbsd.org X-Mailer: log_accum Message-Id: <20190910181418.9159BFBF4@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. --_----------=_156813925844700 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: bsiegert Date: Tue Sep 10 18:14:18 UTC 2019 Modified Files: pkgsrc/x11/libdrm [pkgsrc-2019Q2]: Makefile distinfo pkgsrc/x11/libdrm/patches [pkgsrc-2019Q2]: patch-xf86drm.c Log Message: Pullup ticket #6051 - requested by maya x11/libdrm: Linux build fix Revisions pulled up: - x11/libdrm/Makefile 1.93-1.94 - x11/libdrm/distinfo 1.94-1.95 - x11/libdrm/patches/patch-xf86drm.c 1.5-1.6 --- Module Name: pkgsrc Committed By: maya Date: Sun Sep 8 15:43:37 UTC 2019 Modified Files: pkgsrc/x11/libdrm: Makefile distinfo pkgsrc/x11/libdrm/patches: patch-xf86drm.c Log Message: libdrm: restore "return 0;" for linux drmParsePciBusInfo. It was lost in a patching accident. From Yosuke Kawasaki in PR pkg/54534 Bump PKGREVISION --- Module Name: pkgsrc Committed By: maya Date: Sun Sep 8 15:55:04 UTC 2019 Modified Files: pkgsrc/x11/libdrm: Makefile distinfo pkgsrc/x11/libdrm/patches: patch-xf86drm.c Log Message: libdrm: don't steal another linux "return" line for the netbsd block. Thanks wiz for the heads up. PR pkg/54534 To generate a diff of this commit: cvs rdiff -u -r1.92 -r1.92.2.1 pkgsrc/x11/libdrm/Makefile cvs rdiff -u -r1.93 -r1.93.2.1 pkgsrc/x11/libdrm/distinfo cvs rdiff -u -r1.4 -r1.4.4.1 pkgsrc/x11/libdrm/patches/patch-xf86drm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_156813925844700 Content-Disposition: inline Content-Length: 3582 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/x11/libdrm/Makefile diff -u pkgsrc/x11/libdrm/Makefile:1.92 pkgsrc/x11/libdrm/Makefile:1.92.2.1 --- pkgsrc/x11/libdrm/Makefile:1.92 Tue Apr 23 09:51:47 2019 +++ pkgsrc/x11/libdrm/Makefile Tue Sep 10 18:14:18 2019 @@ -1,6 +1,7 @@ -# $NetBSD: Makefile,v 1.92 2019/04/23 09:51:47 wiz Exp $ +# $NetBSD: Makefile,v 1.92.2.1 2019/09/10 18:14:18 bsiegert Exp $ DISTNAME= libdrm-2.4.98 +PKGREVISION= 2 CATEGORIES= x11 graphics MASTER_SITES= http://dri.freedesktop.org/libdrm/ EXTRACT_SUFX= .tar.bz2 Index: pkgsrc/x11/libdrm/distinfo diff -u pkgsrc/x11/libdrm/distinfo:1.93 pkgsrc/x11/libdrm/distinfo:1.93.2.1 --- pkgsrc/x11/libdrm/distinfo:1.93 Tue Apr 23 09:51:47 2019 +++ pkgsrc/x11/libdrm/distinfo Tue Sep 10 18:14:18 2019 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.93 2019/04/23 09:51:47 wiz Exp $ +$NetBSD: distinfo,v 1.93.2.1 2019/09/10 18:14:18 bsiegert Exp $ SHA1 (libdrm-2.4.98.tar.bz2) = 4c8a11870a89f59c294bef0109939a7ffaa1fb26 RMD160 (libdrm-2.4.98.tar.bz2) = 1896b9e53ca92d61c6aa7dd6b74303b0c794b01c @@ -8,6 +8,6 @@ SHA1 (patch-ac) = 67c998df7dfc0dabc86320 SHA1 (patch-include_drm_drm.h) = 48a912f40bf2b2a1c23edbe4446fa7869212f17b SHA1 (patch-libkms_vmwgfx.c) = d2204c0b79098c6c36b7f282b486c58c6354bd1d SHA1 (patch-libsync.h) = 1e0603e72a54a069fc9d2ab2c9559d22381a69d3 -SHA1 (patch-xf86drm.c) = 7519074f23f308e806274e003a68e66e8c01e8fc +SHA1 (patch-xf86drm.c) = 02ef5f5ec351b7f52a97ab80d3d469e854ac957a SHA1 (patch-xf86drmMode.c) = 5f66d45a63b0915f22d0abe115aace13c53823a8 SHA1 (patch-xf86drmMode.h) = a28b02887389be8670193c119f711901af61a6b2 Index: pkgsrc/x11/libdrm/patches/patch-xf86drm.c diff -u pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.4 pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.4.4.1 --- pkgsrc/x11/libdrm/patches/patch-xf86drm.c:1.4 Tue Jan 22 21:50:47 2019 +++ pkgsrc/x11/libdrm/patches/patch-xf86drm.c Tue Sep 10 18:14:18 2019 @@ -1,8 +1,8 @@ -$NetBSD: patch-xf86drm.c,v 1.4 2019/01/22 21:50:47 wiz Exp $ +$NetBSD: patch-xf86drm.c,v 1.4.4.1 2019/09/10 18:14:18 bsiegert Exp $ Implement drmParseSubsystemType, drmParsePciBusInfo for NetBSD ---- xf86drm.c.orig 2019-01-22 16:32:41.000000000 +0000 +--- xf86drm.c.orig 2019-04-19 15:52:29.000000000 +0000 +++ xf86drm.c @@ -86,7 +86,10 @@ #endif @@ -16,10 +16,10 @@ Implement drmParseSubsystemType, drmPars #endif #ifdef __OpenBSD__ -@@ -3013,6 +3016,65 @@ static int drmParseSubsystemType(int maj - return bus_types[i].bus_type; +@@ -3032,6 +3035,65 @@ static int drmParseSubsystemType(int maj } + return -EINVAL; +#elif defined(__NetBSD__) + int type, fd; + drmSetVersion sv; @@ -79,13 +79,13 @@ Implement drmParseSubsystemType, drmPars + + /* Success or not, we're done. */ + return ret; - return -EINVAL; #elif defined(__OpenBSD__) || defined(__DragonFly__) return DRM_BUS_PCI; -@@ -3062,6 +3124,73 @@ static int drmParsePciBusInfo(int maj, i - info->dev = dev; + #else +@@ -3081,6 +3143,73 @@ static int drmParsePciBusInfo(int maj, i info->func = func; + return 0; +#elif defined(__NetBSD__) + int type, fd; + drmSetVersion sv; @@ -153,10 +153,10 @@ Implement drmParseSubsystemType, drmPars + + /* Success! */ + return 0; - return 0; #elif defined(__OpenBSD__) || defined(__DragonFly__) struct drm_pciinfo pinfo; -@@ -3229,6 +3358,48 @@ static int drmParsePciDeviceInfo(int maj + int fd, type; +@@ -3247,6 +3376,48 @@ static int drmParsePciDeviceInfo(int maj return parse_config_sysfs_file(maj, min, device); return 0; --_----------=_156813925844700--