diff --git a/xorg-drv-video-ati-19.1.0.20210510git.5eba006e4-xorg-server-21-fix-crash.patch b/xorg-drv-video-ati-19.1.0.20210510git.5eba006e4-xorg-server-21-fix-crash.patch
new file mode 100644
index 0000000..080de79
--- /dev/null
+++ b/xorg-drv-video-ati-19.1.0.20210510git.5eba006e4-xorg-server-21-fix-crash.patch
@@ -0,0 +1,27 @@
+diff --git a/src/radeon_kms.c b/src/radeon_kms.c
+index 62962d61d8ee22a02567b7125b4bb3a7f7230be4..51b00dd9b013d183bf93d7f5578014dc16c80ce8 100644
+--- a/src/radeon_kms.c
++++ b/src/radeon_kms.c
+@@ -931,6 +931,13 @@ radeon_dirty_update(ScrnInfoPtr scrn)
+ 	}
+ }
+ 
++static void
++radeonSourceValidate(DrawablePtr draw, int x, int y, int w, int h,
++		     unsigned int subWindowMode)
++{
++}
++
++
+ 
+ Bool
+ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
+@@ -993,7 +1000,7 @@ radeon_scanout_do_update(xf86CrtcPtr xf86_crtc, int scanout_id,
+ 	    SetPicturePictFilter(src, xf86_crtc->filter, xf86_crtc->params,
+ 				 xf86_crtc->nparams);
+ 
+-	pScreen->SourceValidate = NULL;
++	pScreen->SourceValidate = radeonSourceValidate;
+ 	CompositePicture(PictOpSrc,
+ 			 src, NULL, dst,
+ 			 extents.x1, extents.y1, 0, 0, extents.x1,
diff --git a/xorg-drv-video-ati.spec b/xorg-drv-video-ati.spec
index 466bdf1..030dce3 100644
--- a/xorg-drv-video-ati.spec
+++ b/xorg-drv-video-ati.spec
@@ -1,24 +1,27 @@
 %define xorg_ver %(pkg-config xorg-server --modversion|cut -d. -f 1-2)
+%define gittag %(echo %version | cut -d. -f5)
 Name:          xorg-drv-video-ati
-Version:       19.1.0
+Version:       19.1.0.20210510git.5eba006e4
 Release:       1mamba
 Summary:       ATI video driver for X.Org
 Group:         System/X11
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
-URL:           http://x.org
+URL:           https://www.x.org/wiki/
+Source:        https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati.git/master@%{gittag}/xf86-video-ati-%{version}.tar.bz2
 Source:        ftp://x.org/pub/individual/driver/xf86-video-ati-%{version}.tar.bz2
 Patch0:        xorg-drv-video-ati-6.13.2-xorg-server-1.10.patch
+Patch1:        xorg-drv-video-ati-19.1.0.20210510git.5eba006e4-xorg-server-21-fix-crash.patch
 License:       MIT
-BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 ## AUTOBUILDREQ-BEGIN
 BuildRequires: glibc-devel
 BuildRequires: libdrm-devel
+BuildRequires: libmesa-devel
 BuildRequires: libpciaccess-devel
-BuildRequires: udev-devel
+BuildRequires: libudev-devel
 ## AUTOBUILDREQ-END
-BuildRequires: xorg-server-devel >= 1.20.4
+BuildRequires: xorg-server-devel >= 21.1.3-1mamba
 BuildRequires: xorg-proto-devel
 BuildRequires: libXvMC-devel >= 1.0.2
 BuildRequires: libXrender >= 0.9.1
@@ -39,10 +42,19 @@ Requires:      xorg-server <= %{xorg_ver}.255
 %description
 ATI video driver for X.Org.
 
+%debug_package
+
 %prep
 %setup -q -n xf86-video-ati-%{version}
 #%patch0 -p1
 
+# fix a crash under Xorg-server 21.1.1
+# https://bugs.archlinux.org/task/72759
+# https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/merge_requests/9
+%patch1 -p1 -b .xorg-server-21-fix-crash
+
+NOCONFIGURE=1 ./autogen.sh
+
 %build
 %configure
 %make
@@ -61,15 +73,14 @@ ATI video driver for X.Org.
 %{_libdir}/xorg/modules/drivers/radeon_drv.la
 %{_libdir}/xorg/modules/drivers/radeon_drv.so
 %{_datadir}/X11/xorg.conf.d/10-radeon.conf
-#%{_libdir}/xorg/modules/multimedia/theatre200_drv.la
-#%{_libdir}/xorg/modules/multimedia/theatre200_drv.so
-#%{_libdir}/xorg/modules/multimedia/theatre_detect_drv.la
-#%{_libdir}/xorg/modules/multimedia/theatre_detect_drv.so
-#%{_libdir}/xorg/modules/multimedia/theatre_drv.la
-#%{_libdir}/xorg/modules/multimedia/theatre_drv.so
-%{_mandir}/man4/*.4.gz
+%{_mandir}/man4/*.4*
+%doc COPYING
 
 %changelog
+* Sat Feb 19 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 19.1.0.20210510git.5eba006e4-1mamba
+- update to 19.1.0.20210510git.5eba006e4
+- rebuilt by autoport with build requirements: xorg-server-devel>=21.1.3-1mamba
+
 * Sun Oct 20 2019 Automatic Build System <autodist@mambasoft.it> 19.1.0-1mamba
 - automatic version update by autodist