openbsd-baikal
/
openbsd-xenocara
mirror of https://github.com/openbsd/xenocara
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: openbsd-baikal:60273ffa39315fd2703b758c1966144612291b92
Branches Tags
openbsd-baikal:master
...
compare: openbsd-baikal:763e4f241a28459eb18ca0aa19e83659afc49030
Branches Tags
openbsd-baikal:master

2 Commits
60273ffa39 ... 763e4f241a

Author SHA1 Message Date
matthieu 763e4f241a fix libxcvt.pc 2023-09-06 20:36:50 +00:00
robert 09bc32815c unbreak build with clang-16 by fixing up function definitions to match 
our uint64_t is an unsinged long long, but CARD64 is defined as unsigned long
so the function pointer types in both glamor and xf86-video-amdgpu were
mismatched and clang-16 treats that as an error

ok matthieu@
 2023-09-06 11:42:37 +00:00
5 changed files with 6 additions and 6 deletions
Show Stats Expand all files Collapse all files

2
driver/xf86-video-amdgpu/src/amdgpu_present.c
View File

@ -62,7 +62,7 @@ amdgpu_present_get_crtc(WindowPtr window)
}
static int
amdgpu_present_get_ust_msc(RRCrtcPtr crtc, CARD64 *ust, CARD64 *msc)
amdgpu_present_get_ust_msc(RRCrtcPtr crtc, uint64_t *ust, uint64_t *msc)
{
xf86CrtcPtr xf86_crtc = crtc->devPrivate;
drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private;

2
driver/xf86-video-amdgpu/src/drmmode_display.h
View File

@ -284,7 +284,7 @@ Bool amdgpu_do_pageflip(ScrnInfoPtr scrn, ClientPtr client,
amdgpu_drm_abort_proc abort,
enum drmmode_flip_sync flip_sync,
uint32_t target_msc);
int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, CARD64 *ust, CARD64 *msc);
int drmmode_crtc_get_ust_msc(xf86CrtcPtr crtc, uint64_t *ust, uint64_t *msc);
int drmmode_get_current_ust(int drm_fd, CARD64 * ust);
void drmmode_crtc_set_vrr(xf86CrtcPtr crtc, Bool enabled);

4
lib/libxcvt/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.3 2022/08/07 07:29:26 matthieu Exp $
# $OpenBSD: Makefile,v 1.4 2023/09/06 20:36:50 matthieu Exp $
SUBDIR= lib cvt
@ -6,7 +6,7 @@ INCS= libxcvt.h libxcvt_mode.h
PACKAGE_VERSION= 0.1.2
PKGCONFIG= libxcvt.pc
EXTRA_PKGCONFIG_SUBST= -e 's/@VERSION@/${PACKAGE_VERSION}/'
obj: _xenocara_obj

2
xserver/glamor/glamor.h
View File

@ -276,7 +276,7 @@ extern _X_EXPORT PixmapPtr glamor_pixmap_from_fds(ScreenPtr screen,
const CARD32 *offsets,
CARD8 depth,
CARD8 bpp,
uint64_t modifier);
CARD64 modifier);
/* @glamor_pixmap_from_fd: Creates a pixmap to wrap a dma-buf fd.
*

2
xserver/glamor/glamor_egl.c
View File

@ -552,7 +552,7 @@ glamor_pixmap_from_fds(ScreenPtr screen,
CARD16 width, CARD16 height,
const CARD32 *strides, const CARD32 *offsets,
CARD8 depth, CARD8 bpp,
uint64_t modifier)
CARD64 modifier)
{
PixmapPtr pixmap;
struct glamor_egl_screen_private *glamor_egl;