Rename plugin filesnames to match plugin names

- libgstgtksink.so -> libgstgtk.so
- libgstteletextdec.so -> libgstteletex.so
- libgstcamerabin2.so -> libgstcamerabin.so
- libgstonvif.so -> libgstrtponvif.so (meson only)
- sdp -> sdpelem (avoid clash with libgstsdp)
- gstsiren -> siren
- libgstkmssink.so -> libgstkms.so

https://bugzilla.gnome.org/show_bug.cgi?id=779344

diff --git a/docs/plugins/inspect/plugin-gtk.xml b/docs/plugins/inspect/plugin-gtk.xml
new file mode 100644 (file)
index 0000000..3822e8b
--- /dev/null
+++ b/docs/plugins/inspect/plugin-gtk.xml
@@ -0,0 +1,43 @@
+<plugin>
+  <name>gtk</name>
+  <description>Gtk+ sink</description>
+  <filename>../../ext/gtk/.libs/libgstgtk.so</filename>
+  <basename>libgstgtk.so</basename>
+  <version>1.11.2.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-bad</source>
+  <package>GStreamer Bad Plug-ins git</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+    <element>
+      <name>gtkglsink</name>
+      <longname>Gtk GL Video Sink</longname>
+      <class>Sink/Video</class>
+      <description>A video sink that renders to a GtkWidget using OpenGL</description>
+      <author>Matthew Waters &lt;matthew@centricular.com&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>video/x-raw(memory:GLMemory), format=(string)RGBA, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]; video/x-raw(memory:GLMemory, meta:GstVideoOverlayComposition), format=(string)RGBA, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
+        </caps>
+      </pads>
+    </element>
+    <element>
+      <name>gtksink</name>
+      <longname>Gtk Video Sink</longname>
+      <class>Sink/Video</class>
+      <description>A video sink that renders to a GtkWidget</description>
+      <author>Matthew Waters &lt;matthew@centricular.com&gt;</author>
+      <pads>
+        <caps>
+          <name>sink</name>
+          <direction>sink</direction>
+          <presence>always</presence>
+          <details>video/x-raw, format=(string){ BGRx, BGRA }, width=(int)[ 1, 2147483647 ], height=(int)[ 1, 2147483647 ], framerate=(fraction)[ 0/1, 2147483647/1 ]</details>
+        </caps>
+      </pads>
+    </element>
+  </elements>
+</plugin>
\ No newline at end of file

diff --git a/docs/plugins/inspect/plugin-sdp.xml b/docs/plugins/inspect/plugin-sdpelem.xml
similarity index 92%
rename from docs/plugins/inspect/plugin-sdp.xml
rename to docs/plugins/inspect/plugin-sdpelem.xml
index 0d6135c..d9e9683 100644 (file)
--- a/docs/plugins/inspect/plugin-sdp.xml
+++ b/docs/plugins/inspect/plugin-sdpelem.xml
@@ -1,12 +1,12 @@
 <plugin>
-  <name>sdp</name>
+  <name>sdpelem</name>
   <description>configure streaming sessions using SDP</description>
   <filename>../../gst/sdp/.libs/libgstsdpelem.so</filename>
   <basename>libgstsdpelem.so</basename>
-  <version>1.11.2</version>
+  <version>1.11.2.1</version>
   <license>LGPL</license>
   <source>gst-plugins-bad</source>
-  <package>GStreamer Bad Plug-ins source release</package>
+  <package>GStreamer Bad Plug-ins git</package>
   <origin>Unknown package origin</origin>
   <elements>
     <element>

diff --git a/ext/fluidsynth/meson.build b/ext/fluidsynth/meson.build
index d732b93..610c4b8 100644 (file)
--- a/ext/fluidsynth/meson.build
+++ b/ext/fluidsynth/meson.build
@@ -1,7 +1,7 @@
 fluidsynth_dep = dependency('fluidsynth', version : '>= 1.0', required : false)
 
 if fluidsynth_dep.found()
-  gstfluidsynth = library('gstfluidsynth',
+  gstfluidsynth = library('gstfluidsynthmidi',
     'gstfluiddec.c',
     c_args : gst_plugins_bad_args,
     include_directories : [configinc],

diff --git a/ext/gtk/Makefile.am b/ext/gtk/Makefile.am
index 8484677..fdf860f 100644 (file)
--- a/ext/gtk/Makefile.am
+++ b/ext/gtk/Makefile.am
@@ -21,29 +21,29 @@ sources = \
        gstplugin.c \
        $(NULL)
 
-libgstgtksink_la_CFLAGS = \
+libgstgtk_la_CFLAGS = \
        -I$(top_srcdir)/gst-libs \
        -I$(top_builddir)/gst-libs \
        $(GTK3_CFLAGS) \
        $(GST_CFLAGS) \
        $(GST_BASE_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS)
-libgstgtksink_la_LIBADD = \
+libgstgtk_la_LIBADD = \
        $(GTK3_LIBS) \
        $(GST_BASE_LIBS) \
        $(GST_PLUGINS_BASE_LIBS) \
        -lgstvideo-$(GST_API_VERSION)
 
-libgstgtksink_la_SOURCES = $(sources)
-libgstgtksink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstgtksink_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstgtk_la_SOURCES = $(sources)
+libgstgtk_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstgtk_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 if USE_GTK3_GL
 if USE_GL
-libgstgtksink_la_SOURCES += gstgtkglsink.c gstgtkglsink.h gtkgstglwidget.c gtkgstglwidget.h
-libgstgtksink_la_LIBADD += \
+libgstgtk_la_SOURCES += gstgtkglsink.c gstgtkglsink.h gtkgstglwidget.c gtkgstglwidget.h
+libgstgtk_la_LIBADD += \
        $(top_builddir)/gst-libs/gst/gl/libgstgl-$(GST_API_VERSION).la
 endif
 endif
 
-plugin_LTLIBRARIES = libgstgtksink.la
+plugin_LTLIBRARIES = libgstgtk.la

diff --git a/ext/gtk/gstplugin.c b/ext/gtk/gstplugin.c
index 4c5d26b..ed27578 100644 (file)
--- a/ext/gtk/gstplugin.c
+++ b/ext/gtk/gstplugin.c
@@ -46,7 +46,7 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    gstgtk,
+    gtk,
     "Gtk+ sink",
     plugin_init, PACKAGE_VERSION, GST_LICENSE, GST_PACKAGE_NAME,
     GST_PACKAGE_ORIGIN)

diff --git a/ext/teletextdec/Makefile.am b/ext/teletextdec/Makefile.am
index 5aa8ab5..50f2179 100644 (file)
--- a/ext/teletextdec/Makefile.am
+++ b/ext/teletextdec/Makefile.am
@@ -1,10 +1,10 @@
-plugin_LTLIBRARIES = libgstteletextdec.la
+plugin_LTLIBRARIES = libgstteletext.la
 
-libgstteletextdec_la_SOURCES = gstteletextdec.c
+libgstteletext_la_SOURCES = gstteletextdec.c
 
-libgstteletextdec_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TELETEXTDEC_CFLAGS)
-libgstteletextdec_la_LIBADD = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_LIBS) $(TELETEXTDEC_LIBS)
-libgstteletextdec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstteletextdec_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstteletext_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(TELETEXTDEC_CFLAGS)
+libgstteletext_la_LIBADD = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_LIBS) $(TELETEXTDEC_LIBS)
+libgstteletext_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstteletext_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstteletextdec.h

diff --git a/gst/camerabin2/Makefile.am b/gst/camerabin2/Makefile.am
index 9254f7c..b44aba4 100644 (file)
--- a/gst/camerabin2/Makefile.am
+++ b/gst/camerabin2/Makefile.am
@@ -1,26 +1,26 @@
-plugin_LTLIBRARIES = libgstcamerabin2.la
+plugin_LTLIBRARIES = libgstcamerabin.la
 
-libgstcamerabin2_la_SOURCES = gstviewfinderbin.c \
+libgstcamerabin_la_SOURCES = gstviewfinderbin.c \
                                gstdigitalzoom.c \
                                camerabingeneral.c \
                                gstwrappercamerabinsrc.c \
                                gstcamerabin2.c \
                                gstplugin.c
 
-libgstcamerabin2_la_CFLAGS = \
+libgstcamerabin_la_CFLAGS = \
        $(GST_PLUGINS_BAD_CFLAGS) \
        $(GST_PLUGINS_BASE_CFLAGS) \
        $(GST_BASE_CFLAGS) $(GST_CFLAGS) \
        -DGST_USE_UNSTABLE_API
 
-libgstcamerabin2_la_LIBADD = \
+libgstcamerabin_la_LIBADD = \
        $(top_builddir)/gst-libs/gst/interfaces/libgstphotography-$(GST_API_VERSION).la \
        $(top_builddir)/gst-libs/gst/basecamerabinsrc/libgstbasecamerabinsrc-$(GST_API_VERSION).la \
        $(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_API_VERSION) -lgstapp-$(GST_API_VERSION) -lgstpbutils-$(GST_API_VERSION) \
        $(GST_BASE_LIBS) $(GST_LIBS)
 
-libgstcamerabin2_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstcamerabin2_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstcamerabin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstcamerabin_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = gstviewfinderbin.h \
                camerabingeneral.h \

diff --git a/gst/camerabin2/meson.build b/gst/camerabin2/meson.build
index b9c043a..9cee343 100644 (file)
--- a/gst/camerabin2/meson.build
+++ b/gst/camerabin2/meson.build
@@ -1,4 +1,4 @@
-camerabin2_sources = [
+camerabin_sources = [
   'gstdigitalzoom.c',
   'gstviewfinderbin.c',
   'camerabingeneral.c',
@@ -7,8 +7,8 @@ camerabin2_sources = [
   'gstplugin.c',
 ]
 
-gstcamerabin2 = library('gstcamerabin2',
-  camerabin2_sources,
+gstcamerabin = library('gstcamerabin',
+  camerabin_sources,
   c_args : gst_plugins_bad_args + ['-DGST_USE_UNSTABLE_API'],
   include_directories : [configinc, libsinc],
   link_with : gstbasecamerabin,

diff --git a/gst/onvif/meson.build b/gst/onvif/meson.build
index d88528d..d3d4faa 100644 (file)
--- a/gst/onvif/meson.build
+++ b/gst/onvif/meson.build
@@ -4,7 +4,7 @@ onvif_sources = [
   'gstrtponviftimestamp.c',
 ]
 
-gstonvif = library('gstonvif',
+gstrtponvif = library('gstrtponvif',
   onvif_sources,
   c_args : gst_plugins_bad_args,
   include_directories : [configinc],

diff --git a/gst/sdp/gstsdpelem.c b/gst/sdp/gstsdpelem.c
index d0f0333..8a945cd 100644 (file)
--- a/gst/sdp/gstsdpelem.c
+++ b/gst/sdp/gstsdpelem.c
@@ -38,6 +38,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    sdp,
+    sdpelem,
     "configure streaming sessions using SDP",
     plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

diff --git a/gst/siren/gstsiren.c b/gst/siren/gstsiren.c
index 4678cdf..6fde346 100644 (file)
--- a/gst/siren/gstsiren.c
+++ b/gst/siren/gstsiren.c
@@ -42,6 +42,6 @@ plugin_init (GstPlugin * plugin)
 
 GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
     GST_VERSION_MINOR,
-    gstsiren,
+    siren,
     "Siren encoder/decoder/payloader/depayloader plugins",
     plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

diff --git a/sys/kms/Makefile.am b/sys/kms/Makefile.am
index daf2ff7..a97cad1 100644 (file)
--- a/sys/kms/Makefile.am
+++ b/sys/kms/Makefile.am
@@ -1,13 +1,13 @@
-plugin_LTLIBRARIES = libgstkmssink.la
+plugin_LTLIBRARIES = libgstkms.la
 
-libgstkmssink_la_SOURCES =                     \
+libgstkms_la_SOURCES =                         \
        gstkmssink.c                            \
        gstkmsutils.c                           \
        gstkmsallocator.c                       \
        gstkmsbufferpool.c                      \
        $(NUL)
 
-libgstkmssink_la_CFLAGS =                      \
+libgstkms_la_CFLAGS =                  \
        $(GST_PLUGINS_BASE_CFLAGS)              \
        $(GST_BASE_CFLAGS)                      \
        $(GST_VIDEO_CFLAGS)                     \
@@ -16,7 +16,7 @@ libgstkmssink_la_CFLAGS =                     \
        $(KMS_DRM_CFLAGS)                       \
        $(NULL)
 
-libgstkmssink_la_LIBADD =                      \
+libgstkms_la_LIBADD =                  \
        $(GST_PLUGINS_BASE_LIBS)                \
        $(GST_BASE_LIBS)                        \
        $(GST_VIDEO_LIBS)                       \
@@ -25,11 +25,11 @@ libgstkmssink_la_LIBADD =                   \
        $(KMS_DRM_LIBS)                         \
        $(NULL)
 
-libgstkmssink_la_LDFLAGS =                     \
+libgstkms_la_LDFLAGS =                         \
        $(GST_PLUGIN_LDFLAGS)                   \
        $(NULL)
 
-libgstkmssink_la_LIBTOOLFLAGS =                \
+libgstkms_la_LIBTOOLFLAGS =            \
        $(GST_PLUGIN_LIBTOOLFLAGS)              \
        $(NULL)
 

diff --git a/sys/kms/meson.build b/sys/kms/meson.build
index 05d49c2..e8865f0 100644 (file)
--- a/sys/kms/meson.build
+++ b/sys/kms/meson.build
@@ -8,7 +8,7 @@ kmssink_sources = [
 libdrm_dep = dependency('libdrm', version : '>= 2.4.55', required : false)
 
 if libdrm_dep.found()
-  gstkmssink = library('gstkmssink',
+  gstkmssink = library('gstkms',
     kmssink_sources,
     c_args : gst_plugins_bad_args,
     include_directories : [configinc],