plugin: remove multimedia dep

Also remove QML module version
This commit is contained in:
2 * r + 2 * t 2025-09-10 22:57:12 +10:00
parent 8da5acdb3d
commit f3d086024b
3 changed files with 13 additions and 14 deletions

View file

@ -87,7 +87,7 @@
}; };
nativeBuildInputs = [cmake ninja pkg-config]; nativeBuildInputs = [cmake ninja pkg-config];
buildInputs = [qt6.qtbase qt6.qtdeclarative qt6.qtmultimedia libqalculate pipewire aubio libcava fftw]; buildInputs = [qt6.qtbase qt6.qtdeclarative libqalculate pipewire aubio libcava fftw];
dontWrapQtApps = true; dontWrapQtApps = true;
cmakeFlags = cmakeFlags =

View file

@ -1,11 +1 @@
find_package(Qt6 REQUIRED COMPONENTS Core Qml Gui Concurrent Multimedia)
if(QT_KNOWN_POLICY_QTP0001)
qt_policy(SET QTP0001 NEW)
endif()
string(REGEX MATCH "^[0-9]+\\.[0-9]+" VERSION_SHORT "${VERSION}")
set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
qt_standard_project_setup()
add_subdirectory(src/Caelestia) add_subdirectory(src/Caelestia)

View file

@ -1,12 +1,15 @@
find_package(Qt6 REQUIRED COMPONENTS Core Qml Gui Concurrent)
find_package(PkgConfig REQUIRED) find_package(PkgConfig REQUIRED)
pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED) pkg_check_modules(Qalculate IMPORTED_TARGET libqalculate REQUIRED)
pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED) pkg_check_modules(Pipewire IMPORTED_TARGET libpipewire-0.3 REQUIRED)
pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED) pkg_check_modules(Aubio IMPORTED_TARGET aubio REQUIRED)
pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED) pkg_check_modules(Cava IMPORTED_TARGET cava REQUIRED)
set(QT_QML_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/qml")
qt_standard_project_setup(REQUIRES 6.9)
qt_add_qml_module(caelestia qt_add_qml_module(caelestia
URI Caelestia URI Caelestia
VERSION ${VERSION_SHORT}
SOURCES SOURCES
cutils.hpp cutils.cpp cutils.hpp cutils.cpp
cachingimagemanager.hpp cachingimagemanager.cpp cachingimagemanager.hpp cachingimagemanager.cpp
@ -38,6 +41,12 @@ install(FILES "${module_qmldir}" DESTINATION "${module_dir}")
install(FILES "${module_typeinfo}" DESTINATION "${module_dir}") install(FILES "${module_typeinfo}" DESTINATION "${module_dir}")
target_link_libraries(caelestia PRIVATE target_link_libraries(caelestia PRIVATE
Qt::Core Qt::Qml Qt::Gui Qt::Concurrent Qt::Multimedia Qt::Core
PkgConfig::Qalculate PkgConfig::Pipewire PkgConfig::Aubio PkgConfig::Cava Qt::Qml
Qt::Gui
Qt::Concurrent
PkgConfig::Qalculate
PkgConfig::Pipewire
PkgConfig::Aubio
PkgConfig::Cava
) )