From eda095b5ce23c6ccbd7533fa0b82e6ce279ca07c Mon Sep 17 00:00:00 2001
From: jbeich <jbeich@35697150-7ecd-e111-bb59-0022644237b5>
Date: Sat, 1 Jul 2017 14:39:27 +0000
Subject: [PATCH] graphics/mesa-{libs,dri}: update to 17.3.6

Changes:	https://www.mesa3d.org/relnotes/17.3.2.html
Changes:	https://www.mesa3d.org/relnotes/17.3.3.html
Changes:	https://www.mesa3d.org/relnotes/17.3.4.html
Changes:	https://www.mesa3d.org/relnotes/17.3.5.html
Changes:	https://www.mesa3d.org/relnotes/17.3.6.html
PR:		225035
Approved by:	x11 (???) or maintainer timeout (? weeks)
MFH:		2018Q1
---
 graphics/mesa-dri/Makefile                                     |  1 -
 graphics/mesa-dri/Makefile.common                              |  2 +-
 graphics/mesa-dri/distinfo                                     |  6 +++---
 .../files/extra-src_mesa_drivers_dri_i965_intel__screen.c      | 10 +++++-----
 4 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/graphics/mesa-dri/Makefile b/graphics/mesa-dri/Makefile
index 43395f09c8c6..c3dcf50e9108 100644
--- a/graphics/mesa-dri/Makefile
+++ b/graphics/mesa-dri/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	mesa-dri
 PORTVERSION=	${MESAVERSION}
-PORTREVISION=	1
 CATEGORIES=	graphics
 
 COMMENT=	OpenGL hardware acceleration drivers for DRI2+
diff --git a/graphics/mesa-dri/Makefile.common b/graphics/mesa-dri/Makefile.common
index 53e928f707f1..60d917d95e64 100644
--- a/graphics/mesa-dri/Makefile.common
+++ b/graphics/mesa-dri/Makefile.common
@@ -14,7 +14,7 @@
 MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
 MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
 
-MESABASEVERSION=	17.3.1
+MESABASEVERSION=	17.3.6
 # if there is a subversion, don't include the '-' between 7.11-rc2.
 MESASUBVERSION=
 
diff --git a/graphics/mesa-dri/distinfo b/graphics/mesa-dri/distinfo
index a10f2c3c22a4..521eab964245 100644
--- a/graphics/mesa-dri/distinfo
+++ b/graphics/mesa-dri/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1513877589
-SHA256 (mesa-17.3.1.tar.xz) = 9ae607e0998a586fb2c866cfc8e45e6f52d1c56cb1b41288253ea83eada824c1
-SIZE (mesa-17.3.1.tar.xz) = 10669392
+TIMESTAMP = 1519690868
+SHA256 (mesa-17.3.6.tar.xz) = e5915680d44ac9d05defdec529db7459ac9edd441c9845266eff2e2d3e57fbf8
+SIZE (mesa-17.3.6.tar.xz) = 10679396
diff --git a/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c b/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c
index 704aad20f611..a7f445689fcd 100644
--- a/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c
+++ b/graphics/mesa-dri/files/extra-src_mesa_drivers_dri_i965_intel__screen.c
@@ -22,12 +22,12 @@ diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i96
 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);
+@@ -1776,8 +1776,8 @@ intel_init_bufmgr(struct intel_screen *screen)
+       return false;
+    }
  
--   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_EXEC_NO_RELOC)) {
+-      fprintf(stderr, "[%s: %u] Kernel 3.9 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;