Skip to content

Commit a617aed

Browse files
committed
wayland: implement fall backs for proxy_get_version, proxy_marshall_constructor etc for older wayland versions
1 parent e6b1a1e commit a617aed

9 files changed

Lines changed: 471 additions & 5 deletions

File tree

Makefile.common

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1307,6 +1307,10 @@ ifeq ($(HAVE_WAYLAND), 1)
13071307
DEF_FLAGS += $(LIBDECOR_CFLAGS)
13081308
endif
13091309

1310+
ifeq ($(HAVE_WAYLAND_BACKPORT),1)
1311+
DEFINES += -DHAVE_WAYLAND_BACKPORT=1
1312+
OBJ += gfx/common/wayland_common_backport.o
1313+
endif
13101314
endif
13111315

13121316
# XML

Makefile.webos

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@ HAVE_USERLAND ?= 0
136136
HAVE_WEBOS_EXTRA_PROTOS ?= 0
137137
HAVE_CORE_INFO_CACHE = 1
138138
HAVE_WAYLAND ?= 0
139+
HAVE_WAYLAND_BACKPORT ?= 1
139140

140141
OS = Linux
141142
TARGET = retroarch
@@ -340,6 +341,9 @@ ipk: prebuild $(TARGET) sdl2
340341
echo "$$APPINFO" > webos/dist/appinfo.json
341342
cp -t webos/dist -vf $(TARGET) webos/icon160.png
342343
cp -t webos/dist/lib -vf $(WEBOS_USR_LIB_DIR)/libstdc++.so.6
344+
ifeq ($(HAVE_XKBCOMMON), 1)
345+
cp -t webos/dist/lib -vf $(WEBOS_USR_LIB_DIR)/libxkbcommon.so.0
346+
endif
343347
cp -t webos/dist/lib -vf $(WEBOS_LIB_DIR)/libatomic.so.1
344348
ifeq ($(ADD_SDL2_LIB), 1)
345349
cp -t webos/dist/lib -vf SDL/lib/libSDL2-2.0.so.0

0 commit comments

Comments
 (0)