Skip to Content.
Sympa Menu

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

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 grimoire by Florian Franzmann (5af1b311c1057c4937dd54e36f2e62407e327313)
  • Date: Sat, 7 Jul 2012 19:56:33 -0500

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

graphics/lensfun/BUILD | 4 +---
graphics/lensfun/DEPENDS | 5 +++--
graphics/lensfun/DETAILS | 8 ++++----
graphics/lensfun/HISTORY | 6 ++++++
graphics/lensfun/PREPARE | 9 ++-------
5 files changed, 16 insertions(+), 16 deletions(-)

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

graphics/lensfun: version 0.2.6

* use prepare_select_branch
* use cmake
* have optional dependency on libpng

diff --git a/graphics/lensfun/BUILD b/graphics/lensfun/BUILD
index e342b8f..e013b8d 100755
--- a/graphics/lensfun/BUILD
+++ b/graphics/lensfun/BUILD
@@ -1,3 +1 @@
-./configure --prefix=${INSTALL_ROOT}/usr --libdir="$INSTALL_ROOT/usr/lib"
$OPTS &&
-make all
-
+cmake_build
diff --git a/graphics/lensfun/DEPENDS b/graphics/lensfun/DEPENDS
index 6409049..e106143 100755
--- a/graphics/lensfun/DEPENDS
+++ b/graphics/lensfun/DEPENDS
@@ -1,7 +1,8 @@
depends python &&
depends glib2 &&
-depends libpng &&
-if [[ $LENSFUN_SCM == y ]]; then
+depends cmake &&
+optional_depends libpng '-DBUILD_AUXFUN=ON' '-DBUILD_AUXFUN=OFF' 'build
AUXFUN library?' &&
+if [[ $LENSFUN_BRANCH == scm ]]; then
depends subversion
fi &&
optional_depends doxygen '' '' 'build documentation'
diff --git a/graphics/lensfun/DETAILS b/graphics/lensfun/DETAILS
index ab73e23..cbd0149 100755
--- a/graphics/lensfun/DETAILS
+++ b/graphics/lensfun/DETAILS
@@ -1,6 +1,6 @@
SPELL=lensfun
-if [[ $LENSFUN_SCM == y ]]; then
-if [[ $LENSFUN_SCM_AUTO == y ]]; then
+if [[ $LENSFUN_BRANCH == scm ]]; then
+if [[ $LENSFUN_AUTOUPDATE == y ]]; then
VERSION=$(date +%Y%m%d)
else
VERSION=scm
@@ -12,8 +12,8 @@ fi
SOURCE_IGNORE=volatile
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-scm
else
- VERSION=0.2.5
-
SOURCE_HASH=sha512:a90292fd53fc12d82ccfd0211b8e544b18e2bd712010bf4c1cad5ad1d18f82145c399371f3699fe004571a845420f8e17f3237b45f861cb58c7ac8df8e503baa
+ VERSION=0.2.6
+
SOURCE_HASH=sha512:209ef807d0cc43dcc021709ab0f5e460fed9192a4f617c8e4e07fd6e3b0ad3863d1e1b716c38025ec5cc8b22f62708ec64b4e02f14b35f25c5767b5db1defbb1
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://download.berlios.de/$SPELL/$SOURCE
diff --git a/graphics/lensfun/HISTORY b/graphics/lensfun/HISTORY
index 39501ab..d4434b7 100644
--- a/graphics/lensfun/HISTORY
+++ b/graphics/lensfun/HISTORY
@@ -1,3 +1,9 @@
+2012-07-08 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 0.2.6
+ * DETAILS, PREPARE, DEPENDS: use prepare_select_branch
+ * DEPENDS: made dependency on libpng optional
+ * BUILD, DEPENDS: use cmake
+
2010-04-01 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 0.2.5

diff --git a/graphics/lensfun/PREPARE b/graphics/lensfun/PREPARE
index b3eac7f..98d27e4 100755
--- a/graphics/lensfun/PREPARE
+++ b/graphics/lensfun/PREPARE
@@ -1,7 +1,2 @@
-config_query LENSFUN_SCM "Do you want SCM version" "n" &&
-if [[ "${LENSFUN_SCM}" == "y" ]]
-then
-config_query LENSFUN_SCM_AUTO \
- "Automaticaly update the spell on sorcery queue/system-update?" \
- "n"
-fi
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (5af1b311c1057c4937dd54e36f2e62407e327313), Florian Franzmann, 07/07/2012

Archive powered by MHonArc 2.6.24.

Top of Page