[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: d2780da75b1bc7140988aa0262881823c053a4e1 Author: Florian Schmaus gentoo org> AuthorDate: Thu Apr 20 14:01:48 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Apr 20 14:08:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2780da7 games-simulation/EmptyEpsilon: compress SRC_URI using PN Signed-off-by: Florian Schmaus gentoo.org> games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild index 3bdffb95126d..2e760b51db7f 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild @@ -16,14 +16,14 @@ HOMEPAGE="https://daid.github.io/EmptyEpsilon/; # a separate SeriousProton instance (and currently EmptyEpsilon seems to # be the only consumer). SRC_URI=" - https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz + https://github.com/daid/${PN}/archive/EE-${PV}.tar.gz -> ${PN}-${PV}.tar.gz https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz https://github.com/Flowdalic/SeriousProton/commit/dc9dccf6c802b9c55ac4eccad424d2b1af9f4b93.patch -> SeriousProton-2022.10.28-add-missing-cstdint-include.patch - https://github.com/void-linux/void-packages/raw/bfb212a0ca0f9dda6f34f837e723156f46813d4d/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch -> - EmptyEpsilon-2022.10.28-musl-and-ppc.patch + https://github.com/void-linux/void-packages/raw/bfb212a0ca0f9dda6f34f837e723156f46813d4d/srcpkgs/${PN}/patches/musl_and_ppc.patch -> + ${PN}-2022.10.28-musl-and-ppc.patch " # EmptyEpsilon is mostly licensed under GPL, however the art ressources
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/files/
commit: 96ed9bb0c9c737e40f1400afc18f4fd09a66d5cc Author: Florian Schmaus gentoo org> AuthorDate: Thu Apr 20 14:02:32 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Apr 20 14:08:08 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96ed9bb0 games-simulation/EmptyEpsilon: drop unused patch Signed-off-by: Florian Schmaus gentoo.org> ...Add-missing-include-memory-to-websocket.h.patch | 23 -- 1 file changed, 23 deletions(-) diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch deleted file mode 100644 index 861eaa781e8f.. --- a/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 9fe127233eae44f14e37900c3f54e8a305d2f161 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Sun, 22 May 2022 12:36:08 +0200 -Subject: [PATCH] Add missing #include to websocket.h - -std::unique_ptr, which is used for the 'socket' field, is defined in - but currently not included. Starting with GCC 12, the missing -include will cause a compilation error. - -The missing include was found by Gentoo's CI and reported as -https://bugs.gentoo.org/846935 a/src/io/http/websocket.h -+++ b/src/io/http/websocket.h -@@ -5,6 +5,9 @@ - #include - #include - -+#ifndef EMSCRIPTEN -+#include -+#endif - - namespace sp { - namespace io {
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: e8cfaac5af246d6e51803bf618a44c4f55f281ed Author: Florian Schmaus gentoo org> AuthorDate: Thu Apr 20 13:59:49 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Apr 20 14:08:07 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8cfaac5 games-simulation/EmptyEpsilon: drop unnecessary patches I had my portage/env/gcc-13 with CXX=gcc-13 messed up. Signed-off-by: Florian Schmaus gentoo.org> games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild | 8 games-simulation/EmptyEpsilon/Manifest | 2 -- 2 files changed, 10 deletions(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild index 84cc11d69ac4..3bdffb95126d 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild @@ -22,10 +22,6 @@ SRC_URI=" https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz https://github.com/Flowdalic/SeriousProton/commit/dc9dccf6c802b9c55ac4eccad424d2b1af9f4b93.patch -> SeriousProton-2022.10.28-add-missing-cstdint-include.patch - https://github.com/daid/SeriousProton/commit/3bb7f1cfbd91a4520ff23af7d761e08b5ca7cf88.patch -> - SeriousProton-2022.10.28-lua-fix-underlinking.patch - https://github.com/daid/EmptyEpsilon/commit/5d7e7bba4daadeeb05897349d518a8d9568331cc.patch -> - EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch https://github.com/void-linux/void-packages/raw/bfb212a0ca0f9dda6f34f837e723156f46813d4d/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch -> EmptyEpsilon-2022.10.28-musl-and-ppc.patch " @@ -48,8 +44,6 @@ S="${WORKDIR}/EmptyEpsilon-EE-${PV}" PATCHES=( "${FILESDIR}/${PN}-cmake-meshoptimizer.patch" - # https://github.com/daid/EmptyEpsilon/pull/1969 - "${DISTDIR}/EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch" ) pkg_pretend() { @@ -84,8 +78,6 @@ src_prepare() { "${FILESDIR}/SeriousProton-cmake.patch" # https://github.com/daid/SeriousProton/pull/236 "${DISTDIR}/SeriousProton-2022.10.28-add-missing-cstdint-include.patch" - # https://github.com/daid/SeriousProton/pull/237 - "${DISTDIR}/SeriousProton-2022.10.28-lua-fix-underlinking.patch" ) eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ "${serious_proton_patches[@]}" diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index bdc199e83ddb..56be56e05da0 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,8 +1,6 @@ -DIST EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch 668 BLAKE2B 7338f41fa2bf3b95352ff70ce0440f501fc6c99778fdef9d2af3ceae7a7e141ae3e85d290a4c18b4f97f993533e40cc4e66d2715be6d78545ce9bbb413a4e357 SHA512 cfedba9ceca79511478180eefcc130a7a4a33ae2f0c2577b05df6acb24c261dfb03f914e1681bfb952efbc7ff27b729745afc5ef4f2fa2fbe6f1fdbb988600b4 DIST EmptyEpsilon-2022.10.28-musl-and-ppc.patch 5440 BLAKE2B 7a3f20e5c6595ec037a1855f22b59dc979ff4f69bdf87f8bff09d32f2aedea60595ef4647c87ce182738352d00eaf54f1778dc8d3c46de96b7c7a4cbc963bab4 SHA512 bb555c3752348a4f23c5764542f8b9902b753358517463c04f044fe50a98e47a890fd425d2c4c38b6aa1eb7bc48ad508ad08ba5811b2825e7f0483f5312b DIST EmptyEpsilon-2022.10.28.tar.gz 258148673 BLAKE2B dcc2cdd6f02afef4fee00939145c4c98461ea5403ad45949ffc99758b0575f56504b610249231969f63751d8a2f746913a004d88d7287876a5b448a4b90d8162 SHA512 6af0522cb9f07f0b0cf3ac287ce57b156206b27b4d17de237acf50c46928782c49a4af397c9cad4be30603e0ee04bd6979404e11d0b2c5472cf0c278124df140 DIST SeriousProton-2022.10.28-add-missing-cstdint-include.patch 850 BLAKE2B f193fb30b39e7b07caf0018fc4e32430ee451baaf63315110e204e7e6f3aff84448a3a5cc83b60e642c27cebb39f532065bd1126f5646ac70645c1c341c8e464 SHA512 3645efb49ea012a31da0414a454bfca46170dfdfd90db7af07481181d75b87c621e7d8ba2ee9752c49d978ab0e5080f01b81eeb07cf1ce68425066c8a4111c2b -DIST SeriousProton-2022.10.28-lua-fix-underlinking.patch 736 BLAKE2B 50a0fa840c90056032100d19805eb26ba4b0135b77cd7a9bfea92201c0c4b88b0e8597f6cbf453ebb8ffae19e90ef691fb1e98a0219027bfd906eade92956abe SHA512 d7949e6d622d7470de0a1a68c1cecc5920d72b8e9f919c7f0c19be884a981b7e07c8ed2e0c2f51eb532ff46bcb43f40eb4db1ebde7a97f708809f54c2396cf15 DIST SeriousProton-2022.10.28.tar.gz 2668713 BLAKE2B 9f200881bfa812904cd37428eb2bb2f8e04c46a134e8b3fceb0e02e87fe4bd7e529e1fbaf18cb4e284ec7ee4d1c6e8606f35e7ec3e61efa66816a7b354d446b9 SHA512 7955ed78529c0f69d6fd3ef6fac5537009548cdfe1cf8e47dc1fac8919fc3532e03453869968369f027c40dd4da513cfd84e58ffedaddd4b9d9fe67d28406be7 DIST basis_universal_1_15_update2.tar.gz 13283133 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: 13653f0b670a4791c9db1e269064b7c9675bba3f Author: Florian Schmaus gentoo org> AuthorDate: Thu Apr 20 12:27:43 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Apr 20 12:28:12 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=13653f0b games-simulation/EmptyEpsilon: fix build on musl (and ppc) Closes: https://bugs.gentoo.org/895994 Signed-off-by: Florian Schmaus gentoo.org> games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild | 5 + games-simulation/EmptyEpsilon/Manifest | 1 + 2 files changed, 6 insertions(+) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild index 11108d01222d..84cc11d69ac4 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild @@ -26,6 +26,8 @@ SRC_URI=" SeriousProton-2022.10.28-lua-fix-underlinking.patch https://github.com/daid/EmptyEpsilon/commit/5d7e7bba4daadeeb05897349d518a8d9568331cc.patch -> EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch + https://github.com/void-linux/void-packages/raw/bfb212a0ca0f9dda6f34f837e723156f46813d4d/srcpkgs/EmptyEpsilon/patches/musl_and_ppc.patch -> + EmptyEpsilon-2022.10.28-musl-and-ppc.patch " # EmptyEpsilon is mostly licensed under GPL, however the art ressources @@ -87,6 +89,9 @@ src_prepare() { ) eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ "${serious_proton_patches[@]}" + + # https://bugs.gentoo.org/895994 + eapply -p2 "${DISTDIR}/EmptyEpsilon-2022.10.28-musl-and-ppc.patch" } src_configure() { diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index b913ff0d163c..bdc199e83ddb 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,4 +1,5 @@ DIST EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch 668 BLAKE2B 7338f41fa2bf3b95352ff70ce0440f501fc6c99778fdef9d2af3ceae7a7e141ae3e85d290a4c18b4f97f993533e40cc4e66d2715be6d78545ce9bbb413a4e357 SHA512 cfedba9ceca79511478180eefcc130a7a4a33ae2f0c2577b05df6acb24c261dfb03f914e1681bfb952efbc7ff27b729745afc5ef4f2fa2fbe6f1fdbb988600b4 +DIST EmptyEpsilon-2022.10.28-musl-and-ppc.patch 5440 BLAKE2B 7a3f20e5c6595ec037a1855f22b59dc979ff4f69bdf87f8bff09d32f2aedea60595ef4647c87ce182738352d00eaf54f1778dc8d3c46de96b7c7a4cbc963bab4 SHA512 bb555c3752348a4f23c5764542f8b9902b753358517463c04f044fe50a98e47a890fd425d2c4c38b6aa1eb7bc48ad508ad08ba5811b2825e7f0483f5312b DIST EmptyEpsilon-2022.10.28.tar.gz 258148673 BLAKE2B dcc2cdd6f02afef4fee00939145c4c98461ea5403ad45949ffc99758b0575f56504b610249231969f63751d8a2f746913a004d88d7287876a5b448a4b90d8162 SHA512 6af0522cb9f07f0b0cf3ac287ce57b156206b27b4d17de237acf50c46928782c49a4af397c9cad4be30603e0ee04bd6979404e11d0b2c5472cf0c278124df140 DIST SeriousProton-2022.10.28-add-missing-cstdint-include.patch 850 BLAKE2B f193fb30b39e7b07caf0018fc4e32430ee451baaf63315110e204e7e6f3aff84448a3a5cc83b60e642c27cebb39f532065bd1126f5646ac70645c1c341c8e464 SHA512 3645efb49ea012a31da0414a454bfca46170dfdfd90db7af07481181d75b87c621e7d8ba2ee9752c49d978ab0e5080f01b81eeb07cf1ce68425066c8a4111c2b DIST SeriousProton-2022.10.28-lua-fix-underlinking.patch 736 BLAKE2B 50a0fa840c90056032100d19805eb26ba4b0135b77cd7a9bfea92201c0c4b88b0e8597f6cbf453ebb8ffae19e90ef691fb1e98a0219027bfd906eade92956abe SHA512 d7949e6d622d7470de0a1a68c1cecc5920d72b8e9f919c7f0c19be884a981b7e07c8ed2e0c2f51eb532ff46bcb43f40eb4db1ebde7a97f708809f54c2396cf15
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: cfcbd2484c73b21dad1f2138f8f4eea5b31273a1 Author: Florian Schmaus gentoo org> AuthorDate: Thu Apr 20 08:01:22 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Apr 20 08:02:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfcbd248 games-simulation/EmptyEpsilon: fix compilation with gcc-13 Closes: https://bugs.gentoo.org/894738 Signed-off-by: Florian Schmaus gentoo.org> games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild | 12 games-simulation/EmptyEpsilon/Manifest | 3 +++ 2 files changed, 15 insertions(+) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild index 712b44d5d70d..11108d01222d 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild @@ -20,6 +20,12 @@ SRC_URI=" https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz + https://github.com/Flowdalic/SeriousProton/commit/dc9dccf6c802b9c55ac4eccad424d2b1af9f4b93.patch -> + SeriousProton-2022.10.28-add-missing-cstdint-include.patch + https://github.com/daid/SeriousProton/commit/3bb7f1cfbd91a4520ff23af7d761e08b5ca7cf88.patch -> + SeriousProton-2022.10.28-lua-fix-underlinking.patch + https://github.com/daid/EmptyEpsilon/commit/5d7e7bba4daadeeb05897349d518a8d9568331cc.patch -> + EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch " # EmptyEpsilon is mostly licensed under GPL, however the art ressources @@ -40,6 +46,8 @@ S="${WORKDIR}/EmptyEpsilon-EE-${PV}" PATCHES=( "${FILESDIR}/${PN}-cmake-meshoptimizer.patch" + # https://github.com/daid/EmptyEpsilon/pull/1969 + "${DISTDIR}/EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch" ) pkg_pretend() { @@ -72,6 +80,10 @@ src_prepare() { local serious_proton_patches=( "${FILESDIR}/SeriousProton-cmake.patch" + # https://github.com/daid/SeriousProton/pull/236 + "${DISTDIR}/SeriousProton-2022.10.28-add-missing-cstdint-include.patch" + # https://github.com/daid/SeriousProton/pull/237 + "${DISTDIR}/SeriousProton-2022.10.28-lua-fix-underlinking.patch" ) eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ "${serious_proton_patches[@]}" diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index 08dd565ed1f6..a4a5e3d5b266 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,6 +1,9 @@ DIST EmptyEpsilon-2022.03.16.tar.gz 258014053 BLAKE2B d447518c6887b5969bce48abc042a259733a6845a49ba767b274d17c1b0e28a025443d073563e269365837191439f7963f3a3775c58b143e97cef7b7c0cef336 SHA512 63f351be1af792be0ce8b1171ea14dd9f3ab75825ca9df48f7a7bfbc3cedfe05183f59896a51cd4e1f4e977aa5c9386159716dcc206afd7a1adab1df7c35e062 +DIST EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch 668 BLAKE2B 7338f41fa2bf3b95352ff70ce0440f501fc6c99778fdef9d2af3ceae7a7e141ae3e85d290a4c18b4f97f993533e40cc4e66d2715be6d78545ce9bbb413a4e357 SHA512 cfedba9ceca79511478180eefcc130a7a4a33ae2f0c2577b05df6acb24c261dfb03f914e1681bfb952efbc7ff27b729745afc5ef4f2fa2fbe6f1fdbb988600b4 DIST EmptyEpsilon-2022.10.28.tar.gz 258148673 BLAKE2B dcc2cdd6f02afef4fee00939145c4c98461ea5403ad45949ffc99758b0575f56504b610249231969f63751d8a2f746913a004d88d7287876a5b448a4b90d8162 SHA512 6af0522cb9f07f0b0cf3ac287ce57b156206b27b4d17de237acf50c46928782c49a4af397c9cad4be30603e0ee04bd6979404e11d0b2c5472cf0c278124df140 DIST SeriousProton-2022.03.16.tar.gz 2671635 BLAKE2B 9fdb58d50e7f3522678efe14b753016c4d2e3341f2e3b78ede00815e4f6a6361eb635016c9cdf0ce235a0bb35fb813b61790a5b0d1522a1e8afe2f3594674341 SHA512 74a06c69a3f49789b35a6e5795a7b1de1b7e79d36c956a92e1383f9983489319060c62f3ee6349e26ac985a5121b4e60cf7a3546ec78b3a830e30c0c99ccd023 +DIST SeriousProton-2022.10.28-add-missing-cstdint-include.patch 850 BLAKE2B f193fb30b39e7b07caf0018fc4e32430ee451baaf63315110e204e7e6f3aff84448a3a5cc83b60e642c27cebb39f532065bd1126f5646ac70645c1c341c8e464 SHA512 3645efb49ea012a31da0414a454bfca46170dfdfd90db7af07481181d75b87c621e7d8ba2ee9752c49d978ab0e5080f01b81eeb07cf1ce68425066c8a4111c2b +DIST SeriousProton-2022.10.28-lua-fix-underlinking.patch 736 BLAKE2B 50a0fa840c90056032100d19805eb26ba4b0135b77cd7a9bfea92201c0c4b88b0e8597f6cbf453ebb8ffae19e90ef691fb1e98a0219027bfd906eade92956abe SHA512
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: 9445521fdde7a87b8274b90926006af21c72a55e Author: Florian Schmaus gentoo org> AuthorDate: Thu Apr 20 08:02:00 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Apr 20 08:02:13 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9445521f games-simulation/EmptyEpsilon: drop 2022.03.16 Signed-off-by: Florian Schmaus gentoo.org> .../EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild| 92 -- games-simulation/EmptyEpsilon/Manifest | 2 - 2 files changed, 94 deletions(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild deleted file mode 100644 index ccb890d0ff82.. --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -# basics_universal version -MY_BU_VER="1_15_update2" -# meshoptimizer version -MY_MO_VER="0.16" - -DESCRIPTION="A spaceship bridge simulator game" -HOMEPAGE="https://daid.github.io/EmptyEpsilon/; -# This bundles SeriousProton as the build system does not support using -# a separate SeriousProton instance (and currently EmptyEpsilon seems to -# be the only consumer). -SRC_URI=" - https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz - https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz - https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz - https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz -" - -# EmptyEpsilon is mostly licensed under GPL, however the art ressources -# use Creative Commons and the bundled SeriousProton is MIT-licensed. -LICENSE="Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT" -SLOT="0" -KEYWORDS="amd64" - -RDEPEND=" - dev-cpp/nlohmann_json - media-libs/freetype - media-libs/libsdl2 - >=media-libs/glm-0.9.9.8 -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/EmptyEpsilon-EE-${PV}" - -PATCHES=( - "${FILESDIR}/${PN}-cmake-meshoptimizer.patch" -) - -pkg_pretend() { - [[ ${MERGE_TYPE} == "binary" ]] && return - - if tc-is-gcc; then - if [[ $(gcc-major-version) -lt 11 ]]; then - # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' - eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." - die "Need at least GCC >= 11" - fi - fi -} - -src_prepare() { - cmake_src_prepare - - local -A externals=() - externals["${BUILD_DIR}/SeriousProton/externals/basis"]="${WORKDIR}/basis_universal-${MY_BU_VER}" - externals["${BUILD_DIR}/externals/meshoptimizer"]="${WORKDIR}/meshoptimizer-${MY_MO_VER}" - local link - for link in "${!externals[@]}"; do - local external_dir=$(dirname "${link}") - if [[ ! -d "${external_dir}" ]]; then - mkdir -p "${external_dir}" || die - fi - local target="${externals[${link}]}" - ln -rs "${target}" "${link}" || die - done - - local serious_proton_patches=( - "${FILESDIR}/SeriousProton-cmake.patch" - "${FILESDIR}/SeriousProton-Add-missing-include-memory-to-websocket.h.patch" - ) - eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ - "${serious_proton_patches[@]}" -} - -src_configure() { - local version=( $(ver_rs 1- ' ') ) - local mycmakeargs=( - -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" - -DCPACK_PACKAGE_VERSION="${PV}" - -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" - -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" - -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" - ) - - cmake_src_configure -} diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index a4a5e3d5b266..b913ff0d163c 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,7 +1,5 @@ -DIST EmptyEpsilon-2022.03.16.tar.gz 258014053 BLAKE2B d447518c6887b5969bce48abc042a259733a6845a49ba767b274d17c1b0e28a025443d073563e269365837191439f7963f3a3775c58b143e97cef7b7c0cef336 SHA512 63f351be1af792be0ce8b1171ea14dd9f3ab75825ca9df48f7a7bfbc3cedfe05183f59896a51cd4e1f4e977aa5c9386159716dcc206afd7a1adab1df7c35e062 DIST EmptyEpsilon-2022.10.28-fix-underliking-stdcxx.patch 668 BLAKE2B
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: 61f071010c49a66431791cf098668cbe0f5962b2 Author: Florian Schmaus gentoo org> AuthorDate: Tue Mar 21 11:14:36 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Tue Mar 21 11:15:32 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=61f07101 games-simulation/EmptyEpsilon: stabilize 2022.10.28 for amd64 Signed-off-by: Florian Schmaus gentoo.org> games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild index d25e36d666ad..712b44d5d70d 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild @@ -26,7 +26,7 @@ SRC_URI=" # use Creative Commons and the bundled SeriousProton is MIT-licensed. LICENSE="Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" dev-cpp/nlohmann_json
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/files/
commit: dcf791cd84278c02d9c7c42c1050c3c074a3643c Author: Michael Mair-Keimberger levelnine at> AuthorDate: Wed Feb 22 16:41:59 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Wed Feb 22 18:27:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcf791cd games-simulation/EmptyEpsilon: remove unused patches Signed-off-by: Michael Mair-Keimberger levelnine.at> Closes: https://github.com/gentoo/gentoo/pull/29727 Signed-off-by: Florian Schmaus gentoo.org> ...EmptyEpsilon-Install-EmptyEpsilon.desktop.patch | 45 -- ...yEpsilon-Make-CMake-call-find_package-glm.patch | 35 - .../files/SeriousProton-Unbundle-json11.patch | 27 - 3 files changed, 107 deletions(-) diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch deleted file mode 100644 index 4730bcbabb25.. --- a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch +++ /dev/null @@ -1,45 +0,0 @@ -From c34c773ab5a403c288d7eecd971ae5b0d9eecfa0 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Thu, 21 Oct 2021 10:33:28 +0200 -Subject: [PATCH] Install EmptyEpsilon.desktop - -Fixes #405. - -See also https://bugs.gentoo.org/818697 - CMakeLists.txt | 5 + - EmptyEpsilon.desktop | 9 + - 2 files changed, 14 insertions(+) - create mode 100644 EmptyEpsilon.desktop - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index cb3e32c0e6ed..b630668aecd9 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -711,3 +711,8 @@ set(CPACK_INSTALL_CMAKE_PROJECTS - ) - - include(CPack) -+ -+if(UNIX AND NOT APPLE) -+ install(FILES EmptyEpsilon.desktop DESTINATION "share/applications") -+ install(FILES logo.png DESTINATION "share/icons" RENAME "EmptyEpsilon.png") -+endif() -diff --git a/EmptyEpsilon.desktop b/EmptyEpsilon.desktop -new file mode 100644 -index ..07cc109b578d /dev/null -+++ b/EmptyEpsilon.desktop -@@ -0,0 +1,9 @@ -+[Desktop Entry] -+Name=EmptyEpsilon -+GenericName=EmptyEpsilon -+Comment=Spaceship bridge simulator game -+Exec=EmptyEpsilon -+Icon=EmptyEpsilon -+Terminal=false -+Type=Application -+Categories=Game;Simulation; --- -2.33.1 - diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch deleted file mode 100644 index da52f0267f77.. --- a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 7efb73d1a964f04646dba692323c1affcb25d16e Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Fri, 8 Oct 2021 11:07:20 +0200 -Subject: [PATCH] Make CMake call find_package(glm) - - CMakeLists.txt | 12 +--- - 1 file changed, 1 insertion(+), 11 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 6fb5c88f6614..9d65d1ef2653 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -106,17 +106,7 @@ if(WITH_DISCORD) - endif() - - # GLM --set(GLM_BASE_PATH "${EXTERNALS_DIR}") -- --if(NOT EXISTS "${GLM_BASE_PATH}/glm/CMakeLists.txt") -- set(GLM_ZIP "${DOWNLOADS_DIR}/glm.zip") -- file(DOWNLOAD "https://github.com/g-truc/glm/releases/download/0.9.9.8/glm-0.9.9.8.zip; "${GLM_ZIP}" TIMEOUT 60 TLS_VERIFY ON) -- -- file(MAKE_DIRECTORY "${GLM_BASE_PATH}/glm") -- execute_process(COMMAND ${CMAKE_COMMAND} -E tar -xf "${GLM_ZIP}" WORKING_DIRECTORY "${GLM_BASE_PATH}") --endif() -- --add_subdirectory("${GLM_BASE_PATH}/glm" "${PROJECT_BINARY_DIR}/glm" EXCLUDE_FROM_ALL) -+find_package(glm) - - set(SOURCES - src/main.cpp --- -2.32.0 - diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch deleted file mode 100644 index deb44e9aee00.. --- a/games-simulation/EmptyEpsilon/files/SeriousProton-Unbundle-json11.patch +++ /dev/null @@ -1,27 +0,0 @@ -From ae5ea143e6a9f57c797a96b9024c8acc60f05828 Mon Sep 17 00:00:00 2001 -From: Florian Schmaus -Date: Fri, 8 Oct 2021 13:26:27 +0200 -Subject: [PATCH] Unbundle json11 - - CMakeLists.txt | 4 - 1 file changed, 4 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4b57a4f6631a..0a06c3186ff5 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -86,10 +86,6 @@ add_subdirectory(src/lua) - add_subdirectory(src/GL) - add_subdirectory(src/libopus) - --if(SERIOUSPROTON_WITH_JSON) --add_subdirectory(src/json11) --endif() -- - #-File lists--- - set(source_files #All SeriousProton's objects to compile - src/clipboard.cpp --- -2.32.0 -
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: 95adb59c642ad5289e582af07c34c9e2ccf0d1ae Author: Florian Schmaus gentoo org> AuthorDate: Thu Feb 16 09:01:35 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Feb 16 09:01:49 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=95adb59c games-simulation/EmptyEpsilon: drop 2021.06.23-r1 Signed-off-by: Florian Schmaus gentoo.org> .../EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild | 69 -- games-simulation/EmptyEpsilon/Manifest | 2 - 2 files changed, 71 deletions(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild deleted file mode 100644 index c1ff6c877b43.. --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild +++ /dev/null @@ -1,69 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake toolchain-funcs - -DESCRIPTION="A spaceship bridge simulator game" -HOMEPAGE="https://daid.github.io/EmptyEpsilon/; -# This bundles SeriousProton as the build system does not support using -# a separate SeriousProton instance (and currently EmptyEpsilon seems to -# be the only consumer). -SRC_URI="https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz - https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz" - -# EmptyEpsilon is mostly licensed under GPL, however the art ressources -# use Creative Commons and the bundled SeriousProton is MIT-licensed. -LICENSE="GPL-2 CC-BY-SA-3.0 MIT" -SLOT="0" -KEYWORDS="amd64" - -RDEPEND=" - >=dev-cpp/json11-1.0.0 - media-libs/libglvnd - media-libs/libsfml - >=media-libs/glm-0.9.9.8 -" -DEPEND="${RDEPEND}" - -S="${WORKDIR}/EmptyEpsilon-EE-${PV}" - -pkg_pretend() { - if [[ ${MERGE_TYPE} == "binary" ]]; then - return - fi - - if tc-is-gcc; then - if [[ $(gcc-major-version) -lt 11 ]]; then - # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' - eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." - die "Need at least GCC >= 11" - fi - fi -} - -src_prepare() { - eapply "${FILESDIR}/${PN}-Install-EmptyEpsilon.desktop.patch" - eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch" - eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ - "${FILESDIR}/SeriousProton-Unbundle-json11.patch" - - eapply_user - - cmake_src_prepare -} - -src_configure() { - local version=( $(ver_rs 1- ' ') ) - local mycmakeargs=( - -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" - -DOpenGL_GL_PREFERENCE=GLVND - -DCPACK_PACKAGE_VERSION="${PV}" - -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" - -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" - -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" - ) - - cmake_src_configure -} diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index f3ba3cc8a30c..08dd565ed1f6 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,7 +1,5 @@ -DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764 DIST EmptyEpsilon-2022.03.16.tar.gz 258014053 BLAKE2B d447518c6887b5969bce48abc042a259733a6845a49ba767b274d17c1b0e28a025443d073563e269365837191439f7963f3a3775c58b143e97cef7b7c0cef336 SHA512 63f351be1af792be0ce8b1171ea14dd9f3ab75825ca9df48f7a7bfbc3cedfe05183f59896a51cd4e1f4e977aa5c9386159716dcc206afd7a1adab1df7c35e062 DIST EmptyEpsilon-2022.10.28.tar.gz 258148673 BLAKE2B dcc2cdd6f02afef4fee00939145c4c98461ea5403ad45949ffc99758b0575f56504b610249231969f63751d8a2f746913a004d88d7287876a5b448a4b90d8162 SHA512 6af0522cb9f07f0b0cf3ac287ce57b156206b27b4d17de237acf50c46928782c49a4af397c9cad4be30603e0ee04bd6979404e11d0b2c5472cf0c278124df140 -DIST SeriousProton-2021.06.23.tar.gz 1181117 BLAKE2B 433280b7f6994bed0b86ffc4135a1e91bd9521c508b875332d17dc041da6b77a4260de784b6b75e79aab072d6bc68108a8b6b4949d674670f1d13ed1abe90d7e SHA512 4519801c30cd87436704023090ce39299573b02637a86b0d5c6ac0f4e99b4bddc6724b2b660edfd29d33a908b67268409a8c47dab7b5d59958a5abd52d5610bf DIST SeriousProton-2022.03.16.tar.gz 2671635 BLAKE2B 9fdb58d50e7f3522678efe14b753016c4d2e3341f2e3b78ede00815e4f6a6361eb635016c9cdf0ce235a0bb35fb813b61790a5b0d1522a1e8afe2f3594674341 SHA512
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: 5ad764aff43b52a587f8dfa541ba9fa63d062c93 Author: Florian Schmaus gentoo org> AuthorDate: Thu Feb 16 09:01:14 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Feb 16 09:01:48 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5ad764af games-simulation/EmptyEpsilon: add github upstream metadata Signed-off-by: Florian Schmaus gentoo.org> games-simulation/EmptyEpsilon/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/games-simulation/EmptyEpsilon/metadata.xml b/games-simulation/EmptyEpsilon/metadata.xml index a7fa285c7476..c700facfe383 100644 --- a/games-simulation/EmptyEpsilon/metadata.xml +++ b/games-simulation/EmptyEpsilon/metadata.xml @@ -5,4 +5,7 @@ Florian Schmaus f...@gentoo.org + + daid/EmptyEpsilon +
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: 73f129a1f74d64e234ac95363c396a3f63cf1d52 Author: Florian Schmaus gentoo org> AuthorDate: Thu Feb 16 09:00:03 2023 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Feb 16 09:01:47 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f129a1 games-simulation/EmptyEpsilon: add 2022.10.28 Signed-off-by: Florian Schmaus gentoo.org> .../EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild| 91 ++ games-simulation/EmptyEpsilon/Manifest | 2 + 2 files changed, 93 insertions(+) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild new file mode 100644 index ..d25e36d666ad --- /dev/null +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.10.28.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +# basis_universal version +MY_BU_VER="1_15_update2" +# meshoptimizer version +MY_MO_VER="0.16" + +DESCRIPTION="A spaceship bridge simulator game" +HOMEPAGE="https://daid.github.io/EmptyEpsilon/; +# This bundles SeriousProton as the build system does not support using +# a separate SeriousProton instance (and currently EmptyEpsilon seems to +# be the only consumer). +SRC_URI=" + https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz + https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz + https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz + https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz +" + +# EmptyEpsilon is mostly licensed under GPL, however the art ressources +# use Creative Commons and the bundled SeriousProton is MIT-licensed. +LICENSE="Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-cpp/nlohmann_json + media-libs/freetype + media-libs/libsdl2 + >=media-libs/glm-0.9.9.8 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/EmptyEpsilon-EE-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-cmake-meshoptimizer.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} == "binary" ]] && return + + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 11 ]]; then + # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' + eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." + die "Need at least GCC >= 11" + fi + fi +} + +src_prepare() { + cmake_src_prepare + + local -A externals=() + externals["${BUILD_DIR}/SeriousProton/externals/basis"]="${WORKDIR}/basis_universal-${MY_BU_VER}" + externals["${BUILD_DIR}/externals/meshoptimizer"]="${WORKDIR}/meshoptimizer-${MY_MO_VER}" + local link + for link in "${!externals[@]}"; do + local external_dir=$(dirname "${link}") + if [[ ! -d "${external_dir}" ]]; then + mkdir -p "${external_dir}" || die + fi + local target="${externals[${link}]}" + ln -rs "${target}" "${link}" || die + done + + local serious_proton_patches=( + "${FILESDIR}/SeriousProton-cmake.patch" + ) + eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ + "${serious_proton_patches[@]}" +} + +src_configure() { + local version=( $(ver_rs 1- ' ') ) + local mycmakeargs=( + -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" + -DCPACK_PACKAGE_VERSION="${PV}" + -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" + -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" + -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" + ) + + cmake_src_configure +} diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index aaf0d0e732ff..f3ba3cc8a30c 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,6 +1,8 @@ DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764 DIST EmptyEpsilon-2022.03.16.tar.gz 258014053 BLAKE2B d447518c6887b5969bce48abc042a259733a6845a49ba767b274d17c1b0e28a025443d073563e269365837191439f7963f3a3775c58b143e97cef7b7c0cef336 SHA512
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: eb7bd29b08b126b190134596e47c56fc5e160236 Author: Florian Schmaus gentoo org> AuthorDate: Fri Jul 1 08:16:59 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Fri Jul 1 08:18:58 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb7bd29b games-simulation/EmptyEpsilon: stabilize 2022.03.16 for amd64 Signed-off-by: Florian Schmaus gentoo.org> games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild index 3ab9976cc817..ccb890d0ff82 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild @@ -26,7 +26,7 @@ SRC_URI=" # use Creative Commons and the bundled SeriousProton is MIT-licensed. LICENSE="Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" dev-cpp/nlohmann_json
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/, games-simulation/EmptyEpsilon/files/
commit: df31905a60fab5a2db71994d7b2a2eeabeb31268 Author: Florian Schmaus gentoo org> AuthorDate: Sun May 22 17:53:56 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Sun May 22 17:53:56 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df31905a games-simulation/EmptyEpsilon: fix compilation with gcc 12 Closes: https://bugs.gentoo.org/846935 Signed-off-by: Florian Schmaus gentoo.org> .../EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild| 6 +- ...Add-missing-include-memory-to-websocket.h.patch | 23 ++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild index 9842d07150b2..3ab9976cc817 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild @@ -70,8 +70,12 @@ src_prepare() { ln -rs "${target}" "${link}" || die done + local serious_proton_patches=( + "${FILESDIR}/SeriousProton-cmake.patch" + "${FILESDIR}/SeriousProton-Add-missing-include-memory-to-websocket.h.patch" + ) eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ - "${FILESDIR}/SeriousProton-cmake.patch" + "${serious_proton_patches[@]}" } src_configure() { diff --git a/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch new file mode 100644 index ..861eaa781e8f --- /dev/null +++ b/games-simulation/EmptyEpsilon/files/SeriousProton-Add-missing-include-memory-to-websocket.h.patch @@ -0,0 +1,23 @@ +From 9fe127233eae44f14e37900c3f54e8a305d2f161 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Sun, 22 May 2022 12:36:08 +0200 +Subject: [PATCH] Add missing #include to websocket.h + +std::unique_ptr, which is used for the 'socket' field, is defined in + but currently not included. Starting with GCC 12, the missing +include will cause a compilation error. + +The missing include was found by Gentoo's CI and reported as +https://bugs.gentoo.org/846935 +--- a/src/io/http/websocket.h b/src/io/http/websocket.h +@@ -5,6 +5,9 @@ + #include + #include + ++#ifndef EMSCRIPTEN ++#include ++#endif + + namespace sp { + namespace io {
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/, games-simulation/EmptyEpsilon/files/
commit: eb81f1f23a16118debe1daebbccc58d02a3f5631 Author: Florian Schmaus gentoo org> AuthorDate: Mon May 16 09:59:11 2022 + Commit: Florian Schmaus gentoo org> CommitDate: Mon May 16 10:12:05 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb81f1f2 games-simulation/EmptyEpsilon: add 2022.03.16 Signed-off-by: Florian Schmaus gentoo.org> .../EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild| 88 ++ games-simulation/EmptyEpsilon/Manifest | 4 + .../files/EmptyEpsilon-cmake-meshoptimizer.patch | 15 .../EmptyEpsilon/files/SeriousProton-cmake.patch | 15 4 files changed, 122 insertions(+) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild new file mode 100644 index ..9842d07150b2 --- /dev/null +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2022.03.16.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +# basics_universal version +MY_BU_VER="1_15_update2" +# meshoptimizer version +MY_MO_VER="0.16" + +DESCRIPTION="A spaceship bridge simulator game" +HOMEPAGE="https://daid.github.io/EmptyEpsilon/; +# This bundles SeriousProton as the build system does not support using +# a separate SeriousProton instance (and currently EmptyEpsilon seems to +# be the only consumer). +SRC_URI=" + https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz + https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz + https://github.com/BinomialLLC/basis_universal/archive/refs/tags/v${MY_BU_VER}.tar.gz -> basis_universal_${MY_BU_VER}.tar.gz + https://github.com/zeux/meshoptimizer/archive/refs/tags/v${MY_MO_VER}.tar.gz -> meshoptimizer-${MY_MO_VER}.tar.gz +" + +# EmptyEpsilon is mostly licensed under GPL, however the art ressources +# use Creative Commons and the bundled SeriousProton is MIT-licensed. +LICENSE="Apache-2.0 GPL-2 CC-BY-SA-3.0 MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + dev-cpp/nlohmann_json + media-libs/freetype + media-libs/libsdl2 + >=media-libs/glm-0.9.9.8 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/EmptyEpsilon-EE-${PV}" + +PATCHES=( + "${FILESDIR}/${PN}-cmake-meshoptimizer.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} == "binary" ]] && return + + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 11 ]]; then + # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' + eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." + die "Need at least GCC >= 11" + fi + fi +} + +src_prepare() { + cmake_src_prepare + + local -A externals=() + externals["${BUILD_DIR}/SeriousProton/externals/basis"]="${WORKDIR}/basis_universal-${MY_BU_VER}" + externals["${BUILD_DIR}/externals/meshoptimizer"]="${WORKDIR}/meshoptimizer-${MY_MO_VER}" + local link + for link in "${!externals[@]}"; do + local external_dir=$(dirname "${link}") + if [[ ! -d "${external_dir}" ]]; then + mkdir -p "${external_dir}" || die + fi + local target="${externals[${link}]}" + ln -rs "${target}" "${link}" || die + done + + eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ + "${FILESDIR}/SeriousProton-cmake.patch" +} + +src_configure() { + local version=( $(ver_rs 1- ' ') ) + local mycmakeargs=( + -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" + -DCPACK_PACKAGE_VERSION="${PV}" + -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" + -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" + -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" + ) + + cmake_src_configure +} diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest index a04319c8d93f..aaf0d0e732ff 100644 --- a/games-simulation/EmptyEpsilon/Manifest +++ b/games-simulation/EmptyEpsilon/Manifest @@ -1,2 +1,6 @@ DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764 +DIST EmptyEpsilon-2022.03.16.tar.gz 258014053 BLAKE2B d447518c6887b5969bce48abc042a259733a6845a49ba767b274d17c1b0e28a025443d073563e269365837191439f7963f3a3775c58b143e97cef7b7c0cef336 SHA512
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/
commit: 597a0aa34d01a6385caffad2beab74f2deecd38d Author: Sam James gentoo org> AuthorDate: Sat Jan 8 00:33:43 2022 + Commit: Sam James gentoo org> CommitDate: Sat Jan 8 00:33:43 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=597a0aa3 games-simulation/EmptyEpsilon: Stabilize 2021.06.23-r1 amd64, #830721 Signed-off-by: Sam James gentoo.org> games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild index c7cdef11bba5..c1ff6c877b43 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -17,7 +17,7 @@ SRC_URI="https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEp # use Creative Commons and the bundled SeriousProton is MIT-licensed. LICENSE="GPL-2 CC-BY-SA-3.0 MIT" SLOT="0" -KEYWORDS="~amd64" +KEYWORDS="amd64" RDEPEND=" >=dev-cpp/json11-1.0.0
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/files/, games-simulation/EmptyEpsilon/
commit: e6ba27a83a9b9e1df6b4e370e15e6a798f08060e Author: Florian Schmaus gentoo org> AuthorDate: Thu Oct 21 10:52:39 2021 + Commit: Florian Schmaus gentoo org> CommitDate: Thu Oct 21 11:13:11 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6ba27a8 games-simulation/EmptyEpsilon: install .desktop file Closes: https://bugs.gentoo.org/818697 Signed-off-by: Florian Schmaus gentoo.org> ...23.ebuild => EmptyEpsilon-2021.06.23-r1.ebuild} | 1 + ...EmptyEpsilon-Install-EmptyEpsilon.desktop.patch | 45 ++ 2 files changed, 46 insertions(+) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild similarity index 96% rename from games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild rename to games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild index 5d9e67d4a9f..046224a20d1 100644 --- a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23-r1.ebuild @@ -44,6 +44,7 @@ pkg_pretend() { } src_prepare() { + eapply "${FILESDIR}/${PN}-Install-EmptyEpsilon.desktop.patch" eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch" eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ "${FILESDIR}/SeriousProton-Unbundle-json11.patch" diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch new file mode 100644 index 000..4730bcbabb2 --- /dev/null +++ b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Install-EmptyEpsilon.desktop.patch @@ -0,0 +1,45 @@ +From c34c773ab5a403c288d7eecd971ae5b0d9eecfa0 Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Thu, 21 Oct 2021 10:33:28 +0200 +Subject: [PATCH] Install EmptyEpsilon.desktop + +Fixes #405. + +See also https://bugs.gentoo.org/818697 +--- + CMakeLists.txt | 5 + + EmptyEpsilon.desktop | 9 + + 2 files changed, 14 insertions(+) + create mode 100644 EmptyEpsilon.desktop + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index cb3e32c0e6ed..b630668aecd9 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -711,3 +711,8 @@ set(CPACK_INSTALL_CMAKE_PROJECTS + ) + + include(CPack) ++ ++if(UNIX AND NOT APPLE) ++ install(FILES EmptyEpsilon.desktop DESTINATION "share/applications") ++ install(FILES logo.png DESTINATION "share/icons" RENAME "EmptyEpsilon.png") ++endif() +diff --git a/EmptyEpsilon.desktop b/EmptyEpsilon.desktop +new file mode 100644 +index ..07cc109b578d +--- /dev/null b/EmptyEpsilon.desktop +@@ -0,0 +1,9 @@ ++[Desktop Entry] ++Name=EmptyEpsilon ++GenericName=EmptyEpsilon ++Comment=Spaceship bridge simulator game ++Exec=EmptyEpsilon ++Icon=EmptyEpsilon ++Terminal=false ++Type=Application ++Categories=Game;Simulation; +-- +2.33.1 +
[gentoo-commits] repo/gentoo:master commit in: games-simulation/EmptyEpsilon/files/, games-simulation/EmptyEpsilon/
commit: eb6fc9c7005c78ddadba92660dec4eb156de3a09 Author: Florian Schmaus gentoo org> AuthorDate: Sat Oct 9 15:01:34 2021 + Commit: Florian Schmaus gentoo org> CommitDate: Sat Oct 9 15:01:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb6fc9c7 games-simulation/EmptyEpsilon: initial import Closes: https://bugs.gentoo.org/717592 Signed-off-by: Florian Schmaus gentoo.org> .../EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild| 68 ++ games-simulation/EmptyEpsilon/Manifest | 2 + ...yEpsilon-Make-CMake-call-find_package-glm.patch | 35 +++ .../files/SeriousProton-Unbundle-json11.patch | 27 + games-simulation/EmptyEpsilon/metadata.xml | 8 +++ 5 files changed, 140 insertions(+) diff --git a/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild new file mode 100644 index 000..5d9e67d4a9f --- /dev/null +++ b/games-simulation/EmptyEpsilon/EmptyEpsilon-2021.06.23.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs + +DESCRIPTION="A spaceship bridge simulator game." +HOMEPAGE="https://daid.github.io/EmptyEpsilon/; +# This bundles SeriousProton as the build system does not support using +# a separate SeriousProton instance (and currently EmptyEpsilon seems to +# be the only consumer). +SRC_URI="https://github.com/daid/EmptyEpsilon/archive/EE-${PV}.tar.gz -> EmptyEpsilon-${PV}.tar.gz + https://github.com/daid/SeriousProton/archive/EE-${PV}.tar.gz -> SeriousProton-${PV}.tar.gz" + +# EmptyEpsilon is mostly licensed under GPL, however the art ressources +# use Creative Commons and the bundled SeriousProton is MIT-licensed. +LICENSE="GPL-2 CC-BY-SA-3.0 MIT" +SLOT="0" +KEYWORDS="~amd64" + +RDEPEND=" + >=dev-cpp/json11-1.0.0 + media-libs/libglvnd + media-libs/libsfml + >=media-libs/glm-0.9.9.8 +" +DEPEND="${RDEPEND}" + +S="${WORKDIR}/EmptyEpsilon-EE-${PV}" + +pkg_pretend() { + if [[ ${MERGE_TYPE} == "binary" ]]; then + return + fi + + if tc-is-gcc; then + if [[ $(gcc-major-version) -lt 11 ]]; then + # ld: /usr/lib64/libsfml-audio.so: undefined reference to `std::__throw_bad_array_new_length()@GLIBCXX_3.a4.29' + eerror "${PN} requires GCC >= 11. Run gcc-config to switch your default compiler." + die "Need at least GCC >= 11" + fi + fi +} + +src_prepare() { + eapply "${FILESDIR}/${PN}-Make-CMake-call-find_package-glm.patch" + eapply --directory="${WORKDIR}/SeriousProton-EE-${PV}" \ + "${FILESDIR}/SeriousProton-Unbundle-json11.patch" + + eapply_user + + cmake_src_prepare +} + +src_configure() { + local version=( $(ver_rs 1- ' ') ) + local mycmakeargs=( + -DSERIOUS_PROTON_DIR="${WORKDIR}/SeriousProton-EE-${PV}/" + -DOpenGL_GL_PREFERENCE=GLVND + -DCPACK_PACKAGE_VERSION="${PV}" + -DCPACK_PACKAGE_VERSION_MAJOR="${version[0]}" + -DCPACK_PACKAGE_VERSION_MINOR="${version[1]}" + -DCPACK_PACKAGE_VERSION_PATCH="${version[2]}" + ) + + cmake_src_configure +} diff --git a/games-simulation/EmptyEpsilon/Manifest b/games-simulation/EmptyEpsilon/Manifest new file mode 100644 index 000..a04319c8d93 --- /dev/null +++ b/games-simulation/EmptyEpsilon/Manifest @@ -0,0 +1,2 @@ +DIST EmptyEpsilon-2021.06.23.tar.gz 285211647 BLAKE2B 813b7e02ff7f046b7f28139063441eb421861b720c7b55d25930d3a418211fefdce7ac0e6ab705b4afe52df58f85a9298ff3e6be883a841e6eb9f7037eca297b SHA512 209ea68d99ef5ef53f1e3484d6471cafc01d4cb6505609a5b41d468387147127b4b4bbc20af75404d2cdef3d3cfb37bbb7f6fb3ae336d2f7e264e9c470ad7764 +DIST SeriousProton-2021.06.23.tar.gz 1181117 BLAKE2B 433280b7f6994bed0b86ffc4135a1e91bd9521c508b875332d17dc041da6b77a4260de784b6b75e79aab072d6bc68108a8b6b4949d674670f1d13ed1abe90d7e SHA512 4519801c30cd87436704023090ce39299573b02637a86b0d5c6ac0f4e99b4bddc6724b2b660edfd29d33a908b67268409a8c47dab7b5d59958a5abd52d5610bf diff --git a/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch new file mode 100644 index 000..da52f0267f7 --- /dev/null +++ b/games-simulation/EmptyEpsilon/files/EmptyEpsilon-Make-CMake-call-find_package-glm.patch @@ -0,0 +1,35 @@ +From 7efb73d1a964f04646dba692323c1affcb25d16e Mon Sep 17 00:00:00 2001 +From: Florian Schmaus +Date: Fri, 8 Oct 2021 11:07:20 +0200 +Subject: [PATCH] Make CMake call find_package(glm) + +--- + CMakeLists.txt | 12 +--- + 1 file changed, 1 insertion(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index