From 0db465cec2c12ea762b8b756ab92515c466db01b Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Wed, 4 Jan 2017 14:30:23 +0100
Subject: [PATCH 1/9] updated zlib port to version 1.2.10

---
 ports/zlib/CONTROL        | 2 +-
 ports/zlib/portfile.cmake | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/ports/zlib/CONTROL b/ports/zlib/CONTROL
index 482873480..b12fe9e67 100644
--- a/ports/zlib/CONTROL
+++ b/ports/zlib/CONTROL
@@ -1,3 +1,3 @@
 Source: zlib
-Version: 1.2.8
+Version: 1.2.10
 Description: A compression library
\ No newline at end of file
diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index ef891f685..c49f35a00 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -1,9 +1,9 @@
 include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.8)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.10)
 vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "http://zlib.net/zlib128.zip"
-    FILENAME "zlib128.zip"
-    SHA512 b0d7e71eca9032910c56fc1de6adbdc4f915bdeafd9a114591fc05701893004ef3363add8ad0e576c956b6be158f2fc339ab393f2dd40e8cc8c2885d641d807b
+    URLS "http://zlib.net/zlib1210.zip"
+    FILENAME "zlib1210.zip"
+    SHA512 e1f0ffaa1d6d9c322d6fd30dc8fba202272205943b719e5d6525323e6773b4fcdd82885928c3f59b4bf7ca55babda9f379e174632bf3b25dc9067adb89f58409
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})
 

From f8210aa32b5029b7b04742b949311f12336141b0 Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Wed, 4 Jan 2017 15:17:22 +0100
Subject: [PATCH 2/9] [zlib] fixed wrong FILENAME

---
 ports/zlib/portfile.cmake | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/zlib/portfile.cmake b/ports/zlib/portfile.cmake
index 6deff6c0c..81d54fb4b 100644
--- a/ports/zlib/portfile.cmake
+++ b/ports/zlib/portfile.cmake
@@ -2,7 +2,7 @@ include(vcpkg_common_functions)
 set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/zlib-1.2.10)
 vcpkg_download_distfile(ARCHIVE_FILE
     URLS "http://www.zlib.net/zlib-1.2.10.tar.gz"
-    FILENAME "zlib1210.zip"
+    FILENAME "zlib1210.tar.gz"
     SHA512 5fa71052a418a0f2b345fce28af9941bbd1c6ee276ce506ab3092157f15776ee41f96bb1799657227513b852913f96ac52dae8122a437f34b43933ee48d63ee0
 )
 vcpkg_extract_source_archive(${ARCHIVE_FILE})

From 29aedfad6cd82cc2c071dc99fa5d6aac74af8d49 Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Thu, 5 Jan 2017 16:42:52 +0100
Subject: [PATCH 3/9] added first version of SDL2_image library which currently
 does not link to any external libraries.

---
 ports/sdl2-image/CMakeLists.txt               | 44 +++++++++++++++++++
 ports/sdl2-image/CONTROL                      |  3 ++
 .../sdl2-image/correct-sdl-headers-dir.patch  | 25 +++++++++++
 ports/sdl2-image/portfile.cmake               | 36 +++++++++++++++
 4 files changed, 108 insertions(+)
 create mode 100644 ports/sdl2-image/CMakeLists.txt
 create mode 100644 ports/sdl2-image/CONTROL
 create mode 100644 ports/sdl2-image/correct-sdl-headers-dir.patch
 create mode 100644 ports/sdl2-image/portfile.cmake

diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt
new file mode 100644
index 000000000..3167294d3
--- /dev/null
+++ b/ports/sdl2-image/CMakeLists.txt
@@ -0,0 +1,44 @@
+cmake_minimum_required(VERSION 2.6)
+project(SDL2_image)
+
+find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
+find_library(SDL_LIBRARY SDL2)
+
+include_directories(${SDL_INCLUDE_DIR})
+include_directories(${SDL_INCLUDE_DIR}/SDL2)
+include_directories(${CMAKE_SOURCE_DIR})
+
+#add_definitions(-DNOCONTROLS -DTHREADED_AUDIO)
+
+# some c++ code just assumes memset is available
+
+add_library(SDL2_image
+    IMG.c
+	IMG_bmp.c
+	IMG_gif.c
+	IMG_jpg.c
+	IMG_lbm.c
+	IMG_pcx.c
+	IMG_png.c
+	IMG_pnm.c
+	IMG_tga.c
+	IMG_tif.c
+	IMG_webp.c
+	IMG_xcf.c
+	IMG_xpm.c
+	IMG_xv.c
+	IMG_xxx.c
+	)
+
+target_link_libraries(SDL2_image ${SDL_LIBRARY})
+
+install(TARGETS SDL2_image
+    RUNTIME DESTINATION bin
+    ARCHIVE DESTINATION lib
+    LIBRARY DESTINATION lib)
+
+install(FILES SDL_image.h DESTINATION include CONFIGURATIONS Release)
+
+
+message(STATUS "Link-time dependencies:")
+message(STATUS "  " ${SDL_LIBRARY})
diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL
new file mode 100644
index 000000000..591550cdc
--- /dev/null
+++ b/ports/sdl2-image/CONTROL
@@ -0,0 +1,3 @@
+Source: sdl2-image
+Version:
+Description:
diff --git a/ports/sdl2-image/correct-sdl-headers-dir.patch b/ports/sdl2-image/correct-sdl-headers-dir.patch
new file mode 100644
index 000000000..4addc155d
--- /dev/null
+++ b/ports/sdl2-image/correct-sdl-headers-dir.patch
@@ -0,0 +1,25 @@
+diff --git "a/SDL_image.h" "b/SDL_image.h"
+index f654483..1bd4f62 100644
+--- "a/SDL_image.h"
++++ "b/SDL_image.h"
+@@ -24,9 +24,9 @@
+ #ifndef _SDL_IMAGE_H
+ #define _SDL_IMAGE_H
+ 
+-#include "SDL.h"
+-#include "SDL_version.h"
+-#include "begin_code.h"
++#include <SDL2/SDL.h>
++#include <SDL2/SDL_version.h>
++#include <SDL2/begin_code.h>
+ 
+ /* Set up for C function definitions, even when using C++ */
+ #ifdef __cplusplus
+@@ -140,6 +140,6 @@ extern DECLSPEC int SDLCALL IMG_SavePNG_RW(SDL_Surface *surface, SDL_RWops *dst,
+ #ifdef __cplusplus
+ }
+ #endif
+-#include "close_code.h"
++#include <SDL2/close_code.h>
+ 
+ #endif /* _SDL_IMAGE_H */
diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake
new file mode 100644
index 000000000..f70d237c2
--- /dev/null
+++ b/ports/sdl2-image/portfile.cmake
@@ -0,0 +1,36 @@
+# Common Ambient Variables:
+#   VCPKG_ROOT_DIR = <C:\path\to\current\vcpkg>
+#   TARGET_TRIPLET is the current triplet (x86-windows, etc)
+#   PORT is the current port name (zlib, etc)
+#   CURRENT_BUILDTREES_DIR = ${VCPKG_ROOT_DIR}\buildtrees\${PORT}
+#   CURRENT_PACKAGES_DIR  = ${VCPKG_ROOT_DIR}\packages\${PORT}_${TARGET_TRIPLET}
+#
+
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/SDL2_image-2.0.1)
+vcpkg_download_distfile(ARCHIVE
+    URLS "https://www.libsdl.org/projects/SDL_image/release/SDL2_image-2.0.1.zip"
+    FILENAME "SDL2_image-2.0.1.zip"
+    SHA512 37d12f4fae71c586bec73262bddb9207ab2f9a2ca6001d2cbfde646e268a950ba5cd4cff53d75e2da8959ae6da6e9cadc6eca88fa7bd9aa2758395d64c84a307
+)
+vcpkg_extract_source_archive(${ARCHIVE})
+
+vcpkg_apply_patches(
+    SOURCE_PATH ${SOURCE_PATH}
+    PATCHES 
+        ${CMAKE_CURRENT_LIST_DIR}/correct-sdl-headers-dir.patch)
+
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+
+vcpkg_configure_cmake(
+    SOURCE_PATH ${SOURCE_PATH}
+    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+    # OPTIONS_RELEASE -DOPTIMIZE=1
+    # OPTIONS_DEBUG -DDEBUGGABLE=1
+)
+
+vcpkg_install_cmake()
+
+# Handle copyright
+file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-image)
+file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-image/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-image/copyright)

From d62dda3b030e31f322aaa47b4aeaa0a12fa3201b Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Thu, 5 Jan 2017 16:48:04 +0100
Subject: [PATCH 4/9] forces CMake use zlib version which is installed by
 vcpkg.

---
 ports/libpng/portfile.cmake      |  6 +++++-
 ports/libpng/set_zlib_root.patch | 12 ++++++++++++
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 ports/libpng/set_zlib_root.patch

diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index f7be6cca1..55cbb4bda 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -9,7 +9,9 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch"
+    PATCHES 
+		"${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch"
+		"${CMAKE_CURRENT_LIST_DIR}/set_zlib_root.patch"
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -19,6 +21,7 @@ else()
     set(PNG_STATIC_LIBS ON)
     set(PNG_SHARED_LIBS OFF)
 endif()
+#message(STATUS ${CURRENT_INSTALL_DIR})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -29,6 +32,7 @@ vcpkg_configure_cmake(
         -DSKIP_INSTALL_PROGRAMS=ON
         -DSKIP_INSTALL_EXECUTABLES=ON
         -DSKIP_INSTALL_FILES=ON
+		-DINSTALLED_DIR:PATH=${CURRENT_INSTALLED_DIR}
     OPTIONS_DEBUG
         -DSKIP_INSTALL_HEADERS=ON
 )
diff --git a/ports/libpng/set_zlib_root.patch b/ports/libpng/set_zlib_root.patch
new file mode 100644
index 000000000..8fb029635
--- /dev/null
+++ b/ports/libpng/set_zlib_root.patch
@@ -0,0 +1,12 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 186b65a..e485fd9 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -40,6 +40,7 @@ set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
+ set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
+ 
+ # needed packages
++set(ZLIB_ROOT ${INSTALLED_DIR})
+ find_package(ZLIB REQUIRED)
+ include_directories(${ZLIB_INCLUDE_DIR})
+ 

From 44c86f56db351da15e5a2b2fcca62656ab8cccbf Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Thu, 5 Jan 2017 19:39:14 +0100
Subject: [PATCH 5/9] Revert "forces CMake use zlib version which is installed
 by vcpkg."

This reverts commit d62dda3b030e31f322aaa47b4aeaa0a12fa3201b.
---
 ports/libpng/portfile.cmake      |  6 +-----
 ports/libpng/set_zlib_root.patch | 12 ------------
 2 files changed, 1 insertion(+), 17 deletions(-)
 delete mode 100644 ports/libpng/set_zlib_root.patch

diff --git a/ports/libpng/portfile.cmake b/ports/libpng/portfile.cmake
index 55cbb4bda..f7be6cca1 100644
--- a/ports/libpng/portfile.cmake
+++ b/ports/libpng/portfile.cmake
@@ -9,9 +9,7 @@ vcpkg_download_distfile(ARCHIVE
 vcpkg_extract_source_archive(${ARCHIVE})
 vcpkg_apply_patches(
     SOURCE_PATH ${SOURCE_PATH}
-    PATCHES 
-		"${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch"
-		"${CMAKE_CURRENT_LIST_DIR}/set_zlib_root.patch"
+    PATCHES "${CMAKE_CURRENT_LIST_DIR}/use-abort-on-all-platforms.patch"
 )
 
 if(VCPKG_LIBRARY_LINKAGE STREQUAL dynamic)
@@ -21,7 +19,6 @@ else()
     set(PNG_STATIC_LIBS ON)
     set(PNG_SHARED_LIBS OFF)
 endif()
-#message(STATUS ${CURRENT_INSTALL_DIR})
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
@@ -32,7 +29,6 @@ vcpkg_configure_cmake(
         -DSKIP_INSTALL_PROGRAMS=ON
         -DSKIP_INSTALL_EXECUTABLES=ON
         -DSKIP_INSTALL_FILES=ON
-		-DINSTALLED_DIR:PATH=${CURRENT_INSTALLED_DIR}
     OPTIONS_DEBUG
         -DSKIP_INSTALL_HEADERS=ON
 )
diff --git a/ports/libpng/set_zlib_root.patch b/ports/libpng/set_zlib_root.patch
deleted file mode 100644
index 8fb029635..000000000
--- a/ports/libpng/set_zlib_root.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 186b65a..e485fd9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,6 +40,7 @@ set(PNGLIB_NAME libpng${PNGLIB_MAJOR}${PNGLIB_MINOR})
- set(PNGLIB_VERSION ${PNGLIB_MAJOR}.${PNGLIB_MINOR}.${PNGLIB_RELEASE})
- 
- # needed packages
-+set(ZLIB_ROOT ${INSTALLED_DIR})
- find_package(ZLIB REQUIRED)
- include_directories(${ZLIB_INCLUDE_DIR})
- 

From 37a5504855a83e24eb06ca1b5dd16b3dabd68313 Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Fri, 6 Jan 2017 19:08:31 +0100
Subject: [PATCH 6/9] finished port of sdl2_image  - optional dependencies
 which are installed in vcpkg are automatically linked  - unavailable
 dependencies are marked as dynamically linked and dlls have to be copied
 manually if respective file formats are used

---
 ports/sdl2-image/CMakeLists.txt | 81 +++++++++++++++++++++++++++++----
 ports/sdl2-image/CONTROL        |  6 ++-
 ports/sdl2-image/FindWEBP.cmake | 51 +++++++++++++++++++++
 ports/sdl2-image/portfile.cmake |  5 +-
 4 files changed, 132 insertions(+), 11 deletions(-)
 create mode 100644 ports/sdl2-image/FindWEBP.cmake

diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt
index 3167294d3..a77662c0e 100644
--- a/ports/sdl2-image/CMakeLists.txt
+++ b/ports/sdl2-image/CMakeLists.txt
@@ -1,16 +1,29 @@
 cmake_minimum_required(VERSION 2.6)
 project(SDL2_image)
 
-find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
-find_library(SDL_LIBRARY SDL2)
+### configuration ###
 
-include_directories(${SDL_INCLUDE_DIR})
-include_directories(${SDL_INCLUDE_DIR}/SDL2)
-include_directories(${CMAKE_SOURCE_DIR})
+list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}/cmake")
+# enable all file formats which are supported natively
+set(SUPPORTED_FORMATS BMP GIF LBM PCX PNM TGA XPM XCF XV)
 
-#add_definitions(-DNOCONTROLS -DTHREADED_AUDIO)
+# enable all file formats which are supported through external dependencies
+# first try to load them statically (lib file in vcpkg installation)
+# if this fails try to make them a dynamic dependency (dll will be loaded at runtime) if possible. vcpkg cannot resolve these dependencies!
+# else do not support this file format at all
+set(DEPENDENCIES PNG JPEG TIFF WEBP)
 
-# some c++ code just assumes memset is available
+# patch library names for preprocessor flags
+set(JPEG_FLAG JPG)
+set(TIFF_FLAG TIF)
+
+# names of potentially dynamically loaded libraries
+set(JPEG_DYNAMIC \"libjpeg-9.dll\")
+set(PNG_DYNAMIC \"libpng16-16.dll\")
+set(TIFF_DYNAMIC \"libtiff-5.dll\")
+set(WEBP_DYNAMIC \"libwebp-4.dll\")
+
+### implementation ###
 
 add_library(SDL2_image
     IMG.c
@@ -30,15 +43,67 @@ add_library(SDL2_image
 	IMG_xxx.c
 	)
 
+foreach(FORMAT ${SUPPORTED_FORMATS})
+	add_definitions(-DLOAD_${FORMAT})
+endforeach(FORMAT)
+
+# SDL
+find_path(SDL_INCLUDE_DIR SDL2/SDL.h)
+find_library(SDL_LIBRARY SDL2)
+
+include_directories(${SDL_INCLUDE_DIR})
+include_directories(${SDL_INCLUDE_DIR}/SDL2)
+include_directories(${CMAKE_SOURCE_DIR})
+
 target_link_libraries(SDL2_image ${SDL_LIBRARY})
 
+# external dependencies
+foreach(DEPENDENCY ${DEPENDENCIES})
+	find_package(${DEPENDENCY})
+	
+	if(NOT DEFINED ${DEPENDENCY}_FLAG)
+		set(${DEPENDENCY}_FLAG ${DEPENDENCY})
+	endif()
+	
+	add_definitions(-DLOAD_${${DEPENDENCY}_FLAG})
+	if(${DEPENDENCY}_FOUND)
+		message(STATUS "  --> linking statically.")
+		target_link_libraries(SDL2_image ${${DEPENDENCY}_LIBRARIES})
+	elseif(DEFINED ${DEPENDENCY}_DYNAMIC)
+		message(STATUS "  --> linking dynamically.")
+		add_definitions(-DLOAD_${${DEPENDENCY}_FLAG}_DYNAMIC=${${DEPENDENCY}_DYNAMIC})
+		set(RUNTIME_DEPENDENCIES ON)
+	else()
+		message(STATUS "  --> skipping.")
+	endif()
+endforeach(DEPENDENCY)
+
+if(DEFINED RUNTIME_DEPENDENCIES)
+	include_directories(VisualC/external/include)
+endif()
+
+
 install(TARGETS SDL2_image
     RUNTIME DESTINATION bin
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
-install(FILES SDL_image.h DESTINATION include CONFIGURATIONS Release)
+install(FILES SDL_image.h DESTINATION include/SDL2_image CONFIGURATIONS Release)
 
 
 message(STATUS "Link-time dependencies:")
 message(STATUS "  " ${SDL_LIBRARY})
+foreach(DEPENDENCY ${DEPENDENCIES})
+	if(${DEPENDENCY}_FOUND)
+		message(STATUS "  " ${DEPENDENCY})
+	endif()
+endforeach(DEPENDENCY)
+
+if(DEFINED RUNTIME_DEPENDENCIES)
+	message(STATUS "Run-time dependencies:")
+	foreach(DEPENDENCY ${DEPENDENCIES})
+		if(NOT ${DEPENDENCY}_FOUND AND DEFINED ${DEPENDENCY}_DYNAMIC)
+			message(STATUS "  " ${${DEPENDENCY}_DYNAMIC})
+		endif()
+	endforeach(DEPENDENCY)
+endif()
\ No newline at end of file
diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL
index 591550cdc..f9785ba22 100644
--- a/ports/sdl2-image/CONTROL
+++ b/ports/sdl2-image/CONTROL
@@ -1,3 +1,5 @@
 Source: sdl2-image
-Version:
-Description:
+Version: 2.0.1
+Build-Depends: sdl2
+Description: SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV
+
diff --git a/ports/sdl2-image/FindWEBP.cmake b/ports/sdl2-image/FindWEBP.cmake
new file mode 100644
index 000000000..ddabe71fe
--- /dev/null
+++ b/ports/sdl2-image/FindWEBP.cmake
@@ -0,0 +1,51 @@
+# - Try to find WebP.
+# Once done, this will define
+#
+#  WEBP_FOUND - system has WebP.
+#  WEBP_INCLUDE_DIRS - the WebP. include directories
+#  WEBP_LIBRARIES - link these to use WebP.
+#
+# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
+# Copyright (C) 2013 Igalia S.L.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1.  Redistributions of source code must retain the above copyright
+#     notice, this list of conditions and the following disclaimer.
+# 2.  Redistributions in binary form must reproduce the above copyright
+#     notice, this list of conditions and the following disclaimer in the
+#     documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
+# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+find_package(PkgConfig)
+pkg_check_modules(PC_WEBP QUIET libwebp)
+
+# Look for the header file.
+find_path(WEBP_INCLUDE_DIRS
+    NAMES webp/decode.h
+    HINTS ${PC_WEBP_INCLUDEDIR} ${PC_WEBP_INCLUDE_DIRS}
+)
+mark_as_advanced(WEBP_INCLUDE_DIRS)
+
+# Look for the library.
+find_library(
+    WEBP_LIBRARIES
+    NAMES webp
+    HINTS ${PC_WEBP_LIBDIR} ${PC_WEBP_LIBRARY_DIRS}
+)
+mark_as_advanced(WEBP_LIBRARIES)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES)
\ No newline at end of file
diff --git a/ports/sdl2-image/portfile.cmake b/ports/sdl2-image/portfile.cmake
index f70d237c2..4cc6ce74a 100644
--- a/ports/sdl2-image/portfile.cmake
+++ b/ports/sdl2-image/portfile.cmake
@@ -21,10 +21,11 @@ vcpkg_apply_patches(
         ${CMAKE_CURRENT_LIST_DIR}/correct-sdl-headers-dir.patch)
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
+file(COPY ${CMAKE_CURRENT_LIST_DIR}/FindWEBP.cmake DESTINATION ${SOURCE_PATH}/cmake)
 
 vcpkg_configure_cmake(
     SOURCE_PATH ${SOURCE_PATH}
-    # OPTIONS -DUSE_THIS_IN_ALL_BUILDS=1 -DUSE_THIS_TOO=2
+    # OPTIONS
     # OPTIONS_RELEASE -DOPTIMIZE=1
     # OPTIONS_DEBUG -DDEBUGGABLE=1
 )
@@ -34,3 +35,5 @@ vcpkg_install_cmake()
 # Handle copyright
 file(COPY ${SOURCE_PATH}/COPYING.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/sdl2-image)
 file(RENAME ${CURRENT_PACKAGES_DIR}/share/sdl2-image/COPYING.txt ${CURRENT_PACKAGES_DIR}/share/sdl2-image/copyright)
+
+vcpkg_copy_pdbs()
\ No newline at end of file

From 937c4e26b074d7ddb603e16186e4efe271e8c230 Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Fri, 6 Jan 2017 22:05:22 +0100
Subject: [PATCH 7/9] fixed findWEBP.cmake to select debug version of webp for
 debug builds.

---
 ports/sdl2-image/FindWEBP.cmake | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/ports/sdl2-image/FindWEBP.cmake b/ports/sdl2-image/FindWEBP.cmake
index ddabe71fe..a74814026 100644
--- a/ports/sdl2-image/FindWEBP.cmake
+++ b/ports/sdl2-image/FindWEBP.cmake
@@ -7,6 +7,7 @@
 #
 # Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
 # Copyright (C) 2013 Igalia S.L.
+# Copyright (C) 2017 Patrick Bader
 #
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
@@ -39,12 +40,16 @@ find_path(WEBP_INCLUDE_DIRS
 )
 mark_as_advanced(WEBP_INCLUDE_DIRS)
 
+if(CMAKE_BUILD_TYPE MATCHES DEBUG)
+    message("debug mode")
+endif(CMAKE_BUILD_TYPE MATCHES DEBUG)
+
 # Look for the library.
-find_library(
-    WEBP_LIBRARIES
-    NAMES webp
-    HINTS ${PC_WEBP_LIBDIR} ${PC_WEBP_LIBRARY_DIRS}
-)
+find_library(WEBP_LIBRARY_RELEASE NAMES webp HINTS ${PC_WEBP_LIBDIR} ${PC_WEBP_LIBRARY_DIRS})
+find_library(WEBP_LIBRARY_DEBUG NAMES webpd HINTS ${PC_WEBP_LIBDIR} ${PC_WEBP_LIBRARY_DIRS})
+
+select_library_configurations(WEBP)
+
 mark_as_advanced(WEBP_LIBRARIES)
 
 include(FindPackageHandleStandardArgs)

From 2bb72e6637ab016a1fa8625b0a673d5ecd74ae4f Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Fri, 6 Jan 2017 23:20:57 +0100
Subject: [PATCH 8/9] [sdl2-image] added dependencies to CONTROL so they will
 always be statically linked Replaced FindWEBP.cmake with version from
 freeimage port

---
 ports/sdl2-image/CONTROL        |  2 +-
 ports/sdl2-image/FindWEBP.cmake | 56 +++++++--------------------------
 2 files changed, 13 insertions(+), 45 deletions(-)

diff --git a/ports/sdl2-image/CONTROL b/ports/sdl2-image/CONTROL
index f9785ba22..04c9f77bb 100644
--- a/ports/sdl2-image/CONTROL
+++ b/ports/sdl2-image/CONTROL
@@ -1,5 +1,5 @@
 Source: sdl2-image
 Version: 2.0.1
-Build-Depends: sdl2
+Build-Depends: sdl2, libpng, libjpeg-turbo, tiff, libwebp
 Description: SDL_image is an image file loading library. It loads images as SDL surfaces and textures, and supports the following formats: BMP, GIF, JPEG, LBM, PCX, PNG, PNM, TGA, TIFF, WEBP, XCF, XPM, XV
 
diff --git a/ports/sdl2-image/FindWEBP.cmake b/ports/sdl2-image/FindWEBP.cmake
index a74814026..fb3f9caa1 100644
--- a/ports/sdl2-image/FindWEBP.cmake
+++ b/ports/sdl2-image/FindWEBP.cmake
@@ -1,56 +1,24 @@
-# - Try to find WebP.
-# Once done, this will define
+# - Find WEBP
+# Find the WEBP library 
+# This module defines
+#  WEBP_INCLUDE_DIRS, where to find webp/decode.h
+#  WEBP_LIBRARIES, the libraries needed to use WEBP
 #
-#  WEBP_FOUND - system has WebP.
-#  WEBP_INCLUDE_DIRS - the WebP. include directories
-#  WEBP_LIBRARIES - link these to use WebP.
-#
-# Copyright (C) 2012 Raphael Kubo da Costa <rakuco@webkit.org>
-# Copyright (C) 2013 Igalia S.L.
-# Copyright (C) 2017 Patrick Bader
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1.  Redistributions of source code must retain the above copyright
-#     notice, this list of conditions and the following disclaimer.
-# 2.  Redistributions in binary form must reproduce the above copyright
-#     notice, this list of conditions and the following disclaimer in the
-#     documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND ITS CONTRIBUTORS ``AS
-# IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-# THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-# PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR ITS
-# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-# EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-# PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
-# OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-# WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
-# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
-# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-find_package(PkgConfig)
-pkg_check_modules(PC_WEBP QUIET libwebp)
-
-# Look for the header file.
 find_path(WEBP_INCLUDE_DIRS
     NAMES webp/decode.h
-    HINTS ${PC_WEBP_INCLUDEDIR} ${PC_WEBP_INCLUDE_DIRS}
 )
 mark_as_advanced(WEBP_INCLUDE_DIRS)
 
-if(CMAKE_BUILD_TYPE MATCHES DEBUG)
-    message("debug mode")
-endif(CMAKE_BUILD_TYPE MATCHES DEBUG)
-
-# Look for the library.
-find_library(WEBP_LIBRARY_RELEASE NAMES webp HINTS ${PC_WEBP_LIBDIR} ${PC_WEBP_LIBRARY_DIRS})
-find_library(WEBP_LIBRARY_DEBUG NAMES webpd HINTS ${PC_WEBP_LIBDIR} ${PC_WEBP_LIBRARY_DIRS})
+find_library(
+    WEBP_LIBRARIES
+    NAMES webp
+)
 
+find_library(WEBP_LIBRARY_RELEASE NAMES webp PATH_SUFFIXES lib)
+find_library(WEBP_LIBRARY_DEBUG NAMES webpd PATH_SUFFIXES lib)
+include(SelectLibraryConfigurations)
 select_library_configurations(WEBP)
 
-mark_as_advanced(WEBP_LIBRARIES)
-
 include(FindPackageHandleStandardArgs)
 FIND_PACKAGE_HANDLE_STANDARD_ARGS(WEBP DEFAULT_MSG WEBP_INCLUDE_DIRS WEBP_LIBRARIES)
\ No newline at end of file

From 07fb014193d725da008742d38dd94362de30afde Mon Sep 17 00:00:00 2001
From: Patrick Bader <mail@patrickbader.eu>
Date: Sat, 7 Jan 2017 11:51:07 +0100
Subject: [PATCH 9/9] [sdl2-image] changed include directory to SDL2 include
 directory

---
 ports/sdl2-image/CMakeLists.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ports/sdl2-image/CMakeLists.txt b/ports/sdl2-image/CMakeLists.txt
index a77662c0e..e742a408d 100644
--- a/ports/sdl2-image/CMakeLists.txt
+++ b/ports/sdl2-image/CMakeLists.txt
@@ -88,7 +88,7 @@ install(TARGETS SDL2_image
     ARCHIVE DESTINATION lib
     LIBRARY DESTINATION lib)
 
-install(FILES SDL_image.h DESTINATION include/SDL2_image CONFIGURATIONS Release)
+install(FILES SDL_image.h DESTINATION include/SDL2 CONFIGURATIONS Release)
 
 
 message(STATUS "Link-time dependencies:")