From d9ab90facf4b66b9ed9c2de2cbc4738eb017185e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Tue, 11 Aug 2020 10:33:11 +0300 Subject: [PATCH] Move Wayland/X11/EGL GL API back into GstGL-1.0.gir for backwards compatibility --- gir-files/GstGL-1.0.gir | 381 +++++++++++++++++++++++++++++++++ gir-files/GstGLEGL-1.0.gir | 198 ----------------- gir-files/GstGLWayland-1.0.gir | 120 ----------- gir-files/GstGLX11-1.0.gir | 114 ---------- gir-files/fix.sh | 8 +- 5 files changed, 385 insertions(+), 436 deletions(-) delete mode 100644 gir-files/GstGLEGL-1.0.gir delete mode 100644 gir-files/GstGLWayland-1.0.gir delete mode 100644 gir-files/GstGLX11-1.0.gir diff --git a/gir-files/GstGL-1.0.gir b/gir-files/GstGL-1.0.gir index 511584c07..8648544f8 100644 --- a/gir-files/GstGL-1.0.gir +++ b/gir-files/GstGL-1.0.gir @@ -10621,5 +10621,386 @@ or a valid GLSL version and/or profile. + + + the contents of a #GstGLDisplayEGL are private and should only be accessed +through the provided API + + + Create a new #GstGLDisplayEGL using the default EGL_DEFAULT_DISPLAY. + + + a new #GstGLDisplayEGL or %NULL + + + + + + + + + + + + + + + + Creates a EGL display connection from a native Display. + +This function will return the same value for multiple calls with the same +@display. + + + a new #GstGLDisplayEGL + + + + + an existing #GstGLDisplay + + + + + + Attempts to create a new `EGLDisplay` from @display. If @type is +%GST_GL_DISPLAY_TYPE_ANY, then @display must be 0. @type must not be +%GST_GL_DISPLAY_TYPE_NONE. + + + A `EGLDisplay` or `EGL_NO_DISPLAY` + + + + + a #GstGLDisplayType + + + + pointer to a display (or 0) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the contents of a #GstGLDisplayWayland are private and should only be accessed +through the provided API + + + Create a new #GstGLDisplayWayland from the wayland display name. See `wl_display_connect`() +for details on what is a valid name. + + + a new #GstGLDisplayWayland or %NULL + + + + + a display name + + + + + + Creates a new display connection from a wl_display Display. + + + a new #GstGLDisplayWayland + + + + + an existing, wayland display + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + the contents of a #GstGLDisplayX11 are private and should only be accessed +through the provided API + + + Create a new #GstGLDisplayX11 from the x11 display name. See `XOpenDisplay`() +for details on what is a valid name. + + + a new #GstGLDisplayX11 or %NULL + + + + + a display name + + + + + + Creates a new display connection from a X11 Display. + + + a new #GstGLDisplayX11 + + + + + an existing, x11 display + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/gir-files/GstGLEGL-1.0.gir b/gir-files/GstGLEGL-1.0.gir deleted file mode 100644 index d1f869765..000000000 --- a/gir-files/GstGLEGL-1.0.gir +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - - - - - the contents of a #GstGLDisplayEGL are private and should only be accessed -through the provided API - - - Create a new #GstGLDisplayEGL using the default EGL_DEFAULT_DISPLAY. - - - a new #GstGLDisplayEGL or %NULL - - - - - - - - - - - - - - - - Creates a EGL display connection from a native Display. - -This function will return the same value for multiple calls with the same -@display. - - - a new #GstGLDisplayEGL - - - - - an existing #GstGLDisplay - - - - - - Attempts to create a new `EGLDisplay` from @display. If @type is -%GST_GL_DISPLAY_TYPE_ANY, then @display must be 0. @type must not be -%GST_GL_DISPLAY_TYPE_NONE. - - - A `EGLDisplay` or `EGL_NO_DISPLAY` - - - - - a #GstGLDisplayType - - - - pointer to a display (or 0) - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gir-files/GstGLWayland-1.0.gir b/gir-files/GstGLWayland-1.0.gir deleted file mode 100644 index 0efcd7a1d..000000000 --- a/gir-files/GstGLWayland-1.0.gir +++ /dev/null @@ -1,120 +0,0 @@ - - - - - - - - - - - - the contents of a #GstGLDisplayWayland are private and should only be accessed -through the provided API - - - Create a new #GstGLDisplayWayland from the wayland display name. See `wl_display_connect`() -for details on what is a valid name. - - - a new #GstGLDisplayWayland or %NULL - - - - - a display name - - - - - - Creates a new display connection from a wl_display Display. - - - a new #GstGLDisplayWayland - - - - - an existing, wayland display - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gir-files/GstGLX11-1.0.gir b/gir-files/GstGLX11-1.0.gir deleted file mode 100644 index 29f107086..000000000 --- a/gir-files/GstGLX11-1.0.gir +++ /dev/null @@ -1,114 +0,0 @@ - - - - - - - - - - - - the contents of a #GstGLDisplayX11 are private and should only be accessed -through the provided API - - - Create a new #GstGLDisplayX11 from the x11 display name. See `XOpenDisplay`() -for details on what is a valid name. - - - a new #GstGLDisplayX11 or %NULL - - - - - a display name - - - - - - Creates a new display connection from a X11 Display. - - - a new #GstGLDisplayX11 - - - - - an existing, x11 display - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/gir-files/fix.sh b/gir-files/fix.sh index ce941fb42..5b5db6c2e 100755 --- a/gir-files/fix.sh +++ b/gir-files/fix.sh @@ -23,7 +23,7 @@ xmlstarlet ed --pf --inplace \ --value gpointer \ --update '//*[@c:type="wl_shell*"]/@c:type' \ --value gpointer \ - GstGLWayland-1.0.gir + GstGL-1.0.gir # Change X11's Display* and xcb_connection_t* pointers to gpointer xmlstarlet ed --pf --inplace \ @@ -35,7 +35,7 @@ xmlstarlet ed --pf --inplace \ --value gpointer \ --update '//*[@c:type="xcb_connection_t*"]/@c:type' \ --value gpointer \ - GstGLX11-1.0.gir + GstGL-1.0.gir # Remove GstMemoryEGL and EGLImage xmlstarlet ed --pf --inplace \ @@ -56,12 +56,12 @@ xmlstarlet ed --pf --inplace \ --delete '//_:function-macro[starts-with(@name, "GL_MEMORY_EGL")]' \ --delete '//_:function-macro[starts-with(@name, "IS_EGL_IMAGE")]' \ --delete '//_:function-macro[starts-with(@name, "IS_GL_MEMORY_EGL")]' \ - GstGLEGL-1.0.gir + GstGL-1.0.gir xmlstarlet ed --pf --inplace \ --delete '//_:method[@c:identifier="gst_gl_display_egl_from_gl_display"]' \ --delete '//_:method[@c:identifier="egl_from_gl_display"]' \ - GstGLEGL-1.0.gir + GstGL-1.0.gir # Remove all libcheck related API xmlstarlet ed --pf --inplace \