early-access version 2853

This commit is contained in:
pineappleEA
2022-07-23 03:01:36 +02:00
parent 1f2b5081b5
commit 1f111bb69c
8955 changed files with 418777 additions and 999 deletions

View File

@@ -0,0 +1,13 @@
diff --git a/src/multimedia/platform/windows/qwindowsmediadevices_p.h b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
index 23e349e02..233a816d4 100644
--- a/src/multimedia/platform/windows/qwindowsmediadevices_p.h
+++ b/src/multimedia/platform/windows/qwindowsmediadevices_p.h
@@ -56,7 +56,7 @@
#include <qset.h>
#include <qaudio.h>
#include <qaudiodevice.h>
-#include <windows.h>
+#include <QtCore/qt_windows.h>
struct IMMDeviceEnumerator;

View File

@@ -0,0 +1,52 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")
set(${PORT}_PATCHES fix_windows_header_include.patch
remove_unistd.patch
)
#Maybe TODO: ALSA + PulseAudio? (Missing Ports) -> check ALSA since it was added
# qt_find_package(ALSA PROVIDED_TARGETS ALSA::ALSA MODULE_NAME multimedia QMAKE_LIB alsa)
# qt_find_package(AVFoundation PROVIDED_TARGETS AVFoundation::AVFoundation MODULE_NAME multimedia QMAKE_LIB avfoundation)
# qt_find_package(WrapPulseAudio PROVIDED_TARGETS WrapPulseAudio::WrapPulseAudio MODULE_NAME multimedia QMAKE_LIB pulseaudio)
# qt_find_package(WMF PROVIDED_TARGETS WMF::WMF MODULE_NAME multimedia QMAKE_LIB wmf)
# qt_configure_add_summary_section(NAME "Qt Multimedia")
# qt_configure_add_summary_entry(ARGS "alsa")
# qt_configure_add_summary_entry(ARGS "gstreamer_1_0")
# qt_configure_add_summary_entry(ARGS "linux_v4l")
# qt_configure_add_summary_entry(ARGS "pulseaudio")
# qt_configure_add_summary_entry(ARGS "mmrenderer")
# qt_configure_add_summary_entry(ARGS "avfoundation")
# qt_configure_add_summary_entry(ARGS "wmf")
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
FEATURES
"qml" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Quick
"widgets" CMAKE_REQUIRE_FIND_PACKAGE_Qt6Widgets
#"gstreamer" CMAKE_REQUIRE_FIND_PACKAGE_GStreamer
INVERTED_FEATURES
"qml" CMAKE_DISABLE_FIND_PACKAGE_Qt6Quick
"widgets" CMAKE_DISABLE_FIND_PACKAGE_Qt6Widgets
"gstreamer" CMAKE_DISABLE_FIND_PACKAGE_GStreamer
)
if("gstreamer" IN_LIST FEATURES)
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='yes'")
else()
list(APPEND FEATURE_OPTIONS "-DINPUT_gstreamer='no'")
endif()
if(VCPKG_TARGET_IS_LINUX)
list(APPEND FEATURE_OPTIONS "-DFEATURE_alsa=ON")
list(APPEND FEATURE_OPTIONS "-DCMAKE_REQUIRE_FIND_PACKAGE_ALSA=ON")
else()
list(APPEND FEATURE_OPTIONS "-DCMAKE_DISABLE_FIND_PACKAGE_ALSA=ON")
endif()
qt_install_submodule(PATCHES ${${PORT}_PATCHES}
CONFIGURE_OPTIONS ${FEATURE_OPTIONS}
CONFIGURE_OPTIONS_RELEASE
CONFIGURE_OPTIONS_DEBUG
)

View File

@@ -0,0 +1,24 @@
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp
index d4806b23a..f985a973b 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosink.cpp
@@ -45,7 +45,6 @@
#include "qgstreameraudiosink_p.h"
#include "qgstreameraudiodevice_p.h"
#include <sys/types.h>
-#include <unistd.h>
#include <private/qgstpipeline_p.h>
#include <private/qgstappsrc_p.h>
diff --git a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
index 51fc26c42..3b04a77bb 100644
--- a/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
+++ b/src/multimedia/platform/gstreamer/audio/qgstreameraudiosource.cpp
@@ -45,7 +45,6 @@
#include "qgstreameraudiosource_p.h"
#include "qgstreameraudiodevice_p.h"
#include <sys/types.h>
-#include <unistd.h>
#include <gst/gst.h>
Q_DECLARE_OPAQUE_POINTER(GstSample *);

59
externals/vcpkg/ports/qtmultimedia/vcpkg.json vendored Executable file
View File

@@ -0,0 +1,59 @@
{
"name": "qtmultimedia",
"version": "6.3.0",
"description": "Qt Multimedia",
"homepage": "https://www.qt.io/",
"license": null,
"dependencies": [
{
"name": "alsa",
"platform": "linux"
},
{
"name": "qtbase",
"default-features": false,
"features": [
"gui",
"network"
]
},
{
"name": "qtshadertools",
"host": true,
"default-features": false
}
],
"default-features": [
"widgets"
],
"features": {
"gstreamer": {
"description": "Build with gstreamer",
"dependencies": [
"angle",
"gstreamer"
]
},
"qml": {
"description": "Build QML imports",
"dependencies": [
{
"name": "qtdeclarative",
"default-features": false
}
]
},
"widgets": {
"description": "Build Multimedia Widgets",
"dependencies": [
{
"name": "qtbase",
"default-features": false,
"features": [
"widgets"
]
}
]
}
}
}