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
73 lines
2.2 KiB
Diff
73 lines
2.2 KiB
Diff
From deeaf931fe2451cd2589959368bea5c4c1bb503e Mon Sep 17 00:00:00 2001
|
|
From: "Enrico Weigelt, metux IT consult" <info@metux.net>
|
|
Date: Tue, 14 May 2024 16:31:01 +0200
|
|
Subject: [PATCH 11/15] drop compat with ancient xserver versions
|
|
|
|
We're relying on at least 1.18 now.
|
|
|
|
Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
|
|
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-voodoo/-/merge_requests/7>
|
|
---
|
|
src/compat-api.h | 41 -----------------------------------------
|
|
1 file changed, 41 deletions(-)
|
|
|
|
diff --git a/src/compat-api.h b/src/compat-api.h
|
|
index 6bc946f..2376b25 100644
|
|
--- a/src/compat-api.h
|
|
+++ b/src/compat-api.h
|
|
@@ -28,45 +28,6 @@
|
|
#ifndef COMPAT_API_H
|
|
#define COMPAT_API_H
|
|
|
|
-#ifndef GLYPH_HAS_GLYPH_PICTURE_ACCESSOR
|
|
-#define GetGlyphPicture(g, s) GlyphPicture((g))[(s)->myNum]
|
|
-#define SetGlyphPicture(g, s, p) GlyphPicture((g))[(s)->myNum] = p
|
|
-#endif
|
|
-
|
|
-#ifndef XF86_HAS_SCRN_CONV
|
|
-#define xf86ScreenToScrn(s) xf86Screens[(s)->myNum]
|
|
-#define xf86ScrnToScreen(s) screenInfo.screens[(s)->scrnIndex]
|
|
-#endif
|
|
-
|
|
-#ifndef XF86_SCRN_INTERFACE
|
|
-
|
|
-#define SCRN_ARG_TYPE int
|
|
-#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = xf86Screens[(arg1)]
|
|
-
|
|
-#define SCREEN_ARG_TYPE int
|
|
-#define SCREEN_PTR(arg1) ScreenPtr pScreen = screenInfo.screens[(arg1)]
|
|
-
|
|
-#define SCREEN_INIT_ARGS_DECL int i, ScreenPtr pScreen, int argc, char **argv
|
|
-
|
|
-#define BLOCKHANDLER_ARGS_DECL int arg, pointer blockData, pointer pTimeout, pointer pReadmask
|
|
-#define BLOCKHANDLER_ARGS arg, blockData, pTimeout, pReadmask
|
|
-
|
|
-#define CLOSE_SCREEN_ARGS_DECL int scrnIndex, ScreenPtr pScreen
|
|
-#define CLOSE_SCREEN_ARGS scrnIndex, pScreen
|
|
-
|
|
-#define ADJUST_FRAME_ARGS_DECL int arg, int x, int y, int flags
|
|
-#define ADJUST_FRAME_ARGS(arg, x, y) (arg)->scrnIndex, x, y, 0
|
|
-
|
|
-#define SWITCH_MODE_ARGS_DECL int arg, DisplayModePtr mode, int flags
|
|
-#define SWITCH_MODE_ARGS(arg, m) (arg)->scrnIndex, m, 0
|
|
-
|
|
-#define FREE_SCREEN_ARGS_DECL int arg, int flags
|
|
-
|
|
-#define VT_FUNC_ARGS_DECL int arg, int flags
|
|
-#define VT_FUNC_ARGS pScrn->scrnIndex, 0
|
|
-
|
|
-#define XF86_SCRN_ARG(x) ((x)->scrnIndex)
|
|
-#else
|
|
#define SCRN_ARG_TYPE ScrnInfoPtr
|
|
#define SCRN_INFO_PTR(arg1) ScrnInfoPtr pScrn = (arg1)
|
|
|
|
@@ -95,5 +56,3 @@
|
|
#define XF86_SCRN_ARG(x) (x)
|
|
|
|
#endif
|
|
-
|
|
-#endif
|
|
--
|
|
2.43.0
|
|
|