From bbdc49d5ccd04563006a608c87c870413f75057e Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 7 Oct 2022 07:23:30 +0100 Subject: gentoo auto-resync : 07:10:2022 - 07:23:30 --- media-gfx/Manifest.gz | Bin 38346 -> 38339 bytes media-gfx/imv/Manifest | 6 +- .../files/imv-4.3.1_p20211221-animated-gif.patch | 19 +++++ .../files/imv-4.3.1_p20211221-libgrapheme2.patch | 12 +++ media-gfx/imv/imv-4.3.1_p20211221-r1.ebuild | 89 +++++++++++++++++++++ media-gfx/imv/imv-9999.ebuild | 9 ++- 6 files changed, 132 insertions(+), 3 deletions(-) create mode 100644 media-gfx/imv/files/imv-4.3.1_p20211221-animated-gif.patch create mode 100644 media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch create mode 100644 media-gfx/imv/imv-4.3.1_p20211221-r1.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index f111c9b171f2..b4cf4773eace 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index 289bcecf950c..78bab1c31cb5 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -1,4 +1,8 @@ +AUX imv-4.3.1_p20211221-animated-gif.patch 504 BLAKE2B 8d2dd70e5b73efa82bc18976b1b51494d87402e7722393f8b53482ab0bfb775daec259b56e2250687228c7c5591925dbab66378c598008a1c6ca6dc977334f4d SHA512 df0f2ab81b1d2f41f9b03a89af6c3bb5688017e74874203b5109554a66e647b11c26798f1112cd4068702bcdf238a68ceef75ce1f90cd12496de4588d6227a83 +AUX imv-4.3.1_p20211221-libgrapheme2.patch 480 BLAKE2B 7253fa89af3c9d130f00450e389325600d4866355c9556b8a7d0798e1c6daa50a4d3b85c66314a7070f69cff221ff1b953c5f2e32b7983f1019cf59c6f34faae SHA512 322cc5fc20285edbd501750388b1d4e07fd2297a4e20c3a8582ca31ec59c82ced85e2038afe8411126f6a0a091a88a2cc453fafc492009c09e8d09522b5d2c23 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 EBUILD imv-4.3.1.ebuild 1900 BLAKE2B 146b313c036db579c8f7f817946d245c2b119aefb1f4de5d6d2cb7676bcea56029379e9164a69d89765cf22c03f24a77d15868e580a59ffe7edd941113acec8c SHA512 faaefb3f7e21a566f8285ae6ae0a759a53fa318bf5bc8c2297f22f00f78afa6623eeae2ece9ac615e7b758cbf3b2ae29c2b349518413b71b8d3db3e731b1431e -EBUILD imv-9999.ebuild 1983 BLAKE2B 3586e052b58d6d46db6863b337f919bfa1575f7bd6c56e97b3e09a70754e20d7c36b0a1e16fa6a6afeb80c40db49789027fe84dde13ea91eb68810c50015cf2e SHA512 76446b7de9e800ce94cb24a84af1156574acabea4575dfb2eef2d81243c14a7065e46502a329b0add448b7c34cbd296d82426cd928a0a21436ada42559a5b488 +EBUILD imv-4.3.1_p20211221-r1.ebuild 2140 BLAKE2B d782b9d8ec854e6b6466590071c05b08d51ffc523df5a36be70068943d745e9a90b4dc566d82ffd3b45ad651b8b69b26bf3d5eebc32d603b31bc2b925f33300e SHA512 a78de0ceee46e2a0ffcbb8cf3b77f75ddd8282fa2e6daab2b1ec5fed741f44df75836af99c2c2b06a00db983b82928d3c024e4e30326fb660b8d9f50923f07fb +EBUILD imv-9999.ebuild 2114 BLAKE2B 19fac35080464bb42b49f69ec3d3f3d63aafd5b7284700eb6c8db2065f9b1a8bcd16f212bf4ecb2989c1bb08e4e632c7b64ef1f72d312c2289f0a952e0e7af1c SHA512 b5000e2beca7d9bc3053916b63da09a766d17a2f89313e920f6422735b29c84b6c87da155ac78514da42698a5a046b7aff853038755b130efb02076ac7198171 MISC metadata.xml 492 BLAKE2B 730957fca9321f08af8114787b1711c0bf3c4c4081ff0b2180cb4e4a96b48afeaa9d62fd459d0908b3eb295119e64fdd5f28ec08c00364d9cb600b416e106024 SHA512 e50550275b462b36344acb8581da21b598dd9a31ef0ad2d0b2b6e2ea0efe56415eb0c0ff61556d0b6461b235f9fb08726b58cca289f4cdc57b99675238d47a15 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..cc467e9eb55d --- /dev/null +++ b/media-gfx/imv/files/imv-4.3.1_p20211221-libgrapheme2.patch @@ -0,0 +1,12 @@ +--- 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-r1.ebuild b/media-gfx/imv/imv-4.3.1_p20211221-r1.ebuild new file mode 100644 index 000000000000..efc26ac19ee5 --- /dev/null +++ b/media-gfx/imv/imv-4.3.1_p20211221-r1.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 +} diff --git a/media-gfx/imv/imv-9999.ebuild b/media-gfx/imv/imv-9999.ebuild index 95ff5b86dae8..2c68adf92af7 100644 --- a/media-gfx/imv/imv-9999.ebuild +++ b/media-gfx/imv/imv-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -38,7 +38,7 @@ RDEPEND=" gif? ( media-libs/libnsgif ) heif? ( media-libs/libheif:= ) icu? ( dev-libs/icu:= ) - !icu? ( dev-libs/libgrapheme ) + !icu? ( >=dev-libs/libgrapheme-2:= ) jpeg? ( media-libs/libjpeg-turbo:= ) png? ( media-libs/libpng:= ) svg? ( >=gnome-base/librsvg-2.44:2 ) @@ -53,6 +53,11 @@ BDEPEND=" app-text/asciidoc wayland? ( dev-util/wayland-scanner )" +PATCHES=( + "${FILESDIR}"/${PN}-4.3.1_p20211221-animated-gif.patch + "${FILESDIR}"/${PN}-4.3.1_p20211221-libgrapheme2.patch +) + src_prepare() { default -- cgit v1.2.3