From 5f68286245dbdfc1376522d96961ac148a9a5ceb Mon Sep 17 00:00:00 2001
From: Neel Chauhan <nc@FreeBSD.org>
Date: Mon, 2 Aug 2021 16:50:13 -0700
Subject: [PATCH] graphics/gstreamer1-plugins-qt: Prepare for glib 2.68.3

PR:	256200
---
 .../files/patch-ext_qt_gstqsgtexture.cc       | 11 ++++++++++
 .../files/patch-ext_qt_gstqtglutility.cc      | 15 ++++++++++++++
 .../files/patch-ext_qt_qtitem.cc              | 11 ++++++++++
 .../files/patch-ext_qt_qtwindow.cc            | 20 +++++++++++++++++++
 4 files changed, 57 insertions(+)
 create mode 100644 multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqsgtexture.cc
 create mode 100644 multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqtglutility.cc
 create mode 100644 multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtitem.cc
 create mode 100644 multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtwindow.cc

diff --git a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqsgtexture.cc b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqsgtexture.cc
new file mode 100644
index 000000000000..04beb939a5af
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqsgtexture.cc
@@ -0,0 +1,11 @@
+--- ext/qt/gstqsgtexture.cc.orig	2021-08-02 23:41:35 UTC
++++ ext/qt/gstqsgtexture.cc
+@@ -39,7 +39,7 @@ GstQSGTexture::GstQSGTexture ()
+ 
+   initializeOpenGLFunctions();
+ 
+-  if (g_once_init_enter (&_debug)) {
++  if (g_once_init_enter ((unsigned long *)&_debug)) {
+     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtqsgtexture", 0,
+         "Qt Scenegraph Texture");
+     g_once_init_leave (&_debug, 1);
diff --git a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqtglutility.cc b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqtglutility.cc
new file mode 100644
index 000000000000..5f8a46fa4fbb
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_gstqtglutility.cc
@@ -0,0 +1,15 @@
+--- ext/qt/gstqtglutility.cc.orig	2021-08-02 23:37:36 UTC
++++ ext/qt/gstqtglutility.cc
+@@ -62,10 +62,10 @@ gst_qt_get_gl_display ()
+ 
+   g_assert (app != NULL);
+ 
+-  if (g_once_init_enter (&_debug)) {
++  if (g_once_init_enter ((unsigned long *)&_debug)) {
+     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglutility", 0,
+         "Qt gl utility functions");
+-    g_once_init_leave (&_debug, 1);
++    g_once_init_leave ((unsigned long *)&_debug, 1);
+   }
+   GST_INFO ("QGuiApplication::instance()->platformName() %s", app->platformName().toUtf8().data());
+ 
diff --git a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtitem.cc b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtitem.cc
new file mode 100644
index 000000000000..de63d41826cb
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtitem.cc
@@ -0,0 +1,11 @@
+--- ext/qt/qtitem.cc.orig	2021-08-02 23:44:43 UTC
++++ ext/qt/qtitem.cc
+@@ -104,7 +104,7 @@ QtGLVideoItem::QtGLVideoItem()
+ {
+   static volatile gsize _debug;
+ 
+-  if (g_once_init_enter (&_debug)) {
++  if (g_once_init_enter ((unsigned long *)&_debug)) {
+     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget");
+     g_once_init_leave (&_debug, 1);
+   }
diff --git a/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtwindow.cc b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtwindow.cc
new file mode 100644
index 000000000000..42703a0fc2bb
--- /dev/null
+++ b/multimedia/gstreamer1-plugins-good/files/patch-ext_qt_qtwindow.cc
@@ -0,0 +1,20 @@
+--- ext/qt/qtwindow.cc.orig	2021-08-02 23:46:48 UTC
++++ ext/qt/qtwindow.cc
+@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindo
+ 
+   g_assert (app != NULL);
+ 
+-  if (g_once_init_enter (&_debug)) {
++  if (g_once_init_enter ((unsigned long *)&_debug)) {
+     GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwindow", 0, "Qt GL QuickWindow");
+     g_once_init_leave (&_debug, 1);
+   }
+@@ -153,7 +153,7 @@ QtGLWindow::beforeRendering()
+   g_mutex_lock (&this->priv->lock);
+ 
+   static volatile gsize once = 0;
+-  if (g_once_init_enter(&once)) {
++  if (g_once_init_enter((unsigned long *)&once)) {
+     this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch();
+     g_once_init_leave(&once,1);
+   }