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

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

[Michał Górny]

commit:     b4754d9dc0a17508c6dc37202595ca48aa34ccb1
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 19 07:16:23 2021 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Thu Aug 19 07:34:12 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4754d9d

games-strategy/colobot: Fix missing -lsndfile with USE=-openal

Closes: https://bugs.gentoo.org/808495
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/colobot-0.1.12.ebuild       |  2 ++
 .../files/colobot-0.1.12-sndfile-link.patch        | 40 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
index 56e82f5815b..152ba200e16 100644
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ b/games-strategy/colobot/colobot-0.1.12.ebuild
@@ -40,6 +40,8 @@ RDEPEND="${DEPEND}
 PATCHES=(
 	# https://github.com/colobot/colobot/pull/1300
 	"${FILESDIR}"/${P}-includes.patch
+	# https://github.com/colobot/colobot/pull/1453
+	"${FILESDIR}"/${P}-sndfile-link.patch
 )
 
 src_prepare() {

diff --git a/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch b/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch
new file mode 100644
index 00000000000..349bb91c487
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.1.12-sndfile-link.patch
@@ -0,0 +1,40 @@
+From f13ca0c15efc80da7034ae1d06224e31591cfc46 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
+Date: Thu, 19 Aug 2021 09:11:16 +0200
+Subject: [PATCH] Fix missing linking to sndfile with OPENAL_SOUND=OFF
+
+Fix the CMake files to use sndfile even if OPENAL_SOUND is disabled.
+The package code (via sndfile_wrapper.cpp) uses sndfile unconditionally,
+and it currently fails to build with -DOPENAL_SOUND=OFF:
+
+    [293/293] Linking CXX executable colobot
+    FAILED: colobot
+    : && /usr/bin/c++ -std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations -Wno-error=deprecated-declarations -Wsuggest-override  -g -O0 -rdynamic src/CMakeFiles/colobot.dir/app/main.cpp.o -o colobot -L/tmp/colobot/src/CBot -Wl,-rpath,/tmp/colobot/src/CBot:/tmp/colobot/build/src/CBot:  src/libcolobotbase.a  src/CBot/libCBot.so  lib/localename/liblocalename.a  -Wl,-Bstatic  -lSDL2main  -Wl,-Bdynamic  -lSDL2  -lpthread  -lSDL2_image  -lSDL2_ttf  -lGL  -lGLU  -lpng  -lz  -lGLEW  /usr/lib64/libboost_system.so.1.76.0  /usr/lib64/libboost_filesystem.so.1.76.0  /usr/lib64/libboost_regex.so.1.76.0  -lphysfs && :
+    /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: src/libcolobotbase.a(sndfile_wrapper.cpp.o): undefined reference to symbol 'sf_close@@libsndfile.so.1.0'
+    /usr/lib/gcc/x86_64-pc-linux-gnu/11.2.0/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/libsndfile.so.1: error adding symbols: DSO missing from command line
+    collect2: error: ld returned 1 exit status
+    ninja: build stopped: subcommand failed.
+---
+ CMakeLists.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 90843488..95927733 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -303,10 +303,11 @@ find_package(Boost COMPONENTS system filesystem regex REQUIRED)
+ 
+ find_package(GLEW REQUIRED)
+ 
++find_package(LibSndFile REQUIRED)
++
+ if (OPENAL_SOUND)
+     find_package(OpenAL REQUIRED)
+     include_directories(${OPENAL_INCLUDE_DIR})
+-    find_package(LibSndFile REQUIRED)
+ endif()
+ 
+ 
+-- 
+2.33.0
+

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

[Sam James]

commit:     08d9399b00bdad8032b993ebeed3377304586091
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 19 04:23:34 2023 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Apr 19 04:31:48 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=08d9399b

games-strategy/colobot: drop -Werror

Signed-off-by: Sam James <sam <AT> gentoo.org>

 games-strategy/colobot/colobot-0.2.0_alpha.ebuild    |  2 ++
 .../colobot/files/colobot-0.2.0_alpha-werror.patch   | 20 ++++++++++++++++++++
 2 files changed, 22 insertions(+)

diff --git a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
index ceef225ca257..f16813414298 100644
--- a/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
+++ b/games-strategy/colobot/colobot-0.2.0_alpha.ebuild
@@ -43,6 +43,8 @@ PATCHES=(
 	"${FILESDIR}"/colobot-0.1.12-sndfile-link.patch
 	# https://github.com/colobot/colobot/pull/1576
 	"${FILESDIR}"/colobot-0.2.0_alpha-gcc13.patch
+	# No -Werror
+	"${FILESDIR}"/colobot-0.2.0_alpha-werror.patch
 )
 
 src_prepare() {

diff --git a/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch b/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch
new file mode 100644
index 000000000000..b326a0c0f7af
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.2.0_alpha-werror.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -155,7 +155,7 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
+ 
+     message(STATUS "Detected GCC version 4.7+")
+ 
+-    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-declarations")
++    set(NORMAL_CXX_FLAGS "-std=gnu++11 -Wall -Wold-style-cast -pedantic-errors -Wmissing-declarations")
+     set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
+ 
+     if(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 5.0)
+@@ -177,7 +177,7 @@ elseif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ 	set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=bfd")
+     endif()
+ 
+-    set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Werror -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
++    set(NORMAL_CXX_FLAGS "-std=c++11 -Wall -Wold-style-cast -pedantic-errors -Wmissing-prototypes")
+     set(NORMAL_CXX_FLAGS "${NORMAL_CXX_FLAGS} -Wno-error=deprecated-declarations") # updated version of physfs is not available on some platforms so we keep using deprecated functions, see #958
+     set(RELEASE_CXX_FLAGS "-O2")
+     set(DEBUG_CXX_FLAGS "-g -O0")

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

[Michał Górny]

commit:     4f3352a586de845ca780356cbd452e336b52111c
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  8 05:00:18 2023 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Aug  8 05:31:44 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f3352a5

games-strategy/colobot: Remove old

Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/Manifest                    |  1 -
 games-strategy/colobot/colobot-0.1.12.ebuild       | 74 ----------------------
 .../colobot/files/colobot-0.1.12-includes.patch    | 45 -------------
 3 files changed, 120 deletions(-)

diff --git a/games-strategy/colobot/Manifest b/games-strategy/colobot/Manifest
index 64d8a8246f51..206d428dd6b8 100644
--- a/games-strategy/colobot/Manifest
+++ b/games-strategy/colobot/Manifest
@@ -1,3 +1,2 @@
-DIST colobot-gold-0.1.12-alpha.tar.gz 1468594 BLAKE2B 2b470e8b074e4a973b751062dca2358396066d8816c2b1b5b44649b798610dccd73ab5fed4086f2aa8d4495f3de69dd8b72b45f97f23f66b18a50fc976bf25ef SHA512 63647a16b376db6544830f96e7d323c0f58003645bf636abd1cab0ffd47b39b0bef47191d584f5156b75324d75dfdfdcabe8b89be565087c37c367ca366f3cbe
 DIST colobot-gold-0.2.0-alpha.tar.gz 1514455 BLAKE2B 9cc1480d342cfa14b12e437c41ce8e65b173cd30ca5f62e574ac17f452e6cd0622b5c2706fcfd427222cf78fce1700cb07b82fac75dd9b4a3ace4389ea3381bc SHA512 9c35ce6da319ef20ff68a9722f0b683adaa2fcada2b89bb322ba5772dfd9371adacd045ae160550780083902c024400c29e1d1f11dcb8b6547ba7d48e401c4c3
 DIST colobot-gold-0.2.1-alpha.tar.gz 1331366 BLAKE2B a4ff7eb10514b829a066654d6800cdf4ddf7c3331c60e8a552b78feb9e153bf666d1a16395be58e3093c98fc2caad8145fd436f66f5afc6b9f9c5d91e9094700 SHA512 cdfe410b30a89bd98513347ba64bbd0569d9f9f9227b063bf99c86101a099de0893b24c2d2e85e718ec0e64e0e428fb6dbdbf88d35f814d99ed31a7f3632f9cd

diff --git a/games-strategy/colobot/colobot-0.1.12.ebuild b/games-strategy/colobot/colobot-0.1.12.ebuild
deleted file mode 100644
index 152ba200e160..000000000000
--- a/games-strategy/colobot/colobot-0.1.12.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="A real-time strategy game, where you can program your bots"
-HOMEPAGE="https://colobot.info/"
-SRC_URI="https://github.com/colobot/colobot/archive/${PN}-gold-${PV}-alpha.tar.gz"
-S="${WORKDIR}/${PN}-${PN}-gold-${PV}-alpha"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="devbuild doc +openal test tools"
-RESTRICT="!test? ( test )"
-
-# perl for pod2man
-BDEPEND="
-	app-text/po4a
-	dev-lang/perl
-	sys-devel/gettext"
-DEPEND="
-	dev-games/physfs
-	dev-libs/boost:=
-	media-libs/glew:0
-	media-libs/libogg
-	media-libs/libpng:0=
-	media-libs/libsdl2:=
-	media-libs/libsndfile:=
-	media-libs/libvorbis:=
-	media-libs/sdl2-image
-	media-libs/sdl2-ttf
-	media-sound/vorbis-tools
-	openal? ( media-libs/openal )"
-RDEPEND="${DEPEND}
-	games-strategy/colobot-data"
-
-PATCHES=(
-	# https://github.com/colobot/colobot/pull/1300
-	"${FILESDIR}"/${P}-includes.patch
-	# https://github.com/colobot/colobot/pull/1453
-	"${FILESDIR}"/${P}-sndfile-link.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# we need to call it explicitly to help Ninja figure out the deps
-	cd desktop || die
-	po4a po4a.cfg || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DDEV_BUILD=$(usex devbuild)
-		-DTESTS=$(usex test)
-		-DTOOLS=$(usex tools)
-		-DINSTALL_DOCS=$(usex doc)
-		-DOPENAL_SOUND=$(usex openal)
-		-DCOLOBOT_INSTALL_BIN_DIR="${EPREFIX}"/usr/bin
-		-DCOLOBOT_INSTALL_LIB_DIR="${EPREFIX}"/usr/$(get_libdir)
-	)
-	cmake_src_configure
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}

diff --git a/games-strategy/colobot/files/colobot-0.1.12-includes.patch b/games-strategy/colobot/files/colobot-0.1.12-includes.patch
deleted file mode 100644
index 3bd118a1ef1d..000000000000
--- a/games-strategy/colobot/files/colobot-0.1.12-includes.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 2cfab017938e1cf44f633647eec2ccc2ed1da38b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Micha=C5=82=20G=C3=B3rny?= <mgorny@gentoo.org>
-Date: Thu, 14 May 2020 10:35:01 +0200
-Subject: [PATCH] Fix missing <limits> include
-
-Add missing <limits> include for std::numeric_limits.  This fixes
-build failure after boost stopped implicitly including it for us.
----
- src/script/script.h | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/script/script.h b/src/script/script.h
-index bc64dc232..dd4e02ff4 100644
---- a/src/script/script.h
-+++ b/src/script/script.h
-@@ -27,6 +27,7 @@
- #include "CBot/CBot.h"
- 
- #include <memory>
-+#include <limits>
- #include <string>
- #include <boost/optional.hpp>
- 
-From fc2bd68876ac6302dbc8e91e8ffa33592db14b21 Mon Sep 17 00:00:00 2001
-From: suve <veg@svgames.pl>
-Date: Sun, 9 Feb 2020 00:36:05 +0100
-Subject: [PATCH] Fix missing std includes
-
----
- src/CBot/CBotInstr/CBotExprLitString.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/src/CBot/CBotInstr/CBotExprLitString.cpp b/src/CBot/CBotInstr/CBotExprLitString.cpp
-index fc2541624..69e42d607 100644
---- a/src/CBot/CBotInstr/CBotExprLitString.cpp
-+++ b/src/CBot/CBotInstr/CBotExprLitString.cpp
-@@ -24,6 +24,8 @@
- 
- #include "CBot/CBotVar/CBotVar.h"
- 
-+#include <stdexcept>
-+
- namespace CBot
- {
- 

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

[Michał Górny]

commit:     db53498a2cd426ca48e30e0020e5af454abd2357
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Fri Jun  7 18:23:14 2024 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jun  7 18:26:14 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db53498a

games-strategy/colobot: Fix building with gcc-14

Closes: https://bugs.gentoo.org/922895
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 games-strategy/colobot/colobot-0.2.1_alpha.ebuild            |  8 +++++++-
 games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch | 12 ++++++++++++
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/games-strategy/colobot/colobot-0.2.1_alpha.ebuild b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
index 731b33cd8a2d..b1ad12a0b717 100644
--- a/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
+++ b/games-strategy/colobot/colobot-0.2.1_alpha.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -50,6 +50,12 @@ DEPEND+="
 "
 
 src_prepare() {
+	local PATCHES=(
+		# fixed upstream as part of:
+		# https://github.com/colobot/colobot/commit/1b69589302c2ac92c6befd2880a03b4b07c7f820
+		"${FILESDIR}/${P}-gcc14.patch"
+	)
+
 	cmake_src_prepare
 
 	# we need to call it explicitly to help Ninja figure out the deps

diff --git a/games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch b/games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch
new file mode 100644
index 000000000000..198aa6ab1a00
--- /dev/null
+++ b/games-strategy/colobot/files/colobot-0.2.1_alpha-gcc14.patch
@@ -0,0 +1,12 @@
+diff --git a/src/level/scoreboard.cpp b/src/level/scoreboard.cpp
+index 87c4451..abc44fe 100644
+--- a/src/level/scoreboard.cpp
++++ b/src/level/scoreboard.cpp
+@@ -31,6 +31,7 @@
+ #include "ui/displaytext.h"
+ 
+ #include <boost/lexical_cast.hpp>
++#include <algorithm>
+ 
+ void CScoreboard::CScoreboardRule::Read(CLevelParserLine* line)
+ {