From: curiousjunior <curiousjunior@users.noreply.github.com>
To: ml@inbox.vuxu.org
Subject: Re: [PR PATCH] [Updated] godot: add client and server export templates
Date: Fri, 26 Nov 2021 02:17:58 +0100 [thread overview]
Message-ID: <20211126011758.dakotuKZF691yqz_r5ZTDsEYjyEZzbPwEOtcTlXEBC4@z> (raw)
In-Reply-To: <gh-mailinglist-notifications-41a7ca26-5023-4802-975b-f1789d68868e-void-packages-34226@inbox.vuxu.org>
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
There is an updated pull request by curiousjunior against master on the void-packages repository
https://github.com/curiousjunior/void-packages godot
https://github.com/void-linux/void-packages/pull/34226
godot: add client and server export templates
they are useful for everything that's not glibc or not x86 because there are no official binaries for those (who plays finished games in the editor?) and can be used to play already exported games
also I didn't test building and packaging on my own laptop because C++ is a cancer, so I'll wait for result of buildbot
A patch file from https://github.com/void-linux/void-packages/pull/34226.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-34226.patch --]
[-- Type: text/x-diff, Size: 4950 bytes --]
From 060c9cc6de6ec77f5c1a4b64e6b10371c8676d51 Mon Sep 17 00:00:00 2001
From: Leonid Bobrov <curiousbeaver@disroot.org>
Date: Wed, 24 Nov 2021 14:26:38 +0200
Subject: [PATCH] godot: add client and server export templates
---
srcpkgs/godot/patches/pie.patch | 33 +++++++++++++++++++++++++++++++++
srcpkgs/godot/template | 32 ++++++++++++++++++++++----------
2 files changed, 55 insertions(+), 10 deletions(-)
create mode 100644 srcpkgs/godot/patches/pie.patch
diff --git a/srcpkgs/godot/patches/pie.patch b/srcpkgs/godot/patches/pie.patch
new file mode 100644
index 000000000000..a300135eca16
--- /dev/null
+++ b/srcpkgs/godot/patches/pie.patch
@@ -0,0 +1,33 @@
+From 065c79f0dfe8a7beae0609be64197cfd4f1e22d5 Mon Sep 17 00:00:00 2001
+From: Hugo Locurcio <hugo.locurcio@hugo.pro>
+Date: Thu, 22 Jul 2021 18:11:02 +0200
+Subject: [PATCH] Re-enable building position-independent executables on
+ Linux/*BSD
+
+This provides better security at the cost of having misleading
+binary icons on some file managers.
+
+Now that recent Linux distributions no longer allow executing
+binaries by double-clicking them in a file manager (even if the
+binary is set to be executable), the usability cost of PIE is lowered.
+You have to use a terminal or install a `.desktop` file nowadays.
+---
+ platform/x11/detect.py | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/platform/x11/detect.py b/platform/x11/detect.py
+index 3e3ed469ed5..f535c9e7bd5 100644
+--- a/platform/x11/detect.py
++++ b/platform/x11/detect.py
+@@ -201,11 +201,6 @@ def configure(env):
+ env.Append(CCFLAGS=["-pipe"])
+ env.Append(LINKFLAGS=["-pipe"])
+
+- # -fpie and -no-pie is supported on GCC 6+ and Clang 4+, both below our
+- # minimal requirements.
+- env.Append(CCFLAGS=["-fpie"])
+- env.Append(LINKFLAGS=["-no-pie"])
+-
+ ## Dependencies
+
+ env.ParseConfig("pkg-config x11 --cflags --libs")
diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index c38f3f8c525a..22a0b26e101a 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,16 +1,14 @@
# Template file for 'godot'
pkgname=godot
version=3.4
-revision=1
+revision=2
archs="x86_64* i686* aarch64* armv7* ppc64*"
wrksrc="${pkgname}-${version}-stable"
build_style=scons
# Godot contains private copies of libraries
# 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
- pulseaudio=no builtin_bullet=false builtin_libpng=false builtin_libvpx=false
+make_build_args="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
builtin_zlib=false builtin_freetype=false builtin_mbedtls=false
@@ -28,7 +26,7 @@ license="MIT"
homepage="https://www.godotengine.org/"
distfiles="https://github.com/godotengine/${pkgname}/archive/${version}-stable.tar.gz"
checksum=61749d12cb094c0be2a2c451ae2aceb8bb45f59f67fcd13fcd8f0c9114262d88
-nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
+#nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
CFLAGS+=" -fPIE -fPIC"
LDFLAGS+=" -pie"
@@ -42,15 +40,29 @@ pre_build() {
export CXXFLAGS=" $CXXFLAGS "
}
+do_build() {
+ scons ${makejobs} ${make_build_args} CCFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS" tools=yes target=release_debug
+ scons ${makejobs} ${make_build_args} CCFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS" tools=no target=release_debug
+ scons ${makejobs} ${make_build_args} CCFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS" tools=no target=release_debug platform=server
+ scons ${makejobs} ${make_build_args} CCFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS" tools=no target=release
+ scons ${makejobs} ${make_build_args} CCFLAGS="$CFLAGS" LINKFLAGS="$LDFLAGS" tools=no target=release platform=server
+}
+
do_install() {
vlicense LICENSE.txt
vinstall ${FILESDIR}/godot.desktop 644 /usr/share/applications/
vinstall ${wrksrc}/icon.png 644 /usr/share/pixmaps/ godot.png
case "$XBPS_TARGET_MACHINE" in
- x86_64*|aarch64*) vbin bin/godot.x11.opt.tools.64 godot;;
- ppc64le*) vbin bin/godot.x11.opt.tools.ppc64le godot;;
- ppc64*) vbin bin/godot.x11.opt.tools.ppc64 godot;;
- *) vbin bin/godot.x11.opt.tools.32 godot;;
+ x86_64*|aarch64*) _godot_arch=64;;
+ ppc64le*) _godot_arch=ppc64le;;
+ ppc64*) _godot_arch=ppc64;;
+ *) _godot_arch=32;;
esac
+
+ vbin bin/godot.x11.opt.tools.$_godot_arch godot
+ vbin bin/godot.x11.opt.$_godot_arch godot-client
+ vbin bin/godot.x11.opt.debug.$_godot_arch godot-client-debug
+ vbin bin/godot_server.x11.opt.$_godot_arch godot-server
+ vbin bin/godot_server.x11.opt.debug.$_godot_arch godot-server-debug
}
next prev parent reply other threads:[~2021-11-26 1:17 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-24 12:41 [PR PATCH] " curiousjunior
2021-11-24 14:16 ` [PR PATCH] [Updated] " curiousjunior
2021-11-24 14:17 ` curiousjunior
2021-11-24 14:20 ` curiousjunior
2021-11-24 15:53 ` [PR PATCH] [Updated] " curiousjunior
2021-11-24 18:16 ` curiousjunior
2021-11-26 1:17 ` curiousjunior [this message]
2021-11-26 1:35 ` curiousjunior
2021-11-26 1:50 ` curiousjunior
2021-11-26 1:53 ` curiousjunior
2021-11-26 2:44 ` curiousjunior
2021-11-29 19:36 ` [PR REVIEW] " ericonr
2021-11-29 19:36 ` ericonr
2021-11-29 19:36 ` ericonr
2021-11-29 19:36 ` ericonr
2021-11-29 19:36 ` ericonr
2021-11-29 19:36 ` ericonr
2021-11-29 19:58 ` curiousjunior
2021-11-29 19:59 ` curiousjunior
2021-11-29 20:00 ` curiousjunior
2021-11-29 20:13 ` curiousjunior
2021-11-29 20:22 ` curiousjunior
2021-11-29 21:37 ` [PR PATCH] [Updated] " curiousjunior
2021-11-29 21:43 ` curiousjunior
2021-11-29 21:49 ` curiousjunior
2021-11-29 21:59 ` curiousjunior
2021-11-29 22:13 ` [PR PATCH] [Updated] godot: add client and server export templates and headless editor curiousjunior
2021-11-30 4:58 ` [PR REVIEW] " ahesford
2021-11-30 6:23 ` [PR PATCH] [Updated] " curiousjunior
2021-11-30 6:27 ` [PR REVIEW] godot: add LTO, export templates and headless curiousjunior
2021-11-30 6:32 ` [PR PATCH] [Updated] " curiousjunior
2021-11-30 6:37 ` curiousjunior
2021-11-30 6:44 ` curiousjunior
2021-11-30 7:23 ` curiousjunior
2021-11-30 15:28 ` q66
2021-11-30 16:00 ` curiousjunior
2021-11-30 16:15 ` ahesford
2021-11-30 16:59 ` q66
2021-11-30 17:12 ` ericonr
2021-11-30 17:14 ` curiousjunior
2021-11-30 17:14 ` [PR REVIEW] " codingHahn
2021-11-30 17:14 ` q66
2021-11-30 17:15 ` [PR PATCH] [Closed]: " ahesford
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20211126011758.dakotuKZF691yqz_r5ZTDsEYjyEZzbPwEOtcTlXEBC4@z \
--to=curiousjunior@users.noreply.github.com \
--cc=ml@inbox.vuxu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).