From patchwork Thu Jul 4 13:03:42 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kieran Bingham X-Patchwork-Id: 1607 Return-Path: Received: from perceval.ideasonboard.com (perceval.ideasonboard.com [213.167.242.64]) by lancelot.ideasonboard.com (Postfix) with ESMTPS id 2A86661569 for ; Thu, 4 Jul 2019 15:03:53 +0200 (CEST) Received: from localhost.localdomain (cpc89242-aztw30-2-0-cust488.18-1.cable.virginm.net [86.31.129.233]) by perceval.ideasonboard.com (Postfix) with ESMTPSA id BA24B2AF; Thu, 4 Jul 2019 15:03:52 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=ideasonboard.com; s=mail; t=1562245432; bh=RtejPm8jvWSr6vxhc0/MGSvlR/N7P+JBgdvpSpNwOBw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RzNGHVQcatNc/FpXOkUjRvydfvQqeOv2tQPaM6PjSqXzE3XTvx4856SUbgqeaKtkO XgbsR+IRIAPWR9sXCH/whqzvN6fJhMwZWTlK5OkoY8Qqh/vnw2SKqMeilK9fyKCbW4 cQ7HszRt5FOsD8gaLlScG3t62by5s56bxXu1CJRg= From: Kieran Bingham To: LibCamera Devel Date: Thu, 4 Jul 2019 14:03:42 +0100 Message-Id: <20190704130347.9372-5-kieran.bingham@ideasonboard.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190704130347.9372-1-kieran.bingham@ideasonboard.com> References: <20190704130347.9372-1-kieran.bingham@ideasonboard.com> MIME-Version: 1.0 Subject: [libcamera-devel] [PATCH v2 0/5] Automatic Version Generation ++ X-BeenThere: libcamera-devel@lists.libcamera.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 04 Jul 2019 13:03:53 -0000 Hi all, V2 of my small misc branch to add automatic version generation to our meson infrastructure, and incorporate that information into the documentation and utilities. While modifying qcam, I've also extended qcam to provide an average frame rate over a 2 second window. This is generated using a QTimer so that we can still update the rate in the event of no frames being generated from libcamera. Kieran Bingham (5): Documentation: Make the project brief more expressive libcamera: Auto generate version information qcam: Move static timestamp to MainWindow qcam: Add the version string to the title qcam: Update window title with FPS Documentation/Doxyfile.in | 2 +- Documentation/conf.py | 7 ++---- Documentation/meson.build | 6 ++++-- include/libcamera/meson.build | 5 +++++ include/libcamera/version.h.in | 22 +++++++++++++++++++ meson.build | 9 +++----- src/libcamera/camera_manager.cpp | 8 +++++++ src/libcamera/meson.build | 1 + src/qcam/main_window.cpp | 36 ++++++++++++++++++++++++++----- src/qcam/main_window.h | 14 ++++++++++++ src/qcam/meson.build | 11 +++++++++- utils/gen-version.sh | 37 ++++++++++++++++++++++++++++++++ 12 files changed, 138 insertions(+), 20 deletions(-) create mode 100644 include/libcamera/version.h.in create mode 100755 utils/gen-version.sh