From e0748987b02625a2a20bee2a7d5443adb481d271 Mon Sep 17 00:00:00 2001 From: marmeladema Date: Sat, 30 Jul 2022 22:57:27 +0200 Subject: [PATCH] godot: update to 3.5 --- srcpkgs/apt/template | 12 +++++++++--- srcpkgs/godot/template | 8 ++++---- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/srcpkgs/apt/template b/srcpkgs/apt/template index 9e477574ead0..17f842c34843 100644 --- a/srcpkgs/apt/template +++ b/srcpkgs/apt/template @@ -1,24 +1,30 @@ # Template file for 'apt' pkgname=apt -version=2.1.12 +version=2.5.2 revision=1 build_style=cmake configure_args="-DDPKG_DATADIR=/usr/share/dpkg -DCURRENT_VENDOR=debian -DDOCBOOK_XSL=/usr/share/xsl/docbook" hostmakedepends="pkg-config docbook-xsl doxygen po4a w3m libxslt triehash" makedepends="db-devel gnutls-devel bzip2-devel liblzma-devel liblz4-devel - libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel" + libzstd-devel libseccomp-devel eudev-libudev-devel dpkg-devel gtest-devel + libgcrypt-devel xxHash-devel" +checkdepends="dpkg runit-void tar" short_desc="APT package management tools" maintainer="Elie ROUDNINSKI " license="GPL-2.0-or-later" homepage="https://salsa.debian.org/apt-team/apt" distfiles="https://github.com/Debian/apt/archive/${version}.tar.gz" -checksum=61f639d3d37a56de37263aaa22dfe8b3f8cc56b1d6d9a59a4ce4ce70fcb139e9 +checksum=6f8817f1091a9f8fd001e9b84185cd198f739391e89e3cabcc253f46c4cf9d68 case "$XBPS_TARGET_MACHINE" in *-musl) broken="error: void value not ignored as it ought to be" ;; esac +pre_check() { + export GTEST_FILTER="-FileUtlTest.GetTempDir" +} + apt-devel_package() { short_desc+=" - development files" depends="${sourcepkg}>=${version}_${revision}" diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template index c38f3f8c525a..3863b1e3ec76 100644 --- a/srcpkgs/godot/template +++ b/srcpkgs/godot/template @@ -1,6 +1,6 @@ # Template file for 'godot' pkgname=godot -version=3.4 +version=3.5 revision=1 archs="x86_64* i686* aarch64* armv7* ppc64*" wrksrc="${pkgname}-${version}-stable" @@ -9,7 +9,7 @@ build_style=scons # that already have been packaged elsewhere. # Use builtin bullet for now as it's too old in repos (needs 2.89) # Toggle to not use builtin once bullet has been updated -make_build_args="platform=x11 tools=yes target=release_debug dev=no progress=no +make_build_args="platform=x11 tools=yes target=release_debug use_llvm=yes dev=no progress=no pulseaudio=no builtin_bullet=false builtin_libpng=false builtin_libvpx=false builtin_libwebp=false builtin_libogg=false builtin_libtheora=false builtin_opus=false builtin_libvorbis=false builtin_enet=false @@ -21,13 +21,13 @@ makedepends=" libXinerama-devel libXrender-devel libXrandr-devel libX11-devel bullet-devel libpng-devel libvpx-devel libwebp-devel libogg-devel libtheora-devel opus-devel opusfile-devel libvorbis-devel libenet-devel zlib-devel mbedtls-devel - miniupnpc-devel pcre2-devel" + miniupnpc-devel pcre2-devel yasm MesaLib-devel" short_desc="Multiplatform 2D and 3D engine" maintainer="Nick Hahn " license="MIT" homepage="https://www.godotengine.org/" distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz" -checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88 +checksum=c65425e1d56a7097990f231c27c9271b7159f763dc59f0eaba9273633e59da36 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio CFLAGS+=" -fPIE -fPIC"