Page MenuHomeFreeBSD
Files F160735844

D49121.id151399.diff
No OneTemporary
Actions

D49121.id151399.diff
View Options

Index: graphics/libosmesa/Makefile
===================================================================
--- graphics/libosmesa/Makefile
+++ graphics/libosmesa/Makefile
@@ -8,8 +8,6 @@
LICENSE= MIT
LICENSE_FILE= ${WRKSRC}/docs/license.rst
-LIB_DEPENDS+= libglapi.so:graphics/mesa-libs
-
USES= llvm:lib,noexport xorg
USE_XORG= xorgproto
USE_LDCONFIG= yes
@@ -23,7 +21,6 @@
-Dplatforms="" \
-Dandroid-libbacktrace=disabled \
-Dgallium-vdpau=disabled \
- -Dgallium-omx=disabled \
-Dgallium-va=disabled \
-Dgallium-opencl=disabled \
-Dgallium-xa=disabled \
Index: graphics/mesa-dri/Makefile
===================================================================
--- graphics/mesa-dri/Makefile
+++ graphics/mesa-dri/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mesa-dri
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 4
CATEGORIES= graphics
COMMENT= OpenGL hardware acceleration drivers for DRI2+
@@ -8,8 +7,6 @@
BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}ply>0:devel/py-ply@${PY_FLAVOR}
-LIB_DEPENDS+= libglapi.so:graphics/mesa-libs
-
USES+= llvm:lib,noexport
OPTIONS_DEFINE= ZSTD
Index: graphics/mesa-dri/Makefile.common
===================================================================
--- graphics/mesa-dri/Makefile.common
+++ graphics/mesa-dri/Makefile.common
@@ -9,7 +9,7 @@
# - graphics/mesa-libs
# - lang/clover
-MESAVERSION= 24.1.7
+MESAVERSION= 25.0.0
MASTER_SITES= https://mesa.freedesktop.org/archive/
@@ -17,8 +17,6 @@
PATCH_SITES= https://gitlab.freedesktop.org/mesa/mesa/-/commit/
PATCHFILES+= 4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26284
-PATCHFILES+= 5a9c052ba78e5d1b0020b8f8320d211d2205a958.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29993
-PATCHFILES+= 5d48fb19553c15bbbac498afcb7cc8710a803716.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31931
MAINTAINER= x11@FreeBSD.org
@@ -27,7 +25,8 @@
COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
-BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR}
+BUILD_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}mako>0:textproc/py-mako@${PY_FLAVOR} \
+ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR}
.if ${COMPONENT} != clover
.if ${PORT_OPTIONS:MX11}
USES+= xorg
@@ -35,9 +34,7 @@
.endif
LIB_DEPENDS+= libdrm.so:graphics/libdrm
-.if ${COMPONENT} != osmesa
LIB_DEPENDS+= libexpat.so:textproc/expat2
-.endif
USES+= compiler:c++11-lib bison meson pathfix pkgconfig \
python:build shebangfix tar:xz
Index: graphics/mesa-dri/distinfo
===================================================================
--- graphics/mesa-dri/distinfo
+++ graphics/mesa-dri/distinfo
@@ -1,9 +1,5 @@
-TIMESTAMP = 1724945188
-SHA256 (mesa-24.1.7.tar.xz) = ecd2e7b1c73998f4103542f39c6b8c968d251637ccc8caa42641aecb86cd2566
-SIZE (mesa-24.1.7.tar.xz) = 29206724
+TIMESTAMP = 1740038359
+SHA256 (mesa-25.0.0.tar.xz) = 96a53501fd59679654273258c6c6a1055a20e352ee1429f0b123516c7190e5b0
+SIZE (mesa-25.0.0.tar.xz) = 46643728
SHA256 (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 84f18f14788bd8f387e2fc754b945bf30f84b517dd917785ed5d8ef1d594e24a
SIZE (4a253aae7ca437201d2a31d2a11a1a5434fe41f1.patch) = 1626
-SHA256 (5a9c052ba78e5d1b0020b8f8320d211d2205a958.patch) = 4b4b7e205ea333db66c809d442f17e1f865aa623c54e7e4d918c45a1f2c9704f
-SIZE (5a9c052ba78e5d1b0020b8f8320d211d2205a958.patch) = 2162
-SHA256 (5d48fb19553c15bbbac498afcb7cc8710a803716.patch) = 316360bdb0e0eb46075a8e537e1147283d1e88f2ee48d9eac13bb8c24f7d7b46
-SIZE (5d48fb19553c15bbbac498afcb7cc8710a803716.patch) = 1090
Index: graphics/mesa-dri/files/patch-include_renderdoc__app.h
===================================================================
--- /dev/null
+++ graphics/mesa-dri/files/patch-include_renderdoc__app.h
@@ -0,0 +1,11 @@
+--- include/renderdoc_app.h.orig 2025-02-18 08:24:43 UTC
++++ include/renderdoc_app.h
+@@ -39,6 +39,8 @@
+ #define RENDERDOC_CC
+ #elif defined(__APPLE__)
+ #define RENDERDOC_CC
++#elif defined(__FreeBSD__)
++#define RENDERDOC_CC
+ #else
+ #error "Unknown platform"
+ #endif
Index: graphics/mesa-dri/files/patch-llvmpipe-159fb9691d792594b91e0fbc4c7823e1a191620d.patch
===================================================================
--- graphics/mesa-dri/files/patch-llvmpipe-159fb9691d792594b91e0fbc4c7823e1a191620d.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 159fb9691d792594b91e0fbc4c7823e1a191620d Mon Sep 17 00:00:00 2001
-From: Lucas Fryzek <lfryzek@igalia.com>
-Date: Mon, 28 Oct 2024 13:02:26 -0400
-Subject: [PATCH] lp: Only close udmabuf handle if its valid
-
-Also change ifdef's from just `HAVE_LIBDRM` to check for both LIBDRM
-and for UDMABUF HEADER. preventing unbalanced guards preventing part of
-the code from being included if you just have LIBDRM or just have the
-udmabuf headers.
-
-Fixes: 4cfaf10c ("llvmpipe: Only use udmabuf with libdrm")
-Reviewed-by: Konstantin Seurer <konstantin.seurer@gmail.com>
-Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31877>
----
- src/gallium/drivers/llvmpipe/lp_screen.c | 5 +++--
- src/gallium/drivers/llvmpipe/lp_screen.h | 2 +-
- 2 files changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/src/gallium/drivers/llvmpipe/lp_screen.c b/src/gallium/drivers/llvmpipe/lp_screen.c
-index 8ede54a1fdf20..f85911b4703ac 100644
---- src/gallium/drivers/llvmpipe/lp_screen.c
-+++ src/gallium/drivers/llvmpipe/lp_screen.c
-@@ -939,8 +939,9 @@ llvmpipe_destroy_screen(struct pipe_screen *_screen)
-
- glsl_type_singleton_decref();
-
--#ifdef HAVE_LIBDRM
-- close(screen->udmabuf_fd);
-+#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
-+ if (screen->udmabuf_fd != -1)
-+ close(screen->udmabuf_fd);
- #endif
-
- #if DETECT_OS_LINUX
-diff --git a/src/gallium/drivers/llvmpipe/lp_screen.h b/src/gallium/drivers/llvmpipe/lp_screen.h
-index f36628340b3af..63ce25d56d1d3 100644
---- src/gallium/drivers/llvmpipe/lp_screen.h
-+++ src/gallium/drivers/llvmpipe/lp_screen.h
-@@ -75,7 +75,7 @@ struct llvmpipe_screen
-
- struct disk_cache *disk_shader_cache;
-
--#ifdef HAVE_LIBDRM
-+#if defined(HAVE_LIBDRM) && defined(HAVE_LINUX_UDMABUF_H)
- int udmabuf_fd;
- #endif
-
---
-GitLab
-
Index: graphics/mesa-dri/pkg-plist
===================================================================
--- graphics/mesa-dri/pkg-plist
+++ graphics/mesa-dri/pkg-plist
@@ -3,10 +3,10 @@
@comment include/EGL/eglext.h
@comment include/EGL/eglmesaext.h
@comment include/EGL/eglplatform.h
-include/GL/internal/dri_interface.h
@comment include/GL/gl.h
@comment include/GL/glcorearb.h
@comment include/GL/glext.h
+include/GL/internal/dri_interface.h
@comment include/GLES/egl.h
@comment include/GLES/gl.h
@comment include/GLES/glext.h
@@ -21,33 +21,35 @@
@comment include/GLES3/gl3platform.h
@comment include/KHR/khrplatform.h
@comment include/gbm.h
-%%crocus%%lib/dri/crocus_dri.so
-%%i915%%lib/dri/i915_dri.so
-%%iris%%lib/dri/iris_dri.so
-%%panfrost%%lib/dri/panfrost_dri.so
-%%panfrost%%lib/dri/rockchip_dri.so
-%%r300%%lib/dri/r300_dri.so
-%%r600%%lib/dri/r600_dri.so
-%%radeonsi%%lib/dri/radeonsi_dri.so
-%%svga%%lib/dri/vmwgfx_dri.so
-%%swrast%%lib/dri/kms_swrast_dri.so
-%%swrast%%lib/dri/swrast_dri.so
-%%zink%%lib/dri/zink_dri.so
+%%X11%%%%crocus%%lib/dri/crocus_dri.so
+%%X11%%%%i915%%lib/dri/i915_dri.so
+%%X11%%%%iris%%lib/dri/iris_dri.so
+%%X11%%%%panfrost%%lib/dri/panfrost_dri.so
+%%X11%%%%panfrost%%lib/dri/rockchip_dri.so
+%%X11%%%%r300%%lib/dri/r300_dri.so
+%%X11%%%%r600%%lib/dri/r600_dri.so
+%%X11%%%%radeonsi%%lib/dri/radeonsi_dri.so
+%%X11%%%%svga%%lib/dri/vmwgfx_dri.so
+%%X11%%%%swrast%%lib/dri/kms_swrast_dri.so
+%%X11%%%%swrast%%lib/dri/swrast_dri.so
+%%X11%%%%zink%%lib/dri/zink_dri.so
+%%X11%%lib/dri/libdril_dri.so
@comment lib/libEGL.so
@comment lib/libEGL.so.1
@comment lib/libEGL.so.1.0.0
-@comment lib/libgbm.so
-@comment lib/libgbm.so.1
-@comment lib/libgbm.so.1.0.0
-@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
+lib/libgallium-25.0.0.so
+@comment lib/libgbm.so
+@comment lib/libgbm.so.1
+@comment lib/libgbm.so.1.0.0
+@comment lib/libglapi.so
+@comment lib/libglapi.so.0
+@comment lib/libglapi.so.0.0.0
%%anv%%lib/libvulkan_intel.so
%%radv%%lib/libvulkan_radeon.so
%%swrast_vk%%lib/libvulkan_lvp.so
Index: graphics/mesa-gallium-va/Makefile
===================================================================
--- graphics/mesa-gallium-va/Makefile
+++ graphics/mesa-gallium-va/Makefile
@@ -44,7 +44,6 @@
-Dvulkan-drivers="" \
-Dandroid-libbacktrace=disabled \
-Dgallium-vdpau=disabled \
- -Dgallium-omx=disabled \
-Dgallium-xa=disabled \
-Dgallium-opencl=disabled \
-Dgallium-nine=false \
@@ -56,8 +55,7 @@
-Dmicrosoft-clc=disabled \
-Dosmesa=false \
-Dvalgrind=disabled \
- -Dglx=disabled \
- -Ddri3=enabled
+ -Dglx=disabled
LDFLAGS_i386= -Wl,-znotext
Index: graphics/mesa-gallium-vdpau/Makefile
===================================================================
--- graphics/mesa-gallium-vdpau/Makefile
+++ graphics/mesa-gallium-vdpau/Makefile
@@ -39,7 +39,6 @@
MESON_ARGS+= -Dvulkan-drivers="" \
-Dandroid-libbacktrace=disabled \
-Dgallium-va=disabled \
- -Dgallium-omx=disabled \
-Dgallium-xa=disabled \
-Dgallium-opencl=disabled \
-Dgallium-nine=false \
@@ -51,8 +50,7 @@
-Dmicrosoft-clc=disabled \
-Dosmesa=false \
-Dvalgrind=disabled \
- -Dglx=disabled \
- -Ddri3=enabled
+ -Dglx=disabled
LDFLAGS_i386= -Wl,-znotext
Index: graphics/mesa-gallium-xa/Makefile
===================================================================
--- graphics/mesa-gallium-xa/Makefile
+++ graphics/mesa-gallium-xa/Makefile
@@ -22,7 +22,6 @@
-Dplatforms="" \
-Dandroid-libbacktrace=disabled \
-Dgallium-vdpau=disabled \
- -Dgallium-omx=disabled \
-Dgallium-va=disabled \
-Dgallium-opencl=disabled \
-Dgallium-nine=false \
Index: graphics/mesa-libs/Makefile
===================================================================
--- graphics/mesa-libs/Makefile
+++ graphics/mesa-libs/Makefile
@@ -1,6 +1,5 @@
PORTNAME= mesa-libs
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
CATEGORIES= graphics
COMMENT= OpenGL libraries that support GLX and EGL clients
@@ -35,7 +34,6 @@
MESON_ARGS+= -Dandroid-libbacktrace=disabled \
-Dgallium-vdpau=disabled \
- -Dgallium-omx=disabled \
-Dgallium-va=disabled \
-Dgallium-xa=disabled \
-Dgallium-nine=false \
Index: graphics/mesa-libs/pkg-plist
===================================================================
--- graphics/mesa-libs/pkg-plist
+++ graphics/mesa-libs/pkg-plist
@@ -3,20 +3,20 @@
include/EGL/eglmesaext.h
@comment include/GL/internal/dri_interface.h
include/gbm.h
+@comment lib/dri/libdril_dri.so
@comment lib/dri/radeon_dri.so
@comment lib/dri/r300_dri.so
+lib/gbm/dri_gbm.so
lib/libEGL_mesa.so
lib/libEGL_mesa.so.0
lib/libEGL_mesa.so.0.0.0
%%GLX%%lib/libGLX_mesa.so
%%GLX%%lib/libGLX_mesa.so.0
%%GLX%%lib/libGLX_mesa.so.0.0.0
+@comment lib/libgallium-25.0.0.so
lib/libgbm.so
lib/libgbm.so.1
lib/libgbm.so.1.0.0
-lib/libglapi.so
-lib/libglapi.so.0
-lib/libglapi.so.0.0.0
@comment libdata/pkgconfig/dri.pc
libdata/pkgconfig/gbm.pc
@comment share/drirc.d/00-mesa-defaults.conf
Index: lang/clover/Makefile
===================================================================
--- lang/clover/Makefile
+++ lang/clover/Makefile
@@ -1,6 +1,5 @@
PORTNAME= clover
PORTVERSION= ${MESAVERSION}
-PORTREVISION= 1
CATEGORIES= lang
COMMENT= Mesa OpenCL implementation for AMD GPUs
@@ -29,7 +28,6 @@
-Dvulkan-drivers="" \
-Dandroid-libbacktrace=disabled \
-Dgallium-nine=false \
- -Dgallium-omx=disabled \
-Dgallium-opencl=disabled \
-Dgallium-va=disabled \
-Dgallium-vdpau=disabled \

File Metadata

Mime Type
text/plain
Expires
Sun, Jun 28, 8:47 AM (4 h, 43 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
34427722
Default Alt Text
D49121.id151399.diff (11 KB)

Event Timeline