d0s3t3ch
/
mxe
mirror of https://git.wownero.com/dsc/mxe.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

qtimageformats: detect and use "system" libwebp

This commit is contained in:
Mark Brand 2018-11-16 10:40:23 +01:00
parent bd254b26f9
commit 611aafdb5a
1 changed files with 47 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/qtimageformats-1.patch
View File

@ -1,14 +1,13 @@
This file is part of MXE. See LICENSE.md for licensing information.
From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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/2] add pkg-config support for libtiff-4
Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4
Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd
diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
index f7ac4c1..bd2c6b0 100644
index 1111111..2222222 100644
--- a/config.tests/libtiff/libtiff.pro
+++ b/config.tests/libtiff/libtiff.pro
@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
@ -21,10 +20,10 @@ index f7ac4c1..bd2c6b0 100644
+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 0f841ab..fa22141 100644
index 1111111..2222222 100644
--- a/src/plugins/imageformats/tiff/tiff.pro
+++ b/src/plugins/imageformats/tiff/tiff.pro
@@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp
@@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp
OTHER_FILES += tiff.json
config_libtiff {
@ -35,19 +34,15 @@ index 0f841ab..fa22141 100644
else:win32: LIBS += libtiff.lib
} else {
include($$PWD/../../../3rdparty/libtiff.pri)
--
1.8.4.5
From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001
From 0000000000000000000000000000000000000000 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/2] add pkg-config support for libmng (mxe-specific)
Subject: [PATCH 2/3] [MXE] pkg-config support for libmng
Change-Id: I1216f35a01a974321efa2463b687c121baa22667
diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
index adc096e..a20a0a0 100644
index 1111111..2222222 100644
--- a/config.tests/libmng/libmng.pro
+++ b/config.tests/libmng/libmng.pro
@@ -2,5 +2,7 @@ SOURCES = libmng.cpp
@ -60,7 +55,7 @@ index adc096e..a20a0a0 100644
+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 5c0fff1..00cd0b3 100644
index 1111111..2222222 100644
--- a/src/plugins/imageformats/mng/qmnghandler.pri
+++ b/src/plugins/imageformats/mng/qmnghandler.pri
@@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD
@ -74,6 +69,42 @@ index 5c0fff1..00cd0b3 100644
else:win32: LIBS += libmng.lib
} else {
include($$PWD/../../../3rdparty/libmng.pri)
--
1.8.4.5
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Fri, 16 Nov 2018 10:13:11 +0100
Subject: [PATCH 3/3] [MXE] pkg-config support for libwebp
diff --git a/config.tests/libwebp/libwebp.pro b/config.tests/libwebp/libwebp.pro
index 1111111..2222222 100644
--- a/config.tests/libwebp/libwebp.pro
+++ b/config.tests/libwebp/libwebp.pro
@@ -2,5 +2,9 @@ SOURCES = libwebp.cpp
CONFIG -= qt dylib
mac:CONFIG -= app_bundle
win32:CONFIG += console
-unix|mingw: LIBS += -lwebp -lwebpdemux
+unix|mingw {
+ CONFIG += link_pkgconfig
+ packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
+ else: LIBS += -lwebp -lwebpdemux
+}
else:win32: LIBS += libwebp.lib libwebpdemux.lib
diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro
index 1111111..2222222 100644
--- a/src/plugins/imageformats/webp/webp.pro
+++ b/src/plugins/imageformats/webp/webp.pro
@@ -5,7 +5,11 @@ SOURCES += main.cpp qwebphandler.cpp
OTHER_FILES += webp.json
config_libwebp {
- unix|win32-g++*: LIBS += -lwebp -lwebpdemux
+ unix|mingw {
+ CONFIG += link_pkgconfig
+ packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
+ else: LIBS += -lwebp -lwebpdemux
+ }
else:win32: LIBS += libwebp.lib libwebpdemux.lib
} else {
include($$PWD/../../../3rdparty/libwebp.pri)