From: Taner Tas <taner76@gmail.com>
To: alpine-aports@lists.alpinelinux.org
Cc: Taner Tas <taner76@gmail.com>
Subject: [alpine-aports] [PATCH] main/mesa: Upgrade to 17.3.6
Date: Tue, 20 Mar 2018 16:59:45 +0000
Message-Id: <20180320165945.18111-1-taner76@gmail.com>
Precedence: list

Patches are revised accordingly.
---
 main/mesa/APKBUILD                | 12 ++++++------
 main/mesa/drmdeps.patch           |  4 ++--
 main/mesa/musl-fix-includes.patch |  7 ++-----
 main/mesa/musl-fixes.patch        |  8 ++++----
 4 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/main/mesa/APKBUILD b/main/mesa/APKBUILD
index 7202695e..1bc4e630 100644
--- a/main/mesa/APKBUILD
+++ b/main/mesa/APKBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=mesa
-pkgver=17.2.4
-pkgrel=1
+pkgver=17.3.6
+pkgrel=0
 pkgdesc="Mesa DRI OpenGL library"
 url="http://www.mesa3d.org"
 arch="all"
@@ -237,8 +237,8 @@ _wayland() {
 	mv "$pkgdir"/usr/lib/libwayland-egl.so.* "$subpkgdir"/usr/lib/
 }
 
-sha512sums="665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac82e72d681ec20cf7c66b47d4076aad5c3f553519f19110ee577da2707085  mesa-17.2.4.tar.xz
+sha512sums="5164ed5a1d3d25031b712a9f443f0e467a29b2bca0a1aa11324ed5c10279411979c9c7482825053926a813e76c58b78a3439c7c81fcd51a7808f53977080828f  mesa-17.3.6.tar.xz
 c3d4804ebc24c7216e4c9d4995fb92e116be7f478024b44808ee134a4c93bb51d1f66fe5fb6eca254f124c4abf6f81272b027824b3e2650a9607818bf793035a  glx_ro_text_segm.patch
-163bb96773686a7446f40a8415acef762910afb2f4f2271d429d9cbd9e3048111c8c0023c1f072fa63f33b68b2aea9d066efd9083904265151eeccbe8ccb7227  musl-fixes.patch
-c7d91a660a033df91fac9c557039efc8669f0c26b2d35997d50753938b70d1af0bd110dcab3f8236eafab7d4be5dd7cd128a3e057e67e7e6a38a73fd6a7ef62e  musl-fix-includes.patch
-1771179e603d1b32a2619eb9b6c166eb7ce82cbc774b3c47d2351bbf69c8e3c0bd26f1c4d3d4fa95d05ea886e2cc74f4fae1210d6d5790de146f9fb9e42bdb30  drmdeps.patch"
+163498ac0deaaa9ce19a1e12a8a6f3ab4b90fc97e0b65b25d595c0a01201a5daacb063614c53c26d7958e1daccfa94e3e313c83a8cdc04e29a56891230707bec  musl-fixes.patch
+f206c965b60131563ce920341042bdbd6911efe9e9d8edb5422c2c3490b42e903eb2260ba9549184c76a2f4692908706641818609c535efb9ed16f00ee4f6889  musl-fix-includes.patch
+3409483217dbec732286e628e268e1e8cd392b7e8efb13c7651b38e6563aa5a4988279efb029096dcd092ebe7a92eece103014ed420d2b242eab8d0237f056fd  drmdeps.patch"
diff --git a/main/mesa/drmdeps.patch b/main/mesa/drmdeps.patch
index 2cb421ce..36b6889b 100644
--- a/main/mesa/drmdeps.patch
+++ b/main/mesa/drmdeps.patch
@@ -9,7 +9,7 @@
  libradeonwinsys_la_SOURCES = $(C_SOURCES)
 --- a/src/gallium/winsys/radeon/drm/Makefile.in
 +++ b/src/gallium/winsys/radeon/drm/Makefile.in
-@@ -118,7 +118,7 @@
+@@ -119,7 +119,7 @@
  CONFIG_CLEAN_FILES =
  CONFIG_CLEAN_VPATH_FILES =
  LTLIBRARIES = $(noinst_LTLIBRARIES)
@@ -30,7 +30,7 @@
  libamdgpuwinsys_la_SOURCES = $(C_SOURCES)
 --- a/src/gallium/winsys/amdgpu/drm/Makefile.in
 +++ b/src/gallium/winsys/amdgpu/drm/Makefile.in
-@@ -565,7 +565,7 @@
+@@ -572,7 +572,7 @@
  AM_CXXFLAGS = $(AM_CFLAGS)
  noinst_LTLIBRARIES = libamdgpuwinsys.la
  libamdgpuwinsys_la_LIBADD = \
diff --git a/main/mesa/musl-fix-includes.patch b/main/mesa/musl-fix-includes.patch
index 2f6cc1d1..415e3dd8 100644
--- a/main/mesa/musl-fix-includes.patch
+++ b/main/mesa/musl-fix-includes.patch
@@ -1,14 +1,11 @@
-diff --git a/src/util/rand_xor.c b/src/util/rand_xor.c
-index de05fa6..016703c 100644
 --- a/src/util/rand_xor.c
 +++ b/src/util/rand_xor.c
-@@ -24,6 +24,9 @@
+@@ -24,6 +24,8 @@
  
  #if defined(__linux__)
  #include <sys/file.h>
 +#include <sys/types.h>
 +#include <sys/stat.h>
-+#include <fcntl.h>
  #include <unistd.h>
+ #include <fcntl.h>
  #else
- #include <time.h>
diff --git a/main/mesa/musl-fixes.patch b/main/mesa/musl-fixes.patch
index ac5e5aa7..11cc0466 100644
--- a/main/mesa/musl-fixes.patch
+++ b/main/mesa/musl-fixes.patch
@@ -9,14 +9,14 @@
  #include "pipe/p_compiler.h"
  #include "pipe/p_state.h"
  
---- a/src/util/u_endian.h.orig	2016-11-04 12:16:00.480356454 +0100
-+++ b/src/util/u_endian.h	2016-11-04 12:16:11.984347944 +0100
+--- ./src/util/u_endian.h.orig
++++ ./src/util/u_endian.h
 @@ -27,7 +27,7 @@
  #ifndef U_ENDIAN_H
  #define U_ENDIAN_H
  
--#if defined(__GLIBC__) || defined(ANDROID)
-+#if defined(__linux__) || defined(ANDROID)
+-#if defined(__GLIBC__) || defined(ANDROID) || defined(__CYGWIN__)
++#if defined(__linux__) || defined(ANDROID) || defined(__CYGWIN__)
  #include <endian.h>
  
  #if __BYTE_ORDER == __LITTLE_ENDIAN
-- 
2.16.2



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---