From fb7d9e26ffe3244130c16864e31575b96690da08 Mon Sep 17 00:00:00 2001
From: Nicolas Dufresne <nicolas.dufresne@collabora.com>
Date: Sat, 4 Mar 2017 10:08:04 -0500
Subject: [PATCH] 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
---
 docs/plugins/inspect/plugin-encoding.xml  |  4 ++--
 docs/plugins/inspect/plugin-libvisual.xml |  2 +-
 docs/plugins/inspect/plugin-pbtypes.xml   | 13 +++++++++++++
 gst/encoding/Makefile.am                  | 12 ++++++------
 gst/encoding/meson.build                  |  2 +-
 sys/xvimage/meson.build                   |  2 +-
 6 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 docs/plugins/inspect/plugin-pbtypes.xml

diff --git a/docs/plugins/inspect/plugin-encoding.xml b/docs/plugins/inspect/plugin-encoding.xml
index 31f31a5691..467165533c 100644
--- 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
index a53151c822..f173fba949 100644
--- a/docs/plugins/inspect/plugin-libvisual.xml
+++ b/docs/plugins/inspect/plugin-libvisual.xml
@@ -178,4 +178,4 @@
       </pads>
     </element>
   </elements>
-</plugin>
\ No newline at end of file
+</plugin>
diff --git a/docs/plugins/inspect/plugin-pbtypes.xml b/docs/plugins/inspect/plugin-pbtypes.xml
new file mode 100644
index 0000000000..67739ce15d
--- /dev/null
+++ 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>
\ No newline at end of file
diff --git a/gst/encoding/Makefile.am b/gst/encoding/Makefile.am
index f9e73792ee..3209d3c1f6 100644
--- 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
index c2f0255655..bab3f7f645 100644
--- 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
index 2c736aff14..6e9ea30fd2 100644
--- 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],