GPUImage 0.1.6-p9

qdrvm · Jan 26, 2018 · c8d99cc · c8d99cc
1 parent 338ddde
commit c8d99cc
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 30 deletions.
diff --git a/cmake/configs/default.cmake b/cmake/configs/default.cmake
@@ -69,7 +69,7 @@ hunter_config(Expat VERSION 2.1.1)
 if(MSVC)
   hunter_config(getopt VERSION 1.0.0-p0)
 endif()
-hunter_config(GPUImage VERSION 0.1.6-p6)
+hunter_config(GPUImage VERSION 0.1.6-p9)
 hunter_config(GSL VERSION 2.1.0-p2)
 hunter_config(Igloo VERSION 1.1.1-hunter)
 hunter_config(intsizeof VERSION 2.0.1)

diff --git a/cmake/projects/GPUImage/hunter.cmake b/cmake/projects/GPUImage/hunter.cmake
@@ -17,19 +17,30 @@ hunter_add_version(
     URL
     "https://github.com/hunter-packages/GPUImage/archive/v0.1.6-p5.tar.gz"
     SHA1
-    69a287016c57ca02012faf973e2eabda4ec87123    
-	)
+    69a287016c57ca02012faf973e2eabda4ec87123
+)
 
-  hunter_add_version(
+hunter_add_version(
     PACKAGE_NAME
     GPUImage
     VERSION
     "0.1.6-p6"
     URL
     "https://github.com/headupinclouds/GPUImage/archive/v0.1.6-p6.tar.gz"
     SHA1
-	230f9f9ba0fe1cce96827ea0cfc944b6df05ec34
-	)
+    230f9f9ba0fe1cce96827ea0cfc944b6df05ec34
+)
+
+hunter_add_version(
+    PACKAGE_NAME
+    GPUImage
+    VERSION
+    "0.1.6-p9"
+    URL
+    "https://github.com/hunter-packages/GPUImage/archive/v0.1.6-p9.tar.gz"
+    SHA1
+    ab3b4785d5767031d545e65ebe12a0910b5ef6b2
+)
 
 hunter_cmake_args(
     GPUImage

diff --git a/docs/packages/pkg/GPUImage.rst b/docs/packages/pkg/GPUImage.rst
@@ -10,28 +10,10 @@ GPUImage
 ========
 
 -  `Official <https://github.com/BradLarson/GPUImage>`__
--  `Hunterized <https://github.com/hunter-packages/GPUImage/tree/hunter>`__
+-  `Hunterized <https://github.com/hunter-packages/GPUImage>`__
+-  `Example <https://github.com/ruslo/hunter/blob/master/examples/GPUImage/CMakeLists.txt>`__
 
-.. code-block:: cmake
-
-    hunter_add_package(GPUImage)
-    find_package(GPUImage CONFIG)
-
-    target_link_libraries(... PUBLIC GPUImage::gpuimage)
-
-Example
--------
-
-A self contained test application can be run in the hunterized GPUImage
-fork using the following `polly <https://github.com/ruslo/polly>`__
-build command (CMake build script):
-
-.. code-block:: bash
-
-    wget https://github.com/hunter-packages/GPUImage/archive/v0.1.6-p2.tar.gz
-    tar zxvf v0.1.6-p2.tar.gz
-    cd GPUImage/examples/iOS/CubeExample
-    build.py --toolchain ios-8-2 --verbose --jobs 8 --open
-
--  TODO: move to Travis CI config of `hunterized
-   repo <https://github.com/hunter-packages/GPUImage>`__
+.. literalinclude:: /../examples/GPUImage/CMakeLists.txt
+  :language: cmake
+  :start-after: # DOCUMENTATION_START {
+  :end-before: # DOCUMENTATION_END }
diff --git a/examples/GPUImage/CMakeLists.txt b/examples/GPUImage/CMakeLists.txt
@@ -0,0 +1,19 @@
+# Copyright (c) 2016-2018, Ruslan Baratov
+# Copyright (c) 2018, David Hirvonen
+# All rights reserved.
+
+cmake_minimum_required(VERSION 3.0)
+
+# Emulate HunterGate:
+# * https://github.com/hunter-packages/gate
+include("../common.cmake")
+
+project(download-GPUImage)
+
+# DOCUMENTATION_START {
+hunter_add_package(GPUImage)
+find_package(GPUImage CONFIG REQUIRED)
+
+add_executable(foo foo.mm)
+target_link_libraries(foo PUBLIC GPUImage::gpuimage)
+# DOCUMENTATION_END }
diff --git a/examples/GPUImage/foo.mm b/examples/GPUImage/foo.mm
@@ -0,0 +1,5 @@
+#include <GPUImage/GPUImageGrayscaleFilter.h>
+
+int main() {
+    auto *filter = [[GPUImageGrayscaleFilter alloc] init];
+}