diff options
Diffstat (limited to 'media-gfx/fbida')
| -rw-r--r-- | media-gfx/fbida/Manifest | 7 | ||||
| -rw-r--r-- | media-gfx/fbida/fbida-2.12.ebuild | 2 | ||||
| -rw-r--r-- | media-gfx/fbida/fbida-2.14-r2.ebuild (renamed from media-gfx/fbida/fbida-2.14.ebuild) | 17 | ||||
| -rw-r--r-- | media-gfx/fbida/fbida-9999.ebuild | 10 | ||||
| -rw-r--r-- | media-gfx/fbida/files/fbida-2.14-cpp.patch | 6 |
5 files changed, 29 insertions, 13 deletions
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest index 5b1c101cbbd5..c0500ac4b79a 100644 --- a/media-gfx/fbida/Manifest +++ b/media-gfx/fbida/Manifest @@ -2,14 +2,15 @@ AUX fbida-2.10-fprintf-format.patch 172 BLAKE2B 1abaa348e1bdd459b9f6458d361bed01 AUX fbida-2.10-giflib-4.2.patch 542 BLAKE2B e41f1cb27860b0fdf99d4e9a3961021e4be64f6ac9e47099e6dd7b784b96599490137f6340e54052216af1692e2d9177d831612248ed7be849e6141ab5eb86b0 SHA512 7610721d965c3640c4524311626ba099501cac1aef6cea62d32158e8a7720cc23bdb0c83422795676de021f88a592c3d2f7d4d26d810dc06d959f7c85e91019e AUX fbida-2.13-Autoconf.patch 239 BLAKE2B 749fa77fe9f2a5b8b61051dcebfacc6efcf97cd2f9bd7d9d4de737bca89689203dff7a1c3baff620289ddc211419a1b31a3924b7542049db345af5503479e5f0 SHA512 b87ed3f79fe9efea02fc97d6cde0e6d67c2e6baf93ab3a19564090f2806cbfa1b67610a16a4151ba8df31d570f79f8f964dd608ce4fda95e7f7cbcc562902847 AUX fbida-2.14-Autoconf.patch 244 BLAKE2B 52b9fff1bcb3eaae0753842e953566ce7eebb4ff445dc288b2ca84342247ec0744dac9327c53dc863cf564543e791305d5a27ffda059837320cac461f4e222fb SHA512 cb31757e3ca3eabbff4c4ecb27581b39b8fef386412b4f26558a070b6b08891b09a31a06861d965009f5158e03ab227b86873f4b64316cf63bc7b51ce6074221 +AUX fbida-2.14-cpp.patch 222 BLAKE2B e8bfabd42c57a08261982b0ab71532135db8a289963c12a0ee3d8793806761a630a75671c655a2ab25cc24be714fa25eababac6f853d7b2323f2dac910741bba SHA512 8fe4bc3e5eb6bfbb8b362807238d9635df9dbc11b4f33a5ed485000f59722c68d3bc8a93953d74e7b86af33d7107c6fb7e253798396a4574baf517a41e44db14 AUX fbida-2.14-fno-common.patch 1148 BLAKE2B 108c21e732afaebe6183835732341b814b1def9a77a4faa55742858d2eeb75a8d2ba4c4151505dbaa683b31b49e1ce6d88aef6ab9b3e6b830a59533903e02597 SHA512 4fe7560be0a5cb4f00ebe8a1574f131b6fd83902c6dbe54995f384a250b25b03e5f0022a5c38c306a709de6240f447c53c9af3ba3aca863b08e725567746185e AUX ida-desktop.patch 384 BLAKE2B 627319b163e62af11acc2c0957254cc671145b9df22f27af8988e5f0bcdf383f7cf2ad4fa7b7c97acfbba3181081ee1c025c4b3c82e99bfd7fe4efe69edd59c0 SHA512 0e14a3b848774d1538e309a9c8a8f0445a870db21723d11d0c39d86760ccb9c6f9a5f08ec75016875b2867c2d2075b59aad0fa810621f2c2afcccd14fef26737 DIST fbida-2.12.tar.gz 294842 BLAKE2B f9de5957f9015e022868d2b14d0269951fccbe8f10b591b3b58758fb67232487aaaf2de23c8ee9b42a7ad9e645e3fed2ac1f05588c039ce9270f418b60b1a3da SHA512 383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515 DIST fbida-2.13.tar.gz 296020 BLAKE2B 119be4103b53ab7e7d1791a22172e1311ced0db5e9c928faf22ab08dbe1670c91d30f7dafbf8873a9621c16a7902354f5e21e2a86d45c9572b30fe8e205bfc4d SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3 DIST fbida-2.14.tar.gz 296826 BLAKE2B 0015b426c5deaf72737a52bddb065e7d0cb804ea97157dded522061d8fabb5c632d5e66b1ef1b4e75b355537ef4f4e603f3a877e2ef92d1581eaa4791ab5be99 SHA512 8f3596ad8a22497880ac698d3b324e038ac5ccae7481fe4a902fc6e8bf43ba1bb3a96af8c7a3347bea86c1988f35674e2647901ac256bd4e8261d467a6a343ec DIST ida.png.bz2 11928 BLAKE2B 8a1c89fc5adfb16c69f9591a299beb62c84d66960b586fbc819e53f904c90beef821ecf3539236563644c28e3ad3c7dbf861b140c820be649305a658b3613433 SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 -EBUILD fbida-2.12.ebuild 2413 BLAKE2B 2fde21f65df975032f3638e2f22ff4aef0ccd81b408e571fe88cc180ae9cc7d11c00f296158abac0c0b891dd46d3bc9c9bbd0a4e4e332e9c53cb074c74e256da SHA512 e2b31fb9cee9204d38060a2269996c8142a981e0179e67ab86bfebb7967bcfae59a45794106e9e741a5a5269b307290885bdfa1b009919550a034d7302390200 +EBUILD fbida-2.12.ebuild 2414 BLAKE2B 893937473fba4502d1ea4cb6903b42a21a64ac0aece55d5b5991b741ed6f80e5f02139e3348c8116d45e0a2819076165e3cc3ccae1864455a3e9a0a29310f526 SHA512 d63b867ea02fdcbb3a39aec5c358b3eb0de7bc30fbd318b1066332ddcf073f5f8ccfe5cd73b59d2e5518d6a72b758cd248c2c65bca44c1fa7cd08908e266b388 EBUILD fbida-2.13-r1.ebuild 2395 BLAKE2B b3f42d22b78ce8a0fe9158fad16daef4cf0fea76585c0f83035604b48664dd9f8a98adcbe2cb6e47fdd4c2fde8f33ec03087796c656dcc92682954864a54333b SHA512 e1809154631d9a298007bd02fca72914ffe9244fd904bbd6fa322831e944f02887cca4ac8e7dc50411efd0cd9356cb4ae663677cfd2a50eda5357132c082c30d -EBUILD fbida-2.14.ebuild 2391 BLAKE2B d43531e71d419ade0e6c06bb2fe92bb72523e466af372a94d6291eeb9dbf3ec36ffbb61ea293e7c590c844f846685c96ee7fd7de78009bfb877dc879891f5b5c SHA512 29ea58a36af771231ea4d7cef4004681662440495ae98893bb143bd0e9ec26fb653688eddaa65f667241a868103e2216394b3685f3543f3848c9594d4cf73209 -EBUILD fbida-9999.ebuild 1261 BLAKE2B 13ca3dd7089feb7104c38febddacd22f3d856543d418d08897ca53b82b1e112660cc2db58c5904cf7a52fd2ed0b81a072c606168c7f5e19d5ebcfeb9aa2922a3 SHA512 fa8c7e06f7ee7ee7e4acc6c926558497de046bd5a895c8027fe715d8b83d4c803cd4971ff307b16685a1f87f37d3c043fc417fb89ca19431018501086bb58f29 +EBUILD fbida-2.14-r2.ebuild 2496 BLAKE2B 666bcb15a1a59db0d811c7016fbebab486d2ea5994b2f5bb92b48aa7f9ab320b1a32dc389d6a71d996ae815fb72fefcfb5e1f4b4037d5d90ab2ed461a7c6f4de SHA512 f321d0b96591e4107eda976e530165f2597d4ac44e0fdba6f1bdc20af9d8d8398491620e0167190bb94f3c255b9c161a8904d46c92a10e27bfd3a6bc7385d90b +EBUILD fbida-9999.ebuild 1349 BLAKE2B b011518d4f9816d0440b1bfd853fe97514e236fa20fb5eee942924b7e30751b981e0eb13a9e819627dff1af7b866b10c3712cbe0554d30e96e3bf5e7fddaa285 SHA512 10d5b89d83f020f3c14a9a68c622a96cd864ef8081b8163967938bacf592d1594ee8c09ff248515de246835a0a4e4fb78a768590f459bf53883011bede177ca0 MISC metadata.xml 439 BLAKE2B 66a897b749b63e389153a97d84be2d4cf7e9c06c0b967ae715bd8202e038005ee724110d7d62ff99ef6ba21c8a365634f9350fc43e7dce44c81717cdeee85c54 SHA512 078e39413b3d63c3324c1f98e83b1b9747f2653108e34986dfc869cc3b65452d1b85ecefdaab17c0c53bd50cdb879f68c8b55a9da7d0cdee47ca329af10eec58 diff --git a/media-gfx/fbida/fbida-2.12.ebuild b/media-gfx/fbida/fbida-2.12.ebuild index ac6cac234948..80d37357377a 100644 --- a/media-gfx/fbida/fbida-2.12.ebuild +++ b/media-gfx/fbida/fbida-2.12.ebuild @@ -12,7 +12,7 @@ SRC_URI=" " LICENSE="GPL-2 IJG" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 arm ~hppa ppc ppc64 sparc x86" IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp" REQUIRED_USE=" ghostscript? ( tiff ) diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14-r2.ebuild index 9e5d00b136d3..d0237a1e80d4 100644 --- a/media-gfx/fbida/fbida-2.14.ebuild +++ b/media-gfx/fbida/fbida-2.14-r2.ebuild @@ -1,8 +1,8 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 -inherit eutils toolchain-funcs +EAPI=7 +inherit desktop toolchain-funcs DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/" @@ -20,17 +20,21 @@ REQUIRED_USE=" CDEPEND=" !media-gfx/fbi - app-text/poppler >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 + app-text/poppler media-libs/libepoxy media-libs/libexif - media-libs/mesa[X(+)] virtual/jpeg:* virtual/ttf-fonts x11-libs/cairo[opengl] - x11-libs/libdrm curl? ( net-misc/curl ) + fbcon? ( + app-text/poppler[cairo] + media-libs/mesa[X(+),gbm] + x11-libs/libdrm + x11-libs/pixman + ) gif? ( media-libs/giflib:= ) lirc? ( app-misc/lirc ) png? ( media-libs/libpng:* ) @@ -38,7 +42,7 @@ CDEPEND=" tiff? ( media-libs/tiff:* ) webp? ( media-libs/libwebp ) X? ( - >=x11-libs/motif-2.3:0 + >=x11-libs/motif-2.3:0[xft] x11-libs/libX11 x11-libs/libXpm x11-libs/libXt @@ -61,6 +65,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch "${FILESDIR}"/${PN}-2.14-Autoconf.patch "${FILESDIR}"/${PN}-2.14-fno-common.patch + "${FILESDIR}"/${PN}-2.14-cpp.patch ) src_configure() { diff --git a/media-gfx/fbida/fbida-9999.ebuild b/media-gfx/fbida/fbida-9999.ebuild index 1da490349569..c8b7ba52c583 100644 --- a/media-gfx/fbida/fbida-9999.ebuild +++ b/media-gfx/fbida/fbida-9999.ebuild @@ -6,19 +6,20 @@ inherit desktop git-r3 meson toolchain-funcs DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)" HOMEPAGE="https://www.kraxel.org/blog/linux/fbida/" -EGIT_REPO_URI="https://git.kraxel.org/cgit/fbida" +EGIT_REPO_URI="https://git.kraxel.org/git/fbida" SRC_URI=" mirror://gentoo/ida.png.bz2 " LICENSE="GPL-2 IJG" SLOT="0" KEYWORDS="" + CDEPEND=" !media-gfx/fbi >=media-libs/fontconfig-2.2 >=media-libs/freetype-2.0 - >=x11-libs/motif-2.3:0 - app-text/poppler + >=x11-libs/motif-2.3:0[xft] + app-text/poppler[cairo] media-libs/giflib:= media-libs/libepoxy media-libs/libexif @@ -34,6 +35,8 @@ CDEPEND=" x11-libs/libXpm x11-libs/libXt x11-libs/libdrm + x11-libs/libxkbcommon + x11-libs/pixman " DEPEND=" ${CDEPEND} @@ -45,6 +48,7 @@ RDEPEND=" PATCHES=( "${FILESDIR}"/ida-desktop.patch "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch + "${FILESDIR}"/${PN}-2.14-cpp.patch ) src_unpack() { diff --git a/media-gfx/fbida/files/fbida-2.14-cpp.patch b/media-gfx/fbida/files/fbida-2.14-cpp.patch new file mode 100644 index 000000000000..1e7635bbd2a9 --- /dev/null +++ b/media-gfx/fbida/files/fbida-2.14-cpp.patch @@ -0,0 +1,6 @@ +--- a/scripts/jpeg-version.sh ++++ b/scripts/jpeg-version.sh +@@ -1,2 +1,2 @@ + #!/bin/sh +-echo JPEG_LIB_VERSION | cpp $CFLAGS -include jpeglib.h | tail -1 ++echo JPEG_LIB_VERSION | $CPP $CFLAGS -include jpeglib.h - | tail -1 |