Skip to content

[qt] Fix qtmultimedia with gstreamer on windows #20555

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
BillyONeal merged 10 commits into from
Oct 11, 2021
Merged

[qt] Fix qtmultimedia with gstreamer on windows #20555

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
46b8460
apply patches to make qtmultimedia work with gestreamer on windows
Neumann-A Oct 6, 2021
ce44671
version stuff
Neumann-A Oct 6, 2021
856dc17
remove libnice from ci.baseline
Neumann-A Oct 6, 2021
0b4ce83
move gstreamer on osx as fail to baseline
Neumann-A Oct 6, 2021
aa95450
add supports field to qtmultimedia. Qt does not officially support x8…
Neumann-A Oct 6, 2021
f820a2c
version stuff
Neumann-A Oct 6, 2021
8219cb2
remove duplicated patch
Neumann-A Oct 7, 2021
9b35429
version stuff
Neumann-A Oct 7, 2021
252fff6
add upstream patch to fix x86-windows
Neumann-A Oct 7, 2021
4fd032e
[skip actions] version stuff
Neumann-A Oct 7, 2021
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
13 changes: 13 additions & 0 deletions ports/qtbase/fix_qthread_max.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h
Comment thread
JackBoosY marked this conversation as resolved.
index 5dc4d2222..1696dbc80 100644
--- a/src/corelib/thread/qthread.h
+++ b/src/corelib/thread/qthread.h
@@ -120,7 +120,7 @@ public:
bool wait(QDeadlineTimer deadline = QDeadlineTimer(QDeadlineTimer::Forever));
bool wait(unsigned long time)
{
- if (time == std::numeric_limits<unsigned long>::max())
+ if (time == (std::numeric_limits<unsigned long>::max)())
return wait(QDeadlineTimer(QDeadlineTimer::Forever));
return wait(QDeadlineTimer(time));
}
1 change: 1 addition & 0 deletions ports/qtbase/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ set(${PORT}_PATCHES
fix_cmake_build.patch
harfbuzz.patch
fix_egl.patch
fix_qthread_max.patch
)

if(NOT VCPKG_USE_HEAD_VERSION AND NOT QT_IS_LATEST)
Expand Down
2 changes: 1 addition & 1 deletion ports/qtbase/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "qtbase",
"version-semver": "6.2.0",
"port-version": 1,
"port-version": 2,
"description": "Qt Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.",
"homepage": "https://www.qt.io/",
"dependencies": [
Expand Down
36 changes: 36 additions & 0 deletions ports/qtmultimedia/FindGLIB_2.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 375d2c0ccb602df38ef8f49c5b3e0bf09c24bf46 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 13 Sep 2021 10:50:03 +0200
Subject: Fix build without pkg-config support

Fix several issues in cmake/Find* in the code path that's hit when
pkg-config is not used.

Pick-to: 6.2
Task-number: QTBUG-96401
Change-Id: Iac6af560976ba6408d877027ed44a0354d32d2b7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
---
cmake/FindGStreamer.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake/FindGStreamer.cmake')

diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
index 0624c1a77..c3becd731 100644
--- a/cmake/FindGStreamer.cmake
+++ b/cmake/FindGStreamer.cmake
@@ -53,8 +53,8 @@ function(find_gstreamer_component component prefix header library)
endif()
if(GStreamer_${component}_LIBRARY AND GStreamer_${component}_INCLUDE_DIR)
add_library(GStreamer::${component} INTERFACE IMPORTED)
- target_include_directories(GStreamer::${component} INTERFACE GStreamer_${component}_INCLUDE_DIR)
- target_link_libraries(GStreamer::${component} INTERFACE GStreamer_${component}_LIBRARY)
+ target_include_directories(GStreamer::${component} INTERFACE ${GStreamer_${component}_INCLUDE_DIR})
+ target_link_libraries(GStreamer::${component} INTERFACE ${GStreamer_${component}_LIBRARY})
endif()
mark_as_advanced(GStreamer_${component}_INCLUDE_DIR GStreamer_${component}_LIBRARY)
endif()
--
cgit v1.2.1
20 changes: 20 additions & 0 deletions ports/qtmultimedia/FindGObject.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
diff --git a/cmake/FindGObject.cmake b/cmake/FindGObject.cmake
index dc207a2..19a8a67 100644
--- a/cmake/FindGObject.cmake
+++ b/cmake/FindGObject.cmake
@@ -27,13 +27,13 @@
GLIB2::GLIB2
)
else()
- find_path(GGObject_INCLUDE_DIR
+ find_path(GObject_INCLUDE_DIR
NAMES gobject.h
PATH_SUFFIXES glib-2.0/gobject/
)
find_library(GObject_LIBRARY NAMES gobject-2.0)
if (GObject_LIBRARY AND GObject_INCLUDE_DIR)
- add_library(GObject::GObject IMPORTED)
+ add_library(GObject::GObject INTERFACE IMPORTED)
target_include_directories(GObject::GObject INTERFACE
${GObject_INCLUDE_DIR}
)
36 changes: 36 additions & 0 deletions ports/qtmultimedia/FindGStreamer.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 375d2c0ccb602df38ef8f49c5b3e0bf09c24bf46 Mon Sep 17 00:00:00 2001
From: Joerg Bornemann <joerg.bornemann@qt.io>
Date: Mon, 13 Sep 2021 10:50:03 +0200
Subject: Fix build without pkg-config support

Fix several issues in cmake/Find* in the code path that's hit when
pkg-config is not used.

Pick-to: 6.2
Task-number: QTBUG-96401
Change-Id: Iac6af560976ba6408d877027ed44a0354d32d2b7
Reviewed-by: Alexey Edelev <alexey.edelev@qt.io>
Reviewed-by: Doris Verria <doris.verria@qt.io>
---
cmake/FindGStreamer.cmake | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'cmake/FindGStreamer.cmake')

diff --git a/cmake/FindGStreamer.cmake b/cmake/FindGStreamer.cmake
index 0624c1a77..c3becd731 100644
--- a/cmake/FindGStreamer.cmake
+++ b/cmake/FindGStreamer.cmake
@@ -53,8 +53,8 @@ function(find_gstreamer_component component prefix header library)
endif()
if(GStreamer_${component}_LIBRARY AND GStreamer_${component}_INCLUDE_DIR)
add_library(GStreamer::${component} INTERFACE IMPORTED)
- target_include_directories(GStreamer::${component} INTERFACE GStreamer_${component}_INCLUDE_DIR)
- target_link_libraries(GStreamer::${component} INTERFACE GStreamer_${component}_LIBRARY)
+ target_include_directories(GStreamer::${component} INTERFACE ${GStreamer_${component}_INCLUDE_DIR})
+ target_link_libraries(GStreamer::${component} INTERFACE ${GStreamer_${component}_LIBRARY})
endif()
mark_as_advanced(GStreamer_${component}_INCLUDE_DIR GStreamer_${component}_LIBRARY)
endif()
--
cgit v1.2.1
5 changes: 4 additions & 1 deletion ports/qtmultimedia/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
set(SCRIPT_PATH "${CURRENT_INSTALLED_DIR}/share/qtbase")
include("${SCRIPT_PATH}/qt_install_submodule.cmake")

set(${PORT}_PATCHES fix_windows_header_include.patch)
set(${PORT}_PATCHES fix_windows_header_include.patch
FindGObject.patch
FindGStreamer.patch
remove_unistd.patch)

#Maybe TODO: ALSA + PulseAudio? (Missing Ports)

Expand Down
24 changes: 24 additions & 0 deletions ports/qtmultimedia/remove_unistd.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 *);
6 changes: 6 additions & 0 deletions ports/qtmultimedia/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
{
"name": "qtmultimedia",
"version-semver": "6.2.0",
"port-version": 1,
"description": "Qt Multimedia",
"homepage": "https://www.qt.io/",
"dependencies": [
Expand All @@ -11,6 +12,11 @@
"gui",
"network"
]
},
{
"name": "qtshadertools",
"host": true,
"default-features": false
}
],
"default-features": [
Expand Down
8 changes: 0 additions & 8 deletions scripts/ci.baseline.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -658,14 +658,6 @@ libmpeg2:x64-uwp=fail
libmupdf:x64-osx=fail
libmysql:x86-windows=fail
libmysql:arm64-windows=fail
#The official website of libnice https://nice.freedesktop.org cannot be accessed
libnice:x86-windows=skip
libnice:x64-windows=skip
libnice:x64-windows-static=skip
libnice:x64-uwp=skip
libnice:arm64-windows=skip
libnice:x64-linux=skip
libnice:x64-osx=skip
libopenmpt:x64-linux=fail
libopenmpt:x64-osx=fail
libopusenc:arm-uwp=fail
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5558,7 +5558,7 @@
},
"qtbase": {
"baseline": "6.2.0",
"port-version": 1
"port-version": 2
},
"qtcharts": {
"baseline": "6.2.0",
Expand Down Expand Up @@ -5606,7 +5606,7 @@
},
"qtmultimedia": {
"baseline": "6.2.0",
"port-version": 0
"port-version": 1
},
"qtnetworkauth": {
"baseline": "6.2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtbase.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "e7c78fd7fe6600eb96712f151670efc765bf5c31",
"version-semver": "6.2.0",
"port-version": 2
},
{
"git-tree": "01075dfd8097c54bd832400553958c2ff9bebf31",
"version-semver": "6.2.0",
Expand Down
5 changes: 5 additions & 0 deletions versions/q-/qtmultimedia.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "81807a40cbea8ae60157116be66aac62e682a588",
"version-semver": "6.2.0",
"port-version": 1
},
{
"git-tree": "3ddc9abc52e8df720dd1799b3ecaabe36bb5b7f3",
"version-semver": "6.2.0",
Expand Down