Drop the mpeg1/2 sanitize hack

Switch to upstream tarball since we no longer need to do the above
This commit is contained in:
Adam Jackson 2019-04-11 14:35:02 -04:00
parent 878fbd1530
commit fd591dd76a
2 changed files with 7 additions and 22 deletions

View File

@ -44,20 +44,15 @@
%global dri_drivers %{?base_drivers}%{?platform_drivers} %global dri_drivers %{?base_drivers}%{?platform_drivers}
%global sanitize 0
Name: mesa Name: mesa
Summary: Mesa graphics libraries Summary: Mesa graphics libraries
%global ver 19.0.2 %global ver 19.0.2
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)} Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
Release: 1%{?dist} Release: 2%{?dist}
License: MIT License: MIT
URL: http://www.mesa3d.org URL: http://www.mesa3d.org
#Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz Source0: https://mesa.freedesktop.org/archive/%{name}-%{ver}.tar.xz
Source0: %{name}-%{ver}.tar.xz
Source1: vl_decoder.c
Source2: vl_mpeg12_decoder.c
Source3: Makefile Source3: Makefile
# src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license. # src/gallium/auxiliary/postprocess/pp_mlaa* have an ... interestingly worded license.
# Source4 contains email correspondence clarifying the license terms. # Source4 contains email correspondence clarifying the license terms.
@ -354,24 +349,10 @@ Requires: vulkan-devel
Headers for development with the Vulkan API. Headers for development with the Vulkan API.
%prep %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 %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/ cp %{SOURCE4} docs/
%build %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 \ %meson -Dcpp_std=gnu++11 \
-Dplatforms=x11,wayland,drm,surfaceless \ -Dplatforms=x11,wayland,drm,surfaceless \
@ -634,6 +615,10 @@ popd
%endif %endif
%changelog %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 * Thu Apr 11 08:48:37 CEST 2019 Igor Gnatenko <ignatenkobrain@fedoraprojec.org> - 19.0.2-1
- Update to 19.0.2 - Update to 19.0.2

View File

@ -1 +1 @@
SHA512 (mesa-19.0.2.tar.xz) = 44745125e5051a020d6abd92eb5dbff5b0f3e8186f65a0f689fe9daa6964a0e186e73ebdf80ce6920402b6e861422b0b17c1ed02cbc931af1d0aa4a5d05efa99 SHA512 (mesa-19.0.2.tar.xz) = 6b317205efa7d62150fae23489fbad5f062ecde99fb5b210fa7ccbed2e0ef60aee1f1e66e2c606ea5d59193c3218f732556706ab3b645b175044342d88984d51