FreeBSD Bugzilla – Attachment 218073 Details for
Bug 249448
graphics/mesa-libs: conflicts with x11/nvidia-driver, x11/nvidia-driver-390 (/usr/local/lib/libGLESv1_CM.so)
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
v2
nvidia2.patch (text/plain), 2.86 KB, created by
Emmanuel Vadot
on 2020-09-19 11:35:08 UTC
(
hide
)
Description:
v2
Filename:
MIME Type:
Creator:
Emmanuel Vadot
Created:
2020-09-19 11:35:08 UTC
Size:
2.86 KB
patch
obsolete
>Index: x11/nvidia-driver/Makefile >=================================================================== >--- x11/nvidia-driver/Makefile (revision 548962) >+++ x11/nvidia-driver/Makefile (working copy) >@@ -261,6 +261,11 @@ > ${MV} -f ${STAGEDIR}${PREFIX}/lib/libEGL.so.1 \ > ${STAGEDIR}${PREFIX}/lib/libEGL-NVIDIA.so.1 > ${RM} ${STAGEDIR}${PREFIX}/lib/libEGL.so >+ ${LN} -sf libGLESv1_CM-NVIDIA.so.1 \ >+ ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM-NVIDIA.so >+ ${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so.1 \ >+ ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM-NVIDIA.so.1 >+ ${RM} ${STAGEDIR}${PREFIX}/lib/libGLESv1_CM.so > ${LN} -sf libGLESv2-NVIDIA.so.2 \ > ${STAGEDIR}${PREFIX}/lib/libGLESv2-NVIDIA.so > ${MV} -f ${STAGEDIR}${PREFIX}/lib/libGLESv2.so.2 \ >Index: x11/nvidia-driver/files/nvidia.conf.in >=================================================================== >--- x11/nvidia-driver/files/nvidia.conf.in (revision 548962) >+++ x11/nvidia-driver/files/nvidia.conf.in (working copy) >@@ -6,6 +6,9 @@ > %%NVGL%%libEGL.so libEGL-NVIDIA.so > %%NVGL%%libEGL.so.1 libEGL-NVIDIA.so.1 > >+%%NVGL%%libGLESv1_CM.so libGLESv1_CM-NVIDIA.so >+%%NVGL%%libGLESv1_CM.so.1 libGLESv1_CM-NVIDIA.so.1 >+ > %%NVGL%%libGLESv2.so libGLESv2-NVIDIA.so > %%NVGL%%libGLESv2.so.2 libGLESv2-NVIDIA.so.2 > >Index: x11/nvidia-driver/pkg-plist >=================================================================== >--- x11/nvidia-driver/pkg-plist (revision 548962) >+++ x11/nvidia-driver/pkg-plist (working copy) >@@ -8,8 +8,6 @@ > lib/libEGL_nvidia.so.0 > lib/libGL-NVIDIA.so > lib/libGL-NVIDIA.so.1 >-lib/libGLESv1_CM.so >-lib/libGLESv1_CM.so.1 > lib/libGLESv1_CM_nvidia.so > lib/libGLESv1_CM_nvidia.so.1 > lib/libGLESv2-NVIDIA.so >Index: x11/nvidia-driver-304/Makefile >=================================================================== >--- x11/nvidia-driver-304/Makefile (revision 548962) >+++ x11/nvidia-driver-304/Makefile (working copy) >@@ -3,7 +3,7 @@ > > DISTVERSION= 304.137 > # Explicitly set PORTREVISION as it can be overridden by the master port >-PORTREVISION= 7 >+PORTREVISION= 8 > > MASTERDIR= ${.CURDIR}/../nvidia-driver > PKGNAMESUFFIX= -304 >Index: x11/nvidia-driver-340/Makefile >=================================================================== >--- x11/nvidia-driver-340/Makefile (revision 548962) >+++ x11/nvidia-driver-340/Makefile (working copy) >@@ -3,7 +3,7 @@ > > DISTVERSION= 340.108 > # Explicitly set PORTREVISION as it can be overridden by the master port >-PORTREVISION= 1 >+PORTREVISION= 2 > > MASTERDIR= ${.CURDIR}/../nvidia-driver > PKGNAMESUFFIX= -340 >Index: x11/nvidia-driver-390/Makefile >=================================================================== >--- x11/nvidia-driver-390/Makefile (revision 548962) >+++ x11/nvidia-driver-390/Makefile (working copy) >@@ -3,7 +3,7 @@ > > DISTVERSION= 390.138 > # Explicitly set PORTREVISION as it can be overridden by the master port >-PORTREVISION= 0 >+PORTREVISION= 1 > > MASTERDIR= ${.CURDIR}/../nvidia-driver > PKGNAMESUFFIX= -390
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 249448
:
218072
|
218073
|
218074
|
218075
|
218135