mirror of https://github.com/bitcoin/bitcoin
Merge #19959: build: patch qt libpng to fix powerpc build
pull/20000/headf07fb5a55e
build: patch qt libpng to fix powerpc build (fanquake) Pull request description: This is an alternative to #19751 that fixes the build without requiring splitting out libpng. This patch can be dropped once we are building qt 5.12.0 or later. One of the [concerns posted in #19751](https://github.com/bitcoin/bitcoin/pull/19751#issuecomment-675455993) was: > the one bundled with Qt is at best a slower "bare minimum". However for our usage, I don't think the performance of libpng is a concern. If it is, I'd like to see some numbers/justification as to why we should be worried about it. This patch should be enough to unblock PowerPC binaries (combined with other changes) for 0.21.0, and for 0.22.0, when we switch to qt 5.15.x in depends, we should be able to drop it. Related upstream issue: https://bugreports.qt.io/browse/QTBUG-66388. ACKs for top commit: laanwj: ACKf07fb5a55e
theuni: ACKf07fb5a55e
. hebasto: ACKf07fb5a55e
, the patch is the same as https://codereview.qt-project.org/gitweb?p=qt/qtbase.git;a=blobdiff;f=src/3rdparty/libpng/libpng.pro;h=a2f56669b47e09629b7a88a0964091404d6a9b06;hp=577b61d833f7842f3f0d6b1c94a3b3920006695c;hb=dc2aead842f4cdf74f9259d3606c53c8bdae2c6b;hpb=ceeecbae510af6e2d1ebbf865761e4761d404033 Tree-SHA512: 865b843f5049eca80215774274fb7ae0dacccc3dd7f4a2eec93a73057115dcea85e715f919f96441424f9dd902dd97f0a238d96d4074babcee66b30577104009
commit
c7eb85d005
@ -0,0 +1,23 @@
|
||||
commit 6f9feb773a43c5abfa3455da2e324180e789285b
|
||||
Author: fanquake <fanquake@gmail.com>
|
||||
Date: Tue Sep 15 21:44:31 2020 +0800
|
||||
|
||||
Fix PowerPC build of libpng
|
||||
|
||||
See https://bugreports.qt.io/browse/QTBUG-66388.
|
||||
|
||||
Can be dropped when we are building qt 5.12.0 or later.
|
||||
|
||||
diff --git a/qtbase/src/3rdparty/libpng/libpng.pro b/qtbase/src/3rdparty/libpng/libpng.pro
|
||||
index 577b61d8..a2f56669 100644
|
||||
--- a/qtbase/src/3rdparty/libpng/libpng.pro
|
||||
+++ b/qtbase/src/3rdparty/libpng/libpng.pro
|
||||
@@ -10,7 +10,7 @@ MODULE_INCLUDEPATH = $$PWD
|
||||
|
||||
load(qt_helper_lib)
|
||||
|
||||
-DEFINES += PNG_ARM_NEON_OPT=0
|
||||
+DEFINES += PNG_ARM_NEON_OPT=0 PNG_POWERPC_VSX_OPT=0
|
||||
SOURCES += \
|
||||
png.c \
|
||||
pngerror.c \
|
Loading…
Reference in new issue