[arch-commits] Commit in xf86-video-ati/repos (3 files)

[Andreas Radke]

    Date: Tuesday, November 16, 2021 @ 19:23:28
  Author: andyrtr
Revision: 428562

archrelease: copy trunk to testing-x86_64

Added:
  xf86-video-ati/repos/testing-x86_64/
  xf86-video-ati/repos/testing-x86_64/0001_dont_set_sourcevalidate_pointer_to_null.diff
    (from rev 428561, xf86-video-ati/trunk/0001_dont_set_sourcevalidate_pointer_to_null.diff)
  xf86-video-ati/repos/testing-x86_64/PKGBUILD
    (from rev 428561, xf86-video-ati/trunk/PKGBUILD)

---------------------------------------------------+
 0001_dont_set_sourcevalidate_pointer_to_null.diff |   27 +++++++
 PKGBUILD                                          |   72 ++++++++++++++++++++
 2 files changed, 99 insertions(+)

Copied: xf86-video-ati/repos/testing-x86_64/0001_dont_set_sourcevalidate_pointer_to_null.diff (from rev 428561, xf86-video-ati/trunk/0001_dont_set_sourcevalidate_pointer_to_null.diff)
===================================================================
--- testing-x86_64/0001_dont_set_sourcevalidate_pointer_to_null.diff	                        (rev 0)
+++ testing-x86_64/0001_dont_set_sourcevalidate_pointer_to_null.diff	2021-11-16 19:23:28 UTC (rev 428562)
@@ -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,

Copied: xf86-video-ati/repos/testing-x86_64/PKGBUILD (from rev 428561, xf86-video-ati/trunk/PKGBUILD)
===================================================================
--- testing-x86_64/PKGBUILD	                        (rev 0)
+++ testing-x86_64/PKGBUILD	2021-11-16 19:23:28 UTC (rev 428562)
@@ -0,0 +1,72 @@
+# Maintainer: AndyRTR <andyrtr at archlinux.org>
+# Contributor: Jan de Groot <jgc at archlinux.org>
+# Contributor: Alexander Baldeck <alexander at archlinux.org>
+
+pkgname=xf86-video-ati
+_commit=5eba006e4129e8015b822f9e1d2f1e613e252cda
+pkgver=19.1.0.r9.g5eba006e
+pkgrel=2
+epoch=1
+pkgdesc="X.org ati video driver"
+arch=('x86_64')
+url="https://xorg.freedesktop.org/"
+license=('custom')
+depends=('systemd-libs' 'mesa')
+makedepends=('xorg-server-devel' 'systemd' 'X-ABI-VIDEODRV_VERSION=25.2' 'git')
+conflicts=('xorg-server<21.1.1' 'X-ABI-VIDEODRV_VERSION<25' 'X-ABI-VIDEODRV_VERSION>=26')
+groups=('xorg-drivers')
+#source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2{,.sig})
+#sha512sums=('73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6'
+#            'SKIP')
+source=("${pkgname}-${pkgver}::git+https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati#commit=${_commit}"
+        0001_dont_set_sourcevalidate_pointer_to_null.diff)
+sha512sums=('SKIP'
+            'ca7c769a20e0682ca0122a8248fa79a54d2181d9554c93174a3c49638b6810951787ed5e5e7f7e0f6d091ce2a111aee4bd03108ef74af95ebea340bc0300480f')
+validpgpkeys=('B09FAF35BE914521980951145A81AF8E6ADBB200') # Michel Daenzer <michel at daenzer.net>
+
+pkgver() {
+  cd ${pkgname}*
+  # from ati-git AUR pkg
+  git describe --long | sed 's/^xf86-video-ati-//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+
+prepare() {
+  cd ${pkgname}*
+
+  # 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
+  patch -Np1 -i ../0001_dont_set_sourcevalidate_pointer_to_null.diff
+
+  NOCONFIGURE=1 ./autogen.sh
+}
+
+build() {
+  cd ${pkgname}* #-${pkgver}
+
+#  CFLAGS+=' -fcommon' # https://wiki.gentoo.org/wiki/Gcc_10_porting_notes/fno_common
+
+  # Since pacman 5.0.2-2, hardened flags are now enabled in makepkg.conf
+  # With them, module fail to load with undefined symbol.
+  # See https://bugs.archlinux.org/task/55102 / https://bugs.archlinux.org/task/54845
+  export CFLAGS=${CFLAGS/-fno-plt}
+  export CXXFLAGS=${CXXFLAGS/-fno-plt}
+  export LDFLAGS=${LDFLAGS/,-z,now}
+
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd ${pkgname}* #-${pkgver}
+  make check
+}
+
+package() {
+  cd ${pkgname}* #-${pkgver}
+
+  make "DESTDIR=${pkgdir}" install
+  install -m755 -d "${pkgdir}/usr/share/licenses/${pkgname}"
+  install -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/"
+}