diff --git a/graphics/upscaler/Makefile b/graphics/upscaler/Makefile index 1c16c9ff2ab2..fc1372c88588 100644 --- a/graphics/upscaler/Makefile +++ b/graphics/upscaler/Makefile @@ -1,28 +1,29 @@ PORTNAME= upscaler -DISTVERSION= 1.1.2 -PORTREVISION= 2 +DISTVERSION= 1.6.3 CATEGORIES= graphics MAINTAINER= ports@FreeBSD.org COMMENT= Upscale and enhance images WWW= https://gitlab.gnome.org/World/Upscaler LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= blueprint-compiler:devel/blueprint-compiler -RUN_DEPENDS= realesrgan-ncnn-vulkan:graphics/realesrgan-ncnn-vulkan +RUN_DEPENDS= realesrgan-ncnn-vulkan:graphics/realesrgan-ncnn-vulkan \ + ${PYTHON_PKGNAMEPREFIX}pillow>0:graphics/py-pillow@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}vulkan>0:graphics/py-vulkan@${PY_FLAVOR} USES= desktop-file-utils gettext-tools gnome meson python USE_GITLAB= yes -USE_GNOME= gtk40 libadwaita pygobject3 GL_SITE= https://gitlab.gnome.org GL_ACCOUNT= World GL_PROJECT= Upscaler +USE_GNOME= glib20 gtk40 libadwaita pango pygobject3 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 index 34ea52d6b486..448e24a764a0 100644 --- a/graphics/upscaler/distinfo +++ b/graphics/upscaler/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670706065 -SHA256 (Upscaler-1.1.2.tar.bz2) = 9fc35c4cc2141f0cb9073d0e79fc0e8d408c5b447d343f5dad28dcb06b3a2136 -SIZE (Upscaler-1.1.2.tar.bz2) = 129007 +TIMESTAMP = 1767112356 +SHA256 (Upscaler-1.6.3.tar.bz2) = 74186083c91b6a52f4bdb1ea67e163b36f67189d41c433fa959a98f0ed560fa3 +SIZE (Upscaler-1.6.3.tar.bz2) = 360001 diff --git a/graphics/upscaler/files/patch-upscaler_window.py b/graphics/upscaler/files/patch-upscaler_window.py index f14c1b3ebd4d..f3312dec71df 100644 --- a/graphics/upscaler/files/patch-upscaler_window.py +++ b/graphics/upscaler/files/patch-upscaler_window.py @@ -1,14 +1,25 @@ 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 +Revert: https://gitlab.gnome.org/World/Upscaler/-/commit/3c88bab3 + +--- upscaler/window.py.orig 2025-12-15 16:42:07 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: +@@ -410,7 +410,7 @@ class Window(Adw.ApplicationWindow): + async def run() -> None: + def start_process(running_row: QueueRow) -> None: + running_row.command = ( +- "upscayl-bin", ++ "realesrgan-ncnn-vulkan", + "-i", + str(running_row.media_file.get_preferred_input_path()), + "-o", +@@ -445,7 +445,7 @@ class Window(Adw.ApplicationWindow): + bad = bad or re.match(warn, line) is not None + + # Process algorithm output +- result = running_row.process.poll() ++ result = running_row.process.wait(1) + if running_row.canceled: + logger.info("Manually canceled upscaling by the user") + diff --git a/graphics/upscaler/pkg-plist b/graphics/upscaler/pkg-plist index 8141abe3deb2..b4ca4f065a9d 100644 --- a/graphics/upscaler/pkg-plist +++ b/graphics/upscaler/pkg-plist @@ -1,20 +1,30 @@ 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/bg/LC_MESSAGES/upscaler.mo share/locale/de/LC_MESSAGES/upscaler.mo +share/locale/es/LC_MESSAGES/upscaler.mo +share/locale/fa_IR/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/pt_BR/LC_MESSAGES/upscaler.mo share/locale/ru/LC_MESSAGES/upscaler.mo +share/locale/sv/LC_MESSAGES/upscaler.mo share/locale/tr/LC_MESSAGES/upscaler.mo +share/locale/uk/LC_MESSAGES/upscaler.mo +share/locale/vi/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/dimension_label.py +%%DATADIR%%/upscaler/exceptions.py +%%DATADIR%%/upscaler/logger.py %%DATADIR%%/upscaler/main.py -%%DATADIR%%/upscaler/threading.py +%%DATADIR%%/upscaler/media.py +%%DATADIR%%/upscaler/queue_row.py +%%DATADIR%%/upscaler/scale_comparison_frame.py +%%DATADIR%%/upscaler/scale_spin_button.py %%DATADIR%%/upscaler/window.py