Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Install build dependencies
run: |
sudo apt-get update
sudo apt-get install meson cmake ninja-build qt6-base-dev qt6-declarative-dev qt6-multimedia-dev
sudo apt-get install meson cmake ninja-build qt6-base-dev qt6-declarative-dev qt6-multimedia-dev libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev
- name: Build application using Meson Build System
run: |
meson setup build-meson --buildtype=release
Expand Down
10 changes: 5 additions & 5 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
set(CMAKE_AUTORCC ON)

find_package(Qt6 REQUIRED COMPONENTS Core Qml Quick Gui DBus Multimedia)
find_package(PkgConfig REQUIRED)
pkg_check_modules(gstreamer REQUIRED IMPORTED_TARGET gstreamer-1.0 gstreamer-pbutils-1.0)

list(APPEND qtphy_sources
resources/resources.qrc
Expand All @@ -17,6 +19,8 @@ list(APPEND qtphy_sources
src/device_info.cpp
src/rauc.hpp
src/rauc.cpp
src/multimedia_formats.hpp
src/multimedia_formats.cpp
)

list(APPEND qtphy_libraries
Expand All @@ -26,18 +30,14 @@ list(APPEND qtphy_libraries
Qt6::Gui
Qt6::DBus
Qt6::Multimedia
PkgConfig::gstreamer
)

if(QML_SINK)
find_package(PkgConfig REQUIRED)
pkg_check_modules(gstreamer REQUIRED IMPORTED_TARGET gstreamer-1.0)
list(APPEND qtphy_sources
src/multimedia_qmlsink.hpp
src/multimedia_qmlsink.cpp
)
list(APPEND qtphy_libraries
PkgConfig::gstreamer
)
add_definitions(-DQML_SINK)
endif()

Expand Down
10 changes: 5 additions & 5 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,22 @@ project(

qt6 = import('qt6')
qt6_dep = dependency('qt6', modules : ['Core', 'Qml', 'Quick', 'Gui', 'DBus', 'Multimedia'])
exec_dep = [qt6_dep]
exec_dep = [qt6_dep, dependency('gstreamer-1.0'), dependency('gstreamer-pbutils-1.0')]

headers = [
'src/device_info.hpp',
'src/rauc.hpp'
'src/rauc.hpp',
'src/multimedia_formats.hpp'
]
src = [
'src/main.cpp',
'src/device_info.cpp',
'src/rauc.cpp'
'src/rauc.cpp',
'src/multimedia_formats.cpp'
]

qmlsink_option = get_option('qmlsink')
if qmlsink_option.enabled()
gst_dep = dependency('gstreamer-1.0')
exec_dep += [gst_dep]
add_project_arguments('-DQML_SINK', language : 'cpp')
headers += ['src/multimedia_qmlsink.hpp']
src += ['src/multimedia_qmlsink.cpp']
Expand Down
10 changes: 7 additions & 3 deletions qtphy.pro
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,21 @@ TARGET = qtphy

QT += qml quick dbus

CONFIG += link_pkgconfig
PKGCONFIG += gstreamer-1.0 gstreamer-pbutils-1.0

SOURCES += \
src/main.cpp \
src/device_info.cpp \
src/rauc.cpp
src/rauc.cpp \
src/multimedia_formats.cpp

HEADERS += \
src/device_info.hpp \
src/rauc.hpp
src/rauc.hpp \
src/multimedia_formats.hpp

qmlsink {
PKGCONFIG = gstreamer-1.0
SOURCES += src/multimedia_qmlsink.cpp
HEADERS += src/multimedia_qmlsink.hpp
}
Expand Down
Loading