From 3f8e58ff6e150ba7b6cc7725e22d8e2d5cb9419f Mon Sep 17 00:00:00 2001
From: Tristan Walter <twalter@orn.mpg.de>
Date: Thu, 29 Oct 2020 12:56:09 +0100
Subject: [PATCH] increase version number
---
Application/src/grabber/default_config.cpp | 2 +-
Application/src/tracker/misc/default_config.cpp | 2 +-
conda/meta.yaml | 3 +--
3 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Application/src/grabber/default_config.cpp b/Application/src/grabber/default_config.cpp
index 6397cd0..c1211a7 100644
--- a/Application/src/grabber/default_config.cpp
+++ b/Application/src/grabber/default_config.cpp
@@ -72,7 +72,7 @@ namespace default_config {
#endif
CONFIG("app_name", std::string("TGrabs"), "Name of the application.", SYSTEM);
- CONFIG("version", std::string("1.0"), "Version of the application.", SYSTEM);
+ CONFIG("version", std::string("1.0.4"), "Version of the application.", SYSTEM);
CONFIG("color_channel", size_t(1), "Index (0-2) of the color channel to be used during video conversion, if more than one channel is present in the video file.");
CONFIG("system_memory_limit", uint64_t(0), "Custom override of how many bytes of system RAM the program is allowed to fill. If `approximate_length_minutes` or `stop_after_minutes` are set, this might help to increase the resulting RAW video footage frame_rate.");
diff --git a/Application/src/tracker/misc/default_config.cpp b/Application/src/tracker/misc/default_config.cpp
index cc3be4e..088e3d6 100644
--- a/Application/src/tracker/misc/default_config.cpp
+++ b/Application/src/tracker/misc/default_config.cpp
@@ -238,7 +238,7 @@ file::Path conda_environment_path() {
Adding adding(config, docs, fn);
CONFIG<std::string>("app_name", "TRex", "Name of the application.", SYSTEM);
- CONFIG("version", std::string("1.0"), "Current application version.", SYSTEM);
+ CONFIG("version", std::string("1.0.4"), "Current application version.", SYSTEM);
CONFIG("build_type", std::string(g_TREX_BUILD_TYPE), "The mode the application was built in.", SYSTEM);
CONFIG("build_is_debug", std::string(is_ndebug_enabled()), "If built in debug mode, this will show 'debug'.", SYSTEM);
CONFIG("build_cxx_options", std::string(g_TREX_BUILD_CXX_OPTIONS), "The mode the application was built in.", SYSTEM);
diff --git a/conda/meta.yaml b/conda/meta.yaml
index 75e4cdb..15b331a 100644
--- a/conda/meta.yaml
+++ b/conda/meta.yaml
@@ -5,10 +5,9 @@ package:
source:
git_url: https://github.com/mooch443/trex.git
git_depth: 1
- git_rev: 4ff9645ea75ab4b1be21ce409080763bcb0359ea
build:
- number: 5
+ number: 6
string: saur
run_exports:
- {{ pin_compatible('ffmpeg', min_pin='x.x.x', max_pin='x.x.x') }}
--
GitLab