diff --git a/mesa-demos-20210504.tar.bz2 b/mesa-demos-20210504.tar.bz2 deleted file mode 100644 index 38420dd..0000000 Binary files a/mesa-demos-20210504.tar.bz2 and /dev/null differ 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-8.5.0.tar.bz2 b/mesa-demos-8.5.0.tar.bz2 new file mode 100644 index 0000000..1f2f245 Binary files /dev/null and b/mesa-demos-8.5.0.tar.bz2 differ 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 0a6e7ce..b2ef2a6 100644 --- a/mesa-demos.spec +++ b/mesa-demos.spec @@ -1,21 +1,22 @@ Name: mesa-demos -Version: 8.4.0 +Version: 8.5.0 Release: 1 Summary: Demo applications for testing Mesa License: MIT URL: http://www.mesa3d.org -Source0: %{name}-20210504.tar.bz2 +Source0: https://mesa.freedesktop.org/archive/demos/%{version}/%{name}-%{version}.tar.bz2 Source1: http://www.x.org/pub/individual/app/xdriinfo-1.0.4.tar.bz2 Source2: mesad-git-snapshot.sh -Patch0: mesa-demos-8.0.1-legal.patch -Patch1: mesa-demos-as-needed.patch +Patch0: mesa-demos-8.5.0-legal.patch +Patch1: meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch Patch2: xdriinfo-1.0.4-glvnd.patch -BuildRequires: gcc-c++ pkgconfig autoconf automake libtool glew-devel +BuildRequires: gcc-c++ pkgconfig autoconf automake libtool BuildRequires: freeglut-devel mesa-libGL-devel mesa-libEGL-devel BuildRequires: mesa-libGLES-devel mesa-libgbm-devel libGLU-devel BuildRequires: libXext-devel +BuildRequires: meson gcc wayland-devel wayland-protocols-devel freetype-devel Provides: glxinfo glxinfo%{?__isa_bits} eglinfo es2_info Provides: glx-utils = %{version}-%{release} egl-utils = %{version}-%{release} @@ -33,8 +34,8 @@ Requires: %{name} = %{version}-%{release} This package contains some man files for %{name}. %prep -%setup -q -n %{name}-20210504 -b1 -%patch0 -p1 +%setup -q -n %{name}-%{version} -b1 +%patch0 -p1 -b .legal %patch1 -p1 cd ../xdriinfo-1.0.4 @@ -44,9 +45,17 @@ cd - rm -f src/demos/{pointblast.c,spriteblast.c} %build -autoreconf -vfi -%configure --bindir=%{_libdir}/mesa --with-system-data-files -%make_build +%meson \ + --bindir=%{_libdir}/mesa \ + -Dwith-system-data-files=true \ + -Dx11=enabled \ + -Dwayland=enabled \ + -Degl=enabled \ + -Dgles2=enabled \ + -Dlibdrm=enabled \ + -Dosmesa=disabled + +%meson_build cd ../xdriinfo-1.0.4 %configure @@ -54,17 +63,18 @@ cd ../xdriinfo-1.0.4 cd - %install -%make_install +%meson_install cd ../xdriinfo-1.0.4 %make_install cd - -install -m755 src/xdemos/{glxgears,glxinfo} %{buildroot}%{_bindir} -install -m755 src/egl/{opengl/eglinfo,opengles2/es2_info} %{buildroot}%{_bindir} +for binary_name in glxgears glxinfo eglinfo es2_info;do + find . -name $binary_name | install -m755 `xargs` %{buildroot}%{_bindir} +done %if 0%{?__isa_bits} != 0 -install -m755 src/xdemos/glxinfo %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} +find . -name glxinfo | install -m755 `xargs` %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} %endif %files @@ -76,6 +86,9 @@ install -m755 src/xdemos/glxinfo %{buildroot}%{_bindir}/glxinfo%{?__isa_bits} %{_datadir}/man/man1/xdriinfo.1* %changelog +* Wed Dec 06 2023 Ge Wang - 8.5.0-1 +- Upgrade to version 8.5.0 + * Thu Jun 16 2022 SimpleUpdate Robot - 8.4.0-1 - Upgrade to version 8.4.0 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 +