[PR PATCH] godot: remove icu and brotli from builtin

[PR PATCH] godot: remove icu and brotli from builtin

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 760 bytes --]

There is a new pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot
https://github.com/void-linux/void-packages/pull/47576

godot: remove icu and brotli from builtin
#### Testing the changes
- I tested the changes in this PR: **YES** (As far as I could think of)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

Since we provide icu and brotli now in correct versions I've setup godot to use our packages instead of builtin variants.

A patch file from https://github.com/void-linux/void-packages/pull/47576.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-47576.patch --]
[-- Type: text/x-diff, Size: 2061 bytes --]

From 3e435f7be2ab8a4a4720eb82fef07d981db920a6 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 4 Dec 2023 18:54:49 +0100
Subject: [PATCH] godot: remove icu and brotli from builtin

---
 srcpkgs/godot/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index b07869975ff97..2f09f92d9614b 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,23 +1,24 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.2
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 # Build currently fails with embree-4.X
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
- builtin_embree=true builtin_enet=false builtin_freetype=false
- builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
- builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
- builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
- builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
+lto=auto builtin_brotli=false builtin_embree=true builtin_enet=false
+builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
+builtin_icu4c=false builtin_libogg=false builtin_libpng=false
+builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
+builtin_mbedtls=false builtin_miniupnpc=false builtin_pcre2=false
+builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
 makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
  libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
  pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
- speech-dispatcher-devel"
+ speech-dispatcher-devel brotli-devel icu-devel"
 depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="dataCobra <datacobra@thinkbot.de>"

Re: [PR PATCH] [Updated] godot: remove icu and brotli from builtin

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 765 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot
https://github.com/void-linux/void-packages/pull/47576

godot: remove icu and brotli from builtin
#### Testing the changes
- I tested the changes in this PR: **YES** (As far as I could think of)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

Since we provide icu and brotli now in correct versions I've setup godot to use our packages instead of builtin variants.

A patch file from https://github.com/void-linux/void-packages/pull/47576.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-47576.patch --]
[-- Type: text/x-diff, Size: 2067 bytes --]

From ef4f645aa07698a64c8fb57263ad7932b7c4a61f Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Mon, 4 Dec 2023 19:00:05 +0100
Subject: [PATCH] godot: remove icu and brotli from builtin

---
 srcpkgs/godot/template | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index b07869975ff97..388d0d413c1a2 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,23 +1,24 @@
 # Template file for 'godot'
 pkgname=godot
 version=4.2
-revision=1
+revision=2
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 # Build currently fails with embree-4.X
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
- builtin_embree=true builtin_enet=false builtin_freetype=false
- builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
- builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
- builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
- builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
+ lto=auto builtin_brotli=false builtin_embree=true builtin_enet=false
+ builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
+ builtin_icu4c=false builtin_libogg=false builtin_libpng=false
+ builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
+ builtin_mbedtls=false builtin_miniupnpc=false builtin_pcre2=false
+ builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
 makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
  libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
  pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
- speech-dispatcher-devel"
+ speech-dispatcher-devel brotli-devel icu-devel"
 depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="dataCobra <datacobra@thinkbot.de>"

Re: [PR PATCH] [Updated] godot: remove icu and brotli from builtin

[dataCobra]

[-- Attachment #1: Type: text/plain, Size: 765 bytes --]

There is an updated pull request by dataCobra against master on the void-packages repository

https://github.com/dataCobra/void-packages godot
https://github.com/void-linux/void-packages/pull/47576

godot: remove icu and brotli from builtin
#### Testing the changes
- I tested the changes in this PR: **YES** (As far as I could think of)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

Since we provide icu and brotli now in correct versions I've setup godot to use our packages instead of builtin variants.

A patch file from https://github.com/void-linux/void-packages/pull/47576.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-godot-47576.patch --]
[-- Type: text/x-diff, Size: 2468 bytes --]

From 3c6ac21b66a5eb3ed846f995b628867330497457 Mon Sep 17 00:00:00 2001
From: dataCobra <datacobra@thinkbot.de>
Date: Tue, 12 Dec 2023 12:24:35 +0100
Subject: [PATCH] godot: update to 4.2.1.

---
 srcpkgs/godot/template | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/srcpkgs/godot/template b/srcpkgs/godot/template
index b07869975ff97..8eb76127acc48 100644
--- a/srcpkgs/godot/template
+++ b/srcpkgs/godot/template
@@ -1,30 +1,31 @@
 # Template file for 'godot'
 pkgname=godot
-version=4.2
+version=4.2.1
 revision=1
 archs="x86_64* i686* aarch64* armv7* ppc64*"
 build_style=scons
 # Build currently fails with embree-4.X
 make_build_args="platform=linuxbsd target=editor progress=no production=yes
- builtin_embree=true builtin_enet=false builtin_freetype=false
- builtin_graphite=false builtin_harfbuzz=false builtin_libogg=false
- builtin_libpng=false builtin_libtheora=false builtin_libvorbis=false
- builtin_libwebp=false builtin_mbedtls=false builtin_miniupnpc=false
- builtin_pcre2=false builtin_zlib=false builtin_zstd=false"
+ lto=auto builtin_brotli=false builtin_embree=true builtin_enet=false
+ builtin_freetype=false builtin_graphite=false builtin_harfbuzz=false
+ builtin_icu4c=false builtin_libogg=false builtin_libpng=false
+ builtin_libtheora=false builtin_libvorbis=false builtin_libwebp=false
+ builtin_mbedtls=false builtin_miniupnpc=false builtin_pcre2=false
+ builtin_zlib=false builtin_zstd=false"
 hostmakedepends="pkg-config clang"
 makedepends="alsa-lib-devel freetype-devel mesa glu-devel libXcursor-devel
  libXi-devel libXinerama-devel libXrender-devel libXrandr-devel libX11-devel
  libpng-devel libwebp-devel libogg-devel libtheora-devel libvorbis-devel
  libenet-devel zlib-devel mbedtls-devel miniupnpc-devel pcre2-devel
  pulseaudio-devel graphite-devel harfbuzz-devel libzstd-devel
- speech-dispatcher-devel"
+ speech-dispatcher-devel brotli-devel icu-devel"
 depends="speech-dispatcher"
 short_desc="Multiplatform 2D and 3D engine"
 maintainer="dataCobra <datacobra@thinkbot.de>"
 license="MIT"
 homepage="https://www.godotengine.org/"
 distfiles="https://github.com/godotengine/godot/archive/${version}-stable.tar.gz"
-checksum=517e538ef7f3eebeb761c281fb71ac529424146f6b3b746d0861825ddcf18918
+checksum=716cfd489dbfc91b5e04cc0df8be415ba6eec74c5fb471840275d887cb53ff95
 nocross=https://build.voidlinux.org/builders/armv7l_builder/builds/6342/steps/shell_3/logs/stdio
 
 CFLAGS+=" -fPIE -fPIC"

Re: [PR PATCH] [Merged]: godot: update to 4.2.1.

[ahesford]

[-- Attachment #1: Type: text/plain, Size: 589 bytes --]

There's a merged pull request on the void-packages repository

godot: update to 4.2.1.
https://github.com/void-linux/void-packages/pull/47576

Description:
#### Testing the changes
- I tested the changes in this PR: **YES** (As far as I could think of)

#### Local build testing
- I built this PR locally for my native architecture, (x86_64-glibc)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
  - x86_64-musl
  - i686

Since we provide icu and brotli now in correct versions I've setup godot to use our packages instead of builtin variants.