griffin: linux buildfixes

This commit is contained in:
Brad Parker 2019-05-22 14:07:56 -04:00
parent 725fe6197d
commit f2e15af6ba
3 changed files with 10 additions and 3 deletions

View File

@ -23,7 +23,9 @@
#include <unistd.h>
#include <X11/Xlib.h>
#ifdef HAVE_CONFIG_H
#include "../../config.h"
#endif
#ifdef HAVE_XRANDR
#include <X11/extensions/Xrandr.h>

View File

@ -53,7 +53,7 @@ typedef struct
static enum gfx_ctx_api xegl_api = GFX_CTX_NONE;
static int x_nul_handler(Display *dpy, XErrorEvent *event)
static int xegl_nul_handler(Display *dpy, XErrorEvent *event)
{
(void)dpy;
(void)event;
@ -430,7 +430,7 @@ static bool gfx_ctx_xegl_set_video_mode(void *data,
/* This can blow up on some drivers. It's not fatal,
* so override errors for this call.
*/
old_handler = XSetErrorHandler(x_nul_handler);
old_handler = XSetErrorHandler(xegl_nul_handler);
XSetInputFocus(g_x11_dpy, g_x11_win, RevertToNone, CurrentTime);
XSync(g_x11_dpy, False);
XSetErrorHandler(old_handler);

View File

@ -276,6 +276,7 @@ VIDEO CONTEXT
#if defined(HAVE_X11)
#include "../gfx/common/x11_common.c"
#include "../gfx/common/xinerama_common.c"
#include "../gfx/display_servers/dispserv_x11.c"
#ifdef HAVE_DBUS
#include "../gfx/common/dbus_common.c"
@ -588,7 +589,7 @@ INPUT
#endif
#ifdef HAVE_X11
#include "../input/common/x11_input_common.c"
#include "../input/common/input_x11_common.c"
#endif
#if defined(_WIN32) && !defined(_XBOX) && _WIN32_WINNT >= 0x0501 && !defined(__WINRT__)
@ -850,6 +851,10 @@ AUDIO
#include "../audio/drivers/tinyalsa.c"
#endif
#ifdef HAVE_PULSE
#include "../audio/drivers/pulse.c"
#endif
#ifdef HAVE_AL
#include "../audio/drivers/openal.c"
#endif