Avidemux Forum

The revision commit number is stuck on commit from 2 days ago:  295a8f3    [appImage] more fixes (https://github.com/mean00/avidemux2/commit/295a8f3a75dffac29267e5385e4d28a70a1f35d6)

I've rebuild this commit: twice on 16.04.1 and 14.04.5 with the same result.

Might be the  "finding  the git top dir" topic once again

git show

Quotecommit 4af7da548db2ec0aeeb2ed66b1db55ca0db0936b
Author: mean <fixounet@free.fr>
Date:   Mon Aug 15 17:22:08 2016 +0200

    [plugin] remove avsfilter for the moment, ppwrite is missing

diff --git a/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt b/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt
index 68dd839..b62ec2e 100644
--- a/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt
+++ b/avidemux_plugins/ADM_videoFilters6/CMakeLists.txt
@@ -1,7 +1,7 @@
ADD_SUBDIRECTORY(addBorder)
ADD_SUBDIRECTORY(asharp)
ADD_SUBDIRECTORY(ass)
-ADD_SUBDIRECTORY(avsfilter)
+#ADD_SUBDIRECTORY(avsfilter)^M
ADD_SUBDIRECTORY(black)
ADD_SUBDIRECTORY(blackenBorder)
ADD_SUBDIRECTORY(changeFps)

or
git rev-parse HEAD

Quote4af7da548db2ec0aeeb2ed66b1db55ca0db0936b

could well be, took a while before I did notice the small issue.

This is by design (http://avidemux.org/smif/index.php/topic,16988.msg76192.html#msg76192), isn't it? The git revision shown in the "About" dialog should be the latest revision which touched the particular module (in this case https://github.com/mean00/avidemux2/tree/master/avidemux/qt4 (https://github.com/mean00/avidemux2/tree/master/avidemux/qt4)), not the repository in general.

(An approach which restored the previous logic http://avidemux.org/smif/index.php/topic,16988.msg76162.html#msg76162 (http://avidemux.org/smif/index.php/topic,16988.msg76162.html#msg76162) was rejected.)

Can't we use the output generated by: git rev-parse HEAD
What produces this output:

Quote4af7da548db2ec0aeeb2ed66b1db55ca0db0936b

and just take the first 7 on the left of that output (
4af7da5) ? And redirect this where it can be used while we are building from git?

yes, i ended up at that point
i.e.
git rev-parse --show-toplevel

Oops, I must have misread your intentions then. In this case

diff --git a/cmake/admMainChecks.cmake b/cmake/admMainChecks.cmake
index 58f6291..2c8c604 100644
--- a/cmake/admMainChecks.cmake
+++ b/cmake/admMainChecks.cmake
@@ -131,7 +131,7 @@ MESSAGE(STATUS "****************")
IF(RELEASE OR AVIDEMUX_EXTERNAL_BUILD)
         SET( ADM_SUBVERSION 0)
ELSE()
-        admGetRevision( ${CMAKE_SOURCE_DIR} ADM_SUBVERSION)
+        admGetRevision( ${AVIDEMUX_TOP_SOURCE_DIR} ADM_SUBVERSION)
ENDIF()
MESSAGE("")
include(avidemuxVersion)

was right, just setting ${AVIDEMUX_TOP_SOURCE_DIR} from respective CMakeLists.txt was wrong.

The way suggested by Jan would be location independent.

It was actually  unclear  in my head, because the aim was to do 2 things at the same time

1- exporting the top source dir is not ok, the module should be buildable independently
2- having a per component tag is both ok and not ok. It should be a "common" marker from packages build from the same source tree

Until now, the solutions failed 1/ or 2/

the rev-parse git trick solves it all

Should be okay now

Yes, confirmed, thanks!

By the way, why do the cmake scripts still take svn into account? Old cruft which doesn't hurt but is to cumbersome to remove? Or is there a real use for it?