Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

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 (230d9c48dbc3c864679e076fc4d3d4b3cd040254)
  • Date: Sat, 25 Nov 2017 12:01:45 +0000

GIT changes to master games grimoire by Florian Franzmann
<siflfran AT hawo.stw.uni-erlangen.de>:

ChangeLog | 4 ++++
FUNCTIONS | 3 ++-
games-data/fgfs-base/DETAILS | 4 ++--
games-data/fgfs-base/HISTORY | 3 +++
games-data/fgfs-bombable/DETAILS | 8 ++++----
games-data/fgfs-bombable/HISTORY | 3 +++
games-libs/simgear/BUILD | 1 +
games-libs/simgear/DETAILS | 4 ++--
games-libs/simgear/HISTORY | 4 ++++
games-simulation/flightgear/BUILD | 4 +++-
games-simulation/flightgear/DETAILS | 4 ++--
games-simulation/flightgear/HISTORY | 4 ++++
glselect.function | 16 ++++++++++++++++
13 files changed, 50 insertions(+), 12 deletions(-)

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

games-data/fgfs-bombable: version 4.6delta

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

games-simulation/flightgear: version 2017.3.1

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

games-data/fgfs-base: version 2017.3.1

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

games-libs/simgear: version 2017.3.1

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

FUNCTIONS: make sure cmake doesn't install into lib64

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

FUNCTIONS: add glselect

diff --git a/ChangeLog b/ChangeLog
index 2ffa9b7..f608a59 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * glselect.function, FUNCTIONS: add glselect
+ * FUNCTIONS: make sure cmake doesn't install anything into lib64
+
2017-11-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* games-engines/openmw: new spell, a recreation of the Morrowind
engine

diff --git a/FUNCTIONS b/FUNCTIONS
index 4b320fa..e1ce1d1 100755
--- a/FUNCTIONS
+++ b/FUNCTIONS
@@ -83,7 +83,7 @@ function cmake_build() {
cd $SOURCE_DIRECTORY &&
mkdir -p build &&
cd build &&
- cmake -DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
+ cmake -DCMAKE_INSTALL_LIBDIR:PATH=lib
-DCMAKE_INSTALL_PREFIX=$INSTALL_ROOT/usr ../ $OPTS &&
make
}

@@ -347,3 +347,4 @@ function get_scm_version() {
fi
}

+. $GRIMOIRE/glselect.function
diff --git a/games-data/fgfs-base/DETAILS b/games-data/fgfs-base/DETAILS
index 0ff2331..5cedb00 100755
--- a/games-data/fgfs-base/DETAILS
+++ b/games-data/fgfs-base/DETAILS
@@ -1,9 +1,9 @@
SPELL=fgfs-base
- VERSION=2016.3.1
+ VERSION=2017.3.1
SOURCE=FlightGear-${VERSION}-data.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/fgdata

SOURCE_URL[0]=http://downloads.sourceforge.net/project/flightgear/release-$(echo
$VERSION|cut -f1,2 -d'.')/$SOURCE
-
SOURCE_HASH=sha512:ba4d51efc23cf125367815491cdb78153d5b553bae54bae41eb9f01f0749d53d1be9c0a63e998a31f05c0d514d5dcef2a1dfd55267e7698d34738e3dc5559018
+
SOURCE_HASH=sha512:9a3a68103bbb0f74d7f019b45cca00e686122618c1b5142231ba0c8b83f1283956782d3ea4372b1d96d653ea45f7087c32f39f26fe97695faddad0be12f8d9ff
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://flightgear.sourceforge.net
ENTERED=20010922
diff --git a/games-data/fgfs-base/HISTORY b/games-data/fgfs-base/HISTORY
index 7452f75..4b13544 100644
--- a/games-data/fgfs-base/HISTORY
+++ b/games-data/fgfs-base/HISTORY
@@ -1,3 +1,6 @@
+2017-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2017.3.1
+
2016-09-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2016.3.1

diff --git a/games-data/fgfs-bombable/DETAILS
b/games-data/fgfs-bombable/DETAILS
index 6ffe2f3..3f287ab 100755
--- a/games-data/fgfs-bombable/DETAILS
+++ b/games-data/fgfs-bombable/DETAILS
@@ -1,8 +1,8 @@
SPELL=fgfs-bombable
- VERSION=4.5b
- SOURCE="bombable${VERSION/\./-}.zip"
- SOURCE_URL[0]=http://brenthugh.com/flightgear/${SOURCE}
-
SOURCE_HASH=sha512:0e6725e3aeeafe853d25b11f15b9ac5b4d9452486c1d17dd26dbafef833a0be47de22a17bc37fb9398df6578736172a39f536a4e0c0f1c7359b379ed49181e56
+ VERSION=4.6delta
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
+ SOURCE_URL[0]=https://github.com/bhugh/Bombable/archive/${VERSION}.tar.gz
+
SOURCE_HASH=sha512:792f224507ea93c958ad636621cbd56780ef58b680ddb26d341cc5c356e468fdb506159464ff2b307b66e6791d3f89dc16aca00b3fa31d20cf76bbcdc313b96e
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
WEB_SITE="http://wiki.flightgear.org/Bombable";
LICENSE[0]=GPL
diff --git a/games-data/fgfs-bombable/HISTORY
b/games-data/fgfs-bombable/HISTORY
index 0252669..b5a8350 100644
--- a/games-data/fgfs-bombable/HISTORY
+++ b/games-data/fgfs-bombable/HISTORY
@@ -1,3 +1,6 @@
+2017-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 4.6delta
+
2014-01-17 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* BUILD, DEPENDS, DETAILS, INSTALL, PRE_BUILD: spell created

diff --git a/games-libs/simgear/BUILD b/games-libs/simgear/BUILD
index e013b8d..17aa367 100755
--- a/games-libs/simgear/BUILD
+++ b/games-libs/simgear/BUILD
@@ -1 +1,2 @@
+glselect mesa &&
cmake_build
diff --git a/games-libs/simgear/DETAILS b/games-libs/simgear/DETAILS
index 9badbcd..974821c 100755
--- a/games-libs/simgear/DETAILS
+++ b/games-libs/simgear/DETAILS
@@ -1,9 +1,9 @@
SPELL=simgear
- VERSION=2016.3.1
+ VERSION=2017.3.1
SOURCE=simgear-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/simgear-${VERSION%-rc*}

SOURCE_URL[0]=http://downloads.sourceforge.net/project/flightgear/release-$(echo
$VERSION|cut -f1,2 -d'.')/$SOURCE
-
SOURCE_HASH=sha512:5c0e260da8b09e815cd6607f3e977b5827f450e9fbe10bfaef019d7489506905fde56a5ab6748165431088bbae7fa61d4bccc27e4d7828c8bc6a05247b450716
+
SOURCE_HASH=sha512:339c9af78e8c0490caec69be34b54f947751a9677cbb1163e73917f6aaa8f3d965ccf8058222c48ca4249cba4bb509205143f846de84595e92abdcd93e64c901
WEB_SITE=http://simgear.sourceforge.net
ENTERED=20010922
LICENSE[0]=LGPL
diff --git a/games-libs/simgear/HISTORY b/games-libs/simgear/HISTORY
index 56e033d..bdf8958 100644
--- a/games-libs/simgear/HISTORY
+++ b/games-libs/simgear/HISTORY
@@ -1,3 +1,7 @@
+2017-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2017.3.1
+ * BUILD: glselect mesa before building
+
2016-09-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2016.3.1

diff --git a/games-simulation/flightgear/BUILD
b/games-simulation/flightgear/BUILD
index 8808975..735bf08 100755
--- a/games-simulation/flightgear/BUILD
+++ b/games-simulation/flightgear/BUILD
@@ -1,3 +1,5 @@
OPTS+=" -DFG_DATA_DIR=${TRACK_ROOT}/usr/share/games/flightgear" &&
-OPTS+=" -DWITH_FGPANEL=off" &&
+OPTS+=" -DWITH_FGPANEL=off" &&
+
+glselect mesa &&
cmake_build
diff --git a/games-simulation/flightgear/DETAILS
b/games-simulation/flightgear/DETAILS
index f444719..d1555e6 100755
--- a/games-simulation/flightgear/DETAILS
+++ b/games-simulation/flightgear/DETAILS
@@ -1,9 +1,9 @@
SPELL=flightgear
- VERSION=2016.3.1
+ VERSION=2017.3.1
SOURCE=flightgear-${VERSION}.tar.bz2
SOURCE_DIRECTORY=${BUILD_DIRECTORY}/flightgear-${VERSION%-rc*}

SOURCE_URL[0]=http://downloads.sourceforge.net/project/flightgear/release-$(echo
$VERSION|cut -f1,2 -d'.')/$SOURCE
-
SOURCE_HASH=sha512:57246144d954e36e330fe5da15ff5c86f810cbd0b09638c2df813a242677eca22e00a9432f6091da6731972699657fee525310f5bcc91cf8dc5e2250c8663e8a
+
SOURCE_HASH=sha512:e91268b4fc6a5b04761cf64e003e9962e5a66a91c0f089a1de220ef7cc438250dbd93ed99773c09f19255604c4cc5a0b65b80fe19e663fa0eae8107374527b4b
# SOURCE_GPG="gurus.gpg:$SOURCE.sig:WORKS_FOR_ME"
WEB_SITE=http://www.flightgear.org
ENTERED=20010922
diff --git a/games-simulation/flightgear/HISTORY
b/games-simulation/flightgear/HISTORY
index 637f4c8..4a17d1f 100644
--- a/games-simulation/flightgear/HISTORY
+++ b/games-simulation/flightgear/HISTORY
@@ -1,3 +1,7 @@
+2017-11-25 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 2017.3.1
+ * BUILD: glselect mesa
+
2016-09-12 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2016.3.1

diff --git a/glselect.function b/glselect.function
new file mode 100755
index 0000000..1e7cb21
--- /dev/null
+++ b/glselect.function
@@ -0,0 +1,16 @@
+#---
+## glselect - select default libGL provider
+## rewritten from smgl-gl_select
+## then modified to call the latter instead, duplication == BAD
+##
+## this is run in FINAL and will always set the provider
+## based on the final spell cast that calls this.
+## If one wants to have this settable runtime then
+## there's the smgl-gl_select tool to do so
+##
+#---
+
+function glselect(){
+ message "${MESSAGE_COLOR}Calling smgl-gl_select to switch to
$1.$DEFAULT_COLOR" &&
+ smgl-gl_select -s "$1"
+}



  • [SM-Commit] GIT changes to master games grimoire by Florian Franzmann (230d9c48dbc3c864679e076fc4d3d4b3cd040254), Florian Franzmann, 11/25/2017

Archive powered by MHonArc 2.6.24.

Top of Page