summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2018-01-19 20:41:32 +0100
committer Eric Hameleers <alien@slackware.com>2018-01-19 20:41:32 +0100
commit7cd75136a24593287a9d6de2694a58d793fc1d9d (patch)
tree6d397f18c40d4e5dab4afa24a780d4ad48746b7d
parentf90fdf383d506d0d01f7c7bab8d0f45380766792 (diff)
downloadktown-7cd75136a24593287a9d6de2694a58d793fc1d9d.tar.gz
ktown-7cd75136a24593287a9d6de2694a58d793fc1d9d.tar.xz
dpes: synced mesa and xorg-server with Slackware
-rwxr-xr-xdeps/mesa/mesa.SlackBuild7
-rw-r--r--deps/mesa/mesa.no.mako.diff34
-rwxr-xr-xdeps/xorg-server/xorg-server.SlackBuild6
3 files changed, 5 insertions, 42 deletions
diff --git a/deps/mesa/mesa.SlackBuild b/deps/mesa/mesa.SlackBuild
index 7496b47..826856b 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.3.1}
+VERSION=${VERSION:-17.3.2}
DEMOVERS=${DEMOVERS:-8.3.0}
BUILD=${BUILD:-1}
@@ -81,16 +81,13 @@ find . \
# Apply patches from git (and maybe elsewhere):
# Patches obtained by:
# git checkout origin/17.2
-# git format-patch 96ad27f8fcf3979c577c052f725e2a80035295aa # 17.2.5 release
+# git format-patch 93c2beafc0a7fa2f210b006d22aba61caa71f773 # 17.2.6 release
if /bin/ls $CWD/patches/*.patch 1> /dev/null 2> /dev/null ; then
for patch in $CWD/patches/*.patch ; do
patch -p1 < $patch || exit 1 ;
done
fi
-## Don't worry if Mako is not present:
-#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
deleted file mode 100644
index 5135899..0000000
--- a/deps/mesa/mesa.no.mako.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./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/xorg-server/xorg-server.SlackBuild b/deps/xorg-server/xorg-server.SlackBuild
index fdb80e3..1921d5a 100755
--- a/deps/xorg-server/xorg-server.SlackBuild
+++ b/deps/xorg-server/xorg-server.SlackBuild
@@ -1,5 +1,5 @@
#!/bin/sh
-# Copyright 2007-2017 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2007-2018 Patrick J. Volkerding, Sebeka, MN, USA
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -22,13 +22,13 @@
# -----------------------------------------------------------------------------
# Condensed from the modular x11.SlackBuild
-# 2016, 2017 by Eric Hameleers <alien@slackware.com>
+# 2016, 2017, 2018 by Eric Hameleers <alien@slackware.com>
# Note: this package contains _all_ X servers. Not just Xorg, but also:
# Xnest, Xephyr, Xvfb, Xwayland.
PKGNAM=xorg-server
VERSION=${VERSION:-1.19.6}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
CWD=$(pwd)
TMP=${TMP:-/tmp}