Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (7979a8891119c4df2154ab648a66749df5cbd587)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (7979a8891119c4df2154ab648a66749df5cbd587)
  • Date: Fri, 22 Sep 2017 05:57:08 +0000

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

devel/heimdall/BUILD | 20 +++++++-------------
devel/heimdall/DEPENDS | 7 ++++++-
devel/heimdall/DETAILS | 4 ++--
devel/heimdall/HISTORY | 4 ++++
devel/heimdall/INSTALL | 6 +++++-
5 files changed, 24 insertions(+), 17 deletions(-)

New commits:
commit 7979a8891119c4df2154ab648a66749df5cbd587
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

heimdall: version 1.4.2 and optional qt5 frontend

diff --git a/devel/heimdall/BUILD b/devel/heimdall/BUILD
index 1f8e16b..aa22bd4 100755
--- a/devel/heimdall/BUILD
+++ b/devel/heimdall/BUILD
@@ -1,13 +1,7 @@
-OPTS="$OPTS --build=${BUILD}";
-[[ $CROSS_INSTALL == on ]] && OPTS="$OPTS --host=${HOST}";
-for i in libpit heimdall; do
- cd "$i" &&
- ./configure \
- --prefix=${INSTALL_ROOT}/usr \
- --sysconfdir=${INSTALL_ROOT}/etc \
- --localstatedir=${INSTALL_ROOT}/var \
- --mandir=${INSTALL_ROOT}/usr/share/man \
- --infodir=${INSTALL_ROOT}/usr/share/info $OPTS &&
- make &&
- cd .. || exit
-done
+cd "$SOURCE_DIRECTORY" &&
+CM_BUILD_TYPE=Release &&
+if is_depends_enabled $SPELL qtbase; then
+ qt5_cmake_build
+else
+ cmake_build
+fi
diff --git a/devel/heimdall/DEPENDS b/devel/heimdall/DEPENDS
index 5487d07..3c961d2 100755
--- a/devel/heimdall/DEPENDS
+++ b/devel/heimdall/DEPENDS
@@ -1 +1,6 @@
-depends libusb
+depends cmake &&
+depends libusb &&
+depends DEVICE-MANAGER &&
+optional_depends qtbase \
+ "-DDISABLE_FRONTEND=off" "-DDISABLE_FRONTEND=on" \
+ "for frontend GUI"
diff --git a/devel/heimdall/DETAILS b/devel/heimdall/DETAILS
index a59a483..d363222 100755
--- a/devel/heimdall/DETAILS
+++ b/devel/heimdall/DETAILS
@@ -1,8 +1,8 @@
SPELL=heimdall
- VERSION=1.4.1
+ VERSION=1.4.2
SOURCE="$SPELL-$VERSION.tar.gz"

SOURCE_URL[0]=https://github.com/Benjamin-Dobell/${SPELL^}/archive/v$VERSION.tar.gz
-
SOURCE_HASH=sha512:2f1f49b0ad7bd5f4359893359b26024fe0cce84afed3878e42d902eb4dee487a44e351247d57e4af143ad728abd6c664df688246fcf7b96b9f3841cd16594296
+
SOURCE_HASH=sha512:c554662f9ccb763a8e9867a0c563618879d2533af985d44db3c237d3ee51add44c1681d13b1a83b72b30ba6e5b32d7c2f9c02b31114c67c5fbe01cbb010acfe7
SOURCE_DIRECTORY="$BUILD_DIRECTORY/${SPELL^}-$VERSION"
WEB_SITE="http://www.glassechidna.com.au/products/heimdall/";
LICENSE[0]="MIT"
diff --git a/devel/heimdall/HISTORY b/devel/heimdall/HISTORY
index e0837d9..bfffb84 100644
--- a/devel/heimdall/HISTORY
+++ b/devel/heimdall/HISTORY
@@ -1,3 +1,7 @@
+2017-09-21 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS: updated spell to 1.4.2
+ * DEPENDS, BUILD, INSTALL: updated for cmake and frontend
+
2016-11-25 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Fixed SOURCE_DIRECTORY

diff --git a/devel/heimdall/INSTALL b/devel/heimdall/INSTALL
index a6d41a3..1d575f9 100755
--- a/devel/heimdall/INSTALL
+++ b/devel/heimdall/INSTALL
@@ -1 +1,5 @@
-make -C heimdall install
+cd "$SOURCE_DIRECTORY/build" &&
+cp -v bin/heimdall "$INSTALL_ROOT/usr/bin/" &&
+if is_depends_enabled $SPELL qtbase; then
+ cp -v bin/heimdall-frontend "$INSTALL_ROOT/usr/bin/"
+fi



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (7979a8891119c4df2154ab648a66749df5cbd587), Thomas Orgis, 09/22/2017

Archive powered by MHonArc 2.6.24.

Top of Page