Fixes

3 files changed, 48 insertions, 8 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 868998151607..aa13f12a63c2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -8,6 +8,7 @@ pkgbase = luminancehdr-git
 	makedepends = git
 	makedepends = cmake
 	makedepends = boost
+	makedepends = eigen
 	makedepends = gtest
 	makedepends = qt5-tools
 	makedepends = patch
@@ -29,7 +30,9 @@ pkgbase = luminancehdr-git
 	conflicts = luminancehdr
 	options = !emptydirs
 	source = git+https://github.com/LuminanceHDR/LuminanceHDR.git
-	sha512sums = SKIP
+	source = cmake-build-type.patch
+	b2sums = SKIP
+	b2sums = d4b4002428819601978c3ed9e765594a4cf0e08d7ddb1d3b4193bc7af72dceb5fb6a2af2bd19a2bd94ce6d44cdc37a0b31397fb36d679d85283ba616a8ffb799
 
 pkgname = luminancehdr-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 1e1327822f3a..478a192eeee2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -12,28 +12,40 @@ url='http://qtpfsgui.sourceforge.net/'
 license=('GPL')
 depends=('exiv2' 'fftw' 'gsl' 'lcms2' 'libraw' 'openexr' 'qt5-webengine' 'qt5-svg'
          'qt5-webkit' 'ccfits' 'desktop-file-utils' 'hicolor-icon-theme' 'boost-libs')
-makedepends=('git' 'cmake' 'boost' 'gtest' 'qt5-tools' 'patch')
+makedepends=('git' 'cmake' 'boost' 'eigen' 'gtest' 'qt5-tools' 'patch')
 optdepends=('hugin: align image stack functionality')
 provides=('luminancehdr')
 conflicts=('luminancehdr')
 options=('!emptydirs')
-source=('git+https://github.com/LuminanceHDR/LuminanceHDR.git')
-sha512sums=('SKIP')
+source=('git+https://github.com/LuminanceHDR/LuminanceHDR.git'
+        'cmake-build-type.patch')
+b2sums=('SKIP'
+        'd4b4002428819601978c3ed9e765594a4cf0e08d7ddb1d3b4193bc7af72dceb5fb6a2af2bd19a2bd94ce6d44cdc37a0b31397fb36d679d85283ba616a8ffb799')
 
 pkgver() {
   cd "${srcdir}"/LuminanceHDR
   git describe --long | sed 's/^v\.//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-build() {
+prepare() {
   cd "${srcdir}"/LuminanceHDR
+  git apply -3 ../cmake-build-type.patch
+}
+
+build() {
+  mkdir -p build
+  cd build
 
-  cmake -DCMAKE_INSTALL_PREFIX=/usr
+  CFLAGS+=" -DNDEBUG"
+  CXXFLAGS+=" -DNDEBUG"
+  cmake \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=None \
+     "${srcdir}"/LuminanceHDR
   make
 }
 
 package() {
-  cd "${srcdir}"/LuminanceHDR
-
+  cd build
   make DESTDIR="${pkgdir}" install
 }
diff --git a/cmake-build-type.patch b/cmake-build-type.patch
new file mode 100644
index 000000000000..bd7b6cdb69cb
--- /dev/null
+++ b/cmake-build-type.patch
@@ -0,0 +1,25 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8ff498d0..50103111 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -5,18 +5,8 @@ CMAKE_POLICY(SET CMP0054 NEW)
+ CMAKE_POLICY(SET CMP0053 NEW)
+ PROJECT("Luminance HDR")
+ 
+-string(TOLOWER ${CMAKE_BUILD_TYPE} LOWERCASE_CMAKE_BUILD_TYPE)
+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(debug|release|relwithdebinfo|minsizerel)$")
+-    message(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+-else()
+-    message(FATAL_ERROR "Invalid value for CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}\n"
+-        "CMAKE_BUILD_TYPE should be one of:\nDebug, Release, RelWithDebInfo, MinSizeRel")
+-endif()
+-
+-if(LOWERCASE_CMAKE_BUILD_TYPE MATCHES "^(release|minsizerel)$")
+-    message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT")
+-    add_definitions("-DQT_NO_DEBUG_OUTPUT")
+-endif()
++message(STATUS "Adding definitions: -DQT_NO_DEBUG_OUTPUT")
++add_definitions("-DQT_NO_DEBUG_OUTPUT")
+ 
+ # assume built-in pthreads on MacOS
+ IF(APPLE)