Closed coldtobi closed 3 years ago
I think this looks great. Yes, README update needed and should we now distribute the non-gzipped version of the manpage, to make things less confusing ?
FYI, had to push some change in the Makefile; which doesn't matter as we remove it anyway in this pull request, but it will likely complain about a conflict.
New file is renerer.o
and bumped C++ to 14, as it uses std::make_unique
which probably can be described in the required features, though I haven't found something that looks like that.
Further changes since then: @speedy-beaver changed the manpage to use pandoc in #41
Great! I've rebased this branch and will update with pandoc.
Update README.md @speedy-beaver: Can you check if the MacOS instructions make sense? TIA!
Am 9. Februar 2021 20:24:06 MEZ schrieb Henner Zeller notifications@github.com:
@hzeller commented on this pull request.
Install
-You can run timg directly in the source directory using
./timg
. To install -the binary and manpage on your system, type: +You can run timg directly in the build directory using./timg
. To installwouldn't that be
./src/timg
if you're in the build-directory ?
your're right. i'll fix it later, (currently afk)
@coldtobi - reviewed the macOS instructions. With cmake the LDFLAGS are not needed, at least not when I run it on my machine. I suggest to change the text to this - also adding the pandoc
dependency in the brew install
command:
# Homebrew needs to be available to install required dependencies
brew install GraphicsMagick webp cmake pandoc # required libs
# If you want to include video decoding, install these additional libraries
brew install ffmpeg
cmake .. -DWITH_VIDEO_DECODING=On # or Off for no video
make
If we want to deduplicate the Readme.md even more, then we can even have common text for cmake.. ; make
steps.
Thanks, merged!
I just pushed some minor change with a missing option in the pandoc generation, and re-added optimization and warning flags in the compilation.
One problem I have found: without git (e.g. if someone downloaded and compiled from https://github.com/hzeller/timg/archive/main.zip ), we don't get a fallback version string, but timg --version
shows
timg HEAD-HASH-NOTFOUND HEAD-HASH-NOTFOUND <http://timg.sh/>
as version string.
Can you have a look how to make the fallback work @coldtobi ?
@hzeller Fixed in #42
This is how it looks like when removing the Makefile (made an extra branch so it is not entangled)
Missing is updating README.md
PS: I've added "DISTRIBUTION_VERSION" to the version so that distributions can ammend the version, which is maybe useful to determine where a bug report came from. Though there is no automatic detection, distribution needs to add that information in their build process)