Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (ca34b77498fc032cd1c50254ccf71f7b0e834576)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

[SM-Commit] GIT changes to master games grimoire by Florian Franzmann (ca34b77498fc032cd1c50254ccf71f7b0e834576)

Chronological Thread  
    < Chronological >       < Thread >
  • From: Florian Franzmann <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (ca34b77498fc032cd1c50254ccf71f7b0e834576)
  • Date: Sat, 4 Jan 2020 12:42:26 +0000
GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

CMAKE_CONFIGURE | 15 +++++++++++++++
CMAKE_DEPENDS | 5 +++++
CMAKE_FUNCTIONS | 10 ++++++++++
ChangeLog | 5 +++++
FUNCTIONS | 2 +-
games-libs/bullet/DETAILS | 4 ++--
games-libs/bullet/HISTORY | 3 +++
games-simulation/pioneer/BUILD | 2 +-
games-simulation/pioneer/CONFIGURE | 1 +
games-simulation/pioneer/DEPENDS | 7 +++++--
games-simulation/pioneer/DETAILS | 5 +++--
games-simulation/pioneer/HISTORY | 5 +++++
games-simulation/pioneer/PRE_BUILD | 4 ----
games-strategy-tbs/freeciv/DETAILS | 4 ++--
games-strategy-tbs/freeciv/HISTORY | 3 +++
15 files changed, 61 insertions(+), 14 deletions(-)

New commits:
commit ca34b77498fc032cd1c50254ccf71f7b0e834576
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

games-strategy-tbs/freeciv: version 2.6.1

commit e7d0339a1e642a97b61fbe4b7705cfe6e39d81a0
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

games-libs/bullet: version 2.89

commit 231432934baa6ea448f183d55ae23b6e46d0a834
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

games-simulation/pioneer: version 20191117

commit 4fcaa5cab8fd74a16c0263769bd17a31c34125a1
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

CMAKE_*: added

commit 2ac4a276436b65097014966160adf97351ae7f95
Author: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
Commit: Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>

FUNCTIONS: install to /usr/games and /usr/share/games when using cmake

diff --git a/CMAKE_CONFIGURE b/CMAKE_CONFIGURE
new file mode 100755
index 0000000..ae19da8
--- /dev/null
+++ b/CMAKE_CONFIGURE
@@ -0,0 +1,15 @@
+config_query_list CM_BUILD_TYPE 'which build type?' Release Debug
RelWithDebInfo
+#if is_depends_enabled $SPELL extra-cmake-modules;then
+ config_query_option CM_TESTS 'build tests?' n "-DBUILD_TESTING=1"
"-DBUILD_TESTING=0"
+#fi
+
+# Default to Ninja cmake generator if it's installed, otherwise the standard
Unix way
+if spell_ok ninja-build-system; then
+ message
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is
using ${SPELL_COLOR}ninja${DEFAULT_COLOR}${MESSAGE_COLOR} for CMAKE
GENERATOR." &&
+ CMAKE_GEN='Ninja'
+else
+ message
"${MESSAGE_COLOR}${SPELL_COLOR}${SPELL}${DEFAULT_COLOR}${MESSAGE_COLOR} is
using \"Unix Makefiles\" for CMAKE GENERATOR." &&
+ CMAKE_GEN='Unix Makefiles'
+fi &&
+
+persistent_add CMAKE_GEN
diff --git a/CMAKE_DEPENDS b/CMAKE_DEPENDS
new file mode 100755
index 0000000..8840cf4
--- /dev/null
+++ b/CMAKE_DEPENDS
@@ -0,0 +1,5 @@
+depends cmake &&
+
+if [[ $CMAKE_GEN == Ninja ]];then
+ depends ninja-build-system
+fi
diff --git a/CMAKE_FUNCTIONS b/CMAKE_FUNCTIONS
new file mode 100755
index 0000000..85857fe
--- /dev/null
+++ b/CMAKE_FUNCTIONS
@@ -0,0 +1,10 @@
+PREFIX=${PREFIX:-/usr}
+default_build () {
+ cd $SOURCE_DIRECTORY
+ mkdir -p build
+ OPTS+=" -DBUILD_SHARED_LIBS=1"
+ cmake_build
+}
+default_install () {
+ cmake_install
+}
diff --git a/ChangeLog b/ChangeLog
index 80129f1..c2a5626 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2019-11-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * FUNCTIONS: install to /usr/games and /usr/share/games when using
+ cmake
+ * CMAKE_*: added
+
2019-07-08 Eric Sandall <sandalle AT sourcemage.org>
* FUNCTIONS: In disable_pic, check 64-bit for EM64T as well.
Sorcery devel (from git), glibc, gcc, or updated smgl-archspecs
changed
diff --git a/FUNCTIONS b/FUNCTIONS
index ad135b5..8a4bbd9 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -86,7 +86,7 @@ function cmake_build() {
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
cd build &&
- cmake -DCMAKE_INSTALL_LIBDIR:PATH=lib
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
+ cmake -DCMAKE_INSTALL_LIBDIR:PATH=lib
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ -DCMAKE_INSTALL_BINDIR=games
-DCMAKE_INSTALL_DATAROOTDIR=share/games $OPTS &&
make
}

diff --git a/games-libs/bullet/DETAILS b/games-libs/bullet/DETAILS
index fb160e1..c022dad 100755
--- a/games-libs/bullet/DETAILS
+++ b/games-libs/bullet/DETAILS
@@ -1,9 +1,9 @@
SPELL=bullet
- VERSION=2.88
+ VERSION=2.89
SOURCE="$SPELL-$VERSION.tgz"
SOURCE_URL[0]=http://${SPELL}.googlecode.com/files/${SOURCE}

SOURCE_URL[0]=https://github.com/bulletphysics/bullet3/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:15face1940d496c96fd19a44139d11d2cbb629526c40432be4a0eef5fa9a532c842ec7318248c0359a080f2034111bf1a3c2d3a6fd789bec675bd368fac7bd93
+
SOURCE_HASH=sha512:3c4ba6a3b3623ef44dd4a23e0bc2e90dec1f2b7af463edcb886e110feac1dfb4a91945f0ed640052cac228318539e275976d37238102fb10a0f78aef065a730b
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}3-${VERSION}"
WEB_SITE="http://www.bulletphysics.com/";
LICENSE[0]=zlib
diff --git a/games-libs/bullet/HISTORY b/games-libs/bullet/HISTORY
index 45a0b14..fc9d54c 100644
--- a/games-libs/bullet/HISTORY
+++ b/games-libs/bullet/HISTORY
@@ -1,3 +1,6 @@
+2019-12-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.89
+
2019-01-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.88

diff --git a/games-simulation/pioneer/BUILD b/games-simulation/pioneer/BUILD
index e5daa6e..e013b8d 100755
--- a/games-simulation/pioneer/BUILD
+++ b/games-simulation/pioneer/BUILD
@@ -1 +1 @@
-PIONEER_DATA_DIR="$INSTALL_ROOT/usr/share/games/pioneer" default_games_build
+cmake_build
diff --git a/games-simulation/pioneer/CONFIGURE
b/games-simulation/pioneer/CONFIGURE
new file mode 100755
index 0000000..b2f02c3
--- /dev/null
+++ b/games-simulation/pioneer/CONFIGURE
@@ -0,0 +1 @@
+source $GRIMOIRE/CMAKE_CONFIGURE
diff --git a/games-simulation/pioneer/DEPENDS
b/games-simulation/pioneer/DEPENDS
index 22c0f8f..d225110 100755
--- a/games-simulation/pioneer/DEPENDS
+++ b/games-simulation/pioneer/DEPENDS
@@ -1,10 +1,13 @@
+source $GRIMOIRE/CMAKE_DEPENDS
depends gcc &&
-depends automake &&
depends curl &&
depends libsigc++2 &&
depends sdl2_image &&
depends freetype2 &&
+depends freeimage &&
depends libvorbis &&
depends libpng &&
depends assimp &&
-depends OPENGL
+depends OPENGL &&
+depends glew &&
+depends minizip
diff --git a/games-simulation/pioneer/DETAILS
b/games-simulation/pioneer/DETAILS
index 47bfc1c..9b44d49 100755
--- a/games-simulation/pioneer/DETAILS
+++ b/games-simulation/pioneer/DETAILS
@@ -1,8 +1,9 @@
+isource $GRIMOIRE/CMAKE_FUNCTIONS
SPELL=pioneer
- VERSION=20180203
+ VERSION=20191117
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/${SPELL}spacesim/${SPELL}/archive/${VERSION}.tar.gz
-
SOURCE_HASH=sha512:cd339809712ac35d5e3bcaa60126590c3c6ece4339f7ac08de7deea9d88bc79c89e43fcec58ee9e57f172049ef7b74f92fb90c91f0a74979e6cb43003e88ab2c
+
SOURCE_HASH=sha512:2155fb7e1bb88598673e516afca9bfac7accda23ac4d9cc01c03de1a9d87f1f554305b0ca6cebb5c98c542794421d273fd369faeb43c7533b26e457f1a629d35
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-$VERSION"
WEB_SITE="http://pioneerspacesim.net/";
LICENSE[0]=GPL
diff --git a/games-simulation/pioneer/HISTORY
b/games-simulation/pioneer/HISTORY
index 67255b6..44b75bd 100644
--- a/games-simulation/pioneer/HISTORY
+++ b/games-simulation/pioneer/HISTORY
@@ -1,3 +1,8 @@
+2019-11-22 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 20191117
+ * BUILD, CONFIGURE, DEPENDS, DETAILS: use cmake
+ * PRE_BUILD: removed
+
2018-02-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 20180203

diff --git a/games-simulation/pioneer/PRE_BUILD
b/games-simulation/pioneer/PRE_BUILD
deleted file mode 100755
index ab1cf67..0000000
--- a/games-simulation/pioneer/PRE_BUILD
+++ /dev/null
@@ -1,4 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-
-./bootstrap
diff --git a/games-strategy-tbs/freeciv/DETAILS
b/games-strategy-tbs/freeciv/DETAILS
index fb5f947..ca38cac 100755
--- a/games-strategy-tbs/freeciv/DETAILS
+++ b/games-strategy-tbs/freeciv/DETAILS
@@ -1,9 +1,9 @@
SPELL=freeciv
- VERSION=2.5.6
+ VERSION=2.6.1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION

SOURCE_URL[0]=$SOURCEFORGE_URL/${SPELL}/Freeciv%20${VERSION%.*}/${VERSION}/${SOURCE}
-
SOURCE_HASH=sha512:85f87d73e7f9a74ff4fe71962481374b2e37a98574615fb94831af0b3d8c1e5c8bbee9a9bbb0223ff455ca46ead85f050f941fb97777c015d1d760d8468cb3db
+
SOURCE_HASH=sha512:44145eaea96d5ab4f18e843102209d0f88a626af37365cf91b5e592bcac45f2692a7e21e9b3454a3ee4b9099212f5826a4687931bb37dabbb7dedad059df1cb4
SECURITY_PATCH=1
# SOURCE_GPG="gurus.gpg:${SOURCE}.sig:WORKS_FOR_ME"
LICENSE[0]=GPL
diff --git a/games-strategy-tbs/freeciv/HISTORY
b/games-strategy-tbs/freeciv/HISTORY
index 8fa3930..a2eaac0 100644
--- a/games-strategy-tbs/freeciv/HISTORY
+++ b/games-strategy-tbs/freeciv/HISTORY
@@ -1,3 +1,6 @@
+2020-01-04 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2.6.1
+
2016-12-03 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.5.6



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (ca34b77498fc032cd1c50254ccf71f7b0e834576), Florian Franzmann, 01/04/2020

Archive powered by MHonArc 2.6.24.

Top of Page