From 2096a29b0605021df57985d00d885a42207044f0 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 29 Apr 2024 14:18:55 +0200
Subject: [PATCH] build: Remove an old workaround

The workaround only triggered in GStreamer < 1.19.1 but we require 1.23
now.
---
 modules/media/gtkgstsink.c | 12 ------------
 modules/media/meson.build  |  9 +--------
 2 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/modules/media/gtkgstsink.c b/modules/media/gtkgstsink.c
index 587c5fa3da..5242bfd03e 100644
--- a/modules/media/gtkgstsink.c
+++ b/modules/media/gtkgstsink.c
@@ -685,20 +685,8 @@ gtk_gst_sink_initialize_gl (GtkGstSink *self)
 
           if (gl_api & (GST_GL_API_OPENGL3 | GST_GL_API_OPENGL))
             {
-#ifdef HAVE_GST_GL_DISPLAY_NEW_WITH_TYPE
               self->gst_display = gst_gl_display_new_with_type (GST_GL_DISPLAY_TYPE_WIN32);
-#else
-#if GST_GL_HAVE_PLATFORM_EGL
-              g_message ("If media fails to play, set the envvar `GST_DEBUG=1`, and if GstGL context creation fails");
-              g_message ("due to \"Couldn't create GL context: Cannot share context with non-EGL context\",");
-              g_message ("set in the environment `GST_GL_PLATFORM=wgl` and `GST_GL_WINDOW=win32`,");
-              g_message ("and restart the GTK application");
-#endif
-
-              self->gst_display = gst_gl_display_new ();
-#endif
             }
-
 #if GST_GL_HAVE_PLATFORM_EGL
           else
             {
diff --git a/modules/media/meson.build b/modules/media/meson.build
index 4b401fae9d..9ee3e964b9 100644
--- a/modules/media/meson.build
+++ b/modules/media/meson.build
@@ -6,13 +6,6 @@ extra_c_args = ['-DGTK_COMPILATION']
 extra_c_args += common_cflags
 
 if gstplayer_dep.found() and gstgl_dep.found() and gstallocators_dep.found()
-  extra_win_cflags = []
-
-  if host_machine.system() == 'windows' and gstgl_dep.version().version_compare('>=1.19.1')
-    message('libgstgl has gst_gl_display_new_with_type()')
-    extra_win_cflags += '-DHAVE_GST_GL_DISPLAY_NEW_WITH_TYPE'
-  endif
-
   media_backends += 'gstreamer'
   cdata.set('HAVE_GSTREAMER', 1)
   media_gst_deps = [ libm, libgtk_dep, gstplayer_dep, gstgl_dep, gstallocators_dep ]
@@ -23,7 +16,7 @@ if gstplayer_dep.found() and gstgl_dep.found() and gstallocators_dep.found()
       'gtkgstpaintable.c',
       'gtkgstsink.c',
     ],
-    c_args: extra_c_args + extra_win_cflags,
+    c_args: extra_c_args,
     dependencies: media_gst_deps,
     name_suffix: module_suffix,
     install_dir: media_install_dir,