>From dde0c6928e0842063f95adea409a72279c9993e2 Mon Sep 17 00:00:00 2001
From: Martin Lambers <address@hidden>
Date: Wed, 7 Jan 2015 19:51:34 +0100
Subject: [PATCH 8/9] pfstools: update to 2.0.0, add test program.

The update requires a move from autoconf to cmake.
---
 src/pfstools-test.cpp | 20 ++++++++++++++++++++
 src/pfstools.mk       | 45 ++++++++++++++++++++++++++-------------------
 2 files changed, 46 insertions(+), 19 deletions(-)
 create mode 100644 src/pfstools-test.cpp

diff --git a/src/pfstools-test.cpp b/src/pfstools-test.cpp
new file mode 100644
index 0000000..d344923
--- /dev/null
+++ b/src/pfstools-test.cpp
@@ -0,0 +1,20 @@
+/*
+ * This file is part of MXE.
+ * See index.html for further information.
+ */
+
+#include <pfs/pfs.h>
+
+int main(int argc, char *argv[])
+{
+    pfs::DOMIO pfsio;
+    pfs::Frame* frame;
+
+    (void)argc;
+    (void)argv;
+
+    frame = pfsio.createFrame(10, 10);
+    pfsio.freeFrame(frame);
+
+    return 0;
+}
diff --git a/src/pfstools.mk b/src/pfstools.mk
index 4fce369..e7483a3 100644
--- a/src/pfstools.mk
+++ b/src/pfstools.mk
@@ -3,10 +3,10 @@
 
 PKG             := pfstools
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 1.9.1
-$(PKG)_CHECKSUM := d89ca4ea501ba9569b36ce9497aff1194e93ebee
+$(PKG)_VERSION  := 2.0.0
+$(PKG)_CHECKSUM := 1501b58d0014a9e92e6e2b7b8829b3f015204b29
 $(PKG)_SUBDIR   := $(PKG)-$($(PKG)_VERSION)
-$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tar.gz
+$(PKG)_FILE     := $(PKG)-$($(PKG)_VERSION).tgz
 $(PKG)_URL      := http://$(SOURCEFORGE_MIRROR)/project/$(PKG)/$(PKG)/$($(PKG)_VERSION)/$($(PKG)_FILE)
 $(PKG)_DEPS     := gcc
 
@@ -16,23 +16,30 @@ define $(PKG)_UPDATE
     head -1
 endef
 
+# Note: all the external dependencies are used for the tools, but we
+# only want the library so we don't need them.
 define $(PKG)_BUILD
-    cd '$(1)' && ./configure \
-        --host='$(TARGET)' \
-        --prefix='$(PREFIX)/$(TARGET)' \
-        --disable-shared \
-        --disable-netpbm \
-        --disable-openexr \
-        --disable-tiff \
-        --disable-qt \
-        --disable-jpeghdr \
-        --disable-imagemagick \
-        --disable-octave \
-        --disable-opengl \
-        --disable-matlab \
-        --disable-gdal
-    $(MAKE) -C '$(1)'/src/pfs -j '$(JOBS)'
-    $(MAKE) -C '$(1)'/src/pfs -j 1 install
+    mkdir '$(1).build'
+    cd '$(1).build' && cmake '$(1)' \
+        -DCMAKE_TOOLCHAIN_FILE='$(CMAKE_TOOLCHAIN_FILE)' \
+        -DPKG_CONFIG_EXECUTABLE='$(PREFIX)/bin/$(TARGET)-pkg-config' \
+        -DWITH_OpenEXR=false \
+        -DWITH_ImageMagick=false \
+        -DWITH_NetPBM=false \
+        -DWITH_TIFF=false \
+        -DWITH_QT=false \
+        -DWITH_pfsglview=false \
+        -DWITH_MATLAB=false \
+        -DWITH_Octave=false \
+        -DWITH_FFTW=false \
+        -DWITH_GSL=false \
+        -DWITH_OpenCV=false
+    $(MAKE) -C '$(1).build/src/pfs' -j '$(JOBS)' install VERBOSE=1
+
+    '$(TARGET)-g++' \
+        -Wall -Wextra -Werror \
+        '$(2).cpp' -o '$(PREFIX)/$(TARGET)/bin/test-pfstools.exe' \
+        `'$(TARGET)-pkg-config' pfs --cflags --libs`
 endef
 
 $(PKG)_BUILD_SHARED =
-- 
2.1.4