diff options
author | Mihai Moldovan <ionic@ionic.de> | 2017-04-06 12:17:54 +0200 |
---|---|---|
committer | Mihai Moldovan <ionic@ionic.de> | 2017-04-06 12:17:54 +0200 |
commit | 0d7b4c365808a7ce8abd8b1f1079b4a99d007c78 (patch) | |
tree | 0f8132d4fbf5270c4385c768b115b10218eb78cd /mesa-quilt | |
parent | 2767d32c0efd7fe8a36e4340caeccb8841e1b96a (diff) | |
parent | 2c9effed2113df2929fd0b85830030ce4bd64f87 (diff) | |
download | nx-libs-0d7b4c365808a7ce8abd8b1f1079b4a99d007c78.tar.gz nx-libs-0d7b4c365808a7ce8abd8b1f1079b4a99d007c78.tar.bz2 nx-libs-0d7b4c365808a7ce8abd8b1f1079b4a99d007c78.zip |
Merge branch 'sunweaver-pr/mesa-patching-with-quilt' into 3.6.x
Attributes GH PR #409: https://github.com/ArcticaProject/nx-libs/pull/409
Diffstat (limited to 'mesa-quilt')
-rwxr-xr-x | mesa-quilt | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/mesa-quilt b/mesa-quilt new file mode 100755 index 000000000..1aaeae1e4 --- /dev/null +++ b/mesa-quilt @@ -0,0 +1,34 @@ +#!/bin/bash + +# Copyright (C) 2017 by Mike Gabriel <mike.gabriel@das-netzwerkteam.de> +# +# This is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the +# Free Software Foundation, Inc., +# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +d=. ; while [ ! -d "$d/nx-X11/extras" ] && [ "$(readlink -e "$d")" != "/" ]; do d="$d/.."; done +if [ -d "$d/nx-X11/extras" ] && [ -z "$QUILT_PATCHES" ]; then + # if in nx-libs tree with unset $QUILT_PATCHES + export QUILT_PATCHES="../Mesa.patches" + export QUILT_PATCH_OPTS="--reject-format=unified" + export QUILT_DIFF_ARGS="-p ab --no-timestamps --no-index --color=auto" + export QUILT_REFRESH_ARGS="-p ab --no-timestamps --no-index" + export QUILT_COLORS="diff_hdr=1;32:diff_add=1;34:diff_rem=1;31:diff_hunk=1;33:diff_ctx=35:diff_cctx=33" + if ! [ -d "$d/nx-X11/extras/Mesa.patches" ]; then mkdir "$d/nx-X11/extras/Mesa.patches"; fi + cd "$d/nx-X11/extras/Mesa/" +fi + +quilt "$@" + +cd - 1> /dev/null |