NekoCWD/libcamera
NekoCWD/libcamera
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 7 Wiki Activity Actions

gst: Turn the top-level plugin file gstlibcamera.c into a C++ file

Browse source 
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>
This commit is contained in:
Laurent Pinchart 2020-03-07 20:48:33 +02:00
parent 6f344f8942
commit f36ecf9824
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

0
src/gstreamer/gstlibcamera.c → src/gstreamer/gstlibcamera.cpp
View file

8
src/gstreamer/meson.build
View file

@ -1,6 +1,6 @@
libcamera_gst_sources = [ libcamera_gst_sources = [
'gstlibcamera-utils.cpp', 'gstlibcamera-utils.cpp',
'gstlibcamera.c', 'gstlibcamera.cpp',
'gstlibcameraallocator.cpp', 'gstlibcameraallocator.cpp',
'gstlibcamerapad.cpp', 'gstlibcamerapad.cpp',
'gstlibcamerapool.cpp', 'gstlibcamerapool.cpp',
@ -8,7 +8,7 @@ libcamera_gst_sources = [
'gstlibcamerasrc.cpp', 'gstlibcamerasrc.cpp',
] ]
libcamera_gst_c_args = [ libcamera_gst_cpp_args = [
'-DVERSION="@0@"'.format(libcamera_git_version), '-DVERSION="@0@"'.format(libcamera_git_version),
'-DPACKAGE="@0@"'.format(meson.project_name()), '-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 # complain about the ones we are not using. Silence the -Wunused-function
# warning in that case. # warning in that case.
if cc.get_id() == 'clang' and glib_dep.version().version_compare('<2.63.0') 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 endif
libcamera_gst = shared_library('gstlibcamera', libcamera_gst = shared_library('gstlibcamera',
libcamera_gst_sources, libcamera_gst_sources,
c_args : libcamera_gst_c_args, cpp_args : libcamera_gst_cpp_args,
dependencies : [libcamera_dep, gstvideo_dep, gstallocator_dep], dependencies : [libcamera_dep, gstvideo_dep, gstallocator_dep],
install: true, install: true,
install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')), install_dir : '@0@/gstreamer-1.0'.format(get_option('libdir')),