Attachment 240716 Details for Bug 270060 – 525.89.02 (fixed Wayland conflicts)

[patch] 525.89.02 (fixed Wayland conflicts)

nvidia.patch (text/plain), 5.32 KB, created by Bartek Jasicki on 2023-03-10 08:31:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bartek Jasicki

Created: 2023-03-10 08:31:31 UTC

Size: 5.32 KB

patch

obsolete

>diff --git a/x11/linux-nvidia-libs/Makefile b/x11/linux-nvidia-libs/Makefile
>index 43f751b6f..d7970970f 100644
>--- a/x11/linux-nvidia-libs/Makefile
>+++ b/x11/linux-nvidia-libs/Makefile
>@@ -1,5 +1,5 @@
> PORTNAME=	nvidia-libs
>-DISTVERSION?=	515.86.01
>+DISTVERSION?=	525.89.02
> # Always try to set PORTREVISION as it can be overridden by the slave ports
> PORTREVISION?=	0
> CATEGORIES=	x11 linux
>@@ -122,7 +122,11 @@ PLIST_RE+=	'\,${LINUXBASE}.*libGLESv(1_CM|2)_nvidia\.so,d' \
> 		'\,${LINUXBASE}.*libGLX_(nvidia|indirect)\.so,d' \
> 		'\,${LINUXBASE}.*libnvidia-ptxjitcompiler\.so,d'
> .endif
>-.if ${NVVERSION} >= 495.02905 # 495.29.05
>+.if ${NVVERSION} >= 525.08902 # 525.89.02
>+LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.10
>+LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.10 libnvidia-egl-wayland.so.1
>+PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.10/'
>+.elif ${NVVERSION} >= 495.02905 # 495.29.05
> LINUX_LIBS+=	libnvidia-egl-wayland.so.1.1.9
> LINUX_LINKS+=	libnvidia-egl-wayland.so.1.1.9 libnvidia-egl-wayland.so.1
> PLIST_RE+=	'\,${LINUXBASE},s/(libnvidia-egl-wayland\.so)\.X/\1.1.1.9/'
>diff --git a/x11/linux-nvidia-libs/distinfo b/x11/linux-nvidia-libs/distinfo
>index 29a68c3ae..2b45292fb 100644
>--- a/x11/linux-nvidia-libs/distinfo
>+++ b/x11/linux-nvidia-libs/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1677612334
>-SHA256 (NVIDIA-Linux-x86_64-515.86.01.run) = 141777e1ca2f11e97d8d33260213f1be327eb73922ae22f4ddab404bb2ef4664
>-SIZE (NVIDIA-Linux-x86_64-515.86.01.run) = 363743089
>+TIMESTAMP = 1678276890
>+SHA256 (NVIDIA-Linux-x86_64-525.89.02.run) = 0e412c88c5bd98f842a839a6f64614f20e4c0950ef7cffb12b158a71633593e9
>+SIZE (NVIDIA-Linux-x86_64-525.89.02.run) = 414116295
> SHA256 (NVIDIA-Linux-x86_64-470.161.03.run) = 5da82a7f8c76e781e7d7f0be7b798db4d344f26bd4facf9abcf3c71c71fe7640
> SIZE (NVIDIA-Linux-x86_64-470.161.03.run) = 272397700
> SHA256 (NVIDIA-Linux-x86_64-390.154.run) = f4420280c55210964c008d5b724f2615845d47ad4c9c05d8ed26a62fc6331f7c
>diff --git a/x11/nvidia-driver/Makefile b/x11/nvidia-driver/Makefile
>index 81f9c8ea3..7bbc1ef23 100644
>--- a/x11/nvidia-driver/Makefile
>+++ b/x11/nvidia-driver/Makefile
>@@ -12,7 +12,7 @@
> # ``make DISTVERSION=xxx.yy.zz -DNO_CHECKSUM'' should typically work.
> 
> PORTNAME?=	nvidia-driver
>-DISTVERSION?=	515.86.01
>+DISTVERSION?=	525.89.02
> # Always try to set PORTREVISION as it can be overridden by the slave ports
> PORTREVISION?=	1
> CATEGORIES=	x11
>@@ -34,6 +34,9 @@ PATCH_DEPENDS=	gsed:textproc/gsed
> BUILD_DEPENDS=	pkg-config:devel/pkgconf
> LIB_DEPENDS=	libOpenGL.so:graphics/libglvnd
> .endif
>+.if ${NVVERSION} >= 525.08902
>+LIB_DEPENDS+=	libnvidia-egl-wayland.so.1:graphics/egl-wayland
>+.endif
> 
> USES=		kmod uidfix xorg
> .if ${NVVERSION} >= 470.04201
>@@ -135,8 +138,13 @@ PLIST_SUB+=	LIBGLDIR=${LIBGLDIR} LIBGLMAP="@comment "
> .else
> PLIST_SUB+=	LIBGLDIR="@comment " LIBGLMAP=""
> .endif
>+.if ${NVVERSION} >= 525.08902
>+PLIST_SUB+=	NVEGL=""
>+.else
>+PLIST_SUB+=	NVEGL="@comment "
>+.endif
> 
>-.if ${NVVERSION} >= 515.8601
>+.if ${NVVERSION} >= 515.08601
> PLIST_FILES+=	lib/libnvidia-wayland-client.so.${DISTVERSION}
> .endif
> 
>@@ -397,5 +405,10 @@ post-install: .SILENT
> 	@${ECHO_CMD} "libGLX_indirect.so.0 libGLX_nvidia.so.0" \
> 		>${STAGEDIR}${PREFIX}/etc/libmap.d/nvidia.conf
> .endif
>+.if ${NVVERSION} >= 525.08902
>+	${MKDIR} ${STAGEDIR}${PREFIX}/lib/gbm
>+	${LN} -sf ../libnvidia-allocator.so.1 \
>+		${STAGEDIR}${PREFIX}/lib/gbm/nvidia-drm_gbm.so
>+.endif
> 
> .include <bsd.port.post.mk>
>diff --git a/x11/nvidia-driver/distinfo b/x11/nvidia-driver/distinfo
>index b25ea828a..4cca554e5 100644
>--- a/x11/nvidia-driver/distinfo
>+++ b/x11/nvidia-driver/distinfo
>@@ -1,6 +1,6 @@
>-TIMESTAMP = 1677612209
>-SHA256 (NVIDIA-FreeBSD-x86_64-515.86.01.tar.xz) = 5807c76dd6680754d68d33876ffbd8ab076398f28428ae0c85d67c89e13c589f
>-SIZE (NVIDIA-FreeBSD-x86_64-515.86.01.tar.xz) = 112400260
>+TIMESTAMP = 1678263830
>+SHA256 (NVIDIA-FreeBSD-x86_64-525.89.02.tar.xz) = 2d032b8c0b311af0adb90e2f16d6345939d38de7eae9fbb7836038844d58f2f7
>+SIZE (NVIDIA-FreeBSD-x86_64-525.89.02.tar.xz) = 136622256
> SHA256 (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 54f87e6cadc4aedebc4f862e3d25657fddb867ddc3fe01ad06c9d54bcfa8d607
> SIZE (NVIDIA-FreeBSD-x86_64-470.161.03.tar.xz) = 99719576
> SHA256 (NVIDIA-FreeBSD-x86_64-390.154.tar.gz) = 5994c77c3510a4a89076ecf2bf402f1da635b250cca07655efc913f2a94bee84
>diff --git a/x11/nvidia-driver/pkg-plist b/x11/nvidia-driver/pkg-plist
>index 796e2a79b..247bfda16 100644
>--- a/x11/nvidia-driver/pkg-plist
>+++ b/x11/nvidia-driver/pkg-plist
>@@ -32,10 +32,13 @@ lib/libXvMCNVIDIA.so.1
> lib/libXvMCNVIDIA_dynamic.so.1
> lib/libnvidia-cfg.so
> lib/libnvidia-cfg.so.1
>-@comment lib/libnvidia-egl-gbm.so
>-@comment lib/libnvidia-egl-gbm.so.1
>+%%NVEGL%%lib/libnvidia-egl-gbm.so
>+%%NVEGL%%lib/libnvidia-egl-gbm.so.1
> @comment lib/libnvidia-egl-wayland.so
> @comment lib/libnvidia-egl-wayland.so.1
>+%%NVEGL%%lib/libnvidia-allocator.so
>+%%NVEGL%%lib/libnvidia-allocator.so.1
>+%%NVEGL%%lib/gbm/nvidia-drm_gbm.so
> lib/libnvidia-eglcore.so
> lib/libnvidia-eglcore.so.1
> lib/libnvidia-glcore.so
>@@ -89,7 +92,7 @@ lib32/libnvidia-tls.so.1
> lib32/vdpau/libvdpau_nvidia.so.1
> man/man1/nvidia-smi.1.gz
> @comment share/egl/egl_external_platform.d/10_nvidia_wayland.json
>-@comment share/egl/egl_external_platform.d/15_nvidia_gbm.json
>+%%NVEGL%%share/egl/egl_external_platform.d/15_nvidia_gbm.json
> share/glvnd/egl_vendor.d/10_nvidia.json
> share/vulkan/icd.d/nvidia_icd.json
> share/vulkan/implicit_layer.d/nvidia_layers.json

Actions: View | Diff

Attachments on bug 270060: 240691 | 240716 | 240791 | 240811 | 240835 | 240915