Compare commits

..

No commits in common. "0317b88c879db481611027dc5d2a853fee632b1a" and "9cdc641b0a233d46dffc3595574af30b66369190" have entirely different histories.

5 changed files with 6 additions and 19 deletions

3
.gitmodules vendored
View File

@ -1,6 +1,3 @@
[submodule "wuffs-mirror-release-c"]
path = wuffs-mirror-release-c
url = https://github.com/google/wuffs-mirror-release-c
[submodule "liberty"]
path = liberty
url = https://git.janouch.name/p/liberty.git

View File

@ -38,12 +38,11 @@ a package with the latest development version from Archlinux's AUR.
Building and Running
--------------------
Build-only dependencies:
Meson, pkg-config, asciidoctor or asciidoc (recommended but optional) +
Runtime dependencies:
gtk+-3.0, glib>=2.64, pixman-1, shared-mime-info, libturbojpeg, libwebp +
Build-only dependencies: Meson, pkg-config, asciidoctor or asciidoc +
Runtime dependencies: gtk+-3.0, glib>=2.64, pixman-1, shared-mime-info,
libturbojpeg, libwebp +
Optional dependencies: lcms2, LibRaw, librsvg-2.0, xcursor, libheif, libtiff,
ExifTool, resvg (unstable API, needs to be requested explicitly)
ExifTool, resvg (unstable API, needs to be requested explicitly)
$ git clone --recursive https://git.janouch.name/p/fiv.git
$ meson builddir

View File

@ -26,7 +26,7 @@
// TODO(p): Make it possible to use Skia's skcms,
// which also supports premultiplied alpha.
// NOTE: Little CMS 2.13 already supports premultiplied alpha, too.
// NOTE: Little CMS 2.13 will support premultiplied alpha in 2022.
typedef void *FivIoProfile;
FivIoProfile fiv_io_profile_new(const void *data, size_t len);
FivIoProfile fiv_io_profile_new_sRGB(void);

@ -1 +0,0 @@
Subproject commit 0e86ffe7c30a4d52eea35856b792567ca1040f56

View File

@ -217,11 +217,9 @@ if not win32
asciidoctor = find_program('asciidoctor', required : false)
a2x = find_program('a2x', required : false)
if not asciidoctor.found() and not a2x.found()
warning('Neither asciidoctor nor a2x were found, ' +
'falling back to a substandard manual page generator')
error('Neither asciidoctor nor a2x were found')
endif
foreach page : [meson.project_name()]
man_capture = false
if asciidoctor.found()
command = [asciidoctor, '-b', 'manpage',
'-a', 'release-version=' + meson.project_version(),
@ -230,16 +228,10 @@ if not win32
command = [a2x, '--doctype', 'manpage', '--format', 'manpage',
'-a', 'release-version=' + meson.project_version(),
'-D', '@OUTDIR@', '@INPUT@']
else
command = ['env', 'LC_ALL=C',
'asciidoc-release-version=' + meson.project_version(),
'awk', '-f', files('liberty/tools/asciiman.awk'), '@INPUT@']
man_capture = true
endif
custom_target('manpage for ' + page,
input : 'docs' / page + '.adoc',
output : page + '.1',
capture : man_capture,
command : command,
install : true,
install_dir : get_option('mandir') / 'man1')