From 727a55eec1c1fe9be9094b1098a622e7a1f91f26 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Fri, 22 Dec 2017 00:33:08 +0100
Subject: deps: updates and recompilations

---
 deps/mesa/mesa.SlackBuild      |   4 ++--
 deps/mesa/mesa.no.mako.diff    |  34 ++++++++++++++++++++++++++++++++++
 deps/mesa/mesa.no.mako.diff.gz | Bin 425 -> 0 bytes
 3 files changed, 36 insertions(+), 2 deletions(-)
 create mode 100644 deps/mesa/mesa.no.mako.diff
 delete mode 100644 deps/mesa/mesa.no.mako.diff.gz

(limited to 'deps/mesa')

diff --git a/deps/mesa/mesa.SlackBuild b/deps/mesa/mesa.SlackBuild
index 3d62eea..15b135b 100755
--- a/deps/mesa/mesa.SlackBuild
+++ b/deps/mesa/mesa.SlackBuild
@@ -21,7 +21,7 @@
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PKGNAM=mesa
-VERSION=${VERSION:-17.2.5}
+VERSION=${VERSION:-17.2.7}
 DEMOVERS=${DEMOVERS:-8.3.0}
 BUILD=${BUILD:-1}
 
@@ -90,7 +90,7 @@ fi
 
 # Don't worry if Mako is not present:
 #sed -i "s,AX_CHECK_PYTHON_MAKO_MODULE(\$PYTHON_MAKO_REQUIRED),,g" configure.ac
-zcat $CWD/mesa.no.mako.diff.gz | patch -p1 --verbose || exit 1
+cat $CWD/mesa.no.mako.diff | patch -p1 --verbose || exit 1
 
 # This doesn't fully do the trick.  See below.  ;-)
 #./autogen.sh
diff --git a/deps/mesa/mesa.no.mako.diff b/deps/mesa/mesa.no.mako.diff
new file mode 100644
index 0000000..5135899
--- /dev/null
+++ b/deps/mesa/mesa.no.mako.diff
@@ -0,0 +1,34 @@
+--- ./configure.ac.orig	2015-04-09 06:28:58.000000000 -0500
++++ ./configure.ac	2015-04-16 15:33:30.087481982 -0500
+@@ -114,19 +114,19 @@
+     fi
+ fi
+ 
+-AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
++dnl AX_CHECK_PYTHON_MAKO_MODULE($PYTHON_MAKO_REQUIRED)
+ 
+-if test -z "$PYTHON2"; then
+-    if test ! -f "$srcdir/src/util/format_srgb.c"; then
+-        AC_MSG_ERROR([Python not found - unable to generate sources])
+-    fi
+-else
+-    if test "x$acv_mako_found" = xno; then
+-        if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then
+-            AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
+-        fi
+-    fi
+-fi
++dnl if test -z "$PYTHON2"; then
++dnl     if test ! -f "$srcdir/src/util/format_srgb.c"; then
++dnl         AC_MSG_ERROR([Python not found - unable to generate sources])
++dnl     fi
++dnl else
++dnl     if test "x$acv_mako_found" = xno; then
++dnl         if test ! -f "$srcdir/src/mesa/main/format_unpack.c"; then
++dnl             AC_MSG_ERROR([Python mako module v$PYTHON_MAKO_REQUIRED or higher not found])
++dnl         fi
++dnl     fi
++dnl fi
+ 
+ AC_PROG_INSTALL
+ 
diff --git a/deps/mesa/mesa.no.mako.diff.gz b/deps/mesa/mesa.no.mako.diff.gz
deleted file mode 100644
index ab6aa29..0000000
Binary files a/deps/mesa/mesa.no.mako.diff.gz and /dev/null differ
-- 
cgit v1.2.3