wallenstein/void-packages
1
0
Fork 0
mirror of https://github.com/void-linux/void-packages.git synced 2025-08-04 03:42:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

xf86-video-cirrus: update to 1.6.0.

Browse source
This commit is contained in:
Piraty 2025-06-26 17:28:29 +02:00
parent 1c6e0b9509
commit 3452273312
2 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
srcpkgs/xf86-video-cirrus/patches/no-vbe-non-x86.patch
View file

@ -23,10 +23,10 @@ index bd5e52f..f478eb5 100644
#include "cir.h" #include "cir.h"
#define _ALP_PRIVATE_ #define _ALP_PRIVATE_
@@ -469,7 +471,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags) @@ -457,7 +459,11 @@ AlpPreInit(ScrnInfoPtr pScrn, int flags)
int depth_flags; int depth_flags;
ClockRangePtr clockRanges; ClockRangePtr clockRanges;
char *s; const char *s;
+#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__)
xf86Int10InfoPtr pInt = NULL; xf86Int10InfoPtr pInt = NULL;
+#else +#else
@ -35,7 +35,7 @@ index bd5e52f..f478eb5 100644
if (flags & PROBE_DETECT) { if (flags & PROBE_DETECT) {
cirProbeDDC( pScrn, xf86GetEntityInfo(pScrn->entityList[0])->index ); 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 GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 12
if (!xf86IsPc98()) if (!xf86IsPc98())
#endif #endif
@ -43,7 +43,7 @@ index bd5e52f..f478eb5 100644
if (xf86LoadSubModule(pScrn, "int10")) if (xf86LoadSubModule(pScrn, "int10"))
{ {
xf86DrvMsg(pScrn->scrnIndex,X_INFO,"initializing int10\n"); 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, 0, REGION_MEM), 0x10);
PCI_WRITE_LONG(pCir->PciInfo, PCI_REGION_BASE(pCir->PciInfo, 1, REGION_MEM), 0x14); 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. * 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 _X_EXPORT void
cirProbeDDC(ScrnInfoPtr pScrn, int index) cirProbeDDC(ScrnInfoPtr pScrn, int index)
{ {
@ -73,7 +73,7 @@ index 2df4a2e..d9c2f0c 100644
vbeInfoPtr pVbe; vbeInfoPtr pVbe;
if (xf86LoadSubModule(pScrn, "vbe")) { 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); ConfiguredMonitor = vbeDoEDID(pVbe, NULL);
vbeFree(pVbe); vbeFree(pVbe);
} }
@ -83,8 +83,8 @@ diff --git src/lg_driver.c src/lg_driver.c
index 589d14e..6bc3154 100644 index 589d14e..6bc3154 100644
--- a/src/lg_driver.c --- a/src/lg_driver.c
+++ b/src/lg_driver.c +++ b/src/lg_driver.c
@@ -51,7 +51,9 @@ @@ -66,7 +66,9 @@
/* Needed by the Shadow Framebuffer */ */
#include "shadowfb.h" #include "shadowfb.h"
+#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__)
@ -93,22 +93,22 @@ index 589d14e..6bc3154 100644
#include "fb.h" #include "fb.h"
@@ -388,6 +390,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) @@ -457,6 +459,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
PCI_DEV_FUNC(pCir->PciInfo)); PCI_DEV_DEV(pCir->PciInfo), PCI_DEV_FUNC(pCir->PciInfo));
#endif #endif
+#if defined(__i386__) || defined(__x86_64__) +#if defined(__i386__) || defined(__x86_64__)
if (xf86LoadSubModule(pScrn, "int10")) { if (xf86LoadSubModule(pScrn, "int10")) {
xf86Int10InfoPtr int10InfoPtr; xf86Int10InfoPtr int10InfoPtr;
@@ -396,6 +399,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags) @@ -465,6 +468,7 @@ LgPreInit(ScrnInfoPtr pScrn, int flags)
if (int10InfoPtr) if (int10InfoPtr)
xf86FreeInt10(int10InfoPtr); xf86FreeInt10(int10InfoPtr);
} }
+#endif +#endif
/* Set pScrn->monitor */ /*
pScrn->monitor = pScrn->confScreen->monitor; * Set pScrn->monitor.
-- --
2.30.1 2.30.1

8
srcpkgs/xf86-video-cirrus/template
View file

@ -1,7 +1,7 @@
# Template file for 'xf86-video-cirrus' # Template file for 'xf86-video-cirrus'
pkgname=xf86-video-cirrus pkgname=xf86-video-cirrus
version=1.5.3 version=1.6.0
revision=9 revision=1
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="xorg-server-devel" makedepends="xorg-server-devel"
@ -10,8 +10,8 @@ short_desc="Xorg Cirrus Logic video driver"
maintainer="Orphaned <orphan@voidlinux.org>" maintainer="Orphaned <orphan@voidlinux.org>"
license="MIT" license="MIT"
homepage="http://xorg.freedesktop.org" homepage="http://xorg.freedesktop.org"
distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.bz2" distfiles="${XORG_SITE}/driver/${pkgname}-${version}.tar.xz"
checksum=edc87b20a55259126b5239b5c1ef913419eab7ded0ed12ae9ae989460d7351ab checksum=0ef3fa0083de3d9a040f11b3af38598d8405f1165b908fdd6712c30038326401
lib32disabled=yes lib32disabled=yes
LDFLAGS="-Wl,-z,lazy" LDFLAGS="-Wl,-z,lazy"