diff --git a/code/PKGBUILDs/nsxiv/PKGBUILD b/code/PKGBUILDs/nsxiv/PKGBUILD index f9ea731..fa0bc1e 100644 --- a/code/PKGBUILDs/nsxiv/PKGBUILD +++ b/code/PKGBUILDs/nsxiv/PKGBUILD @@ -3,19 +3,19 @@ _pkgname=nsxiv pkgname="${_pkgname}-bepo-git" -pkgver=29.r13.g6922d5d +pkgver=31.r19.gc03ec39 pkgrel=1 pkgdesc='New Simple X Image Viewer' arch=('x86_64') license=('GPL2') conflicts=("$_pkgname" "${_pkgname}-git") provides=('sxiv') -url="https://github.com/${_pkgname}/${_pkgname}" +url="https://codeberg.org/${_pkgname}/${_pkgname}" depends=('imlib2' 'desktop-file-utils' 'xdg-utils' 'hicolor-icon-theme' 'libexif' 'libxft' 'giflib' 'libwebp') makedepends=(git) source=("${_pkgname}::git+$url" config.h) -sha512sums=('SKIP' - 'fc4d8327b2de66f90af245d8670c4fd0169ba172fcdd0344d3ba6d72b13f54583b7042b4f7bfc891645675c3a0771c0144a6c0486a8380af93b7d090f990c6aa') +b2sums=('SKIP' + '657b40dab4ed27e2d1402feb4fcd2dd225504c2e3a619da08cf87e36405d18a161a64939374670626e896c03a553a718f93b1bf54703f2d30dcdb27e082d6c21') pkgver() { cd "$srcdir/${_pkgname}" diff --git a/code/PKGBUILDs/nsxiv/config.h b/code/PKGBUILDs/nsxiv/config.h index 63b2e03..5f3ba76 100644 --- a/code/PKGBUILDs/nsxiv/config.h +++ b/code/PKGBUILDs/nsxiv/config.h @@ -1,4 +1,4 @@ -#ifdef _WINDOW_CONFIG +#ifdef INCLUDE_WINDOW_CONFIG /* default window dimensions (overwritten via -g option): */ static const int WIN_WIDTH = 800; @@ -14,26 +14,13 @@ static const char *DEFAULT_MARK_COLOR = NULL; /* NULL means it will default to static const char *DEFAULT_BAR_BG = NULL; /* NULL means it will default to window background */ static const char *DEFAULT_BAR_FG = NULL; /* NULL means it will default to window foreground */ static const char *DEFAULT_FONT = "monospace-8"; -#endif /* if true, statusbar appears on top of the window */ static const bool TOP_STATUSBAR = false; +#endif /* HAVE_LIBFONTS */ #endif -#ifdef _TITLE_CONFIG - -/* default title prefix */ -static const char *TITLE_PREFIX = "nsxiv - "; - -/* default title suffixmode, available options are: - * SUFFIX_EMPTY - * SUFFIX_BASENAME - * SUFFIX_FULLPATH - */ -static const suffixmode_t TITLE_SUFFIXMODE = SUFFIX_BASENAME; - -#endif -#ifdef _IMAGE_CONFIG +#ifdef INCLUDE_IMAGE_CONFIG /* levels (in percent) to use when zooming via '-' and '+': * (first/last value is used as min/max zoom level) @@ -46,36 +33,45 @@ static const float zoom_levels[] = { /* default slideshow delay (in sec, overwritten via -S option): */ static const int SLIDESHOW_DELAY = 5; -/* gamma correction: the user-visible ranges [-GAMMA_RANGE, 0] and - * (0, GAMMA_RANGE] are mapped to the ranges [0, 1], and (1, GAMMA_MAX]. +/* color correction: the user-visible ranges [-CC_STEPS, 0] and + * (0, CC_STEPS] are mapped to the ranges [0, 1], and (1, *_MAX]. + * Higher step count will have higher granulairy. */ -static const double GAMMA_MAX = 10.0; -static const int GAMMA_RANGE = 32; +static const int CC_STEPS = 32; +static const double GAMMA_MAX = 10.0; +static const double BRIGHTNESS_MAX = 2.0; +static const double CONTRAST_MAX = 4.0; /* command i_scroll pans image 1/PAN_FRACTION of screen width/height */ static const int PAN_FRACTION = 5; -/* if false, pixelate images at zoom level != 100%, - * toggled with 'a' key binding - */ -static const bool ANTI_ALIAS = true; - -/* if true, use a checkerboard background for alpha layer, - * toggled with 'A' key binding - */ -static const bool ALPHA_LAYER = false; - /* percentage of memory to use for imlib2's cache size. * 3 means use 3% of total memory which is about 245MiB on 8GiB machine. * 0 or less means disable cache. * 100 means use all available memory (but not above CACHE_SIZE_LIMIT). + * + * NOTE: higher cache size means better image reloading performance, but also + * higher memory usage. */ static const int CACHE_SIZE_MEM_PERCENTAGE = 3; /* use 3% of total memory for cache */ static const int CACHE_SIZE_LIMIT = 256 * 1024 * 1024; /* but not above 256MiB */ static const int CACHE_SIZE_FALLBACK = 32 * 1024 * 1024; /* fallback to 32MiB if we can't determine total memory */ #endif -#ifdef _THUMBS_CONFIG +#ifdef INCLUDE_OPTIONS_CONFIG + +/* if false, pixelate images at zoom level != 100%, + * toggled with 'a' key binding (overwritten via `--anti-alias` option) + */ +static const bool ANTI_ALIAS = true; + +/* if true, use a checkerboard background for alpha layer, + * toggled with 'A' key binding (overwritten via `--alpha-layer` option) + */ +static const bool ALPHA_LAYER = false; + +#endif +#ifdef INCLUDE_THUMBS_CONFIG /* thumbnail sizes in pixels (width == height): */ static const int thumb_sizes[] = { 32, 64, 96, 128, 160 }; @@ -84,7 +80,7 @@ static const int thumb_sizes[] = { 32, 64, 96, 128, 160 }; static const int THUMB_SIZE = 3; #endif -#ifdef _MAPPINGS_CONFIG +#ifdef INCLUDE_MAPPINGS_CONFIG /* these modifiers will be used when processing keybindings */ static const unsigned int USED_MODMASK = ShiftMask | ControlMask | Mod1Mask;