From e71e391e4071b801383f40b82958e0bb7c6732fe Mon Sep 17 00:00:00 2001 From: Frederic Devernay Date: Fri, 9 Apr 2021 11:01:10 -0700 Subject: [PATCH] global.pri: link with whatever version of cairo is present on the system, even if it links to X11 fixes https://github.com/NatronGitHub/Natron/issues/328 --- global.pri | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/global.pri b/global.pri index 10e4edf0f7..f279971297 100644 --- a/global.pri +++ b/global.pri @@ -395,19 +395,16 @@ unix { QT_CONFIG -= no-pkg-config CONFIG += link_pkgconfig expat: PKGCONFIG += expat + # Linking cairo dynamically is OK even on Linux, where it links to X11, + # since we need X11 for OpenGL rendering anyway. + cairo: PKGCONFIG += cairo # GLFW will require a link to X11 on linux and OpenGL framework on OS X linux-*|freebsd-* { LIBS += -lGL -lX11 - # link with static cairo on linux, to avoid linking to X11 libraries in NatronRenderer - cairo { - PKGCONFIG += pixman-1 freetype2 fontconfig - LIBS += $$system(pkg-config --variable=libdir cairo)/libcairo.a - } QMAKE_LFLAGS += '-Wl,-rpath,\'\$$ORIGIN/../lib\',-z,origin' } else { LIBS += -framework OpenGL - cairo: PKGCONFIG += cairo } linux-* { LIBS += -ldl