[Midnightbsd-cvs] mports [24064] trunk/graphics: update mesa to 17.1.4
laffer1 at midnightbsd.org
laffer1 at midnightbsd.org
Sun Sep 2 15:54:14 EDT 2018
Revision: 24064
http://svnweb.midnightbsd.org/mports/?rev=24064
Author: laffer1
Date: 2018-09-02 15:54:13 -0400 (Sun, 02 Sep 2018)
Log Message:
-----------
update mesa to 17.1.4
Modified Paths:
--------------
trunk/graphics/Makefile
Added Paths:
-----------
trunk/graphics/mesa-dri/
trunk/graphics/mesa-dri/Makefile
trunk/graphics/mesa-dri/Makefile.common
trunk/graphics/mesa-dri/Makefile.targets
trunk/graphics/mesa-dri/distinfo
trunk/graphics/mesa-dri/files/
trunk/graphics/mesa-dri/files/configure.ac
trunk/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
trunk/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c
trunk/graphics/mesa-dri/files/patch-configure
trunk/graphics/mesa-dri/files/patch-include_GL_internal_dri__interface.h
trunk/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c
trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c
trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c
trunk/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
trunk/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h
trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_util_range.hpp
trunk/graphics/mesa-dri/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
trunk/graphics/mesa-dri/files/patch-src_glx_glxext.c
trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c
trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c
trunk/graphics/mesa-dri/files/patch-src_mapi_glapi_gen_gl__gentable.py
trunk/graphics/mesa-dri/files/patch-src_mesa_main_compiler.h
trunk/graphics/mesa-dri/files/patch-src_util_build__id.c
trunk/graphics/mesa-dri/files/patch-src_util_u__endian.h
trunk/graphics/mesa-dri/pkg-descr
trunk/graphics/mesa-dri/pkg-help
trunk/graphics/mesa-dri/pkg-plist
trunk/graphics/mesa-libs/
trunk/graphics/mesa-libs/Makefile
trunk/graphics/mesa-libs/pkg-descr
trunk/graphics/mesa-libs/pkg-plist
Modified: trunk/graphics/Makefile
===================================================================
--- trunk/graphics/Makefile 2018-09-02 19:07:09 UTC (rev 24063)
+++ trunk/graphics/Makefile 2018-09-02 19:54:13 UTC (rev 24064)
@@ -130,6 +130,8 @@
SUBDIR += linux-f10-ungif
SUBDIR += linux-panorama-tools
SUBDIR += mesa-demos
+SUBDIR += mesa-dri
+SUBDIR += mesa-libs
SUBDIR += ming
SUBDIR += netpbm
SUBDIR += ocrad
Added: trunk/graphics/mesa-dri/Makefile
===================================================================
--- trunk/graphics/mesa-dri/Makefile (rev 0)
+++ trunk/graphics/mesa-dri/Makefile 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,87 @@
+# $MidnightBSD$
+
+PORTNAME= mesa-dri
+PORTVERSION= ${MESAVERSION}
+CATEGORIES= graphics
+
+COMMENT= OpenGL hardware acceleration drivers for DRI2+
+
+LICENSE= mit
+
+RUN_DEPENDS= ${LOCALBASE}/lib/libtxc_dxtn.so:graphics/s2tc
+
+USE_XORG= dri2proto dri3proto glproto presentproto x11 xdamage xext \
+ xfixes xshmfence xv xvmc
+
+OPTIONS_DEFINE= TEXTURE VAAPI VDPAU
+OPTIONS_DEFAULT=TEXTURE
+OPTIONS_SUB= yes
+
+TEXTURE_DESC= Enable texture-float support (patent encumbered)
+TEXTURE_CONFIGURE_ENABLE= texture-float
+
+VAAPI_CONFIGURE_ENABLE= va
+VAAPI_LIB_DEPENDS= libva.so:multimedia/libva
+VAAPI_USE= XORG=xcb
+
+VDPAU_CONFIGURE_ENABLE= vdpau
+VDPAU_LIB_DEPENDS= libvdpau.so:multimedia/libvdpau
+
+.include <bsd.mport.options.mk>
+.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
+
+ALL_DRI_DRIVERS= I915 I965 RADEON R200 SWRAST
+ALL_GALLIUM_DRIVERS= FREEDRENO R300 R600 RADEONSI SVGA SWRAST VC4
+
+DRI_DRIVERS= SWRAST # classic swrast
+.if "${MESA_LLVM_VER}" != ""
+GALLIUM_DRIVERS= SWRAST # llvmpipe
+.else
+GALLIUM_DRIVERS= ""
+.endif
+.if ${ARCH} == amd64 || ${ARCH} == i386 \
+ || ${ARCH} == powerpc || ${ARCH} == powerpc64
+DRI_DRIVERS+= RADEON R200
+GALLIUM_DRIVERS+= R300 R600
+. if "${MESA_LLVM_VER}" != "" # until PPC gets LLVM in base
+GALLIUM_DRIVERS+= RADEONSI
+. endif
+.endif
+.if ${ARCH} == amd64 || ${ARCH} == i386
+DRI_DRIVERS+= I915 I965
+GALLIUM_DRIVERS+= SVGA
+. if ${OPSYS} == FreeBSD && ${OSVERSION} < 1100000
+EXTRA_PATCHES+= ${PATCHDIR}/extra-src_mesa_drivers_dri_i965_intel__screen.c
+. endif
+.elif ${ARCH} == armv6 || ${ARCH} == aarch64
+GALLIUM_DRIVERS+= FREEDRENO VC4
+. if ${ARCH} == armv6
+EXTRA_PATCHES+= ${PATCHDIR}/extra-src_gallium_drivers_vc4_Makefile.in
+. endif
+.endif
+
+CONFIGURE_ARGS+= --with-dri-drivers="${DRI_DRIVERS:tl}" \
+ --with-gallium-drivers="${GALLIUM_DRIVERS:tl}"
+
+.for _d in ${ALL_DRI_DRIVERS}
+. if ${DRI_DRIVERS:M${_d}}
+PLIST_SUB+= ${_d}_DRIVER=""
+. else
+PLIST_SUB+= ${_d}_DRIVER="@comment "
+. endif
+.endfor
+
+.for _gd in ${ALL_GALLIUM_DRIVERS}
+. if ${GALLIUM_DRIVERS:M${_gd}}
+PLIST_SUB+= ${_gd}_GDRIVER=""
+. else
+PLIST_SUB+= ${_gd}_GDRIVER="@comment "
+. endif
+.endfor
+
+.include "${MASTERDIR}/Makefile.targets"
+
+post-install:
+ -${RM} -r ${FAKE_DESTDIR}/etc/OpenCL
+
+.include <bsd.port.post.mk>
Property changes on: trunk/graphics/mesa-dri/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/Makefile.common
===================================================================
--- trunk/graphics/mesa-dri/Makefile.common (rev 0)
+++ trunk/graphics/mesa-dri/Makefile.common 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,106 @@
+# Makefile.common - shared code between MesaLib ports.
+#
+# !!! Here be dragons !!! (they seem to be everywhere these days)
+#
+# Remember to upgrade the following ports everytime you bump MESAVERSION:
+#
+# - graphics/libosmesa
+# - graphics/mesa-dri
+# - graphics/mesa-libs
+# - lang/clover
+#
+# $MidnightBSD$
+
+MESAVERSION= ${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
+MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
+
+MESABASEVERSION= 17.1.4
+# if there is a subversion, don't include the '-' between 7.11-rc2.
+MESASUBVERSION=
+
+MASTER_SITES= https://mesa.freedesktop.org/archive/ \
+ https://mesa.freedesktop.org/archive/${MESABASEVERSION}/ \
+ ftp://ftp.freedesktop.org/pub/mesa/ \
+ ftp://ftp.freedesktop.org/pub/mesa/${MESABASEVERSION}/
+
+DISTFILES= mesa-${MESADISTVERSION}${EXTRACT_SUFX}
+
+MAINTAINER= ports at MidnightBSD.org
+
+COMPONENT= ${PORTNAME:tl:C/^lib//:C/mesa-//}
+
+BUILD_DEPENDS+= ${LOCALBASE}/libdata/pkgconfig/pthread-stubs.pc:devel/libpthread-stubs
+LIB_DEPENDS+= libexpat.so:textproc/expat2
+.if ${COMPONENT} != osmesa
+LIB_DEPENDS+= libdrm.so:graphics/libdrm
+.endif
+.if ${COMPONENT} != libs
+LIB_DEPENDS+= libglapi.so:graphics/mesa-libs
+.endif
+.if ${ARCH} == amd64 || ${ARCH} == i386
+LIB_DEPENDS+= libunwind.so:devel/libunwind
+.endif
+.if ${OPSYS} == DragonFly
+LIB_DEPENDS+= libelf.so:devel/libelf
+.endif
+
+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
+CONFIGURE_TARGET= ${ARCH}-portbld-freebsd10.4
+
+# only have one port to check with portscout.
+.if ${PORTNAME} != mesa-dri
+PORTSCOUT= ignore:1
+.endif
+
+python_OLD_CMD= /usr/bin/env[[:space:]]python2 /usr/bin/python2 /bin/env[[:space:]]python
+SHEBANG_FILES= src/gallium/*/*/*.py src/gallium/tools/trace/*.py \
+ src/gallium/drivers/svga/svgadump/svga_dump.py \
+ src/mapi/glapi/gen/*.py src/mapi/mapi_abi.py \
+ src/mesa/drivers/dri/common/xmlpool/gen_xmlpool.py \
+ src/mesa/main/get_*.py src/util/format_srgb.py \
+ src/amd/*/*.py src/intel/genxml/gen_pack_header.py
+
+MASTERDIR= ${.CURDIR:H:H}/graphics/mesa-dri
+PATCHDIR= ${MASTERDIR}/files
+WRKSRC= ${WRKDIR}/mesa-${MESADISTVERSION}
+DESCR= ${.CURDIR}/pkg-descr
+PLIST= ${.CURDIR}/pkg-plist
+PKGHELP= ${.CURDIR}/pkg-help
+PKGINSTALL= ${.CURDIR}/pkg-install
+PKGDEINSTALL= ${.CURDIR}/pkg-deinstall
+INSTALL_TARGET= install-strip
+
+.include <bsd.port.pre.mk>
+
+# need LLVM for libEGL wherever possible, but mixing GCC and LLVM breaks Gallium
+.if ${CHOSEN_COMPILER_TYPE} == clang \
+ || (${COMPONENT} == libs && ${ARCH} != sparc64) # no working LLVM
+MESA_LLVM_VER?= 40
+.endif
+
+.if "${MESA_LLVM_VER}" != ""
+BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
+.if ${COMPONENT} != libs
+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}
+LDFLAGS+= -Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
+CONFIGURE_ARGS+= --enable-llvm
+.else
+CONFIGURE_ARGS+= --disable-llvm
+.endif
+
+# There are issues that need to be fixed to use TLS model "initial-exec"
+# So stick with "global-dynamic"'s model for now. kan@ is working on a
+# patch for rtld. We might want to backport global-dynamic or
+# pthread_setspecific which it uses now by default. But since this
+# configure switch is going away ...
+# https://lists.freebsd.org/pipermail/freebsd-arch/2016-February/017699.html
+CONFIGURE_ARGS+= --disable-glx-tls
+
+# we don't care about GLes v1
+CONFIGURE_ARGS+= --disable-gles1
+
Property changes on: trunk/graphics/mesa-dri/Makefile.common
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/Makefile.targets
===================================================================
--- trunk/graphics/mesa-dri/Makefile.targets (rev 0)
+++ trunk/graphics/mesa-dri/Makefile.targets 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,48 @@
+# $FreeBSD: branches/2017Q3/graphics/mesa-dri/Makefile.targets 443828 2017-06-18 14:02:35Z rezny $
+#
+# this file holds common targets
+
+post-patch:
+.if ${OPSYS} == FreeBSD
+ @${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure
+. if ${COMPONENT} == osmesa
+ @${REINPLACE_CMD} -e 's|x86_64|amd64|' ${WRKSRC}/configure.ac
+. endif
+# Disable use of GCC_ATOMICs on i386 to avoid build failures
+# Clang in 10.3 fails with cannot compile this atomic library call yet 'p_atomic_add'
+# Clang in 11.0 fails with undefined reference to `__atomic_fetch_add_8`
+. if ${ARCH} == "i386"
+ @${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
+. if ${COMPONENT} == osmesa
+ @${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure.ac
+. endif
+. endif
+.endif
+ @${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
+ ${WRKSRC}/src/mesa/drivers/dri/common/xmlconfig.c
+
+pre-build: mesa-pre-build
+
+#custom targets so we can build parts of Mesa
+mesa-pre-build:
+# do propper gmake target.
+ @cd ${WRKSRC}/src && ${MAKE_CMD} ${FAKE_MAKEARGS} git_sha1.h libglsl_util.la
+ @cd ${WRKSRC}/src/mesa/drivers/dri/common/ && ${MAKE_CMD} ${FAKE_MAKEARGS}
+ @cd ${WRKSRC}/src/loader && ${MAKE_CMD} ${FAKE_MAKEARGS}
+# libloader.la
+
+.if defined(MESA_BUILD_WRKSRC)
+do-build:
+. for dir in ${MESA_BUILD_WRKSRC}
+ (cd ${WRKSRC}/${dir}; ${DO_MAKE_BUILD} ${ALL_TARGET};)
+. endfor
+.endif
+
+.if defined(MESA_INSTALL_WRKSRC)
+do-install:
+. for dir in ${MESA_INSTALL_WRKSRC}
+ (cd ${WRKSRC}/${dir} && ${SETENV} ${MAKE_ENV} ${FAKE_MAKEENV} ${MAKE_CMD} \
+ ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${FAKE_MAKEARGS} ${INSTALL_TARGET})
+. endfor
+.endif
+
Property changes on: trunk/graphics/mesa-dri/Makefile.targets
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/distinfo
===================================================================
--- trunk/graphics/mesa-dri/distinfo (rev 0)
+++ trunk/graphics/mesa-dri/distinfo 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,3 @@
+TIMESTAMP = 1498843561
+SHA256 (mesa-17.1.4.tar.xz) = 06f3b0e6a28f0d20b7f3391cf67fe89ae98ecd0a686cd545da76557b6cec9cad
+SIZE (mesa-17.1.4.tar.xz) = 9899196
Property changes on: trunk/graphics/mesa-dri/distinfo
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/configure.ac
===================================================================
--- trunk/graphics/mesa-dri/files/configure.ac (rev 0)
+++ trunk/graphics/mesa-dri/files/configure.ac 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,39 @@
+--- configure.ac.orig 2017-04-01 15:33:36 UTC
++++ configure.ac
+@@ -1121,7 +1121,7 @@ fi
+ AC_SUBST(LIBSENSORS_LIBS)
+
+ case "$host_os" in
+-linux*)
++linux* | freebsd*)
+ dri3_default=yes
+ ;;
+ *)
+@@ -2002,9 +2002,18 @@ if test "x$enable_opencl" = xyes; then
+ AC_MSG_ERROR([cannot enable OpenCL without Gallium])
+ fi
+
++ if test "x$acv_mesa_CLANG" = xno; then
++
++ GCC_VERSION=`$CC -dumpversion`
++ if test $? -eq 0; then
++ GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
++ GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
++ fi
++
+ if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
+ AC_MSG_ERROR([gcc >= 4.7 is required to build clover])
+ fi
++ fi # end of clang test
+
+ if test "x$have_libclc" = xno; then
+ AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
+@@ -2061,8 +2070,6 @@ if test "x$enable_opencl" = xyes; then
+ CLANG_LIBDIR=${LLVM_LIBDIR}
+ fi
+ CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
+- AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
+- [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
+ fi
+ AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
+ AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
Property changes on: trunk/graphics/mesa-dri/files/configure.ac
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
===================================================================
--- trunk/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in (rev 0)
+++ trunk/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,13 @@
+# enable NEON instructions in the compiler when building the NEON codepath
+#
+--- src/gallium/drivers/vc4/Makefile.in.orig 2017-05-16 13:55:49 UTC
++++ src/gallium/drivers/vc4/Makefile.in
+@@ -669,7 +669,7 @@ libvc4_la_SOURCES = $(C_SOURCES)
+ libvc4_la_LIBADD = $(SIM_LIB) $(VC4_LIBS) libvc4_neon.la
+ libvc4_la_LDFLAGS = $(SIM_LDFLAGS)
+ libvc4_neon_la_SOURCES = vc4_tiling_lt.c
+-libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON
++libvc4_neon_la_CFLAGS = $(AM_CFLAGS) -DVC4_BUILD_NEON -march=armv7-a -mfpu=neon
+ EXTRA_DIST = kernel/README
+ all: all-am
+
Property changes on: trunk/graphics/mesa-dri/files/extra-src_gallium_drivers_vc4_Makefile.in
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c
===================================================================
--- trunk/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c (rev 0)
+++ trunk/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,37 @@
+# Partial revert of the following commit because the feature check fails on 10.x
+# which disables HW accel on gen4+ (the new check occurs for gen6+ as well)
+
+From 088449487ebcb72561d73ffb91c96302583445a8 Mon Sep 17 00:00:00 2001
+From: Kenneth Graunke <kenneth at whitecape.org>
+Date: Wed, 22 Mar 2017 15:20:51 -0700
+Subject: i965: Require Kernel 3.6 for Gen4-5 platforms.
+
+We've already required Kernel 3.6 on Gen6+ since Mesa 9.2 (May 2013,
+commit 92d2f5acfadea672417b6785710c9e8b7f605e41). It seems reasonable
+to require it for Gen4-5 as well, bumping the requirement from 2.6.39.
+
+This is necessary for glClientWaitSync with a timeout to work, which
+is a feature we expose on Gen4-5. Without it, we would fall back to an
+infinite wait, which is pretty bad.
+
+See kernel commit 172cf15d18889313bf2c3bfb81fcea08369274ef in 3.6+.
+
+Reviewed-by: Matt Turner <mattst88 at gmail.com>
+
+diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
+index c7f111d..bc998ab 100644
+--- src/mesa/drivers/dri/i965/intel_screen.c
++++ src/mesa/drivers/dri/i965/intel_screen.c
+@@ -1274,8 +1274,8 @@ intel_init_bufmgr(struct intel_screen *screen)
+
+ drm_intel_bufmgr_gem_enable_fenced_relocs(screen->bufmgr);
+
+- if (!intel_get_boolean(screen, I915_PARAM_HAS_WAIT_TIMEOUT)) {
+- fprintf(stderr, "[%s: %u] Kernel 3.6 required.\n", __func__, __LINE__);
++ if (!intel_get_boolean(screen, I915_PARAM_HAS_RELAXED_DELTA)) {
++ fprintf(stderr, "[%s: %u] Kernel 2.6.39 required.\n", __func__, __LINE__);
+ return false;
+ }
+
+--
+cgit v0.10.2
Property changes on: trunk/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-configure
===================================================================
--- trunk/graphics/mesa-dri/files/patch-configure (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-configure 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,41 @@
+--- configure.orig 2017-05-10 14:14:06 UTC
++++ configure
+@@ -22709,7 +22709,7 @@ fi
+
+
+ case "$host_os" in
+-linux*)
++linux* | freebsd*)
+ dri3_default=yes
+ ;;
+ *)
+@@ -25972,9 +25972,19 @@ if test "x$enable_opencl" = xyes; then
+ as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
+ fi
+
++ if test "x$acv_mesa_CLANG" = xno; then
++
++ GCC_VERSION=`$CC -dumpversion`
++ if test $? -eq 0; then
++ GCC_VERSION_MAJOR=`echo $GCC_VERSION | cut -d. -f1`
++ GCC_VERSION_MINOR=`echo $GCC_VERSION | cut -d. -f2`
++ fi
++
+ if test $GCC_VERSION_MAJOR -lt 4 -o $GCC_VERSION_MAJOR -eq 4 -a $GCC_VERSION_MINOR -lt 7; then
+ as_fn_error $? "gcc >= 4.7 is required to build clover" "$LINENO" 5
+ fi
++# end of clang test.
++ fi
+
+ if test "x$have_libclc" = xno; then
+ as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
+@@ -26037,9 +26047,6 @@ rm -f core conftest.err conftest.$ac_obj
+ CLANG_LIBDIR=${LLVM_LIBDIR}
+ fi
+ CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
+- if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
+- as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
+-fi
+ fi
+ if test "x$enable_opencl" = xyes; then
+ HAVE_CLOVER_TRUE=
Property changes on: trunk/graphics/mesa-dri/files/patch-configure
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-include_GL_internal_dri__interface.h
===================================================================
--- trunk/graphics/mesa-dri/files/patch-include_GL_internal_dri__interface.h (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-include_GL_internal_dri__interface.h 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,19 @@
+GCC on 9.x doesn't allow types to be overwritten, these types are defined
+in drm.h also, which causes build issues in xorg-server.
+
+--- include/GL/internal/dri_interface.h.orig 2016-11-10 22:05:17 UTC
++++ include/GL/internal/dri_interface.h
+@@ -40,13 +40,7 @@
+ #ifndef DRI_INTERFACE_H
+ #define DRI_INTERFACE_H
+
+-#ifdef HAVE_LIBDRM
+ #include <drm.h>
+-#else
+-typedef unsigned int drm_context_t;
+-typedef unsigned int drm_drawable_t;
+-typedef struct drm_clip_rect drm_clip_rect_t;
+-#endif
+
+ /**
+ * \name DRI interface structures
Property changes on: trunk/graphics/mesa-dri/files/patch-include_GL_internal_dri__interface.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,16 @@
+# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
+#
+--- src/egl/drivers/dri2/platform_x11.c.orig 2017-05-10 14:13:57 UTC
++++ src/egl/drivers/dri2/platform_x11.c
+@@ -1509,7 +1509,11 @@ dri2_initialize_x11(_EGLDriver *drv, _EG
+
+ if (!getenv("LIBGL_ALWAYS_SOFTWARE")) {
+ #ifdef HAVE_DRI3
++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)
++ if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))
++#else
+ if (!getenv("LIBGL_DRI3_DISABLE"))
++#endif
+ initialized = dri2_initialize_x11_dri3(drv, disp);
+ #endif
+
Property changes on: trunk/graphics/mesa-dri/files/patch-src_egl_drivers_dri2_platform__x11.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,118 @@
+Revert the following commit.
+
+FreeBSD and DragonFly don't have the required render nodes.
+
+-------
+
+From 69a1b9959e59653da262185c4e2cf57d24939b19 Mon Sep 17 00:00:00 2001
+From: Emil Velikov <emil.l.velikov at gmail.com>
+Date: Mon, 29 Jun 2015 12:36:45 +0100
+Subject: pipe-loader: drop support for non-render node devices
+
+Render nodes have been around for quite some time. Removing support via
+the master/primary node allows us to clean up the conditional
+compilation and simplify the build greatly.
+
+For example currently we the pipe-loader, which explicitly links against
+xcb and friends (for X auth) if found at compile-time. That
+would cause problems as one will be forced to use X/xcb, even if it's a
+headless system that is used for opencl.
+
+v2: Clarify the linking topic in the commit message.
+
+Cc: Tom Stellard <thomas.stellard at amd.com>
+Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
+Reviewed-by: Francisco Jerez <currojerez at riseup.net>
+
+
+--- src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c.orig 2017-05-10 14:13:57 UTC
++++ src/gallium/auxiliary/pipe-loader/pipe_loader_drm.c
+@@ -209,6 +209,14 @@ pipe_loader_drm_probe_fd(struct pipe_loa
+ }
+
+ static int
++open_drm_minor(int minor)
++{
++ char path[PATH_MAX];
++ snprintf(path, sizeof(path), DRM_DEV_NAME, DRM_DIR_NAME, minor);
++ return open(path, O_RDWR, 0);
++}
++
++static int
+ open_drm_render_node_minor(int minor)
+ {
+ char path[PATH_MAX];
+@@ -220,8 +228,15 @@ open_drm_render_node_minor(int minor)
+ int
+ pipe_loader_drm_probe(struct pipe_loader_device **devs, int ndev)
+ {
+- int i, j, fd;
++ int i, k, fd, num_render_node_devs;
++ int j = 0;
++
++ struct {
++ unsigned vendor_id;
++ unsigned chip_id;
++ } render_node_devs[DRM_RENDER_NODE_MAX_NODES];
+
++ /* 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;
+@@ -235,6 +250,9 @@ pipe_loader_drm_probe(struct pipe_loader
+ continue;
+ }
+
++ render_node_devs[j].vendor_id = dev->u.pci.vendor_id;
++ render_node_devs[j].chip_id = dev->u.pci.chip_id;
++
+ if (j < ndev) {
+ devs[j] = dev;
+ } else {
+@@ -244,6 +262,46 @@ pipe_loader_drm_probe(struct pipe_loader
+ j++;
+ }
+
++ num_render_node_devs = j;
++
++ /* Next look for drm devices. */
++ for (i = 0; i < DRM_MAX_MINOR; i++) {
++ struct pipe_loader_device *dev;
++ boolean duplicate = FALSE;
++ fd = open_drm_minor(i);
++ if (fd < 0)
++ continue;
++
++ if (!pipe_loader_drm_probe_fd(&dev, fd)) {
++ close(fd);
++ continue;
++ }
++
++ /* Check to make sure we aren't already accessing this device via
++ * render nodes.
++ */
++ for (k = 0; k < num_render_node_devs; k++) {
++ if (dev->u.pci.vendor_id == render_node_devs[k].vendor_id &&
++ dev->u.pci.chip_id == render_node_devs[k].chip_id) {
++ close(fd);
++ dev->ops->release(&dev);
++ duplicate = TRUE;
++ break;
++ }
++ }
++
++ if (duplicate)
++ continue;
++
++ if (j < ndev) {
++ devs[j] = dev;
++ } else {
++ dev->ops->release(&dev);
++ }
++
++ j++;
++ }
++
+ return j;
+ }
+
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_pipe-loader_pipe__loader__drm.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,11 @@
+--- src/gallium/auxiliary/util/u_network.c.orig 2016-11-10 22:05:17 UTC
++++ src/gallium/auxiliary/util/u_network.c
+@@ -6,7 +6,7 @@
+ #if defined(PIPE_SUBSYSTEM_WINDOWS_USER)
+ # include <winsock2.h>
+ # include <windows.h>
+-#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_HAIKU) || \
++#elif defined(PIPE_OS_LINUX) || defined(PIPE_OS_BSD) || defined(PIPE_OS_HAIKU) || \
+ defined(PIPE_OS_APPLE) || defined(PIPE_OS_CYGWIN) || defined(PIPE_OS_SOLARIS)
+ # include <sys/socket.h>
+ # include <netinet/in.h>
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_auxiliary_util_u__network.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,14 @@
+# define ETIME as ETIMEOUT same as in intel driver
+#
+--- src/gallium/drivers/vc4/vc4_bufmgr.c.orig 2017-05-10 14:13:57 UTC
++++ src/gallium/drivers/vc4/vc4_bufmgr.c
+@@ -27,6 +27,9 @@
+ #include <fcntl.h>
+ #include <xf86drm.h>
+ #include <xf86drmMode.h>
++#ifndef ETIME
++#define ETIME ETIMEDOUT
++#endif
+
+ #include "util/u_hash_table.h"
+ #include "util/u_memory.h"
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_drivers_vc4_vc4__bufmgr.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,38 @@
+--- 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__)
++#define PIPE_ARCH_SPARC
++#if defined(__sparc64__)
++#define PIPE_ARCH_SPARC_64
++#endif
++#endif
++
+
+ /*
+ * 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
+-#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390)
++#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) || defined(PIPE_ARCH_SPARC) || defined(PIPE_ARCH_SPARC_64)
+ #define PIPE_ARCH_BIG_ENDIAN
+ #endif
+
+@@ -159,6 +166,12 @@
+ #define PIPE_OS_ANDROID
+ #endif
+
++#if defined(__DragonFly__)
++#define PIPE_OS_DRAGONFLY
++#define PIPE_OS_BSD
++#define PIPE_OS_UNIX
++#endif
++
+ #if defined(__FreeBSD__) || defined(__FreeBSD_kernel__)
+ #define PIPE_OS_FREEBSD
+ #define PIPE_OS_BSD
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_include_pipe_p__config.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,30 @@
+# 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 2017-04-01 15:33:37 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,
+@@ -105,8 +107,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(opts.size());
++ std::transform(opts.begin(), opts.end(), copts.begin(), cstr);
+
+ if (!clang::CompilerInvocation::CreateFromArgs(
+ c->getInvocation(), copts.data(), copts.data() + copts.size(), diag))
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_invocation.cpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,13 @@
+# 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 {};
+ }
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_llvm_metadata.hpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_util_range.hpp
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_util_range.hpp (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_util_range.hpp 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,31 @@
+From b95533b981af9a6687b41418e7cc2a5652fc2bdb Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jean-S=C3=A9bastien=20P=C3=A9dron?= <dumbbell at FreeBSD.org>
+Date: Fri, 7 Mar 2014 15:16:08 +0100
+Subject: [PATCH 3/3] Work around for clang 3.4 which fails to build Clover
+
+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
+@@ -362,6 +362,12 @@ namespace clover {
+ return { i, i + n };
+ }
+
++ namespace detail {
++ template<typename T>
++ using fixup_function_type =
++ typename std::conditional<std::is_function<T>::value, T &, T>::type;
++ }
++
+ ///
+ /// Create a range by transforming the contents of a number of
+ /// source ranges \a rs element-wise using a provided functor \a f.
+@@ -369,7 +375,7 @@ namespace clover {
+ /// \sa adaptor_range.
+ ///
+ template<typename F, typename... Rs>
+- adaptor_range<F, Rs...>
++ adaptor_range<detail::fixup_function_type<F>, Rs...>
+ map(F &&f, Rs &&... rs) {
+ return { std::forward<F>(f), std::forward<Rs>(rs)... };
+ }
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_state__trackers_clover_util_range.hpp
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,14 @@
+--- src/gallium/winsys/svga/drm/vmw_screen_ioctl.c.orig 2016-11-10 22:05:17 UTC
++++ src/gallium/winsys/svga/drm/vmw_screen_ioctl.c
+@@ -70,6 +70,11 @@ vmw_region_size(struct vmw_region *regio
+ return region->size;
+ }
+
++#if defined(__DragonFly__) || defined(__FreeBSD__) || \
++ defined(__NetBSD__) || defined(__OpenBSD__)
++#define ERESTART EINTR
++#endif
++
+ uint32
+ vmw_ioctl_context_create(struct vmw_winsys_screen *vws)
+ {
Property changes on: trunk/graphics/mesa-dri/files/patch-src_gallium_winsys_svga_drm_vmw__screen__ioctl.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_glx_glxext.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_glx_glxext.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_glx_glxext.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,16 @@
+# work-around for https://bugs.freedesktop.org/show_bug.cgi?id=100627
+#
+--- src/glx/glxext.c.orig 2017-04-01 15:33:37 UTC
++++ src/glx/glxext.c
+@@ -906,7 +906,11 @@ __glXInitialize(Display * dpy)
+ #if defined(GLX_USE_DRM)
+ if (glx_direct && glx_accel) {
+ #if defined(HAVE_DRI3)
++#if (defined(__FreeBSD__) || defined(__FreeBSD_kernel__)) && !defined (__DRM_NEXT__)
++ if (getenv("LIBGL_DRI3_ENABLE") && !getenv("LIBGL_DRI3_DISABLE"))
++#else
+ if (!getenv("LIBGL_DRI3_DISABLE"))
++#endif
+ dpyPriv->dri3Display = dri3_create_display(dpy);
+ #endif /* HAVE_DRI3 */
+ dpyPriv->dri2Display = dri2CreateDisplay(dpy);
Property changes on: trunk/graphics/mesa-dri/files/patch-src_glx_glxext.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,14 @@
+# 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 2017-05-10 14:13:57 UTC
++++ src/intel/tools/aubinator.c
+@@ -1221,7 +1221,7 @@ int main(int argc, char *argv[])
+ /* mmap a terabyte for our gtt space. */
+ gtt_size = 1ull << 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);
Property changes on: trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,14 @@
+# expose getline in FreeBSD's stdio.h
+#
+--- src/intel/tools/aubinator_error_decode.c.orig 2017-05-10 14:13:57 UTC
++++ src/intel/tools/aubinator_error_decode.c
+@@ -22,6 +22,9 @@
+ *
+ */
+
++#ifdef __FreeBSD__
++#define _WITH_GETLINE
++#endif
+ #include <stdbool.h>
+ #include <stdio.h>
+ #include <stdlib.h>
Property changes on: trunk/graphics/mesa-dri/files/patch-src_intel_tools_aubinator__error__decode.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_mapi_glapi_gen_gl__gentable.py
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_mapi_glapi_gen_gl__gentable.py (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_mapi_glapi_gen_gl__gentable.py 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,11 @@
+--- src/mapi/glapi/gen/gl_gentable.py.orig 2017-05-15 12:05:59 UTC
++++ src/mapi/glapi/gen/gl_gentable.py
+@@ -43,7 +43,7 @@ header = """/* GLXEXT is the define used
+ #endif
+
+ #if (defined(GLXEXT) && defined(HAVE_BACKTRACE)) \\
+- || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__DragonFly__))
++ || (!defined(GLXEXT) && defined(DEBUG) && !defined(__CYGWIN__) && !defined(__MINGW32__) && !defined(__OpenBSD__) && !defined(__NetBSD__) && !defined(__FreeBSD__) && !defined(__DragonFly__))
+ #define USE_BACKTRACE
+ #endif
+
Property changes on: trunk/graphics/mesa-dri/files/patch-src_mapi_glapi_gen_gl__gentable.py
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_mesa_main_compiler.h
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_mesa_main_compiler.h (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_mesa_main_compiler.h 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,12 @@
+--- src/mesa/main/compiler.h.orig 2017-05-10 14:13:57 UTC
++++ src/mesa/main/compiler.h
+@@ -51,6 +51,9 @@
+ #if defined(__linux__)
+ #include <byteswap.h>
+ #define CPU_TO_LE32( x ) bswap_32( x )
++#elif defined(__FreeBSD__)
++#include <sys/endian.h>
++#define CPU_TO_LE32( x ) bswap32( x )
+ #elif defined(__APPLE__)
+ #include <CoreFoundation/CFByteOrder.h>
+ #define CPU_TO_LE32( x ) CFSwapInt32HostToLittle( x )
Property changes on: trunk/graphics/mesa-dri/files/patch-src_mesa_main_compiler.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_util_build__id.c
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_util_build__id.c (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_util_build__id.c 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,17 @@
+# Elf_ doesn't exist, use Elf32_ or Elf64_
+#
+--- src/util/build_id.c.orig 2017-05-10 14:13:58 UTC
++++ src/util/build_id.c
+@@ -33,7 +33,11 @@
+ #endif
+
+ #ifndef ElfW
+-#define ElfW(type) Elf_##type
++#ifdef __LP64__
++#define ElfW(type) Elf64_##type
++#else
++#define ElfW(type) Elf32_##type
++#endif
+ #endif
+
+ #define ALIGN(val, align) (((val) + (align) - 1) & ~((align) - 1))
Property changes on: trunk/graphics/mesa-dri/files/patch-src_util_build__id.c
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/files/patch-src_util_u__endian.h
===================================================================
--- trunk/graphics/mesa-dri/files/patch-src_util_u__endian.h (rev 0)
+++ trunk/graphics/mesa-dri/files/patch-src_util_u__endian.h 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,11 @@
+--- src/util/u_endian.h.orig 2016-11-10 22:05:17 UTC
++++ src/util/u_endian.h
+@@ -54,7 +54,7 @@
+ # define PIPE_ARCH_BIG_ENDIAN
+ #endif
+
+-#elif defined(__OpenBSD__) || defined(__NetBSD__)
++#elif defined(__OpenBSD__) || defined(__NetBSD__) || defined(__FreeBSD__) || defined(__DragonFly__)
+ #include <sys/types.h>
+ #include <machine/endian.h>
+
Property changes on: trunk/graphics/mesa-dri/files/patch-src_util_u__endian.h
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/pkg-descr
===================================================================
--- trunk/graphics/mesa-dri/pkg-descr (rev 0)
+++ trunk/graphics/mesa-dri/pkg-descr 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,7 @@
+This package contains the current stable release of the client drivers for DRI2+
+
+With a X Server configured for DRI, they allow direct rendering of hardware-
+accelerated OpenGL. This package also includes the software renderer, either
+llvmpipe or classic SWrast.
+
+WWW: http://www.mesa3d.org/
Property changes on: trunk/graphics/mesa-dri/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/pkg-help
===================================================================
--- trunk/graphics/mesa-dri/pkg-help (rev 0)
+++ trunk/graphics/mesa-dri/pkg-help 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,15 @@
+VAAPI and VDPAU options enable building Gallium based VA-API and VDPAU
+drivers to decode video on the GPU via libva and libvdpau, respectively.
+Gallium based VAAPI and VDPAU drivers are only available for Radeon GPUs.
+
+Both GPU decode options require newer drm drivers than are currently present
+in a released FreeBSD kernel. These are options for DRM-next and DragonFly.
+
+The TEXTURE option enables texture-float support, which SGI claims requires
+US Patent #6,650,327 [1], filed Jun 16, 1998 thus expiring on Jun 16, 2018.
+Use may require a license depending on jurisdiction, consult a lawyer.
+
+See docs/patents.txt in the Mesa tarball or the following URLs:
+
+[1] https://www.google.com/patents/US6650327
+[2] http://www.opengl.org/registry/specs/ARB/texture_float.txt
Property changes on: trunk/graphics/mesa-dri/pkg-help
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-dri/pkg-plist
===================================================================
--- trunk/graphics/mesa-dri/pkg-plist (rev 0)
+++ trunk/graphics/mesa-dri/pkg-plist 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,92 @@
+etc/drirc
+ at comment include/EGL/egl.h
+ at comment include/EGL/eglext.h
+ at comment include/EGL/eglextchromium.h
+ at comment include/EGL/eglmesaext.h
+ at comment include/EGL/eglplatform.h
+ at comment include/GL/gl.h
+ at comment include/GL/gl_mangle.h
+ at comment include/GL/glcorearb.h
+ at comment include/GL/glext.h
+ at comment include/GL/glx.h
+ at comment include/GL/glx_mangle.h
+ at comment include/GL/glxext.h
+include/GL/internal/dri_interface.h
+ at comment include/GL/osmesa.h
+ at comment include/GLES2/gl2.h
+ at comment include/GLES2/gl2ext.h
+ at comment include/GLES2/gl2platform.h
+ at comment include/GLES3/gl3.h
+ at comment include/GLES3/gl31.h
+ at comment include/GLES3/gl32.h
+ at comment include/GLES3/gl3ext.h
+ at comment include/GLES3/gl3platform.h
+ at comment include/KHR/khrplatform.h
+ at comment include/gbm.h
+%%I915_DRIVER%%lib/dri/i915_dri.so
+%%I965_DRIVER%%lib/dri/i965_dri.so
+%%FREEDRENO_GDRIVER%%lib/dri/kgsl_dri.so
+%%SWRAST_GDRIVER%%lib/dri/kms_swrast_dri.so
+%%FREEDRENO_GDRIVER%%lib/dri/msm_dri.so
+%%R200_DRIVER%%lib/dri/r200_dri.so
+%%R300_GDRIVER%%lib/dri/r300_dri.so
+%%R600_GDRIVER%%lib/dri/r600_dri.so
+%%VAAPI%%%%R600_GDRIVER%%lib/dri/r600_drv_video.so
+%%RADEON_DRIVER%%lib/dri/radeon_dri.so
+%%RADEONSI_GDRIVER%%lib/dri/radeonsi_dri.so
+%%VAAPI%%%%RADEONSI_GDRIVER%%lib/dri/radeonsi_drv_video.so
+%%SWRAST_DRIVER%%lib/dri/swrast_dri.so
+%%VC4_GDRIVER%%lib/dri/vc4_dri.so
+%%SVGA_GDRIVER%%lib/dri/vmwgfx_dri.so
+ at comment lib/gallium-pipe/pipe_r300.so
+ at comment lib/gallium-pipe/pipe_r600.so
+ at comment lib/gallium-pipe/pipe_radeonsi.so
+ at comment lib/gallium-pipe/pipe_swrast.so
+ at comment lib/gallium-pipe/pipe_vmwgfx.so
+ at comment lib/libEGL.so
+ at comment lib/libEGL.so.1
+ at comment lib/libEGL.so.1.0.0
+ at comment lib/libGL.so
+ at comment lib/libGL.so.1
+ at comment lib/libGL.so.1.2.0
+ at comment lib/libGLESv2.so
+ at comment lib/libGLESv2.so.2
+ at comment lib/libGLESv2.so.2.0.0
+ at comment lib/libMesaOpenCL.so
+ at comment lib/libMesaOpenCL.so.1
+ at comment lib/libMesaOpenCL.so.1.0.0
+ at comment lib/libOSMesa.so
+ at comment lib/libOSMesa.so.8
+ at comment lib/libOSMesa.so.8.0.0
+%%R600_GDRIVER%%lib/libXvMCr600.so
+%%R600_GDRIVER%%lib/libXvMCr600.so.1
+%%R600_GDRIVER%%lib/libXvMCr600.so.1.0
+%%R600_GDRIVER%%lib/libXvMCr600.so.1.0.0
+ at comment lib/libgbm.so
+ at comment lib/libgbm.so.1
+ at comment lib/libgbm.so.1.0.0
+ at comment lib/libglapi.so
+ at comment lib/libglapi.so.0
+ at comment lib/libglapi.so.0.0.0
+%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so
+%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1
+%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1.0
+%%VDPAU%%%%R300_GDRIVER%%lib/vdpau/libvdpau_r300.so.1.0.0
+%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so
+%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1
+%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1.0
+%%VDPAU%%%%R600_GDRIVER%%lib/vdpau/libvdpau_r600.so.1.0.0
+%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so
+%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1
+%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0
+%%VDPAU%%%%RADEONSI_GDRIVER%%lib/vdpau/libvdpau_radeonsi.so.1.0.0
+ at comment lib/libwayland-egl.so
+ at comment lib/libwayland-egl.so.1
+ at comment lib/libwayland-egl.so.1.0.0
+libdata/pkgconfig/dri.pc
+ at comment libdata/pkgconfig/egl.pc
+ at comment libdata/pkgconfig/gbm.pc
+ at comment libdata/pkgconfig/gl.pc
+ at comment libdata/pkgconfig/glesv2.pc
+ at comment libdata/pkgconfig/osmesa.pc
+ at comment libdata/pkgconfig/wayland-egl.pc
Property changes on: trunk/graphics/mesa-dri/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-libs/Makefile
===================================================================
--- trunk/graphics/mesa-libs/Makefile (rev 0)
+++ trunk/graphics/mesa-libs/Makefile 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,64 @@
+# $MidnightBSD$
+
+PORTNAME= mesa-libs
+PORTVERSION= ${MESAVERSION}
+CATEGORIES= graphics
+
+COMMENT= OpenGL libraries that support GLX and EGL clients
+
+LICENSE= mit
+
+USE_XORG= dri2proto dri3proto glproto presentproto x11 xcb xdamage xext \
+ xfixes xshmfence xxf86vm
+
+OPTIONS_DEFINE= WAYLAND
+OPTIONS_SUB= yes
+
+WAYLAND_DESC= Enable support for the Wayland platform in EGL
+WAYLAND_LIB_DEPENDS= libwayland-client.so:graphics/wayland \
+ libwayland-server.so:graphics/wayland
+
+.include <bsd.mport.options.mk>
+.include "${.CURDIR:H:H}/graphics/mesa-dri/Makefile.common"
+
+CONFIGURE_ARGS+= --with-dri-drivers="" --with-gallium-drivers=""
+
+# libEGL needs gallium enabled which depends on llvm
+.if "${MESA_LLVM_VER}" != ""
+.if ${PORT_OPTIONS:MWAYLAND}
+CONFIGURE_ARGS+= --with-platforms=x11,drm,wayland
+.else
+CONFIGURE_ARGS+= --with-platforms=x11,drm
+.endif
+PLIST_SUB+= EGL=""
+.else
+CONFIGURE_ARGS+= --disable-egl
+PLIST_SUB+= EGL="@comment "
+.if ${PORT_OPTIONS:MWAYLAND}
+IGNORE= option WAYLAND is only valid on platforms with LLVM
+.endif
+.endif
+
+MESA_BUILD_WRKSRC= src/mapi
+MESA_INSTALL_WRKSRC= src/mapi
+
+.if ${PORT_OPTIONS:MWAYLAND}
+MESA_BUILD_WRKSRC+= src/egl/wayland/wayland-drm src/egl/wayland/wayland-egl
+MESA_INSTALL_WRKSRC+= src/egl/wayland/wayland-egl
+.endif
+
+MESA_BUILD_WRKSRC+= src/gbm src/glx
+MESA_INSTALL_WRKSRC+= src/gbm src/glx
+
+.if "${MESA_LLVM_VER}" != ""
+MESA_BUILD_WRKSRC+= src/egl
+MESA_INSTALL_WRKSRC+= src/egl
+.endif
+
+.include "${MASTERDIR}/Makefile.targets"
+
+post-install:
+ @cd ${WRKSRC}/src && ${SETENV} DESTDIR=${FAKE_DESTDIR} ${FAKE_MAKEENV} \
+ ${MAKE_CMD} ${FAKE_MAKEARGS} install-pkgconfigDATA install-glHEADERS install-glxHEADERS
+
+.include <bsd.port.post.mk>
Property changes on: trunk/graphics/mesa-libs/Makefile
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:keywords
## -0,0 +1 ##
+MidnightBSD=%H
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-libs/pkg-descr
===================================================================
--- trunk/graphics/mesa-libs/pkg-descr (rev 0)
+++ trunk/graphics/mesa-libs/pkg-descr 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,5 @@
+This package contains the Mesa OpenGL libraries for GLX and EGL clients.
+These include libEGL, libGL, and libglesv2 as well as utlity libraries
+libglapi and gbm.
+
+WWW: http://www.mesa3d.org/
Property changes on: trunk/graphics/mesa-libs/pkg-descr
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Added: trunk/graphics/mesa-libs/pkg-plist
===================================================================
--- trunk/graphics/mesa-libs/pkg-plist (rev 0)
+++ trunk/graphics/mesa-libs/pkg-plist 2018-09-02 19:54:13 UTC (rev 24064)
@@ -0,0 +1,45 @@
+%%EGL%%include/EGL/egl.h
+%%EGL%%include/EGL/eglext.h
+%%EGL%%include/EGL/eglextchromium.h
+%%EGL%%include/EGL/eglmesaext.h
+%%EGL%%include/EGL/eglplatform.h
+include/GL/gl.h
+include/GL/gl_mangle.h
+include/GL/glcorearb.h
+include/GL/glext.h
+include/GL/glx.h
+include/GL/glx_mangle.h
+include/GL/glxext.h
+include/GLES2/gl2.h
+include/GLES2/gl2ext.h
+include/GLES2/gl2platform.h
+include/GLES3/gl3.h
+include/GLES3/gl31.h
+include/GLES3/gl32.h
+include/GLES3/gl3ext.h
+include/GLES3/gl3platform.h
+%%EGL%%include/KHR/khrplatform.h
+include/gbm.h
+%%EGL%%lib/libEGL.so
+%%EGL%%lib/libEGL.so.1
+%%EGL%%lib/libEGL.so.1.0.0
+lib/libGL.so
+lib/libGL.so.1
+lib/libGL.so.1.2.0
+lib/libGLESv2.so
+lib/libGLESv2.so.2
+lib/libGLESv2.so.2.0.0
+lib/libgbm.so
+lib/libgbm.so.1
+lib/libgbm.so.1.0.0
+lib/libglapi.so
+lib/libglapi.so.0
+lib/libglapi.so.0.0.0
+%%WAYLAND%%lib/libwayland-egl.so
+%%WAYLAND%%lib/libwayland-egl.so.1
+%%WAYLAND%%lib/libwayland-egl.so.1.0.0
+%%EGL%%libdata/pkgconfig/egl.pc
+libdata/pkgconfig/gbm.pc
+libdata/pkgconfig/gl.pc
+libdata/pkgconfig/glesv2.pc
+%%WAYLAND%%libdata/pkgconfig/wayland-egl.pc
Property changes on: trunk/graphics/mesa-libs/pkg-plist
___________________________________________________________________
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
More information about the Midnightbsd-cvs
mailing list