Skip to Content.
Sympa Menu

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

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 (20a9ee1968c9fe61a0f35acc2323c700926601b4)
  • Date: Sun, 7 Aug 2016 14:21:53 +0000

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

graphics/darktable/0001-do-not-build-darktable-viewer.patch | 44
++++++++++++
graphics/darktable/DETAILS | 4 -
graphics/darktable/HISTORY | 5 +
graphics/darktable/PRE_BUILD | 3
4 files changed, 54 insertions(+), 2 deletions(-)

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

graphics/darktable: version 2.0.5

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

graphics/darktable: do not build darktable-viewer

diff --git a/graphics/darktable/0001-do-not-build-darktable-viewer.patch
b/graphics/darktable/0001-do-not-build-darktable-viewer.patch
new file mode 100644
index 0000000..b634dfe
--- /dev/null
+++ b/graphics/darktable/0001-do-not-build-darktable-viewer.patch
@@ -0,0 +1,44 @@
+From 7a26b2751a34f485f18a4106e489f9e09415574e Mon Sep 17 00:00:00 2001
+From: Florian Franzmann <siflfran AT hawo.net>
+Date: Sun, 7 Aug 2016 15:28:58 +0200
+Subject: [PATCH] do not build darktable-viewer
+
+---
+ src/dtview/CMakeLists.txt | 24 ++++++++++++------------
+ 1 file changed, 12 insertions(+), 12 deletions(-)
+
+diff --git a/src/dtview/CMakeLists.txt b/src/dtview/CMakeLists.txt
+index d45bb0c..c220712 100644
+--- a/src/dtview/CMakeLists.txt
++++ b/src/dtview/CMakeLists.txt
+@@ -12,15 +12,15 @@ include_directories(SYSTEM ${SDL_INCLUDE_DIR})
+ include_directories(SYSTEM ${OPENGL_INCLUDE_DIR})
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/..)
+ include_directories(${CMAKE_CURRENT_BINARY_DIR}/..)
+-add_executable(darktable-viewer main.c)
+-
+-set_target_properties(darktable-viewer PROPERTIES
CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
+-set_target_properties(darktable-viewer PROPERTIES
CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+-if(APPLE)
+- set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
@loader_path/../${LIB_INSTALL}/darktable)
+-else(APPLE)
+- set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
$ORIGIN/../${LIB_INSTALL}/darktable)
+-endif(APPLE)
+-set_target_properties(darktable-viewer PROPERTIES LINKER_LANGUAGE C)
+-target_link_libraries(darktable-viewer lib_darktable ${SDL_LIBRARY}
${OPENGL_LIBRARIES})
+-install(TARGETS darktable-viewer DESTINATION bin)
++#add_executable(darktable-viewer main.c)
++#
++#set_target_properties(darktable-viewer PROPERTIES
CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
++#set_target_properties(darktable-viewer PROPERTIES
CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
++#if(APPLE)
++# set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
@loader_path/../${LIB_INSTALL}/darktable)
++#else(APPLE)
++# set_target_properties(darktable-viewer PROPERTIES INSTALL_RPATH
$ORIGIN/../${LIB_INSTALL}/darktable)
++#endif(APPLE)
++#set_target_properties(darktable-viewer PROPERTIES LINKER_LANGUAGE C)
++#target_link_libraries(darktable-viewer lib_darktable ${SDL_LIBRARY}
${OPENGL_LIBRARIES})
++#install(TARGETS darktable-viewer DESTINATION bin)
+--
+2.9.2
+
diff --git a/graphics/darktable/DETAILS b/graphics/darktable/DETAILS
index 25143d4..d7fa7a5 100755
--- a/graphics/darktable/DETAILS
+++ b/graphics/darktable/DETAILS
@@ -1,10 +1,10 @@
. "$GRIMOIRE/FUNCTIONS"
SPELL=darktable
if [[ "$DARKTABLE_BRANCH" == "stable" ]]; then
- VERSION=2.0.4
+ VERSION=2.0.5
SOURCE="${SPELL}-${VERSION}.tar.xz"

SOURCE_URL[0]=https://github.com/darktable-org/darktable/releases/download/release-${VERSION}/${SOURCE}
-
SOURCE_HASH=sha256:80e448622ff060bca1d64bf6151c27de34dea8fe6b7ddb708e1e3526a5961e62
+
SOURCE_HASH=sha256:898b71b94e7ef540eb1c87c829daadc8d8d025b1705d4a9471b1b9ed91b90a02
SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
else
VERSION=$(get_scm_version)
diff --git a/graphics/darktable/HISTORY b/graphics/darktable/HISTORY
index 532728c..ebf00b3 100644
--- a/graphics/darktable/HISTORY
+++ b/graphics/darktable/HISTORY
@@ -1,3 +1,8 @@
+2016-08-07 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, 0001-do-not-build-darktable-viewer.patch: don't install
+ darktable-view, fails to build
+ * DETAILS: version 2.0.5
+
2016-05-06 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DETAILS: version 2.0.4

diff --git a/graphics/darktable/PRE_BUILD b/graphics/darktable/PRE_BUILD
new file mode 100755
index 0000000..40f2d4c
--- /dev/null
+++ b/graphics/darktable/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd "$SOURCE_DIRECTORY" &&
+patch -p1 < "$SPELL_DIRECTORY/0001-do-not-build-darktable-viewer.patch"



  • [SM-Commit] GIT changes to master grimoire by Florian Franzmann (20a9ee1968c9fe61a0f35acc2323c700926601b4), Florian Franzmann, 08/07/2016

Archive powered by MHonArc 2.6.24.

Top of Page