File fix-version.patch of Package focus-stack

Overview Repositories Revisions Requests Users Attributes Meta

File fix-version.patch of Package focus-stack

Only in mod: build
diff -ru focus-stack-1.4/Makefile mod/Makefile
--- focus-stack-1.4/Makefile	2022-05-20 09:12:58.000000000 +0200
+++ mod/Makefile	2024-02-12 15:06:29.478884758 +0100
@@ -6,6 +6,7 @@
 CXXFLAGS ?= -O2 -g3 -ggdb -Wall -Wextra -Wno-sign-compare
 DESTDIR ?=
 prefix ?= /usr/local
+RPM_VERSION ?= 
 
 # Try to get opencv path from pkg-config
 CXXFLAGS += $(shell pkg-config --silence-errors --cflags-only-I opencv4 || pkg-config --cflags-only-I opencv)
@@ -17,7 +18,7 @@
 LDFLAGS += -lopencv_video -lopencv_imgcodecs -lopencv_photo -lopencv_imgproc -lopencv_core
 
 VERSION = $(shell git describe --always)
-CXXFLAGS += -DGIT_VERSION=\"$(shell git describe --always --dirty 2>/dev/null)\"
+CXXFLAGS += -DRPM_VERSION=$(RPM_VERSION)
 
 # List of source code files
 CXXSRCS += focusstack.cc worker.cc options.cc logger.cc
diff -ru focus-stack-1.4/src/main.cc mod/src/main.cc
--- focus-stack-1.4/src/main.cc	2022-05-20 09:12:58.000000000 +0200
+++ mod/src/main.cc	2024-02-12 15:12:20.857548227 +0100
@@ -3,10 +3,6 @@
 #include "focusstack.hh"
 #include <opencv2/core.hpp>
 
-#ifndef GIT_VERSION
-#define GIT_VERSION "unknown"
-#endif
-
 using namespace focusstack;
 
 int main(int argc, const char *argv[])
@@ -16,7 +12,7 @@
 
   if (options.has_flag("--version"))
   {
-    std::cerr << "focus-stack 1.0, git version " GIT_VERSION ", built " __DATE__ " " __TIME__ "\n"
+    std::cerr << "focus-stack v" << RPM_VERSION << ", built " __DATE__ " " __TIME__ "\n"
                  "Compiled with OpenCV version " CV_VERSION "\n"
                  "Copyright (c) 2019 Petteri Aimonen\n\n"

Places

File fix-version.patch of Package focus-stack

Places