CVS commit: pkgsrc/x11/xf86-video-ati

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Tue Apr 25 19:47:59 UTC 2023

Modified Files:
        pkgsrc/x11/xf86-video-ati: Makefile distinfo
        pkgsrc/x11/xf86-video-ati/patches: patch-configure
Removed Files:
        pkgsrc/x11/xf86-video-ati/patches: patch-src_drmmode__display.c
            patch-src_radeon.h patch-src_radeon__kms.c

Log Message:
xf86-video-ati: update to 22.0.0.

Adam Jackson (1):
      Fix link failure with gcc 10

Alan Coopersmith (5):
      Build xz tarballs instead of bzip2
      Fix spelling/wording issues
      gitlab CI: enable commit & merge request checks
      gitlab CI: enable gitlab's builtin static analysis
      radeon_glamor_wrappers.c: Convert from ISO-8859-1 to UTF-8

Alexey Sheplyakov (1):
      Don't crash X server if GPU acceleration is not available

Dave Airlie (1):
      ati: cleanup terminology to use primary/secondary

Matt Turner (1):
      Bump version for 22.0.0 release

Matthieu Herrb (1):
      Don't set SourceValidate pointer to NULL

Michel Dänzer (5):
      Handle NULL fb_ptr in pixmap_get_fb
      Guard local variable priv only used with glamor
      Guard local variable info only used with glamor
      Add GitLab CI pipeline
      Only include dri.h with older versions of xserver

Niclas Zeising (1):
      Fix return value check of drmIoctl()


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/x11/xf86-video-ati/Makefile
cvs rdiff -u -r1.42 -r1.43 pkgsrc/x11/xf86-video-ati/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/xf86-video-ati/patches/patch-configure
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/xf86-video-ati/patches/patch-src_drmmode__display.c
cvs rdiff -u -r1.2 -r0 pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon.h
cvs rdiff -u -r1.6 -r0 \
    pkgsrc/x11/xf86-video-ati/patches/patch-src_radeon__kms.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/xf86-video-ati/Makefile
diff -u pkgsrc/x11/xf86-video-ati/Makefile:1.58 pkgsrc/x11/xf86-video-ati/Makefile:1.59
--- pkgsrc/x11/xf86-video-ati/Makefile:1.58     Sun Jan 29 21:18:26 2023
+++ pkgsrc/x11/xf86-video-ati/Makefile  Tue Apr 25 19:47:59 2023
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.58 2023/01/29 21:18:26 ryoon Exp $
+# $NetBSD: Makefile,v 1.59 2023/04/25 19:47:59 wiz Exp $
 
-DISTNAME=      xf86-video-ati-19.1.0
-PKGREVISION=   3
+DISTNAME=      xf86-video-ati-22.0.0
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
-EXTRACT_SUFX=  .tar.bz2
+EXTRACT_SUFX=  .tar.xz
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://xorg.freedesktop.org/
@@ -15,12 +14,10 @@ CONFIGURE_ARGS+=    --enable-dri
 
 CONFLICTS+=    xf86-video-ati6-[0-9]*
 
-USE_LIBTOOL=   YES
-GNU_CONFIGURE= YES
+USE_LIBTOOL=   yes
+GNU_CONFIGURE= yes
 USE_TOOLS+=    gmake pkg-config
 
-RELRO_SUPPORTED=       partial
-
 CONFIGURE_ARGS+=       --enable-glamor
 
 CONFIGURE_ENV.SunOS+=  DRIVER_MAN_SUFFIX=4
@@ -30,7 +27,6 @@ X11_DRV_NAME= ati
 .include "../../devel/zlib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.libdrm+= libdrm>=2.4.58
 .include "../../x11/libdrm/buildlink3.mk"
-BUILDLINK_API_DEPENDS.modular-xorg-server+=    modular-xorg-server>=1.18.1
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/xorgproto/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/x11/xf86-video-ati/distinfo
diff -u pkgsrc/x11/xf86-video-ati/distinfo:1.42 pkgsrc/x11/xf86-video-ati/distinfo:1.43
--- pkgsrc/x11/xf86-video-ati/distinfo:1.42     Tue Jul 19 11:59:05 2022
+++ pkgsrc/x11/xf86-video-ati/distinfo  Tue Apr 25 19:47:59 2023
@@ -1,9 +1,6 @@
-$NetBSD: distinfo,v 1.42 2022/07/19 11:59:05 hauke Exp $
+$NetBSD: distinfo,v 1.43 2023/04/25 19:47:59 wiz Exp $
 
-BLAKE2s (xf86-video-ati-19.1.0.tar.bz2) = 07180b71f7a5bb49dfb06a3c763120607799603ae82a79d90fd7733c45e3d8f3
-SHA512 (xf86-video-ati-19.1.0.tar.bz2) = 73a81f6c492daf2e89067fb52b3033dc0fe6841f109627ddca1aee54a45a738c8c134443753a2a2aaa2c131e1d560057ebc76351ff2304c16407df3ff568fcd6
-Size (xf86-video-ati-19.1.0.tar.bz2) = 904558 bytes
-SHA1 (patch-configure) = bdd1014b215af69c2bb837d36829e12e86eb5764
-SHA1 (patch-src_drmmode__display.c) = 70f9271286f9190f79815dd0643ad6bac78b4d66
-SHA1 (patch-src_radeon.h) = d3921c60f64e3e74633b8e7b6623eece6b0c64c5
-SHA1 (patch-src_radeon__kms.c) = 8179d6adf5fcce312c9b930a81b4b69d2931fe8f
+BLAKE2s (xf86-video-ati-22.0.0.tar.xz) = 48e5e694707c14d4d068dd4a818e79f3ef8e4a15f6438c2e497e10094785dce7
+SHA512 (xf86-video-ati-22.0.0.tar.xz) = fba9ffc7b0eeb0c369eb1a6f8ef0bb3061cfeca26bc269baf6e3d16dcd943fbf4092f1e37adfb1bc71051cee0b7a0e6fb253f0b8bcd210732ccaf99e8f2356fe
+Size (xf86-video-ati-22.0.0.tar.xz) = 755812 bytes
+SHA1 (patch-configure) = 2d4a016411764a03e5d01d574de8e72ef5b3c363

Index: pkgsrc/x11/xf86-video-ati/patches/patch-configure
diff -u pkgsrc/x11/xf86-video-ati/patches/patch-configure:1.1 pkgsrc/x11/xf86-video-ati/patches/patch-configure:1.2
--- pkgsrc/x11/xf86-video-ati/patches/patch-configure:1.1       Sun May 20 07:11:10 2018
+++ pkgsrc/x11/xf86-video-ati/patches/patch-configure   Tue Apr 25 19:47:59 2023
@@ -1,26 +1,20 @@
-$NetBSD: patch-configure,v 1.1 2018/05/20 07:11:10 wiz Exp $
+$NetBSD: patch-configure,v 1.2 2023/04/25 19:47:59 wiz Exp $
 
 Remove duplicate definitions - src/radeon.h defines these as well.
 
---- configure.orig     2018-03-15 16:21:20.000000000 +0000
+--- configure.orig     2023-04-25 18:45:20.000000000 +0000
 +++ configure
-@@ -19933,20 +19933,6 @@ $as_echo "$SYS_ENDIAN_BSWAP" >&6; }
- $as_echo "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
+@@ -21000,14 +21000,6 @@ printf "%s\n" "$SYS_ENDIAN_BSWAP" >&6; }
+ printf "%s\n" "#define USE_SYS_ENDIAN_H 1" >>confdefs.h
  
  
--cat >>confdefs.h <<_ACEOF
--#define bswap_16 ${BSWAP}16
--_ACEOF
+-printf "%s\n" "#define bswap_16 ${BSWAP}16" >>confdefs.h
 -
 -
--cat >>confdefs.h <<_ACEOF
--#define bswap_32 ${BSWAP}32
--_ACEOF
+-printf "%s\n" "#define bswap_32 ${BSWAP}32" >>confdefs.h
 -
 -
--cat >>confdefs.h <<_ACEOF
--#define bswap_64 ${BSWAP}64
--_ACEOF
+-printf "%s\n" "#define bswap_64 ${BSWAP}64" >>confdefs.h
 -
        fi
  fi