qtmultimedia: build C++-only (no QML); konsole uses real modules (drop workaround)
qtmultimedia: drop qtdeclarative dep (its staged QtQuick scenegraph config header made QT_CONFIG(quick_sprite) divide by zero for consumers); keep qtshadertools (video-frame shaders need qt_internal_add_shaders). Builds libQt6Multimedia (API-only). konsole: drop the 439-line optional-multimedia workaround patch and depend on qtmultimedia + qt5compat + qtbase-printsupport directly — port the modules, don't work around them.
This commit is contained in:
@@ -8,9 +8,7 @@ version = "26.04.3"
|
||||
[source]
|
||||
tar = "https://invent.kde.org/utilities/konsole/-/archive/v26.04.3/konsole-v26.04.3.tar.gz"
|
||||
blake3 = "6fca3c2ea807ca0e12d014e2f6b5832bed31c2b15a3dac9ec6e28f3599f14930"
|
||||
patches = [
|
||||
"01-optional-multimedia-printsupport-core5compat.patch",
|
||||
]
|
||||
patches = [] # multimedia/printsupport/core5compat now provided by qtmultimedia + qtbase(printsupport) + qt5compat
|
||||
|
||||
[build]
|
||||
template = "custom"
|
||||
@@ -18,6 +16,7 @@ dependencies = [
|
||||
"icu",
|
||||
"qtbase",
|
||||
"qt5compat",
|
||||
"qtmultimedia",
|
||||
"kf6-extra-cmake-modules",
|
||||
"kf6-kcoreaddons",
|
||||
"kf6-ki18n",
|
||||
|
||||
@@ -15,7 +15,6 @@ blake3 = "5d12f9a49a29e2852f3910643576a34ab77657c8c45351f00e6c1f354aff90df"
|
||||
template = "custom"
|
||||
dependencies = [
|
||||
"qtbase",
|
||||
"qtdeclarative",
|
||||
"qtshadertools",
|
||||
]
|
||||
script = """
|
||||
@@ -35,7 +34,7 @@ done
|
||||
rm -f CMakeCache.txt
|
||||
rm -rf CMakeFiles
|
||||
|
||||
cmake "${COOKBOOK_SOURCE}" -G Ninja -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" -DQT_HOST_PATH="${HOST_BUILD}" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" -DQT_BUILD_EXAMPLES=OFF -DQT_BUILD_TESTS=OFF -DQT_GENERATE_SBOM=OFF -DFEATURE_ffmpeg=OFF -DFEATURE_gstreamer=OFF -DFEATURE_pulseaudio=OFF -DFEATURE_alsa=OFF -DFEATURE_pipewire=OFF -DFEATURE_v4l2=OFF -Wno-dev
|
||||
cmake "${COOKBOOK_SOURCE}" -G Ninja -DCMAKE_TOOLCHAIN_FILE="${COOKBOOK_ROOT}/local/recipes/qt/redox-toolchain.cmake" -DQT_HOST_PATH="${HOST_BUILD}" -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release -DCMAKE_PREFIX_PATH="${COOKBOOK_SYSROOT}" -DQT_BUILD_EXAMPLES=OFF -DQT_BUILD_TESTS=OFF -DQT_GENERATE_SBOM=OFF -DFEATURE_ffmpeg=OFF -DFEATURE_gstreamer=OFF -DFEATURE_pulseaudio=OFF -DFEATURE_alsa=OFF -DFEATURE_pipewire=OFF -DFEATURE_v4l2=OFF -DQT_FEATURE_quick_sprite=OFF -DFEATURE_qml=OFF -Wno-dev
|
||||
|
||||
cmake --build . -j"${COOKBOOK_MAKE_JOBS}"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user