View | Details | Raw Unified | Return to bug 214581 | Differences between
and this patch

Collapse All | Expand All

(-)graphics/dri/Makefile (-1 / +1 lines)
Lines 13-19 Link Here
13
13
14
USES=		ssl
14
USES=		ssl
15
USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto \
15
USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto \
16
		presentproto xvmc xshmfence
16
		presentproto xv xvmc xshmfence
17
17
18
OPTIONS_DEFINE=	TEXTURE
18
OPTIONS_DEFINE=	TEXTURE
19
OPTIONS_DEFAULT=TEXTURE
19
OPTIONS_DEFAULT=TEXTURE
(-)graphics/dri/pkg-plist (-2 / +1 lines)
Lines 13-25 Link Here
13
@comment include/GL/glxext.h
13
@comment include/GL/glxext.h
14
include/GL/internal/dri_interface.h
14
include/GL/internal/dri_interface.h
15
@comment include/GL/osmesa.h
15
@comment include/GL/osmesa.h
16
@comment include/GL/wglext.h
17
@comment include/GL/wmesa.h
18
@comment include/GLES2/gl2.h
16
@comment include/GLES2/gl2.h
19
@comment include/GLES2/gl2ext.h
17
@comment include/GLES2/gl2ext.h
20
@comment include/GLES2/gl2platform.h
18
@comment include/GLES2/gl2platform.h
21
@comment include/GLES3/gl3.h
19
@comment include/GLES3/gl3.h
22
@comment include/GLES3/gl31.h
20
@comment include/GLES3/gl31.h
21
@comment include/GLES3/gl32.h
23
@comment include/GLES3/gl3ext.h
22
@comment include/GLES3/gl3ext.h
24
@comment include/GLES3/gl3platform.h
23
@comment include/GLES3/gl3platform.h
25
@comment include/KHR/khrplatform.h
24
@comment include/KHR/khrplatform.h
(-)graphics/libEGL/Makefile (-1 lines)
Lines 10-16 Link Here
10
10
11
LIB_DEPENDS+=	libpthread-stubs.so:devel/libpthread-stubs \
11
LIB_DEPENDS+=	libpthread-stubs.so:devel/libpthread-stubs \
12
		libexpat.so:textproc/expat2 \
12
		libexpat.so:textproc/expat2 \
13
		libdevq.so:devel/libdevq \
14
		libdrm.so:graphics/libdrm
13
		libdrm.so:graphics/libdrm
15
14
16
USE_GL=		gbm
15
USE_GL=		gbm
(-)graphics/libGL/Makefile (-3 / +3 lines)
Lines 13-19 Link Here
13
		libexpat.so:textproc/expat2
13
		libexpat.so:textproc/expat2
14
14
15
USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
15
USE_XORG=	glproto x11 xext xxf86vm xdamage xfixes dri2proto:both \
16
		presentproto xshmfence
16
		presentproto xshmfence xcb
17
17
18
.include <bsd.port.options.mk>
18
.include <bsd.port.options.mk>
19
.include "${.CURDIR}/Makefile.common"
19
.include "${.CURDIR}/Makefile.common"
Lines 27-33 Link Here
27
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
27
	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/.mesa
28
	@${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \
28
	@${MV} ${STAGEDIR}${PREFIX}/lib/libGL* \
29
		${STAGEDIR}${PREFIX}/lib/.mesa/
29
		${STAGEDIR}${PREFIX}/lib/.mesa/
30
	@cd ${WRKSRC}/src/mesa && ${SETENV} DESTDIR=${STAGEDIR} \
30
	@cd ${WRKSRC}/src && ${SETENV} DESTDIR=${STAGEDIR} \
31
		${MAKE_CMD} install-pkgconfigDATA install-glHEADERS
31
		${MAKE_CMD} install-pkgconfigDATA install-glHEADERS install-glxHEADERS
32
32
33
.include <bsd.port.mk>
33
.include <bsd.port.mk>
(-)graphics/libGL/Makefile.common (-11 / +9 lines)
Lines 18-24 Link Here
18
MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
18
MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
19
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
19
MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
20
20
21
MESABASEVERSION=	11.2.2
21
MESABASEVERSION=	13.0.1
22
# if there is a subversion, don't include the '-' between 7.11-rc2.
22
# if there is a subversion, don't include the '-' between 7.11-rc2.
23
MESASUBVERSION=
23
MESASUBVERSION=
24
24
Lines 29-42 Link Here
29
MAINTAINER=	x11@FreeBSD.org
29
MAINTAINER=	x11@FreeBSD.org
30
30
31
BUILD_DEPENDS+=	makedepend:devel/makedepend
31
BUILD_DEPENDS+=	makedepend:devel/makedepend
32
LIB_DEPENDS+=	libdevq.so:devel/libdevq
33
32
34
USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
33
USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
35
		pathfix pkgconfig python:2,build shebangfix tar:xz
34
		localbase pathfix pkgconfig python:2,build shebangfix tar:xz
36
USE_LDCONFIG=	yes
35
USE_LDCONFIG=	yes
37
GNU_CONFIGURE=	yes
36
GNU_CONFIGURE=	yes
38
CPPFLAGS+=	-isystem${LOCALBASE}/include
37
LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
39
LDFLAGS+=	-Wl,-Y/usr/lib:${LOCALBASE}/lib
40
38
41
PKGINSTALL=	${.CURDIR}/pkg-install
39
PKGINSTALL=	${.CURDIR}/pkg-install
42
PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
40
PKGDEINSTALL=	${.CURDIR}/pkg-deinstall
Lines 67-73 Link Here
67
65
68
COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
66
COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
69
67
70
MESA_LLVM_VER=37
68
MESA_LLVM_VER=39
71
69
72
CONFIGURE_ARGS+=	--with-sha1=libcrypto
70
CONFIGURE_ARGS+=	--with-sha1=libcrypto
73
71
Lines 124-137 Link Here
124
CONFIGURE_ARGS+=	--enable-osmesa
122
CONFIGURE_ARGS+=	--enable-osmesa
125
123
126
# gallium
124
# gallium
127
BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER}
125
BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
128
.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
126
.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
129
RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER}
127
RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
130
.endif
128
.endif
131
129
132
CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
130
CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
133
131
134
CONFIGURE_ARGS+=--enable-gallium-llvm \
132
CONFIGURE_ARGS+=--enable-gallium-llvm --enable-llvm-shared-libs \
135
                --enable-xvmc
133
                --enable-xvmc
136
134
137
.if ${PORT_OPTIONS:MTEXTURE}
135
.if ${PORT_OPTIONS:MTEXTURE}
Lines 160-167 Link Here
160
.endif
158
.endif
161
159
162
.if ${ARCH} == powerpc || ${ARCH} == powerpc64
160
.if ${ARCH} == powerpc || ${ARCH} == powerpc64
163
DRI_DRIVERS=	RADEON SWRAST
161
DRI_DRIVERS=	RADEON R200 SWRAST
164
GALLIUM_DRIVERS=	RADEONSI SWRAST
162
GALLIUM_DRIVERS=	R300 R600 RADEONSI SWRAST
165
.endif
163
.endif
166
164
167
.if ${ARCH} == sparc64 || ${ARCH} == armv6
165
.if ${ARCH} == sparc64 || ${ARCH} == armv6
(-)graphics/libGL/distinfo (-2 / +3 lines)
Lines 1-2 Link Here
1
SHA256 (mesa-11.2.2.tar.xz) = 40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4
1
TIMESTAMP = 1479253960
2
SIZE (mesa-11.2.2.tar.xz) = 7860932
2
SHA256 (mesa-13.0.1.tar.xz) = 71962fb2bf77d33b0ad4a565b490dbbeaf4619099c6d9722f04a73187957a731
3
SIZE (mesa-13.0.1.tar.xz) = 9154288
(-)graphics/libGL/files/configure.ac (-48 / +19 lines)
Lines 1-14 Link Here
1
--- configure.ac.orig	2015-12-21 10:05:52.000000000 +0100
1
--- configure.ac.orig	2016-06-21 14:31:09.000000000 +0200
2
+++ configure.ac	2015-12-22 17:04:25.728359000 +0100
2
+++ configure.ac	2016-07-08 13:05:53.236433000 +0200
3
@@ -78,6 +78,7 @@
3
@@ -871,7 +872,7 @@
4
 DRI3PROTO_REQUIRED=1.0
5
 PRESENTPROTO_REQUIRED=1.0
6
 LIBUDEV_REQUIRED=151
7
+LIBDEVQ_REQUIRED=0.0.2
8
 GLPROTO_REQUIRED=1.4.14
9
 LIBOMXIL_BELLAGIO_REQUIRED=0.0
10
 LIBVA_REQUIRED=0.35.0
11
@@ -743,7 +744,7 @@
12
     [enable_dri=yes])
4
     [enable_dri=yes])
13
 
5
 
14
 case "$host_os" in
6
 case "$host_os" in
Lines 17-44 Link Here
17
     dri3_default=yes
9
     dri3_default=yes
18
     ;;
10
     ;;
19
 *)
11
 *)
20
@@ -1000,6 +1001,9 @@
12
@@ -1540,6 +1548,19 @@
21
 PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED],
22
                   have_libudev=yes, have_libudev=no)
23
 
24
+PKG_CHECK_MODULES([LIBDEVQ], [libdevq-1.0 >= $LIBDEVQ_REQUIRED],
25
+                  have_libdevq=yes, have_libdevq=no)
26
+
27
 AC_ARG_ENABLE([sysfs],
28
     [AS_HELP_STRING([--enable-sysfs],
29
         [enable /sys PCI identification @<:@default=disabled@:>@])],
30
@@ -1096,6 +1100,10 @@
31
     DEFINES="$DEFINES -DHAVE_LIBUDEV"
32
     have_pci_id=yes
33
 fi
34
+if test "$have_libdevq" = yes; then
35
+    DEFINES="$DEFINES -DHAVE_LIBDEVQ"
36
+    have_pci_id=yes
37
+fi
38
 
39
 if test "$have_sysfs" = yes; then
40
     DEFINES="$DEFINES -DHAVE_SYSFS"
41
@@ -1228,6 +1236,23 @@
42
         ;;
13
         ;;
43
     gnu*)
14
     gnu*)
44
         DEFINES="$DEFINES -DHAVE_ALIAS"
15
         DEFINES="$DEFINES -DHAVE_ALIAS"
Lines 47-56 Link Here
47
+            DEFINES="$DEFINES -DHAVE_DRI3"
18
+            DEFINES="$DEFINES -DHAVE_DRI3"
48
+        fi
19
+        fi
49
+
20
+
50
+        if test "x$have_libdevq" != xyes; then
51
+            AC_MSG_ERROR([libdevq required for building DRI])
52
+        fi
53
+
54
+        case "$host_cpu" in
21
+        case "$host_cpu" in
55
+        powerpc* | sparc*)
22
+        powerpc* | sparc*)
56
+            # Build only the drivers for cards that exist on PowerPC/sparc
23
+            # Build only the drivers for cards that exist on PowerPC/sparc
Lines 62-77 Link Here
62
         ;;
29
         ;;
63
     cygwin*)
30
     cygwin*)
64
         if test "x$with_dri_drivers" = "xyes"; then
31
         if test "x$with_dri_drivers" = "xyes"; then
65
@@ -1384,6 +1409,8 @@
32
@@ -1921,9 +1948,19 @@
66
 AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes)
67
 if test "x$need_pci_id$have_libudev" = xyesyes; then
68
     GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
69
+elif test "x$need_libdevq" = xyes; then
70
+    GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
71
 else
72
     GBM_PC_REQ_PRIV=""
73
 fi
74
@@ -1545,9 +1572,19 @@
75
         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
33
         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
76
     fi
34
     fi
77
 
35
 
Lines 91-97 Link Here
91
 
49
 
92
     if test "x$have_libclc" = xno; then
50
     if test "x$have_libclc" = xno; then
93
         AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
51
         AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
94
@@ -1815,8 +1852,6 @@
52
@@ -2102,9 +2139,9 @@
53
 strip_unwanted_llvm_flags() {
54
     # Use \> (marks the end of the word)
55
     echo `$1` | sed \
56
-	-e 's/-march=\S*//g' \
57
-	-e 's/-mtune=\S*//g' \
58
-	-e 's/-mcpu=\S*//g' \
59
+	-e 's/-march=[[:graph:]]* //g' \
60
+	-e 's/-mtune=[[:graph:]]* //g' \
61
+	-e 's/-mcpu=[[:graph:]]* //g' \
62
 	-e 's/-DNDEBUG\>//g' \
63
 	-e 's/-D_GNU_SOURCE\>//g' \
64
 	-e 's/-pedantic\>//g' \
65
@@ -2196,8 +2233,6 @@
95
                 CLANG_LIBDIR=${LLVM_LIBDIR}
66
                 CLANG_LIBDIR=${LLVM_LIBDIR}
96
             fi
67
             fi
97
             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
68
             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
(-)graphics/libGL/files/patch-configure (-149 / +374 lines)
Lines 1-45 Link Here
1
--- configure.orig	2015-12-22 17:04:20.271630000 +0100
1
--- configure.orig	2016-11-14 11:29:26 UTC
2
+++ configure	2015-12-22 17:05:17.669976000 +0100
2
+++ configure
3
@@ -858,6 +858,8 @@
3
@@ -1962,7 +1962,7 @@ Optional Features:
4
 GLPROTO_CFLAGS
4
                           Disable writable .text section on x86 (decreases
5
 XLIBGL_LIBS
5
                           performance) [default=disabled]
6
 XLIBGL_CFLAGS
6
   --enable-gallium-llvm   build gallium LLVM support [default=enabled on
7
+LIBDEVQ_LIBS
7
-                          x86/x86_64]
8
+LIBDEVQ_CFLAGS
8
+                          x86/amd64]
9
 LIBUDEV_LIBS
9
   --enable-llvm-shared-libs
10
 LIBUDEV_CFLAGS
10
                           link with LLVM shared libraries [default=enabled]
11
 MESA_LLVM
11
   --enable-valgrind       Build mesa with valgrind support (default: auto)
12
@@ -1156,6 +1158,8 @@
12
@@ -9622,7 +9622,7 @@ mips64*-*linux*)
13
 LIBDRM_LIBS
13
   rm -rf conftest*
14
 LIBUDEV_CFLAGS
14
   ;;
15
 LIBUDEV_LIBS
16
+LIBDEVQ_CFLAGS
17
+LIBDEVQ_LIBS
18
 XLIBGL_CFLAGS
19
 XLIBGL_LIBS
20
 GLPROTO_CFLAGS
21
@@ -1966,6 +1970,10 @@
22
               C compiler flags for LIBUDEV, overriding pkg-config
23
   LIBUDEV_LIBS
24
               linker flags for LIBUDEV, overriding pkg-config
25
+  LIBDEVQ_CFLAGS
26
+              C compiler flags for LIBDEVQ, overriding pkg-config
27
+  LIBDEVQ_LIBS
28
+              linker flags for LIBDEVQ, overriding pkg-config
29
   XLIBGL_CFLAGS
30
               C compiler flags for XLIBGL, overriding pkg-config
31
   XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config
32
@@ -5246,6 +5254,7 @@
33
 DRI3PROTO_REQUIRED=1.0
34
 PRESENTPROTO_REQUIRED=1.0
35
 LIBUDEV_REQUIRED=151
36
+LIBDEVQ_REQUIRED=0.0.2
37
 GLPROTO_REQUIRED=1.4.14
38
 LIBOMXIL_BELLAGIO_REQUIRED=0.0
39
 LIBVA_REQUIRED=0.35.0
40
@@ -21035,7 +21044,7 @@
41
 
15
 
16
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
17
+amd64-*kfreebsd*-gnu|amd64-*linux*|powerpc*-*linux*| \
18
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
19
   # Find out what ABI is being produced by ac_compile, and set linker
20
   # options accordingly.  Note that the listed cases only cover the
21
@@ -9639,13 +9639,13 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
22
     case `/usr/bin/file conftest.o` in
23
       *32-bit*)
24
 	case $host in
25
-	  x86_64-*kfreebsd*-gnu)
26
+	  amd64-*kfreebsd*-gnu)
27
 	    LD="${LD-ld} -m elf_i386_fbsd"
28
 	    ;;
29
-	  x86_64-*linux*)
30
+	  amd64-*linux*)
31
 	    case `/usr/bin/file conftest.o` in
32
 	      *x86-64*)
33
-		LD="${LD-ld} -m elf32_x86_64"
34
+		LD="${LD-ld} -m elf32_amd64"
35
 		;;
36
 	      *)
37
 		LD="${LD-ld} -m elf_i386"
38
@@ -9668,11 +9668,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
39
 	;;
40
       *64-bit*)
41
 	case $host in
42
-	  x86_64-*kfreebsd*-gnu)
43
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
44
+	  amd64-*kfreebsd*-gnu)
45
+	    LD="${LD-ld} -m elf_amd64_fbsd"
46
 	    ;;
47
-	  x86_64-*linux*)
48
-	    LD="${LD-ld} -m elf_x86_64"
49
+	  amd64-*linux*)
50
+	    LD="${LD-ld} -m elf_amd64"
51
 	    ;;
52
 	  powerpcle-*linux*)
53
 	    LD="${LD-ld} -m elf64lppc"
54
@@ -9754,8 +9754,8 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
55
       case $lt_cv_prog_gnu_ld in
56
       yes*)
57
         case $host in
58
-        i?86-*-solaris*|x86_64-*-solaris*)
59
-          LD="${LD-ld} -m elf_x86_64"
60
+        i?86-*-solaris*|amd64-*-solaris*)
61
+          LD="${LD-ld} -m elf_amd64"
62
           ;;
63
         sparc*-*-solaris*)
64
           LD="${LD-ld} -m elf64_sparc"
65
@@ -11464,7 +11464,7 @@ lt_prog_compiler_static=
42
 
66
 
67
     linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
68
       case $cc_basename in
69
-      # old Intel for x86_64, which still supported -KPIC.
70
+      # old Intel for amd64, which still supported -KPIC.
71
       ecc*)
72
 	lt_prog_compiler_wl='-Wl,'
73
 	lt_prog_compiler_pic='-KPIC'
74
@@ -11907,7 +11907,7 @@ $as_echo_n "checking whether the $compil
75
   hardcode_minus_L=no
76
   hardcode_shlibpath_var=unsupported
77
   inherit_rpath=no
78
-  link_all_deplibs=unknown
79
+  link_all_deplibs=no
80
   module_cmds=
81
   module_expsym_cmds=
82
   old_archive_from_new_cmds=
83
@@ -12206,7 +12206,7 @@ _LT_EOF
84
 	wlarc=
85
       else
86
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
87
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
88
+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
89
       fi
90
       ;;
91
 
92
@@ -12225,7 +12225,7 @@ _LT_EOF
93
 _LT_EOF
94
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
95
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
96
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
97
+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
98
       else
99
 	ld_shlibs=no
100
       fi
101
@@ -12254,7 +12254,7 @@ _LT_EOF
102
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
103
 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
104
 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
105
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
106
+	    archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
107
 	  else
108
 	    ld_shlibs=no
109
 	  fi
110
@@ -12272,7 +12272,7 @@ _LT_EOF
111
     *)
112
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
113
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
114
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
115
+	archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
116
       else
117
 	ld_shlibs=no
118
       fi
119
@@ -12920,7 +12920,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
120
 	hardcode_direct_absolute=yes
121
 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
122
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
123
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
124
+	  archive_expsym_cmds='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-version-script,$lib-ver'
125
 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
126
 	  export_dynamic_flag_spec='$wl-E'
127
 	else
128
@@ -13769,7 +13769,7 @@ freebsd* | dragonfly*)
129
   version_type=freebsd-$objformat
130
   case $version_type in
131
     freebsd-elf*)
132
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
133
+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
134
       soname_spec='$libname$release$shared_ext$major'
135
       need_version=no
136
       need_lib_prefix=no
137
@@ -14901,7 +14901,7 @@ striplib=
138
 old_striplib=
139
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
140
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
141
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
142
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
143
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
144
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
145
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
146
@@ -15153,7 +15153,7 @@ hardcode_automatic_CXX=no
147
 inherit_rpath_CXX=no
148
 module_cmds_CXX=
149
 module_expsym_cmds_CXX=
150
-link_all_deplibs_CXX=unknown
151
+link_all_deplibs_CXX=no
152
 old_archive_cmds_CXX=$old_archive_cmds
153
 reload_flag_CXX=$reload_flag
154
 reload_cmds_CXX=$reload_cmds
155
@@ -15364,7 +15364,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
156
       # archiving commands below assume that GNU ld is being used.
157
       if test yes = "$with_gnu_ld"; then
158
         archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
159
-        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
160
+        archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
161
 
162
         hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
163
         export_dynamic_flag_spec_CXX='$wl--export-dynamic'
164
@@ -16056,7 +16056,7 @@ fi
165
 	    case `$CC -V 2>&1` in
166
 	      *"Version 7."*)
167
 	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
168
-		archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
169
+		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
170
 		;;
171
 	      *)  # Version 8.0 or newer
172
 	        tmp_idyn=
173
@@ -16064,7 +16064,7 @@ fi
174
 		  ia64*) tmp_idyn=' -i_dynamic';;
175
 		esac
176
 	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
177
-		archive_expsym_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
178
+		archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
179
 		;;
180
 	    esac
181
 	    archive_cmds_need_lc_CXX=no
182
@@ -16096,7 +16096,7 @@ fi
183
 	      ;;
184
 	    *) # Version 6 and above use weak symbols
185
 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
186
-	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
187
+	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$lib-ver -o $lib'
188
 	      ;;
189
 	    esac
190
 
191
@@ -16107,7 +16107,7 @@ fi
192
 	  cxx*)
193
 	    # Compaq C++
194
 	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
195
-	    archive_expsym_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-retain-symbols-file $wl$export_symbols'
196
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname  -o $lib $wl-version-script $wl$lib-ver'
197
 
198
 	    runpath_var=LD_RUN_PATH
199
 	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
200
@@ -16141,7 +16141,7 @@ fi
201
 	      # Sun C++ 5.9
202
 	      no_undefined_flag_CXX=' -zdefs'
203
 	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
204
-	      archive_expsym_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
205
+	      archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script $wl$lib-ver'
206
 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
207
 	      whole_archive_flag_spec_CXX='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
208
 	      compiler_needs_object_CXX=yes
209
@@ -16209,7 +16209,7 @@ fi
210
 	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
211
 	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
212
 	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
213
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
214
+	    archive_expsym_cmds_CXX='echo "{ global:" > $lib-ver~		 sed -e "s|$|;|" < $export_symbols >> $lib-ver~	 echo "local: *; };" >> $lib-ver~$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-version-script,$lib-ver -o $lib'
215
 	    export_dynamic_flag_spec_CXX='$wl-E'
216
 	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
217
 	  fi
218
@@ -16844,7 +16844,7 @@ lt_prog_compiler_static_CXX=
219
 	    lt_prog_compiler_pic_CXX='-fPIC'
220
 	    ;;
221
 	  ecpc* )
222
-	    # old Intel C++ for x86_64, which still supported -KPIC.
223
+	    # old Intel C++ for amd64, which still supported -KPIC.
224
 	    lt_prog_compiler_wl_CXX='-Wl,'
225
 	    lt_prog_compiler_pic_CXX='-KPIC'
226
 	    lt_prog_compiler_static_CXX='-static'
227
@@ -17731,7 +17731,7 @@ freebsd* | dragonfly*)
228
   version_type=freebsd-$objformat
229
   case $version_type in
230
     freebsd-elf*)
231
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
232
+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
233
       soname_spec='$libname$release$shared_ext$major'
234
       need_version=no
235
       need_lib_prefix=no
236
@@ -20328,7 +20328,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
237
 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
238
 	 if test -n "$ac_prev"; then
239
 	   case $ac_word in
240
-	     i?86 | x86_64 | ppc | ppc64)
241
+	     i?86 | amd64 | ppc | ppc64)
242
 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
243
 		 ac_arch=$ac_word
244
 	       else
245
@@ -20915,10 +20915,10 @@ asm_arch=""
246
 $as_echo_n "checking whether to enable assembly... " >&6; }
247
 test "x$enable_asm" = xno && { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
248
 $as_echo "no" >&6; }
249
-# disable if cross compiling on x86/x86_64 since we must run gen_matypes
250
+# disable if cross compiling on x86/amd64 since we must run gen_matypes
251
 if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then
252
     case "$host_cpu" in
253
-    i?86 | x86_64 | amd64)
254
+    i?86 | amd64 | amd64)
255
         if test "x$host_cpu" != "x$target_cpu"; then
256
             enable_asm=no
257
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cross compiling" >&5
258
@@ -20937,10 +20937,10 @@ if test "x$enable_asm" = xyes; then
259
             ;;
260
         esac
261
         ;;
262
-    x86_64|amd64)
263
+    amd64|amd64)
264
         case "$host_os" in
265
         linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*)
266
-            asm_arch=x86_64
267
+            asm_arch=amd64
268
             ;;
269
         esac
270
         ;;
271
@@ -20959,10 +20959,10 @@ if test "x$enable_asm" = xyes; then
272
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, x86" >&5
273
 $as_echo "yes, x86" >&6; }
274
         ;;
275
-    x86_64|amd64)
276
+    amd64|amd64)
277
         DEFINES="$DEFINES -DUSE_X86_64_ASM"
278
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, x86_64" >&5
279
-$as_echo "yes, x86_64" >&6; }
280
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, amd64" >&5
281
+$as_echo "yes, amd64" >&6; }
282
         ;;
283
     sparc)
284
         DEFINES="$DEFINES -DUSE_SPARC_ASM"
285
@@ -21955,7 +21955,7 @@ fi
286
 
287
 
43
 case "$host_os" in
288
 case "$host_os" in
44
-linux*)
289
-linux*)
45
+linux*|freebsd*)
290
+linux*|freebsd*)
Lines 46-153 Link Here
46
     dri3_default=yes
291
     dri3_default=yes
47
     ;;
292
     ;;
48
 *)
293
 *)
49
@@ -21543,6 +21552,78 @@
294
@@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then
50
 	have_libudev=yes
51
 fi
52
 
53
+
54
+pkg_failed=no
55
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5
56
+$as_echo_n "checking for LIBDEVQ... " >&6; }
57
+
58
+if test -n "$LIBDEVQ_CFLAGS"; then
59
+    pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
60
+ elif test -n "$PKG_CONFIG"; then
61
+    if test -n "$PKG_CONFIG" && \
62
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
63
+  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
64
+  ac_status=$?
65
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
66
+  test $ac_status = 0; }; then
67
+  pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
68
+		      test "x$?" != "x0" && pkg_failed=yes
69
+else
70
+  pkg_failed=yes
71
+fi
72
+ else
73
+    pkg_failed=untried
74
+fi
75
+if test -n "$LIBDEVQ_LIBS"; then
76
+    pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
77
+ elif test -n "$PKG_CONFIG"; then
78
+    if test -n "$PKG_CONFIG" && \
79
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
80
+  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
81
+  ac_status=$?
82
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
83
+  test $ac_status = 0; }; then
84
+  pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
85
+		      test "x$?" != "x0" && pkg_failed=yes
86
+else
87
+  pkg_failed=yes
88
+fi
89
+ else
90
+    pkg_failed=untried
91
+fi
92
+
93
+
94
+
95
+if test $pkg_failed = yes; then
96
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
97
+$as_echo "no" >&6; }
98
+
99
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
100
+        _pkg_short_errors_supported=yes
101
+else
102
+        _pkg_short_errors_supported=no
103
+fi
104
+        if test $_pkg_short_errors_supported = yes; then
105
+	        LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
106
+        else
107
+	        LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
108
+        fi
109
+	# Put the nasty error message in config.log where it belongs
110
+	echo "$LIBDEVQ_PKG_ERRORS" >&5
111
+
112
+	have_libdevq=no
113
+elif test $pkg_failed = untried; then
114
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
115
+$as_echo "no" >&6; }
116
+	have_libdevq=no
117
+else
118
+	LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
119
+	LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
120
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
121
+$as_echo "yes" >&6; }
122
+	have_libdevq=yes
123
+fi
124
+
125
 # Check whether --enable-sysfs was given.
126
 if test "${enable_sysfs+set}" = set; then :
127
   enableval=$enable_sysfs; have_sysfs="$enableval"
128
@@ -22258,6 +22339,10 @@
129
     DEFINES="$DEFINES -DHAVE_LIBUDEV"
130
     have_pci_id=yes
131
 fi
132
+if test "$have_libdevq" = yes; then
133
+    DEFINES="$DEFINES -DHAVE_LIBDEVQ"
134
+    have_pci_id=yes
135
+fi
136
 
137
 if test "$have_sysfs" = yes; then
138
     DEFINES="$DEFINES -DHAVE_SYSFS"
139
@@ -22396,6 +22481,22 @@
140
         ;;
295
         ;;
141
     gnu*)
296
     *freebsd* | dragonfly* | *netbsd* | openbsd*)
142
         DEFINES="$DEFINES -DHAVE_ALIAS"
297
         DEFINES="$DEFINES -DHAVE_ALIAS"
143
+        if test "x$enable_dri3" = xyes; then
298
+        if test "x$enable_dri3" = xyes; then
144
+            DEFINES="$DEFINES -DHAVE_DRI3"
299
+            DEFINES="$DEFINES -DHAVE_DRI3"
145
+        fi
300
+        fi
146
+
301
+
147
+        if test "x$have_libdevq" != xyes; then
148
+            as_fn_error $? "libdevq required for building DRI" "$LINENO" 5
149
+        fi
150
+
151
+        case "$host_cpu" in
302
+        case "$host_cpu" in
152
+        powerpc* | sparc*)
303
+        powerpc* | sparc*)
153
+            # Build only the drivers for cards that exist on PowerPC/sparc
304
+            # Build only the drivers for cards that exist on PowerPC/sparc
Lines 157-174 Link Here
157
+            ;;
308
+            ;;
158
+        esac
309
+        esac
159
         ;;
310
         ;;
160
     cygwin*)
311
     gnu*)
161
         if test "x$with_dri_drivers" = "xyes"; then
312
         DEFINES="$DEFINES -DHAVE_ALIAS"
162
@@ -23195,6 +23296,8 @@
313
@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
163
 
164
 if test "x$need_pci_id$have_libudev" = xyesyes; then
165
     GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
166
+elif test "x$need_libdevq" = xyes; then
167
+    GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
168
 else
169
     GBM_PC_REQ_PRIV=""
170
 fi
171
@@ -24018,9 +24121,19 @@
172
         as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
314
         as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
173
     fi
315
     fi
174
 
316
 
Lines 188-194 Link Here
188
 
330
 
189
     if test "x$have_libclc" = xno; then
331
     if test "x$have_libclc" = xno; then
190
         as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
332
         as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
191
@@ -24835,9 +24948,6 @@
333
@@ -26375,26 +26397,26 @@ fi
334
 strip_unwanted_llvm_flags() {
335
     # Use \> (marks the end of the word)
336
     echo `$1` | sed \
337
-	-e 's/-march=\S*//g' \
338
-	-e 's/-mtune=\S*//g' \
339
-	-e 's/-mcpu=\S*//g' \
340
-	-e 's/-DNDEBUG\>//g' \
341
-	-e 's/-D_GNU_SOURCE\>//g' \
342
-	-e 's/-pedantic\>//g' \
343
-	-e 's/-Wcovered-switch-default\>//g' \
344
-	-e 's/-O.\>//g' \
345
-	-e 's/-g\>//g' \
346
-	-e 's/-Wall\>//g' \
347
-	-e 's/-Wcast-qual\>//g' \
348
-	-e 's/-Woverloaded-virtual\>//g' \
349
-	-e 's/-fcolor-diagnostics\>//g' \
350
-	-e 's/-fdata-sections\>//g' \
351
-	-e 's/-ffunction-sections\>//g' \
352
-	-e 's/-fno-exceptions\>//g' \
353
-	-e 's/-fomit-frame-pointer\>//g' \
354
-	-e 's/-fvisibility-inlines-hidden\>//g' \
355
-	-e 's/-fPIC\>//g' \
356
-	-e 's/-fstack-protector-strong\>//g'
357
+	-e 's/-march=[:graph:]* //g' \
358
+	-e 's/-mtune=[:graph:]* //g' \
359
+	-e 's/-mcpu=[:graph:]* //g' \
360
+	-e 's/-DNDEBUG[[:>:]]//g' \
361
+	-e 's/-D_GNU_SOURCE[[:>:]]//g' \
362
+	-e 's/-pedantic[[:>:]]//g' \
363
+	-e 's/-Wcovered-switch-default[[:>:]]//g' \
364
+	-e 's/-O.[[:>:]]//g' \
365
+	-e 's/-g[[:>:]]//g' \
366
+	-e 's/-Wall[[:>:]]//g' \
367
+	-e 's/-Wcast-qual[[:>:]]//g' \
368
+	-e 's/-Woverloaded-virtual[[:>:]]//g' \
369
+	-e 's/-fcolor-diagnostics[[:>:]]//g' \
370
+	-e 's/-fdata-sections[[:>:]]//g' \
371
+	-e 's/-ffunction-sections[[:>:]]//g' \
372
+	-e 's/-fno-exceptions[[:>:]]//g' \
373
+	-e 's/-fomit-frame-pointer[[:>:]]//g' \
374
+	-e 's/-fvisibility-inlines-hidden[[:>:]]//g' \
375
+	-e 's/-fPIC[[:>:]]//g' \
376
+	-e 's/-fstack-protector-strong[[:>:]]//g'
377
 }
378
 
379
 llvm_check_version_for() {
380
@@ -26410,7 +26432,7 @@ if test -z "$with_gallium_drivers"; then
381
 fi
382
 if test "x$enable_gallium_llvm" = xauto; then
383
     case "$host_cpu" in
384
-    i*86|x86_64|amd64) enable_gallium_llvm=yes;;
385
+    i*86|amd64|amd64) enable_gallium_llvm=yes;;
386
     esac
387
 fi
388
 if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" = xyes; then
389
@@ -26670,9 +26692,6 @@ fi
192
                 CLANG_LIBDIR=${LLVM_LIBDIR}
390
                 CLANG_LIBDIR=${LLVM_LIBDIR}
193
             fi
391
             fi
194
             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
392
             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
Lines 198-200 Link Here
198
         fi
396
         fi
199
     else
397
     else
200
         MESA_LLVM=0
398
         MESA_LLVM=0
399
@@ -26752,7 +26771,7 @@ gallium_require_llvm() {
400
     if test "x$MESA_LLVM" = x0; then
401
         case "$host" in *gnux32) return;; esac
402
         case "$host_cpu" in
403
-        i*86|x86_64|amd64) as_fn_error $? "LLVM is required to build $1 on x86 and x86_64" "$LINENO" 5;;
404
+        i*86|amd64|amd64) as_fn_error $? "LLVM is required to build $1 on x86 and amd64" "$LINENO" 5;;
405
         esac
406
     fi
407
 }
408
@@ -28207,7 +28226,7 @@ else
409
 fi
410
 
411
 
412
- if test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64; then
413
+ if test "x$asm_arch" = xx86 -o "x$asm_arch" = xamd64; then
414
   HAVE_X86_ASM_TRUE=
415
   HAVE_X86_ASM_FALSE='#'
416
 else
417
@@ -28215,7 +28234,7 @@ else
418
   HAVE_X86_ASM_FALSE=
419
 fi
420
 
421
- if test "x$asm_arch" = xx86_64; then
422
+ if test "x$asm_arch" = xamd64; then
423
   HAVE_X86_64_ASM_TRUE=
424
   HAVE_X86_64_ASM_FALSE='#'
425
 else
(-)graphics/libGL/files/patch-include__GL__internal__dri_interface.h (-2 / +2 lines)
Lines 1-8 Link Here
1
GCC on 9.x doesn't allow types to be overwritten, these types are defined
1
GCC on 9.x doesn't allow types to be overwritten, these types are defined
2
in drm.h also, which causes build issues in xorg-server.
2
in drm.h also, which causes build issues in xorg-server.
3
3
4
--- include/GL/internal/dri_interface.h.orig	2015-12-05 10:55:50.545108000 +0100
4
--- include/GL/internal/dri_interface.h.orig	2016-11-10 22:05:17 UTC
5
+++ include/GL/internal/dri_interface.h	2015-12-05 10:56:03.408589000 +0100
5
+++ include/GL/internal/dri_interface.h
6
@@ -40,13 +40,7 @@
6
@@ -40,13 +40,7 @@
7
 #ifndef DRI_INTERFACE_H
7
 #ifndef DRI_INTERFACE_H
8
 #define DRI_INTERFACE_H
8
 #define DRI_INTERFACE_H
(-)graphics/libGL/files/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c (-7 / +7 lines)
Lines 25-33 Link Here
25
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
25
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
26
26
27
27
28
--- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig	2015-12-21 10:05:52.000000000 +0100
28
--- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig	2016-11-10 22:05:17 UTC
29
+++ src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c	2015-12-22 20:18:18.734280000 +0100
29
+++ src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
30
@@ -90,6 +90,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa
30
@@ -215,6 +215,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa
31
 }
31
 }
32
 
32
 
33
 static int
33
 static int
Lines 42-48 Link Here
42
 open_drm_render_node_minor(int minor)
42
 open_drm_render_node_minor(int minor)
43
 {
43
 {
44
    char path[PATH_MAX];
44
    char path[PATH_MAX];
45
@@ -101,8 +109,15 @@ open_drm_render_node_minor(int minor)
45
@@ -226,8 +234,15 @@ open_drm_render_node_minor(int minor)
46
 int
46
 int
47
 pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev)
47
 pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev)
48
 {
48
 {
Lines 58-65 Link Here
58
+   /* Look for render nodes first */
58
+   /* Look for render nodes first */
59
    for (i = DRM_RENDER_NODE_MIN_MINOR, j = 0;
59
    for (i = DRM_RENDER_NODE_MIN_MINOR, j = 0;
60
         i <= DRM_RENDER_NODE_MAX_MINOR; i++) {
60
         i <= DRM_RENDER_NODE_MAX_MINOR; i++) {
61
       fd = open_drm_render_node_minor(i);
61
       struct pipe_loader_device *dev;
62
@@ -115,6 +130,9 @@ pipe_loader_drm_probe(struct pipe_loader
62
@@ -241,6 +256,9 @@ pipe_loader_drm_probe(struct pipe_loader
63
          continue;
63
          continue;
64
       }
64
       }
65
 
65
 
Lines 69-75 Link Here
69
       if (j < ndev) {
69
       if (j < ndev) {
70
          devs[j] = dev;
70
          devs[j] = dev;
71
       } else {
71
       } else {
72
@@ -124,6 +142,46 @@ pipe_loader_drm_probe(struct pipe_loader
72
@@ -250,6 +268,46 @@ pipe_loader_drm_probe(struct pipe_loader
73
       j++;
73
       j++;
74
    }
74
    }
75
 
75
 
(-)graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (-5 / +5 lines)
Lines 1-7 Link Here
1
--- src/gallium/include/pipe/p_config.h.orig	2015-11-29 13:40:59 UTC
1
--- src/gallium/include/pipe/p_config.h.orig	2016-11-10 22:05:17 UTC
2
+++ src/gallium/include/pipe/p_config.h
2
+++ src/gallium/include/pipe/p_config.h
3
@@ -81,6 +81,13 @@
3
@@ -76,6 +76,13 @@
4
 #define PIPE_CC_SUNPRO
4
 #define PIPE_CC_ICL
5
 #endif
5
 #endif
6
 
6
 
7
+#if defined(__sparc__) || defined(__sparc64__)
7
+#if defined(__sparc__) || defined(__sparc64__)
Lines 14-20 Link Here
14
 
14
 
15
 /*
15
 /*
16
  * Processor architecture
16
  * Processor architecture
17
@@ -171,7 +178,7 @@
17
@@ -130,7 +137,7 @@
18
 
18
 
19
 #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
19
 #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
20
 #define PIPE_ARCH_LITTLE_ENDIAN
20
 #define PIPE_ARCH_LITTLE_ENDIAN
Lines 23-29 Link Here
23
 #define PIPE_ARCH_BIG_ENDIAN
23
 #define PIPE_ARCH_BIG_ENDIAN
24
 #endif
24
 #endif
25
 
25
 
26
@@ -200,6 +207,12 @@
26
@@ -159,6 +166,12 @@
27
 #define PIPE_OS_ANDROID
27
 #define PIPE_OS_ANDROID
28
 #endif
28
 #endif
29
 
29
 
(-)graphics/libGL/files/patch-src__gallium__state_trackers__clover__util__range.hpp (-10 / +1 lines)
Lines 5-17 Link Here
5
5
6
See:
6
See:
7
  https://bugs.freedesktop.org/show_bug.cgi?id=74098#c3
7
  https://bugs.freedesktop.org/show_bug.cgi?id=74098#c3
8
---
8
--- src/gallium/state_trackers/clover/util/range.hpp.orig	2016-11-10 22:05:17 UTC
9
 src/gallium/state_trackers/clover/util/range.hpp | 8 +++++++-
10
 1 file changed, 7 insertions(+), 1 deletion(-)
11
12
diff --git a/src/gallium/state_trackers/clover/util/range.hpp b/src/gallium/state_trackers/clover/util/range.hpp
13
index afa5f77..359edda 100644
14
--- src/gallium/state_trackers/clover/util/range.hpp
15
+++ src/gallium/state_trackers/clover/util/range.hpp
9
+++ src/gallium/state_trackers/clover/util/range.hpp
16
@@ -362,6 +362,12 @@ namespace clover {
10
@@ -362,6 +362,12 @@ namespace clover {
17
       return { i, i + n };
11
       return { i, i + n };
Lines 35-40 Link Here
35
    map(F &&f, Rs &&... rs) {
29
    map(F &&f, Rs &&... rs) {
36
       return { std::forward<F>(f), std::forward<Rs>(rs)... };
30
       return { std::forward<F>(f), std::forward<Rs>(rs)... };
37
    }
31
    }
38
-- 
39
1.8.5.4
40
(-)graphics/libGL/files/patch-src__gallium__winsys__svga__drm__vmw_screen_ioctl.c (-5 / +5 lines)
Lines 1-8 Link Here
1
--- ./src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig	2014-01-06 22:15:40.000000000 +0100
1
--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig	2016-11-10 22:05:17 UTC
2
+++ ./src/gallium/winsys/svga/drm/vmw_screen_ioctl.c	2014-02-23 22:01:50.000000000 +0100
2
+++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
3
@@ -66,6 +66,11 @@
3
@@ -70,6 +70,11 @@ vmw_region_size(struct vmw_region *regio
4
  */
4
    return region->size;
5
 #define SVGA3D_SURFACE_HINT_SCANOUT (1 << 9)
5
 }
6
 
6
 
7
+#if defined(__DragonFly__) || defined(__FreeBSD__) || \
7
+#if defined(__DragonFly__) || defined(__FreeBSD__) || \
8
+    defined(__NetBSD__) || defined(__OpenBSD__)
8
+    defined(__NetBSD__) || defined(__OpenBSD__)
(-)graphics/libGL/files/patch-src__loader__Makefile.in (-11 lines)
Lines 1-11 Link Here
1
--- src/loader/Makefile.in.orig	2015-12-04 10:21:50.951759000 +0100
2
+++ src/loader/Makefile.in	2015-12-04 10:27:14.391665000 +0100
3
@@ -531,7 +531,7 @@
4
 	$(LIBDRM_CFLAGS) \
5
 	$(LIBUDEV_CFLAGS)
6
 
7
-libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(am__append_1)
8
+libloader_la_CPPFLAGS = $(AM_CPPFLAGS) $(LIBDEVQ_CFLAGS) $(am__append_1)
9
 libloader_la_SOURCES = $(LOADER_C_FILES)
10
 libloader_la_LIBADD = $(am__append_2) $(am__append_3)
11
 @HAVE_DRI3_TRUE@libloader_dri3_helper_la_SOURCES = \
(-)graphics/libGL/files/patch-src__loader__loader.c (-91 lines)
Lines 1-91 Link Here
1
--- src/loader/loader.c.orig	2015-08-22 12:01:00.000000000 +0200
2
+++ src/loader/loader.c	2015-08-24 10:50:05.251081000 +0200
3
@@ -70,7 +70,7 @@
4
 #include <stdarg.h>
5
 #include <stdio.h>
6
 #include <string.h>
7
-#ifdef HAVE_LIBUDEV
8
+#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ)
9
 #include <assert.h>
10
 #include <dlfcn.h>
11
 #include <unistd.h>
12
@@ -505,6 +505,54 @@ sysfs_get_pci_id_for_fd(int fd, int *ven
13
 }
14
 #endif
15
 
16
+#if defined(HAVE_LIBDEVQ)
17
+#include <libdevq.h>
18
+
19
+static void *devq_handle = NULL;
20
+
21
+static void *
22
+devq_dlopen_handle(void)
23
+{
24
+   if (!devq_handle) {
25
+      devq_handle = dlopen("libdevq.so.0", RTLD_LOCAL | RTLD_LAZY);
26
+   }
27
+
28
+   return devq_handle;
29
+}
30
+
31
+static void *
32
+asserted_dlsym(void *dlopen_handle, const char *name)
33
+{
34
+   void *result = dlsym(dlopen_handle, name);
35
+   assert(result);
36
+   return result;
37
+}
38
+
39
+#define DEVQ_SYMBOL(ret, name, args) \
40
+   ret (*name) args = asserted_dlsym(devq_dlopen_handle(), #name);
41
+
42
+static int
43
+devq_get_pci_id_from_fd(int fd, int *vendor_id, int *chip_id)
44
+{
45
+   int ret;
46
+   DEVQ_SYMBOL(int, devq_device_get_pciid_from_fd,
47
+               (int fd, int *vendor_id, int *chip_id));
48
+
49
+   *chip_id = -1;
50
+
51
+   ret = devq_device_get_pciid_from_fd(fd, vendor_id, chip_id);
52
+   if (ret < 0) {
53
+      log_(_LOADER_WARNING, "MESA-LOADER: could not get PCI ID\n");
54
+      goto out;
55
+   }
56
+
57
+out:
58
+   return (*chip_id >= 0);
59
+}
60
+
61
+#endif
62
+
63
+
64
 #if defined(HAVE_LIBDRM)
65
 /* for i915 */
66
 #include <i915_drm.h>
67
@@ -588,6 +636,10 @@ loader_get_pci_id_for_fd(int fd, int *ve
68
    if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id))
69
       return 1;
70
 #endif
71
+#if HAVE_LIBDEVQ
72
+   if (devq_get_pci_id_from_fd(fd, vendor_id, chip_id))
73
+      return 1;
74
+#endif
75
 #if HAVE_LIBDRM
76
    if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id))
77
       return 1;
78
@@ -685,6 +737,13 @@ loader_get_device_name_for_fd(int fd)
79
    if ((result = sysfs_get_device_name_for_fd(fd)))
80
       return result;
81
 #endif
82
+#if HAVE_LIBDEVQ
83
+#if 0
84
+/* XXX implement this function in libdevq */
85
+   if ((result = devq_device_get_name_for_fd(fd)))
86
+      return result;
87
+#endif
88
+#endif
89
    return result;
90
 }
91
 
(-)graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h (-13 lines)
Lines 1-13 Link Here
1
--- src/mapi/entry_x86-64_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
2
+++ src/mapi/entry_x86-64_tls.h	2014-07-29 20:28:05.000000000 +0200
3
@@ -63,8 +63,8 @@ entry_patch_public(void)
4
 {
5
 }
6
 
7
-static char
8
-x86_64_entry_start[];
9
+extern char
10
+x86_64_entry_start[] __attribute__((visibility("hidden")));
11
 
12
 mapi_func
13
 entry_get_public(int slot)
(-)graphics/libGL/files/patch-src__mapi__entry_x86_tls.h (-13 lines)
Lines 1-13 Link Here
1
--- src/mapi/entry_x86_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
2
+++ src/mapi/entry_x86_tls.h	2014-07-29 20:28:05.000000000 +0200
3
@@ -73,8 +73,8 @@ __asm__(".text");
4
 extern unsigned long
5
 x86_current_tls();
6
 
7
-static char x86_entry_start[];
8
-static char x86_entry_end[];
9
+extern char x86_entry_start[] __attribute__((visibility("hidden")));
10
+extern char x86_entry_end[] __attribute__((visibility("hidden")));
11
 
12
 void
13
 entry_patch_public(void)
(-)graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h (-13 lines)
Lines 1-13 Link Here
1
--- src/mapi/entry_x86_tsd.h.orig	2013-10-05 05:59:22.000000000 +0200
2
+++ src/mapi/entry_x86_tsd.h	2014-07-29 20:28:05.000000000 +0200
3
@@ -60,8 +60,8 @@ __asm__(".balign 32\n"
4
 #include <string.h>
5
 #include "u_execmem.h"
6
 
7
-static const char x86_entry_start[];
8
-static const char x86_entry_end[];
9
+extern const char x86_entry_start[] __attribute__((visibility("hidden")));
10
+extern const char x86_entry_end[] __attribute__((visibility("hidden")));
11
 
12
 void
13
 entry_patch_public(void)
(-)graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/mapi/glapi/gen/gl_gentable.py.orig	2014-11-21 13:09:28.624910062 +0100
1
--- src/mapi/glapi/gen/gl_gentable.py.orig	2016-11-16 01:19:51 UTC
2
+++ src/mapi/glapi/gen/gl_gentable.py	2014-11-21 13:10:48.294268333 +0100
2
+++ src/mapi/glapi/gen/gl_gentable.py
3
@@ -42,7 +42,7 @@
3
@@ -44,7 +44,7 @@ header = """/* GLXEXT is the define used
4
 #endif
4
 #endif
5
 
5
 
6
 #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
6
 #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
(-)graphics/libGL/files/patch-src__mesa__main__compiler.h (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/mesa/main/compiler.h.orig	2015-06-07 06:45:48.000000000 -0400
1
--- src/mesa/main/compiler.h.orig	2016-11-10 22:05:17 UTC
2
+++ src/mesa/main/compiler.h	2015-06-16 05:04:53.967546000 -0400
2
+++ src/mesa/main/compiler.h
3
@@ -70,6 +70,9 @@
3
@@ -56,6 +56,9 @@ extern "C" {
4
 #if defined(__linux__)
4
 #if defined(__linux__)
5
 #include <byteswap.h>
5
 #include <byteswap.h>
6
 #define CPU_TO_LE32( x )	bswap_32( x )
6
 #define CPU_TO_LE32( x )	bswap_32( x )
(-)graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c (+11 lines)
Line 0 Link Here
1
--- src/gallium/auxiliary/util/u_network.c.orig	2016-11-10 22:05:17 UTC
2
+++ src/gallium/auxiliary/util/u_network.c
3
@@ -6,7 +6,7 @@
4
 #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
5
 #  include <winsock2.h>
6
 #  include <windows.h>
7
-#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
8
+#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_HAIKU) || \
9
    defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
10
 #  include <sys/socket.h>
11
 #  include <netinet/in.h>
(-)graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp (+13 lines)
Line 0 Link Here
1
# Fix error: no matching constructor for initialization of 'std::vector<const ::llvm::MDNode *>' 
2
#
3
--- src/gallium/state_trackers/clover/llvm/metadata.hpp.orig	2016-11-16 01:26:24 UTC
4
+++ src/gallium/state_trackers/clover/llvm/metadata.hpp
5
@@ -42,7 +42,7 @@ namespace clover {
6
          get_kernel_nodes(const ::llvm::Module &mod) {
7
             if (const ::llvm::NamedMDNode *n =
8
                    mod.getNamedMetadata("opencl.kernels"))
9
-               return { n->op_begin(), n->op_end() };
10
+               return { n->getOperand(0), n->getOperand(n->getNumOperands()) };
11
             else
12
                return {};
13
          }
(-)graphics/libGL/files/patch-src_intel_tools_aubinator.c (+14 lines)
Line 0 Link Here
1
# We don't have MAP_NORESERVE so use MAP_NOSYNC | MAP_NOCORE and
2
# hope for the best (this alloc is too big but it's only a test)
3
#
4
--- src/intel/tools/aubinator.c.orig	2016-11-10 22:06:40 UTC
5
+++ src/intel/tools/aubinator.c
6
@@ -1226,7 +1226,7 @@ int main(int argc, char *argv[])
7
    /* mmap a terabyte for our gtt space. */
8
    gtt_size = 1ul << 40;
9
    gtt = mmap(NULL, gtt_size, PROT_READ | PROT_WRITE,
10
-              MAP_PRIVATE | MAP_ANONYMOUS |  MAP_NORESERVE, -1, 0);
11
+              MAP_PRIVATE | MAP_ANONYMOUS | MAP_NOSYNC | MAP_NOCORE, -1, 0);
12
    if (gtt == MAP_FAILED) {
13
       fprintf(stderr, "failed to alloc gtt space: %s\n", strerror(errno));
14
       exit(EXIT_FAILURE);
(-)graphics/libGL/files/patch-src_util_ralloc.c (-3 / +3 lines)
Lines 1-6 Link Here
1
--- src/util/ralloc.c.orig	2015-08-07 17:36:03 UTC
1
--- src/util/ralloc.c.orig	2016-11-10 22:06:40 UTC
2
+++ src/util/ralloc.c
2
+++ src/util/ralloc.c
3
@@ -311,6 +311,7 @@ ralloc_parent(const void *ptr)
3
@@ -315,6 +315,7 @@ ralloc_parent(const void *ptr)
4
 
4
 
5
 static void *autofree_context = NULL;
5
 static void *autofree_context = NULL;
6
 
6
 
Lines 8-14 Link Here
8
 static void
8
 static void
9
 autofree(void)
9
 autofree(void)
10
 {
10
 {
11
@@ -322,7 +323,6 @@ ralloc_autofree_context(void)
11
@@ -326,7 +327,6 @@ ralloc_autofree_context(void)
12
 {
12
 {
13
    if (unlikely(autofree_context == NULL)) {
13
    if (unlikely(autofree_context == NULL)) {
14
       autofree_context = ralloc_context(NULL);
14
       autofree_context = ralloc_context(NULL);
(-)graphics/libGL/files/patch-src_util_u__endian.h (+11 lines)
Line 0 Link Here
1
--- src/util/u_endian.h.orig	2016-11-10 22:05:17 UTC
2
+++ src/util/u_endian.h
3
@@ -54,7 +54,7 @@
4
 # define PIPE_ARCH_BIG_ENDIAN
5
 #endif
6
 
7
-#elif defined(__OpenBSD__) || defined(__NetBSD__)
8
+#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
9
 #include <sys/types.h>
10
 #include <machine/endian.h>
11
 
(-)graphics/libGL/files/src__loader__Makefile.am (-12 lines)
Lines 1-12 Link Here
1
--- src/loader/Makefile.am.orig	2015-02-13 11:41:50.497483000 +0100
2
+++ src/loader/Makefile.am	2015-02-13 11:42:02.748812000 +0100
3
@@ -30,7 +30,8 @@
4
 	-I$(top_srcdir)/include \
5
 	-I$(top_srcdir)/src \
6
 	$(VISIBILITY_CFLAGS) \
7
-	$(LIBUDEV_CFLAGS)
8
+	$(LIBUDEV_CFLAGS) \
9
+	$(LIBDEVQ_CFLAGS)
10
 
11
 libloader_la_SOURCES = $(LOADER_C_FILES)
12
 libloader_la_LIBADD =
(-)graphics/libGL/pkg-plist (-2 lines)
Lines 5-12 Link Here
5
include/GL/glx.h
5
include/GL/glx.h
6
include/GL/glx_mangle.h
6
include/GL/glx_mangle.h
7
include/GL/glxext.h
7
include/GL/glxext.h
8
@comment include/GL/osmesa.h
9
include/GL/wglext.h
10
lib/.mesa/libGL.so
8
lib/.mesa/libGL.so
11
lib/.mesa/libGL.so.1
9
lib/.mesa/libGL.so.1
12
lib/.mesa/libGL.so.1.2.0
10
lib/.mesa/libGL.so.1.2.0
(-)graphics/libglesv2/pkg-plist (+1 lines)
Lines 3-8 Link Here
3
include/GLES2/gl2platform.h
3
include/GLES2/gl2platform.h
4
include/GLES3/gl3.h
4
include/GLES3/gl3.h
5
include/GLES3/gl31.h
5
include/GLES3/gl31.h
6
include/GLES3/gl32.h
6
include/GLES3/gl3ext.h
7
include/GLES3/gl3ext.h
7
include/GLES3/gl3platform.h
8
include/GLES3/gl3platform.h
8
lib/.mesa/libGLESv2.so
9
lib/.mesa/libGLESv2.so
(-)graphics/libosmesa/distinfo (-2 lines)
Lines 1-2 Link Here
1
SHA256 (MesaLib-10.2.7.tar.bz2) = 27b958063a4c002071f14ed45c7d2a1ee52cd85e4ac8876e8a1c273495a7d43f
2
SIZE (MesaLib-10.2.7.tar.bz2) = 7107753

Return to bug 214581