From 317a99e3945e3e42aa7ca20ac0aa3f0bdf979c59e5911e8f22a812965c919d10 Mon Sep 17 00:00:00 2001 From: Stefan Dirsch Date: Wed, 11 Dec 2024 16:32:57 +0000 Subject: [PATCH] - u_buildfix.patch * fixes build on i586 (hopefully) OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-voodoo?expand=0&rev=18 --- u_buildfix.patch | 12 ++++++++++++ xf86-video-voodoo.changes | 2 ++ xf86-video-voodoo.spec | 1 + 3 files changed, 15 insertions(+) create mode 100644 u_buildfix.patch diff --git a/u_buildfix.patch b/u_buildfix.patch new file mode 100644 index 0000000..70c34b3 --- /dev/null +++ b/u_buildfix.patch @@ -0,0 +1,12 @@ +diff -u -r xf86-video-voodoo-1.2.6.old/src/voodoo_hardware.c xf86-video-voodoo-1.2.6/src/voodoo_hardware.c +--- xf86-video-voodoo-1.2.6.old/src/voodoo_hardware.c 2024-12-11 17:27:10.628925000 +0100 ++++ xf86-video-voodoo-1.2.6/src/voodoo_hardware.c 2024-12-11 17:29:56.398752000 +0100 +@@ -144,7 +144,7 @@ + static void pci_enable(VoodooPtr pVoo, int wr, int dac, int fifo) + { + CARD32 x; +- PCI_READ_LONG(pVoo->PciInfo, &x, 0x40); ++ PCI_READ_LONG(pVoo->PciInfo, (uint32_t *) &x, 0x40); + x &= ~7; + x |= wr; + x |= fifo<<1; diff --git a/xf86-video-voodoo.changes b/xf86-video-voodoo.changes index 41385b7..04db1e9 100644 --- a/xf86-video-voodoo.changes +++ b/xf86-video-voodoo.changes @@ -17,6 +17,8 @@ Wed Dec 11 16:10:06 UTC 2024 - Stefan Dirsch 0014-drop-dead-code.patch 0015-drop-remains-of-old-compat-code.patch * latest changes to fix build against current xserver +- u_buildfix.patch + * fixes build on i586 (hopefully) ------------------------------------------------------------------- Sun Dec 18 15:32:28 UTC 2022 - Dirk Müller diff --git a/xf86-video-voodoo.spec b/xf86-video-voodoo.spec index ea7ecf8..0e613fb 100644 --- a/xf86-video-voodoo.spec +++ b/xf86-video-voodoo.spec @@ -41,6 +41,7 @@ Patch12: 0012-Drop-ifdefs-for-ABI_VIDEODRV_VERSION-6.patch Patch13: 0013-Remove-XAA-support.patch Patch14: 0014-drop-dead-code.patch Patch15: 0015-drop-remains-of-old-compat-code.patch +Patch20: u_buildfix.patch BuildRequires: autoconf BuildRequires: automake BuildRequires: pkgconfig