This file is part of MXE.
See index.html for further information.

From fd1717af4dd33e3ea270ec97d7f7e5e3a61021da Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Thu, 3 Nov 2011 14:11:02 +0100
Subject: [PATCH 1/3] add pkg-config support for libtiff-4

Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd

diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
index 47a8437..bd2c6b0 100644
--- a/config.tests/libtiff/libtiff.pro
+++ b/config.tests/libtiff/libtiff.pro
@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
 win32:CONFIG += console
-unix|win32-g++*: LIBS += -ltiff
+CONFIG += link_pkgconfig
+packagesExist(libtiff-4):PKGCONFIG += libtiff-4
+else:if(unix|win32-g++*): LIBS += -ltiff
 else:win32: LIBS += libtiff.lib
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
index 353e3f3..fa22141 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp
 OTHER_FILES += tiff.json
 
 config_libtiff {
-    unix|win32-g++*: LIBS += -ltiff
+    CONFIG += link_pkgconfig
+    packagesExist(libtiff-4):PKGCONFIG += libtiff-4
+    else:if(unix|win32-g++*): LIBS += -ltiff
     else:win32: LIBS += libtiff.lib
 } else {
     include($$PWD/../../../3rdparty/libtiff.pri)
-- 
1.8.4


From a1846586160249a2debcbf113b679c9ea452b909 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Wed, 19 Dec 2012 23:29:52 +0100
Subject: [PATCH 2/3] add pkg-config support for libmng (mxe-specific)

Change-Id: I1216f35a01a974321efa2463b687c121baa22667

diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
index 7a45825..a20a0a0 100644
--- a/config.tests/libmng/libmng.pro
+++ b/config.tests/libmng/libmng.pro
@@ -2,5 +2,7 @@ SOURCES = libmng.cpp
 CONFIG -= qt dylib
 mac:CONFIG -= app_bundle
 win32:CONFIG += console
-unix|win32-g++*: LIBS += -lmng
+CONFIG += link_pkgconfig
+packagesExist(libmng):PKGCONFIG += libmng
+else:if(unix|win32-g++*): LIBS += -lmng
 else:win32: LIBS += libmng.lib
diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri
index cdf17c5..00cd0b3 100644
--- a/src/plugins/imageformats/mng/qmnghandler.pri
+++ b/src/plugins/imageformats/mng/qmnghandler.pri
@@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD
 HEADERS += $$PWD/qmnghandler_p.h
 SOURCES += $$PWD/qmnghandler.cpp
 config_libmng {
-    unix|win32-g++*: LIBS += -lmng
+    CONFIG += link_pkgconfig
+    packagesExist(libmng):PKGCONFIG += libmng
+    else:if(unix|win32-g++*): LIBS += -lmng
     else:win32: LIBS += libmng.lib
 } else {
     include($$PWD/../../../3rdparty/libmng.pri)
-- 
1.8.4


From 5c209558b3c4d82e59c8d5ef3cc263a8fd3bff01 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Sat, 17 Aug 2013 18:08:22 +0200
Subject: [PATCH 3/3] libmng 2 config.test compatibility

Change-Id: I62903256590faf1f1d3d07265b96a6597f912fc2

diff --git a/config.tests/libmng/libmng.cpp b/config.tests/libmng/libmng.cpp
index 9def33e..266dd71 100644
--- a/config.tests/libmng/libmng.cpp
+++ b/config.tests/libmng/libmng.cpp
@@ -46,9 +46,11 @@ int main(int, char **)
     mng_handle hMNG;
     mng_cleanup(&hMNG);
 
+#ifdef MNG_VERSION_MAJOR
 #if MNG_VERSION_MAJOR < 1 || (MNG_VERSION_MAJOR == 1 && MNG_VERSION_MINOR == 0 && MNG_VERSION_RELEASE < 9)
 #error System libmng version is less than 1.0.9; using built-in version instead.
 #endif
+#endif
 
     return 0;
 }
-- 
1.8.4