Received: from knopi.disroot.org (knopi.disroot.org [178.21.23.139]) by nld3-dev1.alpinelinux.org (Postfix) with ESMTPS id 0AFDC781048 for <~alpine/aports@lists.alpinelinux.org>; Tue, 9 Aug 2022 08:37:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by disroot.org (Postfix) with ESMTP id 0083740DC7; Tue, 9 Aug 2022 10:37:24 +0200 (CEST) X-Virus-Scanned: SPAM Filter at disroot.org Received: from knopi.disroot.org ([127.0.0.1]) by localhost (disroot.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id B6DLm89unEQX; Tue, 9 Aug 2022 10:37:22 +0200 (CEST) From: gay DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=disroot.org; s=mail; t=1660034241; bh=p12wPwRdR9rfVYUZsXpzHtUxhPbbTecSt9DGPhHC7q0=; h=From:To:Cc:Subject:Date; b=c/vEiREutu0JCkGnRILeJ35Qti+S95Q3pUsCg66ty+XGIgnpOtEf/msHWWqBZ4ZFw e4i7EYbMVmUxj4FPtoG+Hqdfjtgrv744jc6cf5VvpR47mHTMme+OgIAgmLW/rGqBBl XGNQbV0ztFVw7E4ls4iVWdaTyr6JJ2UtfFGbq6k8/kSGeHRp32dG/ZM46i7RbUVTOQ rOskld67OgQ/AjMa4kjR0GAGEfiyTkf1zH3u+F54oSn4PjeP+lAQlx5EOsxghF+MkC 1Zw7r7zFohyLnxrKDdfQle5BZWBk+AYM2bWBi+MKyUqrBJBArxOsI62svdIsyTRKHD n5s3jSuQmUSig== To: ~alpine/aports@lists.alpinelinux.org Cc: gay Subject: [PATCH] testing/godot: upgrade to 3.5 Date: Tue, 9 Aug 2022 10:37:13 +0200 Message-Id: <20220809083713.27284-1-gay@disroot.org> Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * introduce export templates; * disable pulseaudio; * don't use builtin embree; * introduce headless tools; * unblock other arches; * don't use builtin certificates; * package PNG icon too, useful where SVG icons are not supported. --- testing/godot/APKBUILD | 87 +++++++++++++++++++++++++++--------------- 1 file changed, 56 insertions(+), 31 deletions(-) diff --git a/testing/godot/APKBUILD b/testing/godot/APKBUILD index fadd481d38..6ab09e26cb 100644 --- a/testing/godot/APKBUILD +++ b/testing/godot/APKBUILD @@ -1,15 +1,17 @@ # Contributor: Díaz Urbaneja Diego # Maintainer: Díaz Urbaneja Diego pkgname=godot -pkgver=3.4.4 -pkgrel=1 +pkgver=3.5 +pkgrel=0 pkgdesc="Multi-platform 2D and 3D game engine" url="https://godotengine.org" license="MIT" -arch="armv7 x86_64" # Other architectures untested +arch="all" # Only armv7 and x86_64 are tested, give other architectures a try makedepends=" alsa-lib-dev bullet-dev + ca-certificates-bundle + embree-dev enet-dev freetype-dev libgudev-dev @@ -29,7 +31,6 @@ makedepends=" miniupnpc-dev opusfile-dev pcre2-dev - pulseaudio-dev python3-dev scons wslay-dev @@ -42,43 +43,67 @@ source="https://github.com/godotengine/godot/archive/$pkgver-stable/godot-$pkgve " options="!check" # No tests builddir="$srcdir"/godot-"$pkgver"-stable +sconsflags="builtin_bullet=false \ + builtin_certs=false \ + builtin_embree=false \ + builtin_enet=false \ + builtin_freetype=false \ + builtin_libogg=false \ + builtin_libpng=false \ + builtin_libtheora=false \ + builtin_libvorbis=false \ + builtin_libvpx=false \ + builtin_libwebp=false \ + builtin_mbedtls=false \ + builtin_miniupnpc=false \ + builtin_opus=false \ + builtin_pcre2=false \ + builtin_wslay=false \ + builtin_zlib=false \ + builtin_zstd=false \ + pulseaudio=no + " build() { - scons -j${JOBS:-1} \ - platform=linuxbsd \ - target=release_debug \ - bits=default \ - platform=x11 \ - builtin_bullet=false \ - builtin_enet=false \ - builtin_freetype=false \ - builtin_libogg=false \ - builtin_libpng=false \ - builtin_libtheora=false \ - builtin_libvorbis=false \ - builtin_libvpx=false \ - builtin_libwebp=false \ - builtin_wslay=false \ - builtin_mbedtls=false \ - builtin_miniupnpc=false \ - builtin_opus=false \ - builtin_pcre2=false \ - builtin_zlib=false \ - builtin_zstd=false + for platform in x11 server + do + for target in release release_debug + do + for tools in yes no + do + if [ "x$tools" = "xyes" ] && [ "x$target" = "xrelease" ] + then + continue + fi + scons -j${JOBS:-1} \ + platform=$platform \ + target=$target \ + tools=$tools \ + $sconsflags + done + done + done } package() { install -Dm644 misc/dist/linux/org.godotengine.Godot.desktop \ "$pkgdir"/usr/share/applications/godot.desktop + install -Dm644 icon.png "$pkgdir"/usr/share/pixmaps/godot.png install -Dm644 icon.svg "$pkgdir"/usr/share/pixmaps/godot.svg - test -f bin/godot.x11.opt.tools.32 && \ - install -D -m755 bin/godot.x11.opt.tools.32 "$pkgdir"/usr/bin/godot - test -f bin/godot.x11.opt.tools.64 && \ - install -D -m755 bin/godot.x11.opt.tools.64 "$pkgdir"/usr/bin/godot - install -D -m644 misc/dist/linux/godot.6 "$pkgdir"/usr/share/man/man6/godot.6 + install -Dm644 misc/dist/linux/godot.6 "$pkgdir"/usr/share/man/man6/godot.6 + + # editors, use headless for packaging games + install -Dm755 bin/godot.x11.opt.tools.[36]* "$pkgdir"/usr/bin/godot + install -Dm755 bin/godot_server.x11.opt.tools.[36]* "$pkgdir"/usr/bin/godot-headless + + # export templates, use for packaging games and playing with musl libc or non-x86 CPU + install -Dm755 bin/godot.x11.opt.[36]* "$pkgdir"/usr/bin/godot-client + install -Dm755 bin/godot.x11.opt.debug.[36]* "$pkgdir"/usr/bin/godot-client-debug + install -Dm755 bin/godot_server.x11.opt.[36]* "$pkgdir"/usr/bin/godot-server + install -Dm755 bin/godot_server.x11.opt.debug.[36]* "$pkgdir"/usr/bin/godot-server-debug } sha512sums=" -bfe6a04569c1a0a1dd8eb98869b22c35207c653fd5ad9e4429568474b27ab745558474dc276e4ba72dadfe4d0781c8651bc58f69a2448a382f57eb2c0ac22ee9 godot-3.4.4-stable.tar.gz +7bb6552792ae53d9b5c8fc07df2984ea0ff2a6f3d8e1416101464bb1a3a727d88ce8facc518c994958f96f34aa3fa6383552ff54c6b9cb2988fd3ad8ad012e6c godot-3.5-stable.tar.gz a3853b7e23b0684e44dbf67c7cbddfa3ea8b1154347a1aa58870d66a213d05bb1ad8b6fdc4106239e0c1a1efcd174b0544ff0d6bbb516a0fe9f516ad2514400b no-execinfo.patch " -- 2.36.2