From nobody Tue Jan 03 07:45:47 2023 X-Original-To: dev-commits-ports-all@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 4NmPt34jp8z2p23V; Tue, 3 Jan 2023 07:45:47 +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 4NmPt34B8Xz410k; Tue, 3 Jan 2023 07:45:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672731947; 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=9eTz5O/iNgLMysPYm144dRV4ghRlwwjHQysfKSnEEKs=; b=ei1AB/a2e+3Z+AoTrqM+b4UNDhpgsh3ub08I/ze9vRluLMxfnHsGhFW8e3c34Rs7CdLTnC V6VmIYp7b9yr2kk64rfAOzjbmKBRfwoXO/+YfYjQSOEEhqtsWKYu0SSzSCwqygl5AiXifR /RUwZpzfyAblh/itXLbh7wcA58Y1IxK4jMo/tMrtMoNAR16OV6+7RnVE6a3aNgtGJsF/Jg DMl/sehUSxUPDL9vcdgQbEuz0Fkh9DMwx0C4juG516jxatIbrq1/HcdgSD/Vq9bhPmNV6t 8ZcEPaQB5dyFJt2eKt3FqyUhmKDFt1IqWG1ritvxroqY31UHhORakQ6jtH3ifA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672731947; 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=9eTz5O/iNgLMysPYm144dRV4ghRlwwjHQysfKSnEEKs=; b=Mbegf0THTs31Ywzem1hE34aNEOE+JnqmS9kuX1DFVY19CHwsn99hCK1zwMjCf1DPNc/jxX wbsTg1Mkszw/WLHo6a7MQFBgLgdtyzIIroue5HJLXppCiwJ7OcpK7xzslmY/+DTzasXjzk idYq2mjsnpdCQy0mEGKfqQegq+0vPJu5d9ng+jTbe6dcuz8zIcLSKBRdDIVp4pSFkgkpVC DCzShIQYGR5JGFnIZp+MSJuXkmmqxfWfuVr/K+1ZKmmlgIPlg+nwNy146xg/yTD+vpLTYM 1as8T8+9yDc/Zs2Ck/z2kPfV9L+QKvs00S2kA/ASjbOCpiGP1+twd/urkSV/Nw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672731947; a=rsa-sha256; cv=none; b=ctBrqg5gTUed9P3Z4SmPoOjEcd5lKD/nwD43yZysw81fbbWeejCsaD2POt9SuDarfknSK9 5S4ryO+EKE2LsJdKbvjO43FJRkKgeeKhvuyq+xucWtcN+6P8yRlP+oqmeJTfZRHI2iZc3p 0Qg+YTJ482CDmIHQeNUaVLpMJ594IIE+oeoXQHdOCm7vGINjGhYzNvYU7s2U+HUPzgkcyI mKLD0/KyDEDKr0iFja6TwplEVNFcd6pgoWmnmrBCFFtkloC5r7Lg7hB/wxfgqU/eMJwQcu GSYTe5wXgwMhlV+quSd1ApFcy8VLjD0qFWMdurdaDjBIiLVENhmkAVnoeJKl6Q== 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 4NmPt33DJmzNmf; Tue, 3 Jan 2023 07:45:47 +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 3037jl3j044676; Tue, 3 Jan 2023 07:45:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 3037jlQf044675; Tue, 3 Jan 2023 07:45:47 GMT (envelope-from git) Date: Tue, 3 Jan 2023 07:45:47 GMT Message-Id: <202301030745.3037jlQf044675@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: 15b2d393d261 - 2023Q1 - graphics/upscaler: add new port List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q1 X-Git-Reftype: branch X-Git-Commit: 15b2d393d2614bbc71a7e0c926de620f810cf182 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=15b2d393d2614bbc71a7e0c926de620f810cf182 commit 15b2d393d2614bbc71a7e0c926de620f810cf182 Author: Jan Beich AuthorDate: 2022-12-10 21:01:05 +0000 Commit: Jan Beich CommitDate: 2023-01-03 07:45:18 +0000 graphics/upscaler: add new port Upscaler is a GTK4 + libadwaita application that allows you to upscale and enhance a given image. It is a front-end for Real-ESRGAN ncnn Vulkan. https://gitlab.com/TheEvilSkeleton/Upscaler (cherry picked from commit 4b15a96231c6a389a6080127d3f9a7fcedbf9315) --- graphics/Makefile | 1 + graphics/upscaler/Makefile | 27 ++++++++++++++++++++++++ graphics/upscaler/distinfo | 3 +++ graphics/upscaler/files/patch-upscaler_window.py | 14 ++++++++++++ graphics/upscaler/pkg-descr | 2 ++ graphics/upscaler/pkg-plist | 20 ++++++++++++++++++ 6 files changed, 67 insertions(+) diff --git a/graphics/Makefile b/graphics/Makefile index c8d6a2c3228b..bfa5203defbb 100644 --- a/graphics/Makefile +++ b/graphics/Makefile @@ -1123,6 +1123,7 @@ SUBDIR += tweeny SUBDIR += ufraw SUBDIR += unpaper + SUBDIR += upscaler SUBDIR += urho3d SUBDIR += urt SUBDIR += vapoursynth-fmtconv diff --git a/graphics/upscaler/Makefile b/graphics/upscaler/Makefile new file mode 100644 index 000000000000..ac220a66690b --- /dev/null +++ b/graphics/upscaler/Makefile @@ -0,0 +1,27 @@ +PORTNAME= upscaler +DISTVERSION= 1.1.2 +CATEGORIES= graphics + +MAINTAINER= jbeich@FreeBSD.org +COMMENT= Upscale and enhance images +WWW= https://gitlab.com/TheEvilSkeleton/Upscaler + +LICENSE= GPLv3 +LICENSE_FILE= ${WRKSRC}/COPYING + +BUILD_DEPENDS= blueprint-compiler:devel/blueprint-compiler +RUN_DEPENDS= realesrgan-ncnn-vulkan:graphics/realesrgan-ncnn-vulkan + +USES= desktop-file-utils gettext-tools gnome meson python +USE_GITLAB= yes +USE_GNOME= gtk40 libadwaita pygobject3 +GL_ACCOUNT= TheEvilSkeleton +GL_PROJECT= Upscaler +GL_COMMIT= 5aaab9ccaf56b3c7a0eb7d1dbba372d8ff970d69 +GLIB_SCHEMAS= io.gitlab.theevilskeleton.Upscaler.gschema.xml + +post-patch: +# Derive Python version from Meson + @${REINPLACE_CMD} -e "s,'python3',," ${WRKSRC}/${PORTNAME}/meson.build + +.include diff --git a/graphics/upscaler/distinfo b/graphics/upscaler/distinfo new file mode 100644 index 000000000000..c7b1328a255e --- /dev/null +++ b/graphics/upscaler/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1670706065 +SHA256 (TheEvilSkeleton-Upscaler-5aaab9ccaf56b3c7a0eb7d1dbba372d8ff970d69_GL0.tar.gz) = d92ad00e1e652c543ae5e819c6ef0f72d4348e4014013344c75e49275048d25a +SIZE (TheEvilSkeleton-Upscaler-5aaab9ccaf56b3c7a0eb7d1dbba372d8ff970d69_GL0.tar.gz) = 130006 diff --git a/graphics/upscaler/files/patch-upscaler_window.py b/graphics/upscaler/files/patch-upscaler_window.py new file mode 100644 index 000000000000..f14c1b3ebd4d --- /dev/null +++ b/graphics/upscaler/files/patch-upscaler_window.py @@ -0,0 +1,14 @@ +Avoid spurious error "Algorithm failed" as poll() returns None when +the subprocess hasn't finished yet. + +--- upscaler/window.py.orig 2022-12-10 21:01:05 UTC ++++ upscaler/window.py +@@ -203,7 +203,7 @@ class UpscalerWindow(Adw.ApplicationWindow): + bad = True + continue + """ Process algorithm output. """ +- result = self.process.poll() ++ result = self.process.wait(1) + if result != 0: + raise AlgorithmFailed(result, output) + if bad: diff --git a/graphics/upscaler/pkg-descr b/graphics/upscaler/pkg-descr new file mode 100644 index 000000000000..17ef7fa92336 --- /dev/null +++ b/graphics/upscaler/pkg-descr @@ -0,0 +1,2 @@ +Upscaler is a GTK4 + libadwaita application that allows you to upscale +and enhance a given image. It is a front-end for Real-ESRGAN ncnn Vulkan. diff --git a/graphics/upscaler/pkg-plist b/graphics/upscaler/pkg-plist new file mode 100644 index 000000000000..8141abe3deb2 --- /dev/null +++ b/graphics/upscaler/pkg-plist @@ -0,0 +1,20 @@ +bin/upscaler +share/applications/io.gitlab.theevilskeleton.Upscaler.desktop +share/icons/hicolor/scalable/apps/io.gitlab.theevilskeleton.Upscaler.svg +share/icons/hicolor/symbolic/apps/io.gitlab.theevilskeleton.Upscaler-symbolic.svg +share/locale/de/LC_MESSAGES/upscaler.mo +share/locale/fr/LC_MESSAGES/upscaler.mo +share/locale/id/LC_MESSAGES/upscaler.mo +share/locale/it/LC_MESSAGES/upscaler.mo +share/locale/nl/LC_MESSAGES/upscaler.mo +share/locale/ru/LC_MESSAGES/upscaler.mo +share/locale/tr/LC_MESSAGES/upscaler.mo +share/metainfo/io.gitlab.theevilskeleton.Upscaler.metainfo.xml +%%DATADIR%%/upscaler.gresource +%%DATADIR%%/upscaler/__init__.py +%%DATADIR%%/upscaler/app_profile.py +%%DATADIR%%/upscaler/file_chooser.py +%%DATADIR%%/upscaler/filters.py +%%DATADIR%%/upscaler/main.py +%%DATADIR%%/upscaler/threading.py +%%DATADIR%%/upscaler/window.py