Skip to content

Commit

Permalink
Relax wayland and wayland-protocols version's
Browse files Browse the repository at this point in the history
Sunderland93 committed Nov 26, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent b538786 commit ea180a1
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions gfx/common/wayland/generate_wayland_protos.sh
Original file line number Diff line number Diff line change
@@ -9,8 +9,8 @@ fi

#Generate xdg-shell header and .c files
$WAYSCAN client-header $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.h
$WAYSCAN private-code $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.c
$WAYSCAN code $WAYLAND_PROTOS/stable/xdg-shell/xdg-shell.xml $OUTPUT/xdg-shell.c

#Generate idle-inhibit header and .c files
$WAYSCAN client-header $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.h
$WAYSCAN private-code $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.c
$WAYSCAN code $WAYLAND_PROTOS/unstable/idle-inhibit/idle-inhibit-unstable-v1.xml $OUTPUT/idle-inhibit-unstable-v1.c
8 changes: 4 additions & 4 deletions qb/config.libs.sh
Original file line number Diff line number Diff line change
@@ -455,9 +455,9 @@ check_pkgconf V4L2 libv4l2
check_pkgconf FREETYPE freetype2
check_pkgconf X11 x11
check_pkgconf XCB xcb
check_pkgconf WAYLAND wayland-egl 1.15
check_pkgconf WAYLAND_CURSOR wayland-cursor 1.15
check_pkgconf WAYLAND_PROTOS wayland-protocols 1.15
check_pkgconf WAYLAND wayland-egl 1.14
check_pkgconf WAYLAND_CURSOR wayland-cursor 1.14
check_pkgconf WAYLAND_PROTOS wayland-protocols 1.13
check_pkgconf XKBCOMMON xkbcommon 0.3.2
check_pkgconf DBUS dbus-1
check_pkgconf XEXT xext
@@ -474,7 +474,7 @@ check_val '' XEXT -lXext
check_val '' XF86VM -lXxf86vm

if [ "$HAVE_WAYLAND_PROTOS" = yes ] && [ "$HAVE_WAYLAND" = yes ]; then
check_pkgconf WAYLAND_SCANNER wayland-scanner 1.15
check_pkgconf WAYLAND_SCANNER wayland-scanner 1.13
./gfx/common/wayland/generate_wayland_protos.sh
else
die : 'Notice: wayland-egl or wayland-protocols not present. Skiping Wayland code paths.'

0 comments on commit ea180a1

Please sign in to comment.