Attachment #235580 for bug #265536

Lines 1-10 Link Here

(-)b/x11/swayimg/Makefile (-4 / +9 lines)
1	PORTNAME= swayimg	1	PORTNAME= swayimg
2	DISTVERSIONPREFIX= v	2	DISTVERSIONPREFIX= v
3	DISTVERSION= 1.7	3	DISTVERSION= 1.8
4	CATEGORIES= x11 wayland	4	CATEGORIES= x11 wayland
5		5
6	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/	6	PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
7	PATCHFILES+= d12f10e9ebbd.patch:-p1 # https://github.com/artemsen/swayimg/pull/24	7	PATCHFILES+= d5ebd6e2f0e8.patch:-p1 # https://github.com/artemsen/swayimg/pull/36
8		8
9	MAINTAINER= jbeich@FreeBSD.org	9	MAINTAINER= jbeich@FreeBSD.org
10	COMMENT= Image viewer for Sway/Wayland	10	COMMENT= Image viewer for Sway/Wayland
Lines 14-19 LICENSE_FILE= ${WRKSRC}/LICENSE Link Here
14		14
15	BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols	15	BUILD_DEPENDS= wayland-protocols>0:graphics/wayland-protocols
16	LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \	16	LIB_DEPENDS= libepoll-shim.so:devel/libepoll-shim \
		17	libfreetype.so:print/freetype2 \
		18	libfontconfig.so:x11-fonts/fontconfig \
17	libjson-c.so:devel/json-c \	19	libjson-c.so:devel/json-c \
18	libwayland-client.so:graphics/wayland \	20	libwayland-client.so:graphics/wayland \
19	libxkbcommon.so:x11/libxkbcommon	21	libxkbcommon.so:x11/libxkbcommon
Lines 30-37 PLIST_FILES= bin/${PORTNAME} \ Link Here
30	share/icons/hicolor/64x64/apps/${PORTNAME}.png \	32	share/icons/hicolor/64x64/apps/${PORTNAME}.png \
31	${NULL}	33	${NULL}
32		34
33	OPTIONS_DEFINE= AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG WEBP	35	OPTIONS_DEFINE= AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
34	OPTIONS_DEFAULT=AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG WEBP	36	OPTIONS_DEFAULT=AVIF BASH GIF JPEG JXL LIBEXIF LIBRSVG2 PNG TIFF WEBP
35	OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}	37	OPTIONS_EXCLUDE=${LIBRSVG2_DEFAULT:Mlegacy:C/.+/LIBRSVG2/}
36		38
37	AVIF_LIB_DEPENDS= libavif.so:graphics/libavif	39	AVIF_LIB_DEPENDS= libavif.so:graphics/libavif
Lines 60-65 LIBRSVG2_MESON_ENABLED= svg Link Here
60	PNG_LIB_DEPENDS= libpng.so:graphics/png	62	PNG_LIB_DEPENDS= libpng.so:graphics/png
61	PNG_MESON_ENABLED= png	63	PNG_MESON_ENABLED= png
62		64
		65	TIFF_LIB_DEPENDS= libtiff.so:graphics/tiff
		66	TIFF_MESON_ENABLED= tiff
		67
63	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp	68	WEBP_LIB_DEPENDS= libwebp.so:graphics/webp
64	WEBP_MESON_ENABLED= webp	69	WEBP_MESON_ENABLED= webp
65		70

Lines 1-5 Link Here

(-)b/x11/swayimg/distinfo (-5 / +5 lines)
1	TIMESTAMP = 1659275210	1	TIMESTAMP = 1659272037
2	SHA256 (artemsen-swayimg-v1.7_GH0.tar.gz) = 2bb7bde8f993396c9f2a32c2789abdf30667f3191bf6f69f9823cdc2f06aa932	2	SHA256 (artemsen-swayimg-v1.8_GH0.tar.gz) = d4b4988a673522d47c38939c3406dbb72bd213f857dd6116185cd9811b887b23
3	SIZE (artemsen-swayimg-v1.7_GH0.tar.gz) = 77022	3	SIZE (artemsen-swayimg-v1.8_GH0.tar.gz) = 382650
4	SHA256 (d12f10e9ebbd.patch) = 682a8889be251a91f4d70d9091de880a458651a9b32788b974a1ddb4f496a27c	4	SHA256 (d5ebd6e2f0e8.patch) = 506c0bce5564188c896810c56d057c239b700e6d4a9d3a71e88828e503373cbd
5	SIZE (d12f10e9ebbd.patch) = 973	5	SIZE (d5ebd6e2f0e8.patch) = 1785




--- meson.build.orig	2022-07-31 08:50:03 UTC
+++ meson.build
@@ -46,7 +46,7 @@ rsvg = dependency('librsvg-2.0', version: '>=2.46', re
 jpeg = dependency('libjpeg', required: get_option('jpeg'))
 png = dependency('libpng', required: get_option('png'))
 rsvg = dependency('librsvg-2.0', version: '>=2.46', required: get_option('svg'))
-tiff = cc.find_library('libtiff', required: get_option('tiff'))
+tiff = dependency('libtiff-4', required: get_option('tiff'))
 webp = dependency('libwebp', required: get_option('webp'))
 # 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,
- 

Return to bug 265536

Lines 1-19 Link Here

(-)b/x11/swayimg/files/patch-meson.build (-18 / +9 lines)
1	--- meson.build.orig 2022-02-20 08:36:23 UTC	1	--- meson.build.orig 2022-07-31 08:50:03 UTC
2	+++ meson.build	2	+++ meson.build
3	@@ -39,6 +39,8 @@ bash = dependency('bash-completion', required: get_op	3	@@ -46,7 +46,7 @@ rsvg = dependency('librsvg-2.0', version: '>=2.46', re
		4	jpeg = dependency('libjpeg', required: get_option('jpeg'))
		5	png = dependency('libpng', required: get_option('png'))
		6	rsvg = dependency('librsvg-2.0', version: '>=2.46', required: get_option('svg'))
		7	-tiff = cc.find_library('libtiff', required: get_option('tiff'))
		8	+tiff = dependency('libtiff-4', required: get_option('tiff'))
		9	webp = dependency('libwebp', required: get_option('webp'))
4	# optional dependencies: other features	10	# optional dependencies: other features
5	exif = dependency('libexif', required: get_option('exif'))	11	exif = dependency('libexif', required: get_option('exif'))
6	bash = dependency('bash-completion', required: get_option('bash'))
7	+# Non-Linux
8	+epoll = dependency('epoll-shim', required: false)
9
10	# configuration file
11	conf = configuration_data()
12	@@ -150,6 +152,7 @@ executable(
13	dependencies: [
14	avif,
15	cairo,
16	+ epoll,
17	exif,
18	gif,
19	jpeg,
20	-