Mercurial > mxe-octave

annotate 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
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
4310
2c34ec679fb3 qt5: update to 5.7.1
John D
parents: 4222
diff changeset
1 This file is part of MXE. See LICENSE.md for licensing information.
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
2
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
3 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
4 From: Mark Brand <mabrand@mabrand.nl>
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
5 Date: Thu, 3 Nov 2011 14:11:02 +0100
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
6 Subject: [PATCH 1/3] [MXE] pkg-config support for libtiff-4
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
7
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
8
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
9 diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
10 index 1111111..2222222 100644
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
11 --- a/config.tests/libtiff/libtiff.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
12 +++ b/config.tests/libtiff/libtiff.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
13 @@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
14 CONFIG -= qt dylib
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
15 mac:CONFIG -= app_bundle
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
16 win32:CONFIG += console
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
17 -unix|mingw: LIBS += -ltiff
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
18 +CONFIG += link_pkgconfig
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
19 +packagesExist(libtiff-4):PKGCONFIG += libtiff-4
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
20 +else:if(unix|win32-g++*): LIBS += -ltiff
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
21 else:win32: LIBS += libtiff.lib
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
22 diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
23 index 1111111..2222222 100644
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
24 --- a/src/plugins/imageformats/tiff/tiff.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
25 +++ b/src/plugins/imageformats/tiff/tiff.pro
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
26 @@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
27 OTHER_FILES += tiff.json
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
28
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
29 config_libtiff {
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
30 - unix|mingw: LIBS += -ltiff
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
31 + CONFIG += link_pkgconfig
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
32 + packagesExist(libtiff-4):PKGCONFIG += libtiff-4
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
33 + else:if(unix|win32-g++*): LIBS += -ltiff
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
34 else:win32: LIBS += libtiff.lib
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
35 } else {
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
36 include($$PWD/../../../3rdparty/libtiff.pri)
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
37
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
38 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
39 From: Mark Brand <mabrand@mabrand.nl>
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
40 Date: Wed, 19 Dec 2012 23:29:52 +0100
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
41 Subject: [PATCH 2/3] [MXE] pkg-config support for libmng
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
42
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
43
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
44 diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
45 index 1111111..2222222 100644
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
46 --- a/config.tests/libmng/libmng.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
47 +++ b/config.tests/libmng/libmng.pro
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
48 @@ -2,5 +2,7 @@ SOURCES = libmng.cpp
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
49 CONFIG -= qt dylib
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
50 mac:CONFIG -= app_bundle
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
51 win32:CONFIG += console
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
52 -unix|mingw: LIBS += -lmng
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
53 +CONFIG += link_pkgconfig
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
54 +packagesExist(libmng):PKGCONFIG += libmng
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
55 +else:if(unix|win32-g++*): LIBS += -lmng
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
56 else:win32: LIBS += libmng.lib
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
57 diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
58 index 1111111..2222222 100644
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
59 --- a/src/plugins/imageformats/mng/mng.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
60 +++ b/src/plugins/imageformats/mng/mng.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
61 @@ -5,7 +5,10 @@ SOURCES += main.cpp \
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
62 qmnghandler.cpp
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
63 OTHER_FILES += mng.json
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
64
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
65 -msvc: LIBS += libmng.lib
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
66 +CONFIG += link_pkgconfig
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
67 +packagesExist(libmng):PKGCONFIG += libmng
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
68 +else:if(unix|mingw): LIBS += -lmng
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
69 +else:msvc: LIBS += libmng.lib
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
70 else: LIBS += -lmng
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
71
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
72 PLUGIN_TYPE = imageformats
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
73
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
74 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
75 From: Mark Brand <mabrand@mabrand.nl>
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
76 Date: Fri, 16 Nov 2018 10:13:11 +0100
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
77 Subject: [PATCH 3/3] [MXE] pkg-config support for libwebp
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
78
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
79
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
80 diff --git a/config.tests/libwebp/libwebp.pro b/config.tests/libwebp/libwebp.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
81 index 1111111..2222222 100644
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
82 --- a/config.tests/libwebp/libwebp.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
83 +++ b/config.tests/libwebp/libwebp.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
84 @@ -2,5 +2,9 @@ SOURCES = libwebp.cpp
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
85 CONFIG -= qt dylib
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
86 mac:CONFIG -= app_bundle
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
87 win32:CONFIG += console
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
88 -unix|mingw: LIBS += -lwebp -lwebpdemux
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
89 +unix|mingw {
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
90 + CONFIG += link_pkgconfig
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
91 + packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
92 + else: LIBS += -lwebp -lwebpdemux
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
93 +}
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
94 else:win32: LIBS += libwebp.lib libwebpdemux.lib
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
95 diff --git a/src/plugins/imageformats/webp/webp.pro b/src/plugins/imageformats/webp/webp.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
96 index 1111111..2222222 100644
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
97 --- a/src/plugins/imageformats/webp/webp.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
98 +++ b/src/plugins/imageformats/webp/webp.pro
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
99 @@ -5,7 +5,11 @@ SOURCES += main.cpp qwebphandler.cpp
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
100 OTHER_FILES += webp.json
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
101
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
102 config_libwebp {
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
103 - unix|win32-g++*: LIBS += -lwebp -lwebpdemux
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
104 + unix|mingw {
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
105 + CONFIG += link_pkgconfig
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
106 + packagesExist(libwebp libwebpdemux): PKGCONFIG += libwebp libwebpdemux
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
107 + else: LIBS += -lwebp -lwebpdemux
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
108 + }
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
109 else:win32: LIBS += libwebp.lib libwebpdemux.lib
4222
44b1a9b2193e qt5: add initial qt5 to mxe-octave, based on mxe.cc
John D
parents:
diff changeset
110 } else {
4900
22937c7fe60d Update QT5 5.12.0
John Donoghue
parents: 4310
diff changeset
111 include($$PWD/../../../3rdparty/libwebp.pri)