Attachment #179062 for bug #214581




		libexpat.so:textproc/expat2

USES=		ssl
USE_XORG=	dri2proto dri3proto glproto presentproto x11 xext xdamage \
		xfixes xshmfence xv xvmc xxf86vm 

OPTIONS_DEFINE=	TEXTURE
OPTIONS_DEFAULT=TEXTURE


.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"

# Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
#
# glsl/cache.c:613:4: error: cannot compile this atomic library call yet
#   p_atomic_add(cache->size, size); note: expanded from macro 'p_atomic_add'
# define p_atomic_add(v, i) (void) __atomic_add_fetch((v), (i), __ATOMIC_ACQ_REL)
#
.if ${OSVERSION} < 1100000 && ${ARCH} == "i386"
# post-patch is defined in Makefile.targets, use pre-configure target to patch
pre-configure:
	@${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
.endif

post-install:
	@${RM} -r ${STAGEDIR}/etc/OpenCL





@comment include/GL/glxext.h
include/GL/internal/dri_interface.h
@comment include/GL/osmesa.h
@comment include/GL/wglext.h
@comment include/GL/wmesa.h
@comment include/GLES2/gl2.h
@comment include/GLES2/gl2ext.h
@comment include/GLES2/gl2platform.h
@comment include/GLES3/gl3.h
@comment include/GLES3/gl31.h
@comment include/GLES3/gl32.h
@comment include/GLES3/gl3ext.h
@comment include/GLES3/gl3platform.h
@comment include/KHR/khrplatform.h

Lines 16-22 Link Here

(-)graphics/gbm/Makefile (-1 / +1 lines)
16	USE_XORG= x11 xau xcb xdmcp	16	USE_XORG= x11 xau xcb xdmcp
17		17
18	# stuff not needed by gbm but configure wants it	18	# stuff not needed by gbm but configure wants it
19	USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \	19	USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \
20	xshmfence	20	xshmfence
21		21
22	.include <bsd.port.options.mk>	22	.include <bsd.port.options.mk>

Lines 10-16 Link Here

(-)graphics/libEGL/Makefile (-2 / +1 lines)
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
Lines 17-23 Link Here
17	USE_XORG= x11 xau xcb xdmcp	16	USE_XORG= x11 xau xcb xdmcp
18		17
19	# stuff not needed by libEGL but configure wants it	18	# stuff not needed by libEGL but configure wants it
20	USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \	19	USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \
21	xshmfence	20	xshmfence
22		21
23	.include <bsd.port.options.mk>	22	.include <bsd.port.options.mk>

Lines 12-19 Link Here

(-)graphics/libGL/Makefile (-4 / +4 lines)
12	libglapi.so:graphics/libglapi \	12	libglapi.so:graphics/libglapi \
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= dri2proto dri3proto glproto presentproto x11 xcb xdamage xext \
16	presentproto xshmfence	16	xfixes xshmfence xxf86vm
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>




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

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


MAINTAINER=	x11@FreeBSD.org

BUILD_DEPENDS+=	makedepend:devel/makedepend
LIB_DEPENDS+=	libdevq.so:devel/libdevq

USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
		localbase pathfix pkgconfig python:2,build shebangfix tar:xz
USE_LDCONFIG=	yes
GNU_CONFIGURE=	yes
LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
LDFLAGS+=	-Wl,-Y/usr/lib:${LOCALBASE}/lib

PKGINSTALL=	${.CURDIR}/pkg-install
PKGDEINSTALL=	${.CURDIR}/pkg-deinstall


COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}

MESA_LLVM_VER=39

CONFIGURE_ARGS+=	--with-sha1=libcrypto

# DRI3 needs PRIME support in the kernel to work
CONFIGURE_ARGS+=	--disable-dri3

CONFIGURE_ARGS+=	--enable-gbm

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

# Clover (OpenCL).
.if ${OPSYS} == DragonFly || \
	(${OPSYS} == FreeBSD && \
		(${ARCH} == amd64 || ${ARCH} == i386))
		${ARCH} == i386))

BUILD_DEPENDS+=	libclc>=0.2.0.20160915:devel/libclc

# We need the clang port too even if it is not used to compile because
# Clover needs some of the clang includes to build.

CONFIGURE_ARGS+=	--enable-osmesa

# gallium
BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
.if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
.endif

CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}

CONFIGURE_ARGS+=--enable-gallium-llvm --enable-llvm-shared-libs \
                --enable-xvmc

.if ${PORT_OPTIONS:MTEXTURE}

.endif

.if ${ARCH} == powerpc || ${ARCH} == powerpc64
DRI_DRIVERS=	RADEON R200 SWRAST
GALLIUM_DRIVERS=	R300 R600 RADEONSI SWRAST
.endif

.if ${ARCH} == sparc64 || ${ARCH} == armv6

Lines 1-2 Link Here

(-)graphics/libGL/distinfo (-2 / +3 lines)
1	SHA256 (mesa-11.2.2.tar.xz) = 40e148812388ec7c6d7b6657d5a16e2e8dabba8b97ddfceea5197947647bdfb4	1	TIMESTAMP = 1483668696
2	SIZE (mesa-11.2.2.tar.xz) = 7860932	2	SHA256 (mesa-13.0.3.tar.xz) = d9aa8be5c176d00d0cd503cb2f64a5a403ea471ec819c022581414860d7ba40e
		3	SIZE (mesa-13.0.3.tar.xz) = 9162036




--- configure.ac.orig	2016-06-21 14:31:09.000000000 +0200
+++ configure.ac	2016-07-08 13:05:53.236433000 +0200
@@ -871,7 +872,7 @@
 DRI3PROTO_REQUIRED=1.0
 PRESENTPROTO_REQUIRED=1.0
 LIBUDEV_REQUIRED=151
+LIBDEVQ_REQUIRED=0.0.2
 GLPROTO_REQUIRED=1.4.14
 LIBOMXIL_BELLAGIO_REQUIRED=0.0
 LIBVA_REQUIRED=0.35.0
@@ -743,7 +744,7 @@
     [enable_dri=yes])
 
 case "$host_os" in

     dri3_default=yes
     ;;
 *)
@@ -1540,6 +1548,19 @@
 PKG_CHECK_MODULES([LIBUDEV], [libudev >= $LIBUDEV_REQUIRED],
                   have_libudev=yes, have_libudev=no)
 
+PKG_CHECK_MODULES([LIBDEVQ], [libdevq-1.0 >= $LIBDEVQ_REQUIRED],
+                  have_libdevq=yes, have_libdevq=no)
+
 AC_ARG_ENABLE([sysfs],
     [AS_HELP_STRING([--enable-sysfs],
         [enable /sys PCI identification @<:@default=disabled@:>@])],
@@ -1096,6 +1100,10 @@
     DEFINES="$DEFINES -DHAVE_LIBUDEV"
     have_pci_id=yes
 fi
+if test "$have_libdevq" = yes; then
+    DEFINES="$DEFINES -DHAVE_LIBDEVQ"
+    have_pci_id=yes
+fi
 
 if test "$have_sysfs" = yes; then
     DEFINES="$DEFINES -DHAVE_SYSFS"
@@ -1228,6 +1236,23 @@
         ;;
     gnu*)
         DEFINES="$DEFINES -DHAVE_ALIAS"

+            DEFINES="$DEFINES -DHAVE_DRI3"
+        fi
+
+        if test "x$have_libdevq" != xyes; then
+            AC_MSG_ERROR([libdevq required for building DRI])
+        fi
+
+        case "$host_cpu" in
+        powerpc* | sparc*)
+            # Build only the drivers for cards that exist on PowerPC/sparc

         ;;
     cygwin*)
         if test "x$with_dri_drivers" = "xyes"; then
@@ -1921,9 +1948,19 @@
 AM_CONDITIONAL(HAVE_GBM, test "x$enable_gbm" = xyes)
 if test "x$need_pci_id$have_libudev" = xyesyes; then
     GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
+elif test "x$need_libdevq" = xyes; then
+    GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
 else
     GBM_PC_REQ_PRIV=""
 fi
@@ -1545,9 +1572,19 @@
         AC_MSG_ERROR([cannot enable OpenCL without Gallium])
     fi
 

 
     if test "x$have_libclc" = xno; then
         AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
@@ -2102,9 +2139,9 @@
 strip_unwanted_llvm_flags() {
     # Use \> (marks the end of the word)
     echo `$1` | sed \
-	-e 's/-march=\S*//g' \
-	-e 's/-mtune=\S*//g' \
-	-e 's/-mcpu=\S*//g' \
+	-e 's/-march=[[:graph:]]* //g' \
+	-e 's/-mtune=[[:graph:]]* //g' \
+	-e 's/-mcpu=[[:graph:]]* //g' \
 	-e 's/-DNDEBUG\>//g' \
 	-e 's/-D_GNU_SOURCE\>//g' \
 	-e 's/-pedantic\>//g' \
@@ -2196,8 +2233,6 @@
                 CLANG_LIBDIR=${LLVM_LIBDIR}
             fi
             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}




--- configure.orig	2017-01-05 15:52:21 UTC
+++ configure
@@ -1962,7 +1962,7 @@ Optional Features:
                           Disable writable .text section on x86 (decreases
                           performance) [default=disabled]
   --enable-gallium-llvm   build gallium LLVM support [default=enabled on
-                          x86/x86_64]
+                          x86/amd64]
   --enable-llvm-shared-libs
                           link with LLVM shared libraries [default=enabled]
   --enable-valgrind       Build mesa with valgrind support (default: auto)
@@ -9622,7 +9622,7 @@ mips64*-*linux*)
   rm -rf conftest*
   ;;
 LIBUDEV_LIBS
+LIBDEVQ_CFLAGS
+LIBDEVQ_LIBS
 XLIBGL_CFLAGS
 XLIBGL_LIBS
 GLPROTO_CFLAGS
@@ -1966,6 +1970,10 @@
               C compiler flags for LIBUDEV, overriding pkg-config
   LIBUDEV_LIBS
               linker flags for LIBUDEV, overriding pkg-config
+  LIBDEVQ_CFLAGS
+              C compiler flags for LIBDEVQ, overriding pkg-config
+  LIBDEVQ_LIBS
+              linker flags for LIBDEVQ, overriding pkg-config
   XLIBGL_CFLAGS
               C compiler flags for XLIBGL, overriding pkg-config
   XLIBGL_LIBS linker flags for XLIBGL, overriding pkg-config
@@ -5246,6 +5254,7 @@
 DRI3PROTO_REQUIRED=1.0
 PRESENTPROTO_REQUIRED=1.0
 LIBUDEV_REQUIRED=151
+LIBDEVQ_REQUIRED=0.0.2
 GLPROTO_REQUIRED=1.4.14
 LIBOMXIL_BELLAGIO_REQUIRED=0.0
 LIBVA_REQUIRED=0.35.0
@@ -21035,7 +21044,7 @@
 
-x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
+amd64-*kfreebsd*-gnu|amd64-*linux*|powerpc*-*linux*| \
 s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
   # Find out what ABI is being produced by ac_compile, and set linker
   # options accordingly.  Note that the listed cases only cover the
@@ -9639,13 +9639,13 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
     case `/usr/bin/file conftest.o` in
       *32-bit*)
 	case $host in
-	  x86_64-*kfreebsd*-gnu)
+	  amd64-*kfreebsd*-gnu)
 	    LD="${LD-ld} -m elf_i386_fbsd"
 	    ;;
-	  x86_64-*linux*)
+	  amd64-*linux*)
 	    case `/usr/bin/file conftest.o` in
 	      *x86-64*)
-		LD="${LD-ld} -m elf32_x86_64"
+		LD="${LD-ld} -m elf32_amd64"
 		;;
 	      *)
 		LD="${LD-ld} -m elf_i386"
@@ -9668,11 +9668,11 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
 	;;
       *64-bit*)
 	case $host in
-	  x86_64-*kfreebsd*-gnu)
-	    LD="${LD-ld} -m elf_x86_64_fbsd"
+	  amd64-*kfreebsd*-gnu)
+	    LD="${LD-ld} -m elf_amd64_fbsd"
 	    ;;
-	  x86_64-*linux*)
-	    LD="${LD-ld} -m elf_x86_64"
+	  amd64-*linux*)
+	    LD="${LD-ld} -m elf_amd64"
 	    ;;
 	  powerpcle-*linux*)
 	    LD="${LD-ld} -m elf64lppc"
@@ -9754,8 +9754,8 @@ $as_echo "$lt_cv_cc_needs_belf" >&6; }
       case $lt_cv_prog_gnu_ld in
       yes*)
         case $host in
-        i?86-*-solaris*|x86_64-*-solaris*)
-          LD="${LD-ld} -m elf_x86_64"
+        i?86-*-solaris*|amd64-*-solaris*)
+          LD="${LD-ld} -m elf_amd64"
           ;;
         sparc*-*-solaris*)
           LD="${LD-ld} -m elf64_sparc"
@@ -11464,7 +11464,7 @@ lt_prog_compiler_static=
 
     linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
-      # old Intel for x86_64, which still supported -KPIC.
+      # old Intel for amd64, which still supported -KPIC.
       ecc*)
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-KPIC'
@@ -11907,7 +11907,7 @@ $as_echo_n "checking whether the $compil
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
   inherit_rpath=no
-  link_all_deplibs=unknown
+  link_all_deplibs=no
   module_cmds=
   module_expsym_cmds=
   old_archive_from_new_cmds=
@@ -12206,7 +12206,7 @@ _LT_EOF
 	wlarc=
       else
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	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'
       fi
       ;;
 
@@ -12225,7 +12225,7 @@ _LT_EOF
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	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'
       else
 	ld_shlibs=no
       fi
@@ -12254,7 +12254,7 @@ _LT_EOF
 	  if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	    hardcode_libdir_flag_spec='$wl-rpath $wl$libdir'
 	    archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	    archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	    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'
 	  else
 	    ld_shlibs=no
 	  fi
@@ -12272,7 +12272,7 @@ _LT_EOF
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
 	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
+	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'
       else
 	ld_shlibs=no
       fi
@@ -12920,7 +12920,7 @@ $as_echo "$lt_cv_irix_exported_symbol" >
 	hardcode_direct_absolute=yes
 	if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
 	  archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
-	  archive_expsym_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+	  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'
 	  hardcode_libdir_flag_spec='$wl-rpath,$libdir'
 	  export_dynamic_flag_spec='$wl-E'
 	else
@@ -13769,7 +13769,7 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
       soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
@@ -14901,7 +14901,7 @@ striplib=
 old_striplib=
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether stripping libraries is possible" >&5
 $as_echo_n "checking whether stripping libraries is possible... " >&6; }
-if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "GNU strip" >/dev/null; then
+if test -n "$STRIP" && $STRIP -V 2>&1 | $GREP "strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
@@ -15153,7 +15153,7 @@ hardcode_automatic_CXX=no
 inherit_rpath_CXX=no
 module_cmds_CXX=
 module_expsym_cmds_CXX=
-link_all_deplibs_CXX=unknown
+link_all_deplibs_CXX=no
 old_archive_cmds_CXX=$old_archive_cmds
 reload_flag_CXX=$reload_flag
 reload_cmds_CXX=$reload_cmds
@@ -15364,7 +15364,7 @@ with_gnu_ld=$lt_cv_prog_gnu_ld
       # archiving commands below assume that GNU ld is being used.
       if test yes = "$with_gnu_ld"; then
         archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-        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'
+        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'
 
         hardcode_libdir_flag_spec_CXX='$wl-rpath $wl$libdir'
         export_dynamic_flag_spec_CXX='$wl--export-dynamic'
@@ -16056,7 +16056,7 @@ fi
 	    case `$CC -V 2>&1` in
 	      *"Version 7."*)
 	        archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-		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'
+		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'
 		;;
 	      *)  # Version 8.0 or newer
 	        tmp_idyn=
@@ -16064,7 +16064,7 @@ fi
 		  ia64*) tmp_idyn=' -i_dynamic';;
 		esac
 	        archive_cmds_CXX='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
-		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'
+		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'
 		;;
 	    esac
 	    archive_cmds_need_lc_CXX=no
@@ -16096,7 +16096,7 @@ fi
 	      ;;
 	    *) # Version 6 and above use weak symbols
 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	      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'
+	      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'
 	      ;;
 	    esac
 
@@ -16107,7 +16107,7 @@ fi
 	  cxx*)
 	    # Compaq C++
 	    archive_cmds_CXX='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
-	    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'
+	    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'
 
 	    runpath_var=LD_RUN_PATH
 	    hardcode_libdir_flag_spec_CXX='-rpath $libdir'
@@ -16141,7 +16141,7 @@ fi
 	      # Sun C++ 5.9
 	      no_undefined_flag_CXX=' -zdefs'
 	      archive_cmds_CXX='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
-	      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'
+	      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'
 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
 	      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'
 	      compiler_needs_object_CXX=yes
@@ -16209,7 +16209,7 @@ fi
 	  archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
 	  hardcode_libdir_flag_spec_CXX='$wl-rpath,$libdir'
 	  if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
-	    archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+	    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'
 	    export_dynamic_flag_spec_CXX='$wl-E'
 	    whole_archive_flag_spec_CXX=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
 	  fi
@@ -16844,7 +16844,7 @@ lt_prog_compiler_static_CXX=
 	    lt_prog_compiler_pic_CXX='-fPIC'
 	    ;;
 	  ecpc* )
-	    # old Intel C++ for x86_64, which still supported -KPIC.
+	    # old Intel C++ for amd64, which still supported -KPIC.
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-static'
@@ -17731,7 +17731,7 @@ freebsd* | dragonfly*)
   version_type=freebsd-$objformat
   case $version_type in
     freebsd-elf*)
-      library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+      library_names_spec='$libname$release$shared_ext$versuffix  $libname$release$shared_ext$major	 $libname$shared_ext'			 soname_spec='$libname$release$shared_ext$major'
       soname_spec='$libname$release$shared_ext$major'
       need_version=no
       need_lib_prefix=no
@@ -20328,7 +20328,7 @@ if ac_fn_c_try_compile "$LINENO"; then :
 	for ac_word in $CC $CFLAGS $CPPFLAGS $LDFLAGS; do
 	 if test -n "$ac_prev"; then
 	   case $ac_word in
-	     i?86 | x86_64 | ppc | ppc64)
+	     i?86 | amd64 | ppc | ppc64)
 	       if test -z "$ac_arch" || test "$ac_arch" = "$ac_word"; then
 		 ac_arch=$ac_word
 	       else
@@ -20915,10 +20915,10 @@ asm_arch=""
 $as_echo_n "checking whether to enable assembly... " >&6; }
 test "x$enable_asm" = xno && { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-# disable if cross compiling on x86/x86_64 since we must run gen_matypes
+# disable if cross compiling on x86/amd64 since we must run gen_matypes
 if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then
     case "$host_cpu" in
-    i?86 | x86_64 | amd64)
+    i?86 | amd64 | amd64)
         if test "x$host_cpu" != "x$target_cpu"; then
             enable_asm=no
             { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, cross compiling" >&5
@@ -20937,10 +20937,10 @@ if test "x$enable_asm" = xyes; then
             ;;
         esac
         ;;
-    x86_64|amd64)
+    amd64|amd64)
         case "$host_os" in
         linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*)
-            asm_arch=x86_64
+            asm_arch=amd64
             ;;
         esac
         ;;
@@ -20959,10 +20959,10 @@ if test "x$enable_asm" = xyes; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, x86" >&5
 $as_echo "yes, x86" >&6; }
         ;;
-    x86_64|amd64)
+    amd64|amd64)
         DEFINES="$DEFINES -DUSE_X86_64_ASM"
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, x86_64" >&5
-$as_echo "yes, x86_64" >&6; }
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes, amd64" >&5
+$as_echo "yes, amd64" >&6; }
         ;;
     sparc)
         DEFINES="$DEFINES -DUSE_SPARC_ASM"
@@ -21955,7 +21955,7 @@ fi
 
 
 case "$host_os" in
-linux*)
+linux*|freebsd*)

     dri3_default=yes
     ;;
 *)
@@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then
 	have_libudev=yes
 fi
 
+
+pkg_failed=no
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LIBDEVQ" >&5
+$as_echo_n "checking for LIBDEVQ... " >&6; }
+
+if test -n "$LIBDEVQ_CFLAGS"; then
+    pkg_cv_LIBDEVQ_CFLAGS="$LIBDEVQ_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBDEVQ_CFLAGS=`$PKG_CONFIG --cflags "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+if test -n "$LIBDEVQ_LIBS"; then
+    pkg_cv_LIBDEVQ_LIBS="$LIBDEVQ_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+    if test -n "$PKG_CONFIG" && \
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libdevq-1.0 >= \$LIBDEVQ_REQUIRED\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libdevq-1.0 >= $LIBDEVQ_REQUIRED") 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }; then
+  pkg_cv_LIBDEVQ_LIBS=`$PKG_CONFIG --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>/dev/null`
+		      test "x$?" != "x0" && pkg_failed=yes
+else
+  pkg_failed=yes
+fi
+ else
+    pkg_failed=untried
+fi
+
+
+
+if test $pkg_failed = yes; then
+   	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
+        _pkg_short_errors_supported=yes
+else
+        _pkg_short_errors_supported=no
+fi
+        if test $_pkg_short_errors_supported = yes; then
+	        LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
+        else
+	        LIBDEVQ_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libdevq-1.0 >= $LIBDEVQ_REQUIRED" 2>&1`
+        fi
+	# Put the nasty error message in config.log where it belongs
+	echo "$LIBDEVQ_PKG_ERRORS" >&5
+
+	have_libdevq=no
+elif test $pkg_failed = untried; then
+     	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+	have_libdevq=no
+else
+	LIBDEVQ_CFLAGS=$pkg_cv_LIBDEVQ_CFLAGS
+	LIBDEVQ_LIBS=$pkg_cv_LIBDEVQ_LIBS
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+	have_libdevq=yes
+fi
+
 # Check whether --enable-sysfs was given.
 if test "${enable_sysfs+set}" = set; then :
   enableval=$enable_sysfs; have_sysfs="$enableval"
@@ -22258,6 +22339,10 @@
     DEFINES="$DEFINES -DHAVE_LIBUDEV"
     have_pci_id=yes
 fi
+if test "$have_libdevq" = yes; then
+    DEFINES="$DEFINES -DHAVE_LIBDEVQ"
+    have_pci_id=yes
+fi
 
 if test "$have_sysfs" = yes; then
     DEFINES="$DEFINES -DHAVE_SYSFS"
@@ -22396,6 +22481,22 @@
         ;;
     *freebsd* | dragonfly* | *netbsd* | openbsd*)
         DEFINES="$DEFINES -DHAVE_ALIAS"
+        if test "x$enable_dri3" = xyes; then
+            DEFINES="$DEFINES -DHAVE_DRI3"
+        fi
+
+        if test "x$have_libdevq" != xyes; then
+            as_fn_error $? "libdevq required for building DRI" "$LINENO" 5
+        fi
+
+        case "$host_cpu" in
+        powerpc* | sparc*)
+            # Build only the drivers for cards that exist on PowerPC/sparc

+            ;;
+        esac
         ;;
     gnu*)
         DEFINES="$DEFINES -DHAVE_ALIAS"
@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
 
 if test "x$need_pci_id$have_libudev" = xyesyes; then
     GBM_PC_REQ_PRIV="libudev >= $LIBUDEV_REQUIRED"
+elif test "x$need_libdevq" = xyes; then
+    GBM_PC_REQ_PRIV="libdevq-1.0 >= $LIBDEVQ_REQUIRED"
 else
     GBM_PC_REQ_PRIV=""
 fi
@@ -24018,9 +24121,19 @@
         as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
     fi
 

 
     if test "x$have_libclc" = xno; then
         as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
@@ -26375,26 +26397,26 @@ fi
 strip_unwanted_llvm_flags() {
     # Use \> (marks the end of the word)
     echo `$1` | sed \
-	-e 's/-march=\S*//g' \
-	-e 's/-mtune=\S*//g' \
-	-e 's/-mcpu=\S*//g' \
-	-e 's/-DNDEBUG\>//g' \
-	-e 's/-D_GNU_SOURCE\>//g' \
-	-e 's/-pedantic\>//g' \
-	-e 's/-Wcovered-switch-default\>//g' \
-	-e 's/-O.\>//g' \
-	-e 's/-g\>//g' \
-	-e 's/-Wall\>//g' \
-	-e 's/-Wcast-qual\>//g' \
-	-e 's/-Woverloaded-virtual\>//g' \
-	-e 's/-fcolor-diagnostics\>//g' \
-	-e 's/-fdata-sections\>//g' \
-	-e 's/-ffunction-sections\>//g' \
-	-e 's/-fno-exceptions\>//g' \
-	-e 's/-fomit-frame-pointer\>//g' \
-	-e 's/-fvisibility-inlines-hidden\>//g' \
-	-e 's/-fPIC\>//g' \
-	-e 's/-fstack-protector-strong\>//g'
+	-e 's/-march=[:graph:]* //g' \
+	-e 's/-mtune=[:graph:]* //g' \
+	-e 's/-mcpu=[:graph:]* //g' \
+	-e 's/-DNDEBUG[[:>:]]//g' \
+	-e 's/-D_GNU_SOURCE[[:>:]]//g' \
+	-e 's/-pedantic[[:>:]]//g' \
+	-e 's/-Wcovered-switch-default[[:>:]]//g' \
+	-e 's/-O.[[:>:]]//g' \
+	-e 's/-g[[:>:]]//g' \
+	-e 's/-Wall[[:>:]]//g' \
+	-e 's/-Wcast-qual[[:>:]]//g' \
+	-e 's/-Woverloaded-virtual[[:>:]]//g' \
+	-e 's/-fcolor-diagnostics[[:>:]]//g' \
+	-e 's/-fdata-sections[[:>:]]//g' \
+	-e 's/-ffunction-sections[[:>:]]//g' \
+	-e 's/-fno-exceptions[[:>:]]//g' \
+	-e 's/-fomit-frame-pointer[[:>:]]//g' \
+	-e 's/-fvisibility-inlines-hidden[[:>:]]//g' \
+	-e 's/-fPIC[[:>:]]//g' \
+	-e 's/-fstack-protector-strong[[:>:]]//g'
 }
 
 llvm_check_version_for() {
@@ -26410,7 +26432,7 @@ if test -z "$with_gallium_drivers"; then
 fi
 if test "x$enable_gallium_llvm" = xauto; then
     case "$host_cpu" in
-    i*86|x86_64|amd64) enable_gallium_llvm=yes;;
+    i*86|amd64|amd64) enable_gallium_llvm=yes;;
     esac
 fi
 if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" = xyes; then
@@ -26670,9 +26692,6 @@ fi
                 CLANG_LIBDIR=${LLVM_LIBDIR}
             fi
             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}

         fi
     else
         MESA_LLVM=0
@@ -26752,7 +26771,7 @@ gallium_require_llvm() {
     if test "x$MESA_LLVM" = x0; then
         case "$host" in *gnux32) return;; esac
         case "$host_cpu" in
-        i*86|x86_64|amd64) as_fn_error $? "LLVM is required to build $1 on x86 and x86_64" "$LINENO" 5;;
+        i*86|amd64|amd64) as_fn_error $? "LLVM is required to build $1 on x86 and amd64" "$LINENO" 5;;
         esac
     fi
 }
@@ -28207,7 +28226,7 @@ else
 fi
 
 
- if test "x$asm_arch" = xx86 -o "x$asm_arch" = xx86_64; then
+ if test "x$asm_arch" = xx86 -o "x$asm_arch" = xamd64; then
   HAVE_X86_ASM_TRUE=
   HAVE_X86_ASM_FALSE='#'
 else
@@ -28215,7 +28234,7 @@ else
   HAVE_X86_ASM_FALSE=
 fi
 
- if test "x$asm_arch" = xx86_64; then
+ if test "x$asm_arch" = xamd64; then
   HAVE_X86_64_ASM_TRUE=
   HAVE_X86_64_ASM_FALSE='#'
 else

Lines 1-8 Link Here

(-)graphics/libGL/files/patch-include__GL__internal__dri_interface.h (-2 / +2 lines)
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




Reviewed-by: Francisco Jerez <currojerez@riseup.net>


--- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig	2016-11-10 22:05:17 UTC
+++ src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
@@ -215,6 +215,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa
 }
 
 static int

 open_drm_render_node_minor(int minor)
 {
    char path[PATH_MAX];
@@ -226,8 +234,15 @@ open_drm_render_node_minor(int minor)
 int
 pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev)
 {

+   /* Look for render nodes first */
    for (i = DRM_RENDER_NODE_MIN_MINOR, j = 0;
         i <= DRM_RENDER_NODE_MAX_MINOR; i++) {
       struct pipe_loader_device *dev;
@@ -241,6 +256,9 @@ pipe_loader_drm_probe(struct pipe_loader
          continue;
       }
 

       if (j < ndev) {
          devs[j] = dev;
       } else {
@@ -250,6 +268,46 @@ pipe_loader_drm_probe(struct pipe_loader
       j++;
    }
 




--- src/gallium/include/pipe/p_config.h.orig	2016-11-10 22:05:17 UTC
+++ src/gallium/include/pipe/p_config.h
@@ -76,6 +76,13 @@
 #define PIPE_CC_ICL
 #endif
 
+#if defined(__sparc__) || defined(__sparc64__)

 
 /*
  * Processor architecture
@@ -130,7 +137,7 @@
 
 #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) || defined(PIPE_ARCH_ARM) || defined(PIPE_ARCH_AARCH64)
 #define PIPE_ARCH_LITTLE_ENDIAN

 #define PIPE_ARCH_BIG_ENDIAN
 #endif
 
@@ -159,6 +166,12 @@
 #define PIPE_OS_ANDROID
 #endif
 





See:
  https://bugs.freedesktop.org/show_bug.cgi?id=74098#c3
--- src/gallium/state_trackers/clover/util/range.hpp.orig	2016-11-10 22:05:17 UTC
 src/gallium/state_trackers/clover/util/range.hpp | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/clover/util/range.hpp b/src/gallium/state_trackers/clover/util/range.hpp
index afa5f77..359edda 100644
--- src/gallium/state_trackers/clover/util/range.hpp
+++ src/gallium/state_trackers/clover/util/range.hpp
@@ -362,6 +362,12 @@ namespace clover {
       return { i, i + n };

    map(F &&f, Rs &&... rs) {
       return { std::forward<F>(f), std::forward<Rs>(rs)... };
    }
-- 
1.8.5.4


Lines 1-8 Link Here

(-)graphics/libGL/files/patch-src__gallium__winsys__svga__drm__vmw_screen_ioctl.c (-5 / +5 lines)
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__)

Lines 1-11 Link Here

(-)graphics/libGL/files/patch-src__loader__Makefile.in (-11 lines)
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 = \




--- src/loader/loader.c.orig	2015-08-22 12:01:00.000000000 +0200
+++ src/loader/loader.c	2015-08-24 10:50:05.251081000 +0200
@@ -70,7 +70,7 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <string.h>
-#ifdef HAVE_LIBUDEV
+#if defined(HAVE_LIBUDEV) || defined(HAVE_LIBDEVQ)
 #include <assert.h>
 #include <dlfcn.h>
 #include <unistd.h>
@@ -505,6 +505,54 @@ sysfs_get_pci_id_for_fd(int fd, int *ven
 }
 #endif
 
+#if defined(HAVE_LIBDEVQ)
+#include <libdevq.h>
+
+static void *devq_handle = NULL;
+
+static void *
+devq_dlopen_handle(void)
+{
+   if (!devq_handle) {
+      devq_handle = dlopen("libdevq.so.0", RTLD_LOCAL | RTLD_LAZY);
+   }
+
+   return devq_handle;
+}
+
+static void *
+asserted_dlsym(void *dlopen_handle, const char *name)
+{
+   void *result = dlsym(dlopen_handle, name);
+   assert(result);
+   return result;
+}
+
+#define DEVQ_SYMBOL(ret, name, args) \
+   ret (*name) args = asserted_dlsym(devq_dlopen_handle(), #name);
+
+static int
+devq_get_pci_id_from_fd(int fd, int *vendor_id, int *chip_id)
+{
+   int ret;
+   DEVQ_SYMBOL(int, devq_device_get_pciid_from_fd,
+               (int fd, int *vendor_id, int *chip_id));
+
+   *chip_id = -1;
+
+   ret = devq_device_get_pciid_from_fd(fd, vendor_id, chip_id);
+   if (ret < 0) {
+      log_(_LOADER_WARNING, "MESA-LOADER: could not get PCI ID\n");
+      goto out;
+   }
+
+out:
+   return (*chip_id >= 0);
+}
+
+#endif
+
+
 #if defined(HAVE_LIBDRM)
 /* for i915 */
 #include <i915_drm.h>
@@ -588,6 +636,10 @@ loader_get_pci_id_for_fd(int fd, int *ve
    if (sysfs_get_pci_id_for_fd(fd, vendor_id, chip_id))
       return 1;
 #endif
+#if HAVE_LIBDEVQ
+   if (devq_get_pci_id_from_fd(fd, vendor_id, chip_id))
+      return 1;
+#endif
 #if HAVE_LIBDRM
    if (drm_get_pci_id_for_fd(fd, vendor_id, chip_id))
       return 1;
@@ -685,6 +737,13 @@ loader_get_device_name_for_fd(int fd)
    if ((result = sysfs_get_device_name_for_fd(fd)))
       return result;
 #endif
+#if HAVE_LIBDEVQ
+#if 0
+/* XXX implement this function in libdevq */
+   if ((result = devq_device_get_name_for_fd(fd)))
+      return result;
+#endif
+#endif
    return result;
 }
 




--- src/mapi/entry_x86-64_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
+++ src/mapi/entry_x86-64_tls.h	2014-07-29 20:28:05.000000000 +0200
@@ -63,8 +63,8 @@ entry_patch_public(void)
 {
 }
 
-static char
-x86_64_entry_start[];
+extern char
+x86_64_entry_start[] __attribute__((visibility("hidden")));
 
 mapi_func
 entry_get_public(int slot)




--- src/mapi/entry_x86_tls.h.orig	2013-10-05 05:59:22.000000000 +0200
+++ src/mapi/entry_x86_tls.h	2014-07-29 20:28:05.000000000 +0200
@@ -73,8 +73,8 @@ __asm__(".text");
 extern unsigned long
 x86_current_tls();
 
-static char x86_entry_start[];
-static char x86_entry_end[];
+extern char x86_entry_start[] __attribute__((visibility("hidden")));
+extern char x86_entry_end[] __attribute__((visibility("hidden")));
 
 void
 entry_patch_public(void)




--- src/mapi/entry_x86_tsd.h.orig	2013-10-05 05:59:22.000000000 +0200
+++ src/mapi/entry_x86_tsd.h	2014-07-29 20:28:05.000000000 +0200
@@ -60,8 +60,8 @@ __asm__(".balign 32\n"
 #include <string.h>
 #include "u_execmem.h"
 
-static const char x86_entry_start[];
-static const char x86_entry_end[];
+extern const char x86_entry_start[] __attribute__((visibility("hidden")));
+extern const char x86_entry_end[] __attribute__((visibility("hidden")));
 
 void
 entry_patch_public(void)

Lines 1-6 Link Here

(-)graphics/libGL/files/patch-src__mapi__glapi__gen__gl_gentable.py (-3 / +3 lines)
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 2017-01-06 02:14:06 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)) \\

Lines 1-6 Link Here

(-)graphics/libGL/files/patch-src__mesa__main__compiler.h (-3 / +3 lines)
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 )

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_auxiliary_util_u__network.c (+11 lines)
	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>




# fix errors like the following
#
# llvm/invocation.cpp:(.text+0x1275): undefined reference to `std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::c_str()
 const'
# /usr/bin/ld: ../../../../src/gallium/state_trackers/clover/.libs/libclover.a(libclllvm_la-invocation.o): relocation R_X86_64_PC32 against `_ZNKSt3__112bas
ic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv' can not be used when making a shared object; recompile with -fPIC
# /usr/bin/ld: final link failed: Bad value
#
--- src/gallium/state_trackers/clover/llvm/invocation.cpp.orig	2016-11-28 15:34:30 UTC
+++ src/gallium/state_trackers/clover/llvm/invocation.cpp
@@ -93,6 +93,8 @@ namespace {
       return ctx;
    }
 
+   const char* cstr(const std::string& str) { return str.c_str(); }
+
    std::unique_ptr<clang::CompilerInstance>
    create_compiler_instance(const target &target,
                             const std::vector<std::string> &opts,
@@ -104,8 +106,8 @@ namespace {
       // Parse the compiler options.  A file name should be present at the end
       // and must have the .cl extension in order for the CompilerInvocation
       // class to recognize it as an OpenCL source file.
-      const std::vector<const char *> copts =
-         map(std::mem_fn(&std::string::c_str), opts);
+      std::vector<const char *> copts;
+      std::transform(opts.begin(), opts.end(), copts.begin(), cstr);
 
       if (!clang::CompilerInvocation::CreateFromArgs(
              c->getInvocation(), copts.data(), copts.data() + copts.size(), diag))




# Fix error: no matching constructor for initialization of 'std::vector<const ::llvm::MDNode *>' 
#
--- src/gallium/state_trackers/clover/llvm/metadata.hpp.orig	2016-11-10 22:05:17 UTC
+++ src/gallium/state_trackers/clover/llvm/metadata.hpp
@@ -42,7 +42,7 @@ namespace clover {
          get_kernel_nodes(const ::llvm::Module &mod) {
             if (const ::llvm::NamedMDNode *n =
                    mod.getNamedMetadata("opencl.kernels"))
-               return { n->op_begin(), n->op_end() };
+               return { n->getOperand(0), n->getOperand(n->getNumOperands()) };
             else
                return {};
          }




# We don't have MAP_NORESERVE so use MAP_NOSYNC | MAP_NOCORE and
# hope for the best (this alloc is too big but it's only a test)
#
--- src/intel/tools/aubinator.c.orig	2016-11-28 15:34:30 UTC
+++ src/intel/tools/aubinator.c
@@ -1226,7 +1226,7 @@ int main(int argc, char *argv[])
    /* mmap a terabyte for our gtt space. */
    gtt_size = 1ul << 40;
    gtt = mmap(NULL, gtt_size, PROT_READ | PROT_WRITE,
-              MAP_PRIVATE | MAP_ANONYMOUS |  MAP_NORESERVE, -1, 0);
+              MAP_PRIVATE | MAP_ANONYMOUS | MAP_NOSYNC | MAP_NOCORE, -1, 0);
    if (gtt == MAP_FAILED) {
       fprintf(stderr, "failed to alloc gtt space: %s\n", strerror(errno));
       exit(EXIT_FAILURE);

Lines 1-6 Link Here

(-)graphics/libGL/files/patch-src_util_ralloc.c (-3 / +3 lines)
1	--- src/util/ralloc.c.orig 2015-08-07 17:36:03 UTC	1	--- src/util/ralloc.c.orig 2016-11-28 15:34:30 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);

Line 0 Link Here

(-)graphics/libGL/files/patch-src_util_u__endian.h (+11 lines)
	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




--- src/loader/Makefile.am.orig	2015-02-13 11:41:50.497483000 +0100
+++ src/loader/Makefile.am	2015-02-13 11:42:02.748812000 +0100
@@ -30,7 +30,8 @@
 	-I$(top_srcdir)/include \
 	-I$(top_srcdir)/src \
 	$(VISIBILITY_CFLAGS) \
-	$(LIBUDEV_CFLAGS)
+	$(LIBUDEV_CFLAGS) \
+	$(LIBDEVQ_CFLAGS)
 
 libloader_la_SOURCES = $(LOADER_C_FILES)
 libloader_la_LIBADD =

Lines 5-12 Link Here

(-)graphics/libGL/pkg-plist (-2 lines)
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

Lines 13-19 Link Here

(-)graphics/libglapi/Makefile (-1 / +1 lines)
13	USE_XORG= x11 xau xcb xdmcp xvmc	13	USE_XORG= x11 xau xcb xdmcp xvmc
14		14
15	# stuff not needed by libglapi but configure wants it	15	# stuff not needed by libglapi but configure wants it
16	USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \	16	USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \
17	xshmfence	17	xshmfence
18	LIB_DEPENDS+= libexpat.so:textproc/expat2 \	18	LIB_DEPENDS+= libexpat.so:textproc/expat2 \
19	libdrm.so:graphics/libdrm	19	libdrm.so:graphics/libdrm

Lines 13-19 Link Here

(-)graphics/libglesv2/Makefile (-1 / +1 lines)
13	libexpat.so:textproc/expat2	13	libexpat.so:textproc/expat2
14		14
15	# stuff not needed by libglesv2 but configure wants it	15	# stuff not needed by libglesv2 but configure wants it
16	USE_XORG+= glproto dri2proto xext xdamage xfixes presentproto \	16	USE_XORG+= dri2proto dri3proto glproto presentproto xdamage xext xfixes \
17	xshmfence	17	xshmfence
18		18
19	.include <bsd.port.options.mk>	19	.include <bsd.port.options.mk>

Lines 3-8 Link Here

(-)graphics/libglesv2/pkg-plist (+1 lines)
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

Lines 1-2 Link Here

(-)graphics/libosmesa/distinfo (-2 lines)
1	SHA256 (MesaLib-10.2.7.tar.bz2) = 27b958063a4c002071f14ed45c7d2a1ee52cd85e4ac8876e8a1c273495a7d43f
2	SIZE (MesaLib-10.2.7.tar.bz2) = 7107753

Lines 14-21 Link Here

(-)lang/clover/Makefile (-2 / +2 lines)
14	RUN_DEPENDS= opencl>=0:devel/opencl	14	RUN_DEPENDS= opencl>=0:devel/opencl
15		15
16	USES= ssl	16	USES= ssl
17	USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto \	17	USE_XORG= dri2proto dri3proto glproto presentproto x11 xdamage xext \
18	presentproto xvmc xshmfence	18	xfixes xshmfence xvmc xxf86vm
19		19
20	ONLY_FOR_ARCHS= i386 amd64	20	ONLY_FOR_ARCHS= i386 amd64
21	ONLY_FOR_ARCHS_REASON= Clover needs a graphics driver supported by the Radeon KMS driver	21	ONLY_FOR_ARCHS_REASON= Clover needs a graphics driver supported by the Radeon KMS driver

Return to bug 214581

Lines 12-19 Link Here

(-)graphics/dri/Makefile (-2 / +14 lines)
12	libexpat.so:textproc/expat2	12	libexpat.so:textproc/expat2
13		13
14	USES= ssl	14	USES= ssl
15	USE_XORG= glproto x11 xext xxf86vm xdamage xfixes dri2proto \	15	USE_XORG= dri2proto dri3proto glproto presentproto x11 xext xdamage \
16	presentproto xvmc xshmfence	16	xfixes xshmfence xv xvmc xxf86vm
17		17
18	OPTIONS_DEFINE= TEXTURE	18	OPTIONS_DEFINE= TEXTURE
19	OPTIONS_DEFAULT=TEXTURE	19	OPTIONS_DEFAULT=TEXTURE
Lines 33-38 Link Here
33		33
34	.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"	34	.include "${.CURDIR}/../../graphics/libGL/Makefile.targets"
35		35
		36	# Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
		37	#
		38	# glsl/cache.c:613:4: error: cannot compile this atomic library call yet
		39	# p_atomic_add(cache->size, size); note: expanded from macro 'p_atomic_add'
		40	# define p_atomic_add(v, i) (void) __atomic_add_fetch((v), (i), __ATOMIC_ACQ_REL)
		41	#
		42	.if ${OSVERSION} < 1100000 && ${ARCH} == "i386"
		43	# post-patch is defined in Makefile.targets, use pre-configure target to patch
		44	pre-configure:
		45	@${REINPLACE_CMD} -e 's\|-DUSE_GCC_ATOMIC_BUILTINS\|\|' ${WRKSRC}/configure
		46	.endif
		47
36	post-install:	48	post-install:
37	@${RM} -r ${STAGEDIR}/etc/OpenCL	49	@${RM} -r ${STAGEDIR}/etc/OpenCL
38		50

Lines 13-25 Link Here

(-)graphics/dri/pkg-plist (-2 / +1 lines)
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

Lines 18-24 Link Here

(-)graphics/libGL/Makefile.common (-17 / +11 lines)
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.3
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 62-74 Link Here
62		60
63	COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}	61	COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
64		62
65	MESA_LLVM_VER=37	63	MESA_LLVM_VER=39
66		64
67	CONFIGURE_ARGS+= --with-sha1=libcrypto	65	CONFIGURE_ARGS+= --with-sha1=libcrypto
68		66
69	# DRI3 needs PRIME support in the kernel to work
70	CONFIGURE_ARGS+= --disable-dri3
71
72	CONFIGURE_ARGS+= --enable-gbm	67	CONFIGURE_ARGS+= --enable-gbm
73		68
74	# There are issues that need to be fixed to use TLS model "initial-exec"	69	# There are issues that need to be fixed to use TLS model "initial-exec"
Lines 91-100 Link Here
91	# Clover (OpenCL).	86	# Clover (OpenCL).
92	.if ${OPSYS} == DragonFly \|\| \	87	.if ${OPSYS} == DragonFly \|\| \
93	(${OPSYS} == FreeBSD && \	88	(${OPSYS} == FreeBSD && \
94	(${ARCH} == amd64 \|\| \	89	(${ARCH} == amd64 \|\| ${ARCH} == i386))
95	${ARCH} == i386))
96		90
97	BUILD_DEPENDS+= libclc>=0.0.r222830:devel/libclc	91	BUILD_DEPENDS+= libclc>=0.2.0.20160915:devel/libclc
98		92
99	# We need the clang port too even if it is not used to compile because	93	# We need the clang port too even if it is not used to compile because
100	# Clover needs some of the clang includes to build.	94	# Clover needs some of the clang includes to build.
Lines 119-132 Link Here
119	CONFIGURE_ARGS+= --enable-osmesa	113	CONFIGURE_ARGS+= --enable-osmesa
120		114
121	# gallium	115	# gallium
122	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER}	116	BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
123	.if ${COMPONENT:Mdri} != "" \|\| ${COMPONENT:Mclover} != "" \|\| ${COMPONENT:Megl} != ""	117	.if ${COMPONENT:Mdri} != "" \|\| ${COMPONENT:Mclover} != "" \|\| ${COMPONENT:Megl} != ""
124	RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.7.1_1:devel/llvm${MESA_LLVM_VER}	118	RUN_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
125	.endif	119	.endif
126		120
127	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}	121	CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
128		122
129	CONFIGURE_ARGS+=--enable-gallium-llvm \	123	CONFIGURE_ARGS+=--enable-gallium-llvm --enable-llvm-shared-libs \
130	--enable-xvmc	124	--enable-xvmc
131		125
132	.if ${PORT_OPTIONS:MTEXTURE}	126	.if ${PORT_OPTIONS:MTEXTURE}
Lines 155-162 Link Here
155	.endif	149	.endif
156		150
157	.if ${ARCH} == powerpc \|\| ${ARCH} == powerpc64	151	.if ${ARCH} == powerpc \|\| ${ARCH} == powerpc64
158	DRI_DRIVERS= RADEON SWRAST	152	DRI_DRIVERS= RADEON R200 SWRAST
159	GALLIUM_DRIVERS= RADEONSI SWRAST	153	GALLIUM_DRIVERS= R300 R600 RADEONSI SWRAST
160	.endif	154	.endif
161		155
162	.if ${ARCH} == sparc64 \|\| ${ARCH} == armv6	156	.if ${ARCH} == sparc64 \|\| ${ARCH} == armv6

Lines 1-14 Link Here

(-)graphics/libGL/files/configure.ac (-48 / +19 lines)
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}

Lines 25-33 Link Here

(-)graphics/libGL/files/patch-src__gallium__auxiliary__pipe-loader__pipe_loader_drm.c (-7 / +7 lines)
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

Lines 1-7 Link Here

(-)graphics/libGL/files/patch-src__gallium__include__pipe__p_config.h (-5 / +5 lines)
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

Lines 5-17 Link Here

(-)graphics/libGL/files/patch-src__gallium__state_trackers__clover__util__range.hpp (-10 / +1 lines)
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

Lines 1-91 Link Here

(-)graphics/libGL/files/patch-src__loader__loader.c (-91 lines)
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

Lines 1-13 Link Here

(-)graphics/libGL/files/patch-src__mapi__entry_x86-64_tls.h (-13 lines)
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)

Lines 1-13 Link Here

(-)graphics/libGL/files/patch-src__mapi__entry_x86_tls.h (-13 lines)
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)

Lines 1-13 Link Here

(-)graphics/libGL/files/patch-src__mapi__entry_x86_tsd.h (-13 lines)
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)

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp (+30 lines)
	1	# fix errors like the following
	2	#
	3	# llvm/invocation.cpp:(.text+0x1275): undefined reference to `std::__1::basic_string<char, std::__1::char_traits<char>, std::__1::allocator<char> >::c_str()
	4	const'
	5	# /usr/bin/ld: ../../../../src/gallium/state_trackers/clover/.libs/libclover.a(libclllvm_la-invocation.o): relocation R_X86_64_PC32 against `_ZNKSt3__112bas
	6	ic_stringIcNS_11char_traitsIcEENS_9allocatorIcEEE5c_strEv' can not be used when making a shared object; recompile with -fPIC
	7	# /usr/bin/ld: final link failed: Bad value
	8	#
	9	--- src/gallium/state_trackers/clover/llvm/invocation.cpp.orig 2016-11-28 15:34:30 UTC
	10	+++ src/gallium/state_trackers/clover/llvm/invocation.cpp
	11	@@ -93,6 +93,8 @@ namespace {
	12	return ctx;
	13	}
	14
	15	+ const char* cstr(const std::string& str) { return str.c_str(); }
	16	+
	17	std::unique_ptr<clang::CompilerInstance>
	18	create_compiler_instance(const target &target,
	19	const std::vector<std::string> &opts,
	20	@@ -104,8 +106,8 @@ namespace {
	21	// Parse the compiler options. A file name should be present at the end
	22	// and must have the .cl extension in order for the CompilerInvocation
	23	// class to recognize it as an OpenCL source file.
	24	- const std::vector<const char *> copts =
	25	- map(std::mem_fn(&std::string::c_str), opts);
	26	+ std::vector<const char *> copts;
	27	+ std::transform(opts.begin(), opts.end(), copts.begin(), cstr);
	28
	29	if (!clang::CompilerInvocation::CreateFromArgs(
	30	c->getInvocation(), copts.data(), copts.data() + copts.size(), diag))

Line 0 Link Here

(-)graphics/libGL/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp (+13 lines)
	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-10 22:05:17 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	}

Line 0 Link Here

(-)graphics/libGL/files/patch-src_intel_tools_aubinator.c (+14 lines)
	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-28 15:34:30 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);

Lines 1-12 Link Here

(-)graphics/libGL/files/src__loader__Makefile.am (-12 lines)
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 =