From owner-svn-ports-all@freebsd.org Fri Jun 12 07:49:34 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 07CE133237D; Fri, 12 Jun 2020 07:49:34 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49jtCx2mRLz46H1; Fri, 12 Jun 2020 07:49:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5144326229; Fri, 12 Jun 2020 07:49:32 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05C7nW05063397; Fri, 12 Jun 2020 07:49:32 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05C7nV7C063395; Fri, 12 Jun 2020 07:49:31 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <202006120749.05C7nV7C063395@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Fri, 12 Jun 2020 07:49:31 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538570 - in head/graphics/mesa-devel: . files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head/graphics/mesa-devel: . files X-SVN-Commit-Revision: 538570 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 12 Jun 2020 07:49:35 -0000 Author: jbeich Date: Fri Jun 12 07:49:31 2020 New Revision: 538570 URL: https://svnweb.freebsd.org/changeset/ports/538570 Log: graphics/mesa-devel: disable EGL ICD with libglvnd Adding suffix to flat .json file was broken, anyway. Reported by: Greg V Modified: head/graphics/mesa-devel/Makefile (contents, props changed) head/graphics/mesa-devel/files/patch-suffix (contents, props changed) Modified: head/graphics/mesa-devel/Makefile ============================================================================== --- head/graphics/mesa-devel/Makefile Fri Jun 12 07:49:30 2020 (r538569) +++ head/graphics/mesa-devel/Makefile Fri Jun 12 07:49:31 2020 (r538570) @@ -146,8 +146,6 @@ post-patch: @${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \ ${WRKSRC}/bin/git_sha1_gen.py .if defined(PKGNAMESUFFIX) - @${MV} ${WRKSRC}/src/egl/main/50_${PORTNAME}.json \ - ${WRKSRC}/src/egl/main/50_${PKGBASE}.json @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ ${WRKSRC}/src/util/00-${PKGBASE}-defaults.conf .endif Modified: head/graphics/mesa-devel/files/patch-suffix ============================================================================== --- head/graphics/mesa-devel/files/patch-suffix Fri Jun 12 07:49:30 2020 (r538569) +++ head/graphics/mesa-devel/files/patch-suffix Fri Jun 12 07:49:31 2020 (r538570) @@ -51,19 +51,9 @@ Library selection is handled by libglvnd and/or libmap [libradv_files, radv_entrypoints, radv_extensions_c, amd_vk_format_table_c, sha1_h], include_directories : [ inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux, inc_amd, inc_amd_common, inc_amd_common_llvm, inc_compiler, inc_util, inc_vulkan_wsi, ---- src/egl/main/50_mesa.json.orig 2020-05-30 21:28:01 UTC -+++ src/egl/main/50_mesa.json -@@ -1,6 +1,6 @@ - { - "file_format_version" : "1.0.0", - "ICD" : { -- "library_path" : "libEGL_mesa.so.0" -+ "library_path" : "libEGL_mesa@0@.so.0".format(get_option('egl-lib-suffix')) - } - } --- src/egl/meson.build.orig 2020-05-30 21:28:01 UTC +++ src/egl/meson.build -@@ -147,13 +147,13 @@ if not with_glvnd +@@ -147,7 +147,7 @@ if not with_glvnd egl_lib_name = 'EGL' + get_option('egl-lib-suffix') egl_lib_version = '1.0.0' else @@ -72,13 +62,6 @@ Library selection is handled by libglvnd and/or libmap egl_lib_version = '0.0.0' deps_for_egl += dep_glvnd files_egl += [g_egldispatchstubs_h, g_egldispatchstubs_c] - files_egl += files('main/eglglvnd.c', 'main/egldispatchstubs.c') - install_data( -- 'main/50_mesa.json', -+ 'main/50_mesa@0@.json'.format(get_option('egl-lib-suffix')), - install_dir : join_paths(get_option('datadir'), 'glvnd', 'egl_vendor.d') - ) - endif --- src/gbm/backends/dri/gbm_dri.c.orig 2020-05-30 21:28:01 UTC +++ src/gbm/backends/dri/gbm_dri.c @@ -307,14 +307,6 @@ dri_bind_extensions(struct gbm_dri_device *dri,