Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4f9ccc8a2c68137124b921aeb9d5b827dc6aaed6)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Ismael Luceno <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4f9ccc8a2c68137124b921aeb9d5b827dc6aaed6)
  • Date: Fri, 4 Jul 2014 17:16:54 -0500

GIT changes to master grimoire by Ismael Luceno <ismael AT sourcemage.org>:

libs/libfreenect/DETAILS | 2 +-
libs/libfreenect/HISTORY | 5 ++++-
libs/libfreenect/PREPARE | 6 +++---
libs/libfreenect/PRE_BUILD | 7 -------
4 files changed, 8 insertions(+), 12 deletions(-)

New commits:
commit 4f9ccc8a2c68137124b921aeb9d5b827dc6aaed6
Author: Ismael Luceno <ismael AT sourcemage.org>
Commit: Ismael Luceno <ismael AT sourcemage.org>

libfreenect: Use prepare_select_branch

diff --git a/libs/libfreenect/DETAILS b/libs/libfreenect/DETAILS
index 47e17ea..8fabd52 100755
--- a/libs/libfreenect/DETAILS
+++ b/libs/libfreenect/DETAILS
@@ -2,7 +2,7 @@
SPELL=libfreenect
VERSION=$(get_scm_version)
SOURCE="${SPELL}-git.tar.bz2"
- SOURCE_URL[0]=git://github.com/OpenKinect/libfreenect.git:libfreenect-git
+
SOURCE_URL[0]=git://github.com/OpenKinect/libfreenect.git:libfreenect-git:"$LIBFREENECT_BRANCH"
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
WEB_SITE=http://openkinect.org/
diff --git a/libs/libfreenect/HISTORY b/libs/libfreenect/HISTORY
index a62eff0..cb8daa2 100644
--- a/libs/libfreenect/HISTORY
+++ b/libs/libfreenect/HISTORY
@@ -1,7 +1,10 @@
+2014-07-04 Ismael Luceno <ismael AT sourcemage.org>
+ * DETAILS, PREPARE, PRE_BUILD: Use prepare_select_branch
+
2014-07-03 Ismael Luceno <ismael AT sourcemage.org>
* DETAILS: Use get_scm_version

-2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
+2012-05-09 Treeve Jelbert <treeve AT sourcemage.org>
* DEPENDS: libusb => LIBUSB

2011-12-31 Ladislav Hagara <hgr AT vabo.cz>
diff --git a/libs/libfreenect/PREPARE b/libs/libfreenect/PREPARE
index 32d8b00..347c0fd 100755
--- a/libs/libfreenect/PREPARE
+++ b/libs/libfreenect/PREPARE
@@ -1,4 +1,4 @@
-config_query LIBFREENECT_AUTOUPDATE "Queue for update on every system
update?" n &&
+. "$GRIMOIRE/FUNCTIONS" &&
+prepare_select_branch master unstable &&
config_query LIBFREENECT_PYTHON_WRAPPER "Do you want to build libfreenect
python wrapper?" n &&
-config_query LIBFREENECT_AUDIO "Do you want to enable audio?" n &&
-config_query_list LIBFREENECT_GIT_BRANCH "Which branch of libfreenect do you
want to build?" master unstable
+config_query LIBFREENECT_AUDIO "Do you want to enable audio?" n
diff --git a/libs/libfreenect/PRE_BUILD b/libs/libfreenect/PRE_BUILD
deleted file mode 100755
index ed29463..0000000
--- a/libs/libfreenect/PRE_BUILD
+++ /dev/null
@@ -1,7 +0,0 @@
-default_pre_build &&
-cd $SOURCE_DIRECTORY &&
-
-if [[ "$LIBFREENECT_GIT_BRANCH" == "unstable" ]]; then
- message "${MESSAGE_COLOR}git checkout unstable${DEFAULT_COLOR}" &&
- git checkout origin/unstable
-fi



  • [SM-Commit] GIT changes to master grimoire by Ismael Luceno (4f9ccc8a2c68137124b921aeb9d5b827dc6aaed6), Ismael Luceno, 07/04/2014

Archive powered by MHonArc 2.6.24.

Top of Page