From 220bcbf7c0a09b508f18b72e187c7f2f3eadf863 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9mi=20Verschelde?= Date: Sat, 19 Nov 2016 12:59:26 +0100 Subject: [PATCH] libpng: Fix erroneously linking against libpng12 on old distros This bit us for 2.1.1 binaries built on Ubuntu 12.04 LTS where libpng.pc apparently prioritizes libpng12. (cherry picked from commit 5fa1bb331ad9be31dbfc752c7d19ccf7caeb8fa4) --- platform/x11/detect.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platform/x11/detect.py b/platform/x11/detect.py index 675fea51790..67751649103 100644 --- a/platform/x11/detect.py +++ b/platform/x11/detect.py @@ -144,7 +144,7 @@ def configure(env): env.ParseConfig('pkg-config freetype2 --cflags --libs') if (env['builtin_libpng'] == 'no'): - env.ParseConfig('pkg-config libpng --cflags --libs') + env.ParseConfig('pkg-config libpng16 --cflags --libs') if (env['builtin_squish'] == 'no' and env["tools"] == "yes"): env.ParseConfig('pkg-config libsquish --cflags --libs')