Merge pull request xbmc#23982 from fuzzard/depends_wayland

[tools/depends] Bump wayland related dependencies
Memphiz · Oct 22, 2023 · 5423d9b · 5423d9b
2 parents 8926df2 + 6c9eb94
commit 5423d9b
Show file tree

Hide file tree

Showing 11 changed files with 81 additions and 53 deletions.
diff --git 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
@@ -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
@@ -0,0 +1,4 @@
+LIBNAME=wayland
+VERSION=1.22.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
diff --git a/tools/depends/native/waylandpp-scanner/Makefile b/tools/depends/native/waylandpp-scanner/Makefile
@@ -1,15 +1,7 @@
-include ../../Makefile.include
+include ../../Makefile.include WAYLANDPP-SCANNER-VERSION ../../download-files.include
 PREFIX=$(NATIVEPREFIX)
 PLATFORM=$(NATIVEPLATFORM)
-DEPS =../../Makefile.include Makefile ../../download-files.include 001-fix-gcc13-build.patch
-
-# lib name, version
-LIBNAME=waylandpp
-VERSION=0.2.8
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-SHA512=bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
-include ../../download-files.include
+DEPS =../../Makefile.include Makefile WAYLANDPP-SCANNER-VERSION ../../download-files.include 001-fix-gcc13-build.patch
 
 CMAKE_OPTIONS := -DBUILD_DOCUMENTATION=OFF \
                  -DBUILD_LIBRARIES=OFF \

diff --git a/tools/depends/native/waylandpp-scanner/WAYLANDPP-SCANNER-VERSION b/tools/depends/native/waylandpp-scanner/WAYLANDPP-SCANNER-VERSION
@@ -0,0 +1,4 @@
+LIBNAME=waylandpp
+VERSION=1.0.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039
diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile
@@ -178,7 +178,7 @@ libxml2: $(ZLIB)
 libxslt: libgcrypt libxml2
 libzip: bzip2 gnutls $(ZLIB)
 mariadb: openssl $(ICONV) $(ZLIB)
-mesa: libdrm $(MESA_DEPS)
+mesa: libdrm $(MESA_DEPS) $(ZLIB)
 nettle: gmp
 openssl: $(ZLIB)
 python3: expat gettext libxml2 sqlite3 openssl libffi bzip2 xz $(ICONV)

diff --git a/tools/depends/target/wayland-protocols/Makefile b/tools/depends/target/wayland-protocols/Makefile
@@ -3,10 +3,10 @@ DEPS =Makefile ../../download-files.include
 
 # lib name, version
 LIBNAME=wayland-protocols
-VERSION=1.24
+VERSION=1.32
 SOURCE=$(LIBNAME)-$(VERSION)
 ARCHIVE=$(SOURCE).tar.xz
-SHA512=4b1122517db56f48a5fafd4bd0cb7f94faef6fdd2d80e6cec17e5a6bafbaf2f5a71b958ed12e6d13965494885c209b2fb6dd8331487b39c6f251e71f1e770a15
+SHA512=90bbd52daf342b98823ddeed04e349ae242d2eaf925ab8d603cceb36c980c83b5681bb890961e0d49584cb5c2e60a33abf8821770c6ab87956383630bd5b7966
 
 ifeq ($(PLATFORM),)
 	# Building stand-alone

diff --git a/tools/depends/target/wayland/Makefile b/tools/depends/target/wayland/Makefile
@@ -1,31 +1,51 @@
-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)
 
 
 $(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
@@ -0,0 +1,4 @@
+LIBNAME=wayland
+VERSION=1.22.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.xz
+SHA512=fb1974efc8433e97254eb83fe28974198f2b4d8246418eb3d34ce657055461e0c97bc06dd52e5066ae91bbe05bac611dc49a0937ba226ac6388d5a47241efb12
diff --git a/tools/depends/target/waylandpp/Makefile b/tools/depends/target/waylandpp/Makefile
@@ -1,12 +1,6 @@
 -include ../../Makefile.include
-DEPS =Makefile ../../download-files.include 001-fix-gcc13-build.patch
-
-# lib name, version
-LIBNAME=waylandpp
-VERSION=0.2.8
-SOURCE=$(LIBNAME)-$(VERSION)
-ARCHIVE=$(SOURCE).tar.gz
-SHA512=bf1b8a9e69b87547fc65989b9eaff88a442d8b2f01f5446cef960000b093390b1e557536837fbf38bb6d9a4f93e3985ea34c3253f94925b0f571b4606c980832
+include WAYLANDPP-VERSION ../../download-files.include
+DEPS =Makefile ../../download-files.include WAYLANDPP-VERSION 001-fix-gcc13-build.patch
 
 LIBDYLIB=$(PLATFORM)/build/libwayland-client++.so
 
@@ -31,7 +25,6 @@ endif
 CMAKE_OPTIONS := -DBUILD_DOCUMENTATION=OFF -DBUILD_LIBRARIES=ON -DBUILD_SHARED_LIBS=OFF -DBUILD_EXAMPLES=OFF $(CMAKE_OPTIONS)
 BUILDDIR = $(PLATFORM)/build
 
-include ../../download-files.include
 all: .installed-$(PLATFORM)
 
 

diff --git a/tools/depends/target/waylandpp/WAYLANDPP-VERSION b/tools/depends/target/waylandpp/WAYLANDPP-VERSION
@@ -0,0 +1,4 @@
+LIBNAME=waylandpp
+VERSION=1.0.0
+ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz
+SHA512=64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039