Skip to content

Add qmlglsink #13

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

Open
Michal-Szczepaniak wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add qmlglsink #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 43 additions & 0 deletions rpm/0003-qml-Fix-build-with-Qt-5.6.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matti=20Lehtim=C3=A4ki?= <matti.lehtimaki@jolla.com>
Date: Fri, 20 Feb 2026 01:47:48 +0200
Subject: [PATCH] qml: Fix build with Qt 5.6

---
subprojects/gst-plugins-good/ext/qt/gstqtglutility.cc | 4 ++--
subprojects/gst-plugins-good/ext/qt/gstqtglutility.h | 2 ++
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/subprojects/gst-plugins-good/ext/qt/gstqtglutility.cc b/subprojects/gst-plugins-good/ext/qt/gstqtglutility.cc
index a9d2f38fe35cbb0087b3a35307bf42970d7b4775..3eb8244c9494bc0b4d6b42548ffcc735d4c8c20c 100644
--- a/subprojects/gst-plugins-good/ext/qt/gstqtglutility.cc
+++ b/subprojects/gst-plugins-good/ext/qt/gstqtglutility.cc
@@ -327,7 +327,7 @@ qt_opengl_native_context_from_gst_gl_context (GstGLContext * context)
"on wayland. See https://bugreports.qt.io/browse/QTBUG-82528");
gst_object_unref (display_egl);
gst_object_unref (display);
- return QVariant::fromValue(nullptr);
+ return QVariant();
#else
if (display_egl)
egl_display = (EGLDisplay) gst_gl_display_get_handle ((GstGLDisplay *) display_egl);
@@ -356,5 +356,5 @@ qt_opengl_native_context_from_gst_gl_context (GstGLContext * context)
platform_s);
g_free (platform_s);
}
- return QVariant::fromValue(nullptr);
+ return QVariant();
}
diff --git a/subprojects/gst-plugins-good/ext/qt/gstqtglutility.h b/subprojects/gst-plugins-good/ext/qt/gstqtglutility.h
index 7b02bca7a7bfc729f0eb0ff0c423c23dbc42ab74..8ba32ae6f67c49204f397a41bd36ea23e9bd6255 100644
--- a/subprojects/gst-plugins-good/ext/qt/gstqtglutility.h
+++ b/subprojects/gst-plugins-good/ext/qt/gstqtglutility.h
@@ -24,6 +24,8 @@
#include <gst/gst.h>
#include <gst/gl/gl.h>

+#include <functional>
+
#include <QVariant>
#include <QRunnable>

11 changes: 10 additions & 1 deletion rpm/gst-plugins-good.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ URL: https://github.com/sailfishos/gst-plugins-good
Source: %{name}-%{version}.tar.xz
Patch0: 0001-Set-specific-media.role-for-pulsesink-probe.patch
Patch1: 0002-qtmux-write-rotation-information-into-the-TKHD-matri.patch
Patch2: 0003-qml-Fix-build-with-Qt-5.6.patch

%define sonamever %(echo %{version} | cut -d '+' -f 1)

Expand All @@ -31,6 +32,12 @@ BuildRequires: pkgconfig(libmpg123)
BuildRequires: pkgconfig(gudev-1.0)
BuildRequires: pkgconfig(gstreamer-plugins-base-1.0) >= %{sonamever}
BuildRequires: pkgconfig(orc-0.4) >= 0.4.18
BuildRequires: pkgconfig(Qt5Core)
BuildRequires: pkgconfig(Qt5Gui)
BuildRequires: pkgconfig(Qt5Qml)
BuildRequires: pkgconfig(Qt5Quick)
BuildRequires: pkgconfig(Qt5WaylandClient)
BuildRequires: qt5-qttools-linguist
BuildRequires: bzip2-devel
BuildRequires: meson
BuildRequires: libtool
Expand Down Expand Up @@ -69,8 +76,9 @@ plug-ins.
-Dnls=disabled \
-Dorc=enabled \
-Doss=disabled -Doss4=disabled \
-Dqt5=disabled \
-Dqt5=enabled \
-Dqt6=disabled \
-Dqt-x11=disabled \
-Drpicamsrc=disabled \
-Dshout2=disabled \
-Dtaglib=disabled \
Expand Down Expand Up @@ -137,6 +145,7 @@ rm -fr $RPM_BUILD_ROOT%{_mandir}
%{_libdir}/gstreamer-%{majorminor}/libgstnavigationtest.so
%{_libdir}/gstreamer-%{majorminor}/libgstpng.so
%{_libdir}/gstreamer-%{majorminor}/libgstpulseaudio.so
%{_libdir}/gstreamer-%{majorminor}/libgstqmlgl.so
%{_libdir}/gstreamer-%{majorminor}/libgstreplaygain.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtpmanager.so
%{_libdir}/gstreamer-%{majorminor}/libgstrtp.so
Expand Down