From ca0ed8a134f1d26083e6f89636493df89ff29cff Mon Sep 17 00:00:00 2001 From: Nicolas Dufresne Date: Sat, 4 Mar 2017 10:52:47 -0500 Subject: [PATCH] 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 --- docs/plugins/inspect/plugin-oss4.xml | 8 ++++---- docs/plugins/inspect/plugin-pulseaudio.xml | 8 ++++---- .../inspect/{plugin-shout2send.xml => plugin-shout2.xml} | 8 ++++---- ext/pulse/Makefile.am | 12 ++++++------ ext/pulse/meson.build | 2 +- ext/shout2/gstshout2.c | 2 +- ext/soup/Makefile.am | 12 ++++++------ ext/soup/meson.build | 2 +- sys/oss4/Makefile.am | 12 ++++++------ 9 files changed, 33 insertions(+), 33 deletions(-) rename docs/plugins/inspect/{plugin-shout2send.xml => plugin-shout2.xml} (87%) diff --git a/docs/plugins/inspect/plugin-oss4.xml b/docs/plugins/inspect/plugin-oss4.xml index ed8e5f7..ab073b7 100644 --- a/docs/plugins/inspect/plugin-oss4.xml +++ b/docs/plugins/inspect/plugin-oss4.xml @@ -1,12 +1,12 @@ oss4 Open Sound System (OSS) version 4 support for GStreamer - ../../sys/oss4/.libs/libgstoss4audio.so - libgstoss4audio.so - 1.11.2 + ../../sys/oss4/.libs/libgstoss4.so + libgstoss4.so + 1.11.2.1 LGPL gst-plugins-good - GStreamer Good Plug-ins source release + GStreamer Good Plug-ins git Unknown package origin diff --git a/docs/plugins/inspect/plugin-pulseaudio.xml b/docs/plugins/inspect/plugin-pulseaudio.xml index 8bc38df..e98e1f9 100644 --- a/docs/plugins/inspect/plugin-pulseaudio.xml +++ b/docs/plugins/inspect/plugin-pulseaudio.xml @@ -1,12 +1,12 @@ pulseaudio PulseAudio plugin library - ../../ext/pulse/.libs/libgstpulse.so - libgstpulse.so - 1.11.2 + ../../ext/pulse/.libs/libgstpulseaudio.so + libgstpulseaudio.so + 1.11.2.1 LGPL gst-plugins-good - GStreamer Good Plug-ins source release + GStreamer Good Plug-ins git Unknown package origin diff --git a/docs/plugins/inspect/plugin-shout2send.xml b/docs/plugins/inspect/plugin-shout2.xml similarity index 87% rename from docs/plugins/inspect/plugin-shout2send.xml rename to docs/plugins/inspect/plugin-shout2.xml index ad42a45..6bfafb8 100644 --- a/docs/plugins/inspect/plugin-shout2send.xml +++ b/docs/plugins/inspect/plugin-shout2.xml @@ -1,9 +1,9 @@ - shout2send + shout2 Sends data to an icecast server using libshout2 ../../ext/shout2/.libs/libgstshout2.so libgstshout2.so - 1.11.2 + 1.11.2.1 LGPL gst-plugins-good libshout2 @@ -20,9 +20,9 @@ sink sink always -
application/ogg; audio/ogg; video/ogg; audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]; video/webm; audio/webm
+
application/ogg; audio/ogg; video/ogg; audio/mpeg, mpegversion=(int)1, layer=(int)[ 1, 3 ]
 - \ No newline at end of file + diff --git a/ext/pulse/Makefile.am b/ext/pulse/Makefile.am index a813cb6..5a1d52e 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 afc95dd..d685f91 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 d99e77d..867a134 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 63e5fec..8b5de4a 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 ebd7100..3fd7129 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 a22475a..36a0562 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 \ -- 2.7.4