From a4c500da08a55ab3ff4b8f78e28dcfdc4372af65 Mon Sep 17 00:00:00 2001 From: Ross Charles Campbell Date: Sat, 2 Jan 2021 23:57:46 +0800 Subject: [PATCH 1/3] dev-games/godot: New Package Closes: https://bugs.gentoo.org/532730 Closes: https://github.com/gentoo/gentoo/pull/17874 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Ross Charles Campbell --- dev-games/godot/Manifest | 1 + .../files/godot-3.2.3-fix-llvm-build.patch | 36 +++++ dev-games/godot/godot-3.2.3.ebuild | 139 ++++++++++++++++++ dev-games/godot/metadata.xml | 28 ++++ 4 files changed, 204 insertions(+) create mode 100644 dev-games/godot/Manifest create mode 100644 dev-games/godot/files/godot-3.2.3-fix-llvm-build.patch create mode 100644 dev-games/godot/godot-3.2.3.ebuild create mode 100644 dev-games/godot/metadata.xml diff --git a/dev-games/godot/Manifest b/dev-games/godot/Manifest new file mode 100644 index 0000000000..36fd2278f9 --- /dev/null +++ b/dev-games/godot/Manifest @@ -0,0 +1 @@ +DIST godot-3.2.3.tar.gz 22459811 BLAKE2B fdebfc4fc4a259d52496feb2904ff1e311a8df3fd57568091b181380e28b789efd16d598df7a2331f22f182acebacb7af1f5aa88583f8b7e992be52f2f494198 SHA512 229a32f082e412f20533b781ee95a1e7a9039a6329fe3429f9a3388ba3aada311bcc49c2abecdeec7496ef039a81358009126b21daaeeb127c170b77c3def99f diff --git a/dev-games/godot/files/godot-3.2.3-fix-llvm-build.patch b/dev-games/godot/files/godot-3.2.3-fix-llvm-build.patch new file mode 100644 index 0000000000..40c45f341b --- /dev/null +++ b/dev-games/godot/files/godot-3.2.3-fix-llvm-build.patch @@ -0,0 +1,36 @@ +diff --git a/SConstruct b/SConstruct +index 26019e6..f460aef 100644 +--- a/SConstruct ++++ b/SConstruct +@@ -170,6 +170,8 @@ opts.Add(BoolVariable("builtin_zstd", "Use the built-in Zstd library", True)) + # Compilation environment setup + opts.Add("CXX", "C++ compiler") + opts.Add("CC", "C compiler") ++opts.Add("AR", "Archiver") ++opts.Add("RANLIB", "Random Access Library Indexer") + opts.Add("LINK", "Linker") + opts.Add("CCFLAGS", "Custom flags for both the C and C++ compilers") + opts.Add("CFLAGS", "Custom flags for the C compiler") +diff --git a/platform/x11/detect.py b/platform/x11/detect.py +index 716930d..28b1df4 100644 +--- a/platform/x11/detect.py ++++ b/platform/x11/detect.py +@@ -130,7 +130,6 @@ def configure(env): + env["CXX"] = "clang++" + env["LINK"] = "clang++" + env.Append(CPPDEFINES=["TYPED_METHOD_BIND"]) +- env.extra_suffix = ".llvm" + env.extra_suffix + + if env["use_lld"]: + if env["use_llvm"]: +@@ -173,10 +172,6 @@ def configure(env): + env.Append(CCFLAGS=["-flto"]) + env.Append(LINKFLAGS=["-flto"]) + +- if not env["use_llvm"]: +- env["RANLIB"] = "gcc-ranlib" +- env["AR"] = "gcc-ar" +- + env.Append(CCFLAGS=["-pipe"]) + env.Append(LINKFLAGS=["-pipe"]) + diff --git a/dev-games/godot/godot-3.2.3.ebuild b/dev-games/godot/godot-3.2.3.ebuild new file mode 100644 index 0000000000..b0115ed966 --- /dev/null +++ b/dev-games/godot/godot-3.2.3.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_{7..9} ) + +inherit desktop python-any-r1 scons-utils xdg + +DESCRIPTION="Multi-platform 2D and 3D game engine" +HOMEPAGE="http://godotengine.org" + +SRC_URI="https://github.com/godotengine/${PN}/archive/${PV}-stable.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${P}-stable" +KEYWORDS="~amd64 ~x86" + +LICENSE="Apache-2.0 BSD BSL-1.1 CC-BY-3.0 MIT MPL-2.0 OFL-1.1 public-domain ZLIB" +SLOT="0" +IUSE="+bullet debug +enet +freetype lto +mbedtls +ogg +opus pulseaudio +theora +udev +upnp +vorbis +webp" + +RDEPEND=" + app-arch/lz4 + app-arch/zstd + dev-libs/libpcre2[pcre32] + media-libs/alsa-lib + media-libs/libpng:0= + media-libs/libvpx + media-libs/mesa[gles2] + sys-libs/zlib + x11-libs/libX11 + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + virtual/glu + virtual/opengl + bullet? ( >=sci-physics/bullet-2.89 ) + enet? ( net-libs/enet:= ) + freetype? ( media-libs/freetype:2 ) + mbedtls? ( net-libs/mbedtls ) + ogg? ( media-libs/libogg ) + opus? ( + media-libs/opus + media-libs/opusfile + ) + pulseaudio? ( media-sound/pulseaudio ) + theora? ( media-libs/libtheora ) + udev? ( virtual/udev ) + upnp? ( net-libs/miniupnpc ) + vorbis? ( media-libs/libvorbis ) + webp? ( media-libs/libwebp ) +" +DEPEND=" + ${RDEPEND} + dev-lang/yasm +" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${P}-fix-llvm-build.patch ) + +src_prepare() { + default + rm -r thirdparty/{bullet,enet,freetype,libogg,libpng,libtheora,libvorbis,libvpx,libwebp,mbedtls,miniupnpc,opus,pcre2,zlib,zstd} || die +} + +src_configure() { + myesconsargs=( + CC="$(tc-getCC)" + CXX="$(tc-getCXX)" + AR="$(tc-getAR)" + RANLIB="$(tc-getRANLIB)" + ) + # Remove builtin third-party packages, link with system ones instead + myesconsargs+=( + builtin_bullet=no + builtin_enet=no + builtin_freetype=no + builtin_libogg=no + builtin_libpng=no + builtin_libtheora=no + builtin_libvorbis=no + builtin_libvpx=no + builtin_libwebp=no + builtin_mbedtls=no + builtin_miniupnpc=no + builtin_opus=no + builtin_pcre2=no + builtin_pcre2_with_jit=no + builtin_zlib=no + builtin_zstd=no + ) + myesconsargs+=( + # Mono bindings requires MSBuild which is only available on Windows + module_mono_enabled=no + module_bullet_enabled=$(usex bullet) + module_enet_enabled=$(usex enet) + module_freetype_enabled=$(usex freetype) + module_mbedtls_enabled=$(usex mbedtls) + module_ogg_enabled=$(usex ogg) + module_opus_enabled=$(usex opus) + module_theora_enabled=$(usex theora) + module_upnp_enabled=$(usex upnp) + module_vorbis_enabled=$(usex vorbis) + module_webp_enabled=$(usex webp) + ) + # Misc options + myesconsargs+=( + platform=x11 + progress=yes + tools=yes + verbose=yes + pulseaudio=$(usex pulseaudio) + target=$(usex debug debug release_debug) + udev=$(usex udev) + use_lto=$(usex lto) + ) +} + +src_compile() { + escons "${myesconsargs[@]}" +} + +src_install() { + local godot_binary="${PN}.x11.opt.tools" + + if [[ "${ARCH}" == "amd64" ]]; then + godot_binary="${godot_binary}.64" + elif [[ "${ARCH}" == "x86" ]]; then + godot_binary="${godot_binary}.32" + fi + + newbin bin/${godot_binary} ${PN} + newicon icon.svg ${PN}.svg + doman misc/dist/linux/${PN}.6 + domenu misc/dist/linux/org.godotengine.Godot.desktop + insinto /usr/share/metainfo + doins misc/dist/linux/org.godotengine.Godot.appdata.xml + insinto /usr/share/mime/application + doins misc/dist/linux/x-godot-project.xml + dodoc AUTHORS.md CHANGELOG.md DONORS.md README.md +} diff --git a/dev-games/godot/metadata.xml b/dev-games/godot/metadata.xml new file mode 100644 index 0000000000..5f4bcc66cc --- /dev/null +++ b/dev-games/godot/metadata.xml @@ -0,0 +1,28 @@ + + + + + rossbridger.cc@gmail.com + Ross Charles Campbell + + +Godot Engine is a feature-packed, cross-platform game engine to create 2D and +3D games from a unified interface. It provides a comprehensive set of common +tools, so users can focus on making games without having to reinvent the wheel. +Games can be exported in one click to a number of platforms, including the major +desktop platforms (Linux, macOS, Windows) as well as mobile (Android, iOS) and +web-based (HTML5) platforms. + + + Enable support for sci-physics/bullet + Enable support for net-libs/enet + Enable support for link time optimization + Enable support for media-libs/freetype + Enable support for net-libs/mbedtls + + + godotengine/godot + https://github.com/godotengine/godot/issues + https://docs.godotengine.org/en/stable/index.html + + From 4e9ac517df5636a55d5f26b02db48378d20a9961 Mon Sep 17 00:00:00 2001 From: Ross Charles Campbell Date: Sun, 3 Jan 2021 00:13:06 +0800 Subject: [PATCH 2/3] app-editors/vscodium-bin: New Package Bug: https://bugs.gentoo.org/675742 Closes: https://github.com/gentoo/gentoo/pull/18733 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Ross Charles Campbell --- app-editors/vscodium-bin/Manifest | 3 + .../files/codium-url-handler.desktop | 12 ++++ app-editors/vscodium-bin/files/codium.desktop | 18 ++++++ app-editors/vscodium-bin/metadata.xml | 13 ++++ .../vscodium-bin/vscodium-bin-1.52.1.ebuild | 60 +++++++++++++++++++ 5 files changed, 106 insertions(+) create mode 100644 app-editors/vscodium-bin/Manifest create mode 100644 app-editors/vscodium-bin/files/codium-url-handler.desktop create mode 100644 app-editors/vscodium-bin/files/codium.desktop create mode 100644 app-editors/vscodium-bin/metadata.xml create mode 100644 app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild diff --git a/app-editors/vscodium-bin/Manifest b/app-editors/vscodium-bin/Manifest new file mode 100644 index 0000000000..cbf5b35cc2 --- /dev/null +++ b/app-editors/vscodium-bin/Manifest @@ -0,0 +1,3 @@ +DIST VSCodium-linux-arm64-1.52.1.tar.gz 99006948 BLAKE2B 933e5b283e011873b7da60a838e7778d8ff1cf69006e5bf370fdeba7aa6709c2b8ea427936d353c75c0331d1a78defb7c0983d73d59c71163cde6ca32cf1ac32 SHA512 e96c79b1176a07f6cbd1a1d30d4a4d0d66d519d854bc0aa0e24e9baa4b0f6fe959e12b4888330188210957763febc644601f958b635deaa7e900f55f0eb5550f +DIST VSCodium-linux-armhf-1.52.1.tar.gz 85288104 BLAKE2B 3df56d4708f44e5029a9cfed05185957951ead696885f16e8d3da8587f812f9e088e37e2b355157989a0e272661f367a1bd2d70cfbc7953a1f07f166b7b8292d SHA512 ffd5b2b476896d4aed67ed0bd157ca14819f493534c9e15eba247998becb06042c6c0caa88ee2db7e76529da252dac57c43c86371430b57a5819ce392cdcdcb5 +DIST VSCodium-linux-x64-1.52.1.tar.gz 96026417 BLAKE2B 0d06ddef0de3af3d22de4757bd5b81742cdfb6605192c61374857fdacfd8df374adf180aaa1f31f0397ead97e7f668320125ef1f806c71689348ac4a3c8bab8d SHA512 9a60f6821e7a796eaca842817fd3853c8099d74418ccabeacabed01c4f7b46b49c52bb11a032c317c27e3cef7ef2c49d2cf967ca2d2d79013790994a6aa9159f diff --git a/app-editors/vscodium-bin/files/codium-url-handler.desktop b/app-editors/vscodium-bin/files/codium-url-handler.desktop new file mode 100644 index 0000000000..c1fa006490 --- /dev/null +++ b/app-editors/vscodium-bin/files/codium-url-handler.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Name=VSCodium - URL Handler +Comment=Code Editing. Redefined. +GenericName=Text Editor +Exec=/usr/bin/codium --no-sandbox --open-url %U +Icon=vscodium +Type=Application +NoDisplay=true +StartupNotify=true +Categories=Utility;TextEditor;Development;IDE; +MimeType=x-scheme-handler/vscodium; +Keywords=vscode; diff --git a/app-editors/vscodium-bin/files/codium.desktop b/app-editors/vscodium-bin/files/codium.desktop new file mode 100644 index 0000000000..4e9579aa56 --- /dev/null +++ b/app-editors/vscodium-bin/files/codium.desktop @@ -0,0 +1,18 @@ +[Desktop Entry] +Name=VSCodium +Comment=Code Editing. Redefined. +GenericName=Text Editor +Exec=/usr/bin/codium --no-sandbox --unity-launch %F +Icon=vscodium +Type=Application +StartupNotify=false +StartupWMClass=VSCodium +Categories=Utility;TextEditor;Development;IDE; +MimeType=text/plain;inode/directory;application/x-codium-workspace; +Actions=new-empty-window; +Keywords=vscode; + +[Desktop Action new-empty-window] +Name=New Empty Window +Exec=/usr/bin/codium --no-sandbox --new-window %F +Icon=vscodium diff --git a/app-editors/vscodium-bin/metadata.xml b/app-editors/vscodium-bin/metadata.xml new file mode 100644 index 0000000000..2a0f0b7f8e --- /dev/null +++ b/app-editors/vscodium-bin/metadata.xml @@ -0,0 +1,13 @@ + + + + + rossbridger.cc@gmail.com + Ross Charles Campbell + + +This is not a fork. This is a repository of scripts to automatically +build Microsoft's vscode repository into freely-licensed binaries with +a community-driven default configuration. + + diff --git a/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild new file mode 100644 index 0000000000..c18d9b7b2c --- /dev/null +++ b/app-editors/vscodium-bin/vscodium-bin-1.52.1.ebuild @@ -0,0 +1,60 @@ +# Copyright 2020-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit desktop pax-utils xdg + +MY_PN="${PN/-bin}" + +DESCRIPTION="Free/Libre Open Source Software Binaries of VSCode" +HOMEPAGE="https://vscodium.com" + +SRC_URI=" + amd64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-x64-${PV}.tar.gz ) + arm? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-armhf-${PV}.tar.gz ) + arm64? ( https://github.com/VSCodium/vscodium/releases/download/${PV}/VSCodium-linux-arm64-${PV}.tar.gz )" + +RESTRICT="strip bindist" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="-* ~amd64 ~arm ~arm64" + +RDEPEND=" + app-accessibility/at-spi2-atk + app-crypt/libsecret[crypt] + dev-libs/nss + media-libs/libpng:0/16 + x11-libs/cairo + x11-libs/gtk+:3 + x11-libs/libnotify + x11-libs/libXScrnSaver + x11-libs/libXtst + x11-libs/pango" + +QA_PRESTRIPPED="*" + +QA_PREBUILT=" + opt/${MY_PN}/codium + opt/${MY_PN}/libEGL.so + opt/${MY_PN}/libffmpeg.so + opt/${MY_PN}/libGLESv2.so + opt/${MY_PN}/libvk_swiftshader.so + opt/${MY_PN}/libvulkan.so + opt/${MY_PN}/swiftshader/libEGL.so + opt/${MY_PN}/swiftshader/libGLESv2.so" + +S="${WORKDIR}" + +src_install() { + pax-mark m codium + insinto "/opt/${MY_PN}" + doins -r * + fperms +x /opt/${MY_PN}/{,bin/}codium + dosym "../../opt/${MY_PN}/bin/codium" "usr/bin/codium" + domenu "${FILESDIR}/codium.desktop" + domenu "${FILESDIR}/codium-url-handler.desktop" + dodoc resources/app/LICENSE.txt resources/app/ThirdPartyNotices.txt + newicon resources/app/resources/linux/code.png ${MY_PN}.png +} From 145db129f3f1d1b828eca116b97377a939ec3078 Mon Sep 17 00:00:00 2001 From: Andrew Ammerlaan Date: Sat, 2 Jan 2021 17:49:45 +0100 Subject: [PATCH 3/3] net-misc/megasync: call cmake_src_prepare closes: https://bugs.gentoo.org/763138 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: Andrew Ammerlaan --- net-misc/megasync/megasync-4.3.7.ebuild | 8 ++++++-- net-misc/megasync/megasync-4.3.8.0.ebuild | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/net-misc/megasync/megasync-4.3.7.ebuild b/net-misc/megasync/megasync-4.3.7.ebuild index 61ef362c59..ccc5b2c1d3 100644 --- a/net-misc/megasync/megasync-4.3.7.ebuild +++ b/net-misc/megasync/megasync-4.3.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -74,7 +74,11 @@ src_prepare() { rmdir src/MEGASync/mega mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega fi - default + if use dolphin; then + cmake_src_prepare + else + default + fi cd src/MEGASync/mega eautoreconf } diff --git a/net-misc/megasync/megasync-4.3.8.0.ebuild b/net-misc/megasync/megasync-4.3.8.0.ebuild index eb91b2e517..3edb24ae83 100644 --- a/net-misc/megasync/megasync-4.3.8.0.ebuild +++ b/net-misc/megasync/megasync-4.3.8.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -75,7 +75,11 @@ src_prepare() { rmdir src/MEGASync/mega mv "${WORKDIR}"/sdk-${MEGA_SDK_REV} src/MEGASync/mega fi - default + if use dolphin; then + cmake_src_prepare + else + default + fi cd src/MEGASync/mega eautoreconf }