Attachment #226435 for bug #257164

View | Details | Raw Unified | Return to bug 257164
Collapse All | Expand All

Lines 1-5 Link Here

(-)b/x11-servers/xephyr/Makefile (-1 / +1 lines)
1	PORTNAME= xephyr	1	PORTNAME= xephyr
2	PORTREVISION= 1	2	PORTREVISION= 2
3		3
4	COMMENT= X server from X.Org based on kdrive	4	COMMENT= X server from X.Org based on kdrive
5		5

Lines 1-7 Link Here

(-)b/x11-servers/xorg-dmx/Makefile (-1 / +1 lines)
1	# Created by: lesi@FreeBSD.org	1	# Created by: lesi@FreeBSD.org
2		2
3	PORTNAME= xorg-dmx	3	PORTNAME= xorg-dmx
4	PORTREVISION= 1	4	PORTREVISION= 2
5		5
6	COMMENT= Distributed Multihead X from X.Org	6	COMMENT= Distributed Multihead X from X.Org
7		7

Lines 1-7 Link Here

(-)b/x11-servers/xorg-nestserver/Makefile (-1 / +1 lines)
1	# Created by: Eric Anholt <anholt@FreeBSD.org>	1	# Created by: Eric Anholt <anholt@FreeBSD.org>
2		2
3	PORTNAME= xorg-nestserver	3	PORTNAME= xorg-nestserver
4	PORTREVISION= 1	4	PORTREVISION= 2
5	PORTEPOCH= 2	5	PORTEPOCH= 2
6		6
7	COMMENT= Nesting X server from X.Org	7	COMMENT= Nesting X server from X.Org





PORTNAME?=	xorg-server
PORTVERSION?=	1.20.11
PORTREVISION?=	4
PORTEPOCH?=	1
CATEGORIES=	x11-servers
MASTER_SITES=	XORG/individual/xserver
DISTNAME=	xorg-server-${PORTVERSION}

PATCH_SITES=	https://gitlab.freedesktop.org/xorg/xserver/-/commit/
PATCHFILES+=	a2f5b917f511.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/706
PATCHFILES+=	a9552868697c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/706

MAINTAINER=	x11@FreeBSD.org
COMMENT?=	X.Org X server and related programs


Lines 1-7 Link Here

(-)b/x11-servers/xorg-server/distinfo (-4 / +4 lines)
1	TIMESTAMP = 1618327364	1	TIMESTAMP = 1618327364
2	SHA256 (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49	2	SHA256 (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49
3	SIZE (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 6476116	3	SIZE (xorg/xserver/xorg-server-1.20.11.tar.bz2) = 6476116
4	SHA256 (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 2e0f1027e56e1512f659dc5cc48400de9bea722e516b05498a7c6a4130f09f55	4	SHA256 (xorg/xserver/a2f5b917f511.patch) = be48612ea2d1d4faff76afb2a4cfb2900e529ef0208504393ba3a3db2887d251
5	SIZE (xorg/xserver/06d1a032ee491547f7037c3ff042065dc2aeaa99.diff) = 3867	5	SIZE (xorg/xserver/a2f5b917f511.patch) = 8110
6	SHA256 (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 5f0996f07af30d6d55713def544aa4b3280909ed91a36cd495ca2ace517b328b	6	SHA256 (xorg/xserver/a9552868697c.patch) = f2e61f1a93b91021fe7f8767f5cac1d6419d67d9279069b89d606d2ac7aabc16
7	SIZE (xorg/xserver/7ccb3b0eabb4658daf0ecb2c78a53609ae2c263b.diff) = 3606	7	SIZE (xorg/xserver/a9552868697c.patch) = 4478




Adjust to before https://gitlab.freedesktop.org/xorg/xserver/-/commit/1b2e224d7dca

glamor.c:615:23: error: no member named 'is_gles' in 'struct glamor_screen_private'
    if (!glamor_priv->is_gles && glamor_priv->glsl_version == 120 &&
         ~~~~~~~~~~~  ^

--- glamor/glamor.c.orig	2021-04-13 14:11:40 UTC
+++ glamor/glamor.c
@@ -612,7 +612,8 @@ glamor_init(ScreenPtr screen, unsigned int flags)
         goto fail;
     }
 
-    if (!glamor_priv->is_gles && glamor_priv->glsl_version == 120 &&
+    if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
+        glamor_priv->glsl_version == 120 &&
         epoxy_has_gl_extension("GL_ARB_instanced_arrays"))
         glamor_priv->use_gpu_shader4 = epoxy_has_gl_extension("GL_EXT_gpu_shader4");
 

Lines 1-7 Link Here

(-)b/x11-servers/xorg-vfbserver/Makefile (-1 / +1 lines)
1	# Created by: Eric Anholt <anholt@FreeBSD.org>	1	# Created by: Eric Anholt <anholt@FreeBSD.org>
2		2
3	PORTNAME= xorg-vfbserver	3	PORTNAME= xorg-vfbserver
4	PORTREVISION= 1	4	PORTREVISION= 2
5	PORTEPOCH= 1	5	PORTEPOCH= 1
6		6
7	COMMENT= X virtual framebuffer server from X.Org	7	COMMENT= X virtual framebuffer server from X.Org

Lines 1-5 Link Here

(-)b/x11-servers/xwayland/Makefile (-1 / +1 lines)
1	PORTNAME= xwayland	1	PORTNAME= xwayland
2	PORTREVISION= 1	2	PORTREVISION= 2
3		3
4	COMMENT= X Clients under Wayland	4	COMMENT= X Clients under Wayland
5		5

Return to bug 257164

Lines 2-13 Link Here

(-)b/x11-servers/xorg-server/Makefile (-1 / +5 lines)
2		2
3	PORTNAME?= xorg-server	3	PORTNAME?= xorg-server
4	PORTVERSION?= 1.20.11	4	PORTVERSION?= 1.20.11
5	PORTREVISION?= 3	5	PORTREVISION?= 4
6	PORTEPOCH?= 1	6	PORTEPOCH?= 1
7	CATEGORIES= x11-servers	7	CATEGORIES= x11-servers
8	MASTER_SITES= XORG/individual/xserver	8	MASTER_SITES= XORG/individual/xserver
9	DISTNAME= xorg-server-${PORTVERSION}	9	DISTNAME= xorg-server-${PORTVERSION}
10		10
		11	PATCH_SITES= https://gitlab.freedesktop.org/xorg/xserver/-/commit/
		12	PATCHFILES+= a2f5b917f511.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/706
		13	PATCHFILES+= a9552868697c.patch:-p1 # https://gitlab.freedesktop.org/xorg/xserver/-/merge_requests/706
		14
11	MAINTAINER= x11@FreeBSD.org	15	MAINTAINER= x11@FreeBSD.org
12	COMMENT?= X.Org X server and related programs	16	COMMENT?= X.Org X server and related programs
13		17

Added Link Here

(-)b/x11-servers/xorg-server/files/patch-glamor_glamor.c (+18 lines)
1	Adjust to before https://gitlab.freedesktop.org/xorg/xserver/-/commit/1b2e224d7dca
2
3	glamor.c:615:23: error: no member named 'is_gles' in 'struct glamor_screen_private'
4	if (!glamor_priv->is_gles && glamor_priv->glsl_version == 120 &&
5	~~~~~~~~~~~ ^
6
7	--- glamor/glamor.c.orig 2021-04-13 14:11:40 UTC
8	+++ glamor/glamor.c
9	@@ -612,7 +612,8 @@ glamor_init(ScreenPtr screen, unsigned int flags)
10	goto fail;
11	}
12
13	- if (!glamor_priv->is_gles && glamor_priv->glsl_version == 120 &&
14	+ if (glamor_priv->gl_flavor == GLAMOR_GL_DESKTOP &&
15	+ glamor_priv->glsl_version == 120 &&
16	epoxy_has_gl_extension("GL_ARB_instanced_arrays"))
17	glamor_priv->use_gpu_shader4 = epoxy_has_gl_extension("GL_EXT_gpu_shader4");
18