diff options
Diffstat (limited to 'graphics/mesa-devel')
| -rw-r--r-- | graphics/mesa-devel/Makefile | 20 | ||||
| -rw-r--r-- | graphics/mesa-devel/distinfo | 10 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/libmap.conf.in | 2 | ||||
| -rw-r--r-- | graphics/mesa-devel/files/patch-suffix | 9 | ||||
| -rw-r--r-- | graphics/mesa-devel/pkg-plist | 8 |
5 files changed, 13 insertions, 36 deletions
diff --git a/graphics/mesa-devel/Makefile b/graphics/mesa-devel/Makefile index 06f6aab9d824..f856fd77ad5b 100644 --- a/graphics/mesa-devel/Makefile +++ b/graphics/mesa-devel/Makefile @@ -1,13 +1,14 @@ PORTNAME= mesa -DISTVERSION= 25.2-branchpoint-1483 -DISTVERSIONSUFFIX= -gfc1b26f4dca +DISTVERSION= 25.2-branchpoint-4196 +DISTVERSIONSUFFIX= -ge02a1bb173e +PORTREVISION= 1 CATEGORIES= graphics PKGNAMESUFFIX= -devel PATCH_SITES= https://github.com/mesa3d/${GL_PROJECT}/commit/:github PATCHFILES+= 700efacda59c.patch:-p1:github PATCH_SITES+= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= 2930dcbb3329.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246 +PATCHFILES+= de5cf0a44b50.patch:-p1 # https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22246 MAINTAINER= jbeich@FreeBSD.org COMMENT= Bleeding edge Mesa drivers (OpenCL, OpenGL, Vulkan) @@ -46,8 +47,8 @@ MESON_ARGS= -Dgallium-mediafoundation=disabled \ LDFLAGS+= -Wl,--undefined-version # https://gitlab.freedesktop.org/mesa/mesa/-/issues/8003 PLIST_SUB= ARCH=${ARCH:S/amd/x86_/} -OPTIONS_DEFINE= DRM LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD -OPTIONS_DEFAULT= DRM LLVM LTO OPENCL VAAPI VDPAU VKLAYERS WAYLAND X11 ZSTD +OPTIONS_DEFINE= DRM LLVM LTO OPENCL VAAPI VKLAYERS WAYLAND X11 ZSTD +OPTIONS_DEFAULT= DRM LLVM LTO OPENCL VAAPI VKLAYERS WAYLAND X11 ZSTD OPTIONS_GROUP= GALLIUM VULKAN OPTIONS_GROUP_GALLIUM= crocus iris panfrost r600 radeonsi OPTIONS_GROUP_VULKAN= anv hasvk radv @@ -125,11 +126,6 @@ VAAPI_DESC= Hardware encoding/decoding (only r600, radeonsi) VAAPI_BUILD_DEPENDS= libva>0:multimedia/libva VAAPI_MESON_ENABLED= gallium-va -VDPAU_DESC= Hardware decoding (only r600, radeonsi) (implies X11) -VDPAU_BUILD_DEPENDS= libvdpau>0:multimedia/libvdpau -VDPAU_MESON_ENABLED= gallium-vdpau -VDPAU_IMPLIES= X11 - VKLAYERS_DESC= Vulkan layers: ${VKLAYERS_MESON_ON:C/.*=//} (implies ${VKLAYERS_IMPLIES}) VKLAYERS_BUILD_DEPENDS= glslangValidator:graphics/glslang VKLAYERS_LIB_DEPENDS= libpng.so:graphics/png @@ -151,8 +147,8 @@ ZSTD_MESON_ENABLED= zstd post-patch: # Extract (snapshot) version from the port instead of empty string - @${REINPLACE_CMD} '/MESA_GIT_SHA1/s/""/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \ - ${WRKSRC}/bin/git_sha1_gen.py + @${REINPLACE_CMD} '/MESA_GIT_SHA1/s/@VCS_TAG@/" (git-${DISTVERSIONSUFFIX:C/.*-g//})"/' \ + ${WRKSRC}/src/git_sha1.h.in post-patch-COINST-on: @${MV} ${WRKSRC}/src/util/00-${PORTNAME}-defaults.conf \ diff --git a/graphics/mesa-devel/distinfo b/graphics/mesa-devel/distinfo index 64ef340b296e..8227b6b79979 100644 --- a/graphics/mesa-devel/distinfo +++ b/graphics/mesa-devel/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1755114577 -SHA256 (mesa-25.2-branchpoint-1483-gfc1b26f4dca.tar.bz2) = a4b80ddad011b28c7ff83121897af3a90a7d19c9e8fbae2a035db5c133584df7 -SIZE (mesa-25.2-branchpoint-1483-gfc1b26f4dca.tar.bz2) = 58503529 +TIMESTAMP = 1759355513 +SHA256 (mesa-25.2-branchpoint-4196-ge02a1bb173e.tar.bz2) = 23f1eae32d4f12de25ae9e19cbfd2aa943b75c4abc17bf8e7af3ca86f93c7031 +SIZE (mesa-25.2-branchpoint-4196-ge02a1bb173e.tar.bz2) = 58798740 SHA256 (700efacda59c.patch) = 0d567fe737ad1404e1f12d7cd018826d9095c23835f1ed5aaa1c81cb58d3d008 SIZE (700efacda59c.patch) = 983 -SHA256 (2930dcbb3329.patch) = f90ab77950ba1a56d165f0bc8a3cbd9c5f624bb5c67d1c7f337316027e8295e8 -SIZE (2930dcbb3329.patch) = 1638 +SHA256 (de5cf0a44b50.patch) = c9e02e5eb1fb4e3aa2bc7a7e0a70f28f3ee609835ff0b59e827893a821983851 +SIZE (de5cf0a44b50.patch) = 1108 diff --git a/graphics/mesa-devel/files/libmap.conf.in b/graphics/mesa-devel/files/libmap.conf.in index 319d4562dc1a..ff4183bda0ad 100644 --- a/graphics/mesa-devel/files/libmap.conf.in +++ b/graphics/mesa-devel/files/libmap.conf.in @@ -15,5 +15,3 @@ libgbm.so.1 libgbm%%SUFFIX%%.so.1 %%VAAPI%%%%r600%%%%PREFIX%%/lib/dri/r600_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/r600_drv_video.so %%VAAPI%%%%radeonsi%%%%PREFIX%%/lib/dri/radeonsi_drv_video.so %%PREFIX%%/lib/dri%%SUFFIX%%/radeonsi_drv_video.so -%%VDPAU%%%%r600%%%%PREFIX%%/lib/vdpau/libvdpau_r600.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1 -%%VDPAU%%%%radeonsi%%%%PREFIX%%/lib/vdpau/libvdpau_radeonsi.so.1 %%PREFIX%%/lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1 diff --git a/graphics/mesa-devel/files/patch-suffix b/graphics/mesa-devel/files/patch-suffix index 8783f8460a0a..040b62dc5a09 100644 --- a/graphics/mesa-devel/files/patch-suffix +++ b/graphics/mesa-devel/files/patch-suffix @@ -22,15 +22,6 @@ Library selection is handled by libglvnd and/or libmap.conf. dep_glvnd = dependency('libglvnd', version : '>= 1.3.2', required : _glvnd) with_glvnd = dep_glvnd.found() if with_glvnd -@@ -622,7 +621,7 @@ if vdpau_drivers_path == '' - - vdpau_drivers_path = get_option('vdpau-libs-path') - if vdpau_drivers_path == '' -- vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau') -+ vdpau_drivers_path = join_paths(get_option('libdir'), 'vdpau' + get_option('egl-lib-suffix')) - endif - - prog_glslang = find_program('glslangValidator', native : true, required : with_vulkan_overlay_layer or with_aco_tests or with_amd_vk or with_intel_vk) @@ -739,7 +738,7 @@ if va_drivers_path == '' va_drivers_path = get_option('va-libs-path') diff --git a/graphics/mesa-devel/pkg-plist b/graphics/mesa-devel/pkg-plist index 71eaba960928..673ba22aef62 100644 --- a/graphics/mesa-devel/pkg-plist +++ b/graphics/mesa-devel/pkg-plist @@ -38,14 +38,6 @@ lib/libgbm%%SUFFIX%%.so.1.0.0 %%anv%%lib/libvulkan_intel%%SUFFIX%%.so %%hasvk%%lib/libvulkan_intel_hasvk%%SUFFIX%%.so %%radv%%lib/libvulkan_radeon%%SUFFIX%%.so -%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so -%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1 -%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0 -%%VDPAU%%%%r600%%lib/vdpau%%SUFFIX%%/libvdpau_r600.so.1.0.0 -%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so -%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1 -%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0 -%%VDPAU%%%%radeonsi%%lib/vdpau%%SUFFIX%%/libvdpau_radeonsi.so.1.0.0 %%NO_COINST%%libdata/pkgconfig/dri.pc %%NO_COINST%%libdata/pkgconfig/gbm.pc share/drirc.d/00-mesa%%SUFFIX%%-defaults.conf |