subject:"\[gentoo\-commits\] repo\/gentoo\:master commit in\: games\-strategy\/freeorion\/files\/, games\-strategy\/freeorion\/"

[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/

2023-04-09 Thread Sam James

commit: caf3802e7acd436a4a2c2b6bc2991921194b51e4
Author: Alexey Sokolov  asokolov  org>
AuthorDate: Wed Apr  5 02:06:12 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 10 05:20:44 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=caf3802e

games-strategy/freeorion: add 0.5

Closes: https://bugs.gentoo.org/901231
Signed-off-by: Alexey Sokolov  asokolov.org>
Closes: https://github.com/gentoo/gentoo/pull/30482
Signed-off-by: Sam James  gentoo.org>

 games-strategy/freeorion/Manifest   |  1 +
 .../freeorion/files/freeorion-0.5-ccache.patch  | 18 ++
 .../{freeorion-.ebuild => freeorion-0.5.ebuild} | 21 -
 games-strategy/freeorion/freeorion-.ebuild  | 21 -
 games-strategy/freeorion/metadata.xml   |  3 +++
 5 files changed, 46 insertions(+), 18 deletions(-)

diff --git a/games-strategy/freeorion/Manifest 
b/games-strategy/freeorion/Manifest
index 478345ba36ff..c8383bc84536 100644
--- a/games-strategy/freeorion/Manifest
+++ b/games-strategy/freeorion/Manifest
@@ -1 +1,2 @@
 DIST FreeOrion_v0.4.10.2_2021-08-01.f663dad_Source.tar.gz 124836633 BLAKE2B 
42224b84a7aef99e998cb025b5095365a65670a3a0a543ef323f444f1904557713dc995de6f7ccaf9a45e34f62b4c65d4977caa0f6ac7605a9978268bdef0ba1
 SHA512 
a0f327f5fec82cf15495828f60b59b59834efaa041919fe9f68e4428e89b729503b7e666214ea39e5c9afdfbb9efd343c5cbcb8dfc982d6f56b3a06fd898f428
+DIST FreeOrion_v0.5_Source.tar.gz 152861207 BLAKE2B 
5263f9c2461db35b5283122889d0779f175af095e90eb782d21b6870193669b0307c2df95ebde78b3f762d2d0e1e1d8ec5f537bd44bf6810b9fbf76c58322172
 SHA512 
ec1247584d317ca0d0394d62754fd35b1d1212323e96e644c9efae422437daf63aac12c2798274993c9c29887fe73a51bfe11e9b53370dc261a0683efe312f19

diff --git a/games-strategy/freeorion/files/freeorion-0.5-ccache.patch 
b/games-strategy/freeorion/files/freeorion-0.5-ccache.patch
new file mode 100644
index ..dc289fa84ec9
--- /dev/null
+++ b/games-strategy/freeorion/files/freeorion-0.5-ccache.patch
@@ -0,0 +1,18 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -30,7 +30,6 @@ ENDIF(NOT CMAKE_BUILD_TYPE)
+ message(STATUS "Build type CMAKE_BUILD_TYPE set to ${CMAKE_BUILD_TYPE}")
+ 
+ include(UseCompilerCache)
+-find_compiler_cache(PROGRAM ccache)
+ 
+ list(APPEND GODOT_CPP_CMAKE_VARS 
"CMAKE_BUILD_TYPE;CMAKE_CONFIGURATION_TYPES;CMAKE_TOOLCHAIN_FILE;PYTHON_EXECUTABLE")
+ get_cmake_property(vars CACHE_VARIABLES)
+@@ -50,7 +49,6 @@ endforeach()
+ 
+ project(FreeOrion)
+ 
+-use_compiler_cache_with_xcode()
+ 
+ include(GNUInstallDirs)
+ include(UseCodeCoverage)

diff --git a/games-strategy/freeorion/freeorion-.ebuild 
b/games-strategy/freeorion/freeorion-0.5.ebuild
similarity index 92%
copy from games-strategy/freeorion/freeorion-.ebuild
copy to games-strategy/freeorion/freeorion-0.5.ebuild
index 7445d5c039df..4850c266029c 100644
--- a/games-strategy/freeorion/freeorion-.ebuild
+++ b/games-strategy/freeorion/freeorion-0.5.ebuild
@@ -10,8 +10,7 @@ if [[ ${PV} ==  ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/freeorion/freeorion.git;
 else
-   FREEORION_BUILD_ID=""
-   
SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_${FREEORION_BUILD_ID}_Source.tar.gz;
+   
SRC_URI="https://github.com/freeorion/freeorion/releases/download/v${PV}/FreeOrion_v${PV}_Source.tar.gz;
S="${WORKDIR}/src-tarball"
KEYWORDS="~amd64"
 fi
@@ -21,7 +20,7 @@ HOMEPAGE="https://www.freeorion.org/;
 
 LICENSE="GPL-2+ CC-BY-SA-3.0 LGPL-2.1+"
 SLOT="0"
-IUSE="dedicated doc test"
+IUSE="+client doc test"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
 
@@ -29,7 +28,7 @@ DEPEND="
${PYTHON_DEPS}
$(python_gen_cond_dep 'dev-libs/boost:=[${PYTHON_USEDEP},nls,python]')
sys-libs/zlib:=
-   !dedicated? (
+   client? (
media-libs/freetype
media-libs/glew:=
media-libs/libglvnd
@@ -41,7 +40,7 @@ DEPEND="
)"
 RDEPEND="
${DEPEND}
-   !dedicated? (
+   client? (
media-fonts/dejavu
media-fonts/roboto
)"
@@ -55,6 +54,10 @@ BDEPEND="
$(python_gen_cond_dep 'dev-python/pytest[${PYTHON_USEDEP}]')
)"
 
+PATCHES=(
+   "${FILESDIR}/freeorion-0.5-ccache.patch"
+)
+
 freeorion_check-reqs() {
# cc1plus processes may suddenly use ~1.5GB all at once early on (2+GB
# if debug symbols) then far less for the rest, check minimal jobs*1.5
@@ -79,7 +82,7 @@ src_prepare() {
 
 src_configure() {
local mycmakeargs=(
-   -DBUILD_CLIENT_GG=$(usex !dedicated)
+   -DBUILD_CLIENT_GG=$(usex client)
-DBUILD_CLIENT_GODOT=no # TODO, perhaps with system godot 
(experimental)
-DBUILD_TESTING=$(usex test)
)
@@ -108,13 +111,13 @@ src_install() {
 
use doc && dodoc -r

[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/

2018-07-15 Thread NP Hardass

commit: 6ada805286db1e9e4ba661532805840618ae7973
Author: NP-Hardass  gentoo  org>
AuthorDate: Sun Jun  3 16:01:40 2018 +
Commit: NP Hardass  gentoo  org>
CommitDate: Mon Jul 16 04:57:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6ada8052

games-strategy/freeorion: Backport fix for detecting SDL2 incl dir

Closes: https://bugs.gentoo.org/651762
Package-Manager: Portage-2.3.36, Repoman-2.3.9

 ...ion-0.4.7.1-backport-sdl2-include-dir-fix.patch | 34 +
 .../freeorion/freeorion-0.4.7.1-r4.ebuild  | 85 ++
 2 files changed, 119 insertions(+)

diff --git 
a/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
 
b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
new file mode 100644
index 000..f7ccdba126b
--- /dev/null
+++ 
b/games-strategy/freeorion/files/freeorion-0.4.7.1-backport-sdl2-include-dir-fix.patch
@@ -0,0 +1,34 @@
+From 77bdc407d0760a529e40914d16248dce01fd4778 Mon Sep 17 00:00:00 2001
+From: O01eg 
+Date: Wed, 8 Nov 2017 16:07:57 +0300
+Subject: [PATCH] Fix #1843
+
+---
+ CMakeLists.txt| 2 +-
+ GG/CMakeLists.txt | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+--- a/CMakeLists.txt   2018-06-03 11:36:04.631832409 -0400
 b/CMakeLists.txt   2018-06-03 11:36:20.678821846 -0400
+@@ -484,7 +484,7 @@
+ ${Boost_INCLUDE_DIRS}
+ ${OPENGL_INCLUDE_DIR}
+ ${GLEW_INCLUDE_DIRS}
+-${SDL_INCLUDE_DIRS}
++${SDL_INCLUDE_DIR}
+ ${OPENAL_INCLUDE_DIR}
+ ${OGG_INCLUDE_DIRS}
+ ${VORBIS_INCLUDE_DIRS}
+diff --git a/GG/CMakeLists.txt b/GG/CMakeLists.txt
+index 5d3c157362..c5bf3825d8 100644
+--- a/GG/CMakeLists.txt
 b/GG/CMakeLists.txt
+@@ -184,7 +184,7 @@ target_include_directories(GiGiSDL SYSTEM
+ ${Boost_INCLUDE_DIRS}
+ ${OPENGL_INCLUDE_DIR}
+ ${GLEW_INCLUDE_DIRS}
+-${SDL_INCLUDE_DIRS}
++${SDL_INCLUDE_DIR}
+ )
+ 
+ target_link_libraries(GiGiSDL

diff --git a/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild 
b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
new file mode 100644
index 000..e3471161e46
--- /dev/null
+++ b/games-strategy/freeorion/freeorion-0.4.7.1-r4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+inherit cmake-utils python-single-r1 gnome2-utils
+
+DESCRIPTION="A free turn-based space empire and galactic conquest game"
+HOMEPAGE="http://www.freeorion.org;
+
+if [[ ${PV} ==  ]]; then
+   inherit git-r3
+   EGIT_REPO_URI="https://github.com/freeorion/freeorion.git;
+else
+   MY_PV="${PV/_/-}"
+   SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> 
${P}.tar.gz"
+   KEYWORDS="~amd64"
+   S="${WORKDIR}/${PN}-${MY_PV}"
+fi
+
+LICENSE="GPL-2 LGPL-2.1 CC-BY-SA-3.0"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/boost-1.56:=[python,threads,${PYTHON_USEDEP}]
+   media-libs/freealut
+   media-libs/freetype
+   media-libs/glew:=
+   media-libs/libsdl2
+   >=media-libs/libogg-1.1.3
+   media-libs/libpng:0
+   media-libs/libsdl2[X,opengl,video]
+   >=media-libs/libvorbis-1.1.2
+   media-libs/openal
+   sci-physics/bullet
+   sys-libs/zlib
+   virtual/opengl
+   !dev-games/gigi"
+   # Use bundled gigi as of freeorion-0.4.3
+
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/${P}-backport-sdl2-include-dir-fix.patch" )
+
+pkg_setup() {
+   # build system is using FindPythonLibs.cmake which needs python:2
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   sed -e "s/-O3//" -i CMakeLists.txt || die
+
+   cmake-utils_src_prepare
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DCMAKE_BUILD_TYPEE=Release
+   -DRELEASE_COMPILE_FLAGS=""
+   -DCMAKE_SKIP_RPATH=ON
+   )
+
+   append-cppflags 
-DBOOST_OPTIONAL_CONFIG_USE_OLD_IMPLEMENTATION_OF_OPTIONAL
+
+   cmake-utils_src_configure
+}
+
+src_install() {
+   cmake-utils_src_install
+   dodoc ChangeLog.md
+
+   newenvd "${FILESDIR}/${PN}.envd" 99${PN}
+}
+
+pkg_postinst() {
+   gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+   gnome2_icon_cache_update
+}

[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/

[gentoo-commits] repo/gentoo:master commit in: games-strategy/freeorion/files/, games-strategy/freeorion/

2 matches

Site Navigation

Mail list logo

Footer information