* [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/
@ 2024-07-08 16:47 David Roman
0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2024-07-08 16:47 UTC (permalink / raw
To: gentoo-commits
commit: c0f534bab3cefbdf2531f7b1472757817895a207
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Jul 5 15:58:20 2024 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Sun Jul 7 09:01:17 2024 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c0f534ba
media-gfx/swayimg: drop 2.1
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
media-gfx/swayimg/Manifest | 1 -
.../swayimg/files/swayimg-2.1-fix-automagic.patch | 25 ---------
media-gfx/swayimg/swayimg-2.1.ebuild | 61 ----------------------
3 files changed, 87 deletions(-)
diff --git a/media-gfx/swayimg/Manifest b/media-gfx/swayimg/Manifest
index f01fc0b3f..1f427d4d7 100644
--- a/media-gfx/swayimg/Manifest
+++ b/media-gfx/swayimg/Manifest
@@ -1,2 +1 @@
-DIST swayimg-2.1.tar.gz 407561 BLAKE2B 80e7acd457440af6bb6ed8fda35858d48dc063e8056f9273530609075f53f1b3166427d6bdb977cc82805bc09db14a2e4596b6ec25352177e5bab36b24ccb165 SHA512 970ea7f8896df28d14ed126c88ec70b3af88dba2977bc351184b66a1094fd1528b81150b8d09afbfac5463c59e20ce32d69872d6726f8129724f344f34892c05
DIST swayimg-2.2.tar.gz 313340 BLAKE2B 51c7bb01df02469a9b089cf9b83bcade78247e0c8d60031ce5a540a184f87b00fd7cce2732d0d99f256f1023a6d3ed4a79eb2e5dcc6f9e1097ee209048616491 SHA512 d7923c8bcb09c4a271dec41374df02e936d847f268d5e8e7dc9e50ebb639fc52592bc5a602e8df702bd536320c90e3277c699ebfa63d33327706c4350466e681
diff --git a/media-gfx/swayimg/files/swayimg-2.1-fix-automagic.patch b/media-gfx/swayimg/files/swayimg-2.1-fix-automagic.patch
deleted file mode 100644
index 373445622..000000000
--- a/media-gfx/swayimg/files/swayimg-2.1-fix-automagic.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Fix a issue that libjxl is automagicaly linked.
-https://github.com/artemsen/swayimg/commit/f8ea442c462b519de1ee6d9c4aa44d7b36b3d74f
---- a/meson.build 2024-03-12 17:00:50.239606131 +0900
-+++ b/meson.build 2024-03-12 17:03:23.185959883 +0900
-@@ -47,6 +47,7 @@
- heif = dependency('libheif', required: get_option('heif'))
- avif = dependency('libavif', required: get_option('avif'))
- jpeg = dependency('libjpeg', required: get_option('jpeg'))
-+jxl = dependency('libjxl', required: get_option('jxl'))
- png = dependency('libpng', required: get_option('png'))
- rsvg = dependency('librsvg-2.0', version: '>=2.46', required: get_option('svg'))
- tiff = dependency('libtiff-4', required: get_option('tiff'))
-@@ -55,12 +56,6 @@
- # optional dependencies: other features
- exif = dependency('libexif', required: get_option('exif'))
- bash = dependency('bash-completion', required: get_option('bash'))
--# Arch specific: https://bugs.archlinux.org/task/73931
--jxl_feature = get_option('jxl')
--jxl = dependency('libjxl', required: false)
--if not jxl.found() and (jxl_feature.auto() or jxl_feature.enabled())
-- jxl = cc.find_library('libjxl', required: jxl_feature)
--endif
- # non-Linux (BSD specific)
- epoll = dependency('epoll-shim', required: false)
- inotify = dependency('libinotify', required: false)
diff --git a/media-gfx/swayimg/swayimg-2.1.ebuild b/media-gfx/swayimg/swayimg-2.1.ebuild
deleted file mode 100644
index 3adef8f47..000000000
--- a/media-gfx/swayimg/swayimg-2.1.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2023-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-DESCRIPTION="A lightweight image viewer for Wayland display servers"
-HOMEPAGE="https://github.com/artemsen/swayimg"
-SRC_URI="https://github.com/artemsen/swayimg/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="avif +exif exr +gif heif +jpeg jpegxl +png svg tiff webp bash-completion"
-
-RDEPEND="
- dev-libs/json-c:=
- dev-libs/wayland
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libxkbcommon
- avif? ( media-libs/libavif:= )
- bash-completion? ( app-shells/bash-completion )
- exif? ( media-libs/libexif )
- exr? ( media-libs/openexr:= )
- gif? ( media-libs/giflib:= )
- heif? ( media-libs/libheif:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpegxl? ( media-libs/libjxl:= )
- png? ( media-libs/libpng:= )
- svg? ( gnome-base/librsvg:2 )
- tiff? ( media-libs/tiff:= )
- webp? ( media-libs/libwebp:= )"
-DEPEND="${RDEPEND}
- dev-libs/wayland-protocols"
-BDEPEND="dev-util/wayland-scanner"
-
-PATCHES=( "${FILESDIR}/${P}-fix-automagic.patch" )
-
-src_configure() {
- local emesonargs=(
- $(meson_feature avif)
- $(meson_feature exif)
- $(meson_feature exr)
- $(meson_feature gif)
- $(meson_feature heif)
- $(meson_feature jpeg)
- $(meson_feature jpegxl jxl)
- $(meson_feature png)
- $(meson_feature svg)
- $(meson_feature tiff)
- $(meson_feature webp)
- $(meson_feature bash-completion bash)
- -Dversion=${PV}
- -Ddesktop=true
- -Dman=true
- -Dzsh=enabled
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/
@ 2025-01-27 9:57 David Roman
0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2025-01-27 9:57 UTC (permalink / raw
To: gentoo-commits
commit: c5efe716a7f47cc30c8d8e03e197811c2c49f6be
Author: Takuya Wakazono <pastalian46 <AT> gmail <DOT> com>
AuthorDate: Fri Jan 24 14:53:12 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Fri Jan 24 14:53:12 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c5efe716
media-gfx/swayimg: fix build wihout USE=png
Closes: https://bugs.gentoo.org/948480
Signed-off-by: Takuya Wakazono <pastalian46 <AT> gmail.com>
.../swayimg-3.7-fix-build-without-libpng.patch | 25 ++++++++++++++++++++++
media-gfx/swayimg/swayimg-3.7.ebuild | 7 +++++-
2 files changed, 31 insertions(+), 1 deletion(-)
diff --git a/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch b/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch
new file mode 100644
index 000000000..af3de1be5
--- /dev/null
+++ b/media-gfx/swayimg/files/swayimg-3.7-fix-build-without-libpng.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/948480
+https://github.com/artemsen/swayimg/pull/243
+Fix build without libpng.
+--- a/src/thumbnail.c
++++ b/src/thumbnail.c
+@@ -378,7 +378,9 @@ const struct thumbnail* thumbnail_get(size_t index)
+
+ void thumbnail_remove(size_t index)
+ {
++#ifdef THUMBNAIL_PSTORE
+ pstore_reset(false);
++#endif // THUMBNAIL_PSTORE
+
+ list_for_each(ctx.thumbs, struct thumbnail, it) {
+ if (it->image->index == index) {
+@@ -392,7 +394,9 @@ void thumbnail_remove(size_t index)
+
+ void thumbnail_clear(size_t min_id, size_t max_id)
+ {
++#ifdef THUMBNAIL_PSTORE
+ pstore_reset(false);
++#endif // THUMBNAIL_PSTORE
+
+ if (min_id == IMGLIST_INVALID && max_id == IMGLIST_INVALID) {
+ list_for_each(ctx.thumbs, struct thumbnail, it) {
diff --git a/media-gfx/swayimg/swayimg-3.7.ebuild b/media-gfx/swayimg/swayimg-3.7.ebuild
index a6dd8892e..7514f4372 100644
--- a/media-gfx/swayimg/swayimg-3.7.ebuild
+++ b/media-gfx/swayimg/swayimg-3.7.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2023-2024 Gentoo Authors
+# Copyright 2023-2025 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -47,6 +47,11 @@ BDEPEND="
test? ( dev-cpp/gtest )
"
+PATCHES=(
+ # bug #948480
+ "${FILESDIR}/${P}-fix-build-without-libpng.patch"
+)
+
src_configure() {
local emesonargs=(
$(meson_feature avif)
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/
@ 2025-05-20 13:45 Julien Roy
0 siblings, 0 replies; 5+ messages in thread
From: Julien Roy @ 2025-05-20 13:45 UTC (permalink / raw
To: gentoo-commits
commit: 4def0b8cb84b71b5f7627f7dc87e08e7cc6bd4ff
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Sun May 18 19:06:07 2025 +0000
Commit: Julien Roy <julien <AT> jroy <DOT> ca>
CommitDate: Sun May 18 19:09:54 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=4def0b8c
media-gfx/swayimg: add 4.0
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
media-gfx/swayimg/Manifest | 1 +
.../swayimg/files/swayimg-4.0-fix_memlk.patch | 52 ++++++++++++++
media-gfx/swayimg/metadata.xml | 1 +
media-gfx/swayimg/swayimg-4.0.ebuild | 80 ++++++++++++++++++++++
4 files changed, 134 insertions(+)
diff --git a/media-gfx/swayimg/Manifest b/media-gfx/swayimg/Manifest
index 9cc4c573e..ead86d1cd 100644
--- a/media-gfx/swayimg/Manifest
+++ b/media-gfx/swayimg/Manifest
@@ -1,2 +1,3 @@
DIST swayimg-3.8.tar.gz 754719 BLAKE2B c41b22912499db8bbc0de5b778280d84826b4cfc974d036a8ba7c6bc2a1b54ed87667c7ae11eb4c9ddccc56f753a0ce1256d0c4516e2a3cd72f28a40551759a3 SHA512 3075eb4f48d11708ff0610a7551c38a0b09d65210c56b267410e688f595711ee5357d27a48ce4a8c3e0fe9a4204881f30363579e5686f0979ce59d0277185303
DIST swayimg-3.9.tar.gz 756909 BLAKE2B 09dccc87a07ef154db792a441d5e8265b0d04432f70c2510eb64df8d0f971aa2b012915e2520c52336eb111ef60d333b7fdf24b8b578ea54e93de4ba27e74c2d SHA512 66d97c6695eb030d1013f28bc4fdbb210d26fe602f178fe32e20084f84d8b8e1934012d93e6239234dadbcb2715e61762eadb2350fb6725788b8e70acbea0b11
+DIST swayimg-4.0.tar.gz 768532 BLAKE2B c7121452f02af4b599679f2040233142978184cb1919d1af5d90540f0e1331542ec56c7d96e68f33aacb117083ae20ae3f2aa81833846c37c7868f9551f2d63c SHA512 e13eadab3188b25266caefabe493da95fecc41b7e78c29e836e895d3d68f71405296e330963a44e88a8adbc9ba6c881f952d30033d63fffd14ccf909ec742613
diff --git a/media-gfx/swayimg/files/swayimg-4.0-fix_memlk.patch b/media-gfx/swayimg/files/swayimg-4.0-fix_memlk.patch
new file mode 100644
index 000000000..9e3e87719
--- /dev/null
+++ b/media-gfx/swayimg/files/swayimg-4.0-fix_memlk.patch
@@ -0,0 +1,52 @@
+From eff7ca90fb6db8ca214384f8660709fdaff405f6 Mon Sep 17 00:00:00 2001
+From: Artem Senichev <artemsen@gmail.com>
+Date: Sat, 17 May 2025 11:47:36 +0300
+Subject: [PATCH] Fix potential memory leak
+
+Signed-off-by: Artem Senichev <artemsen@gmail.com>
+---
+ src/image.c | 18 ++++++++++--------
+ 1 file changed, 10 insertions(+), 8 deletions(-)
+
+diff --git a/src/image.c b/src/image.c
+index cbb28e6..fbdef8d 100644
+--- a/src/image.c
++++ b/src/image.c
+@@ -36,14 +36,7 @@ bool image_clear(struct image* img, size_t mask)
+ bool all_free;
+
+ if ((mask & IMGDATA_FRAMES) && image_has_frames(img)) {
+- struct imgdec* decoder = &img->data->decoder;
+ struct array* frames = img->data->frames;
+-
+- if (decoder->data) {
+- decoder->free(img->data);
+- }
+- memset(decoder, 0, sizeof(*decoder));
+-
+ for (size_t i = 0; i < frames->size; ++i) {
+ struct imgframe* frame = arr_nth(frames, i);
+ pixmap_free(&frame->pm);
+@@ -52,12 +45,21 @@ bool image_clear(struct image* img, size_t mask)
+ img->data->frames = NULL;
+ }
+
++ // automatically free decoder if there are no frames
++ if (!image_has_frames(img)) {
++ struct imgdec* decoder = &img->data->decoder;
++ if (decoder->data) {
++ decoder->free(img->data);
++ }
++ memset(decoder, 0, sizeof(*decoder));
++ }
++
+ if ((mask & IMGDATA_THUMB) && image_has_thumb(img)) {
+ pixmap_free(&img->data->thumbnail);
+ img->data->thumbnail.data = NULL;
+ }
+
+- // automatically free if there are no frames or thumbnail
++ // automatically free info if there are no frames or thumbnail
+ if (!image_has_frames(img) && !image_has_thumb(img)) {
+ mask |= IMGDATA_INFO;
+ }
diff --git a/media-gfx/swayimg/metadata.xml b/media-gfx/swayimg/metadata.xml
index 357bce823..35ac454bf 100644
--- a/media-gfx/swayimg/metadata.xml
+++ b/media-gfx/swayimg/metadata.xml
@@ -11,5 +11,6 @@
<flag name="exr">Enable support for EXR image format</flag>
<flag name="jpegxl">Enable support for JPEG XL image format</flag>
<flag name="sixel">Enable support for Sixel image format</flag>
+ <flag name="sway">Enable Sway WM integration</flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/swayimg/swayimg-4.0.ebuild b/media-gfx/swayimg/swayimg-4.0.ebuild
new file mode 100644
index 000000000..2dc4881a5
--- /dev/null
+++ b/media-gfx/swayimg/swayimg-4.0.ebuild
@@ -0,0 +1,80 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="A lightweight image viewer for Wayland display servers"
+HOMEPAGE="https://github.com/artemsen/swayimg"
+SRC_URI="https://github.com/artemsen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="avif bash-completion exif exr gif heif jpeg jpegxl png raw sixel svg +sway test tiff webp X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/wayland
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libxkbcommon
+ avif? ( media-libs/libavif:= )
+ bash-completion? ( app-shells/bash-completion )
+ exif? ( media-libs/libexif )
+ exr? ( media-libs/openexr:= )
+ gif? ( media-libs/giflib:= )
+ heif? ( media-libs/libheif:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpegxl? ( media-libs/libjxl:= )
+ png? ( media-libs/libpng:= )
+ raw? ( media-libs/libraw:= )
+ sixel? ( media-libs/libsixel )
+ svg? (
+ dev-libs/glib:2
+ gnome-base/librsvg:2
+ x11-libs/cairo[X=]
+ )
+ sway? ( dev-libs/json-c:= )
+ tiff? ( media-libs/tiff:= )
+ webp? ( media-libs/libwebp:= )"
+DEPEND="${RDEPEND}
+ dev-libs/wayland-protocols
+ svg? ( X? ( x11-base/xorg-proto ) )
+"
+BDEPEND="
+ dev-util/wayland-scanner
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ # From upstream, fix potential memory leak
+ "${FILESDIR}"/${P}-fix_memlk.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature avif)
+ $(meson_feature exif)
+ $(meson_feature exr)
+ $(meson_feature gif)
+ $(meson_feature heif)
+ $(meson_feature jpeg)
+ $(meson_feature jpegxl jxl)
+ $(meson_feature png)
+ $(meson_feature raw)
+ $(meson_feature sixel)
+ $(meson_feature svg)
+ $(meson_feature sway)
+ $(meson_feature test tests)
+ $(meson_feature tiff)
+ $(meson_feature webp)
+ $(meson_feature bash-completion bash)
+ -Dversion=${PV}
+ -Ddesktop=true
+ -Dman=true
+ -Dzsh=enabled
+ )
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/
@ 2025-06-11 10:54 David Roman
0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2025-06-11 10:54 UTC (permalink / raw
To: gentoo-commits
commit: c1e978450677369d48de74631b977561a82b4ae5
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Jun 10 19:37:02 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Jun 10 19:53:42 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=c1e97845
media-gfx/swayimg: add 4.2
useflag sway is now wayland as support for Hyprland is included too
disable building of manpages (new with 4.2), use files provided by upstream
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
media-gfx/swayimg/Manifest | 1 +
.../files/swayimg-4.2-fix_opt_position.patch | 34 +++++++++
media-gfx/swayimg/metadata.xml | 1 +
media-gfx/swayimg/swayimg-4.2.ebuild | 88 ++++++++++++++++++++++
4 files changed, 124 insertions(+)
diff --git a/media-gfx/swayimg/Manifest b/media-gfx/swayimg/Manifest
index 5e76511a38..b8b5970a31 100644
--- a/media-gfx/swayimg/Manifest
+++ b/media-gfx/swayimg/Manifest
@@ -1,2 +1,3 @@
DIST swayimg-4.0.tar.gz 768532 BLAKE2B c7121452f02af4b599679f2040233142978184cb1919d1af5d90540f0e1331542ec56c7d96e68f33aacb117083ae20ae3f2aa81833846c37c7868f9551f2d63c SHA512 e13eadab3188b25266caefabe493da95fecc41b7e78c29e836e895d3d68f71405296e330963a44e88a8adbc9ba6c881f952d30033d63fffd14ccf909ec742613
DIST swayimg-4.1.tar.gz 772139 BLAKE2B f20aca21800510f348f0cff3ee9d2c1a176f746b0e75f3b39147d1cee23ef54454ee618120c87d9649fde0bb0565ed2462bdc148b107c6eaf026d94cd8d7f3ad SHA512 0cce9c60bba1daa85776d155a656f7d3988a4e8fd5fa8f461c1bec00c800fdf6a51f6a18212042f61e324d45936434988d60e80bf03f237172d9a159e3e52153
+DIST swayimg-4.2.tar.gz 778261 BLAKE2B 58a0fc1b70c7218493d499d224fd32bfcd4083515060ae6d5ec40225f127a0cc9115dff9237f90e12fb46ac66f110d7003edf8ea13218d7b5e631074c8d30f76 SHA512 6496591410ddadd4569c51e12b92d32f83b233b055212a50c861facb30cc7fe5c58c8b4e4955ae862086ed3d06f014fcc657fb8ba112b3bbfb287dc1e3ec3852
diff --git a/media-gfx/swayimg/files/swayimg-4.2-fix_opt_position.patch b/media-gfx/swayimg/files/swayimg-4.2-fix_opt_position.patch
new file mode 100644
index 0000000000..9e0ffa736d
--- /dev/null
+++ b/media-gfx/swayimg/files/swayimg-4.2-fix_opt_position.patch
@@ -0,0 +1,34 @@
+From 7b1dcf98a77b81131f84f1e6bb71ae99be017497 Mon Sep 17 00:00:00 2001
+From: Artem Senichev <artemsen@gmail.com>
+Date: Tue, 10 Jun 2025 10:32:11 +0300
+Subject: [PATCH] Fix position handling in command line
+
+Resolves the error `swayimg: unrecognized option --position`
+
+Signed-off-by: Artem Senichev <artemsen@gmail.com>
+---
+ src/main.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/main.c b/src/main.c
+index a1e12fb..51e9bfa 100644
+--- a/src/main.c
++++ b/src/main.c
+@@ -31,7 +31,7 @@ static const struct cmdarg arguments[] = {
+ { 'o', "order", "ORDER", "set sort order for image list" },
+ { 's', "scale", "SCALE", "set initial image scale" },
+ { 'l', "slideshow", NULL, "activate slideshow mode on startup" },
+-#ifdef HAVE_SWAYWM
++#ifdef HAVE_COMPOSITOR
+ { 'p', "position", "POS", "(SwayWM only) set window position" },
+ #endif
+ { 'w', "size", "SIZE", "set window size" },
+@@ -128,7 +128,7 @@ static int parse_cmdargs(int argc, char* argv[], struct config* cfg)
+ case 'l':
+ config_set(cfg, CFG_VIEWER, CFG_VIEW_SSHOW, CFG_YES);
+ break;
+-#ifdef HAVE_SWAYWM
++#ifdef HAVE_COMPOSITOR
+ case 'p':
+ config_set(cfg, CFG_GENERAL, CFG_GNRL_POSITION, optarg);
+ break;
diff --git a/media-gfx/swayimg/metadata.xml b/media-gfx/swayimg/metadata.xml
index 35ac454bf4..26cedf2a91 100644
--- a/media-gfx/swayimg/metadata.xml
+++ b/media-gfx/swayimg/metadata.xml
@@ -12,5 +12,6 @@
<flag name="jpegxl">Enable support for JPEG XL image format</flag>
<flag name="sixel">Enable support for Sixel image format</flag>
<flag name="sway">Enable Sway WM integration</flag>
+ <flag name="wayland">Integration with Wayland compositors (Sway and Hyprland only)</flag>
</use>
</pkgmetadata>
diff --git a/media-gfx/swayimg/swayimg-4.2.ebuild b/media-gfx/swayimg/swayimg-4.2.ebuild
new file mode 100644
index 0000000000..c8a4b3fccd
--- /dev/null
+++ b/media-gfx/swayimg/swayimg-4.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 2023-2025 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+DESCRIPTION="A lightweight image viewer for Wayland display servers"
+HOMEPAGE="https://github.com/artemsen/swayimg"
+SRC_URI="https://github.com/artemsen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="avif bash-completion exif exr gif heif jpeg jpegxl png raw sixel svg test tiff +wayland webp X"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/wayland
+ media-libs/fontconfig
+ media-libs/freetype
+ x11-libs/libxkbcommon
+ avif? ( media-libs/libavif:= )
+ bash-completion? ( app-shells/bash-completion )
+ exif? ( media-libs/libexif )
+ exr? ( media-libs/openexr:= )
+ gif? ( media-libs/giflib:= )
+ heif? ( media-libs/libheif:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ jpegxl? ( media-libs/libjxl:= )
+ png? ( media-libs/libpng:= )
+ raw? ( media-libs/libraw:= )
+ sixel? ( media-libs/libsixel )
+ svg? (
+ dev-libs/glib:2
+ gnome-base/librsvg:2
+ x11-libs/cairo[X=]
+ )
+ tiff? ( media-libs/tiff:= )
+ wayland? ( dev-libs/json-c:= )
+ webp? ( media-libs/libwebp:= )
+"
+DEPEND="${RDEPEND}
+ dev-libs/wayland-protocols
+ svg? ( X? ( x11-base/xorg-proto ) )
+"
+BDEPEND="
+ dev-util/wayland-scanner
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ # From upstream, fix `swayimg: unrecognized option --position`
+ "${FILESDIR}"/${P}-fix_opt_position.patch
+)
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature avif)
+ $(meson_feature exif)
+ $(meson_feature exr)
+ $(meson_feature gif)
+ $(meson_feature heif)
+ $(meson_feature jpeg)
+ $(meson_feature jpegxl jxl)
+ $(meson_feature png)
+ $(meson_feature raw)
+ $(meson_feature sixel)
+ $(meson_feature svg)
+ $(meson_feature test tests)
+ $(meson_feature tiff)
+ $(meson_feature wayland compositor)
+ $(meson_feature webp)
+ $(meson_feature bash-completion bash)
+ -Dversion=${PV}
+ -Ddesktop=true
+ # avoid automagic building with scdoc
+ -Dman=false
+ -Dzsh=enabled
+ )
+ meson_src_configure
+}
+
+src_install() {
+ meson_src_install
+
+ doman extra/*.{1,5}
+}
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/
@ 2025-07-10 9:09 David Roman
0 siblings, 0 replies; 5+ messages in thread
From: David Roman @ 2025-07-10 9:09 UTC (permalink / raw
To: gentoo-commits
commit: 31a07a50ef15c1af4bf4ec5adcfddf7d024a182d
Author: Nicolas PARLANT <nicolas.parlant <AT> parhuet <DOT> fr>
AuthorDate: Tue Jul 8 14:38:54 2025 +0000
Commit: David Roman <davidroman96 <AT> gmail <DOT> com>
CommitDate: Tue Jul 8 14:47:47 2025 +0000
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=31a07a50
media-gfx/swayimg: drop 4.2
Signed-off-by: Nicolas PARLANT <nicolas.parlant <AT> parhuet.fr>
media-gfx/swayimg/Manifest | 1 -
.../files/swayimg-4.2-fix_opt_position.patch | 34 ---------
media-gfx/swayimg/swayimg-4.2.ebuild | 88 ----------------------
3 files changed, 123 deletions(-)
diff --git a/media-gfx/swayimg/Manifest b/media-gfx/swayimg/Manifest
index 4915bee74e..25d9f62648 100644
--- a/media-gfx/swayimg/Manifest
+++ b/media-gfx/swayimg/Manifest
@@ -1,3 +1,2 @@
-DIST swayimg-4.2.tar.gz 778261 BLAKE2B 58a0fc1b70c7218493d499d224fd32bfcd4083515060ae6d5ec40225f127a0cc9115dff9237f90e12fb46ac66f110d7003edf8ea13218d7b5e631074c8d30f76 SHA512 6496591410ddadd4569c51e12b92d32f83b233b055212a50c861facb30cc7fe5c58c8b4e4955ae862086ed3d06f014fcc657fb8ba112b3bbfb287dc1e3ec3852
DIST swayimg-4.3.tar.gz 785384 BLAKE2B 1d341b92865436b7cb1393e719a2e5fa3a69200a7cc4e2b0ce0d07564578245835951fd70bb186b3defaffc7765962694db8d73fa97b3721c2e2e992b7f6c38d SHA512 cdd9ee386fdc63f136ec91aa2750ffb67eb6b5a8b6751f75b7947a1793814d1ba81973ad7db19316d496cd6a355fc6288c326a042e8fe7f410e2a2346b2c6b57
DIST swayimg-4.4.tar.gz 788874 BLAKE2B 509c854b55b9d243e27ef0c2d3de079b2be24762c4d020a6bdee28633259c2660d877fb70586906735b80a9af819e54a2f5ae6017ee9158be6fb0013244ac7dc SHA512 8fc720b8d2b9a75c413eb25a673c1a213189a66f3eaa3b4ba32990cfc78dbb370fcdc49a11eb787d6eef345f7951a324d91f0c8c08ce4b7922b7ba26abf93b59
diff --git a/media-gfx/swayimg/files/swayimg-4.2-fix_opt_position.patch b/media-gfx/swayimg/files/swayimg-4.2-fix_opt_position.patch
deleted file mode 100644
index 9e0ffa736d..0000000000
--- a/media-gfx/swayimg/files/swayimg-4.2-fix_opt_position.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 7b1dcf98a77b81131f84f1e6bb71ae99be017497 Mon Sep 17 00:00:00 2001
-From: Artem Senichev <artemsen@gmail.com>
-Date: Tue, 10 Jun 2025 10:32:11 +0300
-Subject: [PATCH] Fix position handling in command line
-
-Resolves the error `swayimg: unrecognized option --position`
-
-Signed-off-by: Artem Senichev <artemsen@gmail.com>
----
- src/main.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/main.c b/src/main.c
-index a1e12fb..51e9bfa 100644
---- a/src/main.c
-+++ b/src/main.c
-@@ -31,7 +31,7 @@ static const struct cmdarg arguments[] = {
- { 'o', "order", "ORDER", "set sort order for image list" },
- { 's', "scale", "SCALE", "set initial image scale" },
- { 'l', "slideshow", NULL, "activate slideshow mode on startup" },
--#ifdef HAVE_SWAYWM
-+#ifdef HAVE_COMPOSITOR
- { 'p', "position", "POS", "(SwayWM only) set window position" },
- #endif
- { 'w', "size", "SIZE", "set window size" },
-@@ -128,7 +128,7 @@ static int parse_cmdargs(int argc, char* argv[], struct config* cfg)
- case 'l':
- config_set(cfg, CFG_VIEWER, CFG_VIEW_SSHOW, CFG_YES);
- break;
--#ifdef HAVE_SWAYWM
-+#ifdef HAVE_COMPOSITOR
- case 'p':
- config_set(cfg, CFG_GENERAL, CFG_GNRL_POSITION, optarg);
- break;
diff --git a/media-gfx/swayimg/swayimg-4.2.ebuild b/media-gfx/swayimg/swayimg-4.2.ebuild
deleted file mode 100644
index c8a4b3fccd..0000000000
--- a/media-gfx/swayimg/swayimg-4.2.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 2023-2025 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-DESCRIPTION="A lightweight image viewer for Wayland display servers"
-HOMEPAGE="https://github.com/artemsen/swayimg"
-SRC_URI="https://github.com/artemsen/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="avif bash-completion exif exr gif heif jpeg jpegxl png raw sixel svg test tiff +wayland webp X"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/wayland
- media-libs/fontconfig
- media-libs/freetype
- x11-libs/libxkbcommon
- avif? ( media-libs/libavif:= )
- bash-completion? ( app-shells/bash-completion )
- exif? ( media-libs/libexif )
- exr? ( media-libs/openexr:= )
- gif? ( media-libs/giflib:= )
- heif? ( media-libs/libheif:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- jpegxl? ( media-libs/libjxl:= )
- png? ( media-libs/libpng:= )
- raw? ( media-libs/libraw:= )
- sixel? ( media-libs/libsixel )
- svg? (
- dev-libs/glib:2
- gnome-base/librsvg:2
- x11-libs/cairo[X=]
- )
- tiff? ( media-libs/tiff:= )
- wayland? ( dev-libs/json-c:= )
- webp? ( media-libs/libwebp:= )
-"
-DEPEND="${RDEPEND}
- dev-libs/wayland-protocols
- svg? ( X? ( x11-base/xorg-proto ) )
-"
-BDEPEND="
- dev-util/wayland-scanner
- test? ( dev-cpp/gtest )
-"
-
-PATCHES=(
- # From upstream, fix `swayimg: unrecognized option --position`
- "${FILESDIR}"/${P}-fix_opt_position.patch
-)
-
-src_configure() {
- local emesonargs=(
- $(meson_feature avif)
- $(meson_feature exif)
- $(meson_feature exr)
- $(meson_feature gif)
- $(meson_feature heif)
- $(meson_feature jpeg)
- $(meson_feature jpegxl jxl)
- $(meson_feature png)
- $(meson_feature raw)
- $(meson_feature sixel)
- $(meson_feature svg)
- $(meson_feature test tests)
- $(meson_feature tiff)
- $(meson_feature wayland compositor)
- $(meson_feature webp)
- $(meson_feature bash-completion bash)
- -Dversion=${PV}
- -Ddesktop=true
- # avoid automagic building with scdoc
- -Dman=false
- -Dzsh=enabled
- )
- meson_src_configure
-}
-
-src_install() {
- meson_src_install
-
- doman extra/*.{1,5}
-}
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-10 9:09 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-11 10:54 [gentoo-commits] repo/proj/guru:master commit in: media-gfx/swayimg/files/, media-gfx/swayimg/ David Roman
-- strict thread matches above, loose matches on Subject: below --
2025-07-10 9:09 David Roman
2025-05-20 13:45 Julien Roy
2025-01-27 9:57 David Roman
2024-07-08 16:47 David Roman
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox