* [gentoo-commits] repo/gentoo:master commit in: media-gfx/imv/, media-gfx/imv/files/
@ 2021-02-16 12:16 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-02-16 12:16 UTC (permalink / raw
To: gentoo-commits
commit: 1ba46e37736e2146f1dc4e860b33d0b2c07a457f
Author: Ionen Wolkens <sudinave <AT> gmail <DOT> com>
AuthorDate: Sat Jan 23 15:36:14 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Feb 16 12:16:38 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ba46e37
media-gfx/imv: 4.2.0 bump
Is now using meson, and notably adds heif support.
Changes from previous live ebuild:
- fix man pages missing when USE=-test
- Allow direct backends even if freeimage is enabled
(upstream sets freeimage as a fallback, so let it be so)
- new inih dep (#760471)
- force removal of unused virtual/glu dep
- reviewed and updated all other deps (e.g. SDL unused)
- allow building X11-less with libglvnd[-X]
(but now use X by default to satisfy required use)
- various cleanups
Patches:
- fix segmentation fault when imv[freeimage,-svg]
- fix flickering issue on wayland (upstream backport)
Closes: https://bugs.gentoo.org/760471
Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Ionen Wolkens <sudinave <AT> gmail.com>
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
media-gfx/imv/Manifest | 1 +
media-gfx/imv/files/imv-4.2.0-add-string-inc.patch | 9 ++
.../imv-4.2.0-wayland-roundtrip-after-scale.patch | 14 +++
media-gfx/imv/imv-4.2.0.ebuild | 86 ++++++++++++++++++
media-gfx/imv/imv-9999.ebuild | 100 ++++++++++-----------
5 files changed, 156 insertions(+), 54 deletions(-)
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index 00813efe7c9..d4de93aa042 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,2 +1,3 @@
DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28
DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a
+DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
diff --git a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
new file mode 100644
index 00000000000..e726d7b093a
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
@@ -0,0 +1,9 @@
+https://github.com/eXeC64/imv/issues/299
+--- a/src/backend_freeimage.c 2020-12-17 15:30:42.000000000 -0500
++++ b/src/backend_freeimage.c 2021-01-23 12:03:46.175921640 -0500
+@@ -8,4 +8,5 @@
+ #include <FreeImage.h>
+ #include <stdlib.h>
++#include <string.h>
+
+ struct private {
diff --git a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
new file mode 100644
index 00000000000..38101332906
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
@@ -0,0 +1,14 @@
+https://github.com/eXeC64/imv/issues/305
+--- a/src/wl_window.c 2020-12-17 15:30:42.000000000 -0500
++++ b/src/wl_window.c 2021-02-02 19:03:52.598901093 -0500
+@@ -545,2 +545,3 @@
+ wl_surface_commit(window->wl_surface);
++ wl_display_roundtrip(window->wl_display);
+ size_t buffer_width = window->width * window->scale;
+@@ -636,4 +637,4 @@
+ .height = window->height,
+- .buffer_width = window->width * window->scale,
+- .buffer_height = window->height * window->scale
++ .buffer_width = buffer_width,
++ .buffer_height = buffer_height,
+ }
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
new file mode 100644
index 00000000000..d586e38f344
--- /dev/null
+++ b/media-gfx/imv/imv-4.2.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+ SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://github.com/eXeC64/imv"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/icu:=
+ dev-libs/inih
+ media-libs/libglvnd[X?]
+ x11-libs/libxkbcommon[X?]
+ x11-libs/pango
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb:=
+ )
+ freeimage? ( media-libs/freeimage )
+ gif? ( media-libs/libnsgif )
+ heif? ( media-libs/libheif:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:= )
+ svg? ( >=gnome-base/librsvg-2.44 )
+ tiff? ( media-libs/tiff )
+ wayland? ( dev-libs/wayland )
+ !sys-apps/renameutils
+"
+DEPEND="
+ ${RDEPEND}
+ test? ( dev-util/cmocka )
+"
+BDEPEND="
+ app-text/asciidoc
+"
+
+PATCHES=(
+ "${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
+ "${FILESDIR}/${PN}-4.2.0-wayland-roundtrip-after-scale.patch"
+)
+
+src_prepare() {
+ default
+
+ # allow building with libglvnd[-X]
+ if ! use X; then
+ sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
+ fi
+
+ # glu isn't used by anything
+ sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+ local WINDOWS=all
+ use X || WINDOWS=wayland
+ use wayland || WINDOWS=x11
+
+ local emesonargs=(
+ $(meson_feature freeimage)
+ $(meson_feature gif libnsgif)
+ $(meson_feature heif libheif)
+ $(meson_feature jpeg libjpeg)
+ $(meson_feature png libpng)
+ $(meson_feature svg librsvg)
+ $(meson_feature test)
+ $(meson_feature tiff libtiff)
+ -Dwindows=$WINDOWS
+ )
+ meson_src_configure
+}
diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild
index 65f50d9221c..7ea6a946642 100644
--- a/media-gfx/imv/imv-9999.ebuild
+++ b/media-gfx/imv/imv-9999.ebuild
@@ -1,89 +1,81 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
-inherit git-r3 meson xdg-utils
+inherit xdg meson
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
+else
+ SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-LICENSE="MIT-with-advertising"
HOMEPAGE="https://github.com/eXeC64/imv"
-EGIT_REPO_URI="https://github.com/eXeC64/imv"
-KEYWORDS=""
+LICENSE="MIT-with-advertising"
SLOT="0"
-IUSE="X +freeimage +png jpeg svg gif heif test tiff wayland"
+IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
RESTRICT="!test? ( test )"
-REQUIRED_USE="
- || ( X wayland )
-"
RDEPEND="
- !sys-apps/renameutils
dev-libs/icu:=
- media-libs/fontconfig
- media-libs/libsdl2
- media-libs/sdl2-ttf
+ dev-libs/inih
+ media-libs/libglvnd[X?]
+ x11-libs/libxkbcommon[X?]
+ x11-libs/pango
X? (
- virtual/glu
x11-libs/libX11
- x11-libs/libxcb
- x11-libs/libxkbcommon[X]
- x11-libs/pango
- )
- freeimage? ( media-libs/freeimage[png?,jpeg?,tiff?] )
- !freeimage? (
- jpeg? ( media-libs/libjpeg-turbo )
- png? ( media-libs/libpng )
- tiff? ( media-libs/tiff )
+ x11-libs/libxcb:=
)
+ freeimage? ( media-libs/freeimage )
gif? ( media-libs/libnsgif )
- heif? ( media-libs/libheif )
+ heif? ( media-libs/libheif:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:= )
svg? ( >=gnome-base/librsvg-2.44 )
+ tiff? ( media-libs/tiff )
wayland? ( dev-libs/wayland )
-"
-BDEPEND="
- app-text/asciidoc
- test? ( dev-util/cmocka )
+ !sys-apps/renameutils
"
DEPEND="
${RDEPEND}
+ test? ( dev-util/cmocka )
+"
+BDEPEND="
+ app-text/asciidoc
"
-src_configure() {
- local WINDOWS
- if use X; then
- if ! use wayland; then
- WINDOWS=x11
- else
- WINDOWS=all
- fi
- else
- if use wayland; then
- WINDOWS=wayland
- fi
- fi
+src_prepare() {
+ default
- if ! use test; then
- sed -i -e '/^dep_cmocka/,/^endforeach$/d' meson.build || die
+ # allow building with libglvnd[-X]
+ if ! use X; then
+ sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
fi
+ # glu isn't used by anything
+ sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+ local WINDOWS=all
+ use X || WINDOWS=wayland
+ use wayland || WINDOWS=x11
+
local emesonargs=(
$(meson_feature freeimage)
$(meson_feature gif libnsgif)
$(meson_feature heif libheif)
+ $(meson_feature jpeg libjpeg)
+ $(meson_feature png libpng)
$(meson_feature svg librsvg)
- $(usex freeimage -Dlibjpeg=disabled -Dlibjpeg=enabled)
- $(usex freeimage -Dlibpng=disabled -Dlibjpeg=enabled)
- $(usex freeimage -Dlibtiff=disabled -Dlibjpeg=enabled)
+ $(meson_feature test)
+ $(meson_feature tiff libtiff)
-Dwindows=$WINDOWS
)
meson_src_configure
}
-
-pkg_postinst() {
- xdg_desktop_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/imv/, media-gfx/imv/files/
@ 2021-08-24 17:52 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2021-08-24 17:52 UTC (permalink / raw
To: gentoo-commits
commit: 6e2f004aff52ba51dd3ef2f9dafee59d4df149de
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 24 16:49:09 2021 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Tue Aug 24 17:51:39 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6e2f004a
media-gfx/imv: drop 4.2.0
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-gfx/imv/Manifest | 1 -
media-gfx/imv/files/imv-4.2.0-add-string-inc.patch | 9 ---
.../imv-4.2.0-wayland-roundtrip-after-scale.patch | 14 ----
media-gfx/imv/imv-4.2.0.ebuild | 85 ----------------------
4 files changed, 109 deletions(-)
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index fc84ad70362..2891222742f 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,2 +1 @@
-DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115
DIST imv-4.3.0.tar.gz 79031 BLAKE2B f620e1d05827f93eae03a01f62cbb1426a623b4ef2e758a5fea2539193292fada0b8bf34276443d787b5a1537e92cd66e94b574a646319c3c37fbf2557bda4eb SHA512 1735c03c48888004b11b3aaf0215a9530c035468a8efdb210d856551ebb75030c906eee2b6ab80e5d3646206e6051a73a8c5e15c010dd09bca7f9e90f9b0e34b
diff --git a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch b/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
deleted file mode 100644
index e726d7b093a..00000000000
--- a/media-gfx/imv/files/imv-4.2.0-add-string-inc.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-https://github.com/eXeC64/imv/issues/299
---- a/src/backend_freeimage.c 2020-12-17 15:30:42.000000000 -0500
-+++ b/src/backend_freeimage.c 2021-01-23 12:03:46.175921640 -0500
-@@ -8,4 +8,5 @@
- #include <FreeImage.h>
- #include <stdlib.h>
-+#include <string.h>
-
- struct private {
diff --git a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch b/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
deleted file mode 100644
index 38101332906..00000000000
--- a/media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-https://github.com/eXeC64/imv/issues/305
---- a/src/wl_window.c 2020-12-17 15:30:42.000000000 -0500
-+++ b/src/wl_window.c 2021-02-02 19:03:52.598901093 -0500
-@@ -545,2 +545,3 @@
- wl_surface_commit(window->wl_surface);
-+ wl_display_roundtrip(window->wl_display);
- size_t buffer_width = window->width * window->scale;
-@@ -636,4 +637,4 @@
- .height = window->height,
-- .buffer_width = window->width * window->scale,
-- .buffer_height = window->height * window->scale
-+ .buffer_width = buffer_width,
-+ .buffer_height = buffer_height,
- }
diff --git a/media-gfx/imv/imv-4.2.0.ebuild b/media-gfx/imv/imv-4.2.0.ebuild
deleted file mode 100644
index c3beeda396a..00000000000
--- a/media-gfx/imv/imv-4.2.0.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit meson xdg
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/eXeC64/imv.git"
-else
- SRC_URI="https://github.com/eXeC64/imv/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://github.com/eXeC64/imv"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="+X +freeimage gif heif jpeg png svg test tiff wayland"
-REQUIRED_USE="|| ( X wayland )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/icu:=
- dev-libs/inih
- media-libs/libglvnd[X?]
- x11-libs/libxkbcommon[X?]
- x11-libs/pango
- X? (
- x11-libs/libX11
- x11-libs/libxcb:=
- )
- freeimage? ( media-libs/freeimage )
- gif? ( media-libs/libnsgif )
- heif? ( media-libs/libheif:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- png? ( media-libs/libpng:= )
- svg? ( >=gnome-base/librsvg-2.44 )
- tiff? ( media-libs/tiff )
- wayland? ( dev-libs/wayland )
- !sys-apps/renameutils"
-DEPEND="
- ${RDEPEND}
- test? ( dev-util/cmocka )"
-BDEPEND="
- app-text/asciidoc
- wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.2.0-add-string-inc.patch"
- "${FILESDIR}/${PN}-4.2.0-wayland-roundtrip-after-scale.patch"
-)
-
-src_prepare() {
- default
-
- # allow building with libglvnd[-X]
- if ! use X; then
- sed -i "/dependency('gl')/s/gl/opengl/" meson.build || die
- fi
-
- # glu isn't used by anything
- sed -i "/dependency('glu')/d" meson.build || die
-}
-
-src_configure() {
- local windows=all
- use X || windows=wayland
- use wayland || windows=x11
-
- local emesonargs=(
- $(meson_feature freeimage)
- $(meson_feature gif libnsgif)
- $(meson_feature heif libheif)
- $(meson_feature jpeg libjpeg)
- $(meson_feature png libpng)
- $(meson_feature svg librsvg)
- $(meson_feature test)
- $(meson_feature tiff libtiff)
- -Dwindows=${windows}
- )
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/imv/, media-gfx/imv/files/
@ 2022-10-07 0:56 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2022-10-07 0:56 UTC (permalink / raw
To: gentoo-commits
commit: b483c31b42645fe35fcf6808f196ab20564dd780
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 7 00:36:55 2022 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Fri Oct 7 00:55:08 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b483c31b
media-gfx/imv: add 4.3.1_p20211221
Mostly to include libgrapheme support for those that don't want
to pull icu on minimal systems (with a minimal image viewer).
Uptream had no activity since 2021, so not expecting a release soon.
Also add workaround to display animated gifs even if USE=freeimage
is set (which prevented using libnsgif with animation support).
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-gfx/imv/Manifest | 1 +
.../files/imv-4.3.1_p20211221-animated-gif.patch | 19 +++++
.../files/imv-4.3.1_p20211221-libgrapheme2.patch | 13 ++++
media-gfx/imv/imv-4.3.1_p20211221.ebuild | 89 ++++++++++++++++++++++
4 files changed, 122 insertions(+)
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index e75c2e6a9fb6..a6bf38bedfbc 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1 +1,2 @@
DIST imv-4.3.1.tar.gz 79123 BLAKE2B 9c818a5a29457313c3d0ed1a8558555b2069aec837939dc1d2b71668ec2fd39867c8ad4fcf8605243ded96e27d346af4307d83c8854538981b62c968e9ec0ede SHA512 f70b95f3f99d7d6a9276370650cef0885938464e3a40ab1768231292ba35d9040f7196a5853ea1268fe6d47cf08d129b3fbae1ca215df96d12ccd85b7efd1ee6
+DIST imv-4.3.1_p20211221.tar.gz 80082 BLAKE2B 2b4f3cdb0b7123b978cdbc588cf686c38d65053e3fadb6532da45be3e24b35a297639ca8ddb7d05945f92763cc014a232eb0ca0af0da059b2dac48d2b3c9939d SHA512 7579930a406d2ba1dca7f043d635ea89301606d06ca5ebe5779fffd1410789bb07ef8228beb2ef08af2783e64deda8b67aa991fc56333c0e60051f7666fbb19f
diff --git a/media-gfx/imv/files/imv-4.3.1_p20211221-animated-gif.patch b/media-gfx/imv/files/imv-4.3.1_p20211221-animated-gif.patch
new file mode 100644
index 000000000000..3b7ac34a3a80
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.3.1_p20211221-animated-gif.patch
@@ -0,0 +1,19 @@
+Upstream priorizes freeimage in general, but nsgif supports animated
+gif while freeimage displays them as a static image. This allows setting
+USE=freeimage while still getting animations if (optional) USE=gif.
+--- a/src/main.c
++++ b/src/main.c
+@@ -20,2 +20,6 @@
+
++#ifdef IMV_BACKEND_LIBNSGIF
++ imv_install_backend(imv, &imv_backend_libnsgif);
++#endif
++
+ #ifdef IMV_BACKEND_FREEIMAGE
+@@ -39,6 +43,2 @@
+ #endif
+-
+-#ifdef IMV_BACKEND_LIBNSGIF
+- imv_install_backend(imv, &imv_backend_libnsgif);
+-#endif
+
diff --git a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
new file mode 100644
index 000000000000..ba02c27ef82e
--- /dev/null
+++ b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
@@ -0,0 +1,13 @@
+Changed with v2 and would become an error with clang16.
+--- a/src/console.c
++++ b/src/console.c
+@@ -54,3 +54,3 @@
+ if (buffer[position] != 0) {
+- return position + grapheme_next_character_break(buffer + position, SIZE_MAX);
++ return position + grapheme_next_character_break((uint_least32_t *)buffer + position, SIZE_MAX);
+ } else {
+@@ -87,3 +87,3 @@
+ do {
+- step = grapheme_next_character_break(buffer + result, SIZE_MAX);
++ step = grapheme_next_character_break((uint_least32_t *)buffer + result, SIZE_MAX);
+ if (result + step >= position)
diff --git a/media-gfx/imv/imv-4.3.1_p20211221.ebuild b/media-gfx/imv/imv-4.3.1_p20211221.ebuild
new file mode 100644
index 000000000000..efc26ac19ee5
--- /dev/null
+++ b/media-gfx/imv/imv-4.3.1_p20211221.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson xdg
+
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
+else
+ IMV_HASH=4448fb6104d67e3dfff3e71babe257992fce556
+ SRC_URI="https://git.sr.ht/~exec64/imv/archive/${IMV_HASH}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/${PN}-${IMV_HASH}"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Minimal image viewer designed for tiling window manager users"
+HOMEPAGE="https://sr.ht/~exec64/imv/"
+
+LICENSE="MIT-with-advertising"
+SLOT="0"
+IUSE="+X +freeimage gif heif icu jpeg png svg test tiff wayland"
+REQUIRED_USE="|| ( X wayland )"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ dev-libs/glib:2
+ dev-libs/inih
+ media-libs/libglvnd[X?]
+ x11-libs/cairo
+ x11-libs/libxkbcommon[X?]
+ x11-libs/pango
+ X? (
+ x11-libs/libX11
+ x11-libs/libxcb:=
+ )
+ freeimage? ( media-libs/freeimage )
+ gif? ( media-libs/libnsgif )
+ heif? ( media-libs/libheif:= )
+ icu? ( dev-libs/icu:= )
+ !icu? ( >=dev-libs/libgrapheme-2:= )
+ jpeg? ( media-libs/libjpeg-turbo:= )
+ png? ( media-libs/libpng:= )
+ svg? ( >=gnome-base/librsvg-2.44:2 )
+ tiff? ( media-libs/tiff )
+ wayland? ( dev-libs/wayland )
+ !sys-apps/renameutils"
+DEPEND="
+ ${RDEPEND}
+ X? ( x11-base/xorg-proto )
+ test? ( dev-util/cmocka )"
+BDEPEND="
+ app-text/asciidoc
+ wayland? ( dev-util/wayland-scanner )"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-animated-gif.patch
+ "${FILESDIR}"/${P}-libgrapheme2.patch
+)
+
+src_prepare() {
+ default
+
+ # if wayland-only, don't automagic on libGL and force libOpenGL
+ if ! use X; then
+ sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die
+ fi
+
+ # glu isn't used by anything
+ sed -i "/dependency('glu')/d" meson.build || die
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_feature freeimage)
+ $(meson_feature gif libnsgif)
+ $(meson_feature heif libheif)
+ $(meson_feature jpeg libjpeg)
+ $(meson_feature png libpng)
+ $(meson_feature svg librsvg)
+ $(meson_feature test)
+ $(meson_feature tiff libtiff)
+ -Dunicode=$(usex icu{,} grapheme)
+ -Dwindows=$(usex X $(usex wayland all x11) wayland)
+ )
+
+ meson_src_configure
+}
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/imv/, media-gfx/imv/files/
@ 2023-01-30 19:11 Ionen Wolkens
0 siblings, 0 replies; 4+ messages in thread
From: Ionen Wolkens @ 2023-01-30 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 4b15699494f9fda24b9c06f9319995e6af8a48e7
Author: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 30 18:56:16 2023 +0000
Commit: Ionen Wolkens <ionen <AT> gentoo <DOT> org>
CommitDate: Mon Jan 30 19:11:09 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4b156994
media-gfx/imv: drop 4.3.1_p20211221-r3
Signed-off-by: Ionen Wolkens <ionen <AT> gentoo.org>
media-gfx/imv/Manifest | 1 -
.../files/imv-4.3.1_p20211221-libgrapheme2.patch | 13 ----
media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild | 89 ----------------------
3 files changed, 103 deletions(-)
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest
index b3bb76e4d202..e0446825429c 100644
--- a/media-gfx/imv/Manifest
+++ b/media-gfx/imv/Manifest
@@ -1,2 +1 @@
-DIST imv-4.3.1_p20211221.tar.gz 80082 BLAKE2B 2b4f3cdb0b7123b978cdbc588cf686c38d65053e3fadb6532da45be3e24b35a297639ca8ddb7d05945f92763cc014a232eb0ca0af0da059b2dac48d2b3c9939d SHA512 7579930a406d2ba1dca7f043d635ea89301606d06ca5ebe5779fffd1410789bb07ef8228beb2ef08af2783e64deda8b67aa991fc56333c0e60051f7666fbb19f
DIST imv-4.4.0.tar.gz 80360 BLAKE2B c598bb270ed57562f1c1b9a56f42676a7c8390c976ed74405228da572b000a85bf69e51f1bbfa6d554a481debc092995fe5222ba1e8b0b029b72395a8b8f329b SHA512 ddc0740022183a5467a0815ca623d2204b26449fee14b00c3468d06dbba3b5c3314b04a582bbac6075205f8d58cc24f157e283ce1ce3d34ecf0a9bdc497ab7f1
diff --git a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
deleted file mode 100644
index d71067130c27..000000000000
--- a/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-https://lists.sr.ht/~exec64/imv-devel/patches/35908
---- a/src/console.c
-+++ b/src/console.c
-@@ -54,3 +54,3 @@
- if (buffer[position] != 0) {
-- return position + grapheme_next_character_break(buffer + position, SIZE_MAX);
-+ return position + grapheme_next_character_break_utf8(buffer + position, SIZE_MAX);
- } else {
-@@ -87,3 +87,3 @@
- do {
-- step = grapheme_next_character_break(buffer + result, SIZE_MAX);
-+ step = grapheme_next_character_break_utf8(buffer + result, SIZE_MAX);
- if (result + step >= position)
diff --git a/media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild b/media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild
deleted file mode 100644
index 48d367ef221a..000000000000
--- a/media-gfx/imv/imv-4.3.1_p20211221-r3.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit meson xdg
-
-if [[ ${PV} == 9999 ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://git.sr.ht/~exec64/imv/"
-else
- IMV_HASH=4448fb6104d67e3dfff3e71babe257992fce556
- SRC_URI="https://git.sr.ht/~exec64/imv/archive/${IMV_HASH}.tar.gz -> ${P}.tar.gz"
- S="${WORKDIR}/${PN}-${IMV_HASH}"
- KEYWORDS="amd64 x86"
-fi
-
-DESCRIPTION="Minimal image viewer designed for tiling window manager users"
-HOMEPAGE="https://sr.ht/~exec64/imv/"
-
-LICENSE="MIT-with-advertising"
-SLOT="0"
-IUSE="+X +freeimage gif heif icu jpeg png svg test tiff wayland"
-REQUIRED_USE="|| ( X wayland )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/glib:2
- dev-libs/inih
- media-libs/libglvnd[X?]
- x11-libs/cairo
- x11-libs/libxkbcommon[X?]
- x11-libs/pango
- X? (
- x11-libs/libX11
- x11-libs/libxcb:=
- )
- freeimage? ( media-libs/freeimage )
- gif? ( media-libs/libnsgif )
- heif? ( media-libs/libheif:= )
- icu? ( dev-libs/icu:= )
- !icu? ( >=dev-libs/libgrapheme-2:= )
- jpeg? ( media-libs/libjpeg-turbo:= )
- png? ( media-libs/libpng:= )
- svg? ( >=gnome-base/librsvg-2.44:2 )
- tiff? ( media-libs/tiff:= )
- wayland? ( dev-libs/wayland )
- !sys-apps/renameutils"
-DEPEND="
- ${RDEPEND}
- X? ( x11-base/xorg-proto )
- test? ( dev-util/cmocka )"
-BDEPEND="
- app-text/asciidoc
- wayland? ( dev-util/wayland-scanner )"
-
-PATCHES=(
- "${FILESDIR}"/${P}-animated-gif.patch
- "${FILESDIR}"/${P}-libgrapheme2.patch
-)
-
-src_prepare() {
- default
-
- # if wayland-only, don't automagic on libGL and force libOpenGL
- if ! use X; then
- sed -i "/dependency('gl'/{s/'gl'/'opengl'/;s/false/true/}" meson.build || die
- fi
-
- # glu isn't used by anything
- sed -i "/dependency('glu')/d" meson.build || die
-}
-
-src_configure() {
- local emesonargs=(
- $(meson_feature freeimage)
- $(meson_feature gif libnsgif)
- $(meson_feature heif libheif)
- $(meson_feature jpeg libjpeg)
- $(meson_feature png libpng)
- $(meson_feature svg librsvg)
- $(meson_feature test)
- $(meson_feature tiff libtiff)
- -Dunicode=$(usex icu{,} grapheme)
- -Dwindows=$(usex X $(usex wayland all x11) wayland)
- )
-
- meson_src_configure
-}
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2023-01-30 19:11 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-02-16 12:16 [gentoo-commits] repo/gentoo:master commit in: media-gfx/imv/, media-gfx/imv/files/ Joonas Niilola
-- strict thread matches above, loose matches on Subject: below --
2021-08-24 17:52 Ionen Wolkens
2022-10-07 0:56 Ionen Wolkens
2023-01-30 19:11 Ionen Wolkens
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox