[tools/depends] Bump wayland 1.22.0

5 files changed, 66 insertions, 31 deletions

diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile
index c0489a2119..39cf54edaa 100644
--- a/tools/depends/native/Makefile
+++ b/tools/depends/native/Makefile
@@ -85,7 +85,7 @@ python3: $(EXPAT) $(LIBFFI) pkg-config zlib openssl autoconf-archive
 swig: pcre
 tar: xz automake
 TexturePacker: cmake libpng liblzo2 giflib libjpeg-turbo
-wayland-scanner: expat pkg-config
+wayland-scanner: expat ninja pkg-config
 waylandpp-scanner: cmake pugixml
 
 # python installs are not thread safe when using easy_install method.
diff --git a/tools/depends/native/wayland-scanner/Makefile b/tools/depends/native/wayland-scanner/Makefile
index 2cbf8d51c1..fc71bb30c0 100644
--- a/tools/depends/native/wayland-scanner/Makefile
+++ b/tools/depends/native/wayland-scanner/Makefile
@@ -1,30 +1,37 @@
-include ../../Makefile.include
+include ../../Makefile.include WAYLAND-SCANNER-VERSION ../../download-files.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS =../../Makefile.include Makefile ../../download-files.include
-
-APPNAME=wayland-scanner
-PROJECTNAME=wayland
-VERSION=1.17.0
-SOURCE=$(PROJECTNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-SHA512=c5051aab5ff078b368c196ecfedb33ccd961265bb914845d7ed81de361bb86ae18299575baa6c4eceb0d82cf8b495e8293f31b51d1cbc05d84af0a199ab3f946
-include ../../download-files.include
+DEPS =../../Makefile.include Makefile WAYLAND-SCANNER-VERSION ../../download-files.include
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --disable-libraries --disable-documentation --disable-dtd-validation
+CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson setup \
+	--prefix $(PREFIX) \
+	--libdir $(PREFIX)/lib \
+	--buildtype=release \
+	-Dlibraries=false \
+	-Dtests=false \
+	-Ddocumentation=false \
+	-Ddtd_validation=false
+
+export CC=$(CC_BINARY_FOR_BUILD)
+export CXX=$(CXX_BINARY_FOR_BUILD)
+export CFLAGS=$(NATIVE_CFLAGS)
+export CXXFLAGS=$(NATIVE_CXXFLAGS)
+export LDFLAGS=$(NATIVE_LDFLAGS)
+
+export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig
 
 all: .installed-$(PLATFORM)
 
-
 $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM); rm -rf build; mkdir -p build
+	cd $(PLATFORM); $(CONFIGURE) . build
 
 .installed-$(PLATFORM): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
-	$(MAKE) -C $(PLATFORM) install
+	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v
+	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v install
 	touch $@
 
 clean:
diff --git a/tools/depends/native/wayland-scanner/WAYLAND-SCANNER-VERSION b/tools/depends/native/wayland-scanner/WAYLAND-SCANNER-VERSION
new file mode 100644
index 0000000000..580ede5ca1
--- /dev/null
+++ b/tools/depends/native/wayland-scanner/WAYLAND-SCANNER-VERSION
@@ -0,0 +1,4 @@
+LIBNAME=wayland
+VERSION=1.22.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
diff --git a/tools/depends/target/wayland/Makefile b/tools/depends/target/wayland/Makefile
index c079d9c1d6..0a0f616125 100644
--- a/tools/depends/target/wayland/Makefile
+++ b/tools/depends/target/wayland/Makefile
@@ -1,16 +1,33 @@
-include ../../Makefile.include
-DEPS =../../Makefile.include Makefile ../../download-files.include
+include ../../Makefile.include WAYLAND-VERSION ../../download-files.include
+DEPS =../../Makefile.include Makefile WAYLAND-VERSION  ../../download-files.include
 
-# lib name, version
-LIBNAME=wayland
-VERSION=1.18.0
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.xz
-SHA512=e30199e30c2bbd361ee695b4f3f7a4e264f10ed8f46f2c90762b5739fc578ae757dc39aa0258d8fbf0ed418553470bccd4b2730ed9705481cfccdab5de96a8fc
-include ../../download-files.include
+MESON_BUILD_TYPE=release
+
+ifeq ($(DEBUG_BUILD), yes)
+  MESON_BUILD_TYPE=debug
+endif
 
 # configuration settings
-CONFIGURE=./configure --prefix=$(PREFIX) --with-host-scanner --disable-documentation --disable-dtd-validation
+CONFIGURE = $(NATIVEPREFIX)/bin/python3 $(NATIVEPREFIX)/bin/meson setup \
+	--prefix $(PREFIX) \
+	--libdir $(PREFIX)/lib \
+	--buildtype=$(MESON_BUILD_TYPE) \
+	-Dscanner=false \
+	-Dtests=false \
+	-Ddocumentation=false \
+	-Ddtd_validation=false
+
+ifeq ($(CROSS_COMPILING), yes)
+	CONFIGURE += --cross-file $(PREFIX)/share/cross-file.meson
+endif
+
+export CC
+export CXX
+export CFLAGS
+export CXXFLAGS
+export LDFLAGS
+
+export PKG_CONFIG_LIBDIR=$(PREFIX)/lib/pkgconfig
 
 all: .installed-$(PLATFORM)
 
@@ -18,14 +35,17 @@ all: .installed-$(PLATFORM)
 $(PLATFORM): $(DEPS) | $(TARBALLS_LOCATION)/$(ARCHIVE).$(HASH_TYPE)
 	rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM)
 	cd $(PLATFORM); $(ARCHIVE_TOOL) $(ARCHIVE_TOOL_FLAGS) $(TARBALLS_LOCATION)/$(ARCHIVE)
-	cd $(PLATFORM); $(CONFIGURE)
+	cd $(PLATFORM); rm -rf build; mkdir -p build
+	# symlink native wayland scanner pkg-config to allow meson to find
+	rm -f $(PREFIX)/lib/pkgconfig/wayland-scanner.pc
+	ln -sf $(NATIVEPREFIX)/lib/pkgconfig/wayland-scanner.pc $(PREFIX)/lib/pkgconfig/wayland-scanner.pc
+	cd $(PLATFORM); $(CONFIGURE) . build
 
 .installed-$(PLATFORM): $(PLATFORM)
-	$(MAKE) -C $(PLATFORM)
-	$(MAKE) -C $(PLATFORM) install
+	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v
+	cd $(PLATFORM)/build; $(NATIVEPREFIX)/bin/ninja -v install
 
-	# remove the target wayland scanner from the sysroot. We only want to use the native one
-	rm -f $(PREFIX)/bin/wayland-scanner
+	# symlink native wayland scanner
 	rm -f $(PREFIX)/lib/pkgconfig/wayland-scanner.pc
 	ln -sf $(NATIVEPREFIX)/lib/pkgconfig/wayland-scanner.pc $(PREFIX)/lib/pkgconfig/wayland-scanner.pc
 	touch $@
diff --git a/tools/depends/target/wayland/WAYLAND-VERSION b/tools/depends/target/wayland/WAYLAND-VERSION
new file mode 100644
index 0000000000..580ede5ca1
--- /dev/null
+++ b/tools/depends/target/wayland/WAYLAND-VERSION
@@ -0,0 +1,4 @@
+LIBNAME=wayland
+VERSION=1.22.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12