From 0d5d9ef2e5ab8f839e1c41ec340fd5584934b8f9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 13 Jul 2018 10:09:10 +0000 Subject: [PATCH 01/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index f509830..dc1cfc8 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.3.0 -Release: 10%{?dist} +Release: 11%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -103,6 +103,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Fri Jul 13 2018 Fedora Release Engineering - 8.3.0-11 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild + * Thu Feb 08 2018 Fedora Release Engineering - 8.3.0-10 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild From 0c212696acc427422a8de05c281ae15b65c5a036 Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Thu, 19 Jul 2018 20:56:43 +0200 Subject: [PATCH 02/36] add BuildRequires: gcc-c++ Reference: https://fedoraproject.org/wiki/Changes/Remove_GCC_from_BuildRoot --- mesa-demos.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mesa-demos.spec b/mesa-demos.spec index dc1cfc8..292a436 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -20,6 +20,7 @@ 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: pkgconfig autoconf automake libtool BuildRequires: freeglut-devel BuildRequires: mesa-libGL-devel From f33cbfa10d69287078ffd62164a2bdb03e1132d2 Mon Sep 17 00:00:00 2001 From: Nicolas Chauvet Date: Thu, 23 Aug 2018 14:03:30 +0200 Subject: [PATCH 03/36] - Rebuilt for glew 2.1.0 --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 292a436..a80979f 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.3.0 -Release: 11%{?dist} +Release: 12%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -104,6 +104,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Thu Aug 23 2018 Nicolas Chauvet - 8.3.0-12 +- Rebuilt for glew 2.1.0 + * Fri Jul 13 2018 Fedora Release Engineering - 8.3.0-11 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild From 64b21509a7029342c85828650d393ca1f59be6a6 Mon Sep 17 00:00:00 2001 From: Lyude Paul Date: Sun, 18 Nov 2018 17:03:01 -0500 Subject: [PATCH 04/36] New git snapshot --- .gitignore | 2 +- mesa-demos.spec | 11 +++++++---- sources | 2 +- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4be436f..33b0b65 100644 --- a/.gitignore +++ b/.gitignore @@ -7,4 +7,4 @@ xdriinfo-1.0.3.tar.bz2 /mesa-demos-8.2.0.tar.bz2 /mesa-demos-20151203.tar.bz2 /mesa-demos-8.3.0.tar.bz2 -/mesa-demos-20171027.tar.bz2 +/mesa-demos-20181118.tar.bz2 diff --git a/mesa-demos.spec b/mesa-demos.spec index a80979f..a6c1ae8 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -1,13 +1,13 @@ -%global gitdate 20171027 -%global gitcommit 22bc355f1b324b6ea07e063b5f20be757ea7a8e5 +%global gitdate 20181118 +%global gitcommit 1830dcb6e48c88f16d328dc4fc9fa32fe3b4956e %global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) %global xdriinfo xdriinfo-1.0.4 %global demodir %{_libdir}/mesa Summary: Mesa demos Name: mesa-demos -Version: 8.3.0 -Release: 12%{?dist} +Version: 8.4.0 +Release: 1%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -104,6 +104,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Sun Nov 18 2018 Lyude Paul - 8.4.0-1 +- New git snapshot + * Thu Aug 23 2018 Nicolas Chauvet - 8.3.0-12 - Rebuilt for glew 2.1.0 diff --git a/sources b/sources index 6934e52..2787adc 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (mesa-demos-20171027.tar.bz2) = 8af9c8e064d06a7e5f59908471f1360b0071f0ccd0633cbe1ceb641b8900f6e261fc1ff55ccbbdef4243180e23d3b1e62cfb5cff00ac4951f28f14a10c1dd337 SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd +SHA512 (mesa-demos-20181118.tar.bz2) = 7d5cde9e3656b4f844365bfa8258773cc41d2912b10a49bd92ac097adce9bcaf16d6a7990e38bf18ba42a808c3cd560e8a5123d00effd38f189df2974b96d34c From 96ed5ab5a0e77abecc6b67b423038a91d2096b45 Mon Sep 17 00:00:00 2001 From: Lyude Paul Date: Mon, 19 Nov 2018 14:41:06 -0500 Subject: [PATCH 05/36] Start using proper git version strings for rawhide --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index a6c1ae8..15ec99e 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 1%{?dist} +Release: 2.%{gitdate}git%{shortcommit}%{?dist} License: MIT Group: System Environment/Libraries URL: http://www.mesa3d.org @@ -104,6 +104,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Mon Nov 19 2018 Lyude Paul - 8.4.0-2.20181118git1830dcb +- Start using proper git version strings for rawhide + * Sun Nov 18 2018 Lyude Paul - 8.4.0-1 - New git snapshot From b9086347d440ff7c9e9c36439083aea846ec1e74 Mon Sep 17 00:00:00 2001 From: Lyude Paul Date: Mon, 19 Nov 2018 15:07:05 -0500 Subject: [PATCH 06/36] Enable building of freetype2 and wayland demos Also-it appears in order to make this continue to both build the x11 and wayland demos and not just one or the other, we need to start manually specifying the options for %configure. We probably should have been doing that from the start anyhow. --- mesa-demos.spec | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 15ec99e..9420142 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -29,6 +29,8 @@ BuildRequires: mesa-libGLES-devel BuildRequires: mesa-libgbm-devel BuildRequires: libGLU-devel BuildRequires: glew-devel +BuildRequires: wayland-devel +BuildRequires: freetype-devel %description This package provides some demo applications for testing Mesa. @@ -63,7 +65,16 @@ rm -rf src/demos/spriteblast.c %build autoreconf -vfi -%configure --bindir=%{demodir} --with-system-data-files +%configure \ + --bindir=%{demodir} \ + --with-system-data-files \ + --enable-x11 \ + --enable-wayland \ + --enable-gbm \ + --enable-egl \ + --enable-gles2 \ + --enable-libdrm \ + --enable-freetype2 make %{?_smp_mflags} pushd ../%{xdriinfo} @@ -106,6 +117,7 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %changelog * Mon Nov 19 2018 Lyude Paul - 8.4.0-2.20181118git1830dcb - Start using proper git version strings for rawhide +- Enabling building of wayland and freetype demos * Sun Nov 18 2018 Lyude Paul - 8.4.0-1 - New git snapshot From aeed90065e86c5c270c7ae509d246eeb2b36f33f Mon Sep 17 00:00:00 2001 From: Igor Gnatenko Date: Mon, 28 Jan 2019 20:17:53 +0100 Subject: [PATCH 07/36] Remove obsolete Group tag References: https://fedoraproject.org/wiki/Changes/Remove_Group_Tag --- mesa-demos.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 9420142..b3fa921 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -9,7 +9,6 @@ Name: mesa-demos Version: 8.4.0 Release: 2.%{gitdate}git%{shortcommit}%{?dist} License: MIT -Group: System Environment/Libraries URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 Source0: mesa-demos-%{gitdate}.tar.bz2 @@ -37,7 +36,6 @@ This package provides some demo applications for testing Mesa. %package -n glx-utils Summary: GLX utilities -Group: Development/Libraries Provides: glxinfo glxinfo%{?__isa_bits} %description -n glx-utils @@ -45,7 +43,6 @@ The glx-utils package provides the glxinfo and glxgears utilities. %package -n egl-utils Summary: EGL utilities -Group: Development/Libraries Provides: eglinfo es2_info %description -n egl-utils From a0ecd6c6e4bb5d20ec3147d58cff0391e653833c Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 1 Feb 2019 10:12:12 +0000 Subject: [PATCH 08/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index b3fa921..64d8dba 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 2.%{gitdate}git%{shortcommit}%{?dist} +Release: 3.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -112,6 +112,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Fri Feb 01 2019 Fedora Release Engineering - 8.4.0-3.20181118git1830dcb +- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild + * Mon Nov 19 2018 Lyude Paul - 8.4.0-2.20181118git1830dcb - Start using proper git version strings for rawhide - Enabling building of wayland and freetype demos From afe6062407044586100d82659b9125bff457cb04 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jul 2019 16:23:32 +0000 Subject: [PATCH 09/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 64d8dba..edc1bee 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 3.%{gitdate}git%{shortcommit}%{?dist} +Release: 4.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -112,6 +112,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Thu Jul 25 2019 Fedora Release Engineering - 8.4.0-4.20181118git1830dcb +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + * Fri Feb 01 2019 Fedora Release Engineering - 8.4.0-3.20181118git1830dcb - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild From af36789aa9a4c3c27be67165c2c3983dabd8ee71 Mon Sep 17 00:00:00 2001 From: Gwyn Ciesla Date: Fri, 4 Oct 2019 08:59:16 -0500 Subject: [PATCH 10/36] Rebuild for new freeglut. --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index edc1bee..ff90900 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 4.%{gitdate}git%{shortcommit}%{?dist} +Release: 5.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -112,6 +112,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Fri Oct 04 2019 Gwyn Ciesla - 8.4.0-5.20181118git1830dcb +- Rebuilt for new freeglut. + * Thu Jul 25 2019 Fedora Release Engineering - 8.4.0-4.20181118git1830dcb - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild From b4c099ec175f0a28d8a70c92393fde8e84b5120b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Wed, 29 Jan 2020 12:35:40 +0000 Subject: [PATCH 11/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index ff90900..8238c25 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 5.%{gitdate}git%{shortcommit}%{?dist} +Release: 6.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -112,6 +112,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Wed Jan 29 2020 Fedora Release Engineering - 8.4.0-6.20181118git1830dcb +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + * Fri Oct 04 2019 Gwyn Ciesla - 8.4.0-5.20181118git1830dcb - Rebuilt for new freeglut. From b35603d84e980affb47b58112aa755e99326a819 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Wed, 5 Feb 2020 11:52:08 -0500 Subject: [PATCH 12/36] Fix missing BR --- mesa-demos.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mesa-demos.spec b/mesa-demos.spec index 8238c25..7a46a6d 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -27,6 +27,7 @@ BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libGLES-devel BuildRequires: mesa-libgbm-devel BuildRequires: libGLU-devel +BuildRequires: libXext-devel BuildRequires: glew-devel BuildRequires: wayland-devel BuildRequires: freetype-devel From 1cc692c95b6259b09ed9c8f217485d337c97e5a1 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 28 Jul 2020 07:16:55 +0000 Subject: [PATCH 13/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 7a46a6d..4c0dca6 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 6.%{gitdate}git%{shortcommit}%{?dist} +Release: 7.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -113,6 +113,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Tue Jul 28 2020 Fedora Release Engineering - 8.4.0-7.20181118git1830dcb +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + * Wed Jan 29 2020 Fedora Release Engineering - 8.4.0-6.20181118git1830dcb - Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild From 5d99d51c72219c0b0592f9368386d28b7c2bf614 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Tue, 14 Jul 2020 20:49:56 +0000 Subject: [PATCH 14/36] Use make macros https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro --- mesa-demos.spec | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 4c0dca6..e0874cc 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 7.%{gitdate}git%{shortcommit}%{?dist} +Release: 8.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -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,6 +113,10 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Wed Jul 29 2020 Tom Stellard - 8.4.0-8.20181118git1830dcb +- Use make macros +- https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro + * Tue Jul 28 2020 Fedora Release Engineering - 8.4.0-7.20181118git1830dcb - Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild From dd7d62c4e7c4b7786442ffa90a435f892095fba3 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Wed, 6 Jan 2021 21:41:42 +0000 Subject: [PATCH 15/36] Add BuildRequires: make https://fedoraproject.org/wiki/Changes/Remove_make_from_BuildRoot --- mesa-demos.spec | 1 + 1 file changed, 1 insertion(+) diff --git a/mesa-demos.spec b/mesa-demos.spec index e0874cc..52180ef 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -19,6 +19,7 @@ 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: make BuildRequires: gcc-c++ BuildRequires: pkgconfig autoconf automake libtool BuildRequires: freeglut-devel From 23ec03ef5faa5a26db6e08d4b7099298e158f3f7 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Tue, 26 Jan 2021 19:39:17 +0000 Subject: [PATCH 16/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 52180ef..ba3da64 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 8.%{gitdate}git%{shortcommit}%{?dist} +Release: 9.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -114,6 +114,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Tue Jan 26 2021 Fedora Release Engineering - 8.4.0-9.20181118git1830dcb +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + * Wed Jul 29 2020 Tom Stellard - 8.4.0-8.20181118git1830dcb - Use make macros - https://fedoraproject.org/wiki/Changes/UseMakeBuildInstallMacro From 2cc60e28052b09b4607787b958805a20062a7a3c Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 4 May 2021 13:15:56 -0400 Subject: [PATCH 17/36] 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 From 0f71fbbd7f393625ecaa93b5b58172ceef85843b Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 4 May 2021 16:34:04 -0400 Subject: [PATCH 18/36] Sneaky li'l bump to hide the changelog line noise --- mesa-demos.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index b3144f5..e226104 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 10.%{gitdate}git%{shortcommit}%{?dist} +Release: 11.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -113,7 +113,7 @@ 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}) +* Tue May 04 2021 Adam Jackson - 8.4.0-11.20210504git0f9e7d995a14f15 - Sync with upstream to drop the glew dependency * Tue Jan 26 2021 Fedora Release Engineering - 8.4.0-9.20181118git1830dcb From f5b226b9e9e5f4dc7b5d803a3451537d633ee415 Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Tue, 4 May 2021 16:40:07 -0400 Subject: [PATCH 19/36] wtf man why did you delete that --- sources | 1 + 1 file changed, 1 insertion(+) diff --git a/sources b/sources index 580f21f..e1ab25d 100644 --- a/sources +++ b/sources @@ -1 +1,2 @@ +SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd SHA512 (mesa-demos-20210504.tar.bz2) = 3cc071b1aeff7acb2faa71baf3d06fa4f678644ba471be01a51967330217e18dedd3a9636ab139ff8e1488e60dd1fa79b2b70ccdc383a448043997d3668b0ef0 From 7aa64aea4a3c9935b4ecc5edefe1e834a9c27f6f Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 22 Jul 2021 14:09:14 +0000 Subject: [PATCH 20/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index e226104..092e873 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 11.%{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 @@ -113,6 +113,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Thu Jul 22 2021 Fedora Release Engineering - 8.4.0-12.20210504git0f9e7d9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + * Tue May 04 2021 Adam Jackson - 8.4.0-11.20210504git0f9e7d995a14f15 - Sync with upstream to drop the glew dependency From 5c09d1105c0cfdb3a499d4e0517d8815f518297e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jan 2022 19:06:29 +0000 Subject: [PATCH 21/36] - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 092e873..52823b8 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 12.%{gitdate}git%{shortcommit}%{?dist} +Release: 13.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -113,6 +113,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Thu Jan 20 2022 Fedora Release Engineering - 8.4.0-13.20210504git0f9e7d9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + * Thu Jul 22 2021 Fedora Release Engineering - 8.4.0-12.20210504git0f9e7d9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild From 26653091152c80db4f3eb6234df62e07d99e320e Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 21 Jul 2022 20:57:32 +0000 Subject: [PATCH 22/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 52823b8..82e44e7 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 13.%{gitdate}git%{shortcommit}%{?dist} +Release: 14.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -113,6 +113,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Thu Jul 21 2022 Fedora Release Engineering - 8.4.0-14.20210504git0f9e7d9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + * Thu Jan 20 2022 Fedora Release Engineering - 8.4.0-13.20210504git0f9e7d9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild From 616d4d5eb54b8106531eb975ac1ca5f4e9305780 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 19 Jan 2023 19:23:12 +0000 Subject: [PATCH 23/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 82e44e7..90457a8 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -7,7 +7,7 @@ Summary: Mesa demos Name: mesa-demos Version: 8.4.0 -Release: 14.%{gitdate}git%{shortcommit}%{?dist} +Release: 15.%{gitdate}git%{shortcommit}%{?dist} License: MIT URL: http://www.mesa3d.org #Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 @@ -113,6 +113,9 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Thu Jan 19 2023 Fedora Release Engineering - 8.4.0-15.20210504git0f9e7d9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + * Thu Jul 21 2022 Fedora Release Engineering - 8.4.0-14.20210504git0f9e7d9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From d6acf2835becaefd42233d5ef39b1e8e372a3e73 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Fri, 3 Feb 2023 12:23:45 +0100 Subject: [PATCH 24/36] Update to 8.5.0 Change build system to meson which was introduced in 8.5.0 and in the next releases will become the only build system for mesa-demos. Rebase patching out some demos for legal reasons. Signed-off-by: Erico Nunes --- .gitignore | 1 + mesa-demos-8.0.1-legal.patch | 19 ------ mesa-demos-8.5.0-legal.patch | 28 ++++++++ mesa-demos-as-needed.patch | 13 ---- mesa-demos.spec | 66 ++++++++++--------- ...DATA_DIR-when-with-system-data-files.patch | 29 ++++++++ sources | 2 +- 7 files changed, 94 insertions(+), 64 deletions(-) delete mode 100644 mesa-demos-8.0.1-legal.patch create mode 100644 mesa-demos-8.5.0-legal.patch delete mode 100644 mesa-demos-as-needed.patch create mode 100644 meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch diff --git a/.gitignore b/.gitignore index 229e920..350e06f 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ xdriinfo-1.0.3.tar.bz2 /mesa-demos-8.3.0.tar.bz2 /mesa-demos-20181118.tar.bz2 /mesa-demos-20210504.tar.bz2 +/mesa-demos-8.5.0.tar.bz2 diff --git a/mesa-demos-8.0.1-legal.patch b/mesa-demos-8.0.1-legal.patch deleted file mode 100644 index 9f83193..0000000 --- a/mesa-demos-8.0.1-legal.patch +++ /dev/null @@ -1,19 +0,0 @@ -diff -up mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am.legal mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am ---- mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am.legal 2013-01-08 11:24:38.805867866 -0500 -+++ mesa-demos-6eef979a5488dab01088412f88374b2ea9d615cd/src/demos/Makefile.am 2013-01-08 11:24:44.975870107 -0500 -@@ -65,7 +65,6 @@ bin_PROGRAMS = \ - multiarb \ - paltex \ - pixeltest \ -- pointblast \ - projtex \ - ray \ - readpix \ -@@ -74,7 +73,6 @@ bin_PROGRAMS = \ - shadowtex \ - singlebuffer \ - spectex \ -- spriteblast \ - stex3d \ - teapot \ - terrain \ diff --git a/mesa-demos-8.5.0-legal.patch b/mesa-demos-8.5.0-legal.patch new file mode 100644 index 0000000..dfaa6c8 --- /dev/null +++ b/mesa-demos-8.5.0-legal.patch @@ -0,0 +1,28 @@ +diff --git a/src/demos/meson.build b/src/demos/meson.build +index 8f01036b..929f5405 100644 +--- a/src/demos/meson.build ++++ b/src/demos/meson.build +@@ -28,7 +28,6 @@ progs = [ + 'copypix', + 'cubemap', + 'cuberender', +- 'dinoshade', + 'dissolve', + 'drawpix', + 'engine', +@@ -52,7 +51,6 @@ progs = [ + 'multiarb', + 'paltex', + 'pixeltest', +- 'pointblast', + 'projtex', + 'ray', + 'readpix', +@@ -61,7 +59,6 @@ progs = [ + 'shadowtex', + 'singlebuffer', + 'spectex', +- 'spriteblast', + 'stex3d', + 'teapot', + 'terrain', diff --git a/mesa-demos-as-needed.patch b/mesa-demos-as-needed.patch deleted file mode 100644 index f037f84..0000000 --- a/mesa-demos-as-needed.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -up mesa-demos-8.1.0/configure.ac.jx mesa-demos-8.1.0/configure.ac ---- mesa-demos-8.1.0/configure.ac.jx 2013-02-24 05:49:47.000000000 -0500 -+++ mesa-demos-8.1.0/configure.ac 2013-03-27 14:41:42.493936005 -0400 -@@ -267,6 +267,9 @@ cygwin*) - ;; - esac - -+dnl i am somewhat surprised this works -+DEMO_LIBS="-Wl,--as-needed $DEMO_LIBS" -+ - AC_SUBST([DEMO_CFLAGS]) - AC_SUBST([DEMO_LIBS]) - AC_SUBST([EGL_CFLAGS]) diff --git a/mesa-demos.spec b/mesa-demos.spec index 90457a8..3377815 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -1,27 +1,25 @@ -%global gitdate 20210504 -%global gitcommit 0f9e7d995a14f15666600fc8598f941b619d82fe -%global shortcommit %(c=%{gitcommit}; echo ${c:0:7}) %global xdriinfo xdriinfo-1.0.4 %global demodir %{_libdir}/mesa Summary: Mesa demos Name: mesa-demos -Version: 8.4.0 -Release: 15.%{gitdate}git%{shortcommit}%{?dist} +Version: 8.5.0 +Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org -#Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 -Source0: mesa-demos-%{gitdate}.tar.bz2 +Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 Source1: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 Source2: mesad-git-snapshot.sh -# Patch pointblast/spriteblast out of the Makefile for legal reasons -Patch0: mesa-demos-8.0.1-legal.patch -Patch1: mesa-demos-as-needed.patch +# Patch pointblast/spriteblast/dinoshade out for legal reasons +# (not in public domain) +Patch0: mesa-demos-8.5.0-legal.patch +Patch1: meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch # Fix xdriinfo not working with libglvnd Patch2: xdriinfo-1.0.4-glvnd.patch -BuildRequires: make +BuildRequires: meson +BuildRequires: gcc BuildRequires: gcc-c++ -BuildRequires: pkgconfig autoconf automake libtool +BuildRequires: pkgconfig BuildRequires: freeglut-devel BuildRequires: mesa-libGL-devel BuildRequires: mesa-libEGL-devel @@ -30,7 +28,10 @@ BuildRequires: mesa-libgbm-devel BuildRequires: libGLU-devel BuildRequires: libXext-devel BuildRequires: wayland-devel +BuildRequires: wayland-protocols-devel BuildRequires: freetype-devel +# xdriinfo still uses autotools +BuildRequires: make autoconf automake libtool %description This package provides some demo applications for testing Mesa. @@ -50,9 +51,9 @@ Provides: eglinfo es2_info The egl-utils package provides the eglinfo and es2_info utilities. %prep -%setup -q -n %{name}-%{gitdate} -b1 +%setup -q -n %{name}-%{version} -b1 %patch0 -p1 -b .legal -%patch1 -p1 -b .asneeded +%patch1 -p1 pushd ../%{xdriinfo} %patch2 -p1 popd @@ -62,18 +63,17 @@ rm -rf src/demos/pointblast.c rm -rf src/demos/spriteblast.c %build -autoreconf -vfi -%configure \ +%meson \ --bindir=%{demodir} \ - --with-system-data-files \ - --enable-x11 \ - --enable-wayland \ - --enable-gbm \ - --enable-egl \ - --enable-gles2 \ - --enable-libdrm \ - --enable-freetype2 -%make_build + -Dwith-system-data-files=true \ + -Dx11=enabled \ + -Dwayland=enabled \ + -Degl=enabled \ + -Dgles2=enabled \ + -Dlibdrm=enabled \ + -Dosmesa=disabled + +%meson_build pushd ../%{xdriinfo} %configure @@ -81,20 +81,20 @@ pushd ../%{xdriinfo} popd %install -%make_install +%meson_install pushd ../%{xdriinfo} %make_install %{?_smp_mflags} popd -install -m 0755 src/xdemos/glxgears %{buildroot}%{_bindir} -install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/xdemos/glxgears %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/xdemos/glxinfo %{buildroot}%{_bindir} %if 0%{?__isa_bits} != 0 -install -m 0755 src/xdemos/glxinfo %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} +install -m 0755 %{_vpath_builddir}/src/xdemos/glxinfo %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} %endif -install -m 0755 src/egl/opengl/eglinfo %{buildroot}%{_bindir} -install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/egl/opengl/eglinfo %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bindir} %check @@ -113,6 +113,10 @@ install -m 0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir} %{_bindir}/es2_info %changelog +* Fri Feb 03 2023 Erico Nunes - 8.5.0-1 +- Update to 8.5.0 +- Change build system to meson + * Thu Jan 19 2023 Fedora Release Engineering - 8.4.0-15.20210504git0f9e7d9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild diff --git a/meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch b/meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch new file mode 100644 index 0000000..b1d0489 --- /dev/null +++ b/meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch @@ -0,0 +1,29 @@ +From 49c89ab7a96a2ef5e3200e56d3043372e736e4c9 Mon Sep 17 00:00:00 2001 +From: Anders Kaseorg +Date: Mon, 11 Jul 2022 13:00:03 -0700 +Subject: [PATCH] meson: Fix DEMOS_DATA_DIR when with-system-data-files is + enabled + +DEMOS_DATA_DIR needs to be an absolute path with a trailing slash. + +Signed-off-by: Anders Kaseorg +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 282c3962..0c15274b 100644 +--- a/meson.build ++++ b/meson.build +@@ -29,7 +29,7 @@ null_dep = dependency('', required : false) + + demos_data_dir = '../data/' + if get_option('with-system-data-files') +- demos_data_dir = get_option('datadir') / 'mesa-demos' ++ demos_data_dir = get_option('prefix') / get_option('datadir') / 'mesa-demos/' + endif + add_project_arguments( + '-DDEMOS_DATA_DIR="@0@"'.format(demos_data_dir), +-- +2.39.1 + diff --git a/sources b/sources index e1ab25d..8634384 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd -SHA512 (mesa-demos-20210504.tar.bz2) = 3cc071b1aeff7acb2faa71baf3d06fa4f678644ba471be01a51967330217e18dedd3a9636ab139ff8e1488e60dd1fa79b2b70ccdc383a448043997d3668b0ef0 +SHA512 (mesa-demos-8.5.0.tar.bz2) = df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 From c95ecd2bd1f9d1e7456c8c7179c1ef7c0db835cc Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Mon, 27 Mar 2023 17:22:31 +0200 Subject: [PATCH 25/36] Update to 9.0.0 Signed-off-by: Erico Nunes --- .gitignore | 1 + mesa-demos.spec | 17 ++++++++--- ...DATA_DIR-when-with-system-data-files.patch | 29 ------------------- sources | 2 +- 4 files changed, 15 insertions(+), 34 deletions(-) delete mode 100644 meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch diff --git a/.gitignore b/.gitignore index 350e06f..439249b 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,4 @@ xdriinfo-1.0.3.tar.bz2 /mesa-demos-20181118.tar.bz2 /mesa-demos-20210504.tar.bz2 /mesa-demos-8.5.0.tar.bz2 +/mesa-demos-9.0.0.tar.xz diff --git a/mesa-demos.spec b/mesa-demos.spec index 3377815..28491f6 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -3,17 +3,16 @@ Summary: Mesa demos Name: mesa-demos -Version: 8.5.0 +Version: 9.0.0 Release: 1%{?dist} License: MIT URL: http://www.mesa3d.org -Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 +Source0: https://archive.mesa3d.org/demos/%{name}-%{version}.tar.xz Source1: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 Source2: mesad-git-snapshot.sh # Patch pointblast/spriteblast/dinoshade out for legal reasons # (not in public domain) Patch0: mesa-demos-8.5.0-legal.patch -Patch1: meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch # Fix xdriinfo not working with libglvnd Patch2: xdriinfo-1.0.4-glvnd.patch BuildRequires: meson @@ -21,12 +20,18 @@ BuildRequires: gcc BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: freeglut-devel +BuildRequires: glslang BuildRequires: mesa-libGL-devel BuildRequires: mesa-libEGL-devel BuildRequires: mesa-libGLES-devel BuildRequires: mesa-libgbm-devel BuildRequires: libGLU-devel BuildRequires: libXext-devel +BuildRequires: libdecor-devel +BuildRequires: libxcb-devel +BuildRequires: libxkbcommon-devel +BuildRequires: libxkbcommon-x11-devel +BuildRequires: vulkan-loader-devel BuildRequires: wayland-devel BuildRequires: wayland-protocols-devel BuildRequires: freetype-devel @@ -53,7 +58,6 @@ The egl-utils package provides the eglinfo and es2_info utilities. %prep %setup -q -n %{name}-%{version} -b1 %patch0 -p1 -b .legal -%patch1 -p1 pushd ../%{xdriinfo} %patch2 -p1 popd @@ -70,6 +74,7 @@ rm -rf src/demos/spriteblast.c -Dwayland=enabled \ -Degl=enabled \ -Dgles2=enabled \ + -Dvulkan=enabled \ -Dlibdrm=enabled \ -Dosmesa=disabled @@ -113,6 +118,10 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %{_bindir}/es2_info %changelog +* Mon Mar 27 2023 Erico Nunes - 9.0.0-1 +- Update to 9.0.0 +- Enable vulkan demos + * Fri Feb 03 2023 Erico Nunes - 8.5.0-1 - Update to 8.5.0 - Change build system to meson diff --git a/meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch b/meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch deleted file mode 100644 index b1d0489..0000000 --- a/meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 49c89ab7a96a2ef5e3200e56d3043372e736e4c9 Mon Sep 17 00:00:00 2001 -From: Anders Kaseorg -Date: Mon, 11 Jul 2022 13:00:03 -0700 -Subject: [PATCH] meson: Fix DEMOS_DATA_DIR when with-system-data-files is - enabled - -DEMOS_DATA_DIR needs to be an absolute path with a trailing slash. - -Signed-off-by: Anders Kaseorg ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 282c3962..0c15274b 100644 ---- a/meson.build -+++ b/meson.build -@@ -29,7 +29,7 @@ null_dep = dependency('', required : false) - - demos_data_dir = '../data/' - if get_option('with-system-data-files') -- demos_data_dir = get_option('datadir') / 'mesa-demos' -+ demos_data_dir = get_option('prefix') / get_option('datadir') / 'mesa-demos/' - endif - add_project_arguments( - '-DDEMOS_DATA_DIR="@0@"'.format(demos_data_dir), --- -2.39.1 - diff --git a/sources b/sources index 8634384..e43f69f 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd -SHA512 (mesa-demos-8.5.0.tar.bz2) = df6a7f09638ca389d6e8bc569e599dcc59c9aa280bcfb95976d83e5cd3edfe74bb3a31f0953956dc16faa540ee5b09990e3377e1341d836fc527e50ace6e60b8 +SHA512 (mesa-demos-9.0.0.tar.xz) = af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1 From 30fa49f5fdff5b91125672f3bbc1eef30b2251d8 Mon Sep 17 00:00:00 2001 From: Yaakov Selkowitz Date: Fri, 19 Feb 2021 00:23:08 -0500 Subject: [PATCH 26/36] Install necessary shader files (#1373299) --- mesa-demos-system-data.patch | 209 +++++++++++++++++++++++++++++++++++ mesa-demos.spec | 8 +- 2 files changed, 216 insertions(+), 1 deletion(-) create mode 100644 mesa-demos-system-data.patch diff --git a/mesa-demos-system-data.patch b/mesa-demos-system-data.patch new file mode 100644 index 0000000..ea77cea --- /dev/null +++ b/mesa-demos-system-data.patch @@ -0,0 +1,209 @@ +diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c +index 84e0367..62996fb 100644 +--- a/src/glsl/bezier.c ++++ b/src/glsl/bezier.c +@@ -13,7 +13,7 @@ + #include "glut_wrap.h" + #include "shaderutil.h" + +-static const char *filename = "bezier.geom"; ++static const char *filename = DEMOS_DATA_DIR "bezier.geom"; + + static GLuint fragShader; + static GLuint vertShader; +diff --git a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c +index 62451e9..3420066 100644 +--- a/src/glsl/blinking-teapot.c ++++ b/src/glsl/blinking-teapot.c +@@ -63,8 +63,8 @@ init_opengl (void) + exit(1); + } + +- vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); +- fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); ++ vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); ++ fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); + prog_id = LinkShaders (vshad_id, fshad_id); + + glUseProgram (prog_id); +diff --git a/src/glsl/brick.c b/src/glsl/brick.c +index 00d8349..f9f0ec7 100644 +--- a/src/glsl/brick.c ++++ b/src/glsl/brick.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH06-brick.frag"; +-static char *VertProgFile = "CH06-brick.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/bump.c b/src/glsl/bump.c +index 95ad19f..f40cba0 100644 +--- a/src/glsl/bump.c ++++ b/src/glsl/bump.c +@@ -15,9 +15,9 @@ + #include "readtex.h" + + +-static char *FragProgFile = "CH11-bumpmap.frag"; +-static char *FragTexProgFile = "CH11-bumpmaptex.frag"; +-static char *VertProgFile = "CH11-bumpmap.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; ++static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; + static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; + + /* program/shader objects */ +diff --git a/src/glsl/convolutions.c b/src/glsl/convolutions.c +index 567b358..4c681dd 100644 +--- a/src/glsl/convolutions.c ++++ b/src/glsl/convolutions.c +@@ -340,7 +340,7 @@ static void init(void) + + menuInit(); + readTexture(textureLocation); +- createProgram("convolution.vert", "convolution.frag"); ++ createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); + + glEnable(GL_TEXTURE_2D); + glClearColor(1.0, 1.0, 1.0, 1.0); +diff --git a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c +index 18b817c..6bbeffd 100644 +--- a/src/glsl/mandelbrot.c ++++ b/src/glsl/mandelbrot.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH18-mandel.frag"; +-static char *VertProgFile = "CH18-mandel.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/meson.build b/src/glsl/meson.build +index db8c613..13564a4 100644 +--- a/src/glsl/meson.build ++++ b/src/glsl/meson.build +@@ -83,3 +83,38 @@ executable( + ], + install: true + ) ++ ++glsl_data = [ ++ 'bezier.geom', ++ 'blinking-teapot.frag', ++ 'blinking-teapot.vert', ++ 'brick.shtest', ++ 'CH06-brick.frag', ++ 'CH06-brick.vert', ++ 'CH11-bumpmap.frag', ++ 'CH11-bumpmaptex.frag', ++ 'CH11-bumpmap.vert', ++ 'CH11-toyball.frag', ++ 'CH11-toyball.vert', ++ 'CH18-mandel.frag', ++ 'CH18-mandel.vert', ++ 'convolution.frag', ++ 'convolution.vert', ++ 'cubemap.frag', ++ 'mandelbrot.shtest', ++ 'multitex.frag', ++ 'multitex.shtest', ++ 'multitex.vert', ++ 'reflect.vert', ++ 'shadowtex.frag', ++ 'simple.vert', ++ 'simplex-noise.glsl', ++ 'skinning.frag', ++ 'skinning.vert', ++ 'toyball.shtest', ++] ++ ++install_data( ++ glsl_data, ++ install_dir: get_option('datadir') / 'mesa-demos' ++) +diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c +index 2f9a2fa..b51aba3 100644 +--- a/src/glsl/multitex.c ++++ b/src/glsl/multitex.c +@@ -35,8 +35,8 @@ + + static const char *Demo = "multitex"; + +-static const char *VertFile = "multitex.vert"; +-static const char *FragFile = "multitex.frag"; ++static const char *VertFile = DEMOS_DATA_DIR "multitex.vert"; ++static const char *FragFile = DEMOS_DATA_DIR "multitex.frag"; + + static const char *TexFiles[2] = + { +diff --git a/src/glsl/simplex-noise.c b/src/glsl/simplex-noise.c +index a687508..9a2a029 100644 +--- a/src/glsl/simplex-noise.c ++++ b/src/glsl/simplex-noise.c +@@ -169,7 +169,7 @@ SpecialKey(int key, int x, int y) + static void + Init(void) + { +- const char *filename = "simplex-noise.glsl"; ++ const char *filename = DEMOS_DATA_DIR "simplex-noise.glsl"; + char noiseText[10000]; + FILE *f; + int len; +diff --git a/src/glsl/skinning.c b/src/glsl/skinning.c +index b451d13..0f4e943 100644 +--- a/src/glsl/skinning.c ++++ b/src/glsl/skinning.c +@@ -20,8 +20,8 @@ + #define M_PI 3.1415926535 + #endif + +-static char *FragProgFile = "skinning.frag"; +-static char *VertProgFile = "skinning.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "skinning.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "skinning.vert"; + + /* program/shader objects */ + static GLuint fragShader; +diff --git a/src/glsl/texdemo1.c b/src/glsl/texdemo1.c +index 861d696..42308d1 100644 +--- a/src/glsl/texdemo1.c ++++ b/src/glsl/texdemo1.c +@@ -35,11 +35,11 @@ + + static const char *Demo = "texdemo1"; + +-static const char *ReflectVertFile = "reflect.vert"; +-static const char *CubeFragFile = "cubemap.frag"; ++static const char *ReflectVertFile = DEMOS_DATA_DIR "reflect.vert"; ++static const char *CubeFragFile = DEMOS_DATA_DIR "cubemap.frag"; + +-static const char *SimpleVertFile = "simple.vert"; +-static const char *SimpleTexFragFile = "shadowtex.frag"; ++static const char *SimpleVertFile = DEMOS_DATA_DIR "simple.vert"; ++static const char *SimpleTexFragFile = DEMOS_DATA_DIR "shadowtex.frag"; + + static const char *GroundImage = DEMOS_DATA_DIR "tile.rgb"; + +diff --git a/src/glsl/toyball.c b/src/glsl/toyball.c +index 17aa765..5b1f7d3 100644 +--- a/src/glsl/toyball.c ++++ b/src/glsl/toyball.c +@@ -14,8 +14,8 @@ + #include "shaderutil.h" + + +-static char *FragProgFile = "CH11-toyball.frag"; +-static char *VertProgFile = "CH11-toyball.vert"; ++static char *FragProgFile = DEMOS_DATA_DIR "CH11-toyball.frag"; ++static char *VertProgFile = DEMOS_DATA_DIR "CH11-toyball.vert"; + + /* program/shader objects */ + static GLuint fragShader; diff --git a/mesa-demos.spec b/mesa-demos.spec index 28491f6..8ce1d1f 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -4,7 +4,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 1%{?dist} +Release: 2%{?dist} License: MIT URL: http://www.mesa3d.org Source0: https://archive.mesa3d.org/demos/%{name}-%{version}.tar.xz @@ -13,6 +13,8 @@ Source2: mesad-git-snapshot.sh # Patch pointblast/spriteblast/dinoshade out for legal reasons # (not in public domain) Patch0: mesa-demos-8.5.0-legal.patch +# Install glsl demos data +Patch1: mesa-demos-system-data.patch # Fix xdriinfo not working with libglvnd Patch2: xdriinfo-1.0.4-glvnd.patch BuildRequires: meson @@ -58,6 +60,7 @@ The egl-utils package provides the eglinfo and es2_info utilities. %prep %setup -q -n %{name}-%{version} -b1 %patch0 -p1 -b .legal +%patch1 -p1 -b .systemdata pushd ../%{xdriinfo} %patch2 -p1 popd @@ -118,6 +121,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %{_bindir}/es2_info %changelog +* Tue Apr 25 2023 Yaakov Selkowitz - 9.0.0-2 +- Install all necessary shader files (#1373299) + * Mon Mar 27 2023 Erico Nunes - 9.0.0-1 - Update to 9.0.0 - Enable vulkan demos From 6b283055f3580353715815db5714fa40e5e8bb5b Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 20 Jul 2023 14:15:52 +0000 Subject: [PATCH 27/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild Signed-off-by: Fedora Release Engineering --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 8ce1d1f..54ecc5b 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -4,7 +4,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 2%{?dist} +Release: 3%{?dist} License: MIT URL: http://www.mesa3d.org Source0: https://archive.mesa3d.org/demos/%{name}-%{version}.tar.xz @@ -121,6 +121,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %{_bindir}/es2_info %changelog +* Thu Jul 20 2023 Fedora Release Engineering - 9.0.0-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + * Tue Apr 25 2023 Yaakov Selkowitz - 9.0.0-2 - Install all necessary shader files (#1373299) From 182a4271c4de2af29e74c2106857d0da8d6f33a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= Date: Thu, 7 Sep 2023 14:34:15 +0200 Subject: [PATCH 28/36] SPDX migration: license is already SPDX compatible --- mesa-demos.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/mesa-demos.spec b/mesa-demos.spec index 54ecc5b..dc8a70b 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -5,6 +5,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 Release: 3%{?dist} +# SPDX License: MIT URL: http://www.mesa3d.org Source0: https://archive.mesa3d.org/demos/%{name}-%{version}.tar.xz @@ -121,6 +122,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %{_bindir}/es2_info %changelog +* Thu Sep 07 2023 José Expósito +- SPDX migration: license is already SPDX compatible + * Thu Jul 20 2023 Fedora Release Engineering - 9.0.0-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild From 07845ceb992cd32cbb56a3894ce3d4461f13faf6 Mon Sep 17 00:00:00 2001 From: Erico Nunes Date: Tue, 3 Oct 2023 15:00:01 +0200 Subject: [PATCH 29/36] Split xdriinfo into its own package Remove xdriinfo additional source build and autotools dependencies. Signed-off-by: Erico Nunes --- mesa-demos.spec | 38 ++++++++++----------------- sources | 1 - xdriinfo-1.0.4-glvnd.patch | 54 -------------------------------------- 3 files changed, 14 insertions(+), 79 deletions(-) delete mode 100644 xdriinfo-1.0.4-glvnd.patch diff --git a/mesa-demos.spec b/mesa-demos.spec index dc8a70b..cfc450c 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -1,23 +1,18 @@ -%global xdriinfo xdriinfo-1.0.4 %global demodir %{_libdir}/mesa Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 3%{?dist} +Release: 4%{?dist} # SPDX License: MIT URL: http://www.mesa3d.org -Source0: https://archive.mesa3d.org/demos/%{name}-%{version}.tar.xz -Source1: http://www.x.org/pub/individual/app/%{xdriinfo}.tar.bz2 -Source2: mesad-git-snapshot.sh +Source: https://archive.mesa3d.org/demos/%{name}-%{version}.tar.xz # Patch pointblast/spriteblast/dinoshade out for legal reasons # (not in public domain) Patch0: mesa-demos-8.5.0-legal.patch # Install glsl demos data Patch1: mesa-demos-system-data.patch -# Fix xdriinfo not working with libglvnd -Patch2: xdriinfo-1.0.4-glvnd.patch BuildRequires: meson BuildRequires: gcc BuildRequires: gcc-c++ @@ -38,8 +33,6 @@ BuildRequires: vulkan-loader-devel BuildRequires: wayland-devel BuildRequires: wayland-protocols-devel BuildRequires: freetype-devel -# xdriinfo still uses autotools -BuildRequires: make autoconf automake libtool %description This package provides some demo applications for testing Mesa. @@ -47,6 +40,12 @@ This package provides some demo applications for testing Mesa. %package -n glx-utils Summary: GLX utilities Provides: glxinfo glxinfo%{?__isa_bits} +# mesa-demos' glx-utils used to provide xdriinfo for a long time, but that has +# always been an additional external source, so it was split into its own +# package. +# Recommend it here so that it still gets pulled at first for anyone expecting +# it to be there, but it doesn't need to be a hard requirement anymore. +Recommends: xdriinfo %description -n glx-utils The glx-utils package provides the glxinfo and glxgears utilities. @@ -59,12 +58,9 @@ Provides: eglinfo es2_info The egl-utils package provides the eglinfo and es2_info utilities. %prep -%setup -q -n %{name}-%{version} -b1 +%setup -q -n %{name}-%{version} %patch0 -p1 -b .legal %patch1 -p1 -b .systemdata -pushd ../%{xdriinfo} -%patch2 -p1 -popd # These two files are distributable, but non-free (lack of permission to modify). rm -rf src/demos/pointblast.c @@ -84,18 +80,10 @@ rm -rf src/demos/spriteblast.c %meson_build -pushd ../%{xdriinfo} -%configure -%make_build -popd - %install %meson_install -pushd ../%{xdriinfo} -%make_install %{?_smp_mflags} -popd - +mkdir -p %{buildroot}%{_bindir} install -m 0755 %{_vpath_builddir}/src/xdemos/glxgears %{buildroot}%{_bindir} install -m 0755 %{_vpath_builddir}/src/xdemos/glxinfo %{buildroot}%{_bindir} %if 0%{?__isa_bits} != 0 @@ -114,14 +102,16 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %files -n glx-utils %{_bindir}/glxinfo* %{_bindir}/glxgears -%{_bindir}/xdriinfo -%{_datadir}/man/man1/xdriinfo.1* %files -n egl-utils %{_bindir}/eglinfo %{_bindir}/es2_info %changelog +* Tue Oct 03 2023 Erico Nunes - 9.0.0-4 +- Split xdriinfo into its own package +- Remove xdriinfo additional source build and autotools dependencies + * Thu Sep 07 2023 José Expósito - SPDX migration: license is already SPDX compatible diff --git a/sources b/sources index e43f69f..5410f39 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (xdriinfo-1.0.4.tar.bz2) = 7d998d89c539dbb93c00bc0dd237e086bc3c6e91c02c251448dc6e34cc8f89b2a752ab6f1d86cfb8a0d3d4373a167c9dda2f6f817626c3c7b5cd02a58bc1e6dd SHA512 (mesa-demos-9.0.0.tar.xz) = af33ef72a521416e39d93370b2b4ccb768f08084c9e4c0aa62868210d9465c858e5cb8e5d23952295a3073946f609eb8723ee60b39dd9fb6696c4e45aafbb2c1 diff --git a/xdriinfo-1.0.4-glvnd.patch b/xdriinfo-1.0.4-glvnd.patch deleted file mode 100644 index 0dc4c0a..0000000 --- a/xdriinfo-1.0.4-glvnd.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -up xdriinfo-1.0.4/xdriinfo.c~ xdriinfo-1.0.4/xdriinfo.c ---- xdriinfo-1.0.4/xdriinfo.c~ 2009-10-16 23:39:10.000000000 +0200 -+++ xdriinfo-1.0.4/xdriinfo.c 2017-03-13 12:01:53.419636100 +0100 -@@ -101,23 +101,9 @@ int main (int argc, char *argv[]) { - return 1; - } - } -- /* if the argument to the options command is a driver name, we can handle -- * it without opening an X connection */ -- if (func == OPTIONS && screenNum == -1) { -- const char *options = (*GetDriverConfig) (funcArg); -- if (!options) { -- fprintf (stderr, -- "Driver \"%s\" is not installed or does not support configuration.\n", -- funcArg); -- return 1; -- } -- printf ("%s", options); -- if (isatty (STDOUT_FILENO)) -- printf ("\n"); -- return 0; -- } -+ - /* driver command needs a valid screen number */ -- else if (func == DRIVER && screenNum == -1) { -+ if (func == DRIVER && screenNum == -1) { - fprintf (stderr, "Invalid screen number \"%s\".\n", funcArg); - return 1; - } -@@ -135,6 +121,9 @@ int main (int argc, char *argv[]) { - return 1; - } - -+ /* Call glXGetClientString to load vendor libs on glvnd enabled systems */ -+ glXGetClientString (dpy, GLX_EXTENSIONS); -+ - switch (func) { - case NSCREENS: - printf ("%d", nScreens); -@@ -154,7 +143,13 @@ int main (int argc, char *argv[]) { - break; - } - case OPTIONS: { -- const char *name = (*GetScreenDriver) (dpy, screenNum), *options; -+ const char *name, *options; -+ -+ if (screenNum == -1) { -+ name = funcArg; -+ } else { -+ name = (*GetScreenDriver) (dpy, screenNum); -+ } - if (!name) { - fprintf (stderr, "Screen \"%d\" is not direct rendering capable.\n", - screenNum); From f6e73183f70dd143f07f5d145aede2bef3279a68 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Sun, 21 Jan 2024 07:20:59 +0000 Subject: [PATCH 30/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index cfc450c..3700601 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -3,7 +3,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 4%{?dist} +Release: 5%{?dist} # SPDX License: MIT URL: http://www.mesa3d.org @@ -108,6 +108,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %{_bindir}/es2_info %changelog +* Sun Jan 21 2024 Fedora Release Engineering - 9.0.0-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Tue Oct 03 2023 Erico Nunes - 9.0.0-4 - Split xdriinfo into its own package - Remove xdriinfo additional source build and autotools dependencies From afa18219cb46d2e9f958a5c90d0f27f98e8cf397 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 25 Jan 2024 06:13:22 +0000 Subject: [PATCH 31/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 3700601..17b1ea0 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -3,7 +3,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 5%{?dist} +Release: 6%{?dist} # SPDX License: MIT URL: http://www.mesa3d.org @@ -108,6 +108,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %{_bindir}/es2_info %changelog +* Thu Jan 25 2024 Fedora Release Engineering - 9.0.0-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + * Sun Jan 21 2024 Fedora Release Engineering - 9.0.0-5 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 5a4a684f97084ecb274750b4431ebffccfc3b334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Relvas?= Date: Mon, 1 Apr 2024 14:47:50 +0000 Subject: [PATCH 32/36] egl-utils: Provide eglgears and es2gears MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This commit adds the eglgears and es2gears demos to egl-utils, matching the glxgears demo found in glx-utils Signed-off-by: José Relvas --- mesa-demos.spec | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 17b1ea0..935727e 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -3,7 +3,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 6%{?dist} +Release: 7%{?dist} # SPDX License: MIT URL: http://www.mesa3d.org @@ -55,7 +55,7 @@ Summary: EGL utilities Provides: eglinfo es2_info %description -n egl-utils -The egl-utils package provides the eglinfo and es2_info utilities. +The egl-utils package provides the eglinfo, eglgears, es2_info and es2gears utilities. %prep %setup -q -n %{name}-%{version} @@ -91,7 +91,11 @@ install -m 0755 %{_vpath_builddir}/src/xdemos/glxinfo %{buildroot}%{_bindir}/glx %endif install -m 0755 %{_vpath_builddir}/src/egl/opengl/eglinfo %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/egl/opengl/eglgears_x11 %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/egl/opengl/eglgears_wayland %{buildroot}%{_bindir} install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2gears_x11 %{buildroot}%{_bindir} +install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2gears_wayland %{buildroot}%{_bindir} %check @@ -105,9 +109,17 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2_info %{buildroot}%{_bin %files -n egl-utils %{_bindir}/eglinfo +%{_bindir}/eglgears_x11 +%{_bindir}/eglgears_wayland %{_bindir}/es2_info +%{_bindir}/es2gears_x11 +%{_bindir}/es2gears_wayland %changelog +* Mon Apr 01 2024 José Relvas - 9.0.0-7 +- Add eglgears and es2gears (eglgears_x11,eglgears_wayland,es2gears_x11,es2gears_wayland) + to egl-utils subpackage + * Thu Jan 25 2024 Fedora Release Engineering - 9.0.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild From 4be1f64607ebd7859ca5334c482e32d902f7022d Mon Sep 17 00:00:00 2001 From: Software Management Team Date: Thu, 30 May 2024 12:46:47 +0200 Subject: [PATCH 33/36] Eliminate use of obsolete %patchN syntax (#2283636) --- mesa-demos.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 935727e..4487f9f 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -59,8 +59,8 @@ The egl-utils package provides the eglinfo, eglgears, es2_info and es2gears util %prep %setup -q -n %{name}-%{version} -%patch0 -p1 -b .legal -%patch1 -p1 -b .systemdata +%patch -P0 -p1 -b .legal +%patch -P1 -p1 -b .systemdata # These two files are distributable, but non-free (lack of permission to modify). rm -rf src/demos/pointblast.c From 1971fe19a9e523343054258c61c491fe819115c9 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 18 Jul 2024 17:12:58 +0000 Subject: [PATCH 34/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 4487f9f..63b76ff 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -3,7 +3,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 7%{?dist} +Release: 8%{?dist} # SPDX License: MIT URL: http://www.mesa3d.org @@ -116,6 +116,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2gears_wayland %{buildroo %{_bindir}/es2gears_wayland %changelog +* Thu Jul 18 2024 Fedora Release Engineering - 9.0.0-8 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + * Mon Apr 01 2024 José Relvas - 9.0.0-7 - Add eglgears and es2gears (eglgears_x11,eglgears_wayland,es2gears_x11,es2gears_wayland) to egl-utils subpackage From 8a7d70c0e727299dc568d4a3e33815b09332b885 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Fri, 17 Jan 2025 17:28:06 +0000 Subject: [PATCH 35/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index 63b76ff..e746209 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -3,7 +3,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 8%{?dist} +Release: 9%{?dist} # SPDX License: MIT URL: http://www.mesa3d.org @@ -116,6 +116,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2gears_wayland %{buildroo %{_bindir}/es2gears_wayland %changelog +* Fri Jan 17 2025 Fedora Release Engineering - 9.0.0-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + * Thu Jul 18 2024 Fedora Release Engineering - 9.0.0-8 - Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild From 9b63edc19999df9db144bbe0e66317c9bd3e2d91 Mon Sep 17 00:00:00 2001 From: Fedora Release Engineering Date: Thu, 24 Jul 2025 21:33:19 +0000 Subject: [PATCH 36/36] Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild --- mesa-demos.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/mesa-demos.spec b/mesa-demos.spec index e746209..b8184d9 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -3,7 +3,7 @@ Summary: Mesa demos Name: mesa-demos Version: 9.0.0 -Release: 9%{?dist} +Release: 10%{?dist} # SPDX License: MIT URL: http://www.mesa3d.org @@ -116,6 +116,9 @@ install -m 0755 %{_vpath_builddir}/src/egl/opengles2/es2gears_wayland %{buildroo %{_bindir}/es2gears_wayland %changelog +* Thu Jul 24 2025 Fedora Release Engineering - 9.0.0-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + * Fri Jan 17 2025 Fedora Release Engineering - 9.0.0-9 - Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild