gl/vulkan: Fix static linking on macOS

duplicate symbol '__invoke_on_main' in:
    /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgstvulkan-1.0.a(cocoa_gstvkwindow_cocoa.m.o)
    /Library/Frameworks/GStreamer.framework/Versions/1.0/lib/libgstgl-1.0.a(cocoa_gstglwindow_cocoa.m.o)
ld: 1 duplicate symbol for architecture x86_64
clang: error: linker command failed with exit code 1 (use -v to see invocation)

Also make the same change in iOS for consistency.

Continuation of https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1132

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/3242>

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkcocoa_utils.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkcocoa_utils.h
index 8958854..7763105 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkcocoa_utils.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkcocoa_utils.h
@@ -49,7 +49,7 @@ G_BEGIN_DECLS
 typedef void (*GstVulkanWindowFunc) (gpointer data);
 
 G_GNUC_INTERNAL
-void _invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify);
+void _gst_vk_invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify);
 
 G_END_DECLS
 

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m
index 4a58c07..8e4a91e 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/cocoa/gstvkwindow_cocoa.m
@@ -155,8 +155,8 @@ gst_vulkan_window_cocoa_show (GstVulkanWindow * window)
   GstVulkanWindowCocoaPrivate *priv = GET_PRIV (window_cocoa);
 
   if (!priv->visible)
-    _invoke_on_main ((GstVulkanWindowFunc) _show_window, gst_object_ref (window),
-        (GDestroyNotify) gst_object_unref);
+    _gst_vk_invoke_on_main ((GstVulkanWindowFunc) _show_window,
+        gst_object_ref (window), (GDestroyNotify) gst_object_unref);
 }
 
 static void
@@ -197,7 +197,7 @@ _create_window (GstVulkanWindowCocoa * window_cocoa)
 gboolean
 gst_vulkan_window_cocoa_create_window (GstVulkanWindowCocoa * window_cocoa)
 {
-  _invoke_on_main ((GstVulkanWindowFunc) _create_window,
+  _gst_vk_invoke_on_main ((GstVulkanWindowFunc) _create_window,
       gst_object_ref (window_cocoa), gst_object_unref);
 
   g_usleep(1000000);
@@ -277,8 +277,8 @@ _close_window (gpointer * data)
 static void
 gst_vulkan_window_cocoa_close (GstVulkanWindow * window)
 {
-  _invoke_on_main ((GstVulkanWindowFunc) _close_window, gst_object_ref (window),
-      (GDestroyNotify) gst_object_unref);
+  _gst_vk_invoke_on_main ((GstVulkanWindowFunc) _close_window,
+      gst_object_ref (window), (GDestroyNotify) gst_object_unref);
 
   GST_VULKAN_WINDOW_CLASS (parent_class)->close (window);
 }
@@ -359,7 +359,7 @@ gst_vulkan_window_cocoa_close (GstVulkanWindow * window)
 @end
 
 void
-_invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify)
+_gst_vk_invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify)
 {
   if ([NSThread isMainThread]) {
     func (data);

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkios_utils.h b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkios_utils.h
index 200d7cf..f7580f0 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkios_utils.h
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkios_utils.h
@@ -35,7 +35,7 @@ G_BEGIN_DECLS
 typedef void (*GstVulkanWindowFunc) (gpointer data);
 
 G_GNUC_INTERNAL
-void _invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify);
+void _gst_vk_invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify);
 
 G_END_DECLS
 

diff --git a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m
index 12ec2ad..7bd4e28 100644 (file)
--- a/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m
+++ b/subprojects/gst-plugins-bad/gst-libs/gst/vulkan/ios/gstvkwindow_ios.m
@@ -178,7 +178,7 @@ gst_vulkan_window_ios_create_window (GstVulkanWindowIos * window_ios)
     return FALSE;
   }
 
-  _invoke_on_main ((GstVulkanWindowFunc) _create_window,
+  _gst_vk_invoke_on_main ((GstVulkanWindowFunc) _create_window,
       gst_object_ref (window_ios), gst_object_unref);
 
   /* XXX: Maybe we need an async create_window/get_surface()? */
@@ -315,7 +315,7 @@ gst_vulkan_window_ios_set_window_handle (GstVulkanWindow * window,
 @end
 
 void
-_invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify)
+_gst_vk_invoke_on_main (GstVulkanWindowFunc func, gpointer data, GDestroyNotify notify)
 {
   if ([NSThread isMainThread]) {
     func (data);

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstgl_cocoa_private.h b/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstgl_cocoa_private.h
index 50819a1..c414a82 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstgl_cocoa_private.h
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstgl_cocoa_private.h
@@ -61,7 +61,7 @@ struct _GstGLContextCocoaPrivate
 gboolean gst_gl_window_cocoa_create_window (GstGLWindowCocoa *window_cocoa);
 
 G_GNUC_INTERNAL
-void _invoke_on_main (GstGLWindowCB func, gpointer data, GDestroyNotify notify);
+void _gst_gl_invoke_on_main (GstGLWindowCB func, gpointer data, GDestroyNotify notify);
 
 G_END_DECLS
 

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m b/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m
index 6b618d2..21ff951 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglcontext_cocoa.m
@@ -313,7 +313,7 @@ gst_gl_context_cocoa_create_context (GstGLContext *context, GstGLAPI gl_api,
   context_cocoa->priv->pixel_format = fmt;
   context_cocoa->priv->gl_context = glContext;
 
-  _invoke_on_main ((GstGLWindowCB) gst_gl_window_cocoa_create_window,
+  _gst_gl_invoke_on_main ((GstGLWindowCB) gst_gl_window_cocoa_create_window,
       gst_object_ref (window_cocoa), (GDestroyNotify) gst_object_unref);
 
   if (!context_cocoa->priv->gl_context) {

diff --git a/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
index a151a60..ba9d892 100644 (file)
--- a/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
+++ b/subprojects/gst-plugins-base/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
@@ -263,8 +263,8 @@ _close_window (gpointer * data)
 static void
 gst_gl_window_cocoa_close (GstGLWindow * window)
 {
-  _invoke_on_main ((GstGLWindowCB) _close_window, gst_object_ref (window),
-      (GDestroyNotify) gst_object_unref);
+  _gst_gl_invoke_on_main ((GstGLWindowCB) _close_window,
+      gst_object_ref (window), (GDestroyNotify) gst_object_unref);
 }
 
 static guintptr
@@ -346,8 +346,8 @@ gst_gl_window_cocoa_show (GstGLWindow * window)
     }
 
     if (!priv->external_view && !priv->visible)
-      _invoke_on_main ((GstGLWindowCB) _show_window, gst_object_ref (window),
-          (GDestroyNotify) gst_object_unref);
+      _gst_gl_invoke_on_main ((GstGLWindowCB) _show_window,
+          gst_object_ref (window), (GDestroyNotify) gst_object_unref);
   }
 }
 
@@ -579,8 +579,8 @@ gst_gl_window_cocoa_set_render_rectangle (GstGLWindow * window, gint x, gint y,
  render->rect.w = width;
  render->rect.h = height;
 
- _invoke_on_main ((GstGLWindowCB) _set_render_rectangle, render,
-                  (GDestroyNotify) _free_set_render_rectangle);
+ _gst_gl_invoke_on_main ((GstGLWindowCB) _set_render_rectangle, render,
+     (GDestroyNotify) _free_set_render_rectangle);
 
  return TRUE;
 }
@@ -732,7 +732,7 @@ close_window_cb (gpointer data)
 @end
 
 void
-_invoke_on_main (GstGLWindowCB func, gpointer data, GDestroyNotify notify)
+_gst_gl_invoke_on_main (GstGLWindowCB func, gpointer data, GDestroyNotify notify)
 {
   if ([NSThread isMainThread]) {
     func (data);