| Message ID | 20190704130347.9372-5-kieran.bingham@ideasonboard.com |
|---|---|
| Headers | show |
| Series |
|
| Related | show |
Please excuse the incorrect resend of the first four patches. This series should only consist of the [v2 n/5] patches. -- Kieran On 04/07/2019 14:03, Kieran Bingham wrote: > 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 >