diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-02-17 10:35:54 +0000 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-02-17 10:35:54 +0000 |
commit | 463397cf1e064185110fe57c568d73f99a06f5d1 (patch) | |
tree | 9aa75eefc5154eaf0e3c33658b830fc54dc68052 /media-gfx/imv | |
parent | c8d60dada2ec8eb48b2d2b290cd6683ccec40e39 (diff) |
gentoo resync : 17.02.2021
Diffstat (limited to 'media-gfx/imv')
-rw-r--r-- | media-gfx/imv/Manifest | 10 | ||||
-rw-r--r-- | media-gfx/imv/files/imv-4.2.0-add-string-inc.patch | 9 | ||||
-rw-r--r-- | media-gfx/imv/files/imv-4.2.0-wayland-roundtrip-after-scale.patch | 14 | ||||
-rw-r--r-- | media-gfx/imv/imv-4.0.1-r2.ebuild | 91 | ||||
-rw-r--r-- | media-gfx/imv/imv-4.2.0.ebuild | 86 | ||||
-rw-r--r-- | media-gfx/imv/imv-9999.ebuild | 102 | ||||
-rw-r--r-- | media-gfx/imv/metadata.xml | 25 |
7 files changed, 178 insertions, 159 deletions
diff --git a/media-gfx/imv/Manifest b/media-gfx/imv/Manifest index f2b11f9eaa70..d8bbe22472e0 100644 --- a/media-gfx/imv/Manifest +++ b/media-gfx/imv/Manifest @@ -1,6 +1,8 @@ -DIST imv-4.0.1.tar.gz 74982 BLAKE2B 5ff7f093307fdf6114e56f0e5d5a47a4320607eea12daa9a9c89c679f558b4d31f206f7eb03a8b0435a3f05974949029ebfc6e1b1fe4d7d2859bbd722ecb6366 SHA512 f946346638d4314956e86f0e7dfa38baf0ebbb80970f1738749e6c7b80642c2315256738b94ab04d45784c0930edadfc7cc339d2bcfd6eb80fd2e1e98b2d9b28 +AUX imv-4.2.0-add-string-inc.patch 275 BLAKE2B 40e46bd1e7531477d6701ac14013405ee37562305286223a4b5800f3f644f63d366bb1ae08a0ee575b088351013605c9ecaf0356a046976d6a520d55dcaaf2c0 SHA512 2ef9ae3e8a6543476000a2e19fee4f383e01a25b5ed6ffb674f12f843761f9d8fa6ae394e2043260ba88d88fa300ebe3bb03027a02aa3afde5d4cdf897174958 +AUX imv-4.2.0-wayland-roundtrip-after-scale.patch 583 BLAKE2B b71b428bc7c3fd566ab9fa650cb714a2abc455df0512aa7372f82e1c331530bf8515cd0f005d54aa9d20de2156eddf7a0fb3b892775825a4a8af64a0bc66735a SHA512 c081fa2656d2611ef78df072826718ccca56fc376860277f74a9248e0b9771547af28e9379dbf820c4e67f33ffad021c10b5e178f1da2c309e33d25692a38218 DIST imv-4.1.0.tar.gz 77341 BLAKE2B d6735feba4d3e958db70eddea72bbbeb60731cf550680320448ba226ba74eb467617ad295f9094995e0bf31c99473f067ff41f16689ce21fb87d7a9fd2e0946a SHA512 92d7551bda55185b29724e90230dac608a82f4a45cd3cb9c7a5d261f65eede6dcdde78f5c16eecfc1242533ec8e155204189fab3cacf31ddc088707af5131b2a -EBUILD imv-4.0.1-r2.ebuild 1668 BLAKE2B 15349164bbf9db90387a806b7a93546321865f1b0ab9afceae73cb8a19f5c3c91868000babc6ecc07ebd799b09f43f3392937b53b9a7ee587d5591a74cf140ae SHA512 2d35ea2a80e63dea404172db166ff394afc052ed063d88fd3d5b35e592bffd6d2154461caab979104a414a39b908e6dd5e362d7f99146f683ba3c3fa8b445e2b +DIST imv-4.2.0.tar.gz 77809 BLAKE2B a0c8aeb4d50d252818f4a4bedc145a8e2ffffa3ae14d888ef4623fe17a714bd17397399064019b32a48e6ebe3613f592428b075988ed533166c06c2b885d245b SHA512 7b64c6d4e5e484fd2ef4e28e2ba5cc74e4d28f8e2fa329ae7c744bd77ce8a345123f9cc3c77e015ff780938d5add97cfe9ed4e5a3a52b03a91b7bb6bb50e7115 EBUILD imv-4.1.0-r1.ebuild 1767 BLAKE2B fe2541d3bce172e6fc1c559ed0593a4c52b1536b907459d2e5842db5c14ec356e7523cf3d91225ab6b5d3261b8ff3fa4ab9724c8d95979e88078b5b7617d897f SHA512 7484d434a44818bd131ccecd484bd88e6ed8867eacf48f94e863b9dc480f197005a5f8bc519207afd82f3fca7d02416dbd7fc7ff966520b7a57c726317af4cdd -EBUILD imv-9999.ebuild 1798 BLAKE2B a1c931a83c7b2444d33341e74fa50c4fa532ec3b215e3010eb250a1cae7c2f0f439068d725d3e3bc17eb4cc2cc97fe0e96924d606225cf783d7c009938ca0832 SHA512 c35f9417fe15cce3947ff334aaadae2c76fa9c4084e321bf903bda5cb9e3c9d6341fe709e9b8dcf2cdad84c48e7b848463c75a508ee8fbcce66261533dcf77cd -MISC metadata.xml 490 BLAKE2B 6b48ec3d26724e518dff34a3cd7b6a121f023c2b78b39777abc71d85192bd27877a7bd058b564f10528765b18c823aa01bdf3f9537468112c2384e66bd2b02e3 SHA512 b53c973037b89ba73e2af0d181bf23b5fc881c73fa2645f3bdd880a948e2d250feb5398a41910b6695cde1b5171b60951edf5e1c9e82279253e356a7d1748618 +EBUILD imv-4.2.0.ebuild 1897 BLAKE2B 8fa164e9e1eb6b8856774c7e863a725749b4316ff3dda0a8906540910c371625406a2ef0b0b4fd281032970f07e764bb7feb899d819c30e1bc35839cdfd031cb SHA512 611ad4cdc876fa7e36a84ffad250d76e291df8fdb0dc4b1f78b9ded7c097708f41a2f9f9ab6fa5e3536a98acd80940b1cf46e6163f1e120abedafd2da6ad73d5 +EBUILD imv-9999.ebuild 1773 BLAKE2B 8e12bc1176341dd3aeafc8cc3347d673e79f154e699fd423967f0841930fa02efd17d601220b3688791cb9d753a69da25ca007c130967e4bfab94c5d08c75cbe SHA512 b5be092d1e4b1acd2542e5a19881f2a4c836e040df6bedbade6022e06db2af21971c167e9162ee72c61c27bd83ce258ff7aa353c711c438960e056afd5816c9d +MISC metadata.xml 662 BLAKE2B a0da452f9b0ae95ba99c7b3b05ad2a4b3530c25f1ed833bc3d394e409d80d44310d58684735eccfe522aa452d94c6a362bc3210dca7790960a571c0425cdd2c0 SHA512 3a7c33c7fc5cf71e874546212bc90e8969d112b3b2bb2b15564fa42e980ba18be42ddb14f57db508a45ea62640b625d0d84a2274617de08150058c86e6bbb266 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 000000000000..e726d7b093a2 --- /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 000000000000..381013329062 --- /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.0.1-r2.ebuild b/media-gfx/imv/imv-4.0.1-r2.ebuild deleted file mode 100644 index a93b2f9f6269..000000000000 --- a/media-gfx/imv/imv-4.0.1-r2.ebuild +++ /dev/null @@ -1,91 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -inherit toolchain-funcs xdg-utils - -DESCRIPTION="Minimal image viewer designed for tiling window manager users" -HOMEPAGE="https://github.com/eXeC64/imv" -SRC_URI="https://github.com/eXeC64/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="MIT-with-advertising" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="X +freeimage jpeg png +svg test tiff wayland" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - || ( X wayland ) -" - -RDEPEND=" - !sys-apps/renameutils - media-libs/fontconfig - media-libs/libsdl2 - media-libs/sdl2-ttf - X? ( - virtual/glu - x11-libs/libX11 - x11-libs/libxcb - x11-libs/libxkbcommon - x11-libs/pango - ) - freeimage? ( media-libs/freeimage ) - jpeg? ( media-libs/libjpeg-turbo ) - png? ( media-libs/libpng ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff ) - wayland? ( dev-libs/wayland ) -" -BDEPEND=" - app-text/asciidoc - test? ( dev-util/cmocka ) -" -DEPEND=" - ${RDEPEND} -" - -src_prepare() { - default - sed -i -e 's|pkg-config|$(PKG_CONFIG)|g' Makefile || die -} - -src_configure() { - tc-export PKG_CONFIG - 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 - - BACKENDS=( - BACKEND_FREEIMAGE=$(usex freeimage) - BACKEND_JPEG=$(usex jpeg) - BACKEND_LIBPNG=$(usex png) - BACKEND_LIBRSVG=$(usex svg) - BACKEND_LIBTIFF=$(usex tiff) - WINDOWS=${WINDOWS} - ) -} - -src_compile() { - emake ${BACKENDS[@]} -} - -src_install() { - emake ${BACKENDS[@]} DESTDIR="${D}" install -} - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} 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 000000000000..25863200b0b2 --- /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 65f50d9221c2..735366ed5332 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) - -Dwindows=$WINDOWS + $(meson_feature test) + $(meson_feature tiff libtiff) + -Dwindows=${windows} ) meson_src_configure } - -pkg_postinst() { - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_desktop_database_update -} diff --git a/media-gfx/imv/metadata.xml b/media-gfx/imv/metadata.xml index 5ae50d4b1eeb..196a224f7464 100644 --- a/media-gfx/imv/metadata.xml +++ b/media-gfx/imv/metadata.xml @@ -1,13 +1,20 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<!-- maintainer-needed --> -<use> -<flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> as image library</flag> -<flag name="heif">Use <pkg>media-libs/libheif</pkg> as image library</flag> -<flag name="libnsgif">Use <pkg>media-libs/libnsgif</pkg> as image library</flag> -</use> -<upstream> -<remote-id type="github">eXeC64/imv</remote-id> -</upstream> + <maintainer type="person"> + <email>sudinave@gmail.com</email> + <name>Ionen Wolkens</name> + </maintainer> + <maintainer type="project"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> + </maintainer> + <use> + <flag name="freeimage">Use <pkg>media-libs/freeimage</pkg> for additional image support</flag> + <flag name="heif">Add HEIF/HEIC image support</flag> + <flag name="libnsgif">Add animated GIF support</flag> + </use> + <upstream> + <remote-id type="github">eXeC64/imv</remote-id> + </upstream> </pkgmetadata> |