[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
[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)" = "FreeBSD" ];
[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/, 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/, 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() {
-
[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() {
+
[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/, 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/, 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, , ,
internalIPAddress, sizeof(internalIPAddress));
