diff options
author | Tim-Philipp Müller <tim@centricular.com> | 2020-07-09 20:31:49 +0300 |
---|---|---|
committer | Tim-Philipp Müller <tim@centricular.com> | 2020-07-10 19:37:28 +0300 |
commit | 996d2389af6a902d7ed39fd649d3601adf1ebb6f (patch) | |
tree | a158a8771d2295380f7a32bcc9db0abc9c1b7c03 /sys | |
parent | 4a4de61c23db9296b3ac6ac41eac9786c8bd9796 (diff) |
rpicamsrc: fix and silence some compiler warnings
Some are in system headers, and in Raspi files we want
to keep modifications to a minimum.
Part-of: <https://gitlab.freedesktop.org/gstreamer/gst-plugins-good/-/merge_requests/667>
Diffstat (limited to 'sys')
-rw-r--r-- | sys/rpicamsrc/RaspiCapture.c | 2 | ||||
-rw-r--r-- | sys/rpicamsrc/RaspiCapture.h | 2 | ||||
-rw-r--r-- | sys/rpicamsrc/gstrpicamsrc.c | 4 | ||||
-rw-r--r-- | sys/rpicamsrc/meson.build | 13 |
4 files changed, 17 insertions, 4 deletions
diff --git a/sys/rpicamsrc/RaspiCapture.c b/sys/rpicamsrc/RaspiCapture.c index 975078f29..446700c25 100644 --- a/sys/rpicamsrc/RaspiCapture.c +++ b/sys/rpicamsrc/RaspiCapture.c @@ -1627,7 +1627,7 @@ static void check_disable_port(MMAL_PORT_T *port) mmal_port_disable(port); } -void raspicapture_init() +void raspicapture_init(void) { bcm_host_init(); diff --git a/sys/rpicamsrc/RaspiCapture.h b/sys/rpicamsrc/RaspiCapture.h index 71e79b26e..d426fed90 100644 --- a/sys/rpicamsrc/RaspiCapture.h +++ b/sys/rpicamsrc/RaspiCapture.h @@ -126,7 +126,7 @@ typedef struct typedef struct RASPIVID_STATE_T RASPIVID_STATE; -void raspicapture_init(); +void raspicapture_init(void); void raspicapture_default_config(RASPIVID_CONFIG *config); RASPIVID_STATE *raspi_capture_setup(RASPIVID_CONFIG *config); gboolean raspi_capture_start(RASPIVID_STATE *state); diff --git a/sys/rpicamsrc/gstrpicamsrc.c b/sys/rpicamsrc/gstrpicamsrc.c index eb57f25d5..3249337da 100644 --- a/sys/rpicamsrc/gstrpicamsrc.c +++ b/sys/rpicamsrc/gstrpicamsrc.c @@ -246,7 +246,9 @@ G_DEFINE_TYPE_WITH_CODE (GstRpiCamSrc, gst_rpi_cam_src, #define C_ENUM(v) ((gint) v) -GType +static GType gst_rpi_cam_src_sensor_mode_get_type (void); + +static GType gst_rpi_cam_src_sensor_mode_get_type (void) { static const GEnumValue values[] = { diff --git a/sys/rpicamsrc/meson.build b/sys/rpicamsrc/meson.build index a71be6f86..2cc9e7c5c 100644 --- a/sys/rpicamsrc/meson.build +++ b/sys/rpicamsrc/meson.build @@ -49,6 +49,17 @@ foreach rpi_lib : ['mmal_core', 'mmal_util', 'mmal_vc_client', 'vcos', 'bcm_host mmal_deps += [l] endforeach +rpi_warn_flags = cc.get_supported_arguments([ + # vcos/mmal headers + '-Wno-redundant-decls', + # RaspiCapture.c + RaspiCamControl.c + '-Wno-discarded-qualifiers', + '-Wno-declaration-after-statement', + '-Wno-missing-prototypes', + '-Wno-missing-declarations', + '-Wno-stringop-truncation', +]) + gnome = import('gnome') enums = gnome.mkenums_simple('gstrpicam-enum-types', @@ -59,7 +70,7 @@ enums = gnome.mkenums_simple('gstrpicam-enum-types', # we might need '-Wl,--no-as-needed' or b_asneeded=false on ubuntu, tbd gstrpicamsrc = library('gstrpicamsrc', rpicamsrc_sources, enums, - c_args: [gst_plugins_good_args, rpi_inc_args], + c_args: [gst_plugins_good_args, rpi_inc_args, rpi_warn_flags], include_directories: [configinc, libsinc], dependencies: [gst_dep, gstbase_dep, gstvideo_dep] + mmal_deps, install_dir: plugins_install_dir, |