summaryrefslogtreecommitdiff
path: root/x11
diff options
context:
space:
mode:
authorEvgeniy Khramtsov <evgeniy@khramtsov.org>2022-07-31 14:20:27 +0000
committerJan Beich <jbeich@FreeBSD.org>2022-07-31 17:21:39 +0000
commit1c185ade7f5e411c1aba8d2e506c2fedd77eb3c0 (patch)
tree5a4c4d61318e70cdaeab0174f462e81410d4b7c9 /x11
parentx11/swayimg: update to 1.7 (diff)
x11/swayimg: update to 1.8
Changes: https://github.com/artemsen/swayimg/releases/tag/v1.8 PR: 265536
Diffstat (limited to 'x11')
-rw-r--r--x11/swayimg/Makefile17
-rw-r--r--x11/swayimg/distinfo12
-rw-r--r--x11/swayimg/files/patch-meson.build21
3 files changed, 18 insertions, 32 deletions
diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
index c7c3eb175fcd..1980023ea713 100644
--- a/x11/swayimg/Makefile
+++ b/x11/swayimg/Makefile
@@ -1,10 +1,11 @@
PORTNAME= swayimg
DISTVERSIONPREFIX= v
-DISTVERSION= 1.7
+DISTVERSION= 1.8
CATEGORIES= x11 wayland
PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
-PATCHFILES+= d12f10e9ebbd.patch:-p1 # https://github.com/artemsen/swayimg/pull/24
+PATCHFILES+= 2a07af9d2362.patch:-p1 # https://github.com/artemsen/swayimg/issues/37
+PATCHFILES+= 2e885eadec15.patch:-p1 # https://github.com/artemsen/swayimg/pull/36
MAINTAINER= jbeich@FreeBSD.org
COMMENT= Image viewer for Sway/Wayland
@@ -16,12 +17,13 @@ BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols
LIB_DEPENDS= libjson-c.so:devel/json-c \
libepoll-shim.so:devel/libepoll-shim \
libwayland-client.so:graphics/wayland \
+ libfreetype.so:print/freetype2 \
+ libfontconfig.so:x11-fonts/fontconfig \
libxkbcommon.so:x11/libxkbcommon
USES= gnome meson pkgconfig
USE_GITHUB= yes
GH_ACCOUNT= artemsen
-USE_GNOME= cairo
MESON_ARGS= -Dversion="${DISTVERSIONFULL}"
PLIST_FILES= bin/${PORTNAME} \
man/man1/${PORTNAME}.1.gz \
@@ -30,8 +32,8 @@ PLIST_FILES= bin/${PORTNAME} \
share/icons/hicolor/64x64/apps/${PORTNAME}.png \
${NULL}
-OPTIONS_DEFINE= AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG WEBP
-OPTIONS_DEFAULT=AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG WEBP
+OPTIONS_DEFINE= AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
+OPTIONS_DEFAULT=AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
AVIF_LIB_DEPENDS= libavif.so:graphics/libavif
@@ -54,12 +56,15 @@ JXL_MESON_ENABLED= jxl
LIBEXIF_LIB_DEPENDS= libexif.so:graphics/libexif
LIBEXIF_MESON_ENABLED= exif
-LIBRSVG2_USE= GNOME=librsvg2
+LIBRSVG2_USE= GNOME=cairo,librsvg2
LIBRSVG2_MESON_ENABLED= svg
PNG_LIB_DEPENDS= libpng.so:graphics/png
PNG_MESON_ENABLED= png
+TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
+TIFF_MESON_ENABLED= tiff
+
WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
WEBP_MESON_ENABLED= webp
diff --git a/x11/swayimg/distinfo b/x11/swayimg/distinfo
index fa18ba2fec2d..239f2ae457ea 100644
--- a/x11/swayimg/distinfo
+++ b/x11/swayimg/distinfo
@@ -1,5 +1,7 @@
-TIMESTAMP = 1645346183
-SHA256 (artemsen-swayimg-v1.7_GH0.tar.gz) = 2bb7bde8f993396c9f2a32c2789abdf30667f3191bf6f69f9823cdc2f06aa932
-SIZE (artemsen-swayimg-v1.7_GH0.tar.gz) = 77022
-SHA256 (d12f10e9ebbd.patch) = 682a8889be251a91f4d70d9091de880a458651a9b32788b974a1ddb4f496a27c
-SIZE (d12f10e9ebbd.patch) = 973
+TIMESTAMP = 1659257403
+SHA256 (artemsen-swayimg-v1.8_GH0.tar.gz) = d4b4988a673522d47c38939c3406dbb72bd213f857dd6116185cd9811b887b23
+SIZE (artemsen-swayimg-v1.8_GH0.tar.gz) = 382650
+SHA256 (2a07af9d2362.patch) = 728bb4901ddea47ae023ac383aff82ccc2fa3e1ac44f1ce63bf671aaaca62952
+SIZE (2a07af9d2362.patch) = 1008
+SHA256 (2e885eadec15.patch) = 37c9f5ff44541261fd6a05c712f267d06ec767030be6526625935448777027b1
+SIZE (2e885eadec15.patch) = 1843
diff --git a/x11/swayimg/files/patch-meson.build b/x11/swayimg/files/patch-meson.build
deleted file mode 100644
index 31d18e49f70e..000000000000
--- a/x11/swayimg/files/patch-meson.build
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/artemsen/swayimg/pull/36
-
---- meson.build.orig 2022-02-20 08:36:23 UTC
-+++ meson.build
-@@ -39,6 +39,8 @@ bash = dependency('bash-completion', required: get_op
- # optional dependencies: other features
- exif = dependency('libexif', required: get_option('exif'))
- bash = dependency('bash-completion', required: get_option('bash'))
-+# Non-Linux
-+epoll = dependency('epoll-shim', required: false)
-
- # configuration file
- conf = configuration_data()
-@@ -150,6 +152,7 @@ executable(
- dependencies: [
- avif,
- cairo,
-+ epoll,
- exif,
- gif,
- jpeg,