Attachment 235580 Details for Bug 265536 – x11/swayimg: update to 1.8 (v. 1.1 "git am")

[patch] x11/swayimg: update to 1.8 (v. 1.1 "git am")

0001-x11-swayimg-update-to-1.8.patch (text/plain), 4.28 KB, created by Ghost on 2022-07-31 14:25:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ghost

Created: 2022-07-31 14:25:05 UTC

Size: 4.28 KB

patch

obsolete

>From 63a4b9d20a49ecf081b7354df2551dfcfc30dbd3 Mon Sep 17 00:00:00 2001
>From: Evgeniy Khramtsov <evgeniy@khramtsov.org>
>Date: Sun, 31 Jul 2022 14:20:27 +0000
>Subject: [PATCH] x11/swayimg: update to 1.8
>
>PR:		?
>Approved by:	?
>Changes:	https://github.com/artemsen/swayimg/compare/v1.7...v1.8
>---
> x11/swayimg/Makefile                | 13 +++++++++----
> x11/swayimg/distinfo                | 10 +++++-----
> x11/swayimg/files/patch-meson.build | 26 +++++++++-----------------
> 3 files changed, 23 insertions(+), 26 deletions(-)
>
>diff --git a/x11/swayimg/Makefile b/x11/swayimg/Makefile
>index abdd0b5a91ec..9107357ad560 100644
>--- a/x11/swayimg/Makefile
>+++ b/x11/swayimg/Makefile
>@@ -1,10 +1,10 @@
> 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+=	d5ebd6e2f0e8.patch:-p1 # https://github.com/artemsen/swayimg/pull/36
> 
> MAINTAINER=	jbeich@FreeBSD.org
> COMMENT=	Image viewer for Sway/Wayland
>@@ -14,6 +14,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
> 
> BUILD_DEPENDS=	wayland-protocols>0:graphics/wayland-protocols
> LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
>+		libfreetype.so:print/freetype2 \
>+		libfontconfig.so:x11-fonts/fontconfig \
> 		libjson-c.so:devel/json-c \
> 		libwayland-client.so:graphics/wayland \
> 		libxkbcommon.so:x11/libxkbcommon
>@@ -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
>@@ -60,6 +62,9 @@ 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 6103ffd4fe33..c557d0940643 100644
>--- a/x11/swayimg/distinfo
>+++ b/x11/swayimg/distinfo
>@@ -1,5 +1,5 @@
>-TIMESTAMP = 1659275210
>-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 = 1659272037
>+SHA256 (artemsen-swayimg-v1.8_GH0.tar.gz) = d4b4988a673522d47c38939c3406dbb72bd213f857dd6116185cd9811b887b23
>+SIZE (artemsen-swayimg-v1.8_GH0.tar.gz) = 382650
>+SHA256 (d5ebd6e2f0e8.patch) = 506c0bce5564188c896810c56d057c239b700e6d4a9d3a71e88828e503373cbd
>+SIZE (d5ebd6e2f0e8.patch) = 1785
>diff --git a/x11/swayimg/files/patch-meson.build b/x11/swayimg/files/patch-meson.build
>index 15a35f250048..0f4ec60cf13e 100644
>--- a/x11/swayimg/files/patch-meson.build
>+++ b/x11/swayimg/files/patch-meson.build
>@@ -1,19 +1,11 @@
>---- meson.build.orig	2022-02-20 08:36:23 UTC
>+--- meson.build.orig	2022-07-31 08:50:03 UTC
> +++ meson.build
>-@@ -39,6 +39,8 @@ bash  = dependency('bash-completion', required: get_op
>+@@ -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,
>+ exif = dependency('libexif', required: get_option('exif'))
>-- 
>2.37.1
>

Actions: View | Diff

Attachments on bug 265536: 235578 | 235579 | 235580 | 235581