From fd591dd76ac975794d148f7f9dba57a9ca0e2ec8 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Thu, 11 Apr 2019 14:35:02 -0400
Subject: [PATCH] Drop the mpeg1/2 sanitize hack Switch to upstream tarball
 since we no longer need to do the above

---
 mesa.spec | 27 ++++++---------------------
 sources   |  2 +-
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/mesa.spec b/mesa.spec
index b8674ba..c3140da 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -44,20 +44,15 @@
 
 %global dri_drivers %{?base_drivers}%{?platform_drivers}
 
-%global sanitize 0
-
 Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 19.0.2
 Version:        %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        MIT
 URL:            http://www.mesa3d.org
 
-#Source0:        https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
-Source0:        %{name}-%{ver}.tar.xz
-Source1:        vl_decoder.c
-Source2:        vl_mpeg12_decoder.c
+Source0:        https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
 Source3:        Makefile
 # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
 # Source4 contains email correspondence clarifying the license terms.
@@ -354,24 +349,10 @@ Requires:       vulkan-devel
 Headers for development with the Vulkan API.
 
 %prep
-%if 0%{sanitize}
-%setup -q -n %{name}-%{ver}
-  cp -f %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
-  cp -f %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
-  exit 0
-%else
 %autosetup -n %{name}-%{ver} -p1
-  cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
-  cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
-%endif
-
 cp %{SOURCE4} docs/
 
 %build
-%if !0%{sanitize}
-  cmp %{SOURCE1} src/gallium/auxiliary/vl/vl_decoder.c
-  cmp %{SOURCE2} src/gallium/auxiliary/vl/vl_mpeg12_decoder.c
-%endif
 
 %meson -Dcpp_std=gnu++11 \
   -Dplatforms=x11,wayland,drm,surfaceless \
@@ -634,6 +615,10 @@ popd
 %endif
 
 %changelog
+* Thu Apr 11 2019 Adam Jackson <ajax@redhat.com> - 19.0.2-2
+- Drop the mpeg1/2 sanitize hack
+- Switch to upstream tarball since we no longer need to do the above
+
 * Thu Apr 11 08:48:37 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraprojec.org> - 19.0.2-1
 - Update to 19.0.2
 
diff --git a/sources b/sources
index db360f9..5fe2603 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-19.0.2.tar.xz) = 44745125e5051a020d6abd92eb5dbff5b0f3e8186f65a0f689fe9daa6964a0e186e73ebdf80ce6920402b6e861422b0b17c1ed02cbc931af1d0aa4a5d05efa99
+SHA512 (mesa-19.0.2.tar.xz) = 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51