From f02b1a687e4dbb88f18b352065133e032cd901a8 Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sun, 22 Oct 2023 20:19:29 +1000 Subject: [PATCH 1/4] [tools/depends] Bump wayland 1.22.0 --- tools/depends/native/Makefile | 2 +- tools/depends/native/wayland-scanner/Makefile | 37 ++++++++------ .../wayland-scanner/WAYLAND-SCANNER-VERSION | 4 ++ tools/depends/target/wayland/Makefile | 50 +++++++++++++------ tools/depends/target/wayland/WAYLAND-VERSION | 4 ++ 5 files changed, 66 insertions(+), 31 deletions(-) create mode 100644 tools/depends/native/wayland-scanner/WAYLAND-SCANNER-VERSION create mode 100644 tools/depends/target/wayland/WAYLAND-VERSION diff --git a/tools/depends/native/Makefile b/tools/depends/native/Makefile index c0489a2119581..39cf54edaaac6 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 2cbf8d51c1cce..fc71bb30c085f 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 0000000000000..580ede5ca1ef0 --- /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 c079d9c1d6455..0a0f61612525f 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 0000000000000..580ede5ca1ef0 --- /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 From 67852064e092b102785e250b986406976ae0a5c4 Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sun, 22 Oct 2023 20:22:47 +1000 Subject: [PATCH 2/4] [tools/depends][target] Bump wayland-protocols 1.32 --- tools/depends/target/wayland-protocols/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/depends/target/wayland-protocols/Makefile b/tools/depends/target/wayland-protocols/Makefile index 0364867fdf247..e3cc1b62caf92 100644 --- 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 From 6c5607b3426e45c3c7fbf659772f9a2ac3f967bd Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sun, 22 Oct 2023 20:30:43 +1000 Subject: [PATCH 3/4] [tools/depends] Bump WaylandPP 1.0.0 --- tools/depends/native/waylandpp-scanner/Makefile | 12 ++---------- .../waylandpp-scanner/WAYLANDPP-SCANNER-VERSION | 4 ++++ tools/depends/target/waylandpp/Makefile | 11 ++--------- tools/depends/target/waylandpp/WAYLANDPP-VERSION | 4 ++++ 4 files changed, 12 insertions(+), 19 deletions(-) create mode 100644 tools/depends/native/waylandpp-scanner/WAYLANDPP-SCANNER-VERSION create mode 100644 tools/depends/target/waylandpp/WAYLANDPP-VERSION diff --git a/tools/depends/native/waylandpp-scanner/Makefile b/tools/depends/native/waylandpp-scanner/Makefile index ccfc8caa9182f..93816f47937e2 100644 --- 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 new file mode 100644 index 0000000000000..b87fb9bbe79ad --- /dev/null +++ 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/waylandpp/Makefile b/tools/depends/target/waylandpp/Makefile index 4631a4668ed67..6a4689e6f8b1e 100644 --- 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 new file mode 100644 index 0000000000000..b87fb9bbe79ad --- /dev/null +++ b/tools/depends/target/waylandpp/WAYLANDPP-VERSION @@ -0,0 +1,4 @@ +LIBNAME=waylandpp +VERSION=1.0.0 +ARCHIVE=$(LIBNAME)-$(VERSION).tar.gz +SHA512=64b59d073a0593ecf442362eb63ec0a9dfeaa1ad1d56b5955cb0c159fd01dc45e012b926811c6ca0dc12d4bb2e640eabc2e778ab7d28de2098eb694d26f01039 From 6c9eb9494726ae8768fbd53493d5599e1384098b Mon Sep 17 00:00:00 2001 From: fuzzard Date: Sun, 22 Oct 2023 20:44:17 +1000 Subject: [PATCH 4/4] [tools/depends][target] Add ZLIB dependency to mesa target --- tools/depends/target/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/depends/target/Makefile b/tools/depends/target/Makefile index b2ea61e733727..9b730b753587d 100644 --- 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)