pull/2264/head
Alois Schloegl
5 years ago
commit
777d4c69c8
@ -1,59 +0,0 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
Contains ad hoc patches for cross building.
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Sun, 2 Sep 2012 00:55:28 +0200
|
||||
Subject: [PATCH 1/2] include gpg-error with gcrypt for static linking
|
||||
(mxe-specific)
|
||||
|
||||
Git rid of the extra -lgcrypt here since we have to pass the
|
||||
whole list via LIBS. Otherwise, LIBS gets simplified with
|
||||
-lgcrypt appearing only after its static dependencies.
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index 1111111..2222222 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -423,7 +423,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
|
||||
if test "$ac_cv_libgcrypt" = "yes"; then
|
||||
AC_DEFINE(LIBSSH2_LIBGCRYPT, 1, [Use libgcrypt])
|
||||
LIBSREQUIRED= # libgcrypt doesn't provide a .pc file. sad face.
|
||||
- LIBS="$LIBS -lgcrypt"
|
||||
found_crypto=libgcrypt
|
||||
else
|
||||
# restore
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From: Mark Brand <mabrand@mabrand.nl>
|
||||
Date: Mon, 7 Nov 2016 10:47:13 +0100
|
||||
Subject: [PATCH 2/2] fix yes/no in lib path
|
||||
|
||||
|
||||
diff --git a/acinclude.m4 b/acinclude.m4
|
||||
index 1111111..2222222 100644
|
||||
--- a/acinclude.m4
|
||||
+++ b/acinclude.m4
|
||||
@@ -386,10 +386,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_MBEDTLS], [
|
||||
|
||||
old_LDFLAGS=$LDFLAGS
|
||||
old_CFLAGS=$CFLAGS
|
||||
- if test -n "$use_mbedtls" && test "$use_mbedtls" != "no"; then
|
||||
- LDFLAGS="$LDFLAGS -L$use_mbedtls/lib"
|
||||
- CFLAGS="$CFLAGS -I$use_mbedtls/include"
|
||||
- fi
|
||||
|
||||
AC_LIB_HAVE_LINKFLAGS([mbedtls], [], [
|
||||
#include <mbedtls/version.h>
|
||||
@@ -412,10 +408,6 @@ AC_DEFUN([LIBSSH2_CHECKFOR_GCRYPT], [
|
||||
|
||||
old_LDFLAGS=$LDFLAGS
|
||||
old_CFLAGS=$CFLAGS
|
||||
- if test -n "$use_libgcrypt" && test "$use_libgcrypt" != "no"; then
|
||||
- LDFLAGS="$LDFLAGS -L$use_libgcrypt/lib"
|
||||
- CFLAGS="$CFLAGS -I$use_libgcrypt/include"
|
||||
- fi
|
||||
AC_LIB_HAVE_LINKFLAGS([gcrypt], [], [
|
||||
#include <gcrypt.h>
|
||||
])
|
||||
@ -1,22 +0,0 @@
|
||||
# This file is part of MXE. See LICENSE.md for licensing information.
|
||||
|
||||
PKG := qtcanvas3d
|
||||
$(PKG)_WEBSITE := https://www.qt.io/
|
||||
$(PKG)_DESCR := Qt
|
||||
$(PKG)_IGNORE :=
|
||||
$(PKG)_VERSION = $(qtbase_VERSION)
|
||||
$(PKG)_CHECKSUM := c0821f1232c6bcd00648af9a5d1eade8e0397c6bfff60621e0fcdfc75561baea
|
||||
$(PKG)_SUBDIR = $(subst qtbase,qtcanvas3d,$(qtbase_SUBDIR))
|
||||
$(PKG)_FILE = $(subst qtbase,qtcanvas3d,$(qtbase_FILE))
|
||||
$(PKG)_URL = $(subst qtbase,qtcanvas3d,$(qtbase_URL))
|
||||
$(PKG)_DEPS := cc qtbase qtdeclarative
|
||||
|
||||
define $(PKG)_UPDATE
|
||||
echo $(qtbase_VERSION)
|
||||
endef
|
||||
|
||||
define $(PKG)_BUILD
|
||||
cd '$(1)' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake'
|
||||
$(MAKE) -C '$(1)' -j '$(JOBS)'
|
||||
$(MAKE) -C '$(1)' -j 1 install
|
||||
endef
|
||||
@ -1,111 +1,120 @@
|
||||
This file is part of MXE. See LICENSE.md for licensing information.
|
||||
From b3504d8f2ce90aeaf3c84ffb6716ee14d173de17 Mon Sep 17 00:00:00 2001
|
||||
From: Joerg Bornemann <joerg.bornemann@qt.io>
|
||||
Date: Tue, 7 May 2019 11:30:05 +0200
|
||||
Subject: [PATCH 1/2] Fix feature and library checks for tiff and mng
|
||||
|
||||
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/3] [MXE] pkg-config support for libtiff-4
|
||||
|
||||
|
||||
diff --git a/config.tests/libtiff/libtiff.pro b/config.tests/libtiff/libtiff.pro
|
||||
index 1111111..2222222 100644
|
||||
--- a/config.tests/libtiff/libtiff.pro
|
||||
+++ b/config.tests/libtiff/libtiff.pro
|
||||
@@ -2,5 +2,7 @@ SOURCES = libtiff.cpp
|
||||
CONFIG -= qt dylib
|
||||
mac:CONFIG -= app_bundle
|
||||
win32:CONFIG += console
|
||||
-unix|mingw: LIBS += -ltiff
|
||||
+CONFIG += link_pkgconfig
|
||||
+packagesExist(libtiff-4):PKGCONFIG += libtiff-4
|
||||
+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 1111111..2222222 100644
|
||||
--- a/src/plugins/imageformats/tiff/tiff.pro
|
||||
+++ b/src/plugins/imageformats/tiff/tiff.pro
|
||||
@@ -5,7 +5,9 @@ SOURCES += main.cpp qtiffhandler.cpp
|
||||
OTHER_FILES += tiff.json
|
||||
|
||||
config_libtiff {
|
||||
- unix|mingw: LIBS += -ltiff
|
||||
+ CONFIG += link_pkgconfig
|
||||
+ packagesExist(libtiff-4):PKGCONFIG += libtiff-4
|
||||
+ else:if(unix|win32-g++*): LIBS += -ltiff
|
||||
else:win32: LIBS += libtiff.lib
|
||||
} else {
|
||||
include($$PWD/../../../3rdparty/libtiff.pri)
|
||||
|
||||
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/3] [MXE] pkg-config support for libmng
|
||||
This amends commit a33e3aea.
|
||||
|
||||
Change-Id: I03304f5bf300e5e52476c3f3d6b06b0815009720
|
||||
Reviewed-by: Liang Qi <liang.qi@qt.io>
|
||||
(cherry picked from commit 626c3053efd7905080ac4a65fca55551391a36e3)
|
||||
|
||||
diff --git a/config.tests/libmng/libmng.pro b/config.tests/libmng/libmng.pro
|
||||
index 1111111..2222222 100644
|
||||
--- a/config.tests/libmng/libmng.pro
|
||||
+++ b/config.tests/libmng/libmng.pro
|
||||
@@ -2,5 +2,7 @@ SOURCES = libmng.cpp
|
||||
CONFIG -= qt dylib
|
||||
mac:CONFIG -= app_bundle
|
||||
win32:CONFIG += console
|
||||
-unix|mingw: LIBS += -lmng
|
||||
+CONFIG += link_pkgconfig
|
||||
+packagesExist(libmng):PKGCONFIG += libmng
|
||||
+else:if(unix|win32-g++*): LIBS += -lmng
|
||||
else:win32: LIBS += libmng.lib
|
||||
diff --git a/src/plugins/imageformats/mng/mng.pro b/src/plugins/imageformats/mng/mng.pro
|
||||
index 1111111..2222222 100644
|
||||
index 4641110..f509fa8 100644
|
||||
--- a/src/plugins/imageformats/mng/mng.pro
|
||||
+++ b/src/plugins/imageformats/mng/mng.pro
|
||||
@@ -5,7 +5,10 @@ SOURCES += main.cpp \
|
||||
@@ -5,8 +5,10 @@ SOURCES += main.cpp \
|
||||
qmnghandler.cpp
|
||||
OTHER_FILES += mng.json
|
||||
|
||||
-msvc: LIBS += libmng.lib
|
||||
+CONFIG += link_pkgconfig
|
||||
+packagesExist(libmng):PKGCONFIG += libmng
|
||||
+else:if(unix|mingw): LIBS += -lmng
|
||||
+else:msvc: LIBS += libmng.lib
|
||||
else: LIBS += -lmng
|
||||
-else: LIBS += -lmng
|
||||
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
|
||||
+QT_FOR_CONFIG += imageformats-private
|
||||
+
|
||||
+QMAKE_USE_PRIVATE += mng
|
||||
|
||||
PLUGIN_TYPE = imageformats
|
||||
PLUGIN_CLASS_NAME = QMngPlugin
|
||||
diff --git a/src/plugins/imageformats/tiff/tiff.pro b/src/plugins/imageformats/tiff/tiff.pro
|
||||
index 04cfbdb..0c42749 100644
|
||||
--- a/src/plugins/imageformats/tiff/tiff.pro
|
||||
+++ b/src/plugins/imageformats/tiff/tiff.pro
|
||||
@@ -4,9 +4,11 @@ HEADERS += qtiffhandler_p.h
|
||||
SOURCES += main.cpp qtiffhandler.cpp
|
||||
OTHER_FILES += tiff.json
|
||||
|
||||
-config_libtiff {
|
||||
- unix|mingw: LIBS += -ltiff
|
||||
- else:win32: LIBS += libtiff.lib
|
||||
+include($$OUT_PWD/../../../imageformats/qtimageformats-config.pri)
|
||||
+QT_FOR_CONFIG += imageformats-private
|
||||
+
|
||||
+qtConfig(system-tiff) {
|
||||
+ QMAKE_USE_PRIVATE += tiff
|
||||
} else {
|
||||
include($$PWD/../../../3rdparty/libtiff.pri)
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
||||
From 9daaac5a219fb55628f0542e905d7157c2c68296 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
|
||||
Date: Mon, 17 Jun 2019 13:54:23 +0200
|
||||
Subject: [PATCH 2/2] use pkgconfig
|
||||
|
||||
|
||||
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)
|
||||
diff --git a/src/imageformats/configure.json b/src/imageformats/configure.json
|
||||
index 03d59d3..0cd3715 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"
|
||||
]
|
||||
}
|
||||
--
|
||||
2.20.1
|
||||
|
||||
|
||||
Loading…
Reference in new issue