summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2017-03-04 10:52:47 -0500
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2017-03-08 20:04:20 -0500
commitca0ed8a134f1d26083e6f89636493df89ff29cff (patch)
tree0ad823bb195a506580ed857c1bd994a2f886bb4c
parent98583dc9449a428d06e172a3c18ccb50e81cdbd1 (diff)
Fix plugin filenames to match plugin names
- libgstpulse.so becomes libgstpulseaudio.so - libgstsouphttpsrc.so becomes libgstsoup.so - libgstoss4audio.so becomes libgstoss4.so https://bugzilla.gnome.org/show_bug.cgi?id=779344
-rw-r--r--docs/plugins/inspect/plugin-oss4.xml8
-rw-r--r--docs/plugins/inspect/plugin-pulseaudio.xml8
-rw-r--r--docs/plugins/inspect/plugin-shout2.xml (renamed from docs/plugins/inspect/plugin-shout2send.xml)8
-rw-r--r--ext/pulse/Makefile.am12
-rw-r--r--ext/pulse/meson.build2
-rw-r--r--ext/shout2/gstshout2.c2
-rw-r--r--ext/soup/Makefile.am12
-rw-r--r--ext/soup/meson.build2
-rw-r--r--sys/oss4/Makefile.am12
9 files changed, 33 insertions, 33 deletions
diff --git a/docs/plugins/inspect/plugin-oss4.xml b/docs/plugins/inspect/plugin-oss4.xml
index ed8e5f7f0..ab073b741 100644
--- a/docs/plugins/inspect/plugin-oss4.xml
+++ b/docs/plugins/inspect/plugin-oss4.xml
@@ -1,12 +1,12 @@
<plugin>
<name>oss4</name>
<description>Open Sound System (OSS) version 4 support for GStreamer</description>
- <filename>../../sys/oss4/.libs/libgstoss4audio.so</filename>
- <basename>libgstoss4audio.so</basename>
- <version>1.11.2</version>
+ <filename>../../sys/oss4/.libs/libgstoss4.so</filename>
+ <basename>libgstoss4.so</basename>
+ <version>1.11.2.1</version>
<license>LGPL</license>
<source>gst-plugins-good</source>
- <package>GStreamer Good Plug-ins source release</package>
+ <package>GStreamer Good Plug-ins git</package>
<origin>Unknown package origin</origin>
<elements>
<element>
diff --git a/docs/plugins/inspect/plugin-pulseaudio.xml b/docs/plugins/inspect/plugin-pulseaudio.xml
index 8bc38dfe4..e98e1f95c 100644
--- a/docs/plugins/inspect/plugin-pulseaudio.xml
+++ b/docs/plugins/inspect/plugin-pulseaudio.xml
@@ -1,12 +1,12 @@
<plugin>
<name>pulseaudio</name>
<description>PulseAudio plugin library</description>
- <filename>../../ext/pulse/.libs/libgstpulse.so</filename>
- <basename>libgstpulse.so</basename>
- <version>1.11.2</version>
+ <filename>../../ext/pulse/.libs/libgstpulseaudio.so</filename>
+ <basename>libgstpulseaudio.so</basename>
+ <version>1.11.2.1</version>
<license>LGPL</license>
<source>gst-plugins-good</source>
- <package>GStreamer Good Plug-ins source release</package>
+ <package>GStreamer Good Plug-ins git</package>
<origin>Unknown package origin</origin>
<elements>
<element>
diff --git a/docs/plugins/inspect/plugin-shout2send.xml b/docs/plugins/inspect/plugin-shout2.xml
index ad42a4579..6bfafb8bc 100644
--- a/docs/plugins/inspect/plugin-shout2send.xml
+++ b/docs/plugins/inspect/plugin-shout2.xml
@@ -1,9 +1,9 @@
<plugin>
- <name>shout2send</name>
+ <name>shout2</name>
<description>Sends data to an icecast server using libshout2</description>
<filename>../../ext/shout2/.libs/libgstshout2.so</filename>
<basename>libgstshout2.so</basename>
- <version>1.11.2</version>
+ <version>1.11.2.1</version>
<license>LGPL</license>
<source>gst-plugins-good</source>
<package>libshout2</package>
@@ -20,9 +20,9 @@
<name>sink</name>
<direction>sink</direction>
<presence>always</presence>
- <details>application/ogg; audio/ogg; video/ogg; audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]; video/webm; audio/webm</details>
+ <details>application/ogg; audio/ogg; video/ogg; audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]</details>
</caps>
</pads>
</element>
</elements>
-</plugin> \ No newline at end of file
+</plugin>
diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am
index a813cb6cb..5a1d52ee8 100644
--- a/ext/pulse/Makefile.am
+++ b/ext/pulse/Makefile.am
@@ -1,18 +1,18 @@
-plugin_LTLIBRARIES = libgstpulse.la
+plugin_LTLIBRARIES = libgstpulseaudio.la
-libgstpulse_la_SOURCES = \
+libgstpulseaudio_la_SOURCES = \
plugin.c \
pulsesink.c \
pulsesrc.c \
pulsedeviceprovider.c \
pulseutil.c
-libgstpulse_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
-libgstpulse_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
+libgstpulseaudio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(PULSE_CFLAGS)
+libgstpulseaudio_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_API_VERSION) \
-lgstpbutils-$(GST_API_VERSION) \
$(GST_BASE_LIBS) $(GST_LIBS) $(PULSE_LIBS)
-libgstpulse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstpulse_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstpulseaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstpulseaudio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
pulsesink.h \
diff --git a/ext/pulse/meson.build b/ext/pulse/meson.build
index afc95dd60..d685f915e 100644
--- a/ext/pulse/meson.build
+++ b/ext/pulse/meson.build
@@ -9,7 +9,7 @@ pulse_sources = [
libpulse_dep = dependency('libpulse', version : '>=2.0', required : false)
if libpulse_dep.found()
- gstpulse = library('gstpulse',
+ gstpulse = library('gstpulseaudio',
pulse_sources,
c_args : gst_plugins_good_args,
include_directories : [configinc, libsinc],
diff --git a/ext/shout2/gstshout2.c b/ext/shout2/gstshout2.c
index d99e77d45..867a134b1 100644
--- a/ext/shout2/gstshout2.c
+++ b/ext/shout2/gstshout2.c
@@ -823,7 +823,7 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- shout2send,
+ shout2,
"Sends data to an icecast server using libshout2",
plugin_init,
VERSION, "LGPL", "libshout2", "http://www.icecast.org/download/")
diff --git a/ext/soup/Makefile.am b/ext/soup/Makefile.am
index 63e5fec9e..8b5de4a23 100644
--- a/ext/soup/Makefile.am
+++ b/ext/soup/Makefile.am
@@ -1,13 +1,13 @@
-plugin_LTLIBRARIES = libgstsouphttpsrc.la
+plugin_LTLIBRARIES = libgstsoup.la
-libgstsouphttpsrc_la_SOURCES = gstsouphttpsrc.c gstsouphttpclientsink.c gstsouputils.c gstsoup.c
+libgstsoup_la_SOURCES = gstsouphttpsrc.c gstsouphttpclientsink.c gstsouputils.c gstsoup.c
-libgstsouphttpsrc_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
+libgstsoup_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) \
$(GST_CFLAGS) $(SOUP_CFLAGS) \
-DSOUP_VERSION_MIN_REQUIRED=SOUP_VERSION_2_48 \
-DSOUP_VERSION_MAX_ALLOWED=SOUP_DEPRECATED_IN_2_48
-libgstsouphttpsrc_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(SOUP_LIBS)
-libgstsouphttpsrc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstsouphttpsrc_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstsoup_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgsttag-@GST_API_VERSION@ $(GST_BASE_LIBS) $(SOUP_LIBS)
+libgstsoup_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstsoup_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = gstsouphttpsrc.h gstsouphttpclientsink.h gstsouputils.h
diff --git a/ext/soup/meson.build b/ext/soup/meson.build
index ebd710043..3fd7129b8 100644
--- a/ext/soup/meson.build
+++ b/ext/soup/meson.build
@@ -13,7 +13,7 @@ soup_args = [
libsoup_dep = dependency('libsoup-2.4', version : '>=2.48', required : false)
if libsoup_dep.found()
- gstsouphttpsrc = library('gstsouphttpsrc',
+ gstsouphttpsrc = library('gstsoup',
soup_sources,
c_args : gst_plugins_good_args + soup_args,
link_args : noseh_link_args,
diff --git a/sys/oss4/Makefile.am b/sys/oss4/Makefile.am
index a22475a85..36a05625c 100644
--- a/sys/oss4/Makefile.am
+++ b/sys/oss4/Makefile.am
@@ -1,18 +1,18 @@
-plugin_LTLIBRARIES = libgstoss4audio.la
+plugin_LTLIBRARIES = libgstoss4.la
-libgstoss4audio_la_SOURCES = \
+libgstoss4_la_SOURCES = \
oss4-audio.c \
oss4-property-probe.c \
oss4-sink.c \
oss4-source.c
-libgstoss4audio_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
-libgstoss4audio_la_LIBADD = \
+libgstoss4_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libgstoss4_la_LIBADD = \
$(GST_PLUGINS_BASE_LIBS) \
-lgstaudio-$(GST_API_VERSION) \
$(GST_LIBS)
-libgstoss4audio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
-libgstoss4audio_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
+libgstoss4_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstoss4_la_LIBTOOLFLAGS = $(GST_PLUGIN_LIBTOOLFLAGS)
noinst_HEADERS = \
oss4-audio.h \