From 6131d224815ccc58ef1a6e08b64ddde0076866cc Mon Sep 17 00:00:00 2001
From: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
Date: Fri, 10 Nov 2017 18:33:17 +0100
Subject: [PATCH] Sanitize tarball

Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
---
 Makefile  | 23 +++++++++++++++++++++++
 mesa.spec | 15 ++++++++++-----
 sources   |  2 +-
 3 files changed, 34 insertions(+), 6 deletions(-)
 create mode 100644 Makefile

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..8952971
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+VERSION ?= 17.2.4
+SANITIZE ?= 1
+
+DIRNAME = mesa-${VERSION}
+
+all: archive
+
+clean:
+	rm -rf $(DIRNAME)/
+	rm -f mesa-${VERSION}.tar.xz
+
+clone: clean
+	curl -O https://mesa.freedesktop.org/archive/mesa-${VERSION}.tar.xz
+	tar xf mesa-${VERSION}.tar.xz
+
+sanitize: clone vl_mpeg12_decoder.c vl_decoder.c
+ifdef SANITIZE
+	cat < vl_mpeg12_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
+	cat < vl_decoder.c > $(DIRNAME)/src/gallium/auxiliary/vl/vl_decoder.c
+endif
+
+archive: clone sanitize
+	tar cf ${DIRNAME}.tar.xz ${DIRNAME}
diff --git a/mesa.spec b/mesa.spec
index 54b1b3b..b63e2d1 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -59,20 +59,22 @@
 Name:           mesa
 Summary:        Mesa graphics libraries
 Version:        17.2.4
-Release:        1%{?rctag:.%{rctag}}%{?dist}
+Release:        2%{?rctag:.%{rctag}}%{?dist}
 
 License:        MIT
 URL:            http://www.mesa3d.org
-Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
+#Source0:        https://mesa.freedesktop.org/archive/%{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
+Source0:        %{name}-%{version}%{?rctag:-%{rctag}}.tar.xz
 Source1:        vl_decoder.c
 Source2:        vl_mpeg12_decoder.c
+Source3:        Makefile
 # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
 # Source4 contains email correspondence clarifying the license terms.
 # Fedora opts to ignore the optional part of clause 2 and treat that code as 2 clause BSD.
-Source3:        Mesa-MLAA-License-Clarification-Email.txt
+Source4:        Mesa-MLAA-License-Clarification-Email.txt
 
 # https://cgit.freedesktop.org/~ajax/mesa/log/?h=mesa-17.2-s3tc
-Patch0:		0001-mesa-Squash-merge-of-S3TC-support.patch
+Patch0:         0001-mesa-Squash-merge-of-S3TC-support.patch
 
 Patch1:         0001-llvm-SONAME-without-version.patch
 Patch2:         0002-hardware-gloat.patch
@@ -375,7 +377,7 @@ Headers for development with the Vulkan API.
   cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
 %endif
 
-cp %{SOURCE3} docs/
+cp %{SOURCE4} docs/
 
 # this is a hack for S3TC support. r200_screen.c is symlinked to
 # radeon_screen.c in git, but is its own file in the tarball.
@@ -694,6 +696,9 @@ popd
 %endif
 
 %changelog
+* Fri Nov 10 2017 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 17.2.4-2
+- Sanitize tarball
+
 * Tue Oct 31 2017 Peter Robinson <pbrobinson@fedoraproject.org> 17.2.4-1
 - Update to 17.2.4 GA
 
diff --git a/sources b/sources
index 6c144db..ab4c2b6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-17.2.4.tar.xz) = 665b63aab6af3f8f263f182d85d9ad71db7a23bcbaf67d62fe53c258cb0f600266ac82e72d681ec20cf7c66b47d4076aad5c3f553519f19110ee577da2707085
+SHA512 (mesa-17.2.4.tar.xz) = 57310f9e6dc4dca582e00b74f3b886094560a590fdc21cf8fa810773bcfd0bddca574e46be8723cf69b201f73e66844691b72b4a05fdd9f46a355a92a165db70