Attachment #182554 for bug #219247

Lines 7-12 CATEGORIES= graphics Link Here

(-)graphics/mesa-dri/Makefile (+1 lines)
7		7
8	COMMENT= OpenGL hardware acceleration drivers for DRI2+	8	COMMENT= OpenGL hardware acceleration drivers for DRI2+
9		9
		10	BUILD_DEPENDS= libdrm>=2.4.80_1,1:graphics/libdrm # libsync.h fix
10	LIB_DEPENDS= libdrm.so:graphics/libdrm \	11	LIB_DEPENDS= libdrm.so:graphics/libdrm \
11	libexpat.so:textproc/expat2	12	libexpat.so:textproc/expat2
12	RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc	13	RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc




MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}

MESABASEVERSION=	17.1.0
# if there is a subversion, don't include the '-' between 7.11-rc2.
MESASUBVERSION=


CONFIGURE_ENV+=	LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
# The gallium-llvm switch is the global llvm switch for historical reasons
CONFIGURE_ARGS+=	--enable-llvm --with-llvm-prefix=${LOCALBASE}/llvm${MESA_LLVM_VER} \
			--enable-llvm-shared-libs
.else
CONFIGURE_ARGS+=	--disable-llvm
.endif

# There are issues that need to be fixed to use TLS model "initial-exec"

Lines 1-3 Link Here

(-)graphics/mesa-dri/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1492459376	1	TIMESTAMP = 1494432267
2	SHA256 (mesa-17.0.4.tar.xz) = 1269dc8545a193932a0779b2db5bce9be4a5f6813b98c38b93b372be8362a346	2	SHA256 (mesa-17.1.0.tar.xz) = cf234a6ed4764673886b6661553b54675776ef0898f774716173cec890ac3b17
3	SIZE (mesa-17.0.4.tar.xz) = 9454976	3	SIZE (mesa-17.1.0.tar.xz) = 9849580

Lines 1-38 Link Here

(-)graphics/mesa-dri/files/configure.ac (-32 / +12 lines)
1	--- configure.ac.orig 2017-04-01 15:33:36 UTC	1	--- configure.ac.orig 2017-04-01 15:33:36 UTC
2	+++ configure.ac	2	+++ configure.ac
3	@@ -942,19 +942,19 @@ llvm_add_target() {	3	@@ -403,9 +403,10 @@ AM_CONDITIONAL([SSE41_SUPPORTED], [test x$SSE41_SUPPORTED = x1])
4	# Call this inside ` ` to get the return value.	4	AC_SUBST([SSE41_CFLAGS], $SSE41_CFLAGS)
5	# $1 is the llvm-config command with arguments.
6	strip_unwanted_llvm_flags() {
7	- # Use \> (marks the end of the word)
8	- echo " `$1`" \| sed \
9	- -e 's/\s\+-m\S*//g' \
10	- -e 's/\s\+-DNDEBUG\>//g' \
11	- -e 's/\s\+-D_GNU_SOURCE\>//g' \
12	- -e 's/\s\+-pedantic\>//g' \
13	- -e 's/\s\+-W\S*//g' \
14	- -e 's/\s\+-O\S*//g' \
15	- -e 's/\s\+-g\S*//g' \
16	- -e 's/-fno-rtti\>/-Fno-rtti/g' \
17	- -e 's/\s\+-f\S*//g' \
18	- -e 's/-Fno-rtti\>/-fno-rtti/g' \
19	- -e 's/^ //'
20	+ echo " `$1` " \| sed -E \
21	+ -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
22	+ -e 's/[[[:space:]]]+-DNDEBUG[[[:space:]]]/ /g' \
23	+ -e 's/[[[:space:]]]+-D_GNU_SOURCE[[[:space:]]]/ /g' \
24	+ -e 's/[[[:space:]]]+-pedantic[[[:space:]]]/ /g' \
25	+ -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
26	+ -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
27	+ -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
28	+ -e 's/-fno-rtti[[[:space:]]]/-Fno-rtti /g' \
29	+ -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
30	+ -e 's/-Fno-rtti[[[:space:]]]/-fno-rtti /g' \
31	+ -e 's/^[[[:space:]]]//' \
32	+ -e 's/[[[:space:]]]$//'
33	}
34		5
35	llvm_set_environment_variables() {	6	dnl Check for new-style atomic builtins
		7	-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
		8	+AC_LINK_IFELSE([AC_LANG_SOURCE([[
		9	+#include <stdint.h>
		10	int main() {
		11	- int n;
		12	+ uint64_t n;
		13	return __atomic_load_n(&n, __ATOMIC_ACQUIRE);
		14	}]])], GCC_ATOMIC_BUILTINS_SUPPORTED=1)
		15	if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = x1; then
36	@@ -1121,7 +1121,7 @@ fi	16	@@ -1121,7 +1121,7 @@ fi
37	AC_SUBST(LIBSENSORS_LIBS)	17	AC_SUBST(LIBSENSORS_LIBS)
38		18




--- configure.orig	2017-04-01 15:33:50 UTC
+++ configure
@@ -20307,15 +20307,17 @@ SSE41_CFLAGS=$SSE41_CFLAGS
 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
+#include <stdint.h>
 int main() {
-    int n;
+    uint64_t n;
     return __atomic_load_n(&n, __ATOMIC_ACQUIRE);
-        -e 's/\s\+-pedantic\>//g' \
-        -e 's/\s\+-W\S*//g' \
-        -e 's/\s\+-O\S*//g' \
-        -e 's/\s\+-g\S*//g' \
-        -e 's/-fno-rtti\>/-Fno-rtti/g' \
-        -e 's/\s\+-f\S*//g' \
-        -e 's/-Fno-rtti\>/-fno-rtti/g' \
-        -e 's/^ //'
+    echo " `$1` " | sed -E \
+        -e 's/[[:space:]]+-m[^[:space:]]*//g' \
+        -e 's/[[:space:]]+-DNDEBUG[[:space:]]/ /g' \
+        -e 's/[[:space:]]+-D_GNU_SOURCE[[:space:]]/ /g' \
+        -e 's/[[:space:]]+-pedantic[[:space:]]/ /g' \
+        -e 's/[[:space:]]+-W[^[:space:]]*//g' \
+        -e 's/[[:space:]]+-O[^[:space:]]*//g' \
+        -e 's/[[:space:]]+-g[^[:space:]]*//g' \
+        -e 's/-fno-rtti[[:space:]]/-Fno-rtti /g' \
+        -e 's/[[:space:]]+-f[^[:space:]]*//g' \
+        -e 's/-Fno-rtti[[:space:]]/-fno-rtti /g' \
+        -e 's/^[[:space:]]//' \
+        -e 's/[[:space:]]$//'
 }
 _ACEOF
-if ac_fn_c_try_compile "$LINENO"; then :
+if ac_fn_c_try_link "$LINENO"; then :
   GCC_ATOMIC_BUILTINS_SUPPORTED=1
 fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
 if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = x1; then
     DEFINES="$DEFINES -DUSE_GCC_ATOMIC_BUILTINS"
 fi
@@ -22560,7 +22560,7 @@ fi
 
 




--- src/intel/tools/aubinator_error_decode.c.orig	2017-04-17 14:00:35 UTC
+++ src/intel/tools/aubinator_error_decode.c
@@ -22,6 +22,9 @@
  *
  */
 
+#ifdef __FreeBSD__
+#define _WITH_GETLINE
+#endif
 #include <stdbool.h>
 #include <stdio.h>
 #include <stdlib.h>




--- src/util/build_id.c.orig	2017-04-17 14:00:35 UTC
+++ src/util/build_id.c
@@ -33,7 +33,11 @@
 #endif
 
 #ifndef ElfW
-#define ElfW(type) Elf_##type
+#ifdef _LP64
+#define ElfW(type) Elf64_##type
+#else
+#define ElfW(type) Elf32_##type
+#endif
 #endif
 
 #define ALIGN(val, align)      (((val) + (align) - 1) & ~((align) - 1))




--- src/util/ralloc.c.orig	2017-04-01 15:33:37 UTC
+++ src/util/ralloc.c
@@ -338,6 +338,7 @@ ralloc_parent(const void *ptr)
 
 static void *autofree_context = NULL;
 
+__attribute__((destructor))
 static void
 autofree(void)
 {
@@ -349,7 +350,6 @@ ralloc_autofree_context(void)
 {
    if (unlikely(autofree_context == NULL)) {
       autofree_context = ralloc_context(NULL);
-      atexit(autofree);
    }
    return autofree_context;
 }

Lines 3-8 Link Here

(-)graphics/libdrm/Makefile (+1 lines)
3		3
4	PORTNAME= libdrm	4	PORTNAME= libdrm
5	PORTVERSION= 2.4.80	5	PORTVERSION= 2.4.80
		6	PORTREVISION= 1
6	PORTEPOCH= 1	7	PORTEPOCH= 1
7	CATEGORIES= graphics x11	8	CATEGORIES= graphics x11
8	MASTER_SITES= http://dri.freedesktop.org/libdrm/	9	MASTER_SITES= http://dri.freedesktop.org/libdrm/




--- libsync.h.orig	2017-04-14 23:29:46 UTC
+++ libsync.h
@@ -75,7 +75,11 @@ static inline int sync_wait(int fd, int timeout)
 			}
 			return 0;
 		} else if (ret == 0) {
+#ifdef ETIME
 			errno = ETIME;
+#else
+			errno = ETIMEDOUT;
+#endif
 			return -1;
 		}
 	} while (ret == -1 && (errno == EINTR || errno == EAGAIN));

Return to bug 219247

Lines 14-20 Link Here

(-)graphics/mesa-dri/Makefile.common (-3 / +4 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.0.4	17	MESABASEVERSION= 17.1.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 68-76 RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/ Link Here
68	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}	68	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
69	LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib	69	LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
70	# The gallium-llvm switch is the global llvm switch for historical reasons	70	# The gallium-llvm switch is the global llvm switch for historical reasons
71	CONFIGURE_ARGS+= --enable-gallium-llvm	71	CONFIGURE_ARGS+= --enable-llvm --with-llvm-prefix=${LOCALBASE}/llvm${MESA_LLVM_VER} \
		72	--enable-llvm-shared-libs
72	.else	73	.else
73	CONFIGURE_ARGS+= --disable-gallium-llvm	74	CONFIGURE_ARGS+= --disable-llvm
74	.endif	75	.endif
75		76
76	# There are issues that need to be fixed to use TLS model "initial-exec"	77	# There are issues that need to be fixed to use TLS model "initial-exec"

Lines 1-38 Link Here

(-)graphics/mesa-dri/files/patch-configure (-32 / +20 lines)
1	--- configure.orig 2017-04-01 15:33:50 UTC	1	--- configure.orig 2017-04-01 15:33:50 UTC
2	+++ configure	2	+++ configure
3	@@ -22350,19 +22350,19 @@ llvm_add_target() {	3	@@ -20307,15 +20307,17 @@ SSE41_CFLAGS=$SSE41_CFLAGS
4	# Call this inside ` ` to get the return value.	4	cat confdefs.h - <<_ACEOF >conftest.$ac_ext
5	# $1 is the llvm-config command with arguments.	5	/* end confdefs.h. */
6	strip_unwanted_llvm_flags() {	6
7	- # Use \> (marks the end of the word)	7	+#include <stdint.h>
8	- echo " `$1`" \| sed \	8	int main() {
9	- -e 's/\s\+-m\S*//g' \	9	- int n;
10	- -e 's/\s\+-DNDEBUG\>//g' \	10	+ uint64_t n;
11	- -e 's/\s\+-D_GNU_SOURCE\>//g' \	11	return __atomic_load_n(&n, __ATOMIC_ACQUIRE);
12	- -e 's/\s\+-pedantic\>//g' \
13	- -e 's/\s\+-W\S*//g' \
14	- -e 's/\s\+-O\S*//g' \
15	- -e 's/\s\+-g\S*//g' \
16	- -e 's/-fno-rtti\>/-Fno-rtti/g' \
17	- -e 's/\s\+-f\S*//g' \
18	- -e 's/-Fno-rtti\>/-fno-rtti/g' \
19	- -e 's/^ //'
20	+ echo " `$1` " \| sed -E \
21	+ -e 's/[[:space:]]+-m[^[:space:]]*//g' \
22	+ -e 's/[[:space:]]+-DNDEBUG[[:space:]]/ /g' \
23	+ -e 's/[[:space:]]+-D_GNU_SOURCE[[:space:]]/ /g' \
24	+ -e 's/[[:space:]]+-pedantic[[:space:]]/ /g' \
25	+ -e 's/[[:space:]]+-W[^[:space:]]*//g' \
26	+ -e 's/[[:space:]]+-O[^[:space:]]*//g' \
27	+ -e 's/[[:space:]]+-g[^[:space:]]*//g' \
28	+ -e 's/-fno-rtti[[:space:]]/-Fno-rtti /g' \
29	+ -e 's/[[:space:]]+-f[^[:space:]]*//g' \
30	+ -e 's/-Fno-rtti[[:space:]]/-fno-rtti /g' \
31	+ -e 's/^[[:space:]]//' \
32	+ -e 's/[[:space:]]$//'
33	}	12	}
34		13	_ACEOF
35	llvm_set_environment_variables() {	14	-if ac_fn_c_try_compile "$LINENO"; then :
		15	+if ac_fn_c_try_link "$LINENO"; then :
		16	GCC_ATOMIC_BUILTINS_SUPPORTED=1
		17	fi
		18	-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
		19	+rm -f core conftest.err conftest.$ac_objext \
		20	+ conftest$ac_exeext conftest.$ac_ext
		21	if test "x$GCC_ATOMIC_BUILTINS_SUPPORTED" = x1; then
		22	DEFINES="$DEFINES -DUSE_GCC_ATOMIC_BUILTINS"
		23	fi
36	@@ -22560,7 +22560,7 @@ fi	24	@@ -22560,7 +22560,7 @@ fi
37		25
38		26

Line 0 Link Here

(-)graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c (+12 lines)
	1	--- src/intel/tools/aubinator_error_decode.c.orig 2017-04-17 14:00:35 UTC
	2	+++ src/intel/tools/aubinator_error_decode.c
	3	@@ -22,6 +22,9 @@
	4	*
	5	*/
	6
	7	+#ifdef __FreeBSD__
	8	+#define _WITH_GETLINE
	9	+#endif
	10	#include <stdbool.h>
	11	#include <stdio.h>
	12	#include <stdlib.h>

Line 0 Link Here

(-)graphics/mesa-dri/files/patch-src_util_build__id.c (+15 lines)
	1	--- src/util/build_id.c.orig 2017-04-17 14:00:35 UTC
	2	+++ src/util/build_id.c
	3	@@ -33,7 +33,11 @@
	4	#endif
	5
	6	#ifndef ElfW
	7	-#define ElfW(type) Elf_##type
	8	+#ifdef _LP64
	9	+#define ElfW(type) Elf64_##type
	10	+#else
	11	+#define ElfW(type) Elf32_##type
	12	+#endif
	13	#endif
	14
	15	#define ALIGN(val, align) (((val) + (align) - 1) & ~((align) - 1))

Lines 1-18 Link Here

(-)graphics/mesa-dri/files/patch-src_util_ralloc.c (-18 lines)
1	--- src/util/ralloc.c.orig 2017-04-01 15:33:37 UTC
2	+++ src/util/ralloc.c
3	@@ -338,6 +338,7 @@ ralloc_parent(const void *ptr)
4
5	static void *autofree_context = NULL;
6
7	+__attribute__((destructor))
8	static void
9	autofree(void)
10	{
11	@@ -349,7 +350,6 @@ ralloc_autofree_context(void)
12	{
13	if (unlikely(autofree_context == NULL)) {
14	autofree_context = ralloc_context(NULL);
15	- atexit(autofree);
16	}
17	return autofree_context;
18	}

Line 0 Link Here

(-)graphics/libdrm/files/patch-libsync.h (+14 lines)
	1	--- libsync.h.orig 2017-04-14 23:29:46 UTC
	2	+++ libsync.h
	3	@@ -75,7 +75,11 @@ static inline int sync_wait(int fd, int timeout)
	4	}
	5	return 0;
	6	} else if (ret == 0) {
	7	+#ifdef ETIME
	8	errno = ETIME;
	9	+#else
	10	+ errno = ETIMEDOUT;
	11	+#endif
	12	return -1;
	13	}
	14	} while (ret == -1 && (errno == EINTR \|\| errno == EAGAIN));