diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2020-06-06 00:40:46 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2020-06-06 00:40:46 +0000 |
| commit | b740b43b1906cb9cc4a62c96f38b9806e6306a93 (patch) | |
| tree | facc43096956ccc8279e1c384f9a818cea20fd1c /x11-servers | |
| parent | 8a706b7b240d05fabfe4af2e93c0ef2b468110ad (diff) | |
| download | ports-b740b43b1906cb9cc4a62c96f38b9806e6306a93.tar.gz ports-b740b43b1906cb9cc4a62c96f38b9806e6306a93.zip | |
x11-servers/xwayland-devel: update to 1.20.0.660
Notes
Notes:
svn path=/head/; revision=538062
Diffstat (limited to 'x11-servers')
| -rw-r--r-- | x11-servers/xwayland-devel/Makefile | 8 | ||||
| -rw-r--r-- | x11-servers/xwayland-devel/distinfo | 12 | ||||
| -rw-r--r-- | x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c | 17 |
3 files changed, 5 insertions, 32 deletions
diff --git a/x11-servers/xwayland-devel/Makefile b/x11-servers/xwayland-devel/Makefile index a6288c5c3c53..0f26a8d48d66 100644 --- a/x11-servers/xwayland-devel/Makefile +++ b/x11-servers/xwayland-devel/Makefile @@ -2,16 +2,12 @@ PORTNAME= xwayland DISTVERSIONPREFIX= xorg-server- -DISTVERSION= 1.20.0-655 +DISTVERSION= 1.20.0-660 DISTVERSIONSUFFIX= -g${GL_COMMIT:C/(.{12}).*/\1/} -PORTREVISION= 3 CATEGORIES= x11-servers PKGNAMESUFFIX= -devel PATCH_SITES= ${GL_SITE}/${GL_ACCOUNT}/${GL_PROJECT}/-/commit/ -PATCHFILES+= f2cf236da8e8.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/393 -PATCHFILES+= be731e0bdc7d.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/393 -PATCHFILES+= b5b529799a20.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/393 PATCHFILES+= 9e0086f99b39.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 PATCHFILES+= 30ea6cb622e9.diff:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/432 @@ -39,7 +35,7 @@ USE_XORG= pixman xau xdmcp xfont2 xkbfile xshmfence xtrans GL_SITE= https://gitlab.freedesktop.org GL_ACCOUNT= xorg GL_PROJECT= xserver -GL_COMMIT= 4195e8035645007be313ade79032b8d561ceec6c +GL_COMMIT= fc4f248544f207ffd68303da22ea1e27beb3729f MESON_ARGS= -Dxwayland=true \ -Dxorg=false \ -Dxnest=false \ diff --git a/x11-servers/xwayland-devel/distinfo b/x11-servers/xwayland-devel/distinfo index 3d3381490487..3dbd3928e175 100644 --- a/x11-servers/xwayland-devel/distinfo +++ b/x11-servers/xwayland-devel/distinfo @@ -1,12 +1,6 @@ -TIMESTAMP = 1589958808 -SHA256 (xorg-xserver-4195e8035645007be313ade79032b8d561ceec6c_GL0.tar.gz) = 399afda2eb1c976faf4568041db80e4f4ced54ad38ea74ae45e8ebfb633dd2e3 -SIZE (xorg-xserver-4195e8035645007be313ade79032b8d561ceec6c_GL0.tar.gz) = 5109217 -SHA256 (f2cf236da8e8.diff) = 03735bd385487becee29ce4aea7795007da0fc08db6477018862653e4df575ac -SIZE (f2cf236da8e8.diff) = 585 -SHA256 (be731e0bdc7d.diff) = 6038a636eee3cc4a8cd156eeb8a1792dcc76a8e8117f8b2e9e079fae149373b6 -SIZE (be731e0bdc7d.diff) = 981 -SHA256 (b5b529799a20.diff) = cd674fe26800b7c4c0e1e9fea2668562df46cf005f36c9923d16984ee8b714ad -SIZE (b5b529799a20.diff) = 3340 +TIMESTAMP = 1591383055 +SHA256 (xorg-xserver-fc4f248544f207ffd68303da22ea1e27beb3729f_GL0.tar.gz) = 630d1e4c12ddd2864ad97acce20d405c03b1d66791d82f2b96a2851264e1d458 +SIZE (xorg-xserver-fc4f248544f207ffd68303da22ea1e27beb3729f_GL0.tar.gz) = 5103038 SHA256 (9e0086f99b39.diff) = e8de09e5ca2e44dbd35924f353f903d7e3393e872732cdf0dfa638e566b43e4d SIZE (9e0086f99b39.diff) = 10299 SHA256 (30ea6cb622e9.diff) = c568c39b302dea2271ffb9a711eb76154f920c17da2f90a275cf3d0535da27bf diff --git a/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c b/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c deleted file mode 100644 index 88e139dec839..000000000000 --- a/x11-servers/xwayland-devel/files/patch-hw_xwayland_xwayland-glx.c +++ /dev/null @@ -1,17 +0,0 @@ -https://gitlab.freedesktop.org/xorg/xserver/-/issues/1032 - ---- hw/xwayland/xwayland-glx.c.orig 2020-05-20 07:13:28 UTC -+++ hw/xwayland/xwayland-glx.c -@@ -354,6 +354,12 @@ egl_screen_probe(ScreenPtr pScreen) - base->createDrawable = egl_create_glx_drawable; - /* base.swapInterval = NULL; */ - -+ /* GlxVendorLibrary is queried in DRI2, so assume Mesa for now */ -+ if (xwl_screen->egl_backend == &xwl_screen->eglstream_backend) -+ base->glvnd = strdup("nvidia"); -+ else -+ base->glvnd = strdup("mesa"); -+ - screen->display = xwl_screen->glamor_ctx->display; - - __glXInitExtensionEnableBits(screen->base.glx_enable_bits); |