From 2cc60e28052b09b4607787b958805a20062a7a3c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 4 May 2021 13:15:56 -0400 Subject: [PATCH] Sync with upstream to drop the glew dependency --- .gitignore | 1 + mesa-demos.spec | 12 +++++++----- sources | 3 +-- 3 files changed, 9 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 33b0b65..229e920 100644 --- a/.gitignore +++ b/.gitignore @@ -8,3 +8,4 @@ xdriinfo-1.0.3.tar.bz2 /mesa-demos-20151203.tar.bz2 /mesa-demos-8.3.0.tar.bz2 /mesa-demos-20181118.tar.bz2 +/mesa-demos-20210504.tar.bz2 diff --git a/mesa-demos.spec b/mesa-demos.spec index ba3da64..b3144f5 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -1,5 +1,5 @@ -%global gitdate 20181118 -%global gitcommit 1830dcb6e48c88f16d328dc4fc9fa32fe3b4956e +%global gitdate 20210504 +%global gitcommit 0f9e7d995a14f15666600fc8598f941b619d82fe %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) %global xdriinfo xdriinfo-1.0.4 %global demodir %{_libdir}/mesa @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 9.%{gitdate}git%{shortcommit}%{?dist} +Release: 10.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -20,7 +20,7 @@ Patch1: mesa-demos-as-needed.patch # Fix xdriinfo not working with libglvnd Patch2: xdriinfo-1.0.4-glvnd.patch BuildRequires: make -BuildRequires: gcc-c++ +BuildRequires: gcc-c++ BuildRequires: pkgconfig autoconf automake libtool BuildRequires: freeglut-devel BuildRequires: mesa-libGL-devel @@ -29,7 +29,6 @@ BuildRequires: mesa-libGLES-devel BuildRequires: mesa-libgbm-devel BuildRequires: libGLU-devel BuildRequires: libXext-devel -BuildRequires: glew-devel BuildRequires: wayland-devel BuildRequires: freetype-devel @@ -114,6 +113,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Tue May 04 2021 Adam Jackson - 8.4.0-10.20200504git%(c=%{gitcommit}; echo ${c:0:7}) +- Sync with upstream to drop the glew dependency + * Tue Jan 26 2021 Fedora Release Engineering - 8.4.0-9.20181118git1830dcb - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild diff --git a/sources b/sources index 2787adc..580f21f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd -SHA512 (mesa-demos-20181118.tar.bz2) = 7d5cde9e3656b4f844365bfa8258773cc41d2912b10a49bd92ac097adce9bcaf16d6a7990e38bf18ba42a808c3cd560e8a5123d00effd38f189df2974b96d34c +SHA512 (mesa-demos-20210504.tar.bz2) = 3cc071b1aeff7acb2faa71baf3d06fa4f678644ba471be01a51967330217e18dedd3a9636ab139ff8e1488e60dd1fa79b2b70ccdc383a448043997d3668b0ef0