Fix plugin filenames to match pugin names

- libgstencodebin.so is now libgstencoding.so - libgstximage.so is now libgstximagesink.so (meson only) https://bugzilla.gnome.org/show_bug.cgi?id=779344
sailfishos-mirror · Mar 9, 2017 · fb7d9e2 · fb7d9e2
1 parent 4e91176
commit fb7d9e2
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 11 deletions.
diff --git a/docs/plugins/inspect/plugin-encoding.xml b/docs/plugins/inspect/plugin-encoding.xml
@@ -1,8 +1,8 @@
 <plugin>
   <name>encoding</name>
   <description>various encoding-related elements</description>
-  <filename>../../gst/encoding/.libs/libgstencodebin.so</filename>
-  <basename>libgstencodebin.so</basename>
+  <filename>../../gst/encoding/.libs/libgstencoding.so</filename>
+  <basename>libgstencoding.so</basename>
   <version>1.11.2.1</version>
   <license>LGPL</license>
   <source>gst-plugins-base</source>

diff --git a/docs/plugins/inspect/plugin-libvisual.xml b/docs/plugins/inspect/plugin-libvisual.xml
@@ -178,4 +178,4 @@
       </pads>
     </element>
   </elements>
-</plugin>
+</plugin>
diff --git a/docs/plugins/inspect/plugin-pbtypes.xml b/docs/plugins/inspect/plugin-pbtypes.xml
@@ -0,0 +1,13 @@
+<plugin>
+  <name>pbtypes</name>
+  <description>gst-plugins-base dynamic types</description>
+  <filename>../../gst/pbtypes/.libs/libgstpbtypes.so</filename>
+  <basename>libgstpbtypes.so</basename>
+  <version>1.11.2.1</version>
+  <license>LGPL</license>
+  <source>gst-plugins-base</source>
+  <package>GStreamer Base Plug-ins git</package>
+  <origin>Unknown package origin</origin>
+  <elements>
+  </elements>
+</plugin>
diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am
@@ -1,17 +1,17 @@
-plugin_LTLIBRARIES = libgstencodebin.la
+plugin_LTLIBRARIES = libgstencoding.la
 
-libgstencodebin_la_SOURCES = 	\
+libgstencoding_la_SOURCES = 	\
 	gstencodebin.c		\
 	gstsmartencoder.c	\
 	gststreamcombiner.c	\
 	gststreamsplitter.c
 
-libgstencodebin_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstencodebin_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstencodebin_la_LIBADD = \
+libgstencoding_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstencoding_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstencoding_la_LIBADD = \
 	$(top_builddir)/gst-libs/gst/pbutils/libgstpbutils-@GST_API_VERSION@.la \
 	$(GST_LIBS)
-libgstencodebin_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstencoding_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
 
 noinst_HEADERS = 		\
 	gstencodebin.h		\

diff --git a/gst/encoding/meson.build b/gst/encoding/meson.build
@@ -4,7 +4,7 @@ encoding_sources = ['gstencodebin.c',
   'gststreamsplitter.c',
   ]
 
-gstencoding = library('gstencodebin',
+gstencoding = library('gstencoding',
   encoding_sources,
   c_args : gst_plugins_base_args,
   include_directories: [configinc, libsinc],

diff --git a/sys/xvimage/meson.build b/sys/xvimage/meson.build
@@ -10,7 +10,7 @@ xvideo_dep = dependency('xv', required : false)
 core_conf.set('HAVE_XVIDEO', x11_dep.found() and xvideo_dep.found())
 
 if xvideo_dep.found()
-  gstxvimage = library('gstxvimage',
+  gstxvimage = library('gstxvimagesink',
     xvimage_sources,
     c_args : gst_plugins_base_args,
     include_directories: [configinc, libsinc],