diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index f1121fb2..e1bd7d7f 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -33,7 +33,10 @@ pkg_check_modules(Xcb REQUIRED IMPORTED_TARGET xcb xcb-shape) pkg_check_modules(DBusextended REQUIRED IMPORTED_TARGET dbusextended-qt5) pkg_check_modules(Gst REQUIRED IMPORTED_TARGET gobject-2.0) # IMPORTED_TARGET failed to work for some of libs under flatpak env -pkg_check_modules(Other REQUIRED gsettings-qt) +pkg_check_modules(Other REQUIRED gsettings-qt) +pkg_check_modules(FFMPEG REQUIRED IMPORTED_TARGET libavcodec) + +include_directories(${FFMPEG_INCLUDE_DIRS}) qt5_add_resources(RCS ../assets/resources.qrc) qt5_add_resources(RCS ../assets/icons/theme-icons.qrc) @@ -41,7 +44,6 @@ if (${Dtk_VERSION} LESS 2.0.6.1) qt5_add_resources(RCS ../assets/theme.qrc) endif() - file(GLOB_RECURSE SRCS LIST_DIRECTORIES false common/*.cpp widgets/*.cpp libdmr/*.cpp vendor/*.cpp dlna/*.cpp dlna/*.c) list(APPEND SRCS main.cpp) diff --git a/src/backends/mpv/mpv_glwidget.cpp b/src/backends/mpv/mpv_glwidget.cpp index c9ec3d47..de52b408 100644 --- a/src/backends/mpv/mpv_glwidget.cpp +++ b/src/backends/mpv/mpv_glwidget.cpp @@ -14,6 +14,9 @@ #include #include + +#define GLAPIENTRY + //#include //#include "../../window/qplatformnativeinterface.h" //qpa/qplatformnativeinterface.h diff --git a/src/libdmr/CMakeLists.txt b/src/libdmr/CMakeLists.txt index c264f7e8..f84b2ec0 100644 --- a/src/libdmr/CMakeLists.txt +++ b/src/libdmr/CMakeLists.txt @@ -11,6 +11,7 @@ add_definitions(-D_LIBDMR_) remove_definitions(-D_MOVIE_USE_) pkg_check_modules(Gst REQUIRED IMPORTED_TARGET gstreamer-1.0 glib-2.0) +pkg_check_modules(other REQUIRED gsettings-qt) include_directories(${CMAKE_INCLUDE_CURRENT_DIR}) @@ -27,7 +28,7 @@ target_include_directories(${CMD_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/../common ${PROJECT_SOURCE_DIR}/../backends/mediaplayer ${PROJECT_SOURCE_DIR}/../backends/mpv /usr/include/glib-2.0 /usr/include/gstreamer-1.0) target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent - Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::Multimedia Qt5::MultimediaWidgets Qt5::DBus PkgConfig::Gst GL) + Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::Svg Qt5::Multimedia Qt5::MultimediaWidgets Qt5::DBus PkgConfig::Gst GL gsettings-qt) #target_link_libraries(${CMD_NAME} PkgConfig::Dtk Qt5::Widgets Qt5::Concurrent # Qt5::Network Qt5::X11Extras Qt5::Sql Qt5::DBus PkgConfig::AV GL png jpeg)