diff --git a/CMakeLists.txt b/CMakeLists.txt index e8a2ecf..ec65f22 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -13,7 +13,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON) find_package(ECM ${KF5_MIN_VERSION} REQUIRED NO_MODULE) -set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH}) +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) include(KDEInstallDirs) include(KDECMakeSettings) @@ -27,6 +27,10 @@ kde_enable_exceptions() find_package(Qt5 ${QT_MIN_VERSION} REQUIRED NO_MODULE COMPONENTS Core Quick Test Gui QuickControls2 Widgets Sql X11Extras) find_package(KF5 ${KF_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 I18n CoreAddons) +find_package(Libmpv) +set_package_properties(Libmpv PROPERTIES TYPE REQUIRED) + + set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..d9f2d72 --- /dev/null +++ b/flake.nix @@ -0,0 +1,14 @@ +{ + description = "A Church Presentation Application"; + + inputs.flake-utils.url = "github:numtide/flake-utils"; + + outputs = { self, nixpkgs, flake-utils }: + flake-utils.lib.eachDefaultSystem + (system: + let pkgs = nixpkgs.legacyPackages.${system}; in + { + devShell = import ./shell.nix { inherit pkgs; }; + } + ); +} diff --git a/shell.nix b/shell.nix new file mode 100644 index 0000000..7c7f914 --- /dev/null +++ b/shell.nix @@ -0,0 +1,33 @@ +with import { }; +pkgs.mkShell { + name = "presenter-env"; + + nativeBuildInputs = [ + gcc + gnumake + clang + cmake + extra-cmake-modules + pkg-config + # gccStdenv + # stdenv + ]; + + buildInputs = [ + qt5.qtbase + qt5.qttools + qt5.qtquickcontrols2 + qt5.qtx11extras + qt5.qtmultimedia + libsForQt5.kirigami2 + libsForQt5.ki18n + libsForQt5.kcoreaddons + mpv + # libsForQt5.kconfig + # ffmpeg-full + # yt-dlp + ]; + + shellHook = '' + ''; +} diff --git a/src/qml/main.qml b/src/qml/main.qml index 8d369d2..b98f97c 100644 --- a/src/qml/main.qml +++ b/src/qml/main.qml @@ -5,7 +5,7 @@ import Qt.labs.platform 1.1 as Labs import QtQuick.Window 2.13 import QtQuick.Layouts 1.2 import QtMultimedia 5.15 -import QtAudioEngine 1.15 +/* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami import "./presenter" as Presenter diff --git a/src/qml/presenter/Actions.qml b/src/qml/presenter/Actions.qml index 2552ade..2f99693 100644 --- a/src/qml/presenter/Actions.qml +++ b/src/qml/presenter/Actions.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 import QtQuick.Layouts 1.2 import QtMultimedia 5.15 -import QtAudioEngine 1.15 +/* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/LeftDock.qml b/src/qml/presenter/LeftDock.qml index 654d38f..00981fe 100644 --- a/src/qml/presenter/LeftDock.qml +++ b/src/qml/presenter/LeftDock.qml @@ -5,7 +5,7 @@ import QtQuick.Window 2.13 import QtQuick.Layouts 1.2 import QtQml.Models 2.12 import QtMultimedia 5.15 -import QtAudioEngine 1.15 +/* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/Presentation.qml b/src/qml/presenter/Presentation.qml index 8e4c5ac..4bcc1c5 100644 --- a/src/qml/presenter/Presentation.qml +++ b/src/qml/presenter/Presentation.qml @@ -3,7 +3,7 @@ import QtQuick.Dialogs 1.0 import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 import QtQuick.Layouts 1.2 -import QtAudioEngine 1.15 +/* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/Slide.qml b/src/qml/presenter/Slide.qml index bb42adb..d2fe6dd 100644 --- a/src/qml/presenter/Slide.qml +++ b/src/qml/presenter/Slide.qml @@ -2,7 +2,7 @@ import QtQuick 2.13 import QtQuick.Controls 2.15 as Controls import QtQuick.Layouts 1.2 /* import QtMultimedia 5.15 */ -import QtAudioEngine 1.15 +/* import QtAudioEngine 1.15 */ import QtGraphicalEffects 1.15 import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter diff --git a/src/qml/presenter/SlideEditor.qml b/src/qml/presenter/SlideEditor.qml index 307099e..277f61f 100644 --- a/src/qml/presenter/SlideEditor.qml +++ b/src/qml/presenter/SlideEditor.qml @@ -4,7 +4,7 @@ import QtQuick.Controls 2.15 as Controls import QtQuick.Window 2.13 import QtQuick.Layouts 1.2 import QtMultimedia 5.15 -import QtAudioEngine 1.15 +/* import QtAudioEngine 1.15 */ import org.kde.kirigami 2.13 as Kirigami import "./" as Presenter