From 97215008c9ca8c33c93f4d7a6159c45dba0270de Mon Sep 17 00:00:00 2001
From: Jonathan Li <jonathan.li@hotmail.co.uk>
Date: Sun, 21 Feb 2016 10:50:55 +0000
Subject: [PATCH] ci|cmake|debian: Remove png++ build dependencies

GSdx now uses libpng directly. png++ is now unused, so let's remove it.
---
 cmake/SearchForStuff.cmake     | 1 -
 cmake/SelectPcsx2Plugins.cmake | 2 +-
 debian-packager/control        | 1 -
 plugins/GSdx/CMakeLists.txt    | 4 ----
 travis.sh                      | 5 -----
 5 files changed, 1 insertion(+), 12 deletions(-)

diff --git a/cmake/SearchForStuff.cmake b/cmake/SearchForStuff.cmake
index f33c5c1588..89b7f9875f 100644
--- a/cmake/SearchForStuff.cmake
+++ b/cmake/SearchForStuff.cmake
@@ -74,7 +74,6 @@ if(EGL_API)
 endif()
 check_lib(PORTAUDIO portaudio portaudio.h pa_linux_alsa.h)
 check_lib(SOUNDTOUCH SoundTouch soundtouch/SoundTouch.h)
-check_lib(PNGPP FALSE png++/png.hpp)
 
 if(SDL2_API)
     check_lib(SDL2 SDL2 SDL.h PATH_SUFFIXES SDL2)
diff --git a/cmake/SelectPcsx2Plugins.cmake b/cmake/SelectPcsx2Plugins.cmake
index 6ceb22aef6..5f1c3d7063 100644
--- a/cmake/SelectPcsx2Plugins.cmake
+++ b/cmake/SelectPcsx2Plugins.cmake
@@ -5,7 +5,7 @@ set(msg_dep_common_libs "check these libraries -> wxWidgets (>=2.8.10), aio")
 set(msg_dep_pcsx2       "check these libraries -> wxWidgets (>=2.8.10), gtk2 (>=2.16), zlib (>=1.2.4), pcsx2 common libs")
 set(msg_dep_cdvdiso     "check these libraries -> bzip2 (>=1.0.5), gtk2 (>=2.16)")
 set(msg_dep_zerogs      "check these libraries -> glew (>=1.6), opengl, X11, nvidia-cg-toolkit (>=2.1)")
-set(msg_dep_gsdx        "check these libraries -> opengl, png++, X11")
+set(msg_dep_gsdx        "check these libraries -> opengl, png (>=1.2), zlib (>=1.2.4), X11")
 set(msg_dep_onepad      "check these libraries -> sdl (>=1.2), X11, gtk2 (>=2.16)")
 set(msg_dep_spu2x       "check these libraries -> soundtouch (>=1.5), alsa, portaudio (>=1.9), sdl (>=1.2) pcsx2 common libs")
 set(msg_dep_zerospu2    "check these libraries -> soundtouch (>=1.5), alsa")
diff --git a/debian-packager/control b/debian-packager/control
index a38c91313e..dae209dd89 100644
--- a/debian-packager/control
+++ b/debian-packager/control
@@ -12,7 +12,6 @@ Build-Depends: cmake (>= 2.8.5),
     libglu1-mesa-dev,
     libgtk2.0-dev (>= 2.16),
     libpng12-dev,
-    libpng++-dev,
     libpulse-dev,
     libsdl2-dev,
     libsoundtouch-dev,
diff --git a/plugins/GSdx/CMakeLists.txt b/plugins/GSdx/CMakeLists.txt
index 55703500d0..7309ac7d9a 100644
--- a/plugins/GSdx/CMakeLists.txt
+++ b/plugins/GSdx/CMakeLists.txt
@@ -31,10 +31,6 @@ if(LIBLZMA_FOUND)
 	set(GSdxFinalFlags ${GSdxFinalFlags} -DLZMA_SUPPORTED)
 endif()
 
-if(PNGPP_FOUND)
-    set(GSdxFinalFlags ${GSdxFinalFlags} -DPNGPP_SUPPORTED)
-endif()
-
 #Clang doesn't support a few common flags that GCC does.
 if(NOT USE_CLANG)
     set(GSdxFinalFlags ${GSdxFinalFlags} -fabi-version=6)
diff --git a/travis.sh b/travis.sh
index 10c3fc3c2c..13ce7be72c 100755
--- a/travis.sh
+++ b/travis.sh
@@ -48,10 +48,6 @@ linux_32_before_install() {
 		portaudio19-dev:i386 \
 		zlib1g-dev:i386 \
 		${COMPILER_PACKAGE}
-
-	# libpng++-dev is noarch but doesn't install nicely.
-	apt-get download libpng++-dev
-	sudo dpkg --force-all -i $(ls | grep 'libpng++-dev')
 }
 
 linux_32_script() {
@@ -91,7 +87,6 @@ linux_64_before_install() {
 		libaio-dev \
 		libasound2-dev \
 		libgtk2.0-dev \
-		libpng++-dev \
 		libpng12-dev \
 		libsdl2-dev \
 		libsoundtouch-dev \