diff options
| author | Treeve Jelbert | 2021-08-03 16:38:33 +0200 |
|---|---|---|
| committer | Treeve Jelbert | 2021-08-03 16:38:33 +0200 |
| commit | 6c4ffb482120c7385254587e1f3ca7c375897ec0 (patch) | |
| tree | eded8d4af4a98929974f2e48a1e50a7973ad80e8 /xorg-driver | |
| parent | 99e4716a324024e2bec7be3faed3cf448cca7c4c (diff) | |
xf86-video-ati - fix build
Diffstat (limited to 'xorg-driver')
| -rwxr-xr-x | xorg-driver/xf86-video-ati/DEPENDS | 2 | ||||
| -rwxr-xr-x | xorg-driver/xf86-video-ati/DETAILS | 2 | ||||
| -rw-r--r-- | xorg-driver/xf86-video-ati/HISTORY | 5 | ||||
| -rwxr-xr-x[-rw-r--r--] | xorg-driver/xf86-video-ati/PRE_BUILD | 0 | ||||
| -rw-r--r-- | xorg-driver/xf86-video-ati/patches/gcc-10.patch | 25 |
5 files changed, 32 insertions, 2 deletions
diff --git a/xorg-driver/xf86-video-ati/DEPENDS b/xorg-driver/xf86-video-ati/DEPENDS index c993fd6278..6435bfc664 100755 --- a/xorg-driver/xf86-video-ati/DEPENDS +++ b/xorg-driver/xf86-video-ati/DEPENDS @@ -2,7 +2,7 @@ depends meson && depends ninja-build-system && depends xorgproto && depends -sub "RADEON" libdrm && -depends XSERVER && +depends xserver && depends libpciaccess && depends libxcb && depends -sub DRI MESA diff --git a/xorg-driver/xf86-video-ati/DETAILS b/xorg-driver/xf86-video-ati/DETAILS index c212952079..7a490fb056 100755 --- a/xorg-driver/xf86-video-ati/DETAILS +++ b/xorg-driver/xf86-video-ati/DETAILS @@ -1,5 +1,5 @@ . "$GRIMOIRE/FUNCTIONS" -. "$GRIMOIRE/MESONFUNCTIONS" +. "$GRIMOIRE/MESON_FUNCTIONS" SPELL=xf86-video-ati if [[ $XF86_VIDEO_ATI_BRANCH == scm ]]; then VERSION=$(get_scm_version) diff --git a/xorg-driver/xf86-video-ati/HISTORY b/xorg-driver/xf86-video-ati/HISTORY index 59d191882e..a0d8507368 100644 --- a/xorg-driver/xf86-video-ati/HISTORY +++ b/xorg-driver/xf86-video-ati/HISTORY @@ -1,3 +1,8 @@ +2021-08-03 Treeve Jelbert <treeve@sourcemage.org> + * DETAILS: fix typo + * gcc-10.patch: added + * DEPENDS: xserver + 2019-10-15 Treeve Jelbert <treeve@sourcemage.org> * DETAILS: version 19.1.0 diff --git a/xorg-driver/xf86-video-ati/PRE_BUILD b/xorg-driver/xf86-video-ati/PRE_BUILD index 922c0ab256..922c0ab256 100644..100755 --- a/xorg-driver/xf86-video-ati/PRE_BUILD +++ b/xorg-driver/xf86-video-ati/PRE_BUILD diff --git a/xorg-driver/xf86-video-ati/patches/gcc-10.patch b/xorg-driver/xf86-video-ati/patches/gcc-10.patch new file mode 100644 index 0000000000..64f3dd63b4 --- /dev/null +++ b/xorg-driver/xf86-video-ati/patches/gcc-10.patch @@ -0,0 +1,25 @@ +commit f223035f4ffcff2a9296d1e907a5193f8e8845a3 +Author: Adam Jackson <ajax@redhat.com> +Date: Tue Feb 4 16:38:06 2020 -0500 + + Fix link failure with gcc 10 + + Without the 'extern' this looks like a definition not just a + declaration, in every file that includes the header. gcc 10 is stricter + about this kind of multiple definition. + + Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> + +diff --git a/src/drmmode_display.h b/src/drmmode_display.h +index 96eaef0a..8cd8a0a6 100644 +--- a/src/drmmode_display.h ++++ b/src/drmmode_display.h +@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, + uint64_t *ust, uint32_t *result_seq); + + +-miPointerSpriteFuncRec drmmode_sprite_funcs; ++extern miPointerSpriteFuncRec drmmode_sprite_funcs; + + + #endif |