Mercurial > mxe-octave

comparison src/qtimageformats-1.patch @ 5099:9d35f8eb1e76

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qt5: update to 5.13.0 * src/qttools.mk, src/qtbase.mk, src/qtsvg.mk src/qtimageformats.mk: update checksum, version * src/qtbase-1-fixes.patch, src/qtimageformats-1.patch, src/qttools-1.patch: update patch
author John Donoghue
date Fri, 21 Jun 2019 14:28:30 -0400
parents 22937c7fe60d
children f0fb4aebfcd0
comparison
equal deleted inserted replaced
5098:80625be06cf4 5099:9d35f8eb1e76
1 This file is part of MXE. See LICENSE.md for licensing information. 1 This file is part of MXE. See LICENSE.md for licensing information.
2 From b3504d8f2ce90aeaf3c84ffb6716ee14d173de17 Mon Sep 17 00:00:00 2001
3 From: Joerg Bornemann <joerg.bornemann@qt.io>
4 Date: Tue, 7 May 2019 11:30:05 +0200
5 Subject: [PATCH 1/2] Fix feature and library checks for tiff and mng
2 6
3 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 7 This amends commit a33e3aea.
4 From: Mark Brand <mabrand@mabrand.nl>
5 Date: Thu, 3 Nov 2011 14:11:02 +0100
6 Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4
7 8
9 Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720
10 Reviewed-by: Liang Qi <liang.qi@qt.io>
11 (cherry picked from commit 626c3053efd7905080ac4a65fca55551391a36e3)
8 12
9 diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
10 index 1111111..2222222 100644
11 --- a/config.tests/libtiff/libtiff.pro
12 +++ b/config.tests/libtiff/libtiff.pro
13 @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
14 CONFIG -= qt dylib
15 mac:CONFIG -= app_bundle
16 win32:CONFIG += console
17 -unix|mingw: LIBS += -ltiff
18 +CONFIG += link_pkgconfig
19 +packagesExist(libtiff-4):PKGCONFIG += libtiff-4
20 +else:if(unix|win32-g++*): LIBS += -ltiff
21 else:win32: LIBS += libtiff.lib
22 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
23 index 1111111..2222222 100644
24 --- a/src/plugins/imageformats/tiff/tiff.pro
25 +++ b/src/plugins/imageformats/tiff/tiff.pro
26 @@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp
27 OTHER_FILES += tiff.json
28
29 config_libtiff {
30 - unix|mingw: LIBS += -ltiff
31 + CONFIG += link_pkgconfig
32 + packagesExist(libtiff-4):PKGCONFIG += libtiff-4
33 + else:if(unix|win32-g++*): LIBS += -ltiff
34 else:win32: LIBS += libtiff.lib
35 } else {
36 include($$PWD/../../../3rdparty/libtiff.pri)
37
38 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
39 From: Mark Brand <mabrand@mabrand.nl>
40 Date: Wed, 19 Dec 2012 23:29:52 +0100
41 Subject: [PATCH 2/3] [MXE] pkg-config support for libmng
42
43
44 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
45 index 1111111..2222222 100644
46 --- a/config.tests/libmng/libmng.pro
47 +++ b/config.tests/libmng/libmng.pro
48 @@ -2,5 +2,7 @@ SOURCES = libmng.cpp
49 CONFIG -= qt dylib
50 mac:CONFIG -= app_bundle
51 win32:CONFIG += console
52 -unix|mingw: LIBS += -lmng
53 +CONFIG += link_pkgconfig
54 +packagesExist(libmng):PKGCONFIG += libmng
55 +else:if(unix|win32-g++*): LIBS += -lmng
56 else:win32: LIBS += libmng.lib
57 diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro 13 diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
58 index 1111111..2222222 100644 14 index 4641110..f509fa8 100644
59 --- a/src/plugins/imageformats/mng/mng.pro 15 --- a/src/plugins/imageformats/mng/mng.pro
60 +++ b/src/plugins/imageformats/mng/mng.pro 16 +++ b/src/plugins/imageformats/mng/mng.pro
61 @@ -5,7 +5,10 @@ SOURCES += main.cpp \ 17 @@ -5,8 +5,10 @@ SOURCES += main.cpp \
62 qmnghandler.cpp 18 qmnghandler.cpp
63 OTHER_FILES += mng.json 19 OTHER_FILES += mng.json
64 20
65 -msvc: LIBS += libmng.lib 21 -msvc: LIBS += libmng.lib
66 +CONFIG += link_pkgconfig 22 -else: LIBS += -lmng
67 +packagesExist(libmng):PKGCONFIG += libmng 23 +include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
68 +else:if(unix|mingw): LIBS += -lmng 24 +QT_FOR_CONFIG += imageformats-private
69 +else:msvc: LIBS += libmng.lib 25 +
70 else: LIBS += -lmng 26 +QMAKE_USE_PRIVATE += mng
71 27
72 PLUGIN_TYPE = imageformats 28 PLUGIN_TYPE = imageformats
73 29 PLUGIN_CLASS_NAME = QMngPlugin
74 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 30 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
75 From: Mark Brand <mabrand@mabrand.nl> 31 index 04cfbdb..0c42749 100644
76 Date: Fri, 16 Nov 2018 10:13:11 +0100 32 --- a/src/plugins/imageformats/tiff/tiff.pro
77 Subject: [PATCH 3/3] [MXE] pkg-config support for libwebp 33 +++ b/src/plugins/imageformats/tiff/tiff.pro
34 @@ -4,9 +4,11 @@ HEADERS += qtiffhandler_p.h
35 SOURCES += main.cpp qtiffhandler.cpp
36 OTHER_FILES += tiff.json
37
38 -config_libtiff {
39 - unix|mingw: LIBS += -ltiff
40 - else:win32: LIBS += libtiff.lib
41 +include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
42 +QT_FOR_CONFIG += imageformats-private
43 +
44 +qtConfig(system-tiff) {
45 + QMAKE_USE_PRIVATE += tiff
46 } else {
47 include($$PWD/../../../3rdparty/libtiff.pri)
48 }
49 --
50 2.20.1
78 51
79 52
80 diff --git a/config.tests/libwebp/libwebp.pro b/config.tests/libwebp/libwebp.pro 53 From 9daaac5a219fb55628f0542e905d7157c2c68296 Mon Sep 17 00:00:00 2001
81 index 1111111..2222222 100644 54 From: Mark Brand <mabrand@mabrand.nl>
82 --- a/config.tests/libwebp/libwebp.pro 55 Date: Mon, 17 Jun 2019 13:54:23 +0200
83 +++ b/config.tests/libwebp/libwebp.pro 56 Subject: [PATCH 2/2] use pkgconfig
84 @@ -2,5 +2,9 @@ SOURCES = libwebp.cpp 57
85 CONFIG -= qt dylib 58
86 mac:CONFIG -= app_bundle 59 diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json
87 win32:CONFIG += console 60 index 03d59d3..0cd3715 100644
88 -unix|mingw: LIBS += -lwebp -lwebpdemux 61 --- a/src/imageformats/configure.json
89 +unix|mingw { 62 +++ b/src/imageformats/configure.json
90 + CONFIG += link_pkgconfig 63 @@ -51,9 +51,6 @@
91 + packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux 64 "stdio.h",
92 + else: LIBS += -lwebp -lwebpdemux 65 "libmng.h"
93 +} 66 ],
94 else:win32: LIBS += libwebp.lib libwebpdemux.lib 67 - "qmake": [
95 diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro 68 - "LIBS += -lmng"
96 index 1111111..2222222 100644 69 - ],
97 --- a/src/plugins/imageformats/webp/webp.pro 70 "main": [
98 +++ b/src/plugins/imageformats/webp/webp.pro 71 "mng_handle hMNG;",
99 @@ -5,7 +5,11 @@ SOURCES += main.cpp qwebphandler.cpp 72 "mng_cleanup(&hMNG);",
100 OTHER_FILES += webp.json 73 @@ -67,6 +64,7 @@
101 74 }
102 config_libwebp { 75 },
103 - unix|win32-g++*: LIBS += -lwebp -lwebpdemux 76 "sources": [
104 + unix|mingw { 77 + { "type": "pkgConfig", "args": "libmng" },
105 + CONFIG += link_pkgconfig 78 "-lmng"
106 + packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux 79 ]
107 + else: LIBS += -lwebp -lwebpdemux 80 },
108 + } 81 @@ -77,10 +75,6 @@
109 else:win32: LIBS += libwebp.lib libwebpdemux.lib 82 "type": "compile",
110 } else { 83 "test": {
111 include($$PWD/../../../3rdparty/libwebp.pri) 84 "include": "tiffio.h",
85 - "qmake": [
86 - "unix|mingw: LIBS += -ltiff",
87 - "else:win32: LIBS += libtiff.lib"
88 - ],
89 "main": [
90 "#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)",
91 "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG",
92 @@ -105,6 +99,7 @@
93 }
94 },
95 "sources": [
96 + { "type": "pkgConfig", "args": "libtiff-4" },
97 "-ltiff"
98 ]
99 },
100 @@ -119,9 +114,6 @@
101 "webp/encode.h",
102 "webp/demux.h"
103 ],
104 - "qmake": [
105 - "LIBS += -lwebp -lwebpdemux"
106 - ],
107 "main": [
108 "#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)",
109 "#error \"Incompatible libwebp version\"",
110 @@ -144,6 +136,7 @@
111 }
112 },
113 "sources": [
114 + { "type": "pkgConfig", "args": "libwebp libwebpdemux" },
115 "-lwebp -lwebpdemux"
116 ]
117 }
118 --
119 2.20.1
120