Received: by mail.netbsd.org (Postfix, from userid 605) id 0C28F84D43; Tue, 21 Jan 2020 14:41:28 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 87EAE84CF7 for ; Tue, 21 Jan 2020 14:41:27 +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 aejqTEGLLMGx for ; Tue, 21 Jan 2020 14:41:27 +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 F3D2E84CE7 for ; Tue, 21 Jan 2020 14:41:26 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id EDD36FBF4; Tue, 21 Jan 2020 14:41:26 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1579617686205050" MIME-Version: 1.0 Date: Tue, 21 Jan 2020 14:41:26 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/graphics/MesaLib To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20200121144126.EDD36FBF4@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. --_----------=_1579617686205050 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Jan 21 14:41:26 UTC 2020 Modified Files: pkgsrc/graphics/MesaLib: Makefile distinfo Added Files: pkgsrc/graphics/MesaLib/patches: patch-src_egl_drivers_dri2_platform__drm.c Log Message: MesaLib: Revert upstream commit causing symbol ref errors with libEGL Bump PKGREVISION To generate a diff of this commit: cvs rdiff -u -r1.182 -r1.183 pkgsrc/graphics/MesaLib/Makefile cvs rdiff -u -r1.146 -r1.147 pkgsrc/graphics/MesaLib/distinfo cvs rdiff -u -r0 -r1.5 \ pkgsrc/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1579617686205050 Content-Disposition: inline Content-Length: 3181 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.182 pkgsrc/graphics/MesaLib/Makefile:1.183 --- pkgsrc/graphics/MesaLib/Makefile:1.182 Sat Jan 18 21:30:05 2020 +++ pkgsrc/graphics/MesaLib/Makefile Tue Jan 21 14:41:26 2020 @@ -1,8 +1,8 @@ -# $NetBSD: Makefile,v 1.182 2020/01/18 21:30:05 triaxx Exp $ +# $NetBSD: Makefile,v 1.183 2020/01/21 14:41:26 nia Exp $ DISTNAME= mesa-19.2.7 PKGNAME= ${DISTNAME:S/mesa/MesaLib/} -PKGREVISION= 2 +PKGREVISION= 3 CATEGORIES= graphics MASTER_SITES= https://mesa.freedesktop.org/archive/ EXTRACT_SUFX= .tar.xz Index: pkgsrc/graphics/MesaLib/distinfo diff -u pkgsrc/graphics/MesaLib/distinfo:1.146 pkgsrc/graphics/MesaLib/distinfo:1.147 --- pkgsrc/graphics/MesaLib/distinfo:1.146 Sat Jan 18 21:29:05 2020 +++ pkgsrc/graphics/MesaLib/distinfo Tue Jan 21 14:41:26 2020 @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.146 2020/01/18 21:29:05 triaxx Exp $ +$NetBSD: distinfo,v 1.147 2020/01/21 14:41:26 nia Exp $ SHA1 (mesa-19.2.7.tar.xz) = 9b8ebf66770353a48bd710e12e2727fb33645f44 RMD160 (mesa-19.2.7.tar.xz) = 5323b623ac22c168b86548cf6d842ce004e346a9 @@ -8,6 +8,7 @@ SHA1 (patch-include_c11_threads__posix.h 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 +SHA1 (patch-src_egl_drivers_dri2_platform__drm.c) = 9230fbae2c04246ebca8437ecad694bbae857fbe SHA1 (patch-src_egl_drivers_dri2_platform__x11.c) = 49e48c31eacb79d1da357fe70eaffd2926b5280e SHA1 (patch-src_egl_main_eglglobals.c) = 0d52014f52e62fc5fa6650336ddb0011ecf331e6 SHA1 (patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c) = f913b779404e6bd8ae707a4fd66eb7c1dca9b311 Added files: Index: pkgsrc/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c diff -u /dev/null pkgsrc/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c:1.5 --- /dev/null Tue Jan 21 14:41:26 2020 +++ pkgsrc/graphics/MesaLib/patches/patch-src_egl_drivers_dri2_platform__drm.c Tue Jan 21 14:41:26 2020 @@ -0,0 +1,23 @@ +$NetBSD: patch-src_egl_drivers_dri2_platform__drm.c,v 1.5 2020/01/21 14:41:26 nia Exp $ + +Revert: https://cgit.freedesktop.org/mesa/mesa/commit/?id=621b0fa8922ade0a8122b868177308e65e6d3595 + +This causes symbol referencing errors: +"ld: /usr/pkg/lib/libEGL.so.1: undefined reference to `gbm_format_get_name'" + +TODO: Talk to upstream and investigate why. + +--- src/egl/drivers/dri2/platform_drm.c.orig 2019-12-04 22:10:12.000000000 +0000 ++++ src/egl/drivers/dri2/platform_drm.c +@@ -649,9 +649,8 @@ drm_add_configs_for_visuals(_EGLDriver * + + for (unsigned i = 0; i < ARRAY_SIZE(format_count); i++) { + if (!format_count[i]) { +- struct gbm_format_name_desc desc; +- _eglLog(_EGL_DEBUG, "No DRI config supports native format %s", +- gbm_format_get_name(visuals[i].gbm_format, &desc)); ++ _eglLog(_EGL_DEBUG, "No DRI config supports native format 0x%x", ++ visuals[i].gbm_format); + } + } + --_----------=_1579617686205050--