From: Jan Palus <atler@pld-linux.org>
Date: Sun, 2 Sep 2018 12:30:42 +0000 (+0200)
Subject: up to 18.1.7
X-Git-Tag: auto/th/Mesa-18.1.7-1
X-Git-Url: http://git.pld-linux.org/?p=packages%2FMesa.git;a=commitdiff_plain;h=8f4518879532a8b593ac9e4fcdcfde8f885635f7

up to 18.1.7

- glvnd-fix-gl-dot-pc and munmap_null patches no longer needed
---

diff --git a/Mesa-munmap_null.patch b/Mesa-munmap_null.patch
deleted file mode 100644
index c8e37ce..0000000
--- a/Mesa-munmap_null.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -urN mesa-18.1.2.orig/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c mesa-18.1.2/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c
---- mesa-18.1.2.orig/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c	2018-07-04 12:45:31.057803594 +0200
-+++ mesa-18.1.2/src/gallium/winsys/sw/kms-dri/kms_dri_sw_winsys.c	2018-07-04 12:47:02.030220461 +0200
-@@ -368,10 +368,14 @@
-    DEBUG_PRINT("KMS-DEBUG: unmapped buffer %u (was %p)\n", kms_sw_dt->handle, kms_sw_dt->mapped);
-    DEBUG_PRINT("KMS-DEBUG: unmapped buffer %u (was %p)\n", kms_sw_dt->handle, kms_sw_dt->ro_mapped);
- 
--   munmap(kms_sw_dt->mapped, kms_sw_dt->size);
--   kms_sw_dt->mapped = NULL;
--   munmap(kms_sw_dt->ro_mapped, kms_sw_dt->size);
--   kms_sw_dt->ro_mapped = NULL;
-+   if (kms_sw_dt->mapped != NULL) {
-+      munmap(kms_sw_dt->mapped, kms_sw_dt->size);
-+      kms_sw_dt->mapped = NULL;
-+   }
-+   if (kms_sw_dt->ro_mapped != NULL) {
-+      munmap(kms_sw_dt->ro_mapped, kms_sw_dt->size);
-+      kms_sw_dt->ro_mapped = NULL;
-+   }
- }
- 
- static struct sw_displaytarget *
diff --git a/Mesa.spec b/Mesa.spec
index ad9ce17..e6a1017 100644
--- a/Mesa.spec
+++ b/Mesa.spec
@@ -59,15 +59,13 @@
 Summary:	Free OpenGL implementation
 Summary(pl.UTF-8):	Wolnodostępna implementacja standardu OpenGL
 Name:		Mesa
-Version:	18.1.6
+Version:	18.1.7
 Release:	1
 License:	MIT (core) and others - see license.html file
 Group:		X11/Libraries
 Source0:	ftp://ftp.freedesktop.org/pub/mesa/mesa-%{version}.tar.xz
-# Source0-md5:	f798814c0b93ca3c1cf395bb936db3e0
+# Source0-md5:	17d8a7e7ecbe146a7dc439e8b6eb02e9
 Patch0:		%{name}-link.patch
-Patch1:		glvnd-fix-gl-dot-pc.patch
-Patch2:		%{name}-munmap_null.patch
 URL:		http://www.mesa3d.org/
 BuildRequires:	autoconf >= 2.60
 BuildRequires:	automake
@@ -1266,10 +1264,6 @@ radv - eksperymentalny sterownik Vulkan dla GPU firmy AMD.
 %prep
 %setup -q -n mesa-%{version}
 %patch0 -p1
-%if %{with glvnd}
-%patch1 -p1
-%endif
-%patch2 -p1
 
 %build
 %{__libtoolize}
diff --git a/glvnd-fix-gl-dot-pc.patch b/glvnd-fix-gl-dot-pc.patch
deleted file mode 100644
index 68118f4..0000000
--- a/glvnd-fix-gl-dot-pc.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up mesa-12.0.3/src/mesa/gl.pc.in.jx mesa-12.0.3/src/mesa/gl.pc.in
---- mesa-12.0.3/src/mesa/gl.pc.in.jx	2016-01-18 02:39:26.000000000 -0500
-+++ mesa-12.0.3/src/mesa/gl.pc.in	2016-10-25 13:06:44.013159358 -0400
-@@ -7,7 +7,7 @@ Name: gl
- Description: Mesa OpenGL library
- Requires.private: @GL_PC_REQ_PRIV@
- Version: @PACKAGE_VERSION@
--Libs: -L${libdir} -l@GL_LIB@
-+Libs: -L${libdir} -lGL
- Libs.private: @GL_PC_LIB_PRIV@
- Cflags: -I${includedir} @GL_PC_CFLAGS@
- glx_tls: @GLX_TLS@