FreeBSD Bugzilla – Attachment 226056 Details for
Bug 256782
emulators/i386-wine & i386-wine-devel: Broken with libglvnd
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
i386-wine & i386-wine-devel fixed for AMD & NVIDIA with libglvnd enabled
i386-wine-[devel]-libglvnd.diff (text/plain), 10.78 KB, created by
Alexander Vereeken
on 2021-06-26 08:46:44 UTC
(
hide
)
Description:
i386-wine & i386-wine-devel fixed for AMD & NVIDIA with libglvnd enabled
Filename:
MIME Type:
Creator:
Alexander Vereeken
Created:
2021-06-26 08:46:44 UTC
Size:
10.78 KB
patch
obsolete
>diff --git a/emulators/i386-wine-devel/Makefile b/emulators/i386-wine-devel/Makefile >index 11df06019..2742227a8 100644 >--- a/emulators/i386-wine-devel/Makefile >+++ b/emulators/i386-wine-devel/Makefile >@@ -10,7 +10,7 @@ PORTNAME= wine > DISTVERSION?= 0 > # define PORTREVISION with ?= to allow it to be overriden by > # wine-devel's PORTREVISION when cross building >-PORTREVISION?= 0 >+PORTREVISION?= 2 > PKGNAMEPREFIX= i386- > PKGNAMESUFFIX= -devel > CATEGORIES= emulators >diff --git a/emulators/i386-wine-devel/Makefile.amd64 b/emulators/i386-wine-devel/Makefile.amd64 >index bc8f6a41c..7cbad64f9 100644 >--- a/emulators/i386-wine-devel/Makefile.amd64 >+++ b/emulators/i386-wine-devel/Makefile.amd64 >@@ -31,7 +31,7 @@ PLIST_SUB+= NOOSREL${osrel}="" > .endif > .endfor > >-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104001 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400013)) >+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104001 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400024)) > IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+, 13.0+ and 14.0+ only > .endif > >diff --git a/emulators/i386-wine-devel/Makefile.i386 b/emulators/i386-wine-devel/Makefile.i386 >index 31ec55c34..e1ba062b3 100644 >--- a/emulators/i386-wine-devel/Makefile.i386 >+++ b/emulators/i386-wine-devel/Makefile.i386 >@@ -60,6 +60,27 @@ post-install-script: > ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ > fi ; \ > done >+ # Install missing libraries that dont have been caught >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libGLX_mesa.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libX11-xcb.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-dri2.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-dri3.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-glx.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-present.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-sync.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-xfixes.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libXdamage.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxshmfence.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${ECHO_CMD} lib32/libGLX_mesa.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libX11-xcb.so.1 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-dri2.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-dri3.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-glx.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-present.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-sync.so.1 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-xfixes.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libXdamage.so.1 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxshmfence.so.1 >> ${TMPPLIST} > # Install nvidia patching script > ${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh > ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} >diff --git a/emulators/i386-wine-devel/distinfo b/emulators/i386-wine-devel/distinfo >index 1b983bf52..158601cbb 100644 >--- a/emulators/i386-wine-devel/distinfo >+++ b/emulators/i386-wine-devel/distinfo >@@ -1,9 +1,9 @@ >-TIMESTAMP = 1624378355 >-SHA256 (FreeBSD:11:amd64/i386-wine-devel-6.11,1.txz) = d1a3c578cb50c923a84ccb7ad344a86d45bcfddfc61fc8359daa5a09c059a625 >-SIZE (FreeBSD:11:amd64/i386-wine-devel-6.11,1.txz) = 98876300 >-SHA256 (FreeBSD:12:amd64/i386-wine-devel-6.11,1.txz) = 63ce26a7bfa8094cc4aabdf2f75da999f22b5f52163bba5f85d85742e717430b >-SIZE (FreeBSD:12:amd64/i386-wine-devel-6.11,1.txz) = 99252056 >-SHA256 (FreeBSD:13:amd64/i386-wine-devel-6.11,1.txz) = aee228bb6ae24d4f8f14b61dabea7a262f19b614c70f8a7a8ae0d8ea083c0198 >-SIZE (FreeBSD:13:amd64/i386-wine-devel-6.11,1.txz) = 99722256 >-SHA256 (FreeBSD:14:amd64/i386-wine-devel-6.11,1.txz) = 64afb70770b442f0e7593fc02fe4fd2cbbc76fedfdc4525620735e2a41d9d261 >-SIZE (FreeBSD:14:amd64/i386-wine-devel-6.11,1.txz) = 101432768 >+TIMESTAMP = 1624695440 >+SHA256 (FreeBSD:11:amd64/i386-wine-devel-6.11_2,1.txz) = f4d13cf6d24dd0162a83cae68642ccb907f9ee2f8dfe740f52b6066ea707df51 >+SIZE (FreeBSD:11:amd64/i386-wine-devel-6.11_2,1.txz) = 99011992 >+SHA256 (FreeBSD:12:amd64/i386-wine-devel-6.11_2,1.txz) = 0b75df95e48cb2cc664478cece681ce4ba00abdbc1e99cfc3d0f85c447d43fca >+SIZE (FreeBSD:12:amd64/i386-wine-devel-6.11_2,1.txz) = 99425876 >+SHA256 (FreeBSD:13:amd64/i386-wine-devel-6.11_2,1.txz) = 6b4efa025f8d65df65bf55e8a3123ee668520f3becff02bb436352d2d6a12481 >+SIZE (FreeBSD:13:amd64/i386-wine-devel-6.11_2,1.txz) = 99839772 >+SHA256 (FreeBSD:14:amd64/i386-wine-devel-6.11_2,1.txz) = 9c427a95e624ddf9cb3bdbca30ea45d5a09f9c55ecdd7cffe52c931a5e9bc7a9 >+SIZE (FreeBSD:14:amd64/i386-wine-devel-6.11_2,1.txz) = 101607056 >diff --git a/emulators/i386-wine-devel/pkg-plist b/emulators/i386-wine-devel/pkg-plist >index 41b690d9e..81c056c81 100644 >--- a/emulators/i386-wine-devel/pkg-plist >+++ b/emulators/i386-wine-devel/pkg-plist >@@ -1140,6 +1140,9 @@ lib32/.libGL/dri/swrast_dri.so > lib32/.libGL/dri/vmwgfx_dri.so > lib32/.libGL/libGL.so.1 > lib32/libFAudio.so.0 >+lib32/libGLX.so.0 >+lib32/libGLX_mesa.so.0 >+lib32/libGLdispatch.so.0 > lib32/libLLVM-10.so > lib32/libSDL2-2.0.so.0 > lib32/libX11-xcb.so.1 >diff --git a/emulators/i386-wine/Makefile b/emulators/i386-wine/Makefile >index cbfb6e96d..1b1786553 100644 >--- a/emulators/i386-wine/Makefile >+++ b/emulators/i386-wine/Makefile >@@ -8,6 +8,9 @@ PORTNAME= wine > # define a dummy DISTVERSION to avoid errors with poudriere bulk -a > # on architectures unsupported by this port > DISTVERSION?= 0 >+# define PORTREVISION with ?= to allow it to be overriden by >+# wine's PORTREVISION when cross building >+PORTREVISION= 2 > PKGNAMEPREFIX= i386- > CATEGORIES= emulators > >diff --git a/emulators/i386-wine/Makefile.amd64 b/emulators/i386-wine/Makefile.amd64 >index f7f55a20d..a7c72b788 100644 >--- a/emulators/i386-wine/Makefile.amd64 >+++ b/emulators/i386-wine/Makefile.amd64 >@@ -3,7 +3,7 @@ > DISTVERSION= 5.0.4 > PORTEPOCH= 1 > MASTER_SITES= http://Alexander88207.de/Homura/Winebuilds/${DIST_SUBDIR}/ >-DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}-${DISTVERSION},${PORTEPOCH} >+DISTNAME= ${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}-${PKGVERSION} > DIST_SUBDIR= FreeBSD:${OSREL:C/\..*//}:amd64 > > LICENSE= LGPL21 LGPL3 >@@ -32,7 +32,7 @@ PLIST_SUB+= NOOSREL${osrel}="" > .endif > .endfor > >-.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104000 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400013)) >+.if ${OPSYS} != FreeBSD || (!(${OSVERSION} >= 1104001 && ${OSVERSION} < 1200000) && !(${OSVERSION} >= 1202000 && ${OSVERSION} < 1300000) && !(${OSVERSION} >= 1300139 && ${OSVERSION} < 1400000) && !(${OSVERSION} >= 1400024)) > IGNORE= binaries compiled for FreeBSD 11.4+, 12.2+, 13.0+ & 14.0+ only > .endif > >diff --git a/emulators/i386-wine/Makefile.i386 b/emulators/i386-wine/Makefile.i386 >index 6cb417094..6efb95bfd 100644 >--- a/emulators/i386-wine/Makefile.i386 >+++ b/emulators/i386-wine/Makefile.i386 >@@ -60,6 +60,27 @@ post-install-script: > ${ECHO_CMD} lib32/$${i##*/} >> ${TMPPLIST} ; \ > fi ; \ > done >+ # Install missing libraries that dont have been caught >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libGLX_mesa.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libX11-xcb.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-dri2.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-dri3.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-glx.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-present.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-sync.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxcb-xfixes.so.0 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libXdamage.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${INSTALL_DATA} ${LOCALBASE}/lib/libxshmfence.so.1 ${STAGEDIR}${PREFIX}/lib32 >+ ${ECHO_CMD} lib32/libGLX_mesa.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libX11-xcb.so.1 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-dri2.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-dri3.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-glx.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-present.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-sync.so.1 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxcb-xfixes.so.0 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libXdamage.so.1 >> ${TMPPLIST} >+ ${ECHO_CMD} lib32/libxshmfence.so.1 >> ${TMPPLIST} > # Install nvidia patching script > ${INSTALL_SCRIPT} ${.CURDIR}/files/nvidia.sh ${STAGEDIR}${DATADIR}/patch-nvidia.sh > ${ECHO_CMD} ${DATADIR:S|$(PREFIX)/||}/patch-nvidia.sh >> ${TMPPLIST} >diff --git a/emulators/i386-wine/distinfo b/emulators/i386-wine/distinfo >index e969b6926..15ea90e44 100644 >--- a/emulators/i386-wine/distinfo >+++ b/emulators/i386-wine/distinfo >@@ -1,9 +1,9 @@ >-TIMESTAMP = 1620476085 >-SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 9273f16297c499f416e901df8fac2c965a4979ffb190019045ea74bddb58ef39 >-SIZE (FreeBSD:11:amd64/i386-wine-5.0.4,1.txz) = 92755060 >-SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 743df3fd4a1a76148931217c13ce06c9b393258028ed2b72bce00d8494754270 >-SIZE (FreeBSD:12:amd64/i386-wine-5.0.4,1.txz) = 93124636 >-SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = efcec0f77e36a9252c64da7399b041467c6ecb385bb080f44c9d88f7818c6d15 >-SIZE (FreeBSD:13:amd64/i386-wine-5.0.4,1.txz) = 93596936 >-SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 9b3c4568d888d32401a36b32bcb3fd027d20b4826d95a969cabe40f98aa55c94 >-SIZE (FreeBSD:14:amd64/i386-wine-5.0.4,1.txz) = 93591812 >+TIMESTAMP = 1624695015 >+SHA256 (FreeBSD:11:amd64/i386-wine-5.0.4_2,1.txz) = c0792df623ef5ca2050a470aa643db183a78af0ebd17b47ac970e71d20ce4235 >+SIZE (FreeBSD:11:amd64/i386-wine-5.0.4_2,1.txz) = 92984208 >+SHA256 (FreeBSD:12:amd64/i386-wine-5.0.4_2,1.txz) = 8149f3663dddeb0114b76269f869c25db9bb6edde1b03bec5415776c8286dd66 >+SIZE (FreeBSD:12:amd64/i386-wine-5.0.4_2,1.txz) = 93358516 >+SHA256 (FreeBSD:13:amd64/i386-wine-5.0.4_2,1.txz) = f510e32ab3ff7337272def5e55258587dfd053c757904078e58aa3dbdced9612 >+SIZE (FreeBSD:13:amd64/i386-wine-5.0.4_2,1.txz) = 93792036 >+SHA256 (FreeBSD:14:amd64/i386-wine-5.0.4_2,1.txz) = f44cf5115c98337ef4358df907196e7619029c9d6416eb7e06b91086401d5cf3 >+SIZE (FreeBSD:14:amd64/i386-wine-5.0.4_2,1.txz) = 95495224 >diff --git a/emulators/i386-wine/pkg-plist b/emulators/i386-wine/pkg-plist >index cb6630783..4594eee64 100644 >--- a/emulators/i386-wine/pkg-plist >+++ b/emulators/i386-wine/pkg-plist >@@ -1041,6 +1041,9 @@ lib32/.libGL/dri/radeonsi_dri.so > lib32/.libGL/dri/swrast_dri.so > lib32/.libGL/dri/vmwgfx_dri.so > lib32/.libGL/libGL.so.1 >+lib32/libGLX.so.0 >+lib32/libGLX_mesa.so.0 >+lib32/libGLdispatch.so.0 > lib32/libLLVM-10.so > lib32/libX11-xcb.so.1 > lib32/libX11.so.6
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
Flags:
Alexander88207
:
maintainer-approval+
Actions:
View
|
Diff
Attachments on
bug 256782
: 226056 |
226057