From nobody Sun Jul 31 17:23:09 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Lwp4G1X43z4XnVJ; Sun, 31 Jul 2022 17:23:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Lwp4F6Rrjz45qV; Sun, 31 Jul 2022 17:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659288189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGwFZL9891tjv5AJYJ8vQsANi8Ly1+8UqpfO9BZiCiY=; b=lxmPSeHc8pLpU4dYZi5VaKTuLJkseFiUDYvXx26YXVDLVa24km6QvsEAFS781pTpOx4+p/ 2j5zN1HSfLpLvjl9lIOFjbY1Je9cqNT4FkKgr8ierHsRfhPYMrZm70X0Zk4Ez1jlheHthr Ch7jKue8Me2op9cidRxvo5dH61HwSEkyurCWE4jvXp57GUzB0ecxAMeL8Li2NLh7Qjn8Md 6Rg1gbREW+RjYX6JbvwY5fDxilbg5bvxffMzjrqTSUeRG2Vugzz1qKd9NjctNfcQ9r9JQC gN93LyAMq76u43yp+54E+UWxcoWMt/3cT+Qsln9THluiI/V+dF00BqLwYDTzUw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Lwp4F5Z5Qz1277; Sun, 31 Jul 2022 17:23:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 26VHN9P1030774; Sun, 31 Jul 2022 17:23:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26VHN9Q7030773; Sun, 31 Jul 2022 17:23:09 GMT (envelope-from git) Date: Sun, 31 Jul 2022 17:23:09 GMT Message-Id: <202207311723.26VHN9Q7030773@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 1c185ade7f5e - main - x11/swayimg: update to 1.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1c185ade7f5e411c1aba8d2e506c2fedd77eb3c0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1659288189; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uGwFZL9891tjv5AJYJ8vQsANi8Ly1+8UqpfO9BZiCiY=; b=urClJWBCovuPjm3an5DShqsxoDpD5wqWodZtoCTUaR1PhRxNU4N17WiDJoFMa4vt+giFk/ OofRIpU9zj4RWFu2DdSKmR20UAJr9JzWaCExjmRtA79XnBpnXaqXBuWVRbr3st9DZCw9jw D7/RNE7eLUK1A1SRhrSQEc16NIlkik+S7UxjUr7EkCBTxUUeyy3jwGVssEf05a9dobusI5 6MUErRk6Hr35pqHQ9lpenrchETbl19TthPeLjMNYI3ggc+0XJfSvUkdb3Bog8IltXurBV8 S8P7Nt/drmQHbyvhBgjvBVFHUaeigmkqu2k4RD3feQKXd37J9PBaZmlOqXhCVQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1659288189; a=rsa-sha256; cv=none; b=h3dxs4hhQPYiJ/R3ScVQNzLhTInN51c/1pT0j6g7M7AlZixz+enQdVj9OYXtlbawpZ2JkJ iTnm0KcBxwfu+btUdI69nv8m/rpAzB/R4Aafj2DENKdpxicAF5A5bEXnKk2tcumtQKAy1z NYGLyEqrbXdqS7hnNtC6bbePmMH35m6ndsYa9DgeeBxDV6okwOMToejSoT1xKxQ2Ce2Nhp T8Es7rCZPfHAQyzSDEKF8eAOi45Mf6VnQM0ki6bZwBx6KVn8p4UnQC0ynObq9zBUXsGgDm 6+HL/A6gDAl7d+z7rvn2AEdb20zjvyUjp6UEKHoLhORUFiWVPkMkCwXS6JjE9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=1c185ade7f5e411c1aba8d2e506c2fedd77eb3c0 commit 1c185ade7f5e411c1aba8d2e506c2fedd77eb3c0 Author: Evgeniy Khramtsov AuthorDate: 2022-07-31 14:20:27 +0000 Commit: Jan Beich CommitDate: 2022-07-31 17:21:39 +0000 x11/swayimg: update to 1.8 Changes: https://github.com/artemsen/swayimg/releases/tag/v1.8 PR: 265536 --- x11/swayimg/Makefile | 17 +++++++++++------ x11/swayimg/distinfo | 12 +++++++----- x11/swayimg/files/patch-meson.build | 21 --------------------- 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,