summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--video/out/vo_wayland.c5
2 files changed, 6 insertions, 1 deletions
diff --git a/configure b/configure
index f6705f89a8..a613fee571 100755
--- a/configure
+++ b/configure
@@ -1702,7 +1702,7 @@ depends_on_application_services(){
fi #if darwin
-_wlver="1.2.90"
+_wlver="1.2.0"
echocheck "Wayland"
if test "$_wayland" = yes || test "$_wayland" = auto; then
_wayland="no"
diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c
index 04e3078ee8..291180e952 100644
--- a/video/out/vo_wayland.c
+++ b/video/out/vo_wayland.c
@@ -37,6 +37,7 @@
#include "video/sws_utils.h"
#include "wayland_common.h"
+#include "wayland-version.h"
#define MAX_BUFFERS 2
@@ -57,6 +58,9 @@ struct fmtentry {
static const struct fmtentry fmttable[] = {
{WL_SHM_FORMAT_ARGB8888, IMGFMT_BGRA}, // 8b 8g 8r 8a
{WL_SHM_FORMAT_XRGB8888, IMGFMT_BGR0},
+#if (WAYLAND_VERSION_MAJOR >= 1) \
+ && (WAYLAND_VERSION_MINOR >= 2) \
+ && (WAYLAND_VERSION_MICRO >= 90)
{WL_SHM_FORMAT_RGB332, IMGFMT_BGR8}, // 3b 3g 2r
{WL_SHM_FORMAT_BGR233, IMGFMT_RGB8}, // 3r 3g 3b,
{WL_SHM_FORMAT_XRGB4444, IMGFMT_BGR12_LE}, // 4b 4g 4r 4a
@@ -85,6 +89,7 @@ static const struct fmtentry fmttable[] = {
{WL_SHM_FORMAT_ABGR8888, IMGFMT_RGBA},
{WL_SHM_FORMAT_RGBA8888, IMGFMT_ABGR},
{WL_SHM_FORMAT_BGRA8888, IMGFMT_ARGB},
+#endif
};
#define MAX_FORMAT_ENTRIES (sizeof(fmttable) / sizeof(fmttable[0]))