[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: 57d4ce1472ddaf7879e4419495c037420155920b
Author: James Le Cuirot gentoo org>
AuthorDate: Sun Jun 16 22:33:50 2024 +
Commit: James Le Cuirot gentoo org>
CommitDate: Sun Jun 16 22:33:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57d4ce14
games-strategy/0ad: Fix compatibility with miniupnpc 2.2.8 with patch
Thanks to Torsten Kaiser for the patch.
Closes: https://bugs.gentoo.org/934315
Signed-off-by: James Le Cuirot gentoo.org>
games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild | 1 +
.../0ad/files/0ad-0.0.26_alpha-miniupnpc.patch | 38 ++
2 files changed, 39 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 7c7373e81a78..e910f14e5bd2 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -103,6 +103,7 @@ PATCHES=(
"${FILESDIR}"/${P}-libxml2-2.12.patch
# https://code.wildfiregames.com/D5267
"${FILESDIR}"/${P}-boost-1.85.patch
+ "${FILESDIR}"/${P}-miniupnpc.patch
)
pkg_setup() {
diff --git a/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch
b/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch
new file mode 100644
index ..f17cee4e36f2
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.26_alpha-miniupnpc.patch
@@ -0,0 +1,38 @@
+Adapt to changes from API 18
+
+https://github.com/miniupnp/miniupnp/commit/c0a50ce33e3b99ce8a96fd43049bb5b53ffac62f
+https://bugs.gentoo.org/934315
+
+--- a/source/network/NetServer.cpp 2022-09-23 21:17:14.0 +0200
a/source/network/NetServer.cpp 2024-06-14 21:43:26.572418719 +0200
+@@ -302,7 +302,11 @@
+ else if ((devlist = upnpDiscover(1, 0, 0, 0, 0, 0)) != NULL)
+ #endif
+ {
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
++ ret = UPNP_GetValidIGD(devlist, &urls, &data,
internalIPAddress, sizeof(internalIPAddress), NULL, 0);
++#else
+ ret = UPNP_GetValidIGD(devlist, &urls, &data,
internalIPAddress, sizeof(internalIPAddress));
++#endif
+ allocatedUrls = ret != 0; // urls is allocated on non-zero
return values
+ }
+ else
+@@ -321,9 +325,18 @@
+ LOGMESSAGE("Net server: found valid IGD = %s", urls.controlURL);
+ break;
+ case 2:
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 18
++ LOGMESSAGE("Net server: found a valid IGD with a reserved
address = %s, will try to continue anyway", urls.controlURL);
++ break;
++ case 3:
++ LOGMESSAGE("Net server: found a valid, not connected IGD = %s,
will try to continue anyway", urls.controlURL);
++ break;
++ case 4:
++#else
+ LOGMESSAGE("Net server: found a valid, not connected IGD = %s,
will try to continue anyway", urls.controlURL);
+ break;
+ case 3:
++#endif
+ LOGMESSAGE("Net server: found a UPnP device unrecognized as IGD
= %s, will try to continue anyway", urls.controlURL);
+ break;
+ default:
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: 9c65c36c3c18a3cbab86b009ff17daccf023c6d6
Author: Sam James gentoo org>
AuthorDate: Tue May 28 01:11:20 2024 +
Commit: Sam James gentoo org>
CommitDate: Tue May 28 01:11:20 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c65c36c
games-strategy/0ad: fix build w/ boost-1.85
Closes: https://bugs.gentoo.org/932254
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild | 2 ++
.../0ad/files/0ad-0.0.26_alpha-boost-1.85.patch| 32 ++
2 files changed, 34 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 14311b6b04fe..7c7373e81a78 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -101,6 +101,8 @@ PATCHES=(
"${FILESDIR}"/${P}-add-missing-cstdint-include.patch
# https://code.wildfiregames.com/D5219
"${FILESDIR}"/${P}-libxml2-2.12.patch
+ # https://code.wildfiregames.com/D5267
+ "${FILESDIR}"/${P}-boost-1.85.patch
)
pkg_setup() {
diff --git a/games-strategy/0ad/files/0ad-0.0.26_alpha-boost-1.85.patch
b/games-strategy/0ad/files/0ad-0.0.26_alpha-boost-1.85.patch
new file mode 100644
index ..cddec5e2a86c
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.26_alpha-boost-1.85.patch
@@ -0,0 +1,32 @@
+https://bugs.gentoo.org/932254
+https://code.wildfiregames.com/file/data/ubpvat3mgrfn6gnaquuq/PHID-FILE-d7xwslolc5hv2vwv66tb/D5267.diff
+
+Index: source/graphics/TextureManager.cpp
+===
+--- a/source/graphics/TextureManager.cpp
b/source/graphics/TextureManager.cpp
+@@ -806,7 +806,7 @@
+ files.push_back(f);
+ p = p / GetWstringFromWpath(*it);
+ }
+- return
m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.leaf()), files);
++ return
m_TextureConverter.ComputeSettings(GetWstringFromWpath(srcPath.filename()),
files);
+ }
+
+ /**
+Index: source/lib/file/file_system.cpp
+===
+--- a/source/lib/file/file_system.cpp
b/source/lib/file/file_system.cpp
+@@ -229,7 +229,11 @@
+ try
+ {
+ if(override_if_exists)
++#if BOOST_VERSION >=107400
++ fs::copy_file(fs::path(path.string()),
fs::path(newPath.string()),
boost::filesystem::copy_options::overwrite_existing);
++#else
+ fs::copy_file(fs::path(path.string()),
fs::path(newPath.string()),
boost::filesystem::copy_option::overwrite_if_exists);
++#endif
+ else
+ fs::copy_file(fs::path(path.string()),
fs::path(newPath.string()));
+ }
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: 4e42097df80ddaf3eb5ca2906bc2c8625785f6ba
Author: Sam James gentoo org>
AuthorDate: Mon Apr 1 06:44:09 2024 +
Commit: Sam James gentoo org>
CommitDate: Mon Apr 1 06:45:52 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e42097d
games-strategy/0ad: fix build w/ libxml2-2.12
Closes: https://bugs.gentoo.org/924387
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild | 4 +-
.../0ad/files/0ad-0.0.26_alpha-libxml2-2.12.patch | 274 +
2 files changed, 277 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 750458800c15..14311b6b04fe 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2023 Gentoo Authors
+# Copyright 2014-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -99,6 +99,8 @@ PATCHES=(
"${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
# https://code.wildfiregames.com/D4997
"${FILESDIR}"/${P}-add-missing-cstdint-include.patch
+ # https://code.wildfiregames.com/D5219
+ "${FILESDIR}"/${P}-libxml2-2.12.patch
)
pkg_setup() {
diff --git a/games-strategy/0ad/files/0ad-0.0.26_alpha-libxml2-2.12.patch
b/games-strategy/0ad/files/0ad-0.0.26_alpha-libxml2-2.12.patch
new file mode 100644
index ..08ee1a11fdb2
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.26_alpha-libxml2-2.12.patch
@@ -0,0 +1,274 @@
+https://bugs.gentoo.org/924387
+https://code.wildfiregames.com/D5219
+
+Index: ps/trunk/libraries/source/fcollada/src/FCollada/FUtils/FUXmlDocument.cpp
+===
+--- ps/libraries/source/fcollada/src/FCollada/FUtils/FUXmlDocument.cpp
ps/libraries/source/fcollada/src/FCollada/FUtils/FUXmlDocument.cpp
+@@ -2,7 +2,7 @@
+ Copyright (C) 2005-2007 Feeling Software Inc.
+ Portions of the code are:
+ Copyright (C) 2005-2007 Sony Computer Entertainment America
+-
++
+ MIT License: http://www.opensource.org/licenses/mit-license.php
+ */
+
+@@ -13,10 +13,12 @@
+ #include "FUFile.h"
+ #include "FCDocument/FCDocument.h"
+
++#include
++
+ #define MAX_FILE_SIZE 1024
+ //
+ // FUXmlDocument
+-//
++//
+
+ FUXmlDocument::FUXmlDocument(FUFileManager* manager, const fchar* _filename,
bool _isParsing)
+ : isParsing(_isParsing), filename(_filename)
+Index:
ps/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
+===
+---
ps/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
ps/libraries/source/fcollada/src/FColladaPlugins/FArchiveXML/FArchiveXML.cpp
+@@ -2,7 +2,7 @@
+ Copyright (C) 2005-2007 Feeling Software Inc.
+ Portions of the code are:
+ Copyright (C) 2005-2007 Sony Computer Entertainment America
+-
++
+ MIT License: http://www.opensource.org/licenses/mit-license.php
+ */
+
+@@ -77,6 +77,7 @@
+ #include "FCDocument/FCDVersion.h"
+ #include "FUtils/FUXmlDocument.h"
+
++#include
+
+ //
+ // Constants
+@@ -442,7 +443,7 @@
+ }
+
+ if (status) FUError::Error(FUError::DEBUG_LEVEL,
FUError::DEBUG_LOAD_SUCCESSFUL);
+- return status;
++ return status;
+ }
+
+ bool FArchiveXML::ExportFile(FCDocument* fcdocument, const fchar* filePath)
+@@ -515,13 +516,13 @@
+ xmlOutputBufferPtr buf = xmlAllocOutputBuffer(NULL);
+ xmlNodeDumpOutput(buf, rootNode->doc, rootNode, 0, 0, NULL);
+
+-#ifdef LIBXML2_NEW_BUFFER
+- outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));
+- memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());
+-#else
+- outData.resize(buf->buffer->use * sizeof(xmlChar));
+- memcpy(outData.begin(), buf->buffer->content, outData.size());
+-#endif
++#ifdef LIBXML2_NEW_BUFFER
++ outData.resize(xmlOutputBufferGetSize(buf) * sizeof(xmlChar));
++ memcpy(outData.begin(), xmlOutputBufferGetContent(buf), outData.size());
++#else
++ outData.resize(buf->buffer->use * sizeof(xmlChar));
++ memcpy(outData.begin(), buf->buffer->content, outData.size());
++#endif
+
+ xmlOutputBufferClose(buf);
+ daeDocument.ReleaseXmlData();
+@@ -591,7 +592,7 @@
+ else if (IsEquivalent(child->name,
DAE_LIBRARY_PMATERIAL_ELEMENT)) n.order = PHYSICS_MATERIAL;
+ else if (IsEquivalent(child->name, DAE_LIBRARY_PMODEL_ELEMENT))
n.order = PHYSICS_MODEL;
+ else if (IsEquivalent(child->name, DAE_LIBRARY_PSCENE_ELEMENT))
n.order = PHYSICS_SCENE;
+- else if (IsEquivalent(child->name, DAE_ASSET_ELEMENT))
++ else if (IsEquivalent(child->name, DAE_ASSET_ELEMENT))
+ {
+ // Read in the asset informat
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: b91f4b53b4c47b807bb46e0c7455dc1d861e86eb
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Nov 22 14:49:11 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Nov 22 15:00:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b91f4b53
games-strategy/0ad: filter lto flag
Closes: https://bugs.gentoo.org/859244
Signed-off-by: Andrew Ammerlaan gentoo.org>
games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild | 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index e81615d22e85..750458800c15 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -6,7 +6,7 @@ EAPI=8
WX_GTK_VER="3.0-gtk3"
# In alpha26 bundled spidermonkey-78.6.0 does not build with python 3.11.
PYTHON_COMPAT=( python3_10 )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
+inherit desktop flag-o-matic toolchain-funcs multiprocessing python-any-r1
wxwidgets xdg
DESCRIPTION="A free, real-time strategy game"
HOMEPAGE="https://play0ad.com/";
@@ -134,6 +134,9 @@ src_unpack() {
src_prepare() {
default
+ # https://bugs.gentoo.org/859244
+ filter-lto
+
# SpiderMonkey's configure no longer recognises --build for
# the build tuple
sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 9acc0180f478dee6f92338625e5930af349c3f55
Author: Sam James gentoo org>
AuthorDate: Thu Sep 14 02:58:06 2023 +
Commit: Sam James gentoo org>
CommitDate: Thu Sep 14 03:15:48 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9acc0180
games-strategy/0ad: add subslot dep on libsodium
Signed-off-by: Sam James gentoo.org>
.../0ad/{0ad-0.0.26_alpha.ebuild => 0ad-0.0.26_alpha-r1.ebuild} | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
similarity index 99%
rename from games-strategy/0ad/0ad-0.0.26_alpha.ebuild
rename to games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
index 49d734e318bd..e81615d22e85 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha-r1.ebuild
@@ -74,7 +74,7 @@ DEPEND="
dev-libs/boost:=
dev-libs/icu:=
dev-libs/libfmt:0=
- dev-libs/libsodium
+ dev-libs/libsodium:=
dev-libs/libxml2
media-libs/libpng:0
media-libs/libsdl2[X,opengl,video]
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: bae9991bf1f8354a70841bd292036160e5120e7a
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Tue Aug 22 13:10:31 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Tue Aug 22 13:11:53 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bae9991b
games-strategy/0ad: add upstream gcc13 patch
Closes: https://bugs.gentoo.org/912362
Signed-off-by: Andrew Ammerlaan gentoo.org>
games-strategy/0ad/0ad-0.0.26_alpha.ebuild | 4 ++-
...-0.0.26_alpha-add-missing-cstdint-include.patch | 29 ++
2 files changed, 32 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
index c440f50e1334..49d734e318bd 100644
--- a/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.26_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2022 Gentoo Authors
+# Copyright 2014-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -97,6 +97,8 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
"${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
+ # https://code.wildfiregames.com/D4997
+ "${FILESDIR}"/${P}-add-missing-cstdint-include.patch
)
pkg_setup() {
diff --git
a/games-strategy/0ad/files/0ad-0.0.26_alpha-add-missing-cstdint-include.patch
b/games-strategy/0ad/files/0ad-0.0.26_alpha-add-missing-cstdint-include.patch
new file mode 100644
index ..db3fe2ebfc09
--- /dev/null
+++
b/games-strategy/0ad/files/0ad-0.0.26_alpha-add-missing-cstdint-include.patch
@@ -0,0 +1,29 @@
+diff --git a/source/tools/atlas/GameInterface/Messages.h
b/source/tools/atlas/GameInterface/Messages.h
+index 2fa4780..a486d93 100644
+--- a/source/tools/atlas/GameInterface/Messages.h
b/source/tools/atlas/GameInterface/Messages.h
+@@ -1,4 +1,4 @@
+-/* Copyright (C) 2022 Wildfire Games.
++/* Copyright (C) 2023 Wildfire Games.
+ * This file is part of 0 A.D.
+ *
+ * 0 A.D. is free software: you can redistribute it and/or modify
+@@ -18,13 +18,15 @@
+ #ifndef INCLUDED_MESSAGES
+ #define INCLUDED_MESSAGES
+
++#include
++#include
++#include
++
++// Opens namespace AtlasMessage, closes it on second inclusion!
+ #ifndef MESSAGES_SKIP_SETUP
+ #include "MessagesSetup.h"
+ #endif
+
+-#include
+-#include
+-
+ // TODO: organisation, documentation, etc
+
+ #ifdef _MSC_VER // (can't use MSC_VERSION here since this file is included by
Atlas too)
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 7003d14a3e29e2202d885ebb0633fac7bc69bdda
Author: Ionen Wolkens gentoo org>
AuthorDate: Thu Aug 11 06:18:34 2022 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Thu Aug 11 07:37:09 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7003d14a
games-strategy/0ad: drop 0.0.25b_alpha-r0
Signed-off-by: Ionen Wolkens gentoo.org>
games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 262
1 file changed, 262 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
deleted file mode 100644
index d7b282a68f35..
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ /dev/null
@@ -1,262 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
-# Upstream signs releases (and only them) with app-crypt/minisign.
-# The (public) key can be found on https://play0ad.com/download/source.
-if [[ ${PV} == * ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/0ad/0ad";
- S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
- ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
- # Trailing whitespace for IUSE append below
- IUSE="verify-sig "
- MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
- MY_P="0ad-${PV/_/-}"
- SRC_URI="
- http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
- https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
- verify-sig? (
-
http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig
-
http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig
- )
- "
- S="${WORKDIR}/${MY_P}"
-fi
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE+="editor +lobby nvtt pch test"
-
-RESTRICT="test"
-CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
-CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
-
-# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
-# build and/or startup issues.
-QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
-
-# virtual/rust is for bundled SpiderMonkey.
-# Build-time Python dependency is for SM, too.
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-util/premake-5.0.0_alpha12:5
- virtual/pkgconfig
- virtual/rust
- test? ( dev-lang/perl )
-"
-# Upstream uses minisign which is not supported by verify-sign, bug #783066.
-# Signatures are only provided for releases.
-if [[ ( ${PV} != * ) && ( ${PV} != *_p* ) ]]; then
- BDEPEND+=" app-crypt/minisign"
-fi
-
-# Removed dependency on nvtt as we use the bundled one.
-# bug #768930
-DEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libfmt:0=
- dev-libs/libsodium
- dev-libs/libxml2
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( net-libs/gloox )
-"
-RDEPEND="
- ${DEPEND}
- !games-strategy/0ad-data
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
- "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
-)
-
-pkg_setup() {
- use editor && setup-wxwidgets
-
- python-any-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ( ${PV} != * ) && ( ${PV} != *_p* ) ]]; then
- if use verify-sig; then
- elog "Verifying both signatures using
app-crypt/minisign."
- minisign -V \
- -P "${MINISIGN_KEY}" \
- -x
"${DISTDIR}/${MY_P}-unix-build.tar.xz.minisig" \
- -m "${DISTDIR}/${MY_P}-unix-build.tar.xz" \
- || die "Failed to verify engine distfile using
minisign!"
- minisign -V \
- -P "${MINISIGN_KEY}" \
- -x
"${DISTDIR}/${MY_P}-unix-data.tar.xz.minisig" \
- -m "${DISTDIR}/${MY_P}-unix-data.tar.xz" \
- || die "Failed to verify data distfile using
minisign!"
- fi
- # Unpack manually until
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: de194ece58a1c37c542ee04378732d59e963f099 Author: Sam James gentoo org> AuthorDate: Fri Jun 10 08:36:30 2022 + Commit: Sam James gentoo org> CommitDate: Fri Jun 10 08:36:34 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de194ece games-strategy/0ad: update nvtt description uses bundled copy (fork) Signed-off-by: Sam James gentoo.org> games-strategy/0ad/metadata.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml index bc03cc2afd55..c47c262ab260 100644 --- a/games-strategy/0ad/metadata.xml +++ b/games-strategy/0ad/metadata.xml @@ -10,7 +10,6 @@ Enable the use of net-libs/gloox and the multiplayer lobby Support for some uncompressed data formats - via media-gfx/nvidia-texture-tools (might be needed for some mods)
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: a1016e0bb4a875a396f1f46aa3cec3037251b934
Author: Sam James gentoo org>
AuthorDate: Tue Jun 7 00:40:34 2022 +
Commit: Sam James gentoo org>
CommitDate: Tue Jun 7 00:41:23 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1016e0b
games-strategy/0ad: backport build patches
Given how fragile the build system can be, it's worth a revbump.
Closes: https://bugs.gentoo.org/834578
Closes: https://bugs.gentoo.org/845987
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild | 264 +
...ad-0.0.25b_alpha-fix-name-collision-glibc.patch | 131 ++
.../0ad/files/0ad-0.0.25b_alpha-python3.10.patch | 156
3 files changed, 551 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild
new file mode 100644
index ..0939933bda9d
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha-r1.ebuild
@@ -0,0 +1,264 @@
+# Copyright 2014-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
+# Upstream signs releases (and only them) with app-crypt/minisign.
+# The (public) key can be found on https://play0ad.com/download/source.
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+ S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+ # Trailing whitespace for IUSE append below
+ IUSE="verify-sig "
+ MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
+ MY_P="0ad-${PV/_/-}"
+ SRC_URI="
+ http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
+ https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
+ verify-sig? (
+
http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig
+
http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig
+ )
+ "
+ S="${WORKDIR}/${MY_P}"
+fi
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE+="editor +lobby nvtt pch test"
+
+RESTRICT="test"
+CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
+CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
+
+# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
+# build and/or startup issues.
+QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
+
+# virtual/rust is for bundled SpiderMonkey.
+# Build-time Python dependency is for SM, too.
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-util/premake-5.0.0_alpha12:5
+ virtual/pkgconfig
+ virtual/rust
+ test? ( dev-lang/perl )
+"
+# Upstream uses minisign which is not supported by verify-sign, bug #783066.
+# Signatures are only provided for releases.
+if [[ ( ${PV} != * ) && ( ${PV} != *_p* ) ]]; then
+ BDEPEND+=" app-crypt/minisign"
+fi
+
+# Removed dependency on nvtt as we use the bundled one.
+# bug #768930
+DEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libfmt:0=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+"
+RDEPEND="
+ ${DEPEND}
+ !games-strategy/0ad-data
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+ "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
+ "${FILESDIR}"/${PN}-0.0.25b_alpha-python3.10.patch
+ "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-name-collision-glibc.patch
+)
+
+pkg_setup() {
+ use editor && setup-wxwidgets
+
+ python-any-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ( ${PV} != * ) && ( ${PV} != *_p* ) ]]; then
+ if use verify-sig; then
+ elog "Verifying both signatures using
app-crypt/minisign."
+ minisign -V \
+ -P "${MINISIGN_KEY}" \
+ -x
"${DISTDIR}/${MY_P}-unix-build.tar.xz.minisig" \
+ -m "${DISTDIR}/${MY_P}-unix-build.tar.xz" \
+ || die "Failed to verify engine distfile usin
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: 763d3498173d92e9de312fafcf0a5335adf2dd46
Author: Sam James gentoo org>
AuthorDate: Mon Feb 7 04:21:41 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 7 04:21:41 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=763d3498
games-strategy/0ad: drop 0.0.24b_alpha-r1
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild | 231 -
games-strategy/0ad/Manifest| 2 -
.../0ad-0.0.24_alpha_pre20210116040036-build.patch | 105 --
...0.24b_alpha-fix-hang-on-quit-without-nvtt.patch | 98 -
.../0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch| 82
5 files changed, 518 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
deleted file mode 100644
index 6307e21c5b2a..
--- a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/0ad/0ad";
-elif [[ ${PV} == *_pre* ]]; then
- ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
- MY_P="0ad-${PV/_/-}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-
-if [[ ${PV} == ]]; then
- S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
- SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
- SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-# virtual/rust is for bundled SpiderMonkey
-# Build-time Python dependency is for SM too
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- virtual/rust
- test? ( dev-lang/perl )
-"
-# Removed dependency on nvtt as we use the bundled one
-# bug #768930
-DEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libfmt:0=
- dev-libs/libsodium
- dev-libs/libxml2
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( >=net-libs/gloox-1.0.20 )
-"
-RDEPEND="
- ${DEPEND}
- !games-strategy/0ad-data
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
- "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
- "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
- "${FILESDIR}"/${PN}-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
-)
-
-pkg_setup() {
- use editor && setup-wxwidgets
-
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # SpiderMonkey's configure no longer recognises --build for
- # the build tuple
- sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
- # Originally from 0ad-data
- rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
- local myconf=(
- --minimal-flags
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --bindir="/usr/bin"
- --libdir="/usr/$(get_libdir)"/${PN}
- --datadir="/usr/share/${PN}"
- )
-
- tc-export AR CC CXX RANLIB
-
- # Stock premake5 does not work, use the shipped one
- # TODO: revisit this, see above BDEPEND note re premake5
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
- # Regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake5 || die
- "${S}"/build/premake/premake5/bin/release/premake5 embed || die
-
- # Rebuild premake again
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
- # Run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake5/bin/release/premake5
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: c5948582c8e35c33b8d6793d6e2c83949b152586
Author: Sam James gentoo org>
AuthorDate: Mon Feb 7 04:30:43 2022 +
Commit: Sam James gentoo org>
CommitDate: Mon Feb 7 04:30:57 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5948582
games-strategy/0ad: fix build with newer setuptools
Closes: https://bugs.gentoo.org/826762
Thanks-to: Stephen Cavilia atomicradi.us>
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.25b_alpha.ebuild| 3 +-
.../files/0ad-0.0.25b_alpha-fix-setuptools.patch | 188 +
2 files changed, 190 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index e01f6242d2cd..d7b282a68f35 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2014-2021 Gentoo Authors
+# Copyright 2014-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -90,6 +90,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+ "${FILESDIR}"/${PN}-0.0.25b_alpha-fix-setuptools.patch
)
pkg_setup() {
diff --git a/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-setuptools.patch
b/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-setuptools.patch
new file mode 100644
index ..ea0626fadadd
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.25b_alpha-fix-setuptools.patch
@@ -0,0 +1,188 @@
+https://bugs.gentoo.org/826762
+https://bugzilla.mozilla.org/show_bug.cgi?id=1665675
+https://phabricator.services.mozilla.com/D90627
+--- a/libraries/source/spidermonkey/patch.sh
b/libraries/source/spidermonkey/patch.sh
+@@ -51,5 +51,7 @@ then
+ #
https://svnweb.freebsd.org/ports/head/lang/spidermonkey78/files/patch-third__party_rust_cc_.cargo-checksum.json?view=log
+ patch -p1 < ../FixFreeBSDCargoChecksum.diff
+ #
https://svnweb.freebsd.org/ports/head/lang/spidermonkey78/files/patch-third__party_rust_cc_src_lib.rs?view=log
+ patch -p1 < ../FixFreeBSDRustThirdPartyOSDetection.diff
+ fi
++
++patch -p1 < ../FixSysconfigImport.diff
+--- a/libraries/source/spidermonkey/FixSysconfigImport.diff
b/libraries/source/spidermonkey/FixSysconfigImport.diff
+@@ -0,0 +1,171 @@
++diff --git a/python/mozbuild/mozbuild/configure/__init__.py
b/python/mozbuild/mozbuild/configure/__init__.py
++--- a/python/mozbuild/mozbuild/configure/__init__.py
+ b/python/mozbuild/mozbuild/configure/__init__.py
++@@ -877,17 +877,56 @@
++
++ def _apply_imports(self, func, glob):
++ for _from, _import, _as in self._imports.pop(func, ()):
++-_from = '%s.' % _from if _from else ''
++-if _as:
++-glob[_as] = self._get_one_import('%s%s' % (_from, _import))
+++self._get_one_import(_from, _import, _as, glob)
+++
+++def _handle_wrapped_import(self, _from, _import, _as, glob):
+++"""Given the name of a module, "import" a mocked package into the
glob
+++iff the module is one that we wrap (either for the sandbox or for the
+++purpose of testing). Applies if the wrapped module is exposed by an
+++attribute of `self`.
+++
+++For example, if the import statement is `from os import environ`,
then
+++this function will set
+++glob['environ'] = self._wrapped_os.environ.
+++
+++Iff this function handles the given import, return True.
+++"""
+++module = (_from or _import).split('.')[0]
+++attr = '_wrapped_' + module
+++wrapped = getattr(self, attr, None)
+++if wrapped:
+++if _as or _from:
+++obj = self._recursively_get_property(
+++module, (_from + '.' if _from else '') + _import,
wrapped)
+++glob[_as or _import] = obj
++ else:
++-what = _import.split('.')[0]
++-glob[what] = self._get_one_import('%s%s' % (_from, what))
+++glob[module] = wrapped
+++return True
+++else:
+++return False
+++
+++def _recursively_get_property(self, module, what, wrapped):
+++"""Traverse the wrapper object `wrapped` (which represents the module
+++`module`) and return the property represented by `what`, which may
be a
+++series of nested attributes.
+++
+++For example, if `module` is 'os' and `what` is 'os.path.join',
+++return `wrapped.path.join`.
+++"""
+++if what == module:
+++return wrapped
+++assert what.startswith(module + '.')
+++attrs = what[len(module + '.'):].split('.')
+++for attr in attrs:
+++wrapped = getattr(wrapped, attr)
+++return wrapped
++
++ @memoized_property
++ def _wrapped_os(self):
++ wrapped_os = {}
++ exec_('from os import *', {}, wrapped_os)
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 1946b915fada8c6d9f16f9fb282697f3cdbe136f
Author: Sam James gentoo org>
AuthorDate: Tue Dec 14 09:04:24 2021 +
Commit: Sam James gentoo org>
CommitDate: Tue Dec 14 09:04:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1946b915
games-strategy/0ad: Keyword 0.0.25b_alpha arm64, #812830
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index 567e01b8b03c..e01f6242d2cd 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -36,7 +36,7 @@ else
S="${WORKDIR}/${MY_P}"
fi
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE+="editor +lobby nvtt pch test"
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 315628cd3c82148476c56fde9c7bbb762c568f4d
Author: Sam James gentoo org>
AuthorDate: Sat Aug 28 03:03:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 28 03:08:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=315628cd
games-strategy/0ad: drop unnecessary verify-sig inherit
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 10 +-
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index e7258e9b6f8..94301481dc8 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=8
WX_GTK_VER="3.0-gtk3"
PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 verify-sig
wxwidgets xdg
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
DESCRIPTION="A free, real-time strategy game"
HOMEPAGE="https://play0ad.com/";
@@ -21,8 +21,8 @@ elif [[ ${PV} == *_pre* ]]; then
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
else
- inherit verify-sig
- IUSE+="verify-sig"
+ # Trailing whitespace for IUSE append below
+ IUSE="verify-sig "
MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
MY_P="0ad-${PV/_/-}"
SRC_URI="
@@ -37,7 +37,7 @@ else
fi
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
+IUSE+="editor +lobby nvtt pch test"
RESTRICT="test"
CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
@@ -59,7 +59,7 @@ BDEPEND="
# Upstream uses minisign which is not supported by verify-sign, bug #783066.
# Signatures are only provided for releases.
if [[ ( ${PV} != * ) && ( ${PV} != *_p* ) ]]; then
- BDEPEND+="app-crypt/minisign"
+ BDEPEND+=" app-crypt/minisign"
fi
# Removed dependency on nvtt as we use the bundled one.
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 022cb8098bf4a77a24c5014805b45712a67825fa
Author: Nils Freydank posteo de>
AuthorDate: Fri Aug 27 11:25:02 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 28 03:01:58 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=022cb809
games-strategy/0ad: Remove a25 (superceded by a25b)
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Nils Freydank posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/22118
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.25_alpha.ebuild | 221 -
games-strategy/0ad/Manifest| 2 -
2 files changed, 223 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
deleted file mode 100644
index c4b1cf74eb7..000
--- a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
+++ /dev/null
@@ -1,221 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/0ad/0ad";
- S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
- ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
- MY_P="0ad-${PV/_/-}"
- SRC_URI="
- http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
- https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
- "
- S="${WORKDIR}/${MY_P}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-CHECKREQS_DISK_BUILD="9000M" # 8779624 KiB (8.3 GiB)
-CHECKREQS_DISK_USR="3500M" # 3545840 KiB (3.3 GiB)
-# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
-# build and/or startup issues.
-QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
-
-# virtual/rust is for bundled SpiderMonkey
-# Build-time Python dependency is for SM, too.
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
-BDEPEND="
- ${PYTHON_DEPS}
- >=dev-util/premake-5.0.0_alpha12:5
- virtual/pkgconfig
- virtual/rust
- test? ( dev-lang/perl )
-"
-# Removed dependency on nvtt as we use the bundled one
-# bug #768930
-DEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libfmt:0=
- dev-libs/libsodium
- dev-libs/libxml2
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( net-libs/gloox )
-"
-RDEPEND="
- ${DEPEND}
- !games-strategy/0ad-data
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
-)
-
-pkg_setup() {
- use editor && setup-wxwidgets
-}
-
-src_prepare() {
- default
-
- # SpiderMonkey's configure no longer recognises --build for
- # the build tuple
- sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
- # Originally from 0ad-data
- rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
- # 0AD uses premake:5 to generate the Makefiles, so let's
- # 1. configure the configure args,
- # 2. export some toolchain args,
- # 3. configure premake args,
- # 4. run premake5.
- local myconf=(
- --minimal-flags
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --bindir="/usr/bin"
- --libdir="/usr/$(get_libdir)"/${PN}
- --datadir="/usr/share/${PN}"
- )
-
- tc-export AR CC CXX RANLIB
-
- local mypremakeargs=(
- --outpath="../workspace/gcc"
- --os=linux
- --verbose
- )
-
- cd "${S}/build/premake" || die "Could not enter premake directory"
-
- /usr/bin/premake5 "${mypremakeargs[@]}" "${myconf[@]}" gmake2 \
- || die "Premake failed"
-}
-
-src_compile() {
- # Build 3rd party fcollada
- einfo "Building bundled fcollada"
- emake -C libraries/source/fcollada/src
-
- # Build bundled NVTT
- # nvtt is abandoned upstream a
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 0b79a1e7483b8d7b5df57942265bba7ffc76e5ae
Author: Nils Freydank posteo de>
AuthorDate: Fri Aug 27 11:25:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 28 03:01:50 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b79a1e7
games-strategy/0ad: Bump to alpha25b and EAPI=8
Upstream bumped 0ad with some fixes, quoting upstream:
- Ranked matches did not longer grant points in the lobby.
- Mod installation no longer require restart.
- Mod installation no longer prints errors when installing mods
by double-clicking
- Mod installation now overwrites the existing mods to allow
for easier updates.
- Fishes are now easier to spot on lowest settings with
the addition of seagulls.
For their full announcement see:
https://play0ad.com/re-release-of-0-a-d-alpha-25-yauna/
This bump hops to EAPI=8 as all used eclasses support it now
and the bump drops an forgotten comment about the bundled premake5.
Additionally it adds distfile signature verification using
the verify-sig eclass calling app-crypt/minisign manually.
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Nils Freydank posteo.de>
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.25b_alpha.ebuild | 259
games-strategy/0ad/Manifest | 4 +
2 files changed, 263 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
new file mode 100644
index 000..e7258e9b6f8
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -0,0 +1,259 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 verify-sig
wxwidgets xdg
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
+# Upstream signs releases (and only them) with app-crypt/minisign.
+# The (public) key can be found on https://play0ad.com/download/source.
+if [[ ${PV} == * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+ S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+ inherit verify-sig
+ IUSE+="verify-sig"
+ MINISIGN_KEY="RWT0hFWv57I2RFoJwLVjxEr44JOq/RkEx1oT0IA3PPPICnSF7HFKW1CT"
+ MY_P="0ad-${PV/_/-}"
+ SRC_URI="
+ http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
+ https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
+ verify-sig? (
+
http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz.minisig
+
http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz.minisig
+ )
+ "
+ S="${WORKDIR}/${MY_P}"
+fi
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+
+RESTRICT="test"
+CHECKREQS_DISK_BUILD="9000M" # 8769732 KiB (8.3 GiB) for alpha 25
+CHECKREQS_DISK_USR="3500M" # 3545972 KiB (3.3 GiB)
+
+# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
+# build and/or startup issues.
+QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
+
+# virtual/rust is for bundled SpiderMonkey.
+# Build-time Python dependency is for SM, too.
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-util/premake-5.0.0_alpha12:5
+ virtual/pkgconfig
+ virtual/rust
+ test? ( dev-lang/perl )
+"
+# Upstream uses minisign which is not supported by verify-sign, bug #783066.
+# Signatures are only provided for releases.
+if [[ ( ${PV} != * ) && ( ${PV} != *_p* ) ]]; then
+ BDEPEND+="app-crypt/minisign"
+fi
+
+# Removed dependency on nvtt as we use the bundled one.
+# bug #768930
+DEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libfmt:0=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+"
+RDEPEND="
+ ${DEPEND}
+ !games-strategy/0ad-data
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+)
+
+pkg_setup() {
+ use editor && setup-wxwidgets
+}
+
+src_unpack() {
+ if [[ ( ${PV} != * ) && ( ${PV} != *_p* ) ]]; then
+ if use verify-sig; then
+ elog "Verifying both signatures usin
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: c9c5aaef64de02961e7a71f74e012f5e3a4273d3
Author: Sam James gentoo org>
AuthorDate: Sat Aug 28 03:39:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Sat Aug 28 03:39:11 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9c5aaef
games-strategy/0ad: add missing python-any-r1_pkg_setup call
Closes: https://bugs.gentoo.org/773568
Closes: https://bugs.gentoo.org/802072
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild | 2 ++
games-strategy/0ad/0ad-0.0.25b_alpha.ebuild| 2 ++
2 files changed, 4 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
index 94bf17e4928..6307e21c5b2 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
@@ -82,6 +82,8 @@ PATCHES=(
pkg_setup() {
use editor && setup-wxwidgets
+
+ python-any-r1_pkg_setup
}
src_prepare() {
diff --git a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
index 94301481dc8..567e01b8b03 100644
--- a/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.25b_alpha.ebuild
@@ -94,6 +94,8 @@ PATCHES=(
pkg_setup() {
use editor && setup-wxwidgets
+
+ python-any-r1_pkg_setup
}
src_unpack() {
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 688ecac307728b83030e2d49f80cae7fefe62f52
Author: Nils Freydank posteo de>
AuthorDate: Thu Aug 12 07:25:01 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 15 20:56:57 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=688ecac3
games-strategy/0ad: Remove the old pre-alpha-24(!) version
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/21931
Signed-off-by: Sam James gentoo.org>
.../0ad-0.0.24_alpha_pre20210116040036-r2.ebuild | 232 -
games-strategy/0ad/Manifest| 1 -
2 files changed, 233 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
deleted file mode 100644
index 849ecb4aaef..000
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
+++ /dev/null
@@ -1,232 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs python-any-r1 wxwidgets xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/0ad/0ad";
- ZEROAD_GIT_REVISION=""
-elif [[ ${PV} == *_pre* ]]; then
- ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
- MY_P="0ad-${PV/_/-}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-if [[ ${PV} == ]]; then
- SRC_URI=""
-elif [[ ${PV} == *_pre* ]]; then
-
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
-else
- SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
-fi
-
-# merged with 0ad-data
-# addresses comment #3
-# bug #771147
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-# virtual/rust is for bundled SpiderMonkey
-# Build-time Python dependency is for SM too
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- virtual/rust
- test? ( dev-lang/perl )
-"
-# remove dependency on nvtt
-# as we use the bundled one
-# bug #768930
-DEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libfmt:0=
- dev-libs/libsodium
- dev-libs/libxml2
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( >=net-libs/gloox-1.0.20 )"
-
-# add block on 0ad-data, as it is no longer needed.
-# addresses comment #3
-# bug #771147
-RDEPEND="${DEPEND}
- !games-strategy/0ad-data"
-
-if [[ ${PV} == ]]; then
- S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
- S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
- S="${WORKDIR}/${MY_P}"
-fi
-
-PATCHES=(
- "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
-)
-
-pkg_setup() {
- use editor && setup-wxwidgets
-}
-
-src_prepare() {
- default
-
- sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
- # merged from 0ad-data
- # addresses comment #3
- # bug #771147
- rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
- local myconf=(
- --minimal-flags
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --bindir="/usr/bin"
- --libdir="/usr/$(get_libdir)"/${PN}
- --datadir="/usr/share/${PN}"
- )
-
- tc-export CC CXX
-
- # stock premake5 does not work, use the shipped one
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
- # regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake5 || die
- "${S}"/build/premake/premake5/bin/release/premake5 embed || die
-
- # rebuild premake again... this is the most stupid build system
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
- # run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake5/bin/release/premake5 \
- --file="premake5.lua" \
- --outpath="../workspaces/gcc/" \
- --os=linux \
- "
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 57cc262249976487a77241a6641f6c9437072b69
Author: Nils Freydank posteo de>
AuthorDate: Thu Aug 12 07:25:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Aug 15 20:56:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=57cc2622
games-strategy/0ad: Bump to 0.0.25_alpha, unbundle premake
This bump unbundles premake and uses now dev-util/premake:5::gentoo.
Drop the ~arm64 keyword until premake get's ~arm64 keywords.
Upstream spidermonkey keeps changing critical stuff on minor releases, so
this bump keeps the the bundled version.
On the fly we can do some house-keeping inside the ebuild:
- add size checks as the package size got huge by the 0ad-data merge
- merge conditional blocks depending on the version into one block
for better maintainability
- sort LICENSE alphabetically
Closes: https://bugs.gentoo.org/807337
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank posteo.de>
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.25_alpha.ebuild | 221 +
games-strategy/0ad/Manifest| 2 +
2 files changed, 223 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
new file mode 100644
index 000..c4b1cf74eb7
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.25_alpha.ebuild
@@ -0,0 +1,221 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+ S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+ MY_P="0ad-${PV/_/-}"
+ SRC_URI="
+ http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz
+ https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz
+ "
+ S="${WORKDIR}/${MY_P}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LGPL-2.1 LPPL-1.3c MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+CHECKREQS_DISK_BUILD="9000M" # 8779624 KiB (8.3 GiB)
+CHECKREQS_DISK_USR="3500M" # 3545840 KiB (3.3 GiB)
+# Premake adds '-s' to some LDFLAGS. Simply sed'ing it out leads to
+# build and/or startup issues.
+QA_PRESTRIPPED="/usr/lib64/0ad/libCollada.so /usr/bin/0ad"
+
+# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM, too.
+# TODO: Unbundle premake5
+# See bug #773472 which may help (bump for it)
+BDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-util/premake-5.0.0_alpha12:5
+ virtual/pkgconfig
+ virtual/rust
+ test? ( dev-lang/perl )
+"
+# Removed dependency on nvtt as we use the bundled one
+# bug #768930
+DEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libfmt:0=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+"
+RDEPEND="
+ ${DEPEND}
+ !games-strategy/0ad-data
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+)
+
+pkg_setup() {
+ use editor && setup-wxwidgets
+}
+
+src_prepare() {
+ default
+
+ # SpiderMonkey's configure no longer recognises --build for
+ # the build tuple
+ sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+ # Originally from 0ad-data
+ rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+ # 0AD uses premake:5 to generate the Makefiles, so let's
+ # 1. configure the configure args,
+ # 2. export some toolchain args,
+ # 3. configure premake args,
+ # 4. run premake5.
+ local myconf=(
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ tc-export AR CC CXX RANLIB
+
+ local mypremakeargs=(
+ --out
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 3b9c5b501e5eba7b2de982c676891504b8aeddcd
Author: Nils Freydank posteo de>
AuthorDate: Thu Jun 17 20:11:54 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 17 23:23:37 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b9c5b50
games-strategy/0ad: Remove the broken version
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank posteo.de>
Closes: https://github.com/gentoo/gentoo/pull/21292
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 228
1 file changed, 228 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
deleted file mode 100644
index e8ce2ce4f62..000
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-WX_GTK_VER="3.0-gtk3"
-PYTHON_COMPAT=( python3_{7..9} )
-inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
-
-if [[ ${PV} == ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/0ad/0ad";
-elif [[ ${PV} == *_pre* ]]; then
- ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
- MY_P="0ad-${PV/_/-}"
-fi
-
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-
-if [[ ${PV} == ]]; then
- S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
-
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
- S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
- SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
- SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
- S="${WORKDIR}/${MY_P}"
-fi
-
-LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-# virtual/rust is for bundled SpiderMonkey
-# Build-time Python dependency is for SM too
-# TODO: Unbundle premake5
-# See bug #773472 which may help (bump for it)
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- virtual/rust
- test? ( dev-lang/perl )
-"
-# Removed dependency on nvtt as we use the bundled one
-# bug #768930
-DEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libfmt:0=
- dev-libs/libsodium
- dev-libs/libxml2
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/opengl
- x11-libs/libX11
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( >=net-libs/gloox-1.0.20 )
-"
-RDEPEND="
- ${DEPEND}
- !games-strategy/0ad-data
-"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
- "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
- "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
-)
-
-pkg_setup() {
- use editor && setup-wxwidgets
-}
-
-src_prepare() {
- default
-
- # SpiderMonkey's configure no longer recognises --build for
- # the build tuple
- sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
-
- # Originally from 0ad-data
- rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_configure() {
- local myconf=(
- --minimal-flags
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --bindir="/usr/bin"
- --libdir="/usr/$(get_libdir)"/${PN}
- --datadir="/usr/share/${PN}"
- )
-
- tc-export AR CC CXX RANLIB
-
- # Stock premake5 does not work, use the shipped one
- # TODO: revisit this, see above BDEPEND note re premake5
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
- # Regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake5 || die
- "${S}"/build/premake/premake5/bin/release/premake5 embed || die
-
- # Rebuild premake again
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
- emake -C "${S}"/build/premake/premake5/build/gmake2.unix
-
- # Run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake5/bin/release/premake5 \
- --file="premake5.lua" \
- --outpath="../workspaces/gcc/" \
- --os=linux \
- "${myconf[@]}" \
- gmake2 \
- || die "Premake failed"
-}
-
-src_compile() {
-
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: dbb3bdf4645d0f83d7112620f07500af44e86962
Author: Nils Freydank posteo de>
AuthorDate: Thu Jun 17 20:11:50 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Jun 17 23:23:36 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dbb3bdf4
games-strategy/0ad: Fix stopping the binary with USE="-nvtt"
Closes: https://bugs.gentoo.org/779757
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Nils Freydank posteo.de>
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild | 229 +
...0.24b_alpha-fix-hang-on-quit-without-nvtt.patch | 98 +
2 files changed, 327 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
new file mode 100644
index 000..94bf17e4928
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha-r1.ebuild
@@ -0,0 +1,229 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+ MY_P="0ad-${PV/_/-}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+
+if [[ ${PV} == ]]; then
+ S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+ SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+ SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
+ S="${WORKDIR}/${MY_P}"
+fi
+
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM too
+# TODO: Unbundle premake5
+# See bug #773472 which may help (bump for it)
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ virtual/rust
+ test? ( dev-lang/perl )
+"
+# Removed dependency on nvtt as we use the bundled one
+# bug #768930
+DEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libfmt:0=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( >=net-libs/gloox-1.0.20 )
+"
+RDEPEND="
+ ${DEPEND}
+ !games-strategy/0ad-data
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-fix-hang-on-quit-without-nvtt.patch
+)
+
+pkg_setup() {
+ use editor && setup-wxwidgets
+}
+
+src_prepare() {
+ default
+
+ # SpiderMonkey's configure no longer recognises --build for
+ # the build tuple
+ sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+ # Originally from 0ad-data
+ rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+ local myconf=(
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ tc-export AR CC CXX RANLIB
+
+ # Stock premake5 does not work, use the shipped one
+ # TODO: revisit this, see above BDEPEND note re premake5
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+ # Regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake5 || die
+ "${S}"/build/premake/premake5/bin/release/premake5 embed || die
+
+ # Rebuild premake again
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+ # Run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake5/bin/release/premake5 \
+ --file="premake5.lua" \
+ --outpath="../workspaces/gc
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 2ecc31a55cdc78c8ce60f4baed69b7229cbf77e4
Author: Sam James gentoo org>
AuthorDate: Fri May 28 19:26:12 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri May 28 19:26:24 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2ecc31a5
games-strategy/0ad: add virtual/rust dep to older version
Closes: https://bugs.gentoo.org/792681
Signed-off-by: Sam James gentoo.org>
.../0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild | 16
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
index 7826f504366..849ecb4aaef 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
@@ -4,7 +4,8 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-inherit desktop toolchain-funcs wxwidgets xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs python-any-r1 wxwidgets xdg
if [[ ${PV} == ]]; then
inherit git-r3
@@ -36,9 +37,16 @@ KEYWORDS="~amd64 ~x86"
IUSE="editor +lobby nvtt pch test"
RESTRICT="test"
-BDEPEND="virtual/pkgconfig
- test? ( dev-lang/perl )"
-
+# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM too
+# TODO: Unbundle premake5
+# See bug #773472 which may help (bump for it)
+BDEPEND="
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ virtual/rust
+ test? ( dev-lang/perl )
+"
# remove dependency on nvtt
# as we use the bundled one
# bug #768930
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: ac141c909e1f6198054d2c36975d57c8e4dde6c4
Author: Sam James gentoo org>
AuthorDate: Mon Mar 15 03:02:55 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 15 03:02:55 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac141c90
games-strategy/0ad-data: treeclean
Signed-off-by: Sam James gentoo.org>
.../0ad-data/0ad-data-0.0.23_alpha.ebuild | 26 ---
.../0ad-data/0ad-data-0.0.23b_alpha.ebuild | 26 ---
.../0ad-data-0.0.24_alpha_pre20210116040036.ebuild | 88 --
games-strategy/0ad-data/Manifest | 3 -
games-strategy/0ad-data/metadata.xml | 11 ---
5 files changed, 154 deletions(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
deleted file mode 100644
index 9b33e87f794..000
--- a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P="0ad-${PV/_/-}"
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/";
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
- insinto /usr/share/0ad
- doins -r binaries/data/*
-}
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
deleted file mode 100644
index e0fd74cd914..000
--- a/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="0ad-${PV/_/-}"
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/";
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
- insinto /usr/share/0ad
- doins -r binaries/data/*
-}
diff --git
a/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
deleted file mode 100644
index da5bd064e6e..000
--- a/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2014-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-MY_PN="0ad"
-
-if [[ ${PV} == ]]; then
- inherit git-r3
-
- EGIT_REPO_URI="https://github.com/0ad/0ad";
- ZEROAD_GIT_REVISION=""
-elif [[ ${PV} == *_pre* ]]; then
- ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
-else
- MY_P="${MY_PN}-${PV/_/-}"
-fi
-
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/";
-if [[ ${PV} == ]]; then
- SRC_URI=""
-elif [[ ${PV} == *_pre* ]]; then
-
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${MY_PN}-${PV}.tar.gz"
-else
- SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
-fi
-
-LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LPPL-1.3c"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-if [[ ${PV} == || ${PV} == *_pre* ]]; then
- BDEPEND="~games-strategy/0ad-${PV}[nvtt]"
-else
- BDEPEND=""
-fi
-DEPEND=""
-RDEPEND=""
-
-if [[ ${PV} == ]]; then
- S="${WORKDIR}/${MY_PN}-${PV}"
-elif [[ ${PV} == *_pre* ]]; then
- S="${WORKDIR}/${MY_PN}-${ZEROAD_GIT_REVISION}"
-else
- S="${WORKDIR}/${MY_P}"
-fi
-
-src_prepare() {
- default
- rm binaries/data/tools/fontbuilder/fonts/*.txt || die
-}
-
-src_compile() {
- if [[ ${PV} == || ${PV} == *_pre* ]]; then
- # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName()
tries to open /proc/self/task/${TID}/comm for writing.
- addpredict /proc/self/task
-
- # Based on source/tools/dist/build-archives.sh used by
source/tools/dist/build.sh.
- local archivebuild_input archivebuild_output mod_name
- for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
- mod_name="${archivebuild_input##*/}"
- archivebuild_output="archives/${mod_name}"
-
- mkdir -p "${archivebuild_output}"
-
- einfo 0ad -archivebuild="${archivebuild_input}"
-archivebuild-output="${archivebuild_output}/${mod_name}.zip"
- 0ad -archivebuild="${archivebuild_input}"
-archivebuild-o
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 123947d043f4ebfcd98f0c87299067e92713e8f0 Author: Sam James gentoo org> AuthorDate: Thu Mar 4 05:03:46 2021 + Commit: Sam James gentoo org> CommitDate: Thu Mar 4 05:03:46 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=123947d0 games-strategy/0ad: Keyword 0.0.24b_alpha arm64, #773634 Signed-off-by: Sam James gentoo.org> games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild index a0468ee4b3e..e8ce2ce4f62 100644 --- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild +++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild @@ -33,7 +33,7 @@ fi LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~arm64 ~x86" IUSE="editor +lobby nvtt pch test" RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/
commit: ee3f2627d7f25d00887ef6b00a5bce4e5d0aa91b
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Mon Mar 1 19:47:26 2021 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Mon Mar 1 22:11:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee3f2627
games-strategy/0ad: remove unused patches
Closes: https://github.com/gentoo/gentoo/pull/19723
Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Signed-off-by: Conrad Kostecki gentoo.org>
.../0ad/files/0ad-0.0.21_alpha-gentoo.patch| 88 --
.../files/0ad-0.0.23b-header_includes_fix.patch| 20 -
2 files changed, 108 deletions(-)
diff --git a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch
b/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch
deleted file mode 100644
index 79549d19368..000
--- a/games-strategy/0ad/files/0ad-0.0.21_alpha-gentoo.patch
+++ /dev/null
@@ -1,88 +0,0 @@
0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make
-+++ 0ad-0.0.21-alpha/build/premake/premake4/build/gmake.unix/Premake4.make
-@@ -26,9 +26,9 @@
- DEFINES += -DNDEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.1.4/src
- CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
-- CFLAGS+= $(CPPFLAGS) -Wall -Os
-- CXXFLAGS += $(CPPFLAGS) -Wall -Os
-- LDFLAGS += -s -rdynamic
-+ CFLAGS+= $(CPPFLAGS) -Wall
-+ CXXFLAGS += $(CPPFLAGS) -Wall
-+ LDFLAGS += -rdynamic
- LIBS += -lm -ldl
- RESFLAGS += $(DEFINES) $(INCLUDES)
- LDDEPS+=
-@@ -48,8 +48,8 @@
- DEFINES += -D_DEBUG -DLUA_USE_POSIX -DLUA_USE_DLOPEN
- INCLUDES += -I../../src/host/lua-5.1.4/src
- CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
-- CFLAGS+= $(CPPFLAGS) -Wall -g
-- CXXFLAGS += $(CPPFLAGS) -Wall -g
-+ CFLAGS+= $(CFLAGS) $(CPPFLAGS) -Wall
-+ CXXFLAGS += $(CXXFLAGS) $(CPPFLAGS) -Wall
- LDFLAGS += -rdynamic
- LIBS += -lm -ldl
- RESFLAGS += $(DEFINES) $(INCLUDES)
0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua
-+++ 0ad-0.0.21-alpha/build/premake/premake4/src/tools/gcc.lua
-@@ -136,8 +136,6 @@
- if not cfg.flags.Symbols then
- if cfg.system == "macosx" then
- table.insert(result, "-Wl,-x")
-- else
-- table.insert(result, "-s")
- end
- end
-
0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile
-+++ 0ad-0.0.21-alpha/libraries/source/fcollada/src/Makefile
-@@ -9,9 +9,9 @@
-
- CXX ?= g++
- CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter
-Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
--CXXFLAGS_DEBUG := -O0 -g -D_DEBUG -DRETAIL
--CXXFLAGS_RELEASE := -O2 -DNDEBUG -DRETAIL
--CXXFLAGS_TEST := -O0 -g -D_DEBUG
-+CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
-+CXXFLAGS_RELEASE := -DNDEBUG -DRETAIL
-+CXXFLAGS_TEST := -D_DEBUG
- LIBS += `pkg-config libxml-2.0 --libs`
- INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
- INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh
-+++ 0ad-0.0.21-alpha/libraries/source/spidermonkey/build.sh
-@@ -93,20 +93,8 @@
- cd js/src
-
- # Clean up data generated by previous builds that could cause problems
--rm -rf build-debug
- rm -rf build-release
-
--# We want separate debug/release versions of the library, so we have to change
--# the LIBRARY_NAME for each build.
--# (We use perl instead of sed so that it works with MozillaBuild on Windows,
--# which has an ancient sed.)
--perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1 '\''mozjs38-ps-debug'\''/'
moz.build
--mkdir -p build-debug
--cd build-debug
--CXXFLAGS="${CXXFLAGS} ${TLCXXFLAGS}" ../configure ${CONF_OPTS}
--with-nspr-libs="$NSPR_LIBS" --with-nspr-cflags="$NSPR_INCLUDES"
--enable-debug --disable-optimize --enable-js-diagnostics --enable-gczeal
--${MAKE} ${MAKE_OPTS}
--cd ..
--
- perl -i.bak -pe 's/(SHARED_LIBRARY_NAME\s+=).*/$1
'\''mozjs38-ps-release'\''/' moz.build
- mkdir -p build-release
- cd build-release
-@@ -161,12 +149,9 @@
- mkdir -p ${INCLUDE_DIR_DEBUG}
- mkdir -p ${INCLUDE_DIR_RELEASE}
- cp -R -L ${FOLDER}/js/src/build-release/dist/include/* ${INCLUDE_DIR_RELEASE}/
--cp -R -L ${FOLDER}/js/src/build-debug/dist/include/* ${INCLUDE_DIR_DEBUG}/
-
- mkdir -p lib/
--cp -L
${FOLDER}/js/src/build-debug/dist/lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_SRC_SUFFIX}
lib/${LIB_PREFIX}mozjs38-ps-debug${LIB_DST_SUFFIX}
- cp -L
${FOLDER}/js/src/build-release/dist/lib/${LIB_PREFIX}mozjs38-ps-release${LIB_SRC_SUFFIX}
lib/${LIB_PREFIX}mozjs38-ps-release${LIB_DST_SUFFIX}
--cp -L
${FOLDER}/js/src/build-debug/dist/bin/${LIB_PREFIX}mozjs38-ps-debug${DLL_SRC_SUFFIX}
../../../binaries/system/${LIB_PREFIX}mozjs38-ps-debug${DLL_DST_SUFFIX}
- cp -L
${FOLDER}/js/src/build-release/dist/bin/${LIB_PREFIX}mozjs38-ps-releas
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 8f24ae86e614567ae2ffcd316a2115da31d72214
Author: Sam James gentoo org>
AuthorDate: Mon Mar 1 19:44:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 1 19:44:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8f24ae86
games-strategy/0ad: pass JOBS as env var
Closes: https://bugs.gentoo.org/773622
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 10 +++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 803df28d90d..a0468ee4b3e 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -143,7 +143,7 @@ src_compile() {
if use nvtt ; then
cd libraries/source/nvtt || die
elog "Building bundled NVTT (bug #768930)"
- ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build
bundled NVTT"
+ JOBS="-j$(makeopts_jobs)" ./build.sh || die "Failed to build
bundled NVTT"
cd "${S}" || die
fi
@@ -153,12 +153,16 @@ src_compile() {
# e.g. bug #768840.
cd libraries/source/spidermonkey || die
elog "Building bundled SpiderMonkey (bug #768840)"
- XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j$(makeopts_jobs)"
|| die "Failed to build bundled SpiderMonkey"
+ XARGS="${EPREFIX}/usr/bin/xargs" \
+ JOBS="-j$(makeopts_jobs)" \
+ ./build.sh \
+ || die "Failed to build bundled SpiderMonkey"
+
cd "${S}" || die
# Build 0ad itself!
elog "Building 0ad"
- emake -C build/workspaces/gcc verbose=1 JOBS="-j$(makeopts_jobs)"
+ JOBS="-j$(makeopts_jobs)" emake -C build/workspaces/gcc verbose=1
# Build assets
# (We only do this if we're using a snapshot/non-release)
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 0ad51cffc272f53e4a4fef804c218eaae395cfa6
Author: Sam James gentoo org>
AuthorDate: Mon Mar 1 19:06:07 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 1 19:06:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ad51cff
games-strategy/0ad: fix makeopts_jobs typo
This is at least one issue...
Bug: https://bugs.gentoo.org/773622
Thanks-to: Emily Rowlands mailbox.org>
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 5346f24636e..803df28d90d 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -153,7 +153,7 @@ src_compile() {
# e.g. bug #768840.
cd libraries/source/spidermonkey || die
elog "Building bundled SpiderMonkey (bug #768840)"
- XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j(makeopts_jobs)" ||
die "Failed to build bundled SpiderMonkey"
+ XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j$(makeopts_jobs)"
|| die "Failed to build bundled SpiderMonkey"
cd "${S}" || die
# Build 0ad itself!
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 1a0d70cdd420a40dcbfa1d35485c76ead61ef151
Author: Sam James gentoo org>
AuthorDate: Mon Mar 1 13:44:45 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 1 13:44:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a0d70cd
games-strategy/0ad: fix doexe typos
Fixes: bb706c5383db445f085b3ac628790a319ed9d309
Bug: https://bugs.gentoo.org/773574
Closes: https://bugs.gentoo.org/773565
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index e7596872128..5346f24636e 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -213,9 +213,9 @@ src_install() {
# Install bundled SpiderMonkey and nvtt
# bug #771147 (comment 1)
exeinto /usr/$(get_libdir)/${PN}
- doexe binaries/system/{libCollada,libmozjs78-ps-release}
+ doexe binaries/system/{libCollada,libmozjs78-ps-release}.so
- use nvtt && doexe
/binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
+ use nvtt && doexe
binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
use editor && doexe binaries/system/libAtlasUI.so
dodoc binaries/system/readme.txt
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: c81340cc391e38351a98c95f89ada39447c621fb
Author: Sam James gentoo org>
AuthorDate: Mon Mar 1 10:39:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 1 10:56:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c81340cc
games-strategy/0ad: fix build with >=virtual/rust-1.50
Closes: https://bugs.gentoo.org/773493
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild| 3 +-
.../0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch| 82 ++
2 files changed, 84 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index a36405f4744..2e003b33f53 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -74,7 +74,8 @@ RDEPEND="
"
PATCHES=(
- "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+ "${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
)
pkg_setup() {
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch
b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch
new file mode 100644
index 000..f4436a7b92c
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-rust-1.50.patch
@@ -0,0 +1,82 @@
+https://bugs.gentoo.org/773493
+--- a/libraries/source/spidermonkey/FixRust150.diff
b/libraries/source/spidermonkey/FixRust150.diff
+@@ -0,0 +1,65 @@
++
++# HG changeset patch
++# User Emilio Cobos Álvarez
++# Date 1609006565 0
++# Node ID 0e8f444683cb9c4079d3b2250f32f986043ea582
++# Parent 55097a5cf353f1b2a2228820bdf26bb69a1372a0
++Bug 1684261 - Fix build with rust nightly. r=jrmuizel, a=RyanVM
++
++Fixes errors like:
++
++ dependency (nix) specification is ambiguous. Only one of `branch`, `tag` or
`rev` is allowed.
++
++I've left the most specific dependency, but for wgpu the rev is not
++right, so I've kept the branch which effectively preserves behavior.
++
++Differential Revision: https://phabricator.services.mozilla.com/D100485
++
++diff --git a/.cargo/config.in b/.cargo/config.in
++--- a/.cargo/config.in
+ b/.cargo/config.in
++@@ -1,16 +1,16 @@
++ # This file contains vendoring instructions for cargo.
++ # It was generated by `mach vendor rust`.
++ # Please do not edit.
++
++ [source."https://github.com/shravanrn/nix/";]
++-branch = "r0.13.1"
++ git = "https://github.com/shravanrn/nix/";
++ replace-with = "vendored-sources"
+++rev = "4af6c367603869a30fddb5ffb0aba2b9477ba92e"
++
++ [source."https://github.com/mozilla/rkv";]
++ git = "https://github.com/mozilla/rkv";
++ replace-with = "vendored-sources"
++ rev = "e3c3388e6632cf55e08d773b32e58b1cab9b2731"
++
++ [source."https://github.com/mozilla/neqo";]
++ git = "https://github.com/mozilla/neqo";
++diff --git a/Cargo.lock b/Cargo.lock
++--- a/Cargo.lock
+ b/Cargo.lock
++@@ -3200,7 +3200,7 @@
++ [[package]]
++ name = "nix"
++ version = "0.13.1"
++-source =
"git+https://github.com/shravanrn/nix/?branch=r0.13.1#4af6c367603869a30fddb5ffb0aba2b9477ba92e";
+++source =
"git+https://github.com/shravanrn/nix/?rev=4af6c367603869a30fddb5ffb0aba2b9477ba92e#4af6c367603869a30fddb5ffb0aba2b9477ba92e";
++ dependencies = [
++ "bitflags",
++ "cc",
++diff --git a/Cargo.toml b/Cargo.toml
++--- a/Cargo.toml
+ b/Cargo.toml
++@@ -60,8 +60,8 @@
++ [patch.crates-io]
++ packed_simd = { git = "https://github.com/hsivonen/packed_simd";,
rev="3541e3818fdc7c2a24f87e3459151a4ce955a67a" }
++ rlbox_lucet_sandbox = { git =
"https://github.com/PLSysSec/rlbox_lucet_sandbox/";,
rev="d510da5999a744c563b0acd18056069d1698273f" }
++-nix = { git = "https://github.com/shravanrn/nix/";, branch = "r0.13.1",
rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
++-spirv_cross = { git = "https://github.com/kvark/spirv_cross";, branch =
"wgpu3", rev = "20191ad2f370afd6d247edcb9ff9da32d3bedb9c" }
+++nix = { git = "https://github.com/shravanrn/nix/";,
rev="4af6c367603869a30fddb5ffb0aba2b9477ba92e" }
+++spirv_cross = { git = "https://github.com/kvark/spirv_cross";, branch =
"wgpu3" }
++ # failure's backtrace feature might break our builds, see bug 1608157.
++ failure = { git = "https://github.com/badboy/failure";, rev =
"64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++ failure_derive = { git = "https://github.com/badboy/failure";, rev =
"64af847bc5fdcb6d2438bec8a6030812a80519a5" }
++
+--- a/libraries/source/spidermonkey/patch.sh
b/libraries/source/spidermonkey/patch.sh
+@@ -39,6 +39,10 @@
+ # https://bugzilla.mozilla.org/show_bug.cgi?id=1536491
+ patch -p1 < ../FixRpiUnalignedFpAccess.diff
+
++# Bug 1684261 upstreamed from 78.8:
https://hg.mozilla.org/releases/mozilla-esr78/rev/0e8f444683cb
++# Note that this isn't quite the upstream patch to match our version.
++patch -p1 < ../FixRust150.diff
++
+ # Patch those separately, as they might interfere with normal behaviour.
+ if [ "$(uname -s)"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: c0ca48ec9827893cd6ab278bd09bbc0865f61630
Author: Sam James gentoo org>
AuthorDate: Mon Mar 1 10:54:33 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 1 10:56:45 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0ca48ec
games-strategy/0ad: fix AR/RANLIB usage
Closes: https://bugs.gentoo.org/773511
Closes: https://bugs.gentoo.org/773502
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild| 5 ++--
.../0ad/files/0ad-0.0.24b_alpha-respect-tc.patch | 32 ++
2 files changed, 34 insertions(+), 3 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 2e003b33f53..e7596872128 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -76,6 +76,7 @@ RDEPEND="
PATCHES=(
"${FILESDIR}"/${PN}-0.0.24_alpha_pre20210116040036-build.patch
"${FILESDIR}"/${PN}-0.0.24b_alpha-rust-1.50.patch
+ "${FILESDIR}"/${PN}-0.0.24b_alpha-respect-tc.patch
)
pkg_setup() {
@@ -106,7 +107,7 @@ src_configure() {
--datadir="/usr/share/${PN}"
)
- tc-export CC CXX
+ tc-export AR CC CXX RANLIB
# Stock premake5 does not work, use the shipped one
# TODO: revisit this, see above BDEPEND note re premake5
@@ -132,8 +133,6 @@ src_configure() {
}
src_compile() {
- tc-export AR
-
# Build 3rd party fcollada
einfo "Building bundled fcollada"
emake -C libraries/source/fcollada/src
diff --git a/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch
b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch
new file mode 100644
index 000..7503ffc001b
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.24b_alpha-respect-tc.patch
@@ -0,0 +1,32 @@
+--- a/libraries/source/fcollada/src/Makefile
b/libraries/source/fcollada/src/Makefile
+@@ -7,6 +7,7 @@
+ PIC_FLAGS ?= -fpic
+ endif
+
++AR? ?= ar
+ CXX ?= g++
+ CXXFLAGS += -fvisibility=hidden -W -Wall -Wno-unused-parameter
-Wno-unused-function $(OS_DEFINE) $(PIC_FLAGS) $(CPPFLAGS)
+ CXXFLAGS_DEBUG := -D_DEBUG -DRETAIL
+@@ -16,6 +17,7 @@
+ LIBS += `pkg-config libxml-2.0 --libs`
+ INCLUDES += -IFCollada `pkg-config libxml-2.0 --cflags`
+ INCLUDES_TEST := -IFCollada/FColladaTest $(INCLUDES)
++RANLIB ?= ranlib
+
+ # FCollada is not aliasing-safe, so disallow dangerous optimisations
+ # (TODO: It'd be nice to fix FCollada, but that looks hard)
+@@ -246,11 +248,11 @@
+
+ output/libFColladaSD.a: $(OBJECTS_DEBUG) | output_dirs
+ @echo "$@"
+- @ar -cr $@ $(OBJECTS_DEBUG); ranlib $@
++ @$(AR) -cr $@ $(OBJECTS_DEBUG); $(RANLIB) $@
+
+ output/libFColladaSR.a: $(OBJECTS_RELEASE) | output_dirs
+ @echo "$@"
+- @ar -cr $@ $(OBJECTS_RELEASE); ranlib $@
++ @$(AR) -cr $@ $(OBJECTS_RELEASE); $(RANLIB) $@
+
+ output/FColladaTest: $(OBJECTS_TEST) | output_dirs
+ $(CXX) -o $@ $(OBJECTS_TEST) $(LIBS) $(LDFLAGS_TEST)
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 691c94e28f9a4f528294c001162b419e016955f6
Author: Sam James gentoo org>
AuthorDate: Mon Mar 1 10:21:46 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 1 10:56:44 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=691c94e2
games-strategy/0ad: add python-any-r1 for SpiderMonkey
Needed at buildtime for SpiderMonkey.
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 3aa595b69b9..a36405f4744 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -4,8 +4,8 @@
EAPI=7
WX_GTK_VER="3.0-gtk3"
-
-inherit desktop toolchain-funcs multiprocessing wxwidgets xdg
+PYTHON_COMPAT=( python3_{7..9} )
+inherit desktop toolchain-funcs multiprocessing python-any-r1 wxwidgets xdg
if [[ ${PV} == ]]; then
inherit git-r3
@@ -38,9 +38,11 @@ IUSE="editor +lobby nvtt pch test"
RESTRICT="test"
# virtual/rust is for bundled SpiderMonkey
+# Build-time Python dependency is for SM too
# TODO: Unbundle premake5
# See bug #773472 which may help (bump for it)
BDEPEND="
+ ${PYTHON_DEPS}
virtual/pkgconfig
virtual/rust
test? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: ee5d207c95d3d2eea86f61478e7f4a277e38e63b Author: Sam James gentoo org> AuthorDate: Mon Mar 1 10:20:10 2021 + Commit: Sam James gentoo org> CommitDate: Mon Mar 1 10:20:10 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ee5d207c games-strategy/0ad: add virtual/rust BDEPEND for SpiderMonkey Needed for bundled SpiderMonkey Signed-off-by: Sam James gentoo.org> games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild index 06ee07597d7..3aa595b69b9 100644 --- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild +++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild @@ -37,10 +37,12 @@ KEYWORDS="~amd64 ~x86" IUSE="editor +lobby nvtt pch test" RESTRICT="test" +# virtual/rust is for bundled SpiderMonkey # TODO: Unbundle premake5 # See bug #773472 which may help (bump for it) BDEPEND=" virtual/pkgconfig + virtual/rust test? ( dev-lang/perl ) " # Removed dependency on nvtt as we use the bundled one
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: bb706c5383db445f085b3ac628790a319ed9d309
Author: Sam James gentoo org>
AuthorDate: Mon Mar 1 10:16:17 2021 +
Commit: Sam James gentoo org>
CommitDate: Mon Mar 1 10:16:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb706c53
games-strategy/0ad: fix USE=-nvtt installation
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index fd767ad8126..06ee07597d7 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -209,7 +209,9 @@ src_install() {
# Install bundled SpiderMonkey and nvtt
# bug #771147 (comment 1)
exeinto /usr/$(get_libdir)/${PN}
- doexe
binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
+ doexe binaries/system/{libCollada,libmozjs78-ps-release}
+
+ use nvtt && doexe
/binaries/system/{libnvtt,libnvcore,libnvimage,libnvmath}.so
use editor && doexe binaries/system/libAtlasUI.so
dodoc binaries/system/readme.txt
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 593c56113d6bb977f31c2f11ff35e0f69f68b619
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 23:20:23 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:20:23 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=593c5611
games-strategy/0ad: extra cleanup
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index b2d76e0fe1a..fd767ad8126 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -11,7 +11,6 @@ if [[ ${PV} == ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/0ad/0ad";
- ZEROAD_GIT_REVISION=""
elif [[ ${PV} == *_pre* ]]; then
ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
else
@@ -20,6 +19,7 @@ fi
DESCRIPTION="A free, real-time strategy game"
HOMEPAGE="https://play0ad.com/";
+
if [[ ${PV} == ]]; then
S="${WORKDIR}/${P}"
elif [[ ${PV} == *_pre* ]]; then
@@ -104,6 +104,7 @@ src_configure() {
tc-export CC CXX
# Stock premake5 does not work, use the shipped one
+ # TODO: revisit this, see above BDEPEND note re premake5
emake -C "${S}"/build/premake/premake5/build/gmake2.unix
# Regenerate scripts.c so our patch applies
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: e19e4df6bab349d7f34e622e02b10792f6186ea8 Author: Sam James gentoo org> AuthorDate: Sun Feb 28 23:17:50 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 28 23:17:50 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e19e4df6 games-strategy/0ad: add github remote-id Signed-off-by: Sam James gentoo.org> games-strategy/0ad/metadata.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/games-strategy/0ad/metadata.xml b/games-strategy/0ad/metadata.xml index 11542ae7c10..f28214cdf98 100644 --- a/games-strategy/0ad/metadata.xml +++ b/games-strategy/0ad/metadata.xml @@ -14,6 +14,7 @@ (might be needed for some mods) + 0ad/0ad zero-ad
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 750a1ce1cc28dc679c08b1456a83c4c8542bb526
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 22:27:30 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=750a1ce1
games-strategy/0ad: bump to 0.0.24b_alpha
Huge thanks to everybody mentioned in this commit
(and likely others too, sorry if I forgot you!)
This started with Arfrever giving an initial bump,
then several revisions later, we seem to be in a position
where it's fully working!
Most of the issues came from (de)bundling SpiderMonkey
and NVTT:
* New SpiderMonkey releases regularly break the APIs
which 0ad uses, so we're reverting to the bundled
copy per upstream advice;
* NVTT has been abandoned upstream (as an independent project)
so the 0ad developers have taken it over and applied significant
patches. We use the bundled copy now to take advantage of these
fixes.
We also abandon 0ad-data for now. We're now using the released
asset files for 0.0.24b_alpha but the 0ad ebuild itself, thanks to
Wolf-Dieter, can now generate these assets rather than relying
on a separate ebuild like 0ad-data. This simplifies matters.
Closes: https://bugs.gentoo.org/735352
Thanks-to: Stanislas Dolcini
Thanks-to: Wolf-Dieter Rieck web.de>
Thanks-to: Arfrever Frehtes Taifersar Arahesis gmail.com>
Thanks-to: Quentin Retornaz retornaz.com>
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 226
1 file changed, 226 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
new file mode 100644
index 000..436db366fb5
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -0,0 +1,226 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+
+inherit desktop toolchain-funcs wxwidgets xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+ ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+ MY_P="0ad-${PV/_/-}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+if [[ ${PV} == ]]; then
+ SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+else
+ SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+ SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
+fi
+
+# merged with 0ad-data
+# addresses comment #3
+# bug #771147
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+# remove dependency on nvtt
+# as we use the bundled one
+# bug #768930
+DEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libfmt:0=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( >=net-libs/gloox-1.0.20 )"
+
+# add block on 0ad-data, as it is no longer needed.
+# addresses comment #3
+# bug #771147
+RDEPEND="${DEPEND}
+ !games-strategy/0ad-data"
+
+if [[ ${PV} == ]]; then
+ S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+ S="${WORKDIR}/${MY_P}"
+fi
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+)
+
+pkg_setup() {
+ use editor && setup-wxwidgets
+}
+
+src_prepare() {
+ default
+
+ sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+ # merged from 0ad-data
+ # addresses comment #3
+ # bug #771147
+ rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+ local myconf=(
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ tc-export CC CXX
+
+ # stock premake5 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+ # regenerate script
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: cb2a1da8c6bcacada604ebd45f0825ccd3c8edb3 Author: Sam James gentoo org> AuthorDate: Sun Feb 28 23:03:30 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 28 23:04:34 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb2a1da8 games-strategy/0ad: add note re bundled premake Bug: https://bugs.gentoo.org/773472 Signed-off-by: Sam James gentoo.org> games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 2 ++ 1 file changed, 2 insertions(+) diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild index 49ac259e569..b2d76e0fe1a 100644 --- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild +++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild @@ -37,6 +37,8 @@ KEYWORDS="~amd64 ~x86" IUSE="editor +lobby nvtt pch test" RESTRICT="test" +# TODO: Unbundle premake5 +# See bug #773472 which may help (bump for it) BDEPEND=" virtual/pkgconfig test? ( dev-lang/perl )
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 7d9069c315688f51766ccd232f8a79a216d44cc5
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 22:34:31 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:32 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7d9069c3
games-strategy/0ad: update formatting for asset generation
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 11 ---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index cde93c077b3..d3e3cac5127 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -164,6 +164,8 @@ src_compile() {
# Merged from 0ad-data
# bug #771147 (comment 3)
+ # We're building the assets from source if we're not using a release
+ # Warning: fragile
if [[ ${PV} == || ${PV} == *_pre* ]]; then
# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName()
tries to open /proc/self/task/${TID}/comm for writing.
addpredict /proc/self/task
@@ -174,13 +176,16 @@ src_compile() {
mod_name="${archivebuild_input##*/}"
archivebuild_output="archives/${mod_name}"
- mkdir -p "${archivebuild_output}"
+ mkdir -p "${archivebuild_output}" || die
einfo pyrogenesis -archivebuild="${archivebuild_input}"
-archivebuild-output="${archivebuild_output}/${mod_name}.zip"
- LD_LIBRARY_PATH="binaries/system"
binaries/system/pyrogenesis -archivebuild="${archivebuild_input}"
-archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
+ LD_LIBRARY_PATH="binaries/system"
binaries/system/pyrogenesis \
+ -archivebuild="${archivebuild_input}" \
+
-archivebuild-output="${archivebuild_output}/${mod_name}.zip" \
+ || die "Failed to build assets"
if [[ -f "${archivebuild_input}/mod.json" ]]; then
- cp "${archivebuild_input}/mod.json"
"${archivebuild_output}"
+ cp "${archivebuild_input}/mod.json"
"${archivebuild_output}" || die
fi
rm -r "${archivebuild_input}" || die
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: a18c2bdc043ce8926cf9f247189c8d42f32d0efe
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 22:27:03 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18c2bdc
games-strategy/0ad: remove old broken versions
Keep 0.0.24_alpha_pre20210116040036-r2 temporarily just
in case.
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.23_alpha.ebuild | 147 --
games-strategy/0ad/0ad-0.0.23b_alpha.ebuild| 148 --
.../0ad-0.0.24_alpha_pre20210116040036-r1.ebuild | 170 -
games-strategy/0ad/Manifest| 4 +-
4 files changed, 2 insertions(+), 467 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
deleted file mode 100644
index 0e44c4e36fb..000
--- a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libsodium
- dev-libs/libxml2
- dev-libs/nspr
- ~games-strategy/0ad-data-${PV}
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( >=net-libs/gloox-1.0.20 )
- nvtt? ( media-gfx/nvidia-texture-tools )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- use editor && setup-wxwidgets
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
-)
-
-src_configure() {
- local myconf=(
- --with-system-nvtt
- --with-system-miniupnpc
- --minimal-flags
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --collada
- --bindir="/usr/bin"
- --libdir="/usr/$(get_libdir)"/${PN}
- --datadir="/usr/share/${PN}"
- )
-
- # stock premake4 does not work, use the shipped one
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake4 || die
- "${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
- # rebuild premake again... this is the most stupid build system
- emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake4/bin/release/premake4 \
- --file="premake4.lua" \
- --outpath="../workspaces/gcc/" \
- --platform=$(usex amd64 "x64" "x32") \
- --os=linux \
- "${myconf[@]}" \
- gmake || die "Premake failed"
-}
-
-src_compile() {
- tc-export AR
-
- # build bundled and patched spidermonkey
- cd libraries/source/spidermonkey || die
- JOBS="${MAKEOPTS}" ./build.sh || die
- cd "${S}" || die
-
- # build 3rd party fcollada
- emake -C libraries/source/fcollada/src
-
- # build 0ad
- emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
- cd binaries/system || die
- ./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
- newbin binaries/system/pyrogenesis 0ad
- use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
- insinto /usr/share/${PN}
- doins -r binaries/data/l10n
-
- exeinto /usr/$(get_libdir)/${PN}
- doexe binaries/system/libCollada.so
- doexe libraries/source/spidermonkey/lib/*.so
- use editor && doexe binaries/system/libAtlasUI.so
-
- dodoc binaries/system/readme.txt
- doicon -s 128 build/re
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 0db072a63b8b3ad4297a2fd7ff5a44b2736ec00e
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 22:41:11 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0db072a6
games-strategy/0ad: further formatting/style changes
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 76 +
1 file changed, 33 insertions(+), 43 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 2c02a47343b..49ac259e569 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -21,26 +21,26 @@ fi
DESCRIPTION="A free, real-time strategy game"
HOMEPAGE="https://play0ad.com/";
if [[ ${PV} == ]]; then
- SRC_URI=""
+ S="${WORKDIR}/${P}"
elif [[ ${PV} == *_pre* ]]; then
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
else
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
SRC_URI+=" https://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
+ S="${WORKDIR}/${MY_P}"
fi
-# merged with 0ad-data
-# addresses comment #3
-# bug #771147
LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
SLOT="0"
KEYWORDS="~amd64 ~x86"
IUSE="editor +lobby nvtt pch test"
RESTRICT="test"
-BDEPEND="virtual/pkgconfig
- test? ( dev-lang/perl )"
-
+BDEPEND="
+ virtual/pkgconfig
+ test? ( dev-lang/perl )
+"
# Removed dependency on nvtt as we use the bundled one
# bug #768930
DEPEND="
@@ -60,21 +60,12 @@ DEPEND="
virtual/opengl
x11-libs/libX11
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( >=net-libs/gloox-1.0.20 )"
-
-# add block on 0ad-data, as it is no longer needed.
-# addresses comment #3
-# bug #771147
-RDEPEND="${DEPEND}
- !games-strategy/0ad-data"
-
-if [[ ${PV} == ]]; then
- S="${WORKDIR}/${P}"
-elif [[ ${PV} == *_pre* ]]; then
- S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
-else
- S="${WORKDIR}/${MY_P}"
-fi
+ lobby? ( >=net-libs/gloox-1.0.20 )
+"
+RDEPEND="
+ ${DEPEND}
+ !games-strategy/0ad-data
+"
PATCHES=(
"${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
@@ -87,11 +78,11 @@ pkg_setup() {
src_prepare() {
default
+ # SpiderMonkey's configure no longer recognises --build for
+ # the build tuple
sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
- # merged from 0ad-data
- # addresses comment #3
- # bug #771147
+ # Originally from 0ad-data
rm binaries/data/tools/fontbuilder/fonts/*.txt || die
}
@@ -110,18 +101,18 @@ src_configure() {
tc-export CC CXX
- # stock premake5 does not work, use the shipped one
+ # Stock premake5 does not work, use the shipped one
emake -C "${S}"/build/premake/premake5/build/gmake2.unix
- # regenerate scripts.c so our patch applies
+ # Regenerate scripts.c so our patch applies
cd "${S}"/build/premake/premake5 || die
"${S}"/build/premake/premake5/bin/release/premake5 embed || die
- # rebuild premake again... this is the most stupid build system
+ # Rebuild premake again
emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
emake -C "${S}"/build/premake/premake5/build/gmake2.unix
- # run premake to create build scripts
+ # Run premake to create build scripts
cd "${S}"/build/premake || die
"${S}"/build/premake/premake5/bin/release/premake5 \
--file="premake5.lua" \
@@ -135,23 +126,22 @@ src_configure() {
src_compile() {
tc-export AR
- # build 3rd party fcollada
+ # Build 3rd party fcollada
einfo "Building bundled fcollada"
emake -C libraries/source/fcollada/src
- # build bundled nvtt
- # nvtt is abandoned upstream and 0ad have forked it
- # and added fixes. Use their copy.
- # bug #768930
+ # Build bundled NVTT
+ # nvtt is abandoned upstream and 0ad have forked it and added fixes.
+ # Use their copy. bug #768930
if use nvtt ; then
cd libraries/source/nvtt || die
- elog "Building bundled nvtt (bug #768930)"
- ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build
bundled nvtt"
+ elog "Building bundled NVTT (bug #768930)"
+ ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build
bundled NVTT"
cd "${S}" || die
fi
- # build bundled spidermonkey
- # We genuinely can't use the system SpiderMonkey right now.
+ # Build bundled SpiderMonkey
+ # We really can't use the syste
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 343b3abeab63a4c2f02bffe46d251a5ffcffe1ab
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 22:37:15 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:33 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343b3abe
games-strategy/0ad: minor style
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index d3e3cac5127..2c02a47343b 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -128,7 +128,8 @@ src_configure() {
--outpath="../workspaces/gcc/" \
--os=linux \
"${myconf[@]}" \
- gmake2 || die "Premake failed"
+ gmake2 \
+ || die "Premake failed"
}
src_compile() {
@@ -200,7 +201,7 @@ src_compile() {
src_test() {
cd binaries/system || die
- ./test -libdir "${S}/binaries/system" || die "test phase failed"
+ ./test -libdir "${S}/binaries/system" || die "Failed tests"
}
src_install() {
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: d0cdd28cee7b12f4fe2e10949af2abb94f3533c5
Author: Wolf-Dieter Rieck web de>
AuthorDate: Mon Feb 22 21:19:08 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:27 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cdd28c
games-strategy/0ad: fix build and merge 0ad-data package
* Build was broken in former revision,
as generated libs weren't in LD_LIBRARY_PATH.
Also libs weren't correcly installed.
* 0ad-data pulled same archive as 0a package.
Merged both ebuilds into this revision blocking the 0ad-data package.
Bug: https://bugs.gentoo.org/768930
Closes: https://bugs.gentoo.org/771147
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Wolf-Dieter Rieck web.de>
Closes: https://github.com/gentoo/gentoo/pull/19603
Signed-off-by: Sam James gentoo.org>
.../0ad-0.0.24_alpha_pre20210116040036-r2.ebuild | 224 +
1 file changed, 224 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
new file mode 100644
index 000..7826f504366
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r2.ebuild
@@ -0,0 +1,224 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+WX_GTK_VER="3.0-gtk3"
+inherit desktop toolchain-funcs wxwidgets xdg
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+ ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+ MY_P="0ad-${PV/_/-}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+if [[ ${PV} == ]]; then
+ SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+else
+ SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+fi
+
+# merged with 0ad-data
+# addresses comment #3
+# bug #771147
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB BitstreamVera LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+# remove dependency on nvtt
+# as we use the bundled one
+# bug #768930
+DEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libfmt:0=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( >=net-libs/gloox-1.0.20 )"
+
+# add block on 0ad-data, as it is no longer needed.
+# addresses comment #3
+# bug #771147
+RDEPEND="${DEPEND}
+ !games-strategy/0ad-data"
+
+if [[ ${PV} == ]]; then
+ S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+ S="${WORKDIR}/${MY_P}"
+fi
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+)
+
+pkg_setup() {
+ use editor && setup-wxwidgets
+}
+
+src_prepare() {
+ default
+
+ sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
+
+ # merged from 0ad-data
+ # addresses comment #3
+ # bug #771147
+ rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_configure() {
+ local myconf=(
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ tc-export CC CXX
+
+ # stock premake5 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake5 || die
+ "${S}"/build/premake/premake5/bin/release/premake5 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake5/bin/release/premake5 \
+ --file="premake5.lua" \
+ --outpath="../workspaces/gcc/" \
+ --os=linux \
+ "${myconf
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: be214f59a2387da65ae4665cbe1639a9c3e6bb42
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 22:32:40 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:31 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be214f59
games-strategy/0ad: use multiprocessing.eclass
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 1a15d95383c..cde93c077b3 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -5,7 +5,7 @@ EAPI=7
WX_GTK_VER="3.0-gtk3"
-inherit desktop toolchain-funcs wxwidgets xdg
+inherit desktop toolchain-funcs multiprocessing wxwidgets xdg
if [[ ${PV} == ]]; then
inherit git-r3
@@ -145,7 +145,7 @@ src_compile() {
if use nvtt ; then
cd libraries/source/nvtt || die
elog "Building bundled nvtt (bug #768930)"
- ./build.sh JOBS="-j3" || die "Failed to build bundled nvtt"
+ ./build.sh JOBS="-j$(makeopts_jobs)" || die "Failed to build
bundled nvtt"
cd "${S}" || die
fi
@@ -155,12 +155,12 @@ src_compile() {
# e.g. bug #768840.
cd libraries/source/spidermonkey || die
elog "Building bundled SpiderMonkey (bug #768840)"
- XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j3" || die "Failed
to build bundled SpiderMonkey"
+ XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh JOBS="-j(makeopts_jobs)" ||
die "Failed to build bundled SpiderMonkey"
cd "${S}" || die
# build 0ad
elog "Building 0ad"
- emake -C build/workspaces/gcc verbose=1 JOBS="-j3"
+ emake -C build/workspaces/gcc verbose=1 JOBS="-j$(makeopts_jobs)"
# Merged from 0ad-data
# bug #771147 (comment 3)
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 645c826c87964db5a24b3fa5dd724d7e3224cbc3
Author: Sam James gentoo org>
AuthorDate: Sun Feb 28 22:31:38 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Feb 28 23:04:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=645c826c
games-strategy/0ad: update comments in ebuild
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.24b_alpha.ebuild | 21 +++--
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
index 436db366fb5..1a15d95383c 100644
--- a/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24b_alpha.ebuild
@@ -41,8 +41,7 @@ RESTRICT="test"
BDEPEND="virtual/pkgconfig
test? ( dev-lang/perl )"
-# remove dependency on nvtt
-# as we use the bundled one
+# Removed dependency on nvtt as we use the bundled one
# bug #768930
DEPEND="
dev-libs/boost:=
@@ -163,9 +162,8 @@ src_compile() {
elog "Building 0ad"
emake -C build/workspaces/gcc verbose=1 JOBS="-j3"
- # merged from 0ad-data
- # addresses comment #3
- # bug #771147
+ # Merged from 0ad-data
+ # bug #771147 (comment 3)
if [[ ${PV} == || ${PV} == *_pre* ]]; then
# source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName()
tries to open /proc/self/task/${TID}/comm for writing.
addpredict /proc/self/task
@@ -204,18 +202,13 @@ src_install() {
newbin binaries/system/pyrogenesis 0ad
use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
- # merged with 0ad-data
- # addresses comment #3
- # bug #771147
+ # Merged from 0ad-data
+ # bug #771147 (comment 3)
insinto /usr/share/${PN}
doins -r binaries/data/{l10n,config,mods,tools}
- # merged with 0ad-data
- # addresses comment #3
- # bug #771147
- # install bundled SpiderMonkey and nvtt
- # fixes comment #1
- # bug #771147
+ # Install bundled SpiderMonkey and nvtt
+ # bug #771147 (comment 1)
exeinto /usr/$(get_libdir)/${PN}
doexe
binaries/system/{libCollada,libmozjs78-ps-release,libnvtt,libnvcore,libnvimage,libnvmath}.so
use editor && doexe binaries/system/libAtlasUI.so
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 815ab784f5f549e0f4cb803bbd813199d2c94c90
Author: Sam James gentoo org>
AuthorDate: Fri Feb 12 20:18:08 2021 +
Commit: Sam James gentoo org>
CommitDate: Fri Feb 12 20:18:47 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=815ab784
games-strategy/0ad: revert to bundled libraries
* SpiderMonkey changes the consumed interfaces
even within minor versions, so using
the system version is a no go.
* nvtt is abandoned upstream and using the
system version results in segfaults.
Use 0ad's version which has fixes instead.
Bug: https://bugs.gentoo.org/735352
Bug: https://bugs.gentoo.org/689124
Closes: https://bugs.gentoo.org/768840
Closes: https://bugs.gentoo.org/759934
Closes: https://bugs.gentoo.org/768930
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
...> 0ad-0.0.24_alpha_pre20210116040036-r1.ebuild} | 28 ++
1 file changed, 23 insertions(+), 5 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
similarity index 81%
rename from games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
rename to games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
index aff130d91e0..a138651fac2 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036-r1.ebuild
@@ -36,7 +36,6 @@ RESTRICT="test"
BDEPEND="virtual/pkgconfig
test? ( dev-lang/perl )"
DEPEND="
- >=dev-lang/spidermonkey-78.6:78
dev-libs/boost:=
dev-libs/icu:=
dev-libs/libfmt:0=
@@ -78,14 +77,11 @@ pkg_setup() {
src_prepare() {
default
- # Delete check for minor version of dev-lang/spidermonkey.
- sed -e "/^#if MOZJS_MINOR_VERSION != [[:digit:]]\+$/,/^#endif$/d" -i
source/scriptinterface/ScriptTypes.h || die
+ sed -i -e "/--build/d" libraries/source/spidermonkey/build.sh || die
}
src_configure() {
local myconf=(
- --with-system-mozjs
- --with-system-nvtt
--minimal-flags
$(usex nvtt "" "--without-nvtt")
$(usex pch "" "--without-pch")
@@ -124,9 +120,31 @@ src_compile() {
tc-export AR
# build 3rd party fcollada
+ einfo "Building bundled fcollada"
emake -C libraries/source/fcollada/src
+ # build bundled nvtt
+ # nvtt is abandoned upstream and 0ad have forked it
+ # and added fixes. Use their copy.
+ # bug #768930
+ if use nvtt ; then
+ cd libraries/source/nvtt || die
+ elog "Building bundled nvtt (bug #768930)"
+ ./build.sh || die "Failed to build bundled nvtt"
+ cd "${S}" || die
+ fi
+
+ # build bundled spidermonkey
+ # We genuinely can't use the system SpiderMonkey right now.
+ # Breakages occur even on minor bumps in upstream SM,
+ # e.g. bug #768840.
+ cd libraries/source/spidermonkey || die
+ elog "Building bundled SpiderMonkey (bug #768840)"
+ XARGS="${EPREFIX}/usr/bin/xargs" ./build.sh || die "Failed to build
bundled SpiderMonkey"
+ cd "${S}" || die
+
# build 0ad
+ elog "Building 0ad"
emake -C build/workspaces/gcc verbose=1
}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 58b4677f8fed20a5996c79496f93f992665e385a
Author: Sam James gentoo org>
AuthorDate: Sun Jan 17 01:12:57 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 17 01:17:16 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58b4677f
games-strategy/0ad: misc fixups
* Tighten nvtt dep
* Use xdg-utils -> xdg
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James gentoo.org>
.../0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild | 21 -
1 file changed, 8 insertions(+), 13 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
index efaa454..aff130d91e0 100644
--- a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
@@ -1,10 +1,10 @@
# Copyright 2014-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="7"
-WX_GTK_VER="3.0-gtk3"
+EAPI=7
-inherit desktop toolchain-funcs wxwidgets xdg-utils
+WX_GTK_VER="3.0-gtk3"
+inherit desktop toolchain-funcs wxwidgets xdg
if [[ ${PV} == ]]; then
inherit git-r3
@@ -54,7 +54,8 @@ DEPEND="
x11-libs/libX11
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
lobby? ( >=net-libs/gloox-1.0.20 )
- nvtt? ( media-gfx/nvidia-texture-tools )"
+ nvtt? ( >=media-gfx/nvidia-texture-tools-2.1.0 )"
+
RDEPEND="${DEPEND}"
PDEPEND="~games-strategy/0ad-data-${PV}"
@@ -94,7 +95,9 @@ src_configure() {
--bindir="/usr/bin"
--libdir="/usr/$(get_libdir)"/${PN}
--datadir="/usr/share/${PN}"
- )
+ )
+
+ tc-export CC CXX
# stock premake5 does not work, use the shipped one
emake -C "${S}"/build/premake/premake5/build/gmake2.unix
@@ -147,11 +150,3 @@ src_install() {
doicon -s 128 build/resources/${PN}.png
make_desktop_entry ${PN}
}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: 9f45cfa2083bf7a6ab3f92241096c11f5adf7691
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Sat Jan 16 04:00:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 17 01:17:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9f45cfa2
games-strategy/0ad: Version bump (0.0.24_alpha_pre20210116040036).
Using system version of SpiderMonkey 78 to avoid direct dependency on Python.
(SpiderMonkey >=78.6 required due to bug #759985.)
Bug: https://bugs.gentoo.org/735352
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Sam James gentoo.org>
.../0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild | 157 +
games-strategy/0ad/Manifest| 1 +
.../0ad-0.0.24_alpha_pre20210116040036-build.patch | 105 ++
3 files changed, 263 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
new file mode 100644
index 000..efaa454
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.24_alpha_pre20210116040036.ebuild
@@ -0,0 +1,157 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+WX_GTK_VER="3.0-gtk3"
+
+inherit desktop toolchain-funcs wxwidgets xdg-utils
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+ ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+ MY_P="0ad-${PV/_/-}"
+fi
+
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+if [[ ${PV} == ]]; then
+ SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${P}.tar.gz"
+else
+ SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+fi
+
+LICENSE="CC-BY-SA-3.0 GPL-2 LGPL-2.1 MIT ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+BDEPEND="virtual/pkgconfig
+ test? ( dev-lang/perl )"
+DEPEND="
+ >=dev-lang/spidermonkey-78.6:78
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libfmt:0=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/opengl
+ x11-libs/libX11
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( >=net-libs/gloox-1.0.20 )
+ nvtt? ( media-gfx/nvidia-texture-tools )"
+RDEPEND="${DEPEND}"
+PDEPEND="~games-strategy/0ad-data-${PV}"
+
+if [[ ${PV} == ]]; then
+ S="${WORKDIR}/${P}"
+elif [[ ${PV} == *_pre* ]]; then
+ S="${WORKDIR}/${PN}-${ZEROAD_GIT_REVISION}"
+else
+ S="${WORKDIR}/${MY_P}"
+fi
+
+PATCHES=(
+ "${FILESDIR}/${PN}-0.0.24_alpha_pre20210116040036-build.patch"
+)
+
+pkg_setup() {
+ use editor && setup-wxwidgets
+}
+
+src_prepare() {
+ default
+
+ # Delete check for minor version of dev-lang/spidermonkey.
+ sed -e "/^#if MOZJS_MINOR_VERSION != [[:digit:]]\+$/,/^#endif$/d" -i
source/scriptinterface/ScriptTypes.h || die
+}
+
+src_configure() {
+ local myconf=(
+ --with-system-mozjs
+ --with-system-nvtt
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ # stock premake5 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake5 || die
+ "${S}"/build/premake/premake5/bin/release/premake5 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix clean
+ emake -C "${S}"/build/premake/premake5/build/gmake2.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake5/bin/release/premake5 \
+ --file="premake5.lua" \
+ --outpath="../workspaces/gcc/" \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake2 || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/, profiles/base/
commit: 84eacd197ad2a5551821b77854a5da1f7f1b245f
Author: Arfrever Frehtes Taifersar Arahesis Apache Org>
AuthorDate: Sat Jan 16 04:00:00 2021 +
Commit: Sam James gentoo org>
CommitDate: Sun Jan 17 01:17:14 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84eacd19
games-strategy/0ad-data: Version bump (0.0.24_alpha_pre20210116040036).
Signed-off-by: Arfrever Frehtes Taifersar Arahesis Apache.Org>
Signed-off-by: Sam James gentoo.org>
.../0ad-data-0.0.24_alpha_pre20210116040036.ebuild | 88 ++
games-strategy/0ad-data/Manifest | 1 +
profiles/base/package.use.force| 4 +
3 files changed, 93 insertions(+)
diff --git
a/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
new file mode 100644
index 000..da5bd064e6e
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.24_alpha_pre20210116040036.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2014-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+MY_PN="0ad"
+
+if [[ ${PV} == ]]; then
+ inherit git-r3
+
+ EGIT_REPO_URI="https://github.com/0ad/0ad";
+ ZEROAD_GIT_REVISION=""
+elif [[ ${PV} == *_pre* ]]; then
+ ZEROAD_GIT_REVISION="c7d07d3979f969b969211a5e5748fa775f6768a7"
+else
+ MY_P="${MY_PN}-${PV/_/-}"
+fi
+
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/";
+if [[ ${PV} == ]]; then
+ SRC_URI=""
+elif [[ ${PV} == *_pre* ]]; then
+
SRC_URI="https://github.com/0ad/0ad/archive/${ZEROAD_GIT_REVISION}.tar.gz ->
${MY_PN}-${PV}.tar.gz"
+else
+ SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
+fi
+
+LICENSE="BitstreamVera CC-BY-SA-3.0 GPL-2 LPPL-1.3c"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+if [[ ${PV} == || ${PV} == *_pre* ]]; then
+ BDEPEND="~games-strategy/0ad-${PV}[nvtt]"
+else
+ BDEPEND=""
+fi
+DEPEND=""
+RDEPEND=""
+
+if [[ ${PV} == ]]; then
+ S="${WORKDIR}/${MY_PN}-${PV}"
+elif [[ ${PV} == *_pre* ]]; then
+ S="${WORKDIR}/${MY_PN}-${ZEROAD_GIT_REVISION}"
+else
+ S="${WORKDIR}/${MY_P}"
+fi
+
+src_prepare() {
+ default
+ rm binaries/data/tools/fontbuilder/fonts/*.txt || die
+}
+
+src_compile() {
+ if [[ ${PV} == || ${PV} == *_pre* ]]; then
+ # source/lib/sysdep/os/linux/ldbg.cpp:debug_SetThreadName()
tries to open /proc/self/task/${TID}/comm for writing.
+ addpredict /proc/self/task
+
+ # Based on source/tools/dist/build-archives.sh used by
source/tools/dist/build.sh.
+ local archivebuild_input archivebuild_output mod_name
+ for archivebuild_input in binaries/data/mods/[A-Za-z0-9]*; do
+ mod_name="${archivebuild_input##*/}"
+ archivebuild_output="archives/${mod_name}"
+
+ mkdir -p "${archivebuild_output}"
+
+ einfo 0ad -archivebuild="${archivebuild_input}"
-archivebuild-output="${archivebuild_output}/${mod_name}.zip"
+ 0ad -archivebuild="${archivebuild_input}"
-archivebuild-output="${archivebuild_output}/${mod_name}.zip" || die
+
+ if [[ -f "${archivebuild_input}/mod.json" ]]; then
+ cp "${archivebuild_input}/mod.json"
"${archivebuild_output}"
+ fi
+
+ rm -r "${archivebuild_input}" || die
+ mv "${archivebuild_output}" "${archivebuild_input}" ||
die
+ done
+
+ # Based on source/tools/dist/build-unix-win32.sh used by
source/tools/dist/build.sh.
+ rm binaries/data/config/dev.cfg || die
+ rm -r binaries/data/mods/_test.* || die
+ fi
+}
+
+src_install() {
+ insinto /usr/share/0ad
+ doins -r binaries/data/{config,mods,tools}
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index b346a707690..b46c67536ae 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,2 +1,3 @@
DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B
7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6
SHA512
9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
DIST 0ad-0.0.23b-alpha-unix-data.tar.xz 691280800 BLAKE2B
9ee0a1c14adb4fa2a842ad734f67a40af60d063c2f1876a34c49e584017b3fc6894a6be7c6533f15031b118d8a88b40b223decdbc3b8ea95f912271ec56f3a90
SHA512
d0515e44f575737a06f27c75c0a58a5229ead474ae6d48531142015548e5986145f895f95e0fa9209cf9085c7c431f4179ff2e70c1a532f61d1cb62c0a91bcfc
+DIST 0ad-0.0.24_alpha_pre20210116040036.tar.gz 2562395684 BLAKE2B
03d6655f7aa1f2f91a87536a7f2afa46558585
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: ccf88971df129944101991c1a8b78cb3e74203d6
Author: Sam James gentoo org>
AuthorDate: Sat Sep 5 00:32:33 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 5 00:32:33 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ccf88971
games-strategy/0ad: arm64 keyworded (bug #730888)
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad/0ad-0.0.23b_alpha.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
index b059293c8f0..174ce6ff0cd 100644
--- a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -17,7 +17,7 @@
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE="editor +lobby nvtt pch test"
RESTRICT="test"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: aff7c545d95afdbaea3838b30c83f4df74312b21
Author: Sam James gentoo org>
AuthorDate: Sat Sep 5 00:33:19 2020 +
Commit: Sam James gentoo org>
CommitDate: Sat Sep 5 00:33:19 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aff7c545
games-strategy/0ad-data: arm64 keyworded (bug #730888)
Package-Manager: Portage-3.0.4, Repoman-2.3.23
Signed-off-by: Sam James gentoo.org>
games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
index c5edceca6d7..e0fd74cd914 100644
--- a/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
+++ b/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,7 +10,7 @@
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
IUSE=""
S="${WORKDIR}/${MY_P}"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: 2f7dd08d95c02526a7ebb25478c0d7622a8a5811
Author: Lars Wendler gentoo org>
AuthorDate: Thu Dec 12 16:16:01 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Dec 12 16:16:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2f7dd08d
games-strategy/0ad: Added missing header includes
Package-Manager: Portage-2.3.81, Repoman-2.3.20
Signed-off-by: Lars Wendler gentoo.org>
games-strategy/0ad/0ad-0.0.23b_alpha.ebuild | 3 ++-
.../0ad/files/0ad-0.0.23b-header_includes_fix.patch | 20
2 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
index 632db834446..b059293c8f0 100644
--- a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -57,6 +57,7 @@ pkg_setup() {
PATCHES=(
"${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+ "${FILESDIR}"/${PN}-0.0.23b-header_includes_fix.patch
)
src_configure() {
diff --git a/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch
b/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch
new file mode 100644
index 000..60bf9d1679b
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.23b-header_includes_fix.patch
@@ -0,0 +1,20 @@
+--- 0ad-0.0.23b-alpha/source/ps/CLogger.h
0ad-0.0.23b-alpha/source/ps/CLogger.h
+@@ -22,6 +22,7 @@
+ #include
+ #include
+ #include
++#include
+
+ #include "ps/ThreadUtil.h"
+ #include "third_party/cppformat/format.h"
+--- 0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp
0ad-0.0.23b-alpha/source/ps/Profiler2GPU.cpp
+@@ -22,6 +22,7 @@
+
+ #include "precompiled.h"
+
++#include
+ #include "Profiler2GPU.h"
+
+ #include "lib/ogl.h"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 771e1353054731413908ad0442dc3ae78b59f477
Author: Lars Wendler gentoo org>
AuthorDate: Tue Dec 25 23:37:26 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Dec 25 23:39:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=771e1353
games-strategy/0ad-data: Bump to version 0.0.23b_alpha
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
.../0ad-data/0ad-data-0.0.23b_alpha.ebuild | 26 ++
games-strategy/0ad-data/Manifest | 1 +
2 files changed, 27 insertions(+)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
new file mode 100644
index 000..c5edceca6d7
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.23b_alpha.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_P="0ad-${PV/_/-}"
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/";
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+ insinto /usr/share/0ad
+ doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 232b9dd4af3..b346a707690 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1 +1,2 @@
DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B
7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6
SHA512
9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
+DIST 0ad-0.0.23b-alpha-unix-data.tar.xz 691280800 BLAKE2B
9ee0a1c14adb4fa2a842ad734f67a40af60d063c2f1876a34c49e584017b3fc6894a6be7c6533f15031b118d8a88b40b223decdbc3b8ea95f912271ec56f3a90
SHA512
d0515e44f575737a06f27c75c0a58a5229ead474ae6d48531142015548e5986145f895f95e0fa9209cf9085c7c431f4179ff2e70c1a532f61d1cb62c0a91bcfc
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: e49344e875574eadef38acc4efacd3b99f3c79f7
Author: Lars Wendler gentoo org>
AuthorDate: Tue Dec 25 23:39:43 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Dec 25 23:39:57 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e49344e8
games-strategy/0ad: Bump to version 0.0.23b_alpha
Package-Manager: Portage-2.3.52, Repoman-2.3.12
Signed-off-by: Lars Wendler gentoo.org>
games-strategy/0ad/0ad-0.0.23b_alpha.ebuild | 147
games-strategy/0ad/Manifest | 1 +
2 files changed, 148 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
new file mode 100644
index 000..632db834446
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.23b_alpha.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libsodium
+ dev-libs/libxml2
+ dev-libs/nspr
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( >=net-libs/gloox-1.0.20 )
+ nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ use editor && setup-wxwidgets
+}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newbin binaries/system/pyrogenesis 0ad
+ use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto /usr/share/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ g
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 44d0bfd3972a9aa9114d162e3bc8a27cb4ca4303
Author: Lars Wendler gentoo org>
AuthorDate: Wed Oct 31 08:13:03 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Oct 31 08:13:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=44d0bfd3
games-strategy/0ad: Removed old.
Signed-off-by: Lars Wendler gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 146 -
games-strategy/0ad/Manifest| 1 -
2 files changed, 147 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
deleted file mode 100644
index 1cb088436b4..000
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch test"
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libxml2
- dev-libs/nspr
- ~games-strategy/0ad-data-${PV}
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- media-libs/libvorbis
- media-libs/openal
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( >=net-libs/gloox-1.0.20 )
- nvtt? ( media-gfx/nvidia-texture-tools )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- test? ( dev-lang/perl )"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- use editor && setup-wxwidgets
-}
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
-)
-
-src_configure() {
- local myconf=(
- --with-system-nvtt
- --with-system-miniupnpc
- --minimal-flags
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --collada
- --bindir="/usr/bin"
- --libdir="/usr/$(get_libdir)"/${PN}
- --datadir="/usr/share/${PN}"
- )
-
- # stock premake4 does not work, use the shipped one
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake4 || die
- "${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
- # rebuild premake again... this is the most stupid build system
- emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake4/bin/release/premake4 \
- --file="premake4.lua" \
- --outpath="../workspaces/gcc/" \
- --platform=$(usex amd64 "x64" "x32") \
- --os=linux \
- "${myconf[@]}" \
- gmake || die "Premake failed"
-}
-
-src_compile() {
- tc-export AR
-
- # build bundled and patched spidermonkey
- cd libraries/source/spidermonkey || die
- JOBS="${MAKEOPTS}" ./build.sh || die
- cd "${S}" || die
-
- # build 3rd party fcollada
- emake -C libraries/source/fcollada/src
-
- # build 0ad
- emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
- cd binaries/system || die
- ./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
- newbin binaries/system/pyrogenesis 0ad
- use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
-
- insinto /usr/share/${PN}
- doins -r binaries/data/l10n
-
- exeinto /usr/$(get_libdir)/${PN}
- doexe binaries/system/libCollada.so
- doexe libraries/source/spidermonkey/lib/*.so
- use editor && doexe binaries/system/libAtlasUI.so
-
- dodoc binaries/system/readme.txt
- doicon -s 128 build/resources/${PN}.png
- make_desktop_entry ${PN}
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
-}
diff --git a/g
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 94c6621e927eb017336c85d582223e2fe3a257f4
Author: Lars Wendler gentoo org>
AuthorDate: Wed Oct 31 08:13:21 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Oct 31 08:13:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=94c6621e
games-strategy/0ad-data: Removed old.
Signed-off-by: Lars Wendler gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
.../0ad-data/0ad-data-0.0.22_alpha.ebuild | 26 --
games-strategy/0ad-data/Manifest | 1 -
2 files changed, 27 deletions(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
deleted file mode 100644
index 2413f34ee5d..000
--- a/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/";
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
- default
- rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
- insinto /usr/share/0ad
- doins -r binaries/data/*
-}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index dad84d4684c..232b9dd4af3 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,2 +1 @@
-DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 BLAKE2B
2b3fd05919e344136114903706d5ec452d432e1fb839e9324b23a627bd740e1994dd10db0d4345447950807908d0f299c745c7f0b6c3cb3215f5a23147ab3e51
SHA512
ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B
7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6
SHA512
9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: db6824809134c8a3327f7fdba293d8fcb6b06e97
Author: Maciej Mrozowski gentoo org>
AuthorDate: Thu May 24 21:18:57 2018 +
Commit: Maciej Mrozowski gentoo org>
CommitDate: Thu May 24 21:19:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db682480
games-strategy/0ad: Add dev-libs/libsodium dependency, fixes 656454
Package-Manager: Portage-2.3.24, Repoman-2.3.6
games-strategy/0ad/0ad-0.0.23_alpha.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
index 281d8103dfe..0e44c4e36fb 100644
--- a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
@@ -24,6 +24,7 @@ RESTRICT="test"
RDEPEND="
dev-libs/boost:=
dev-libs/icu:=
+ dev-libs/libsodium
dev-libs/libxml2
dev-libs/nspr
~games-strategy/0ad-data-${PV}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: b0b035efd9097d0900d3318557cff31f7cc18769
Author: Lars Wendler gentoo org>
AuthorDate: Thu May 24 14:38:40 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu May 24 14:39:00 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b035ef
games-strategy/0ad: Bump to version 0.0.23_alpha
Package-Manager: Portage-2.3.38, Repoman-2.3.9
games-strategy/0ad/0ad-0.0.23_alpha.ebuild | 146 +
games-strategy/0ad/Manifest| 1 +
2 files changed, 147 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
new file mode 100644
index 000..281d8103dfe
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.23_alpha.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libxml2
+ dev-libs/nspr
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( >=net-libs/gloox-1.0.20 )
+ nvtt? ( media-gfx/nvidia-texture-tools )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+ use editor && setup-wxwidgets
+}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newbin binaries/system/pyrogenesis 0ad
+ use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto /usr/share/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-strategy/0ad/Manifest b/
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 0dca90f9044b8626669d96d711e3779998bec168
Author: Lars Wendler gentoo org>
AuthorDate: Thu May 24 14:36:31 2018 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu May 24 14:38:58 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0dca90f9
games-strategy/0ad-data: Bump to version 0.0.23_alpha
Package-Manager: Portage-2.3.38, Repoman-2.3.9
.../0ad-data/0ad-data-0.0.23_alpha.ebuild | 26 ++
games-strategy/0ad-data/Manifest | 1 +
2 files changed, 27 insertions(+)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
new file mode 100644
index 000..9b33e87f794
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.23_alpha.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P="0ad-${PV/_/-}"
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/";
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+ insinto /usr/share/0ad
+ doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 5013963aa30..dad84d4684c 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1 +1,2 @@
DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 BLAKE2B
2b3fd05919e344136114903706d5ec452d432e1fb839e9324b23a627bd740e1994dd10db0d4345447950807908d0f299c745c7f0b6c3cb3215f5a23147ab3e51
SHA512
ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
+DIST 0ad-0.0.23-alpha-unix-data.tar.xz 691973492 BLAKE2B
7dcd36d21ea2c12f314f5a185a0fce57cec33754fbd26ad34c376fb9c7725fe5487e79a3da54249981fe58bf03c39350a871198a4cfb98c3a40eb878c6cc39b6
SHA512
9eae8bbdf83f609a0775261d691435c2924b505499fdf36ac0922b5f0c1d605dae49f257a872153c718d8bad018f6635320ec376418761c0d650bf165765e062
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 183cd703980c2e0b36654ee4137d78b669e0253d
Author: Alexander Tsoy tsoy me>
AuthorDate: Sat Dec 30 16:55:48 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Jan 5 13:01:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=183cd703
games-strategy/0ad: add missing setup-wxwidgets()
Closes: https://bugs.gentoo.org/642748
Closes: https://github.com/gentoo/gentoo/pull/6691
games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
index 73de7d6ddbe..1cb088436b4 100644
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -51,6 +51,7 @@ S="${WORKDIR}/${MY_P}"
pkg_setup() {
python-any-r1_pkg_setup
+ use editor && setup-wxwidgets
}
PATCHES=(
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 63ef41c718a62fa23050d4f8abc9086b0e02feea
Author: Lars Wendler gentoo org>
AuthorDate: Tue Aug 22 07:13:55 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Tue Aug 22 07:14:12 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63ef41c7
games-strategy/0ad: Removed "sound" USE flag.
A game without sound does not really provide optimal game experience.
Package-Manager: Portage-2.3.8, Repoman-2.3.3
games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 9 -
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
index 2bc96642ea2..73de7d6ddbe 100644
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -18,7 +18,7 @@
SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
+IUSE="editor +lobby nvtt pch test"
RESTRICT="test"
RDEPEND="
@@ -29,6 +29,8 @@ RDEPEND="
~games-strategy/0ad-data-${PV}
media-libs/libpng:0
media-libs/libsdl2[X,opengl,video]
+ media-libs/libvorbis
+ media-libs/openal
net-libs/enet:1.3
net-libs/miniupnpc:=
net-misc/curl
@@ -39,9 +41,7 @@ RDEPEND="
x11-libs/libXcursor
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
lobby? ( >=net-libs/gloox-1.0.20 )
- nvtt? ( media-gfx/nvidia-texture-tools )
- sound? ( media-libs/libvorbis
- media-libs/openal )"
+ nvtt? ( media-gfx/nvidia-texture-tools )"
DEPEND="${RDEPEND}
${PYTHON_DEPS}
virtual/pkgconfig
@@ -65,7 +65,6 @@ src_configure() {
$(usex nvtt "" "--without-nvtt")
$(usex pch "" "--without-pch")
$(usex test "" "--without-tests")
- $(usex sound "" "--without-audio")
$(usex editor "--atlas" "")
$(usex lobby "" "--without-lobby")
--collada
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 23eaef86b34331c8601cdd6b7aaf545588f54138
Author: Lars Wendler gentoo org>
AuthorDate: Fri Aug 4 08:43:49 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Aug 4 08:44:03 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23eaef86
games-strategy/0ad: Adjust gloox dependency (bug #626976)
Package-Manager: Portage-2.3.6, Repoman-2.3.3
games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
index 0eac8acb767..2bc96642ea2 100644
--- a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
x11-libs/libX11
x11-libs/libXcursor
editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( net-libs/gloox )
+ lobby? ( >=net-libs/gloox-1.0.20 )
nvtt? ( media-gfx/nvidia-texture-tools )
sound? ( media-libs/libvorbis
media-libs/openal )"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 644a4c60652a4da408daa1ba1df32ae5aee0c750
Author: Lars Wendler gentoo org>
AuthorDate: Thu Jul 27 13:36:50 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jul 27 13:38:35 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=644a4c60
games-strategy/0ad: Bump to version 0.0.22_alpha
Package-Manager: Portage-2.3.6, Repoman-2.3.3
games-strategy/0ad/0ad-0.0.22_alpha.ebuild | 146 +
games-strategy/0ad/Manifest| 1 +
2 files changed, 147 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
new file mode 100644
index 000..0eac8acb767
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.22_alpha.ebuild
@@ -0,0 +1,146 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="https://play0ad.com/";
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libxml2
+ dev-libs/nspr
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+ nvtt? ( media-gfx/nvidia-texture-tools )
+ sound? ( media-libs/libvorbis
+ media-libs/openal )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-0.0.21_alpha-gentoo.patch
+)
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex sound "" "--without-audio")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newbin binaries/system/pyrogenesis 0ad
+ use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto /usr/share/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/ga
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: eaa8b1311c912e3edb72bd3166241b129af34c35
Author: Lars Wendler gentoo org>
AuthorDate: Thu Jul 27 13:37:33 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jul 27 13:38:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eaa8b131
games-strategy/0ad: Removed old.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
games-strategy/0ad/0ad-0.0.20_alpha.ebuild | 151 -
games-strategy/0ad/Manifest| 1 -
.../0ad/files/0ad-0.0.20_alpha-gentoo.patch| 105 --
3 files changed, 257 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
deleted file mode 100644
index 5ccfab2942c..000
--- a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="https://play0ad.com/";
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/boost:=
- dev-libs/icu:=
- dev-libs/libxml2
- dev-libs/nspr
- ~games-strategy/0ad-data-${PV}
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( net-libs/gloox )
- nvtt? ( media-gfx/nvidia-texture-tools )
- sound? ( media-libs/libvorbis
- media-libs/openal )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- games_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
-}
-
-src_configure() {
- local myconf=(
- --with-system-nvtt
- --with-system-miniupnpc
- --minimal-flags
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex sound "" "--without-audio")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --collada
- --bindir="${GAMES_BINDIR}"
- --libdir="$(games_get_libdir)"/${PN}
- --datadir="${GAMES_DATADIR}"/${PN}
- )
-
- # stock premake4 does not work, use the shipped one
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake4 || die
- "${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
- # rebuild premake again... this is the most stupid build system
- emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake4/bin/release/premake4 \
- --file="premake4.lua" \
- --outpath="../workspaces/gcc/" \
- --platform=$(usex amd64 "x64" "x32") \
- --os=linux \
- "${myconf[@]}" \
- gmake || die "Premake failed"
-}
-
-src_compile() {
- tc-export AR
-
- # build bundled and patched spidermonkey
- cd libraries/source/spidermonkey || die
- JOBS="${MAKEOPTS}" ./build.sh || die
- cd "${S}" || die
-
- # build 3rd party fcollada
- emake -C libraries/source/fcollada/src
-
- # build 0ad
- emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
- cd binaries/system || die
- ./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
- newgamesbin binaries/system/pyrogenesis 0ad
- use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r binaries/data/l10n
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe binaries/system/libCollada.so
- doexe libraries/source/spidermonkey/lib/*.so
- use editor && doexe binaries/system/libAtlasUI.so
-
- dodoc binaries/system/readme.txt
- doicon -s 128 build/resources/${PN}.png
- make_desktop_entry ${PN}
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- ga
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: c9f9ad2cb8ae04be8608323990ae343f20c1032a
Author: Lars Wendler gentoo org>
AuthorDate: Thu Jul 27 13:35:58 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jul 27 13:38:33 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9f9ad2c
games-strategy/0ad-data: Bump to version 0.0.22_alpha
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../0ad-data/0ad-data-0.0.22_alpha.ebuild | 26 ++
games-strategy/0ad-data/Manifest | 1 +
2 files changed, 27 insertions(+)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
new file mode 100644
index 000..2413f34ee5d
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.22_alpha.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/";
+SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+ rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+ insinto /usr/share/0ad
+ doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 65eccd4c70a..6d391da645a 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,2 +1,3 @@
DIST 0ad-0.0.20-alpha-unix-data.tar.xz 575064564 SHA256
db5eb387ae131bece98a2685e9568cfc4e701a561dd8bb930dfa2dec2043f4d3 SHA512
02d78f2147f573b201d779f636faba6175c93ebc9df2f2a1e5c593cbee983f822040daf38729b743a8b720f8678935415fd772c2d3d2abb1c2665050a20babb8
WHIRLPOOL
6d08c719bb7cfb6297f5de6fd8f101b5a1a303151ece18b9a4ff15a971e67564c1aeb59679b54270ba6dc48514c947528d32de1b0b25c94854d739fb026748a0
DIST 0ad-0.0.21-alpha-unix-data.tar.xz 587025496 SHA256
f3ab3c58ffd3bd647a9baba93ea009d5945d2b5bc7db7053a547e07db36faa97 SHA512
526bce35da0d86aa344f634fc661189211478b9a9b7759bb6d0cf6b2096cfcf3449d53ded38c23583877fed47aa438da0e379088a37819ae890526f5996afd36
WHIRLPOOL
ebce2dd81bc3672b42847f63e5fee78574ed4bfd720b96a0c46393bb55f3ec112481e0dd5108dcce3e30683496d0467ff377d42eb89486560adb32bdb05c6f3e
+DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 SHA256
4c32cd0a346815cd260357d55d5a61430f670c78a2fa7a321957c0e4559a766e SHA512
ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
WHIRLPOOL
4368da3799b1000b034a023d13b8c4d360c1a36edc891601963bbfe10433d85564c213711c2397b515900dcca0115c7231f151ec06636efb4f04c8c0c71e92b1
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: a2ac54ea55fc4962e76aa6fcc4f337cb0ec65445
Author: Lars Wendler gentoo org>
AuthorDate: Thu Jul 27 13:38:10 2017 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Jul 27 13:38:40 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ac54ea
games-strategy/0ad-data: Removed old.
Package-Manager: Portage-2.3.6, Repoman-2.3.3
.../0ad-data/0ad-data-0.0.20_alpha.ebuild | 27 --
games-strategy/0ad-data/Manifest | 1 -
2 files changed, 28 deletions(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
deleted file mode 100644
index ce552973bda..000
--- a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="https://play0ad.com/";
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/0ad
- doins -r binaries/data/*
- prepgamesdirs
-}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 6d391da645a..269758bba93 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,3 +1,2 @@
-DIST 0ad-0.0.20-alpha-unix-data.tar.xz 575064564 SHA256
db5eb387ae131bece98a2685e9568cfc4e701a561dd8bb930dfa2dec2043f4d3 SHA512
02d78f2147f573b201d779f636faba6175c93ebc9df2f2a1e5c593cbee983f822040daf38729b743a8b720f8678935415fd772c2d3d2abb1c2665050a20babb8
WHIRLPOOL
6d08c719bb7cfb6297f5de6fd8f101b5a1a303151ece18b9a4ff15a971e67564c1aeb59679b54270ba6dc48514c947528d32de1b0b25c94854d739fb026748a0
DIST 0ad-0.0.21-alpha-unix-data.tar.xz 587025496 SHA256
f3ab3c58ffd3bd647a9baba93ea009d5945d2b5bc7db7053a547e07db36faa97 SHA512
526bce35da0d86aa344f634fc661189211478b9a9b7759bb6d0cf6b2096cfcf3449d53ded38c23583877fed47aa438da0e379088a37819ae890526f5996afd36
WHIRLPOOL
ebce2dd81bc3672b42847f63e5fee78574ed4bfd720b96a0c46393bb55f3ec112481e0dd5108dcce3e30683496d0467ff377d42eb89486560adb32bdb05c6f3e
DIST 0ad-0.0.22-alpha-unix-data.tar.xz 632555792 SHA256
4c32cd0a346815cd260357d55d5a61430f670c78a2fa7a321957c0e4559a766e SHA512
ff9928a59b461d4a6082227dce11b7a497e9e518b6cd3a58723963bed9241f7afc2b228e7728a3d03bd2a8c3708f756639b87abd6520d09dab01309c8444ff1d
WHIRLPOOL
4368da3799b1000b034a023d13b8c4d360c1a36edc891601963bbfe10433d85564c213711c2397b515900dcca0115c7231f151ec06636efb4f04c8c0c71e92b1
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 991a88d0ef10942b2202c132d1c4105895090c9b
Author: Michael Palimaka gentoo org>
AuthorDate: Mon Jun 12 08:09:32 2017 +
Commit: Michael Palimaka gentoo org>
CommitDate: Mon Jun 12 08:09:52 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=991a88d0
games-strategy/0ad: use HTTPS
Package-Manager: Portage-2.3.5, Repoman-2.3.2
games-strategy/0ad/0ad-0.0.20_alpha.ebuild | 4 ++--
games-strategy/0ad/0ad-0.0.21_alpha.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
index 14f1d2a1cab..5ccfab2942c 100644
--- a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -12,7 +12,7 @@ inherit eutils wxwidgets toolchain-funcs gnome2-utils
python-any-r1 games
MY_P=0ad-${PV/_/-}
DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/";
+HOMEPAGE="https://play0ad.com/";
SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
diff --git a/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
index ab8f438e264..89de55c9db8 100644
--- a/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -12,7 +12,7 @@ inherit eutils wxwidgets toolchain-funcs gnome2-utils
python-any-r1
MY_P=0ad-${PV/_/-}
DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/";
+HOMEPAGE="https://play0ad.com/";
SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: 321c95f1d60bebfe9dea80d3063d2fdf08472b3b
Author: Lars Wendler gentoo org>
AuthorDate: Wed Nov 9 23:40:42 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Nov 9 23:41:05 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=321c95f1
games-strategy/0ad: Bump to version 0.0.21 (bug #599350).
Bumped to EAPI-6 (bug #589812).
Package-Manager: portage-2.3.2
games-strategy/0ad/0ad-0.0.21_alpha.ebuild | 147 +
games-strategy/0ad/Manifest| 1 +
.../0ad/files/0ad-0.0.21_alpha-gentoo.patch| 88
3 files changed, 236 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
new file mode 100644
index ..02abd8d
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.21_alpha.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/icu:=
+ dev-libs/libxml2
+ dev-libs/nspr
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+ nvtt? ( media-gfx/nvidia-texture-tools )
+ sound? ( media-libs/libvorbis
+ media-libs/openal )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ python-any-r1_pkg_setup
+}
+
+PATCHES=(
+ "${FILESDIR}"/${P}-gentoo.patch
+)
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex sound "" "--without-audio")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="/usr/bin"
+ --libdir="/usr/$(get_libdir)"/${PN}
+ --datadir="/usr/share/${PN}"
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newbin binaries/system/pyrogenesis 0ad
+ use editor && newbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto /usr/share/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto /usr/$(get_libdir)/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ gnome2_icon_ca
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: bef4cc77c47bab2eff5aae4540ef453c6404b3cf
Author: Lars Wendler gentoo org>
AuthorDate: Wed Nov 9 23:38:45 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Nov 9 23:41:02 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bef4cc77
games-strategy/0ad-data: Bump to version 0.0.21 (bug #599350).
Bumped to EAPI-6 (bug #589812).
Package-Manager: portage-2.3.2
.../0ad-data/0ad-data-0.0.21_alpha.ebuild | 27 ++
games-strategy/0ad-data/Manifest | 1 +
2 files changed, 28 insertions(+)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.21_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.21_alpha.ebuild
new file mode 100644
index ..b5934aa
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.21_alpha.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="https://play0ad.com/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ default
+ rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+ insinto /usr/share/0ad
+ doins -r binaries/data/*
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 5a90757..65eccd4 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1 +1,2 @@
DIST 0ad-0.0.20-alpha-unix-data.tar.xz 575064564 SHA256
db5eb387ae131bece98a2685e9568cfc4e701a561dd8bb930dfa2dec2043f4d3 SHA512
02d78f2147f573b201d779f636faba6175c93ebc9df2f2a1e5c593cbee983f822040daf38729b743a8b720f8678935415fd772c2d3d2abb1c2665050a20babb8
WHIRLPOOL
6d08c719bb7cfb6297f5de6fd8f101b5a1a303151ece18b9a4ff15a971e67564c1aeb59679b54270ba6dc48514c947528d32de1b0b25c94854d739fb026748a0
+DIST 0ad-0.0.21-alpha-unix-data.tar.xz 587025496 SHA256
f3ab3c58ffd3bd647a9baba93ea009d5945d2b5bc7db7053a547e07db36faa97 SHA512
526bce35da0d86aa344f634fc661189211478b9a9b7759bb6d0cf6b2096cfcf3449d53ded38c23583877fed47aa438da0e379088a37819ae890526f5996afd36
WHIRLPOOL
ebce2dd81bc3672b42847f63e5fee78574ed4bfd720b96a0c46393bb55f3ec112481e0dd5108dcce3e30683496d0467ff377d42eb89486560adb32bdb05c6f3e
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 7a5d3469dfbf86c6c3b157d8a3a40bc1225b27f6 Author: Lars Wendler gentoo org> AuthorDate: Thu Sep 29 05:38:49 2016 + Commit: Lars Wendler gentoo org> CommitDate: Thu Sep 29 05:40:39 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5d3469 games-strategy/0ad: Added sub-slot dependency for dev-libs/boost. Package-Manager: portage-2.3.1 Signed-off-by: Lars Wendler gentoo.org> games-strategy/0ad/0ad-0.0.20_alpha.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild index 56370a9..1a7b692 100644 --- a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild +++ b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild @@ -23,7 +23,7 @@ IUSE="editor +lobby nvtt pch sound test" RESTRICT="test" RDEPEND=" - dev-libs/boost + dev-libs/boost:= dev-libs/icu:= dev-libs/libxml2 dev-libs/nspr
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 24d5c27cd7653755991c1f947abbe7bb36d1f770
Author: Michael Sterrett gentoo org>
AuthorDate: Mon Jun 27 22:28:43 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Jun 28 14:37:32 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24d5c27c
games-strategy/0ad-data: update HOMEPAGE
Package-Manager: portage-2.2.28
games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
index 05786b5..2f19b5f 100644
--- a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
+++ b/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
@@ -7,7 +7,7 @@ inherit games
MY_P=0ad-${PV/_/-}
DESCRIPTION="Data files for 0ad"
-HOMEPAGE="http://wildfiregames.com/0ad/";
+HOMEPAGE="https://play0ad.com/";
SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: 1aa37ab8bf7393291d4326762db5c2954d86b3d4
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Jun 7 17:10:27 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Jun 7 22:27:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1aa37ab8
games-strategy/0ad: clean old
Package-Manager: portage-2.2.28
games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild | 154 -
games-strategy/0ad/Manifest| 1 -
.../0ad/files/0ad-0.0.18_alpha-gentoo.patch| 101 --
.../0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch | 14 --
4 files changed, 270 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
deleted file mode 100644
index 5bd3321..000
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="3.0"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/";
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/boost
- dev-libs/icu:=
- dev-libs/libxml2
- dev-libs/nspr
- ~games-strategy/0ad-data-${PV}
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg:0
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( net-libs/gloox )
- nvtt? ( media-gfx/nvidia-texture-tools )
- sound? ( media-libs/libvorbis
- media-libs/openal )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- games_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-miniupnpc14.patch
-}
-
-src_configure() {
- local myconf=(
- --with-system-nvtt
- --with-system-miniupnpc
- --minimal-flags
- --sdl2
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex sound "" "--without-audio")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --collada
- --bindir="${GAMES_BINDIR}"
- --libdir="$(games_get_libdir)"/${PN}
- --datadir="${GAMES_DATADIR}"/${PN}
- )
-
- # stock premake4 does not work, use the shipped one
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake4 || die
- "${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
- # rebuild premake again... this is the most stupid build system
- emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake4/bin/release/premake4 \
- --file="premake4.lua" \
- --outpath="../workspaces/gcc/" \
- --platform=$(usex amd64 "x64" "x32") \
- --os=linux \
- "${myconf[@]}" \
- gmake || die "Premake failed"
-}
-
-src_compile() {
- tc-export AR
-
- # build bundled and patched spidermonkey
- cd libraries/source/spidermonkey || die
- JOBS="${MAKEOPTS}" ./build.sh || die
- cd "${S}" || die
-
- # build 3rd party fcollada
- emake -C libraries/source/fcollada/src
-
- # build 0ad
- emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
- cd binaries/system || die
- ./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
- newgamesbin binaries/system/pyrogenesis 0ad
- use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r binaries/data/l10n
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe binaries/system/libCollada.so
- doexe libraries/source/spidermonkey/lib/*.so
- use editor && doexe binaries/system/libAtlasUI.so
-
- dodoc binaries/system/readme.txt
-
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 79004b7ec21aa49911f20b0c474646c858837181
Author: Michael Sterrett gentoo org>
AuthorDate: Tue Jun 7 17:12:02 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Tue Jun 7 22:27:31 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=79004b7e
games-strategy/0ad-data: clean old
Package-Manager: portage-2.2.28
.../0ad-data/0ad-data-0.0.18_alpha.ebuild | 29 --
games-strategy/0ad-data/Manifest | 1 -
2 files changed, 30 deletions(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.18_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.18_alpha.ebuild
deleted file mode 100644
index 051308e..000
--- a/games-strategy/0ad-data/0ad-data-0.0.18_alpha.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="http://wildfiregames.com/0ad/";
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/0ad
- doins -r binaries/data/*
- prepgamesdirs
-}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 4e4b096..5a90757 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,2 +1 @@
-DIST 0ad-0.0.18-alpha-unix-data.tar.xz 571228108 SHA256
b1a4078eb945ac873accb45c831dbe988866e3559d16bea189eb439c2c71ac44 SHA512
581b6774ff42b130152acb057028584816b6194fb24ad98b2e384f1193afb0468f4e336e00834703dbe83477176be4f0ce423a5bae8343c266d5a066932bd8d6
WHIRLPOOL
dbebefb11e1476052e57e978ed6dbe578e758a608dae7ee26ec7e694dc1d5189a8030c65b5dbd81052e709d91c5ecbb49caa0a33fcbf6d593a701a329d3a3a54
DIST 0ad-0.0.20-alpha-unix-data.tar.xz 575064564 SHA256
db5eb387ae131bece98a2685e9568cfc4e701a561dd8bb930dfa2dec2043f4d3 SHA512
02d78f2147f573b201d779f636faba6175c93ebc9df2f2a1e5c593cbee983f822040daf38729b743a8b720f8678935415fd772c2d3d2abb1c2665050a20babb8
WHIRLPOOL
6d08c719bb7cfb6297f5de6fd8f101b5a1a303151ece18b9a4ff15a971e67564c1aeb59679b54270ba6dc48514c947528d32de1b0b25c94854d739fb026748a0
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: ad6bff2cea278cfaa251f1a36f37586bc250211b
Author: Michael Sterrett gentoo org>
AuthorDate: Wed May 25 22:16:54 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Wed May 25 22:17:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad6bff2c
games-strategy/0ad-data: version bump (bug #567230)
Package-Manager: portage-2.2.28
.../0ad-data/0ad-data-0.0.20_alpha.ebuild | 29 ++
games-strategy/0ad-data/Manifest | 1 +
2 files changed, 30 insertions(+)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
new file mode 100644
index 000..7fde07c
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="http://wildfiregames.com/0ad/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+ insinto "${GAMES_DATADIR}"/0ad
+ doins -r binaries/data/*
+ prepgamesdirs
+}
+
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 91f1074..4e4b096 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1 +1,2 @@
DIST 0ad-0.0.18-alpha-unix-data.tar.xz 571228108 SHA256
b1a4078eb945ac873accb45c831dbe988866e3559d16bea189eb439c2c71ac44 SHA512
581b6774ff42b130152acb057028584816b6194fb24ad98b2e384f1193afb0468f4e336e00834703dbe83477176be4f0ce423a5bae8343c266d5a066932bd8d6
WHIRLPOOL
dbebefb11e1476052e57e978ed6dbe578e758a608dae7ee26ec7e694dc1d5189a8030c65b5dbd81052e709d91c5ecbb49caa0a33fcbf6d593a701a329d3a3a54
+DIST 0ad-0.0.20-alpha-unix-data.tar.xz 575064564 SHA256
db5eb387ae131bece98a2685e9568cfc4e701a561dd8bb930dfa2dec2043f4d3 SHA512
02d78f2147f573b201d779f636faba6175c93ebc9df2f2a1e5c593cbee983f822040daf38729b743a8b720f8678935415fd772c2d3d2abb1c2665050a20babb8
WHIRLPOOL
6d08c719bb7cfb6297f5de6fd8f101b5a1a303151ece18b9a4ff15a971e67564c1aeb59679b54270ba6dc48514c947528d32de1b0b25c94854d739fb026748a0
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 49a5add8875bba067c8f1a9c13a03a0fc8067f74
Author: Michael Sterrett gentoo org>
AuthorDate: Wed May 25 22:17:27 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Wed May 25 22:17:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=49a5add8
games-strategy/0ad-data: whitespace
Package-Manager: portage-2.2.28
games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild | 1 -
1 file changed, 1 deletion(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
index 7fde07c..05786b5 100644
--- a/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
+++ b/games-strategy/0ad-data/0ad-data-0.0.20_alpha.ebuild
@@ -26,4 +26,3 @@ src_install() {
doins -r binaries/data/*
prepgamesdirs
}
-
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: bd16e276a83632439c4fab058a5268eaa743ef21
Author: Michael Sterrett gentoo org>
AuthorDate: Wed May 25 22:16:20 2016 +
Commit: Michael Sterrett gentoo org>
CommitDate: Wed May 25 22:17:45 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd16e276
games-strategy/0ad: version bump (bug #567230)
Package-Manager: portage-2.2.28
games-strategy/0ad/0ad-0.0.20_alpha.ebuild | 152 +
games-strategy/0ad/Manifest| 1 +
.../0ad/files/0ad-0.0.20_alpha-gentoo.patch| 105 ++
3 files changed, 258 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
new file mode 100644
index 000..56370a9
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.20_alpha.ebuild
@@ -0,0 +1,152 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost
+ dev-libs/icu:=
+ dev-libs/libxml2
+ dev-libs/nspr
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+ nvtt? ( media-gfx/nvidia-texture-tools )
+ sound? ( media-libs/libvorbis
+ media-libs/openal )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ games_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex sound "" "--without-audio")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="${GAMES_BINDIR}"
+ --libdir="$(games_get_libdir)"/${PN}
+ --datadir="${GAMES_DATADIR}"/${PN}
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newgamesbin binaries/system/pyrogenesis 0ad
+ use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto "$(games_get_libdir)"/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: 84e3985f307d91f4ad57ba3d5ec4e7076e763b09
Author: Julian Ospald gentoo org>
AuthorDate: Mon Oct 26 17:59:12 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Mon Oct 26 18:00:12 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=84e3985f
games-strategy/0ad: fix virtual/jpeg SLOT
games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild | 154 ++
1 file changed, 154 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
new file mode 100644
index 000..5bd3321
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost
+ dev-libs/icu:=
+ dev-libs/libxml2
+ dev-libs/nspr
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:0
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+ nvtt? ( media-gfx/nvidia-texture-tools )
+ sound? ( media-libs/libvorbis
+ media-libs/openal )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ games_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-miniupnpc14.patch
+}
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ --sdl2
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex sound "" "--without-audio")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="${GAMES_BINDIR}"
+ --libdir="$(games_get_libdir)"/${PN}
+ --datadir="${GAMES_DATADIR}"/${PN}
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newgamesbin binaries/system/pyrogenesis 0ad
+ use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto "$(games_get_libdir)"/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postin
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: a51e027ecd9511fdc2249c9d689b4097c4d0a4bf
Author: Julian Ospald gentoo org>
AuthorDate: Mon Oct 26 17:59:42 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Mon Oct 26 18:00:14 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a51e027e
games-strategy/0ad: rm old
games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild | 154 --
games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild | 154 --
2 files changed, 308 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
deleted file mode 100644
index 654bb3d..000
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="threads,ssl"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/";
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby nvtt pch sound test"
-RESTRICT="test"
-
-RDEPEND="
- dev-libs/boost
- dev-libs/icu:=
- dev-libs/libxml2
- dev-libs/nspr
- ~games-strategy/0ad-data-${PV}
- media-libs/libpng:0
- media-libs/libsdl2[X,opengl,video]
- net-libs/enet:1.3
- net-libs/miniupnpc:=
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg:62
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( net-libs/gloox )
- nvtt? ( media-gfx/nvidia-texture-tools )
- sound? ( media-libs/libvorbis
- media-libs/openal )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-pkg_setup() {
- games_pkg_setup
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch
- epatch "${FILESDIR}"/${P}-miniupnpc14.patch
-}
-
-src_configure() {
- local myconf=(
- --with-system-nvtt
- --with-system-miniupnpc
- --minimal-flags
- --sdl2
- $(usex nvtt "" "--without-nvtt")
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex sound "" "--without-audio")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --collada
- --bindir="${GAMES_BINDIR}"
- --libdir="$(games_get_libdir)"/${PN}
- --datadir="${GAMES_DATADIR}"/${PN}
- )
-
- # stock premake4 does not work, use the shipped one
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake4 || die
- "${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
- # rebuild premake again... this is the most stupid build system
- emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake4/bin/release/premake4 \
- --file="premake4.lua" \
- --outpath="../workspaces/gcc/" \
- --platform=$(usex amd64 "x64" "x32") \
- --os=linux \
- "${myconf[@]}" \
- gmake || die "Premake failed"
-}
-
-src_compile() {
- tc-export AR
-
- # build bundled and patched spidermonkey
- cd libraries/source/spidermonkey || die
- JOBS="${MAKEOPTS}" ./build.sh || die
- cd "${S}" || die
-
- # build 3rd party fcollada
- emake -C libraries/source/fcollada/src
-
- # build 0ad
- emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
- cd binaries/system || die
- ./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
- newgamesbin binaries/system/pyrogenesis 0ad
- use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r binaries/data/l10n
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe binaries/system/libCollada.so
- doexe libraries/source/spidermonkey/lib/*.so
- use editor && doexe binaries/system/libAtlasUI.so
-
- dodoc binaries/system/readme.txt
- doicon -s 128 build/resources/${PN}.png
- make_desktop_entry ${PN}
-
- prepgamesdirs
-}
-
-pkg_preinst() {
- games_pkg_preinst
-
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: a36823d5f86a959f46ff6d01b05e2de1bf4ee12e
Author: Julian Ospald gentoo org>
AuthorDate: Mon Oct 26 17:31:40 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Mon Oct 26 17:32:28 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a36823d5
games-strategy/0ad: use x11-libs/wxGTK:3.0
Gentoo-Bug: 563328
games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild | 154 ++
1 file changed, 154 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
new file mode 100644
index 000..8052103
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r3.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="3.0"
+
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost
+ dev-libs/icu:=
+ dev-libs/libxml2
+ dev-libs/nspr
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ net-libs/enet:1.3
+ net-libs/miniupnpc:=
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:62
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+ nvtt? ( media-gfx/nvidia-texture-tools )
+ sound? ( media-libs/libvorbis
+ media-libs/openal )"
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+pkg_setup() {
+ games_pkg_setup
+ python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-miniupnpc14.patch
+}
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ --sdl2
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex sound "" "--without-audio")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="${GAMES_BINDIR}"
+ --libdir="$(games_get_libdir)"/${PN}
+ --datadir="${GAMES_DATADIR}"/${PN}
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newgamesbin binaries/system/pyrogenesis 0ad
+ use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto "$(games_get_libdir)"/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/, games-strategy/0ad/files/
commit: 07e960f32ebc7de1ef0604b8242a77918f9362c8
Author: Lars Wendler gentoo org>
AuthorDate: Fri Oct 2 07:44:43 2015 +
Commit: Lars Wendler gentoo org>
CommitDate: Fri Oct 2 07:50:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=07e960f3
games-strategy/0ad: Added an upstream patch for new miniupnpc API.
Package-Manager: portage-2.2.22
Signed-off-by: Lars Wendler gentoo.org>
games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild | 3 ++-
.../0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch | 14 ++
2 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
index e9c57bd..654bb3d 100644
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
media-libs/libpng:0
media-libs/libsdl2[X,opengl,video]
net-libs/enet:1.3
- net-libs/miniupnpc
+ net-libs/miniupnpc:=
net-misc/curl
sys-libs/zlib
virtual/jpeg:62
@@ -57,6 +57,7 @@ pkg_setup() {
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
+ epatch "${FILESDIR}"/${P}-miniupnpc14.patch
}
src_configure() {
diff --git a/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch
b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch
new file mode 100644
index 000..ff46685
--- /dev/null
+++ b/games-strategy/0ad/files/0ad-0.0.18_alpha-miniupnpc14.patch
@@ -0,0 +1,14 @@
+Index: ps/trunk/source/network/NetServer.cpp
+===
+--- ps/trunk/source/network/NetServer.cpp (revision 17090)
ps/trunk/source/network/NetServer.cpp (revision 17091)
+@@ -237,5 +237,9 @@
+ }
+ // No cached URL, or it did not respond. Try getting a valid UPnP
device for 10 seconds.
++#if defined(MINIUPNPC_API_VERSION) && MINIUPNPC_API_VERSION >= 14
++ else if ((devlist = upnpDiscover(1, 0, 0, 0, 0, 2, 0)) != NULL)
++#else
+ else if ((devlist = upnpDiscover(1, 0, 0, 0, 0, 0)) != NULL)
++#endif
+ {
+ ret = UPNP_GetValidIGD(devlist, &urls, &data,
internalIPAddress, sizeof(internalIPAddress));
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: cf0f6da43b1e12cdf6aa6c92c761b757f00e8832
Author: Julian Ospald gentoo org>
AuthorDate: Tue Sep 15 23:55:18 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Tue Sep 15 23:55:46 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf0f6da4
games-strategy/0ad: revbump to fix missing python DEPEND
Gentoo-Bug: 560542
...{0ad-0.0.18_alpha-r1.ebuild => 0ad-0.0.18_alpha-r2.ebuild} | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
similarity index 94%
rename from games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
rename to games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
index 06c8f8a..e9c57bd 100644
--- a/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r2.ebuild
@@ -6,7 +6,10 @@ EAPI=5
WX_GTK_VER="2.8"
-inherit eutils wxwidgets toolchain-funcs gnome2-utils games
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="threads,ssl"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils python-any-r1 games
MY_P=0ad-${PV/_/-}
DESCRIPTION="A free, real-time strategy game"
@@ -41,11 +44,17 @@ RDEPEND="
sound? ( media-libs/libvorbis
media-libs/openal )"
DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
virtual/pkgconfig
test? ( dev-lang/perl )"
S=${WORKDIR}/${MY_P}
+pkg_setup() {
+ games_pkg_setup
+ python-any-r1_pkg_setup
+}
+
src_prepare() {
epatch "${FILESDIR}"/${P}-gentoo.patch
}
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/
commit: e8c8e1b2849945ba1ef3f660e1acaa41a0fe3e55
Author: Julian Ospald gentoo org>
AuthorDate: Thu Aug 20 22:10:06 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Thu Aug 20 22:30:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8c8e1b2
games-strategy/0ad: add missing dependency on dev-libs/nspr
We need this dep, because we don't use the system spidermonkey
anymore.
Reported-by: Toralf Förster
Gentoo-Bug: 558276
.../0ad/{0ad-0.0.18_alpha.ebuild => 0ad-0.0.18_alpha-r1.ebuild} | 1 +
1 file changed, 1 insertion(+)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
similarity index 99%
rename from games-strategy/0ad/0ad-0.0.18_alpha.ebuild
rename to games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
index 258645d..06c8f8a 100644
--- a/games-strategy/0ad/0ad-0.0.18_alpha.ebuild
+++ b/games-strategy/0ad/0ad-0.0.18_alpha-r1.ebuild
@@ -23,6 +23,7 @@ RDEPEND="
dev-libs/boost
dev-libs/icu:=
dev-libs/libxml2
+ dev-libs/nspr
~games-strategy/0ad-data-${PV}
media-libs/libpng:0
media-libs/libsdl2[X,opengl,video]
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 56894a446e2afa4fb97279b4770e4676323d078c
Author: Julian Ospald gentoo org>
AuthorDate: Fri Aug 14 22:49:56 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Fri Aug 14 22:49:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=56894a44
games-strategy/0ad-data: rm old
.../0ad-data/0ad-data-0.0.16_alpha.ebuild | 29 --
.../0ad-data/0ad-data-0.0.17_alpha.ebuild | 29 --
games-strategy/0ad-data/Manifest | 2 --
3 files changed, 60 deletions(-)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.16_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.16_alpha.ebuild
deleted file mode 100644
index ab5fe9e..000
--- a/games-strategy/0ad-data/0ad-data-0.0.16_alpha.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="http://wildfiregames.com/0ad/";
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-data.tar.xz";
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/0ad
- doins -r binaries/data/*
- prepgamesdirs
-}
diff --git a/games-strategy/0ad-data/0ad-data-0.0.17_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.17_alpha.ebuild
deleted file mode 100644
index 448745f..000
--- a/games-strategy/0ad-data/0ad-data-0.0.17_alpha.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="Data files for 0ad"
-HOMEPAGE="http://wildfiregames.com/0ad/";
-SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
-
-LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- rm binaries/data/tools/fontbuilder/fonts/*.txt
-}
-
-src_install() {
- insinto "${GAMES_DATADIR}"/0ad
- doins -r binaries/data/*
- prepgamesdirs
-}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 50a12ce..91f1074 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,3 +1 @@
-DIST 0ad-0.0.16-alpha-unix-data.tar.xz 526615868 SHA256
0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc SHA512
a34ae77c6fdc1781bf6f7f7d20ab31f91ab2d1227c2528f40075af8056b41b9c3d4c03debd92e7836a17b64bc0437ed5970338dfc7b171eb4df3f8c5558593d0
WHIRLPOOL
21f837df31fea98b597e78754b2d10b42ea8a6eb15cc2db3bf6f9664d28914e5122e8d80e5f0f61ffa9eeb9f95021525cf236109d311d208d29ed5deecb82379
-DIST 0ad-0.0.17-alpha-unix-data.tar.xz 561617008 SHA256
6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0 SHA512
84d722b3bb5ba466b5db340fc5fea13bc4020379226214f393bb22559147acacfca71a283a2ea358832a2e1b43cb1596b5362c12cee70f22b2d7ada063089e2a
WHIRLPOOL
1359567d112adaaf48d91a3c30e36cdc78c77648deaae8c0542021c7f67f841397400a438890d378133de52a407a33ccffdcc363ae1e318d6d6470ae67187571
DIST 0ad-0.0.18-alpha-unix-data.tar.xz 571228108 SHA256
b1a4078eb945ac873accb45c831dbe988866e3559d16bea189eb439c2c71ac44 SHA512
581b6774ff42b130152acb057028584816b6194fb24ad98b2e384f1193afb0468f4e336e00834703dbe83477176be4f0ce423a5bae8343c266d5a066932bd8d6
WHIRLPOOL
dbebefb11e1476052e57e978ed6dbe578e758a608dae7ee26ec7e694dc1d5189a8030c65b5dbd81052e709d91c5ecbb49caa0a33fcbf6d593a701a329d3a3a54
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad-data/
commit: 03009d31b52aaad40701a4f27bcb0e71e619f033
Author: Julian Ospald gentoo org>
AuthorDate: Fri Aug 14 22:47:27 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Fri Aug 14 22:47:27 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=03009d31
games-strategy/0ad-data: version bump to 0.0.18_alpha
.../0ad-data/0ad-data-0.0.18_alpha.ebuild | 29 ++
games-strategy/0ad-data/Manifest | 1 +
2 files changed, 30 insertions(+)
diff --git a/games-strategy/0ad-data/0ad-data-0.0.18_alpha.ebuild
b/games-strategy/0ad-data/0ad-data-0.0.18_alpha.ebuild
new file mode 100644
index 000..051308e
--- /dev/null
+++ b/games-strategy/0ad-data/0ad-data-0.0.18_alpha.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+inherit games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="Data files for 0ad"
+HOMEPAGE="http://wildfiregames.com/0ad/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-data.tar.xz"
+
+LICENSE="GPL-2 CC-BY-SA-3.0 LPPL-1.3c BitstreamVera"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ rm binaries/data/tools/fontbuilder/fonts/*.txt
+}
+
+src_install() {
+ insinto "${GAMES_DATADIR}"/0ad
+ doins -r binaries/data/*
+ prepgamesdirs
+}
diff --git a/games-strategy/0ad-data/Manifest b/games-strategy/0ad-data/Manifest
index 56c69aa..50a12ce 100644
--- a/games-strategy/0ad-data/Manifest
+++ b/games-strategy/0ad-data/Manifest
@@ -1,2 +1,3 @@
DIST 0ad-0.0.16-alpha-unix-data.tar.xz 526615868 SHA256
0f16d41e81d7349fb16490f3abbfd38bcb3f2b89648355b2b281c5045ddafadc SHA512
a34ae77c6fdc1781bf6f7f7d20ab31f91ab2d1227c2528f40075af8056b41b9c3d4c03debd92e7836a17b64bc0437ed5970338dfc7b171eb4df3f8c5558593d0
WHIRLPOOL
21f837df31fea98b597e78754b2d10b42ea8a6eb15cc2db3bf6f9664d28914e5122e8d80e5f0f61ffa9eeb9f95021525cf236109d311d208d29ed5deecb82379
DIST 0ad-0.0.17-alpha-unix-data.tar.xz 561617008 SHA256
6bf2234ef5043b14a3bbeda013fefed73ce2e564262f5e03b0801bfe671331d0 SHA512
84d722b3bb5ba466b5db340fc5fea13bc4020379226214f393bb22559147acacfca71a283a2ea358832a2e1b43cb1596b5362c12cee70f22b2d7ada063089e2a
WHIRLPOOL
1359567d112adaaf48d91a3c30e36cdc78c77648deaae8c0542021c7f67f841397400a438890d378133de52a407a33ccffdcc363ae1e318d6d6470ae67187571
+DIST 0ad-0.0.18-alpha-unix-data.tar.xz 571228108 SHA256
b1a4078eb945ac873accb45c831dbe988866e3559d16bea189eb439c2c71ac44 SHA512
581b6774ff42b130152acb057028584816b6194fb24ad98b2e384f1193afb0468f4e336e00834703dbe83477176be4f0ce423a5bae8343c266d5a066932bd8d6
WHIRLPOOL
dbebefb11e1476052e57e978ed6dbe578e758a608dae7ee26ec7e694dc1d5189a8030c65b5dbd81052e709d91c5ecbb49caa0a33fcbf6d593a701a329d3a3a54
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: add3c0358e800987db772e55d1837eb52fef9819
Author: Julian Ospald gentoo org>
AuthorDate: Fri Aug 14 22:47:50 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Fri Aug 14 22:47:50 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=add3c035
games-strategy/0ad: version bump to 0.0.18_alpha
games-strategy/0ad/0ad-0.0.18_alpha.ebuild | 143 +
games-strategy/0ad/Manifest| 1 +
.../0ad/files/0ad-0.0.18_alpha-gentoo.patch| 101 +++
3 files changed, 245 insertions(+)
diff --git a/games-strategy/0ad/0ad-0.0.18_alpha.ebuild
b/games-strategy/0ad/0ad-0.0.18_alpha.ebuild
new file mode 100644
index 000..258645d
--- /dev/null
+++ b/games-strategy/0ad/0ad-0.0.18_alpha.ebuild
@@ -0,0 +1,143 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+WX_GTK_VER="2.8"
+
+inherit eutils wxwidgets toolchain-funcs gnome2-utils games
+
+MY_P=0ad-${PV/_/-}
+DESCRIPTION="A free, real-time strategy game"
+HOMEPAGE="http://play0ad.com/";
+SRC_URI="mirror://sourceforge/zero-ad/${MY_P}-unix-build.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="editor +lobby nvtt pch sound test"
+RESTRICT="test"
+
+RDEPEND="
+ dev-libs/boost
+ dev-libs/icu:=
+ dev-libs/libxml2
+ ~games-strategy/0ad-data-${PV}
+ media-libs/libpng:0
+ media-libs/libsdl2[X,opengl,video]
+ net-libs/enet:1.3
+ net-libs/miniupnpc
+ net-misc/curl
+ sys-libs/zlib
+ virtual/jpeg:62
+ virtual/opengl
+ x11-libs/libX11
+ x11-libs/libXcursor
+ editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
+ lobby? ( net-libs/gloox )
+ nvtt? ( media-gfx/nvidia-texture-tools )
+ sound? ( media-libs/libvorbis
+ media-libs/openal )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig
+ test? ( dev-lang/perl )"
+
+S=${WORKDIR}/${MY_P}
+
+src_prepare() {
+ epatch "${FILESDIR}"/${P}-gentoo.patch
+}
+
+src_configure() {
+ local myconf=(
+ --with-system-nvtt
+ --with-system-miniupnpc
+ --minimal-flags
+ --sdl2
+ $(usex nvtt "" "--without-nvtt")
+ $(usex pch "" "--without-pch")
+ $(usex test "" "--without-tests")
+ $(usex sound "" "--without-audio")
+ $(usex editor "--atlas" "")
+ $(usex lobby "" "--without-lobby")
+ --collada
+ --bindir="${GAMES_BINDIR}"
+ --libdir="$(games_get_libdir)"/${PN}
+ --datadir="${GAMES_DATADIR}"/${PN}
+ )
+
+ # stock premake4 does not work, use the shipped one
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # regenerate scripts.c so our patch applies
+ cd "${S}"/build/premake/premake4 || die
+ "${S}"/build/premake/premake4/bin/release/premake4 embed || die
+
+ # rebuild premake again... this is the most stupid build system
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
+ emake -C "${S}"/build/premake/premake4/build/gmake.unix
+
+ # run premake to create build scripts
+ cd "${S}"/build/premake || die
+ "${S}"/build/premake/premake4/bin/release/premake4 \
+ --file="premake4.lua" \
+ --outpath="../workspaces/gcc/" \
+ --platform=$(usex amd64 "x64" "x32") \
+ --os=linux \
+ "${myconf[@]}" \
+ gmake || die "Premake failed"
+}
+
+src_compile() {
+ tc-export AR
+
+ # build bundled and patched spidermonkey
+ cd libraries/source/spidermonkey || die
+ JOBS="${MAKEOPTS}" ./build.sh || die
+ cd "${S}" || die
+
+ # build 3rd party fcollada
+ emake -C libraries/source/fcollada/src
+
+ # build 0ad
+ emake -C build/workspaces/gcc verbose=1
+}
+
+src_test() {
+ cd binaries/system || die
+ ./test -libdir "${S}/binaries/system" || die "test phase failed"
+}
+
+src_install() {
+ newgamesbin binaries/system/pyrogenesis 0ad
+ use editor && newgamesbin binaries/system/ActorEditor 0ad-ActorEditor
+
+ insinto "${GAMES_DATADIR}"/${PN}
+ doins -r binaries/data/l10n
+
+ exeinto "$(games_get_libdir)"/${PN}
+ doexe binaries/system/libCollada.so
+ doexe libraries/source/spidermonkey/lib/*.so
+ use editor && doexe binaries/system/libAtlasUI.so
+
+ dodoc binaries/system/readme.txt
+ doicon -s 128 build/resources/${PN}.png
+ make_desktop_entry ${PN}
+
+ prepgamesdirs
+}
+
+pkg_preinst() {
+ games_pkg_preinst
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ games_pkg_postinst
+ gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+ gnome2_icon_cache_update
+}
diff --git a/games-str
[gentoo-commits] repo/gentoo:master commit in: games-strategy/0ad/files/, games-strategy/0ad/
commit: a4a8287805a82348956f05406cda917c5927bf36
Author: Julian Ospald gentoo org>
AuthorDate: Fri Aug 14 22:49:30 2015 +
Commit: Julian Ospald gentoo org>
CommitDate: Fri Aug 14 22:49:30 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a4a82878
games-strategy/0ad: rm old
games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild | 141
games-strategy/0ad/0ad-0.0.17_alpha.ebuild | 144 -
games-strategy/0ad/Manifest| 2 -
.../0ad/files/0ad-0.0.16_alpha-gcc-4.9.patch | 42 --
.../0ad/files/0ad-0.0.16_alpha-gentoo.patch| 93 -
.../0ad/files/0ad-0.0.17_alpha-gentoo.patch| 100 --
6 files changed, 522 deletions(-)
diff --git a/games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild
b/games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild
deleted file mode 100644
index 2c1be97..000
--- a/games-strategy/0ad/0ad-0.0.16_alpha-r2.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-WX_GTK_VER="2.8"
-
-inherit eutils wxwidgets toolchain-funcs gnome2-utils games
-
-MY_P=0ad-${PV/_/-}
-DESCRIPTION="A free, real-time strategy game"
-HOMEPAGE="http://play0ad.com/";
-SRC_URI="http://releases.wildfiregames.com/${MY_P}-unix-build.tar.xz";
-
-LICENSE="GPL-2 LGPL-2.1 MIT CC-BY-SA-3.0 ZLIB"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="editor +lobby pch sound test"
-RESTRICT="test"
-
-RDEPEND="
- dev-lang/spidermonkey:24
- dev-libs/boost
- dev-libs/icu:=
- dev-libs/libxml2
- ~games-strategy/0ad-data-${PV}
- media-gfx/nvidia-texture-tools
- media-libs/libpng:0
- media-libs/libsdl[X,opengl,video]
- net-libs/enet:1.3
- net-libs/miniupnpc
- net-misc/curl
- sys-libs/zlib
- virtual/jpeg
- virtual/opengl
- x11-libs/libX11
- x11-libs/libXcursor
- editor? ( x11-libs/wxGTK:${WX_GTK_VER}[X,opengl] )
- lobby? ( net-libs/gloox )
- sound? ( media-libs/libogg
- media-libs/libvorbis
- media-libs/openal )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- test? ( dev-lang/perl )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-gcc-4.9.patch
-}
-
-src_configure() {
- local myconf=(
- --with-system-nvtt
- --with-system-enet
- --with-system-miniupnpc
- --with-system-mozjs24
- --minimal-flags
- $(usex pch "" "--without-pch")
- $(usex test "" "--without-tests")
- $(usex sound "" "--without-audio")
- $(usex editor "--atlas" "")
- $(usex lobby "" "--without-lobby")
- --collada
- --bindir="${GAMES_BINDIR}"
- --libdir="$(games_get_libdir)"/${PN}
- --datadir="${GAMES_DATADIR}"/${PN}
- )
-
- # stock premake4 does not work, use the shipped one
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # regenerate scripts.c so our patch applies
- cd "${S}"/build/premake/premake4 || die
- "${S}"/build/premake/premake4/bin/release/premake4 embed || die
-
- # rebuild premake again... this is the most stupid build system
- emake -C "${S}"/build/premake/premake4/build/gmake.unix clean
- emake -C "${S}"/build/premake/premake4/build/gmake.unix
-
- # run premake to create build scripts
- cd "${S}"/build/premake || die
- "${S}"/build/premake/premake4/bin/release/premake4 \
- --file="premake4.lua" \
- --outpath="../workspaces/gcc/" \
- --platform=$(usex amd64 "x64" "x32") \
- --os=linux \
- "${myconf[@]}" \
- gmake || die "Premake failed"
-}
-
-src_compile() {
- # build 3rd party fcollada
- emake -C libraries/source/fcollada/src
-
- # build 0ad
- emake -C build/workspaces/gcc verbose=1
-}
-
-src_test() {
- cd binaries/system || die
- ./test -libdir "${S}/binaries/system" || die "test phase failed"
-}
-
-src_install() {
- dogamesbin binaries/system/pyrogenesis
- use editor && dogamesbin binaries/system/ActorEditor
-
- insinto "${GAMES_DATADIR}"/${PN}
- doins -r binaries/data/l10n
-
- exeinto "$(games_get_libdir)"/${PN}
- doexe binaries/system/libCollada.so
- use editor && doexe binaries/system/libAtlasUI.so
-
- dodoc binaries/system/readme.txt
- doicon -s 128 build/resources/${PN}.png
- games_make_wrapper ${PN} "${GAMES_BINDIR}/pyrogenesis"
- use editor &&
- games_make_wrapper ${PN}-ActorEditor
"${GAMES_BINDIR}/ActorEditor"
- make_desktop_entry ${PN}
-
- prepgamesdirs
-}
-
-pkg_preinst() {
-
