From 46a6d3f8991cdb532fe0d5037e6b8fbb8c8c917a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 13 Mar 2018 13:07:52 +0000 Subject: video: GST_EXPORT -> GST_URI_VIDEO_BAD_API We need different export decorators for the different libs. For now no actual change though, just rename before the release, and add prelude headers to define the new decorator to GST_EXPORT. --- gst-libs/gst/video/Makefile.am | 2 +- gst-libs/gst/video/gstvideoaggregator.h | 3 ++- gst-libs/gst/video/gstvideoaggregatorpad.h | 2 +- gst-libs/gst/video/meson.build | 3 ++- gst-libs/gst/video/video-bad-prelude.h | 31 ++++++++++++++++++++++++++++++ 5 files changed, 37 insertions(+), 4 deletions(-) create mode 100644 gst-libs/gst/video/video-bad-prelude.h diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index e51f6bb52..7d728eef3 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -23,4 +23,4 @@ libgstbadvideo_@GST_API_VERSION@_la_LIBADD = \ libgstbadvideo_@GST_API_VERSION@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS) libgstvideo_@GST_API_VERSION@includedir = $(includedir)/gstreamer-@GST_API_VERSION@/gst/video -libgstvideo_@GST_API_VERSION@include_HEADERS = gstvideoaggregatorpad.h gstvideoaggregator.h +libgstvideo_@GST_API_VERSION@include_HEADERS = gstvideoaggregatorpad.h gstvideoaggregator.h video-bad-prelude.h diff --git a/gst-libs/gst/video/gstvideoaggregator.h b/gst-libs/gst/video/gstvideoaggregator.h index 9882a75df..d3e5370b4 100644 --- a/gst-libs/gst/video/gstvideoaggregator.h +++ b/gst-libs/gst/video/gstvideoaggregator.h @@ -29,6 +29,7 @@ #include #include #include +#include G_BEGIN_DECLS @@ -111,7 +112,7 @@ struct _GstVideoAggregatorClass gpointer _gst_reserved[GST_PADDING_LARGE]; }; -GST_EXPORT +GST_VIDEO_BAD_API GType gst_video_aggregator_get_type (void); G_END_DECLS diff --git a/gst-libs/gst/video/gstvideoaggregatorpad.h b/gst-libs/gst/video/gstvideoaggregatorpad.h index 3c84fc54f..79cb8e534 100644 --- a/gst-libs/gst/video/gstvideoaggregatorpad.h +++ b/gst-libs/gst/video/gstvideoaggregatorpad.h @@ -105,7 +105,7 @@ struct _GstVideoAggregatorPadClass gpointer _gst_reserved[GST_PADDING_LARGE]; }; -GST_EXPORT +GST_VIDEO_BAD_API GType gst_video_aggregator_pad_get_type (void); G_END_DECLS diff --git a/gst-libs/gst/video/meson.build b/gst-libs/gst/video/meson.build index 3bec5988a..d071b8de6 100644 --- a/gst-libs/gst/video/meson.build +++ b/gst-libs/gst/video/meson.build @@ -3,7 +3,8 @@ badvideo_sources = [ ] badvideo_headers = [ 'gstvideoaggregatorpad.h', - 'gstvideoaggregator.h' + 'gstvideoaggregator.h', + 'video-bad-prelude.h', ] install_headers(badvideo_headers, subdir : 'gstreamer-1.0/gst/video') diff --git a/gst-libs/gst/video/video-bad-prelude.h b/gst-libs/gst/video/video-bad-prelude.h new file mode 100644 index 000000000..3638a421f --- /dev/null +++ b/gst-libs/gst/video/video-bad-prelude.h @@ -0,0 +1,31 @@ +/* GStreamer Video Library + * Copyright (C) 2018 GStreamer developers + * + * video-prelude.h: prelude include header for gst-video library + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Library General Public + * License as published by the Free Software Foundation; either + * version 2 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Library General Public License for more details. + * + * You should have received a copy of the GNU Library General Public + * License along with this library; if not, write to the + * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, + * Boston, MA 02110-1301, USA. + */ + +#ifndef __GST_VIDEO_BAD_PRELUDE_H__ +#define __GST_VIDEO_BAD_PRELUDE_H__ + +#include + +#ifndef GST_VIDEO_BAD_API +#define GST_VIDEO_BAD_API GST_EXPORT +#endif + +#endif /* __GST_VIDEO_BAD_PRELUDE_H__ */ -- cgit v1.2.1