Skip to Content.
Sympa Menu

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

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 (bfe1a5f7707f6bca48724d1d4e08f2ba898fa49f)
  • Date: Fri, 26 Jul 2013 15:56:33 -0500

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

graphics/darktable/BUILD | 1
graphics/darktable/HISTORY | 6 ++++
graphics/darktable/PRE_BUILD | 3 ++
graphics/darktable/wb_presets_nx100_liliput_plus.patch | 24
+++++++++++++++++
4 files changed, 33 insertions(+), 1 deletion(-)

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

graphics/darktable: add support for nx100 liliput plus

diff --git a/graphics/darktable/BUILD b/graphics/darktable/BUILD
index 4972ac7..7cef367 100755
--- a/graphics/darktable/BUILD
+++ b/graphics/darktable/BUILD
@@ -3,6 +3,5 @@ OPTS+=" -DDONT_INSTALL_GCONF_SCHEMAS=1" &&
OPTS+=" -DINSTALL_IOP_LEGACY=1" &&
OPTS+=" -DINSTALL_IOP_EXPERIMENTAL=1" &&
OPTS+=" -DBINARY_PACKAGE_BUILD=1" &&
-OPTS+=" -DBUILD_SLIDESHOW=off" &&
CFLAGS="${CFLAGS} -Wno-error=deprecated-declarations" \
CXXFLAGS="${CXXFLAGS} -Wno-error=deprecated-declarations -fpermissive"
cmake_build
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index d46a39f..72ed858 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,9 @@
+2013-07-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * BUILD: remove BUILD_SLIDESHOW=off from OPTS
+ * PRE_BUILD, wb_presets_nx100_liliput_plus.patch: add support
+ for the nx100 liliput plus as does upstream in their ubuntu
+ ppa
+
2013-06-26 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 1.2.2

diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
new file mode 100755
index 0000000..c649a28
--- /dev/null
+++ b/graphics/darktable/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p1 < $SPELL_DIRECTORY/wb_presets_nx100_liliput_plus.patch
diff --git a/graphics/darktable/wb_presets_nx100_liliput_plus.patch
b/graphics/darktable/wb_presets_nx100_liliput_plus.patch
new file mode 100644
index 0000000..324296a
--- /dev/null
+++ b/graphics/darktable/wb_presets_nx100_liliput_plus.patch
@@ -0,0 +1,24 @@
+From e8581a1d45d08ed034843e3e724293c6cd4916ee Mon Sep 17 00:00:00 2001
+From: Pascal de Bruijn <pmjdebruijn AT pcode.nl>
+Date: Fri, 8 Feb 2013 20:23:22 +0100
+Subject: [PATCH] wb_presets: Add Megaman liliput-plus (SAMSUNG NX100)
+
+---
+ src/iop/wb_presets.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/iop/wb_presets.c b/src/iop/wb_presets.c
+index 701887b..bdb724b 100644
+--- a/src/iop/wb_presets.c
++++ b/src/iop/wb_presets.c
+@@ -4269,6 +4269,7 @@ const wb_data wb_preset[] = {
+ { "SAMSUNG", "NX100", Flash, 5, { 2.249317, 1, 0.859903, 0 }
},
+ { "SAMSUNG", "NX100", Flash, 6, { 2.284664, 1, 0.836022, 0 }
},
+ { "SAMSUNG", "NX100", Flash, 7, { 2.320238, 1, 0.812302, 0 }
},
++ { "SAMSUNG", "NX100", "Megaman liliput plus", 0, { 1.800000, 1, 1.350000,
0 } },
+ { "SAMSUNG", "NX100", "5000K", 0, { 1.684339, 1, 1.094063, 0 }
},
+ { "SAMSUNG", "NX100", "5500K", 0, { 1.692022, 1, 0.843950, 0 }
},
+ { "SAMSUNG", "NX100", "6500K", 0, { 2.110371, 1, 0.879107, 0 }
},
+--
+1.7.10.4
+



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (bfe1a5f7707f6bca48724d1d4e08f2ba898fa49f), Florian Franzmann, 07/26/2013

Archive powered by MHonArc 2.6.24.

Top of Page