From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:51952) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ivHap-0004k9-Pa for guix-patches@gnu.org; Sat, 25 Jan 2020 04:19:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ivHao-0002jg-K2 for guix-patches@gnu.org; Sat, 25 Jan 2020 04:19:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:48988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ivHao-0002jc-GN for guix-patches@gnu.org; Sat, 25 Jan 2020 04:19:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ivHao-0007gR-CD for guix-patches@gnu.org; Sat, 25 Jan 2020 04:19:02 -0500 Subject: [bug#39263] [PATCH 2/2] gnu: godot: Unbundle some dependencies. Resent-Message-ID: References: <20200124150226.27294-1-timotej.lazar@araneo.si> <20200124150226.27294-2-timotej.lazar@araneo.si> From: Christopher Baines In-reply-to: <20200124150226.27294-2-timotej.lazar@araneo.si> Date: Sat, 25 Jan 2020 09:18:33 +0000 Message-ID: <87y2tv6gie.fsf@cbaines.net> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="=-=-="; micalg=pgp-sha512; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Timotej Lazar Cc: 39263@debbugs.gnu.org --=-=-= Content-Type: text/plain Timotej Lazar writes: > * gnu/packages/game-development.scm (godot)[inputs]: Add bullet, pcre2, zstd. > [arguments](configure-flags): Use system libraries for the above. > [source](snippet): Remove bundled copies. > --- Generally, this is good :) > gnu/packages/game-development.scm | 18 ++++++++++++++---- > 1 file changed, 14 insertions(+), 4 deletions(-) > > diff --git a/gnu/packages/game-development.scm b/gnu/packages/game-development.scm > index 79e3f6dc6c..9ded71375f 100644 > --- a/gnu/packages/game-development.scm > +++ b/gnu/packages/game-development.scm > @@ -78,6 +78,7 @@ > #:use-module (gnu packages multiprecision) > #:use-module (gnu packages music) > #:use-module (gnu packages ncurses) > + #:use-module (gnu packages pcre) > #:use-module (gnu packages pkg-config) > #:use-module (gnu packages pulseaudio) > #:use-module (gnu packages python) > @@ -1521,7 +1522,8 @@ games.") > ;; of these may be modified; see "thirdparty/README.md". > (with-directory-excursion "thirdparty" > (for-each delete-file-recursively > - '("freetype" > + '("bullet" > + "freetype" > "libogg" > "libpng" > "libtheora" > @@ -1529,7 +1531,9 @@ games.") > "libvpx" > "libwebp" > "opus" > - "zlib")) > + "pcre2" > + "zlib" > + "zstd")) > #t))))) One thought I had here is that it would be more rigorous to have a list of directories that are kept, and anything not on the list is deleted. That way it's harder for new thirdparty dependencies to sneak in. Not something that necessarily needs changing now though. > (build-system scons-build-system) > (arguments > @@ -1541,6 +1545,7 @@ games.") > '()) > ;; Avoid using many of the bundled libs. > ;; Note: These options can be found in the SConstruct file. > + "builtin_bullet=no" > "builtin_freetype=no" > "builtin_glew=no" > "builtin_libmpdec=no" > @@ -1551,7 +1556,9 @@ games.") > "builtin_libvpx=no" > "builtin_libwebp=no" > "builtin_opus=no" > - "builtin_zlib=no") > + "builtin_pcre2=no" > + "builtin_zlib=no" > + "builtin_zstd=no") > #:tests? #f ; There are no tests > #:phases > (modify-phases %standard-phases > @@ -1598,6 +1605,7 @@ games.") > #t)))))) > (native-inputs `(("pkg-config" ,pkg-config))) > (inputs `(("alsa-lib" ,alsa-lib) > + ("bullet" ,bullet) > ("freetype" ,freetype) > ("glew" ,glew) > ("glu" ,glu) > @@ -1612,7 +1620,9 @@ games.") > ("libxrandr" ,libxrandr) > ("mesa" ,mesa) > ("opusfile" ,opusfile) > - ("pulseaudio" ,pulseaudio))) > + ("pcre2" ,pcre2) > + ("pulseaudio" ,pulseaudio) > + ("zstd" ,zstd "lib"))) > (home-page "https://godotengine.org/") > (synopsis "Advanced 2D and 3D game engine") > (description --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQKTBAEBCgB9FiEEPonu50WOcg2XVOCyXiijOwuE9XcFAl4sB+lfFIAAAAAALgAo aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcACgkQXiijOwuE 9Xf57w/+LVLq6V2+was9QUXBoyS6CkI88rrHj9wLUi+vCte9gh3h1AlrVmd/i6CQ SB8qauyUDJU1nve3oR+/0u2h6hYwrIdsgkkYZBwhsixyo/CN+A/YvPPheWHv9U2U FzVfbZ12TmNGLsbyO3Ywgkxtntwwo6MNwqJx2O5uBSH2Y3p35SsJSKnnmrVaV4kw jomAI3vLQhvVhyR80NZY5vMuB/47fWhvWgrCfC1QYWceYOJ13NCNs+DYEJq2xOjh a1S1VdiYFczOXQB7cDbUY/w0ZLsZdTYAEQ64SQ1PgzTIfN4KrpOZD00cRZJ9uFbb LEviOFTCSIlqAZpeoOR/r77Ux5DX2HdeHeLxUJiYIlOHmW1uFAJcJUe/rRmAJWKD sMTq5/6t6+FxQNMVpIhEzjryM5QylTojiNKQ2br1FDVn3BfZx5HXVMqrZSrF6GLi ZLeSbCiD16PanZU6JOAGGjRtXNFcUQMd33Ze5klhJdozIDi4yr8uIiY+w43dV4B8 /kCtGEnwsQ/xXgHfNhrajTLx9qMn/yVkxSj32A4tgx14TPLRyDOgp1sTD8Vyu4Xs eioBf3FqGrwR71fdi5rZFsZnT6q0rwUz5TYs/xa/xTp732LP+UqNh1Igz0b5U6Cq B3OOvYizrsXMEfSppYhWYLKlrg7DmBTMn5te5Lpn7Iahj1xTQI4= =T8ZV -----END PGP SIGNATURE----- --=-=-=--