Stefan Dirsch
89f97d561d
0002-configure-Use-LT_INIT-from-libtool-2-instead-of-depr.patch 0003-Add-X.Org-s-standard-C-warning-flags-to-AM_CFLAGS.patch 0004-Quiet-Wredundant-decls-from-xorg-os.h-fallbacks-for-.patch 0005-Fix-3-Wunused-but-set-variable-warnings.patch 0006-Fix-4-Wunused-variable-warnings.patch 0007-voodoo_find_dac-doesn-t-check-device_ids-2.patch 0008-use-XNFalloc-instead-of-xnfalloc.patch 0009-use-XNFcallocarray-instead-of-xnfcalloc-macro.patch 0010-bump-minimal-xorg-version-to-1.18.patch 0011-drop-compat-with-ancient-xserver-versions.patch 0012-Drop-ifdefs-for-ABI_VIDEODRV_VERSION-6.patch 0013-Remove-XAA-support.patch 0014-drop-dead-code.patch 0015-drop-remains-of-old-compat-code.patch * latest changes to fix build against current xserver OBS-URL: https://build.opensuse.org/package/show/X11:XOrg/xf86-video-voodoo?expand=0&rev=15
32 lines
920 B
Diff
32 lines
920 B
Diff
From 014923aa853a50f9afe07d900f6bc6f006f78e91 Mon Sep 17 00:00:00 2001
|
|
From: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Date: Wed, 22 May 2024 18:51:20 -0700
|
|
Subject: [PATCH 12/15] Drop ifdefs for ABI_VIDEODRV_VERSION < 6
|
|
|
|
ABI_VIDEODRV_VERSION 6 shipped in Xserver 1.7, less than our new minimum
|
|
|
|
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
|
|
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo/-/merge_requests/8>
|
|
---
|
|
src/voodoo_driver.c | 4 ----
|
|
1 file changed, 4 deletions(-)
|
|
|
|
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
|
|
index 559fdc8..01c2710 100644
|
|
--- a/src/voodoo_driver.c
|
|
+++ b/src/voodoo_driver.c
|
|
@@ -53,10 +53,6 @@
|
|
#include "xf86Pci.h"
|
|
#include "xf86cmap.h"
|
|
#include "shadowfb.h"
|
|
-#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 6
|
|
-#include "xf86RAC.h"
|
|
-#include "xf86Resources.h"
|
|
-#endif
|
|
#include "compiler.h"
|
|
#ifdef HAVE_XAA_H
|
|
#include "xaa.h"
|
|
--
|
|
2.43.0
|
|
|