view src/qtimageformats-1.patch @ 5161:f0fb4aebfcd0

qt5: update to v5.13.1 * src/qtbase.mk: update version, checksum * src/qtbase-1-fixes.patch: update patch * src/qtimageformats.mk: update version, checksum * src/qtimageformats-1.patch: update patch * src/qtsvg.mk: update version, checksum * src/qttools.mk: update version, checksum * src/qttranslations.mk: update version, checksum
author John Donoghue
date Fri, 06 Sep 2019 09:57:32 -0400
parents 9d35f8eb1e76
children db6f82a0f476
line wrap: on
line source

This file is part of MXE. See LICENSE.md for licensing information.

From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: Mark Brand <mabrand@mabrand.nl>
Date: Mon, 17 Jun 2019 13:54:23 +0200
Subject: [PATCH 1/1] use pkgconfig


diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json
index 1111111..2222222 100644
--- a/src/imageformats/configure.json
+++ b/src/imageformats/configure.json
@@ -51,9 +51,6 @@
                         "stdio.h",
                         "libmng.h"
                     ],
-                    "qmake": [
-                        "LIBS += -lmng"
-                    ],
                     "main": [
                         "mng_handle hMNG;",
                         "mng_cleanup(&hMNG);",
@@ -67,6 +64,7 @@
                 }
             },
             "sources": [
+                { "type": "pkgConfig", "args": "libmng" },
                 "-lmng"
             ]
         },
@@ -77,10 +75,6 @@
                 "type": "compile",
                 "test": {
                     "include": "tiffio.h",
-                    "qmake": [
-                        "unix|mingw: LIBS += -ltiff",
-                        "else:win32: LIBS += libtiff.lib"
-                    ],
                     "main": [
                         "#if !defined(TIFF_VERSION) && defined(TIFF_VERSION_CLASSIC)",
                         "// libtiff 4.0 splits it into TIFF_VERSION_CLASSIC and TIFF_VERSION_BIG",
@@ -105,6 +99,7 @@
                 }
             },
             "sources": [
+                { "type": "pkgConfig", "args": "libtiff-4" },
                 "-ltiff"
             ]
         },
@@ -119,9 +114,6 @@
                         "webp/encode.h",
                         "webp/demux.h"
                     ],
-                    "qmake": [
-                        "LIBS += -lwebp -lwebpdemux"
-                    ],
                     "main": [
                         "#if WEBP_ABI_IS_INCOMPATIBLE(WEBP_DECODER_ABI_VERSION, 0x0203) || WEBP_ABI_IS_INCOMPATIBLE(WEBP_ENCODER_ABI_VERSION, 0x0202)",
                         "#error \"Incompatible libwebp version\"",
@@ -144,6 +136,7 @@
                 }
             },
             "sources": [
+                { "type": "pkgConfig", "args": "libwebp libwebpdemux" },
                 "-lwebp -lwebpdemux"
             ]
         }