summaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorNicolas Dufresne <nicolas.dufresne@collabora.com>2017-07-20 10:29:18 -0400
committerNicolas Dufresne <nicolas.dufresne@collabora.com>2017-07-20 10:45:32 -0400
commit3e0db49f5b83e2b4ad4386c11c64a5d391c79256 (patch)
tree3e460dc8516a02827d483d10f5f832f14de3cd3f /sys
parenta163dff91dd556c41c5c3f95c98f31bc784d7019 (diff)
downloadgstreamer-plugins-bad-3e0db49f5b83e2b4ad4386c11c64a5d391c79256.tar.gz
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
Diffstat (limited to 'sys')
-rw-r--r--sys/d3dvideosink/Makefile.am10
-rw-r--r--sys/d3dvideosink/d3dvideosink.c4
-rw-r--r--sys/d3dvideosink/meson.build2
3 files changed, 8 insertions, 8 deletions
diff --git a/sys/d3dvideosink/Makefile.am b/sys/d3dvideosink/Makefile.am
index 0f80d1d1d..04b795279 100644
--- a/sys/d3dvideosink/Makefile.am
+++ b/sys/d3dvideosink/Makefile.am
@@ -1,11 +1,11 @@
-plugin_LTLIBRARIES = libgstd3dvideosink.la
+plugin_LTLIBRARIES = libgstd3d.la
-libgstd3dvideosink_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_SOURCES = d3dvideosink.c d3dhelpers.c
+libgstd3d_la_CFLAGS = $(GST_PLUGINS_BAD_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) $(DIRECT3D_CFLAGS) $(DIRECTX_CFLAGS) \
-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) \
$(DIRECT3D_LIBS) $(DIRECTX_LDFAGS)
-libgstd3dvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+libgstd3d_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
noinst_HEADERS = d3dvideosink.h d3dhelpers.h
diff --git a/sys/d3dvideosink/d3dvideosink.c b/sys/d3dvideosink/d3dvideosink.c
index 74920d78c..073b7743d 100644
--- a/sys/d3dvideosink/d3dvideosink.c
+++ b/sys/d3dvideosink/d3dvideosink.c
@@ -619,6 +619,6 @@ plugin_init (GstPlugin * plugin)
GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
GST_VERSION_MINOR,
- d3dsinkwrapper,
- "Direct3D sink wrapper plugin",
+ d3d,
+ "Direct3D plugin",
plugin_init, VERSION, "LGPL", GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff --git a/sys/d3dvideosink/meson.build b/sys/d3dvideosink/meson.build
index 7fc3e2712..f0fd59ded 100644
--- a/sys/d3dvideosink/meson.build
+++ b/sys/d3dvideosink/meson.build
@@ -6,7 +6,7 @@ d3dvideosink_sources = [
if host_system == 'windows' and cc.has_header('d3d9.h')
d3dvideosink_dep = [cc.find_library('d3d9'), cc.find_library('gdi32')]
- gstd3dvideosink = library('gstd3dvideosink',
+ gstd3dvideosink = library('gstd3d',
d3dvideosink_sources,
c_args : gst_plugins_bad_args,
include_directories : [configinc],