From 34522733129f20def7c349c57494844438a901be Mon Sep 17 00:00:00 2001
From: Piraty <mail@piraty.dev>
Date: Thu, 26 Jun 2025 17:28:29 +0200
Subject: [PATCH] xf86-video-cirrus: update to 1.6.0.

---
 .../patches/no-vbe-non-x86.patch              | 40 +++++++++----------
 srcpkgs/xf86-video-cirrus/template            |  8 ++--
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch b/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch
index 1908594fd22..29604d5f1b3 100644
--- a/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch
+++ b/srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch
@@ -23,19 +23,19 @@ index bd5e52f..f478eb5 100644
  
  #include "cir.h"
  #define _ALP_PRIVATE_
-@@ -469,7 +471,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -457,7 +459,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  	int depth_flags;
  	ClockRangePtr clockRanges;
- 	char *s;
+ 	const char *s;
 +#if defined(__i386__) || defined(__x86_64__)
   	xf86Int10InfoPtr pInt = NULL;
 +#else
-+    void *pInt = NULL;
++	void *pInt = NULL;
 +#endif
  
  	if (flags & PROBE_DETECT)  {
  	  cirProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index );
-@@ -528,6 +534,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -516,6 +522,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  #if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
      if (!xf86IsPc98())
  #endif
@@ -43,7 +43,7 @@ index bd5e52f..f478eb5 100644
      if (xf86LoadSubModule(pScrn, "int10"))
      {
  	xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n");
-@@ -541,6 +548,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
+@@ -529,6 +536,7 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
  	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 0, REGION_MEM), 0x10);
  	PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14);
      }
@@ -65,7 +65,7 @@ index 2df4a2e..d9c2f0c 100644
  
  /*
   * Forward definitions for the functions that make up the driver.
-@@ -428,6 +430,7 @@ CirUnmapMem(CirPtr pCir, int scrnIndex)
+@@ -386,6 +388,7 @@ CirUnmapMem(CirPtr pCir, int scrnIndex)
  _X_EXPORT void
  cirProbeDDC(ScrnInfoPtr pScrn, int index)
  {
@@ -73,7 +73,7 @@ index 2df4a2e..d9c2f0c 100644
      vbeInfoPtr pVbe;
  
      if (xf86LoadSubModule(pScrn, "vbe")) {
-@@ -435,4 +438,5 @@ cirProbeDDC(ScrnInfoPtr pScrn, int index)
+@@ -393,4 +396,5 @@ cirProbeDDC(ScrnInfoPtr pScrn, int index
          ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
  	vbeFree(pVbe);
      }
@@ -83,8 +83,8 @@ diff --git src/lg_driver.c src/lg_driver.c
 index 589d14e..6bc3154 100644
 --- a/src/lg_driver.c
 +++ b/src/lg_driver.c
-@@ -51,7 +51,9 @@
- /* Needed by the Shadow Framebuffer */
+@@ -66,7 +66,9 @@
+  */
  #include "shadowfb.h"
  
 +#if defined(__i386__) || defined(__x86_64__)
@@ -93,22 +93,22 @@ index 589d14e..6bc3154 100644
  
  #include "fb.h"
  
-@@ -388,6 +390,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 			      PCI_DEV_FUNC(pCir->PciInfo));
+@@ -457,6 +459,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+             PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo));
  #endif
  
 +#if defined(__i386__) || defined(__x86_64__)
- 	if (xf86LoadSubModule(pScrn, "int10")) {
- 	    xf86Int10InfoPtr int10InfoPtr;
- 	    
-@@ -396,6 +399,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
- 	    if (int10InfoPtr)
- 		xf86FreeInt10(int10InfoPtr);
- 	}
+     if (xf86LoadSubModule(pScrn, "int10")) {
+         xf86Int10InfoPtr int10InfoPtr;
+ 
+@@ -465,6 +468,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
+         if (int10InfoPtr)
+             xf86FreeInt10(int10InfoPtr);
+     }
 +#endif
  
- 	/* Set pScrn->monitor */
- 	pScrn->monitor = pScrn->confScreen->monitor;
+     /*
+      * Set pScrn->monitor.
 -- 
 2.30.1
 
diff --git a/srcpkgs/xf86-video-cirrus/template b/srcpkgs/xf86-video-cirrus/template
index 5d7fa672ea1..c3e6f2aece5 100644
--- a/srcpkgs/xf86-video-cirrus/template
+++ b/srcpkgs/xf86-video-cirrus/template
@@ -1,7 +1,7 @@
 # Template file for 'xf86-video-cirrus'
 pkgname=xf86-video-cirrus
-version=1.5.3
-revision=9
+version=1.6.0
+revision=1
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="xorg-server-devel"
@@ -10,8 +10,8 @@ short_desc="Xorg Cirrus Logic video driver"
 maintainer="Orphaned <orphan@voidlinux.org>"
 license="MIT"
 homepage="http://xorg.freedesktop.org"
-distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2"
-checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab
+distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.xz"
+checksum=0ef3fa0083de3d9a040f11b3af38598d8405f1165b908fdd6712c30038326401
 lib32disabled=yes
 
 LDFLAGS="-Wl,-z,lazy"