Received: by mail.netbsd.org (Postfix, from userid 605) id 6018C84D48; Mon, 21 Oct 2019 12:07:33 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id DD88C84D28 for ; Mon, 21 Oct 2019 12:07:32 +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 HbYM3XLpuFxq for ; Mon, 21 Oct 2019 12:07:32 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 56F8384CD5 for ; Mon, 21 Oct 2019 12:07:32 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 50FD0F97B; Mon, 21 Oct 2019 12:07:32 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1571659652129670" MIME-Version: 1.0 Date: Mon, 21 Oct 2019 12:07:32 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/graphics/MesaLib To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20191021120732.50FD0F97B@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. --_----------=_1571659652129670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Mon Oct 21 12:07:32 UTC 2019 Modified Files: pkgsrc/graphics/MesaLib: Makefile distinfo Added Files: pkgsrc/graphics/MesaLib/patches: patch-meson.build Log Message: MesaLib: Fix DRM build on SunOS. To generate a diff of this commit: cvs rdiff -u -r1.170 -r1.171 pkgsrc/graphics/MesaLib/Makefile cvs rdiff -u -r1.135 -r1.136 pkgsrc/graphics/MesaLib/distinfo cvs rdiff -u -r0 -r1.3 pkgsrc/graphics/MesaLib/patches/patch-meson.build Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1571659652129670 Content-Disposition: inline Content-Length: 3082 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/graphics/MesaLib/Makefile diff -u pkgsrc/graphics/MesaLib/Makefile:1.170 pkgsrc/graphics/MesaLib/Makefile:1.171 --- pkgsrc/graphics/MesaLib/Makefile:1.170 Sat Oct 19 13:42:34 2019 +++ pkgsrc/graphics/MesaLib/Makefile Mon Oct 21 12:07:32 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.170 2019/10/19 13:42:34 nia Exp $ +# $NetBSD: Makefile,v 1.171 2019/10/21 12:07:32 jperkin Exp $ DISTNAME= mesa-19.2.1 PKGNAME= ${DISTNAME:S/mesa/MesaLib/} @@ -50,17 +50,12 @@ PLIST_VARS+= egl gbm vaapi xatracker BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.81 .include "../../x11/libdrm/buildlink3.mk" MESA_PLATFORMS+= drm -. if ${OPSYS} != "SunOS" MESON_ARGS+= -Degl=true MESON_ARGS+= -Dgbm=true MESON_ARGS+= -Dgallium-xa=true PLIST.egl= yes PLIST.gbm= yes PLIST.xatracker= yes -. else -MESON_ARGS+= -Degl=false -MESON_ARGS+= -Dgbm=false -. endif . include "../../multimedia/libva/available.mk" . if ${VAAPI_AVAILABLE} == "yes" MESON_ARGS+= -Dgallium-va=true Index: pkgsrc/graphics/MesaLib/distinfo diff -u pkgsrc/graphics/MesaLib/distinfo:1.135 pkgsrc/graphics/MesaLib/distinfo:1.136 --- pkgsrc/graphics/MesaLib/distinfo:1.135 Sat Oct 19 10:29:57 2019 +++ pkgsrc/graphics/MesaLib/distinfo Mon Oct 21 12:07:32 2019 @@ -1,9 +1,10 @@ -$NetBSD: distinfo,v 1.135 2019/10/19 10:29:57 nia Exp $ +$NetBSD: distinfo,v 1.136 2019/10/21 12:07:32 jperkin Exp $ SHA1 (mesa-19.2.1.tar.xz) = 8ba7cb66799d5372923651f193f84d498b35c9a5 RMD160 (mesa-19.2.1.tar.xz) = a3f068b71b138aae24cefd5c3cb044a5975b9aa2 SHA512 (mesa-19.2.1.tar.xz) = decd74976fe866bf67fac4ae55a62d8e33ad24278dd58effe533e7d258b249f0ead848360e7e71444265184c6d9d9b04361caf0c6df99504e33599e7a0cd6c5d Size (mesa-19.2.1.tar.xz) = 11468492 bytes +SHA1 (patch-meson.build) = 9e1ebd7bb6941baedeb79e420f762a0941c68688 SHA1 (patch-src_amd_common_ac__debug.c) = 8233367c3b5bc344442ea8d19488fdd1e3791ae9 SHA1 (patch-src_compiler_builtin__type__macros.h) = e4868011711fb89a293580a12eb603b8e7162336 SHA1 (patch-src_compiler_glsl_glsl__parser__extras.cpp) = ef114d6e288e6d212fce9d1c0606f7d454a171c4 Added files: Index: pkgsrc/graphics/MesaLib/patches/patch-meson.build diff -u /dev/null pkgsrc/graphics/MesaLib/patches/patch-meson.build:1.3 --- /dev/null Mon Oct 21 12:07:32 2019 +++ pkgsrc/graphics/MesaLib/patches/patch-meson.build Mon Oct 21 12:07:32 2019 @@ -0,0 +1,15 @@ +$NetBSD: patch-meson.build,v 1.3 2019/10/21 12:07:32 jperkin Exp $ + +Fix DRM build on SunOS. + +--- meson.build.orig 2019-10-09 16:51:59.000000000 +0000 ++++ meson.build +@@ -117,7 +117,7 @@ with_any_opengl = with_opengl or with_gl + # Only build shared_glapi if at least one OpenGL API is enabled + with_shared_glapi = get_option('shared-glapi') and with_any_opengl + +-system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux'].contains(host_machine.system()) ++system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos'].contains(host_machine.system()) + + dri_drivers = get_option('dri-drivers') + if dri_drivers.contains('auto') --_----------=_1571659652129670--