开源软件构建与测试

_service:tar_scm:mesa-demos.spec Changed

@@ -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 @@
 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 @@
 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 -
 
 %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 @@
 %{_datadir}/man/man1/xdriinfo.1*
 
 %changelog
+* Wed Dec 06 2023 Ge Wang <wang__ge@126.com> - 8.5.0-1
+- Upgrade to version 8.5.0
+
 * Thu Jun 16 2022 SimpleUpdate Robot <tc@openeuler.org> - 8.4.0-1
 - Upgrade to version 8.4.0

_service:tar_scm:mesa-demos-8.0.1-legal.patch Deleted

_service:tar_scm:mesa-demos-8.5.0-legal.patch Added

_service:tar_scm:mesa-demos-as-needed.patch Deleted

_service:tar_scm:meson-Fix-DEMOS_DATA_DIR-when-with-system-data-files.patch Added

_service Changed

_service:tar_scm:mesa-demos-20210504.tar.bz2 -> _service:tar_scm:mesa-demos-8.5.0.tar.bz2 Changed

Changes of Revision 3