From patchwork Sat Mar 7 19:16:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Pinchart X-Patchwork-Id: 3038 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 0A7F560425 for ; Sat, 7 Mar 2020 20:16:42 +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 70D7924B; Sat, 7 Mar 2020 20:16:41 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1583608601; bh=GW9zIz5zcgUVY3b4ID2/FOJcEVpeoE9tedqFnR8bV8c=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Ttv5VydLDA/J15VSBYFR4K5hHgMvcZT6FMEWXjPbOpD2s07viaXnrm1jJsr5yIh8r ZnlVlTL1AttZ2EJtRThDbO4KZBWulEXRwzd6rgz/EdbAFvZFWE0r2hMmHQyWl4EQNx NpzpfdHj+j5YZRwQeWeyFyw2ss9b13kvZHhoAhJ4= From: Laurent Pinchart To: Nicolas Dufresne Cc: libcamera-devel@lists.libcamera.org Date: Sat, 7 Mar 2020 21:16:33 +0200 Message-Id: <20200307191634.9320-2-laurent.pinchart@ideasonboard.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200307191634.9320-1-laurent.pinchart@ideasonboard.com> References: <20200307191634.9320-1-laurent.pinchart@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 1/2] gst: Turn the top-level plugin file gstlibcamera.c into a C++ file 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 19:16:42 -0000 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 Reviewed-by: Nicolas Dufresne --- src/gstreamer/{gstlibcamera.c => gstlibcamera.cpp} | 0 src/gstreamer/meson.build | 8 ++++---- 2 files changed, 4 insertions(+), 4 deletions(-) rename src/gstreamer/{gstlibcamera.c => gstlibcamera.cpp} (100%) diff --git a/src/gstreamer/gstlibcamera.c b/src/gstreamer/gstlibcamera.cpp similarity index 100% rename from src/gstreamer/gstlibcamera.c rename to src/gstreamer/gstlibcamera.cpp diff --git a/src/gstreamer/meson.build b/src/gstreamer/meson.build index 1965b5041132..8759a12205fa 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')),