Skip to Content.
Sympa Menu

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

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 (8bb84a1c9abeb8b5a266b1550123b7aba348ea21)
  • Date: Sat, 21 Apr 2012 06:01:16 -0500

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

devel/git/DETAILS | 8 ++++----
devel/git/HISTORY | 3 +++
graphics/darktable/DEPENDS | 9 ++++++++-
graphics/darktable/DETAILS | 15 ++++++++++++++-
graphics/darktable/HISTORY | 5 +++++
graphics/darktable/PREPARE | 2 ++
6 files changed, 36 insertions(+), 6 deletions(-)

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

devel/git: fixed HISTORY entry

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

graphics/darktable: added support for the scm version, added missing
dependencies

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

Revert "graphics/darktable: added support for the scm version"

This reverts commit 4c23c1ec94cf34c69b3d19429e4dcf5cfeac8030.

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

graphics/darktable: added support for the scm version

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

devel/git: version 1.7.10

diff --git a/devel/git/DETAILS b/devel/git/DETAILS
index 51ff65e..47f9a86 100755
--- a/devel/git/DETAILS
+++ b/devel/git/DETAILS
@@ -1,10 +1,10 @@
SPELL=git
- VERSION=1.7.9.4
+ VERSION=1.7.10
SECURITY_PATCH=1
SOURCE=$SPELL-$VERSION.tar.gz
# SOURCE2=$SOURCE.sign
# SOURCE_GPG=kernel.gpg:$SOURCE.sign:UPSTREAM_KEY
-
SOURCE_HASH=sha512:85979a000ca114514c888891db8a08af87500b577d41b7b042621671135c4d4be13cb85b2ae23cbb219a558e5965fdbef2c154b2734d6e79437bb9857f8de5f6
+
SOURCE_HASH=sha512:01c622c284a4a661c67facfe6776a86163b68612d7233a887be06cc49e2ba7c7eab36ac5033ee6eec6a56b36ceed1fc85d45f6118d9038fdea82f2bb2b9fd2a7
SOURCE_URL=http://git-core.googlecode.com/files/$SOURCE
# SOURCE2_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE2
# SOURCE2_IGNORE=signature
@@ -12,7 +12,7 @@ if [[ $GIT_DOC == manpages || $GIT_DOC == both ]]; then
SOURCE3=$SPELL-manpages-$VERSION.tar.gz
# SOURCE4=$SOURCE3.sign
# SOURCE3_GPG=kernel.gpg:$SOURCE3.sign:UPSTREAM_KEY
-
SOURCE3_HASH=sha512:d6e29a26cf6bd77e26e647b80b39811bdd0242f5d4b6a8089798414b9b6082f347696087a765a95abf9a66a57b168780743dc32417b1b45e80eea9d2a7796c65
+
SOURCE3_HASH=sha512:e6481a3d768ec2ad1f6e22e6e1630c934cb4dd719c86d2b6a5ac46d0f22d213c6602508ef44a584557bec123aa076e60087843e5ad0548dbe5a9de0f419e9e27
SOURCE3_URL=http://git-core.googlecode.com/files/$SOURCE3
# SOURCE4_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE4
# SOURCE4_IGNORE=signature
@@ -21,7 +21,7 @@ if [[ $GIT_DOC == htmldocs || $GIT_DOC == both ]]; then
SOURCE5=$SPELL-htmldocs-$VERSION.tar.gz
# SOURCE6=$SOURCE5.sign
# SOURCE5_GPG=kernel.gpg:$SOURCE5.sign:UPSTREAM_KEY
-
SOURCE5_HASH=sha512:6569561ff1592a310e8f82bddff928922b6e8c1699b460171fc9a0cf53e8060c70b365c59cb11153d1faa6f262b1bd968b775352ca209ec784488b0af92d1697
+
SOURCE5_HASH=sha512:2d201f29f1beb0ba7db4ed61fab75b50afc0da3fd6d60337830f178da064bb0c01061ea1bcf6ec3afbdec87d16f54ce8dee82fb8c03c630a62b27f1841049823
SOURCE5_URL=http://git-core.googlecode.com/files/$SOURCE5
# SOURCE6_URL=$KERNEL_URL/pub/software/scm/git/$SOURCE6
# SOURCE6_IGNORE=signature
diff --git a/devel/git/HISTORY b/devel/git/HISTORY
index cd0e132..f27cea8 100644
--- a/devel/git/HISTORY
+++ b/devel/git/HISTORY
@@ -1,3 +1,6 @@
+2012-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS: version 1.7.10
+
2012-03-13 Ladislav Hagara <hgr AT vabo.cz>
* DETAILS: 1.7.9.4

diff --git a/graphics/darktable/DEPENDS b/graphics/darktable/DEPENDS
index 46861e5..f52e525 100755
--- a/graphics/darktable/DEPENDS
+++ b/graphics/darktable/DEPENDS
@@ -10,9 +10,16 @@ depends gphoto2 &&
depends gtk+2 &&
depends JPEG &&
depends lcms2 &&
+depends lensfun &&
depends libpng &&
depends libraw &&
depends openexr &&
+depends sdl &&
depends sqlite &&
depends tiff &&
-optional_depends gnome-keyring "-DUSE_GNOME_KEYRING=ON"
"-DUSE_GNOME_KEYRING=OFF" "build gnome-keyring password storage backend"
+if [[ "$DARKTABLE_BRANCH" == "scm" ]]; then
+ depends git
+fi &&
+optional_depends gnome-keyring "-DUSE_GNOME_KEYRING=ON"
"-DUSE_GNOME_KEYRING=OFF" "build gnome-keyring password storage backend" &&
+optional_depends flickurl "-DUSE_FLICKR=ON" "-DUSE_FLICKR=OFF"
"support for flickr" &&
+optional_depends kwallet "-DUSE_KWALLET=ON" "-DUSE_KWALLET=OFF"
"use kwallet as password storage backend"
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 68e81b1..d401ab6 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,9 +1,22 @@
SPELL=darktable
+if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
VERSION=1.0
- SOURCE="${SPELL}-${VERSION}.tar.gz"

SOURCE_URL[0]=$SOURCEFORGE_URL/project/${SPELL}/${SPELL}/${VERSION}/${SOURCE}

SOURCE_HASH=sha512:1bfcfb196a216255b605cbc10c7065e9d71274bd380b8d83b0b3331863de4d7af93e666f09f5bea055c516bc0af0b9dffe0b0422d16361f1c7fa172d8b7f633b
+ SOURCE="${SPELL}-${VERSION}.tar.gz"
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+else
+if [[ "$DARKTABLE_AUTOUPDATE" == "y" ]]; then
+ VERSION=$(date +%Y%m%d)
+else
+ VERSION=git
+fi
+ FORCE_DOWNLOAD=on
+ SOURCE="${SPELL}-git.tar.bz2"
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-git"
+
SOURCE_URL[0]=git://darktable.git.sourceforge.net/gitroot/darktable/darktable
+ SOURCE_IGNORE=volatile
+fi
WEB_SITE="http://www.darktable.org";
LICENSE[0]=GPL
ENTERED=20120121
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 46d6e75..289e653 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,8 @@
+2012-04-21 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * DETAILS, PREPARE, DEPENDS: added support for the scm version
+ * DEPENDS: added optional dependencies on gnome-keyring, flickurl
+ and kwallet, add dependencies on sdl and lensfun
+
2012-03-14 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.0

diff --git a/graphics/darktable/PREPARE b/graphics/darktable/PREPARE
new file mode 100755
index 0000000..98d27e4
--- /dev/null
+++ b/graphics/darktable/PREPARE
@@ -0,0 +1,2 @@
+. ${GRIMOIRE}/FUNCTIONS &&
+prepare_select_branch stable scm



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (8bb84a1c9abeb8b5a266b1550123b7aba348ea21), Florian Franzmann, 04/21/2012

Archive powered by MHonArc 2.6.24.

Top of Page