Avidemux Forum

Avidemux => Main version 2.6 => Topic started by: mm0359 on March 22, 2017, 09:18:54 AM

Title: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: mm0359 on March 22, 2017, 09:18:54 AM
win32/avidemux_2.6.18_r170322_win32.exe (http://www.avidemux.org/nightly/win32/avidemux_2.6.18_r170322_win32.exe)

admlog.txt header has been broken for a few releases (iirc):
QuoteAvidemux vADM_VERSION (ADM_SUBVERSION) .

Would be nice to unbreak it...

Fwiw,
ADM_VERSION search (https://github.com/mean00/avidemux2/search?utf8=%E2%9C%93&q=ADM_VERSION&type=)
And possibly sync main.cpp to be (more) like Q_about.cpp.
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: eumagga0x2a on March 22, 2017, 10:36:00 AM
I've noticed this too, but would like to investigate and hopefully solve the issue that my own Avidemux builds for windows currently don't run at all (access violation somewhere in Qt).
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: eumagga0x2a on March 29, 2017, 08:34:04 AM
[main] Fix version string generation (https://github.com/mean00/avidemux2/pull/137) would fix this, but not sure if it passes below the closed toll bar.
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: mm0359 on April 01, 2017, 12:06:07 PM
I checked ADD_SOURCE_CFLAGS search (https://github.com/mean00/avidemux2/search?utf8=%E2%9C%93&q=ADD_SOURCE_CFLAGS&type=).

It looks like 3 lines were missed in [build/vs] Change how the strings are passed from cmake to compiler (https://github.com/mean00/avidemux2/commit/480a3a0c7e71ee204fdf61a72ae0a9294949d45d).
Or were they left as is on purpose?

cli/CMakeLists.txt (https://github.com/mean00/avidemux2/blob/148a4fa8271f8c7a0f5906c7f411a80523f5bb1c/avidemux/cli/CMakeLists.txt)

ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")


gtk/CMakeLists.txt (https://github.com/mean00/avidemux2/blob/eba13905b861d70d733f8c7c42c77503e5dfff3d/avidemux/gtk/CMakeLists.txt)

ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_SUBVERSION='\"${ADM_SUBVERSION}\"'")
ADD_SOURCE_CFLAGS(../common/main.cpp "-DADM_VERSION='\"${AVIDEMUX_VERSION}\"'")

Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: eumagga0x2a on April 01, 2017, 12:36:46 PM
Quote from: mm0359 on April 01, 2017, 12:06:07 PM
It looks like 3 lines were missed in [build/vs] Change how the strings are passed from cmake to compiler (https://github.com/mean00/avidemux2/commit/480a3a0c7e71ee204fdf61a72ae0a9294949d45d).
Or were they left as is on purpose?

No, thank you for pointing out. The GTK part is not built, so it doesn't matter there.
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: mm0359 on April 01, 2017, 12:41:30 PM
Quote from: eumagga0x2a on March 29, 2017, 08:34:04 AM
[main] Fix version string generation (https://github.com/mean00/avidemux2/pull/137) would fix this

Commited as [cmake/qt/cli] Unset ADM_SUBVERSION for releases, fix version string generation for jobs (https://github.com/mean00/avidemux2/commit/a17cf88b53a248a50d93831aab92206aad177c9b)
then [cmake] Revert unsetting ADM_SUBVERSION (https://github.com/mean00/avidemux2/commit/a9bd97951955f6498cf7e7ac55f2984934b6c2c3).

Don't we miss a few more IF (ADM_SUBVERSION)? (See ADM_SUBVERSION search (https://github.com/mean00/avidemux2/search?utf8=%E2%9C%93&q=ADM_SUBVERSION&type=).)
In
avidemux_core/corePackageTarGz.cmake (PS: Ah, it seems unused since v2.6.0!?)
avidemux/gtk/ADM_userInterfaces/ADM_dialog/CMakeLists.txt
avidemux/gtk/gtkPackageRpm.cmake
avidemux/gtk/CMakeLists.txt
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: mm0359 on April 01, 2017, 12:55:54 PM
Quote from: eumagga0x2a on April 01, 2017, 12:36:46 PM
No, thank you for pointing out.

cli/CMakeLists.txt fixed by [build/cli] Fix the version string (https://github.com/mean00/avidemux2/commit/53e50137ae03854fe94e902de4ba14a18c9a34a9).

Quote from: eumagga0x2a on April 01, 2017, 12:36:46 PM
The GTK part is not built, so it doesn't matter there.

Hum, alright.
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: mm0359 on April 01, 2017, 01:33:18 PM
Quote from: mm0359 on March 22, 2017, 09:18:54 AM
ADM_VERSION search (https://github.com/mean00/avidemux2/search?utf8=%E2%9C%93&q=ADM_VERSION&type=)
And possibly sync main.cpp to be (more) like Q_about.cpp.

Could you remove the extra ending " ." in main.cpp?
And maybe the starting "  " too in main.cpp and ADM_jobs.cpp?

Moreover, could the latters use the same pattern(s) as Q_about.cpp?
Maybe all 3 like "vADM_VERSION (rADM_SUBVERSION, fflibs ADM_FFMPEG_VERSION)"?
(And "vADM_VERSION (Release, fflibs ADM_FFMPEG_VERSION)",
or even "vADM_VERSION - Release (rADM_SUBVERSION, fflibs ADM_FFMPEG_VERSION)".)
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: eumagga0x2a on April 01, 2017, 01:41:51 PM
This all is possible, but I don't dive into such style questions because they don't improve the substance of the application while binding ressources and it was not me who put the period here.
Title: Re: Unbreak "Avidemux vADM_VERSION (ADM_SUBVERSION)"
Post by: mm0359 on April 01, 2017, 02:06:19 PM
Quote from: eumagga0x2a on April 01, 2017, 01:41:51 PM
I don't dive into such style questions

Noted.
Ftr, the data I miss most is ADM_FFMPEG_VERSION in log file.