XLibre/xf86-video-ati
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-ati.git synced 2026-03-23 17:19:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

bump minimal xorg version to 1.18

Browse Source 
1.18 was released a decade ago, so it seems reasonable stop supporting
older ones.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult
2024-05-14 13:17:31 +02:00
committed by Enrico Weigelt
parent 9c57a0cdd4
commit 6da5a33d54
8 changed files with 2 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
.gitlab-ci.yml
View File

@@ -114,7 +114,7 @@ build-gcc:
- .default_build
parallel:
matrix:
- XSERVER_VERSION: ["1.16", "1.17", "1.18", "1.19", "1.20"]
- XSERVER_VERSION: ["1.18", "1.19", "1.20"]
build-clang:
extends:
@@ -124,13 +124,3 @@ build-clang:
- XSERVER_VERSION: ["1.18", "1.19", "1.20", "21.1"]
variables:
CC: clang
build-noglamor:
extends:
- .default_build
script:
- ./autogen.sh --disable-glamor
- make -j${FDO_CI_CONCURRENT:-4} check V=1
parallel:
matrix:
- XSERVER_VERSION: ["1.13", "1.14", "1.15"]

2
conf/Makefile.am
View File

@@ -19,6 +19,4 @@
# CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
if HAS_XORG_CONF_DIR
dist_config_DATA = 10-radeon.conf
endif

30
configure.ac
View File

@@ -75,18 +75,12 @@ PKG_CHECK_MODULES(LIBDRM, [libdrm >= 2.4.89])
PKG_CHECK_MODULES(LIBDRM_RADEON, [libdrm_radeon])
# Obtain compiler/linker options for the driver dependencies
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.13 xproto fontsproto xf86driproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XORG, [xorg-server >= 1.18 xproto fontsproto xf86driproto $REQUIRED_MODULES])
PKG_CHECK_MODULES(XEXT, [xextproto >= 7.0.99.1],
HAVE_XEXTPROTO_71="yes"; AC_DEFINE(HAVE_XEXTPROTO_71, 1, [xextproto 7.1 available]),
HAVE_XEXTPROTO_71="no")
AM_CONDITIONAL(HAVE_XEXTPROTO_71, [ test "$HAVE_XEXTPROTO_71" = "yes" ])
# Section "OutputClass" is only supported as of xserver 1.16
PKG_CHECK_EXISTS([xorg-server >= 1.16],
[sysconfigdir=`$PKG_CONFIG --variable=sysconfigdir xorg-server`],
[sysconfigdir=""])
AM_CONDITIONAL(HAS_XORG_CONF_DIR, [test "x$sysconfigdir" != "x"])
# Define a configure option for an alternate X Server configuration directory
AC_ARG_WITH(xorg-conf-dir,
AS_HELP_STRING([--with-xorg-conf-dir=DIR],
@@ -155,34 +149,12 @@ else
fi
AM_CONDITIONAL(GLAMOR, test x$GLAMOR != xno)
AC_CHECK_DECL(RegionDuplicate,
[AC_DEFINE(HAVE_REGIONDUPLICATE, 1,
[Have RegionDuplicate API])], [],
[#include <xorg-server.h>
#include <regionstr.h>])
AC_CHECK_DECL(xf86CursorResetCursor,
[AC_DEFINE(HAVE_XF86_CURSOR_RESET_CURSOR, 1,
[Have xf86CursorResetCursor API])], [],
[#include <xorg-server.h>
#include <xf86Cursor.h>])
AC_CHECK_HEADERS([misyncshm.h], [], [],
[#include <X11/Xdefs.h>
#include <X11/Xfuncproto.h>
#include <xorg-server.h>
#include <screenint.h>])
AC_CHECK_HEADERS([present.h], [], [],
[#include <X11/Xmd.h>
#include <X11/Xproto.h>
#include "xorg-server.h"
#include <X11/X.h>])
AC_CHECK_HEADERS([dri3.h], [], [],
[#include <X11/Xmd.h>
#include <xorg-server.h>])
CPPFLAGS="$SAVE_CPPFLAGS"
PKG_CHECK_MODULES([PCIACCESS], [pciaccess >= 0.8.0])

19
src/radeon.h
View File

@@ -97,25 +97,6 @@
struct _SyncFence;
#ifndef HAVE_REGIONDUPLICATE
static inline RegionPtr
RegionDuplicate(RegionPtr pOld)
{
RegionPtr pNew;
pNew = RegionCreate(&pOld->extents, 0);
if (!pNew)
return NULL;
if (!RegionCopy(pNew, pOld)) {
RegionDestroy(pNew);
return NULL;
}
return pNew;
}
#endif
#ifndef MAX
#define MAX(a,b) ((a)>(b)?(a):(b))
#endif

17
src/radeon_dri3.c
View File

@@ -27,9 +27,6 @@
#endif
#include "radeon.h"
#ifdef HAVE_DRI3_H
#include "radeon_bo_gem.h"
#include "radeon_glamor.h"
#include "dri3.h"
@@ -243,17 +240,3 @@ radeon_dri3_screen_init(ScreenPtr screen)
return TRUE;
}
#else /* !HAVE_DRI3_H */
Bool
radeon_dri3_screen_init(ScreenPtr screen)
{
xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO,
"Can't initialize DRI3 because dri3.h not available at "
"build time\n");
return FALSE;
}
#endif

4
src/radeon_kms.c
View File

@@ -43,12 +43,8 @@
#include "radeon_version.h"
#include "shadow.h"
#include <xf86Priv.h>
#include "atipciids.h"
#if HAVE_PRESENT_H
#include <present.h>
#endif
/* DPMS */
#ifdef HAVE_XEXTPROTO_71

16
src/radeon_present.c
View File

@@ -27,8 +27,6 @@
#include "radeon.h"
#ifdef HAVE_PRESENT_H
#include <stdio.h>
#include <string.h>
#include <assert.h>
@@ -486,17 +484,3 @@ radeon_present_screen_init(ScreenPtr screen)
return TRUE;
}
#else /* !HAVE_PRESENT_H */
Bool
radeon_present_screen_init(ScreenPtr screen)
{
xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO,
"Present extension disabled because present.h not available at "
"build time\n");
return FALSE;
}
#endif

21
src/radeon_sync.c
View File

@@ -23,8 +23,6 @@
#include "radeon.h"
#ifdef HAVE_MISYNCSHM_H
#include "misync.h"
#include "misyncshm.h"
#include "misyncstr.h"
@@ -131,22 +129,3 @@ radeon_sync_close(ScreenPtr screen)
info->CreateFence = NULL;
}
#else /* !HAVE_MISYNCSHM_H */
Bool
radeon_sync_init(ScreenPtr screen)
{
xf86DrvMsg(xf86ScreenToScrn(screen)->scrnIndex, X_INFO,
"SYNC extension fences disabled because misyncshm.h not "
"available at build time\n");
return FALSE;
}
void
radeon_sync_close(ScreenPtr screen)
{
}
#endif