depends: build qt with ninja

diff --git a/contrib/depends/packages/native_qt.mk b/contrib/depends/packages/native_qt.mk
index b429c810e9a23ef6e12129ee12ad569ba614784c..ec7c0772492a0b69d8dd775098bb38260bb74d98 100644 (file)
--- a/contrib/depends/packages/native_qt.mk
+++ b/contrib/depends/packages/native_qt.mk
@@ -183,11 +183,10 @@ define $(package)_config_cmds
   ./configure -top-level $($(package)_config_opts)
 endef
 
-# https://bugreports.qt.io/browse/QTBUG-112018
 define $(package)_build_cmds
   export LD_LIBRARY_PATH=${build_prefix}/lib/ && \
   unset CMAKE_PREFIX_PATH && \
-  $(MAKE) || $(MAKE)
+  cmake --build . --parallel
 endef
 
 define $(package)_stage_cmds

diff --git a/contrib/depends/packages/qt.mk b/contrib/depends/packages/qt.mk
index 1a34a7676dcd4877fd5b2ff03507a7507e46b381..67e0f8aadcdec2eaa489d2adf5cce30eb85597fa 100644 (file)
--- a/contrib/depends/packages/qt.mk
+++ b/contrib/depends/packages/qt.mk
@@ -180,7 +180,6 @@ $(package)_config_opts_mingw32 += -xplatform win32-g++
 $(package)_config_opts_mingw32 += -device-option CROSS_COMPILE="$(host)-"
 $(package)_config_opts_mingw32 += -pch
 $(package)_config_opts_mingw32 += -qt-host-path $(build_prefix)/qt-host
-$(package)_config_opts_mingw32 += -no-feature-ffmpeg
 $(package)_config_opts_mingw32 += -wmf
 $(package)_config_opts_mingw32 += -- -DCMAKE_TOOLCHAIN_FILE=WindowsToolchain.cmake -DCMAKE_LIBRARY_PATH=$(HOME)/.guix-profile/lib
 
@@ -312,23 +311,23 @@ endif
 ifeq ($(host_os),darwin)
 define $(package)_build_cmds
   export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
-  env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH  $(MAKE)
+  env -u C_INCLUDE_PATH -u CPLUS_INCLUDE_PATH -u OBJC_INCLUDE_PATH -u OBJCPLUS_INCLUDE_PATH -u CPATH -u LIBRARY_PATH cmake --build . --parallel
 endef
 else ifeq ($(host_os),mingw32)
 define $(package)_build_cmds
   export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
-  $(MAKE)
+  cmake --build . --parallel
 endef
 else ifneq (,$(findstring x86_64,$(HOST)))
 define $(package)_build_cmds
   export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
   cmake --build . --target syncqt_build && \
-  $(MAKE)
+  cmake --build . --parallel
 endef
 else
 define $(package)_build_cmds
   export LD_LIBRARY_PATH="${build_prefix}/lib/:$(QT_LIBS_LIBS)" && \
-  $(MAKE)
+  cmake --build . --parallel
 endef
 endif
 

diff --git a/contrib/depends/patches/qt/v4l2.patch b/contrib/depends/patches/qt/v4l2.patch
index e78cc6e6f181ce48cf531f09184f68df9a4680e6..0233de3ddb99fef9b400cac7d9ba96a8a22d2fa3 100644 (file)
--- a/contrib/depends/patches/qt/v4l2.patch
+++ b/contrib/depends/patches/qt/v4l2.patch
@@ -692,8 +692,8 @@ index 000000000..c07c0ebc7
 +#ifdef Q_OS_DARWIN
 +#include "qavfcamera_p.h"
 +#elif defined(Q_OS_WINDOWS)
-+#include "qwindowscamera_p.h"
-+#include "qwindowsvideodevices_p.h"
++#include "../windows/mediacapture/qwindowscamera_p.h"
++#include "../windows/qwindowsvideodevices_p.h"
 +#endif
 +
 +#if QT_CONFIG(linux_v4l)

diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 7fc1580eb664009a2afb3c128cbf4ded8e066df5..d743003c0a29dd90148eebebad9336d85a915573 100644 (file)
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -5,6 +5,7 @@
              (gnu packages base)
              (gnu packages bash)
              (gnu packages bison)
+             (gnu packages build-tools)
              (gnu packages certs)
              (gnu packages check)
              (gnu packages cmake)
@@ -25,6 +26,7 @@
              (gnu packages llvm)
              (gnu packages mingw)
              (gnu packages moreutils)
+             (gnu packages ninja)
              (gnu packages perl)
              (gnu packages pkg-config)
              (gnu packages python)
@@ -321,6 +323,8 @@ chain for " target " development."))
         gettext-minimal
         squashfs-tools
         cmake-minimal
+        meson
+        ninja
         ;; Native GCC 10 toolchain
         gcc-toolchain-10
         (list gcc-toolchain-10 "static")