From patchwork Sat Mar 7 00:33:10 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3036 X-Patchwork-Delegate: laurent.pinchart@ideasonboard.com Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [IPv6:2001:4b98:dc2:55:216:3eff:fef7:d647]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 631F060427 for ; Sat, 7 Mar 2020 01:33:18 +0100 (CET) Received: from pendragon.bb.dnainternet.fi (81-175-216-236.bb.dnainternet.fi [81.175.216.236]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id B611D24B; Sat, 7 Mar 2020 01:33:17 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583541197; bh=M4wXYx8+hpyUTwzJ0Wt9Wkov2DR7LMSEXVzXBUXr/aI=; h=From:To:Cc:Subject:Date:From; b=UnP1yUrc2DkgHtFOr1LH4Z26DYIHnnnenfH/roUhxjJVzMvKtgwC/uIP6kAL9feWh hJGlcBkQat45Y2jtwtlvJ32KMyERhnc3xh//AP72ja+kBQ0JIF7FlLTNm5ahjqBbPD AC2wLPnDy0w/oNBaiJkQ5bdS+3BkNmR4LqdGs4uI= From: Laurent Pinchart To: Nicolas Dufresne Cc: libcamera-devel@lists.libcamera.org Date: Sat, 7 Mar 2020 02:33:10 +0200 Message-Id: <20200307003310.29372-1-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH] gst: Fix GLib detection and warning disabling X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 07 Mar 2020 00:33:18 -0000 Commit 17cccc68a88f ("Add GStreamer plugin and element skeleton") has gained a last minute fix for a clang compilation error with GLib prior to v2.63.0. The fix wasn't properly tested, and not only did it try to silence the affected compiler warning for C files only, it also failed to check the GLib dependency correctly. This resulted in compilation of the GStreamer element to always be disabled. Fix this by changing the GLib package name from 'glib' to 'glib-2.0', and silence the compiler warning for C++ files. Fixes: 17cccc68a88f ("Add GStreamer plugin and element skeleton") Signed-off-by: Laurent Pinchart --- src/gstreamer/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build index 1965b5041132..1b9dedd2528e 100644 --- a/src/gstreamer/meson.build +++ b/src/gstreamer/meson.build @@ -12,8 +12,9 @@ libcamera_gst_c_args = [ '-DVERSION="@0@"'.format(libcamera_git_version), '-DPACKAGE="@0@"'.format(meson.project_name()), ] +libcamera_gst_cpp_args = [] -glib_dep = dependency('glib', required : get_option('gstreamer')) +glib_dep = dependency('glib-2.0', required : get_option('gstreamer')) gst_dep_version = '>=1.14.0' gstvideo_dep = dependency('gstreamer-video-1.0', version : gst_dep_version, @@ -27,12 +28,13 @@ 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')),