Received: by mail.netbsd.org (Postfix, from userid 605) id E4C4084E5F; Sat, 18 Jan 2020 21:32:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id BD9FF84E23 for ; Sat, 18 Jan 2020 21:29:06 +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 AY0GyQHdQzQt for ; Sat, 18 Jan 2020 21:29:06 +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 15A9B84CE9 for ; Sat, 18 Jan 2020 21:29:06 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 08808FBF4; Sat, 18 Jan 2020 21:29:06 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1579382946100570" MIME-Version: 1.0 Date: Sat, 18 Jan 2020 21:29:06 +0000 From: =?UTF-8?B?RnLDqWTDqXJpYyBGYXViZXJ0ZWF1?= Subject: CVS commit: pkgsrc/graphics/MesaLib To: pkgsrc-changes@NetBSD.org Reply-To: triaxx@netbsd.org X-Mailer: log_accum Message-Id: <20200118212906.08808FBF4@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. --_----------=_1579382946100570 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: triaxx Date: Sat Jan 18 21:29:05 UTC 2020 Modified Files: pkgsrc/graphics/MesaLib: Makefile distinfo Added Files: pkgsrc/graphics/MesaLib/patches: patch-src_mesa_main_marshal.h Log Message: MesaLib: fix PR 54823 pkgsrc changes: --------------- * Undefine ALIGN symbol as close as possible to the ALIGN function since it is defined in machine/param.h on FreeBSD. * Add test to verify there is at least one needed gallium driver for VA. On FreeBSD, nouveau is disabled and r600 and radeonsi are enabled only if llvm option is activated. To generate a diff of this commit: cvs rdiff -u -r1.180 -r1.181 pkgsrc/graphics/MesaLib/Makefile cvs rdiff -u -r1.145 -r1.146 pkgsrc/graphics/MesaLib/distinfo cvs rdiff -u -r0 -r1.1 \ pkgsrc/graphics/MesaLib/patches/patch-src_mesa_main_marshal.h Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1579382946100570 Content-Disposition: inline Content-Length: 3562 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.180 pkgsrc/graphics/MesaLib/Makefile:1.181 --- pkgsrc/graphics/MesaLib/Makefile:1.180 Sat Jan 4 01:50:32 2020 +++ pkgsrc/graphics/MesaLib/Makefile Sat Jan 18 21:29:05 2020 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.180 2020/01/04 01:50:32 nia Exp $ +# $NetBSD: Makefile,v 1.181 2020/01/18 21:29:05 triaxx Exp $ DISTNAME= mesa-19.2.7 PKGNAME= ${DISTNAME:S/mesa/MesaLib/} @@ -54,14 +54,6 @@ MESON_ARGS+= -Degl=true MESON_ARGS+= -Dgbm=true MESON_ARGS+= -Dgallium-xa=true PLIST.kms= yes -. include "../../multimedia/libva/available.mk" -. if ${VAAPI_AVAILABLE} == "yes" -MESON_ARGS+= -Dgallium-va=true -PLIST.vaapi= yes -. include "../../multimedia/libva/buildlink3.mk" -. else -MESON_ARGS+= -Dgallium-va=false -. endif . if !empty(MACHINE_ARCH:M*arm*) || \ ${MACHINE_ARCH} == "aarch64" # ARM Mali Utgard @@ -109,6 +101,16 @@ PLIST.r100= yes PLIST.r200= yes PLIST.r300= yes . endif +. include "../../multimedia/libva/available.mk" +. if ${VAAPI_AVAILABLE} == "yes" && \ + !(empty(GALLIUM_DRIVERS:Mr600) && empty(GALLIUM_DRIVERS:Mradeonsi) && \ + empty(GALLIUM_DRIVERS:Mnouveau)) +MESON_ARGS+= -Dgallium-va=true +PLIST.vaapi= yes +. include "../../multimedia/libva/buildlink3.mk" +. else +MESON_ARGS+= -Dgallium-va=false +. endif .else MESA_PLATFORMS+= surfaceless MESON_ARGS+= -Degl=false Index: pkgsrc/graphics/MesaLib/distinfo diff -u pkgsrc/graphics/MesaLib/distinfo:1.145 pkgsrc/graphics/MesaLib/distinfo:1.146 --- pkgsrc/graphics/MesaLib/distinfo:1.145 Sun Dec 8 13:07:20 2019 +++ pkgsrc/graphics/MesaLib/distinfo Sat Jan 18 21:29:05 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.145 2019/12/08 13:07:20 nia Exp $ +$NetBSD: distinfo,v 1.146 2020/01/18 21:29:05 triaxx Exp $ SHA1 (mesa-19.2.7.tar.xz) = 9b8ebf66770353a48bd710e12e2727fb33645f44 RMD160 (mesa-19.2.7.tar.xz) = 5323b623ac22c168b86548cf6d842ce004e346a9 @@ -35,6 +35,7 @@ SHA1 (patch-src_mapi_u__current.c) = 4e3 SHA1 (patch-src_mapi_u__current.h) = 9f4744681381a0959fda2926a436f296c89577f3 SHA1 (patch-src_mesa_main_extensions.c) = 2f48bdb1176c2878bb33bcfab7556172b50a987e SHA1 (patch-src_mesa_main_macros.h) = c5dceaa8dc02a58e5b2273d82e3fe1cc12e327d3 +SHA1 (patch-src_mesa_main_marshal.h) = 4e4c08796a61aaa9f2463a9797e382e2e29860e9 SHA1 (patch-src_mesa_main_shader__query.cpp) = 3f9c31645d87855759def11344dee16af23c7be3 SHA1 (patch-src_mesa_x86_common__x86.c) = f8c4b93443ef66d017f6aa114b877565b30f2598 SHA1 (patch-src_util_build__id.c) = 7a9547bbda9d2fb9f0018ccf27b70b59e497aa2c Added files: Index: pkgsrc/graphics/MesaLib/patches/patch-src_mesa_main_marshal.h diff -u /dev/null pkgsrc/graphics/MesaLib/patches/patch-src_mesa_main_marshal.h:1.1 --- /dev/null Sat Jan 18 21:29:05 2020 +++ pkgsrc/graphics/MesaLib/patches/patch-src_mesa_main_marshal.h Sat Jan 18 21:29:05 2020 @@ -0,0 +1,16 @@ +$NetBSD: patch-src_mesa_main_marshal.h,v 1.1 2020/01/18 21:29:05 triaxx Exp $ + +ALIGN is also defined in machine/param.h on FreetBSD. + +--- src/mesa/main/marshal.h.orig 2019-12-04 22:10:14.000000000 +0000 ++++ src/mesa/main/marshal.h +@@ -55,6 +55,9 @@ _mesa_glthread_allocate_command(struct gl_context *ctx + struct glthread_state *glthread = ctx->GLThread; + struct glthread_batch *next = &glthread->batches[glthread->next]; + struct marshal_cmd_base *cmd_base; ++#ifdef ALIGN ++#undef ALIGN ++#endif + const size_t aligned_size = ALIGN(size, 8); + + if (unlikely(next->used + size > MARSHAL_MAX_CMD_SIZE)) { --_----------=_1579382946100570--