Fix build with Octave 6, don’t use CMAKE_BUILD_TYPE=Release

2 files changed, 14 insertions, 10 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 825bb820aacc..d372462ecc67 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = pfstools
 	pkgdesc = Set of command line programs for reading, writing and manipulating high-dynamic range (HDR) images
 	pkgver = 2.1.0
-	pkgrel = 5
+	pkgrel = 6
 	url = http://pfstools.sourceforge.net/
 	arch = i686
 	arch = x86_64
@@ -37,11 +37,13 @@ pkgbase = pfstools
 	conflicts = pfstmo
 	options = !libtool
 	source = http://downloads.sourceforge.net/pfstools/pfstools-2.1.0.tgz
+	source = https://sourceforge.net/p/pfstools/bugs/_discuss/thread/7209efcaac/18f1/attachment/pfstools-Fix-build-with-Octave-6.patch
 	source = opencv3.patch
 	source = force_imagemagick6.patch
-	sha256sums = 3dea4248e41bf433fe4760b0a11d138ad2d240f62db9e519bcb1d557c0593413
-	sha256sums = 2933635f5b5be07fcede7c90baaad533cbbb87aa0e8bb8add530652da595bad6
-	sha256sums = ab98716861280299d964496b3a3c35bb873d828060e353a4906efb465aba4674
+	b2sums = 11a40c189ca42554a6f341d47b8d4e03145126d5e2d78c702ad097afd190ecc3f789c3b2f3d206dff4b41a14790c80967d5ccaeccd3c5c3cdc1c26acea2e86e9
+	b2sums = 45a33ba5d3e983673f1aeb8bd8dd202502c1245e0ea6c1fa617848be158456de2f157b166e02cc7398c8a3cd3acb385b2dec6ceb693f8fd417d6f43621cbc093
+	b2sums = 8a77db5e6ca74c1833d2de299051d28b3c1614b7686d264950e91c8593a5f20da05b0069c2a7a538694d550d13554d0b8dff646a6bfa9b793ed42a9770b046b0
+	b2sums = f7874dbd47672278404085d372c44102a08b0e9ba69aaa0db625bb05cdd493fb6155ee02a76f2ff459797d5a74d326051c3a0979326ed8c36bd1fed5470f9c23
 
 pkgname = pfstools
 
diff --git a/PKGBUILD b/PKGBUILD
index 6b2301f63073..ad47b715f211 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 # Contributor: Mael Kerbiriou <mael.kerbiriouATfreeDOTfr>
 pkgname=pfstools
 pkgver=2.1.0
-pkgrel=5
+pkgrel=6
 pkgdesc="Set of command line programs for reading, writing and manipulating high-dynamic range (HDR) images"
 arch=('i686' 'x86_64')
 url="http://pfstools.sourceforge.net/"
@@ -29,16 +29,19 @@ makedepends=('cmake' 'qt5-base' 'octave'
              'freeglut' 'glu')
 options=(!libtool)
 source=("http://downloads.sourceforge.net/pfstools/$pkgname-$pkgver.tgz"
+        "https://sourceforge.net/p/pfstools/bugs/_discuss/thread/7209efcaac/18f1/attachment/pfstools-Fix-build-with-Octave-6.patch"
         "opencv3.patch" "force_imagemagick6.patch")
-sha256sums=('3dea4248e41bf433fe4760b0a11d138ad2d240f62db9e519bcb1d557c0593413'
-            '2933635f5b5be07fcede7c90baaad533cbbb87aa0e8bb8add530652da595bad6'
-            'ab98716861280299d964496b3a3c35bb873d828060e353a4906efb465aba4674')
+b2sums=('11a40c189ca42554a6f341d47b8d4e03145126d5e2d78c702ad097afd190ecc3f789c3b2f3d206dff4b41a14790c80967d5ccaeccd3c5c3cdc1c26acea2e86e9'
+        '45a33ba5d3e983673f1aeb8bd8dd202502c1245e0ea6c1fa617848be158456de2f157b166e02cc7398c8a3cd3acb385b2dec6ceb693f8fd417d6f43621cbc093'
+        '8a77db5e6ca74c1833d2de299051d28b3c1614b7686d264950e91c8593a5f20da05b0069c2a7a538694d550d13554d0b8dff646a6bfa9b793ed42a9770b046b0'
+        'f7874dbd47672278404085d372c44102a08b0e9ba69aaa0db625bb05cdd493fb6155ee02a76f2ff459797d5a74d326051c3a0979326ed8c36bd1fed5470f9c23')
 
 prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   patch -Np1 < "$srcdir/opencv3.patch"
   patch -Np1 < "$srcdir/force_imagemagick6.patch"
+  patch -Np1 < "$srcdir/pfstools-Fix-build-with-Octave-6.patch"
 }
 
 build() {
@@ -46,8 +49,7 @@ build() {
   cd "$srcdir/build"
 
   cmake "$srcdir/$pkgname-$pkgver" \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release
+    -DCMAKE_INSTALL_PREFIX=/usr
 
   make
 }