diff --git a/mesa-demos.spec b/mesa-demos.spec
index 912189c..895e9f4 100644
--- a/mesa-demos.spec
+++ b/mesa-demos.spec
@@ -1,6 +1,6 @@
 Name:          mesa-demos
 Version:       8.4.0
-Release:       2mamba
+Release:       3mamba
 Summary:       Demos for the Mesa GL libraries
 Group:         Applications/Graphics
 Vendor:        openmamba
@@ -14,29 +14,23 @@ Patch2:        mesa-demos-8.0.1-arm-tegra-eglut-VisualNoMask.patch
 License:       MIT
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
-BuildRequires: libGL-devel
-BuildRequires: libGLESv1-devel
-BuildRequires: libGLESv2-devel
 BuildRequires: libGLU-devel
-%ifnarch arm
-BuildRequires: libOSMesa-devel
-%endif
 BuildRequires: libX11-devel
 BuildRequires: libXau-devel
 BuildRequires: libXdmcp-devel
 BuildRequires: libXext-devel
-BuildRequires: libbsd-devel
+BuildRequires: libffi-devel
 BuildRequires: libfreeglut-devel
 BuildRequires: libgcc
 BuildRequires: libglew-devel
+BuildRequires: libglvnd-devel
+BuildRequires: libmesa-devel
 BuildRequires: libstdc++6-devel
+BuildRequires: libwayland-devel
+BuildRequires: libwayland-egl-devel
 BuildRequires: libxcb-devel
 ## AUTOBUILDREQ-END
-#BuildRequires: libGLw-devel
-#BuildRequires: libOpenVG-devel
-BuildRequires: libEGL-devel
-BuildRequires: libGL-devel >= 8.0
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
+BuildRequires: libmesa-devel
 
 %description
 Demos for the Mesa GL libraries.
@@ -45,15 +39,19 @@ Demos for the Mesa GL libraries.
 Summary:       Test and information tools for the Mesa libraries
 Group:         System/X11
 Provides:      Mesa-tools
-Obsoletes:     Mesa-tools
+Obsoletes:     Mesa-tools < 8.4.0-3mamba
 Provides:      mesa-tools
-Obsoletes:     mesa-tools
+Obsoletes:     mesa-tools < 8.4.0-3mamba
 
 %description -n mesa-tests
 Test and information tools for the Mesa libraries.
 
+%debug_package
+
 %prep
 %setup -q
+#-D -T
+#:<< _EOF
 #%patch0 -p1
 %ifarch arm
 #%patch1 -p1
@@ -61,6 +59,7 @@ Test and information tools for the Mesa libraries.
 %endif
 
 %build
+#:<< _EOF
 %configure \
    --disable-vg
 
@@ -73,8 +72,8 @@ Test and information tools for the Mesa libraries.
 
 install -D -m0755 src/egl/opengl/eglgears_x11 %{buildroot}%{_bindir}/eglgears
 install -D -m0755 src/egl/opengl/eglinfo %{buildroot}%{_bindir}/eglinfo
-install -D -m0755 src/egl/opengles1/gears_x11 %{buildroot}%{_bindir}/es1gears
-install -D -m0755 src/egl/opengles1/es1_info %{buildroot}%{_bindir}/es1_info
+#install -D -m0755 src/egl/opengles1/gears_x11 %{buildroot}%{_bindir}/es1gears
+#install -D -m0755 src/egl/opengles1/es1_info %{buildroot}%{_bindir}/es1_info
 install -D -m0755 src/egl/opengles2/es2gears_x11 %{buildroot}%{_bindir}/es2gears
 install -D -m0755 src/egl/opengles2/es2_info %{buildroot}%{_bindir}/es2_info
 
@@ -90,8 +89,6 @@ rm -f %{buildroot}%{_bindir}/clear
 %{_bindir}/glxinfo
 %{_bindir}/eglgears
 %{_bindir}/eglinfo
-%{_bindir}/es1gears
-%{_bindir}/es1_info
 %{_bindir}/es2gears
 %{_bindir}/es2_info
 
@@ -104,14 +101,15 @@ rm -f %{buildroot}%{_bindir}/clear
 %exclude %{_bindir}/glxinfo
 %exclude %{_bindir}/eglgears
 %exclude %{_bindir}/eglinfo
-%exclude %{_bindir}/es1gears
-%exclude %{_bindir}/es1_info
 %exclude %{_bindir}/es2gears
 %exclude %{_bindir}/es2_info
 %dir %{_datadir}/mesa-demos
 %{_datadir}/mesa-demos/*
 
 %changelog
+* Wed Apr 21 2021 Silvan Calarco <silvan.calarco@mambasoft.it> 8.4.0-3mamba
+- rebuilt with libmesa
+
 * Sat Aug 17 2019 Silvan Calarco <silvan.calarco@mambasoft.it> 8.4.0-2mamba
 - rebuilt