Attachment #188632 for bug #223195

Lines 7-14 CATEGORIES= graphics Link Here

(-)b/graphics/mesa-dri/Makefile (-2 lines)
7		7
8	COMMENT= OpenGL hardware acceleration drivers for DRI2+	8	COMMENT= OpenGL hardware acceleration drivers for DRI2+
9		9
10	RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc
11
12	USE_XORG= dri2proto dri3proto glproto presentproto x11 xdamage xext \	10	USE_XORG= dri2proto dri3proto glproto presentproto x11 xdamage xext \
13	xfixes xshmfence xv xvmc	11	xfixes xshmfence xv xvmc
14		12

Lines 14-20 Link Here

(-)b/graphics/mesa-dri/Makefile.common (-2 / +2 lines)
14	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}	14	MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
15	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}	15	MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
16		16
17	MESABASEVERSION= 17.2.4	17	MESABASEVERSION= 17.3.0
18	# if there is a subversion, don't include the '-' between 7.11-rc2.	18	# if there is a subversion, don't include the '-' between 7.11-rc2.
19	MESASUBVERSION=	19	MESASUBVERSION=
20		20
Lines 58-64 python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space Link Here
58	SHEBANG_FILES= src/gallium///.py src/gallium/tools/trace/.py \	58	SHEBANG_FILES= src/gallium///.py src/gallium/tools/trace/.py \
59	src/gallium/drivers/svga/svgadump/svga_dump.py \	59	src/gallium/drivers/svga/svgadump/svga_dump.py \
60	src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \	60	src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \
61	src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \	61	src/util/xmlpool/gen_xmlpool.py \
62	src/mesa/main/get_*.py src/util/format_srgb.py \	62	src/mesa/main/get_*.py src/util/format_srgb.py \
63	src/amd//.py src/intel/genxml/gen_pack_header.py	63	src/amd//.py src/intel/genxml/gen_pack_header.py
64		64

Lines 3-8 Link Here

(-)b/graphics/mesa-dri/Makefile.targets (-1 / +6 lines)
3	# this file holds common targets	3	# this file holds common targets
4		4
5	post-patch:	5	post-patch:
		6	# Use --link-static until ports/223191 is fixed
		7	@${REINPLACE_CMD} -e '/$$LLVM_VERSION_MAJOR -ge 4/s\|test \|false \|' ${WRKSRC}/configure
		8	. if ${COMPONENT} == osmesa
		9	@${REINPLACE_CMD} -e '/$$LLVM_VERSION_MAJOR -ge 4/s\|test \|false \|' ${WRKSRC}/configure.ac
		10	. endif
6	.if ${OPSYS} == FreeBSD	11	.if ${OPSYS} == FreeBSD
7	@${REINPLACE_CMD} -e 's\|x86_64\|amd64\|' ${WRKSRC}/configure	12	@${REINPLACE_CMD} -e 's\|x86_64\|amd64\|' ${WRKSRC}/configure
8	. if ${COMPONENT} == osmesa	13	. if ${COMPONENT} == osmesa
Lines 19-25 post-patch: Link Here
19	. endif	24	. endif
20	.endif	25	.endif
21	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' \	26	@${REINPLACE_CMD} -e 's\|/etc/\|${PREFIX}/etc/\|g' \
22	${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c	27	${WRKSRC}/src/util/xmlconfig.c
23		28
24	pre-build: mesa-pre-build	29	pre-build: mesa-pre-build
25		30

Lines 1-3 Link Here

(-)b/graphics/mesa-dri/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1509517641	1	TIMESTAMP = 1512740951
2	SHA256 (mesa-17.2.4.tar.xz) = 5ba408fecd6e1132e5490eec1a2f04466214e4c65c8b89b331be844768c2e550	2	SHA256 (mesa-17.3.0.tar.xz) = 29a0a3a6c39990d491a1a58ed5c692e596b3bfc6c01d0b45e0b787116c50c6d9
3	SIZE (mesa-17.2.4.tar.xz) = 10381984	3	SIZE (mesa-17.3.0.tar.xz) = 10667896




# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
#
--- src/egl/drivers/dri2/platform_x11.c.orig	2017-10-23 13:21:18 UTC
+++ src/egl/drivers/dri2/platform_x11.c
@@ -1462,6 +1462,9 @@ dri2_initialize_x11(_EGLDriver *drv, _EGLDisplay *disp
 
    if (!disp->Options.UseFallback) {
 #ifdef HAVE_DRI3
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)
+      if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
+#else
       if (!getenv("LIBGL_DRI3_DISABLE"))
+#endif
       if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
          initialized = dri2_initialize_x11_dri3(drv, disp);
 #endif
 




# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
#
--- src/glx/glxext.c.orig	2017-10-23 13:21:18 UTC
+++ src/glx/glxext.c
@@ -920,6 +920,9 @@ __glXInitialize(Display * dpy)
 #if defined(GLX_USE_DRM)
    if (glx_direct && glx_accel) {
 #if defined(HAVE_DRI3)
+#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)
+      if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
+#else
       if (!getenv("LIBGL_DRI3_DISABLE"))
+#endif
       if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
          dpyPriv->dri3Display = dri3_create_display(dpy);
 #endif /* HAVE_DRI3 */
       dpyPriv->dri2Display = dri2CreateDisplay(dpy);




../../src/util/.libs/libmesautil.a(libmesautil_la-half_float.o): In function `_mesa_float_to_half':
half_float.c:(.text+0x94): undefined reference to `lrintf'
half_float.c:(.text+0xbf): undefined reference to `lrintf'
cc: error: linker command failed with exit code 1 (use -v to see invocation)
gmake[5]: *** [Makefile:2706: tools/aubinator_error_decode] Error 1

--- src/intel/Makefile.in.orig	2017-10-23 13:21:32 UTC
+++ src/intel/Makefile.in
@@ -1975,7 +1975,8 @@ tools_aubinator_error_decode_LDADD = \
 	compiler/libintel_compiler.la \
 	$(top_builddir)/src/util/libmesautil.la \
 	$(PTHREAD_LIBS) \
-	$(ZLIB_LIBS)
+	$(ZLIB_LIBS) \
+	-lm
 
 tools_aubinator_error_decode_CFLAGS = \
 	$(AM_CFLAGS) \

Lines 39-49 IGNORE= option WAYLAND is only valid on platforms with LLVM Link Here

(-)b/graphics/mesa-libs/Makefile (-2 / +2 lines)
39	.endif	39	.endif
40	.endif	40	.endif
41		41
42	MESA_BUILD_WRKSRC= src/mapi	42	MESA_BUILD_WRKSRC= src/mapi src/util
43	MESA_INSTALL_WRKSRC= src/mapi	43	MESA_INSTALL_WRKSRC= src/mapi
44		44
45	.if ${PORT_OPTIONS:MWAYLAND}	45	.if ${PORT_OPTIONS:MWAYLAND}
46	MESA_BUILD_WRKSRC+= src/util src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl	46	MESA_BUILD_WRKSRC+= src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
47	MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl	47	MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl
48	.endif	48	.endif
49		49

Lines 1-3 Link Here

(-)b/graphics/mesa-libs/pkg-plist (+1 lines)
		1	@comment etc/drirc
1	%%EGL%%include/EGL/egl.h	2	%%EGL%%include/EGL/egl.h
2	%%EGL%%include/EGL/eglext.h	3	%%EGL%%include/EGL/eglext.h
3	%%EGL%%include/EGL/eglextchromium.h	4	%%EGL%%include/EGL/eglextchromium.h

Lines 34-40 pre-configure: Link Here

(-)b/lang/clover/Makefile (-3 lines)
34	${FALSE}; \	34	${FALSE}; \
35	fi	35	fi
36		36
37	post-install:
38	@${MV} ${STAGEDIR}/etc/OpenCL ${STAGEDIR}${PREFIX}/etc/
39
40	.include <bsd.port.post.mk>	37	.include <bsd.port.post.mk>

Return to bug 223195

Lines 1-16 Link Here

(-)b/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c (-8 / +6 lines)
1	# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627	1	# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
2	#	2	#
3	--- src/egl/drivers/dri2/platform_x11.c.orig 2017-10-02 15:49:02 UTC	3	--- src/egl/drivers/dri2/platform_x11.c.orig 2017-10-23 13:21:18 UTC
4	+++ src/egl/drivers/dri2/platform_x11.c	4	+++ src/egl/drivers/dri2/platform_x11.c
5	@@ -1490,7 +1490,11 @@ dri2_initialize_x11(_EGLDriver *drv, _EG	5	@@ -1462,6 +1462,9 @@ dri2_initialize_x11(_EGLDriver drv, _EGLDisplay disp
6		6
7	if (!getenv("LIBGL_ALWAYS_SOFTWARE")) {	7	if (!disp->Options.UseFallback) {
8	#ifdef HAVE_DRI3	8	#ifdef HAVE_DRI3
9	+#if (defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)	9	+#if (defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)
10	+ if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))	10	+ if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
11	+#else
12	if (!getenv("LIBGL_DRI3_DISABLE"))
13	+#endif	11	+#endif
		12	if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
14	initialized = dri2_initialize_x11_dri3(drv, disp);	13	initialized = dri2_initialize_x11_dri3(drv, disp);
15	#endif	14	#endif
16

Lines 1-16 Link Here

(-)b/graphics/mesa-dri/files/patch-src_glx_glxext.c (-7 / +5 lines)
1	# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627	1	# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
2	#	2	#
3	--- src/glx/glxext.c.orig 2017-04-01 15:33:37 UTC	3	--- src/glx/glxext.c.orig 2017-10-23 13:21:18 UTC
4	+++ src/glx/glxext.c	4	+++ src/glx/glxext.c
5	@@ -906,7 +906,11 @@ __glXInitialize(Display * dpy)	5	@@ -920,6 +920,9 @@ __glXInitialize(Display * dpy)
6	#if defined(GLX_USE_DRM)	6	#if defined(GLX_USE_DRM)
7	if (glx_direct && glx_accel) {	7	if (glx_direct && glx_accel) {
8	#if defined(HAVE_DRI3)	8	#if defined(HAVE_DRI3)
9	+#if (defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)	9	+#if (defined(__FreeBSD__) \|\| defined(__FreeBSD_kernel__)) && !defined(__DRM_NEXT__)
10	+ if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))	10	+ if (env_var_as_boolean("LIBGL_DRI3_ENABLE", false))
11	+#else
12	if (!getenv("LIBGL_DRI3_DISABLE"))
13	+#endif	11	+#endif
		12	if (!env_var_as_boolean("LIBGL_DRI3_DISABLE", false))
14	dpyPriv->dri3Display = dri3_create_display(dpy);	13	dpyPriv->dri3Display = dri3_create_display(dpy);
15	#endif /* HAVE_DRI3 */	14	#endif /* HAVE_DRI3 */
16	dpyPriv->dri2Display = dri2CreateDisplay(dpy);

Added Link Here

(-)b/graphics/mesa-dri/files/patch-src_intel_Makefile.in (+18 lines)
1	../../src/util/.libs/libmesautil.a(libmesautil_la-half_float.o): In function `_mesa_float_to_half':
2	half_float.c:(.text+0x94): undefined reference to `lrintf'
3	half_float.c:(.text+0xbf): undefined reference to `lrintf'
4	cc: error: linker command failed with exit code 1 (use -v to see invocation)
5	gmake[5]: *** [Makefile:2706: tools/aubinator_error_decode] Error 1
6
7	--- src/intel/Makefile.in.orig 2017-10-23 13:21:32 UTC
8	+++ src/intel/Makefile.in
9	@@ -1975,7 +1975,8 @@ tools_aubinator_error_decode_LDADD = \
10	compiler/libintel_compiler.la \
11	$(top_builddir)/src/util/libmesautil.la \
12	$(PTHREAD_LIBS) \
13	- $(ZLIB_LIBS)
14	+ $(ZLIB_LIBS) \
15	+ -lm
16
17	tools_aubinator_error_decode_CFLAGS = \
18	$(AM_CFLAGS) \