diff options
| author | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-13 15:33:30 -0700 |
|---|---|---|
| committer | Alan Coopersmith <alan.coopersmith@oracle.com> | 2024-05-13 15:33:53 -0700 |
| commit | 7814a1d2a6da9ce568848112eb663913d52d9c98 (patch) | |
| tree | 723135439188677da28f2de9af5d44e709adf721 | |
| parent | dc0167e2dd55857c0fcd3fa5813dc67ea989b8f6 (diff) | |
Raise minimum supported Xserver version to 1.18 (ABI_VIDEODRV_VERSION 20.0)
Already effectively required by use of XNFcallocarray() introduced in
xorg/xserver@b96dc999 - xserver-1.18.0, released in Nov. 2015.
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
Part-of: <https://gitlab.freedesktop.org/xorg/driver/xf86-video-dummy/-/merge_requests/10>
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/dummy_driver.c | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 2d96988..810063b 100644 --- a/configure.ac +++ b/configure.ac @@ -56,7 +56,7 @@ XORG_DRIVER_CHECK_EXT(RANDR, randrproto) XORG_DRIVER_CHECK_EXT(RENDER, renderproto) # Obtain compiler/linker options for the driver dependencies -PKG_CHECK_MODULES(XORG, [xorg-server >= 1.4.99.901] xproto fontsproto $REQUIRED_MODULES) +PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18] xproto fontsproto $REQUIRED_MODULES) # Checks for libraries. diff --git a/src/dummy_driver.c b/src/dummy_driver.c index d2fdc1d..07e49f2 100644 --- a/src/dummy_driver.c +++ b/src/dummy_driver.c @@ -1027,11 +1027,8 @@ DUMMYCreateWindow(WindowPtr pWin) return(ret); if(dPtr->prop == FALSE) { -#if GET_ABI_MAJOR(ABI_VIDEODRV_VERSION) < 8 - pWinRoot = WindowTable[DUMMYScrn->pScreen->myNum]; -#else pWinRoot = DUMMYScrn->pScreen->root; -#endif + if (! ValidAtom(VFB_PROP)) VFB_PROP = MakeAtom(VFB_PROP_NAME, strlen(VFB_PROP_NAME), 1); |