vlc | branch: master | Steve Lhomme <[email protected]> | Mon Apr 29 15:55:58 2019 +0200| [2b99d8870c25e86298b6e003319365bc531e7d5d] | committer: Steve Lhomme
contrib: qt: include MODULE_AUX_INCLUDES in the generated .pc files Fixes the QtANGLE not included properly in the original .pc file. Fixes QTBUG-75495 > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=2b99d8870c25e86298b6e003319365bc531e7d5d --- ...ULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch | 30 ++++++++++++++++++++++ contrib/src/qt/rules.mak | 4 +-- 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch b/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch new file mode 100644 index 0000000000..5f00050167 --- /dev/null +++ b/contrib/src/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch @@ -0,0 +1,30 @@ +From 41833ff2e8918cf776b7849fd4ab1eab03dd6592 Mon Sep 17 00:00:00 2001 +From: Steve Lhomme <[email protected]> +Date: Mon, 29 Apr 2019 10:49:01 +0200 +Subject: [PATCH] include MODULE_AUX_INCLUDES in the generated .pc files + +QtANGLE is set on MODULE_AUX_INCLUDES so the headers can be found when building +with angle (gui.pro) but the pkg-config file is missing this header and the Qt +headers cannot be compiled with the path from this config. + +Fixes QTBUG-75495 +--- + mkspecs/features/qt_module.prf | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf +index 8bd2d92421..7963356c82 100644 +--- a/mkspecs/features/qt_module.prf ++++ b/mkspecs/features/qt_module.prf +@@ -278,6 +278,8 @@ load(qt_targets) + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] + QMAKE_PKGCONFIG_CFLAGS = -D$$MODULE_DEFINE -I${includedir}/$$MODULE_INCNAME + } ++ !isEmpty(MODULE_AUX_INCLUDES): \ ++ QMAKE_PKGCONFIG_CFLAGS += -I${includedir}/$$section(MODULE_AUX_INCLUDES, /, 1, 1) + QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$QT_MAJOR_VERSION ") + QMAKE_PKGCONFIG_FILE = $$replace(TARGET, ^Qt, Qt$$QT_MAJOR_VERSION) + for(i, MODULE_DEPENDS): \ +-- +2.19.1.windows.1 + diff --git a/contrib/src/qt/rules.mak b/contrib/src/qt/rules.mak index 8588e11631..5e9a888a0e 100644 --- a/contrib/src/qt/rules.mak +++ b/contrib/src/qt/rules.mak @@ -51,6 +51,7 @@ endif $(APPLY) $(SRC)/qt/0001-qmake-Always-split-QMAKE_DEFAULT_LIBDIRS-using-with-.patch $(APPLY) $(SRC)/qt/0001-generate-different-pkg-config-files-for-debug-and-re.patch + $(APPLY) $(SRC)/qt/0001-include-MODULE_AUX_INCLUDES-in-the-generated-.pc-fil.patch $(MOVE) @@ -127,8 +128,7 @@ ifdef HAVE_WIN32 # Fix Qt5Widget.pc file to include qwindowsvistastyle before Qt5Widget, as it depends on it cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/ -lQt5Widget/ -lqwindowsvistastyle -lQt5Widget/' Qt5Widgets.pc # Use ANGLE OpenGL provided by Qt - cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e '/^Cflags:/ s#$$# -I$${includedir}/QtANGLE#' \ - -e 's/-llibGLESv2/-llibGLESv2 -ld3d9 -ltranslator -lpreprocessor/g' Qt5Gui.pc + cd $(PREFIX)/lib/pkgconfig; sed -i.orig -e 's/-llibGLESv2/-llibGLESv2 -ld3d9 -ltranslator -lpreprocessor/g' Qt5Gui.pc endif # Install a qmake with correct paths set cd $<; $(MAKE) sub-qmake-qmake-aux-pro-install_subtargets install_mkspecs _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
