From b1cb039a7a94523d951a7e9075f27b96dd0af5d2 Mon Sep 17 00:00:00 2001
From: Adam Jackson <ajax@redhat.com>
Date: Fri, 12 Apr 2019 14:57:31 -0400
Subject: [PATCH] Drop the mpeg 1/2 sanitize hack Switch to upstream tarball
 since we no longer need to do the above

---
 mesa.spec           | 27 ++++++---------------------
 sources             |  2 +-
 vl_decoder.c        | 20 --------------------
 vl_mpeg12_decoder.c |  7 -------
 4 files changed, 7 insertions(+), 49 deletions(-)
 delete mode 100644 vl_decoder.c
 delete mode 100644 vl_mpeg12_decoder.c

diff --git a/mesa.spec b/mesa.spec
index 0e1056a..afe78fc 100644
--- a/mesa.spec
+++ b/mesa.spec
@@ -43,20 +43,15 @@
 
 %global dri_drivers %{?base_drivers}%{?platform_drivers}
 
-%global sanitize 0
-
 Name:           mesa
 Summary:        Mesa graphics libraries
 %global ver 18.3.6
 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.
@@ -352,24 +347,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 \
@@ -628,6 +609,10 @@ popd
 %endif
 
 %changelog
+* Fri Apr 12 2019 Adam Jackson <ajax@redhat.com> 18.3.6-2
+- Drop the mpeg 1/2 sanitize hack
+- Switch to upstream tarball since we no longer need to do the above
+
 * Sat Apr 06 2019 Pete Walter <pwalter@fedoraproject.org> - 18.3.6-1
 - Update to 18.3.6
 
diff --git a/sources b/sources
index 1e74eb9..3b7c28f 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (mesa-18.3.6.tar.xz) = 62f354cf128c20e92b89ce39010f13e5a31db70831fe0e43c306e84bafb0261f9c290bbace4051375c38ee75d3a8b22cd037d34254cfcd31cc831a675c025e92
+SHA512 (mesa-18.3.6.tar.xz) = 3a6dcaba99185e28d162b130bbd760fe87e6072065958189b28f41ea287ef041397897e098d93218a64802cf11c73806f7400a866bd8e5ed69694fa15c147487
diff --git a/vl_decoder.c b/vl_decoder.c
deleted file mode 100644
index 1e715b6..0000000
--- a/vl_decoder.c
+++ /dev/null
@@ -1,20 +0,0 @@
-#include "vl_decoder.h"
-bool
-vl_profile_supported(struct pipe_screen *screen, enum pipe_video_profile profile,
-                     enum pipe_video_entrypoint entrypoint)
-{
-   return false;
-}
-
-int
-vl_level_supported(struct pipe_screen *screen, enum pipe_video_profile profile)
-{
-   return 0;
-}
-
-struct pipe_video_codec *
-vl_create_decoder(struct pipe_context *pipe,
-                  const struct pipe_video_codec *templat)
-{
-   return NULL;
-}
diff --git a/vl_mpeg12_decoder.c b/vl_mpeg12_decoder.c
deleted file mode 100644
index 85ac2c9..0000000
--- a/vl_mpeg12_decoder.c
+++ /dev/null
@@ -1,7 +0,0 @@
-#include "vl_mpeg12_decoder.h"
-struct pipe_video_codec *
-vl_create_mpeg12_decoder(struct pipe_context *context,
-                         const struct pipe_video_codec *templat)
-{
-    return NULL;
-}