Mercurial > mxe-octave

comparison src/qtimageformats-1.patch @ 4900:22937c7fe60d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update QT5 5.12.0 * src/qtbase-1-fixes.patch: update patch * src/qtbase.mk: update version, checksum * src/qtimageformats-1.patch: update patch * src/qtimageformats.mk: update checksum * src/qtsvg.mk: update checksum * src/qttools.mk: update checksum
author John Donoghue
date Fri, 14 Dec 2018 08:25:27 -0500
parents 2c34ec679fb3
children 9d35f8eb1e76
comparison
equal deleted inserted replaced
4899:3a4b30ff1446 4900:22937c7fe60d
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 2
3 From 30f968c6f65c5668a9760ccfd48312b786ab318b Mon Sep 17 00:00:00 2001 3 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4 From: Mark Brand <mabrand@mabrand.nl> 4 From: Mark Brand <mabrand@mabrand.nl>
5 Date: Thu, 3 Nov 2011 14:11:02 +0100 5 Date: Thu, 3 Nov 2011 14:11:02 +0100
6 Subject: [PATCH 1/2] add pkg-config support for libtiff-4 6 Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4
7 7
8 Change-Id: I387517e04fed7729e5acf28bacdfc289fb2d17bd
9 8
10 diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro 9 diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
11 index f7ac4c1..bd2c6b0 100644 10 index 1111111..2222222 100644
12 --- a/config.tests/libtiff/libtiff.pro 11 --- a/config.tests/libtiff/libtiff.pro
13 +++ b/config.tests/libtiff/libtiff.pro 12 +++ b/config.tests/libtiff/libtiff.pro
14 @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp 13 @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
15 CONFIG -= qt dylib 14 CONFIG -= qt dylib
16 mac:CONFIG -= app_bundle 15 mac:CONFIG -= app_bundle
19 +CONFIG += link_pkgconfig 18 +CONFIG += link_pkgconfig
20 +packagesExist(libtiff-4):PKGCONFIG += libtiff-4 19 +packagesExist(libtiff-4):PKGCONFIG += libtiff-4
21 +else:if(unix|win32-g++*): LIBS += -ltiff 20 +else:if(unix|win32-g++*): LIBS += -ltiff
22 else:win32: LIBS += libtiff.lib 21 else:win32: LIBS += libtiff.lib
23 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro 22 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
24 index 0f841ab..fa22141 100644 23 index 1111111..2222222 100644
25 --- a/src/plugins/imageformats/tiff/tiff.pro 24 --- a/src/plugins/imageformats/tiff/tiff.pro
26 +++ b/src/plugins/imageformats/tiff/tiff.pro 25 +++ b/src/plugins/imageformats/tiff/tiff.pro
27 @@ -10,7 +10,9 @@ wince*: SOURCES += qfunctions_wince.cpp 26 @@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp
28 OTHER_FILES += tiff.json 27 OTHER_FILES += tiff.json
29 28
30 config_libtiff { 29 config_libtiff {
31 - unix|mingw: LIBS += -ltiff 30 - unix|mingw: LIBS += -ltiff
32 + CONFIG += link_pkgconfig 31 + CONFIG += link_pkgconfig
33 + packagesExist(libtiff-4):PKGCONFIG += libtiff-4 32 + packagesExist(libtiff-4):PKGCONFIG += libtiff-4
34 + else:if(unix|win32-g++*): LIBS += -ltiff 33 + else:if(unix|win32-g++*): LIBS += -ltiff
35 else:win32: LIBS += libtiff.lib 34 else:win32: LIBS += libtiff.lib
36 } else { 35 } else {
37 include($$PWD/../../../3rdparty/libtiff.pri) 36 include($$PWD/../../../3rdparty/libtiff.pri)
38 -- 37
39 1.8.4.5 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
40 42
41 43
42 From c791e0599f640cf637d5f925b111dbd7a5569244 Mon Sep 17 00:00:00 2001
43 From: Mark Brand <mabrand@mabrand.nl>
44 Date: Wed, 19 Dec 2012 23:29:52 +0100
45 Subject: [PATCH 2/2] add pkg-config support for libmng (mxe-specific)
46
47 Change-Id: I1216f35a01a974321efa2463b687c121baa22667
48
49 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro 44 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
50 index adc096e..a20a0a0 100644 45 index 1111111..2222222 100644
51 --- a/config.tests/libmng/libmng.pro 46 --- a/config.tests/libmng/libmng.pro
52 +++ b/config.tests/libmng/libmng.pro 47 +++ b/config.tests/libmng/libmng.pro
53 @@ -2,5 +2,7 @@ SOURCES = libmng.cpp 48 @@ -2,5 +2,7 @@ SOURCES = libmng.cpp
54 CONFIG -= qt dylib 49 CONFIG -= qt dylib
55 mac:CONFIG -= app_bundle 50 mac:CONFIG -= app_bundle
57 -unix|mingw: LIBS += -lmng 52 -unix|mingw: LIBS += -lmng
58 +CONFIG += link_pkgconfig 53 +CONFIG += link_pkgconfig
59 +packagesExist(libmng):PKGCONFIG += libmng 54 +packagesExist(libmng):PKGCONFIG += libmng
60 +else:if(unix|win32-g++*): LIBS += -lmng 55 +else:if(unix|win32-g++*): LIBS += -lmng
61 else:win32: LIBS += libmng.lib 56 else:win32: LIBS += libmng.lib
62 diff --git a/src/plugins/imageformats/mng/qmnghandler.pri b/src/plugins/imageformats/mng/qmnghandler.pri 57 diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
63 index 5c0fff1..00cd0b3 100644 58 index 1111111..2222222 100644
64 --- a/src/plugins/imageformats/mng/qmnghandler.pri 59 --- a/src/plugins/imageformats/mng/mng.pro
65 +++ b/src/plugins/imageformats/mng/qmnghandler.pri 60 +++ b/src/plugins/imageformats/mng/mng.pro
66 @@ -3,7 +3,9 @@ INCLUDEPATH *= $$PWD 61 @@ -5,7 +5,10 @@ SOURCES += main.cpp \
67 HEADERS += $$PWD/qmnghandler_p.h 62 qmnghandler.cpp
68 SOURCES += $$PWD/qmnghandler.cpp 63 OTHER_FILES += mng.json
69 config_libmng { 64
70 - unix|mingw: LIBS += -lmng 65 -msvc: LIBS += libmng.lib
66 +CONFIG += link_pkgconfig
67 +packagesExist(libmng):PKGCONFIG += libmng
68 +else:if(unix|mingw): LIBS += -lmng
69 +else:msvc: LIBS += libmng.lib
70 else: LIBS += -lmng
71
72 PLUGIN_TYPE = imageformats
73
74 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
75 From: Mark Brand <mabrand@mabrand.nl>
76 Date: Fri, 16 Nov 2018 10:13:11 +0100
77 Subject: [PATCH 3/3] [MXE] pkg-config support for libwebp
78
79
80 diff --git a/config.tests/libwebp/libwebp.pro b/config.tests/libwebp/libwebp.pro
81 index 1111111..2222222 100644
82 --- a/config.tests/libwebp/libwebp.pro
83 +++ b/config.tests/libwebp/libwebp.pro
84 @@ -2,5 +2,9 @@ SOURCES = libwebp.cpp
85 CONFIG -= qt dylib
86 mac:CONFIG -= app_bundle
87 win32:CONFIG += console
88 -unix|mingw: LIBS += -lwebp -lwebpdemux
89 +unix|mingw {
71 + CONFIG += link_pkgconfig 90 + CONFIG += link_pkgconfig
72 + packagesExist(libmng):PKGCONFIG += libmng 91 + packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
73 + else:if(unix|win32-g++*): LIBS += -lmng 92 + else: LIBS += -lwebp -lwebpdemux
74 else:win32: LIBS += libmng.lib 93 +}
94 else:win32: LIBS += libwebp.lib libwebpdemux.lib
95 diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro
96 index 1111111..2222222 100644
97 --- a/src/plugins/imageformats/webp/webp.pro
98 +++ b/src/plugins/imageformats/webp/webp.pro
99 @@ -5,7 +5,11 @@ SOURCES += main.cpp qwebphandler.cpp
100 OTHER_FILES += webp.json
101
102 config_libwebp {
103 - unix|win32-g++*: LIBS += -lwebp -lwebpdemux
104 + unix|mingw {
105 + CONFIG += link_pkgconfig
106 + packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
107 + else: LIBS += -lwebp -lwebpdemux
108 + }
109 else:win32: LIBS += libwebp.lib libwebpdemux.lib
75 } else { 110 } else {
76 include($$PWD/../../../3rdparty/libmng.pri) 111 include($$PWD/../../../3rdparty/libwebp.pri)
77 --
78 1.8.4.5
79