Permalink
Browse files

Merge pull request #3458 from smspillaz/fix-14644-14645

Some simple wayland build fixes for newer mesa versions
  • Loading branch information...
2 parents 58d04ec + 502a6ad commit 154a2613102c04c16f1e40e4267d1157736edfa8 @MartijnKaijser MartijnKaijser committed Oct 27, 2013
Showing with 2 additions and 2 deletions.
  1. +1 −1 configure.in
  2. +1 −1 xbmc/windowing/egl/wayland/XBMCConnection.h
View
@@ -975,7 +975,7 @@ if test "$use_wayland" = "yes" && test "$host_vendor" != "apple"; then
AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl],
[INCLUDES="$INCLUDES $WAYLAND_EGL_CFLAGS";
- WAYLAND_EGL_LIBRARY_LINE=`LIBRARY=\`${PKG_CONFIG} --libs-only-l wayland-egl\`; echo ${LIBRARY:2}`
+ WAYLAND_EGL_LIBRARY_LINE=`LIBRARY=\`${PKG_CONFIG} --libs-only-l wayland-egl\`; echo ${LIBRARY:2:11}`
XB_FIND_SONAME([WAYLAND_EGL_LIBRARY], ${WAYLAND_EGL_LIBRARY_LINE})],
AC_MSG_ERROR($missing_library))
PKG_CHECK_MODULES([XKBCOMMON], [xkbcommon],
@@ -31,7 +31,7 @@ struct wl_output;
struct wl_shell;
struct wl_seat;
-typedef struct wl_egl_window * EGLNativeWindowType;
+typedef struct wl_display * EGLNativeDisplayType;
struct RESOLUTION_INFO;

0 comments on commit 154a261

Please sign in to comment.