Compare commits

...

No commits in common. "c8" and "9960d827f0b5ebb40d69b0d3f513a4f6e3d21b80" have entirely different histories.

9 changed files with 52 additions and 15 deletions

13
.gitignore vendored
View File

@ -1,2 +1,11 @@
SOURCES/mesa-demos-20181118.tar.bz2
SOURCES/xdriinfo-1.0.4.tar.bz2
mesa-demos-20100615.tar.bz2
xdriinfo-1.0.3.tar.bz2
/mesa-demos-20101028.tar.bz2
/xdriinfo-1.0.4.tar.bz2
/mesa-demos-6eef979.tar.bz2
/mesa-demos-8.1.0.tar.bz2
/mesa-demos-8.2.0.tar.bz2
/mesa-demos-20151203.tar.bz2
/mesa-demos-8.3.0.tar.bz2
/mesa-demos-20181118.tar.bz2
/mesa-demos-20210504.tar.bz2

View File

@ -1,2 +1,2 @@
e2cdd2260f18badda6f80d4baa6ebc30225b0c7e SOURCES/mesa-demos-20181118.tar.bz2
723482b3fc627d7cc6124fec43dd1c21d102daaa SOURCES/xdriinfo-1.0.4.tar.bz2
723482b3fc627d7cc6124fec43dd1c21d102daaa xdriinfo-1.0.4.tar.bz2
1fc5c1a035d1adf024c1371de2709748074786d2 mesa-demos-20210504.tar.bz2

6
gating.yaml Normal file
View File

@ -0,0 +1,6 @@
--- !Policy
product_versions:
- rhel-9
decision_context: osci_compose_gate
rules:
- !PassingTestCaseRule {test_case_name: desktop-qe.desktop-ci.tier1-gating.functional}

View File

@ -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: 5.%{gitdate}git%{shortcommit}%{?dist}
Release: 12.%{gitdate}git%{shortcommit}%{?dist}
License: MIT
URL: http://www.mesa3d.org
#Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2
@ -19,7 +19,8 @@ Patch0: mesa-demos-8.0.1-legal.patch
Patch1: mesa-demos-as-needed.patch
# Fix xdriinfo not working with libglvnd
Patch2: xdriinfo-1.0.4-glvnd.patch
BuildRequires: gcc-c++
BuildRequires: make
BuildRequires: gcc-c++
BuildRequires: pkgconfig autoconf automake libtool
BuildRequires: freeglut-devel
BuildRequires: mesa-libGL-devel
@ -28,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
@ -73,18 +73,18 @@ autoreconf -vfi
--enable-gles2 \
--enable-libdrm \
--enable-freetype2
make %{?_smp_mflags}
%make_build
pushd ../%{xdriinfo}
%configure
make %{?_smp_mflags}
%make_build
popd
%install
make install DESTDIR=%{buildroot}
%make_install
pushd ../%{xdriinfo}
make %{?_smp_mflags} install DESTDIR=%{buildroot}
%make_install %{?_smp_mflags}
popd
install -m 0755 src/xdemos/glxgears %{buildroot}%{_bindir}
@ -113,8 +113,28 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir}
%{_bindir}/es2_info
%changelog
* Thu Jun 11 2020 Adam Jackson <ajax@redhat.com> - 8.4.0-5.20181118git1830dcb
- Rebuild for RHEL 8.3
* Mon Aug 09 2021 Mohan Boddu <mboddu@redhat.com> - 8.4.0-12.20210504git0f9e7d9
- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
Related: rhbz#1991688
* Tue May 04 2021 Adam Jackson <ajax@redhat.com> - 8.4.0-11.20210504git0f9e7d995a14f15
- Sync with upstream to drop the glew dependency
* Tue Jan 26 2021 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-9.20181118git1830dcb
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
* Wed Jul 29 2020 Tom Stellard <tstellar@redhat.com> - 8.4.0-8.20181118git1830dcb
- Use make macros
- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-7.20181118git1830dcb
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
* Wed Jan 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-6.20181118git1830dcb
- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
* Fri Oct 04 2019 Gwyn Ciesla <gwync@protonmail.com> - 8.4.0-5.20181118git1830dcb
- Rebuilt for new freeglut.
* Thu Jul 25 2019 Fedora Release Engineering <releng@fedoraproject.org> - 8.4.0-4.20181118git1830dcb
- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild

2
sources Normal file
View File

@ -0,0 +1,2 @@
SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd
SHA512 (mesa-demos-20210504.tar.bz2) = 3cc071b1aeff7acb2faa71baf3d06fa4f678644ba471be01a51967330217e18dedd3a9636ab139ff8e1488e60dd1fa79b2b70ccdc383a448043997d3668b0ef0