From nobody Wed Nov 22 09:50:15 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4SZxLb5lN7z51GXx; Wed, 22 Nov 2023 09:50:15 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SZxLb5GkPz3TP6; Wed, 22 Nov 2023 09:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700646615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIQO5cRoUDlKVI1efWCJS/NNKrFItCNJ6spvdnPFPWw=; b=Lbg5MnwwJZ5Yn/tQ7KPiF1topghIrLp/qA5JxphsGRNP9oBkHDTn5tZot7lZ1i6suXyXbF tbMTsiJMVJsAl0STKu6CMffykl5Ow75H1D26DgSjBvg9pCjuASRIVL1i/pc+dNUGlh58ZT Nw4qTYxYLUtl3PjsY4wEGiO6S7w/E/JOfk51R29oVRg0DRD8oOQNJ2R3PRDbPNWB1ykUNN 5mmfJyF80SnIveeVhwpDy8Dh2hVG2z8RS+O4QdnoebhunKtaUqdHXbvQPpgAa0ZLNxYUfN xItfXPgGZ8SHC8/NrB5ZvKFglO15GZlr99eN8lJi/R9rIbuWn9uMVt7s5U4epg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700646615; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VIQO5cRoUDlKVI1efWCJS/NNKrFItCNJ6spvdnPFPWw=; b=vnNNzTafYJdCmdHQSO/ip1IK7WRxi+i630hiabhwVBPhufhVaMAN7yx+F+xOl2Q0GgcbaR ITofz9do0XpSG1wWNEOv1toCr/lrLE3gpOsCfWl/Z5HQdKE/cRBKFJV9jkDHY3k7t5e1jV dD71qItZbAipFzZACkM46k7BiOmX66kPuaz43TGCEjBnfZcakUvpJwLi6Whw2fegP6FjSg uKVvKfgmSpdf7ndg6SVq2K+yGBRru1kKz/LrReFX90aKO/e863rIaz3d/DAOWxNNEEz/7a Ig2wDBoxZFlc6fnqCthxHRaBWvNFrK1zZV3KkT3NjsCJxngQQYlG6lzM6rpkpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700646615; a=rsa-sha256; cv=none; b=dR7MXAjLoOm6FQC3USkBBlsjZIgUrIsgwRs0Z5SSguGECpIu6nDpQxuyETDsomrh3V47Zq NiiHG6UYEOWkXwX8wB82mw/Rkpyn7B2NvxKfwMfW+YLhmLAFkhYg5rk0rzdp+isccpniFL CUQ4VpI4lQ8+ZnNbi1/2xLsiu1WbmdZ5AKiOUKFefK44WS72zmiCxy9DVp9lsyhvxtkeST oMkZ3bHcvZRahRcz/S2VTvF9KZjTJTyrbTEcSoZUwW5iQ5zTWZ0uoC0bsW9csjkIhQlSdq 5fYYRG17+cUbaNim6eLDy183Mcpe4n1QLoP1sYHN064BUkBBG4H9yZT1+EGtog== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4SZxLb45cNz1Cc4; Wed, 22 Nov 2023 09:50:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AM9oFtS075526; Wed, 22 Nov 2023 09:50:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AM9oF74075521; Wed, 22 Nov 2023 09:50:15 GMT (envelope-from git) Date: Wed, 22 Nov 2023 09:50:15 GMT Message-Id: <202311220950.3AM9oF74075521@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 8df779db3590 - main - graphics/mesa-dri: vulkan: Remove haswell driver List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8df779db3590087452a722a2412eb3020f0f00fd Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/ports/commit/?id=8df779db3590087452a722a2412eb3020f0f00fd commit 8df779db3590087452a722a2412eb3020f0f00fd Author: Emmanuel Vadot AuthorDate: 2023-11-21 18:16:55 +0000 Commit: Emmanuel Vadot CommitDate: 2023-11-22 09:49:02 +0000 graphics/mesa-dri: vulkan: Remove haswell driver Haswell doesn't work so remove it. While here fix plist, PR 275242 PR: 275242 Sponsored by: Beckhoff Automation GmbH & Co. KG --- graphics/mesa-dri/Makefile | 5 +++-- graphics/mesa-dri/pkg-plist | 22 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile index 40d00e2cb805..e309b1adf75f 100644 --- a/graphics/mesa-dri/Makefile +++ b/graphics/mesa-dri/Makefile @@ -1,5 +1,6 @@ PORTNAME= mesa-dri PORTVERSION= ${MESAVERSION} +PORTREVISION= 1 CATEGORIES= graphics COMMENT= OpenGL hardware acceleration drivers for DRI2+ @@ -33,7 +34,7 @@ ZSTD_MESON_ENABLED= zstd ALL_GALLIUM_DRIVERS= CROCUS I915 IRIS PANFROST R300 R600 RADEONSI SVGA \ SWRAST ZINK -ALL_VULKAN_DRIVERS= INTEL INTEL_HASVK AMD SWRAST +ALL_VULKAN_DRIVERS= INTEL AMD SWRAST GALLIUM_DRIVERS+= SWRAST \ ZINK @@ -51,7 +52,7 @@ BUILD_DEPENDS+= glslangValidator:graphics/glslang .endif .if ${ARCH} == amd64 || ${ARCH} == i386 GALLIUM_DRIVERS+= CROCUS I915 IRIS SVGA -VULKAN_DRIVERS+= INTEL INTEL_HASVK +VULKAN_DRIVERS+= INTEL .endif LDFLAGS_i386= -Wl,-znotext diff --git a/graphics/mesa-dri/pkg-plist b/graphics/mesa-dri/pkg-plist index cd7f2d263fb1..1dbaa3607221 100644 --- a/graphics/mesa-dri/pkg-plist +++ b/graphics/mesa-dri/pkg-plist @@ -7,6 +7,18 @@ include/GL/internal/dri_interface.h @comment include/GL/gl.h @comment include/GL/glcorearb.h @comment include/GL/glext.h +@comment include/GLES/egl.h +@comment include/GLES/gl.h +@comment include/GLES/glext.h +@comment include/GLES/glplatform.h +@comment include/GLES2/gl2.h +@comment include/GLES2/gl2ext.h +@comment include/GLES2/gl2platform.h +@comment include/GLES3/gl3.h +@comment include/GLES3/gl31.h +@comment include/GLES3/gl32.h +@comment include/GLES3/gl3ext.h +@comment include/GLES3/gl3platform.h @comment include/KHR/khrplatform.h @comment include/gbm.h %%CROCUS_GDRIVER%%lib/dri/crocus_dri.so @@ -30,17 +42,23 @@ include/GL/internal/dri_interface.h @comment lib/libglapi.so @comment lib/libglapi.so.0 @comment lib/libglapi.so.0.0.0 +@comment lib/libGLESv1_CM.so +@comment lib/libGLESv1_CM.so.1 +@comment lib/libGLESv1_CM.so.1.1.0 +@comment lib/libGLESv2.so +@comment lib/libGLESv2.so.2 +@comment lib/libGLESv2.so.2.0.0 %%INTEL_VDRIVER%%lib/libvulkan_intel.so -%%INTEL_VDRIVER%%lib/libvulkan_intel_hasvk.so %%AMD_VDRIVER%%lib/libvulkan_radeon.so %%SWRAST_VDRIVER%%lib/libvulkan_lvp.so libdata/pkgconfig/dri.pc @comment libdata/pkgconfig/egl.pc @comment libdata/pkgconfig/gbm.pc +@comment libdata/pkgconfig/glesv1_cm.pc +@comment libdata/pkgconfig/glesv2.pc share/drirc.d/00-mesa-defaults.conf %%AMD_VDRIVER%%share/drirc.d/00-radv-defaults.conf share/drirc.d/01-freebsd.conf %%INTEL_VDRIVER%%share/vulkan/icd.d/intel_icd.%%ARCH%%.json -%%INTEL_VDRIVER%%share/vulkan/icd.d/intel_hasvk_icd.%%ARCH%%.json %%AMD_VDRIVER%%share/vulkan/icd.d/radeon_icd.%%ARCH%%.json %%SWRAST_VDRIVER%%share/vulkan/icd.d/lvp_icd.%%ARCH%%.json