summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-07 20:48:33 +0200
committerLaurent Pinchart <laurent.pinchart@ideasonboard.com>2020-03-07 21:53:59 +0200
commitf36ecf98247a81a322faded4f9b25f06fcbe4ccd (patch)
tree590713ec2c652b5e5fa4f7b559d8f79ae9a6a746
parent6f344f8942768ee217c54d56d1809b5a83496970 (diff)
gst: Turn the top-level plugin file gstlibcamera.c into a C++ file
The top-level plugin file gstlibcamera.c is the only C source file in the whole libcamera GStreamer element. To avoid specifying both C and C++ compiler arguments in the future, turn it into a C++ file. Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> Reviewed-by: Nicolas Dufresne <nicolas.dufresne@collabora.com>
-rw-r--r--src/gstreamer/gstlibcamera.cpp (renamed from src/gstreamer/gstlibcamera.c)0
-rw-r--r--src/gstreamer/meson.build8
2 files changed, 4 insertions, 4 deletions
diff --git a/src/gstreamer/gstlibcamera.c b/src/gstreamer/gstlibcamera.cpp
index 81c7bb19..81c7bb19 100644
--- a/src/gstreamer/gstlibcamera.c
+++ b/src/gstreamer/gstlibcamera.cpp
diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build
index 1965b504..8759a122 100644
--- a/src/gstreamer/meson.build
+++ b/src/gstreamer/meson.build
@@ -1,6 +1,6 @@
libcamera_gst_sources = [
'gstlibcamera-utils.cpp',
- 'gstlibcamera.c',
+ 'gstlibcamera.cpp',
'gstlibcameraallocator.cpp',
'gstlibcamerapad.cpp',
'gstlibcamerapool.cpp',
@@ -8,7 +8,7 @@ libcamera_gst_sources = [
'gstlibcamerasrc.cpp',
]
-libcamera_gst_c_args = [
+libcamera_gst_cpp_args = [
'-DVERSION="@0@"'.format(libcamera_git_version),
'-DPACKAGE="@0@"'.format(meson.project_name()),
]
@@ -27,12 +27,12 @@ if glib_dep.found() and gstvideo_dep.found() and gstallocator_dep.found()
# complain about the ones we are not using. Silence the -Wunused-function
# warning in that case.
if cc.get_id() == 'clang' and glib_dep.version().version_compare('<2.63.0')
- libcamera_gst_c_args += [ '-Wno-unused-function' ]
+ libcamera_gst_cpp_args += [ '-Wno-unused-function' ]
endif
libcamera_gst = shared_library('gstlibcamera',
libcamera_gst_sources,
- c_args : libcamera_gst_c_args,
+ cpp_args : libcamera_gst_cpp_args,
dependencies : [libcamera_dep, gstvideo_dep, gstallocator_dep],
install: true,
install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),