d3dsinkwrapper: Make the DLL name match the plugin name

Otherwise, since 1.12, the plugin gets blacklisted.

https://bugzilla.gnome.org/show_bug.cgi?id=785168
This commit is contained in:
Nicolas Dufresne 2017-07-20 10:29:18 -04:00
parent a163dff91d
commit 3e0db49f5b
4 changed files with 9 additions and 8 deletions

View file

@ -82,6 +82,7 @@ CRUFT_FILES = \
$(top_builddir)/gst/valve/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/gst/valve/.libs/*.{so,dll,DLL,dylib} \
$(top_builddir)/gst/videoparsers/.libs/libgsth263parse* \ $(top_builddir)/gst/videoparsers/.libs/libgsth263parse* \
$(top_builddir)/gst-libs/gst/baseparse/.libs/libgstbaseparse* \ $(top_builddir)/gst-libs/gst/baseparse/.libs/libgstbaseparse* \
$(top_builddir)/sys/d3dvideosink/.libs/libgstd3dvideosink.{dll,DLL} \
$(top_builddir)/sys/oss4/.libs/*.{so,dll,DLL,dylib} \ $(top_builddir)/sys/oss4/.libs/*.{so,dll,DLL,dylib} \
$(top_builddir)/tests/check/elements/{aac,ac3,amr,flac,mpegaudio,dca}parse \ $(top_builddir)/tests/check/elements/{aac,ac3,amr,flac,mpegaudio,dca}parse \
$(top_builddir)/tests/check/elements/autocolorspace \ $(top_builddir)/tests/check/elements/autocolorspace \

View file

@ -1,11 +1,11 @@
plugin_LTLIBRARIES = libgstd3dvideosink.la plugin_LTLIBRARIES = libgstd3d.la
libgstd3dvideosink_la_SOURCES = d3dvideosink.c d3dhelpers.c libgstd3d_la_SOURCES = d3dvideosink.c d3dhelpers.c
libgstd3dvideosink_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(DIRECT3D_CFLAGS) $(DIRECTX_CFLAGS) \ libgstd3d_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(DIRECT3D_CFLAGS) $(DIRECTX_CFLAGS) \
-DDISABLE_BUFFER_POOL -DDISABLE_BUFFER_POOL
libgstd3dvideosink_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \ libgstd3d_la_LIBADD = $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) \
-lgstvideo-$(GST_API_VERSION) \ -lgstvideo-$(GST_API_VERSION) \
$(DIRECT3D_LIBS) $(DIRECTX_LDFAGS) $(DIRECT3D_LIBS) $(DIRECTX_LDFAGS)
libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstd3d_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = d3dvideosink.h d3dhelpers.h noinst_HEADERS = d3dvideosink.h d3dhelpers.h

View file

@ -619,6 +619,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
d3dsinkwrapper, d3d,
"Direct3D sink wrapper plugin", "Direct3D plugin",
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)

View file

@ -6,7 +6,7 @@ d3dvideosink_sources = [
if host_system == 'windows' and cc.has_header('d3d9.h') if host_system == 'windows' and cc.has_header('d3d9.h')
d3dvideosink_dep = [cc.find_library('d3d9'), cc.find_library('gdi32')] d3dvideosink_dep = [cc.find_library('d3d9'), cc.find_library('gdi32')]
gstd3dvideosink = library('gstd3dvideosink', gstd3dvideosink = library('gstd3d',
d3dvideosink_sources, d3dvideosink_sources,
c_args : gst_plugins_bad_args, c_args : gst_plugins_bad_args,
include_directories : [configinc], include_directories : [configinc],