* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fbida/files/, media-gfx/fbida/
@ 2016-01-24 16:06 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2016-01-24 16:06 UTC (permalink / raw
To: gentoo-commits
commit: d095eeaf6d8a6cd3f97ec00e4bd0b873c6660722
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Sun Jan 24 16:05:54 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Sun Jan 24 16:06:20 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d095eeaf
media-gfx/fbida: Fix internally stored version.
Package-Manager: portage-2.2.27
media-gfx/fbida/fbida-2.10-r1.ebuild | 112 +++++++++++++++++++++
.../fbida/files/fbida-2.10-fprintf-format.patch | 11 ++
2 files changed, 123 insertions(+)
diff --git a/media-gfx/fbida/fbida-2.10-r1.ebuild b/media-gfx/fbida/fbida-2.10-r1.ebuild
new file mode 100644
index 0000000..f43d6b9
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.10-r1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
+HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+SRC_URI="
+ http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+ mirror://gentoo/ida.png.bz2
+"
+LICENSE="GPL-2 IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
+REQUIRED_USE="
+ pdf? ( tiff )
+"
+
+RDEPEND="
+ !media-gfx/fbi
+ >=media-libs/fontconfig-2.2
+ >=media-libs/freetype-2.0
+ media-libs/libexif
+ curl? ( net-misc/curl )
+ gif? ( media-libs/giflib:= )
+ lirc? ( app-misc/lirc )
+ png? ( media-libs/libpng:* )
+ scanner? ( media-gfx/sane-backends )
+ tiff? ( media-libs/tiff:* )
+ virtual/jpeg:*
+ virtual/ttf-fonts
+ webp? ( media-libs/libwebp )
+ X? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXt
+ )
+"
+
+DEPEND="
+ ${RDEPEND}
+ X? ( x11-proto/xextproto x11-proto/xproto )
+ pdf? ( app-text/ghostscript-gpl )
+"
+
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/ida-desktop.patch \
+ "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch \
+ "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
+
+ tc-export CC CPP
+
+ # upstream omission?
+ echo ${PV} > VERSION
+}
+
+src_configure() {
+ # Let autoconf do its job and then fix things to build fbida
+ # according to our specifications
+ emake Make.config
+
+ gentoo_fbida() {
+ local useflag=${1}
+ local config=${2}
+
+ local option="no"
+ use ${useflag} && option="yes"
+
+ sed -i \
+ -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
+ "${S}/Make.config" || die
+ }
+
+ gentoo_fbida X MOTIF
+ gentoo_fbida curl LIBCURL
+ gentoo_fbida fbcon LINUX_FB_H
+ gentoo_fbida gif LIBUNGIF
+ gentoo_fbida lirc LIBLIRC
+ gentoo_fbida pdf LIBTIFF
+ gentoo_fbida png LIBPNG
+ gentoo_fbida scanner LIBSANE
+ gentoo_fbida tiff LIBTIFF
+ gentoo_fbida webp LIBWEBP
+}
+
+src_compile() {
+ emake verbose=yes
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ STRIP="" \
+ prefix=/usr \
+ install
+
+ dodoc README
+
+ if use fbcon && ! use pdf; then
+ rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
+ fi
+
+ if use X ; then
+ doicon "${WORKDIR}"/ida.png
+ domenu desktop/ida.desktop
+ fi
+}
diff --git a/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch b/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
new file mode 100644
index 0000000..d1c0b36
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.10-fprintf-format.patch
@@ -0,0 +1,11 @@
+--- a/wr/write-ps.c
++++ b/wr/write-ps.c
+@@ -458,7 +458,7 @@
+ fprintf(fp,"\n");
+ }
+ }
+- fprintf(fp,footer);
++ fprintf(fp, "%s", footer);
+ return 0;
+ }
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fbida/files/, media-gfx/fbida/
@ 2016-03-30 4:22 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2016-03-30 4:22 UTC (permalink / raw
To: gentoo-commits
commit: 41fccacb21f580b97c190a2310ead9d7c35fd7d1
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 04:17:30 2016 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 04:17:30 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=41fccacb
media-gfx/fbida: Old.
Package-Manager: portage-2.2.28
media-gfx/fbida/Manifest | 2 -
media-gfx/fbida/fbida-2.09-r4.ebuild | 122 --------------------------
media-gfx/fbida/files/fbida-2.09-giflib.patch | 97 --------------------
media-gfx/fbida/files/fbida-2.09-make.patch | 36 --------
4 files changed, 257 deletions(-)
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 605eb7c..13debd5 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,4 +1,2 @@
-DIST fbida-2.09-jpeg-9a.patch.bz2 29392 SHA256 d0979bb7b33b34c2b01f0fe14825812319b0ec08f00f0de6cf9a0533a5f6dba8 SHA512 f644f464231967589a2f1ad0fdc9025d60348a9de20d468fc6abdf3dc0cbf07522e3f71a94930df3c54055fc445df035b4b007efa7e6a3f7acbec90e28dc86c8 WHIRLPOOL 372aa56e698f82ff9dd8adacb5de9347e40849653553d810e4f5c0fca731ca8e863f8a20658db071ca11ed8d6bc8794c36ec5fd8c0a2426d8e500389703f2e95
-DIST fbida-2.09.tar.gz 248086 SHA256 dd40b3572f79c6524480ac652c9b32e3867cb53e6c53db51415ddbb20f5231e6 SHA512 b939ca656fc28e3df652610821b9c11f7ab20ad1bd393c40de74f631fad0af463bfaf4f0520484edc12922b1fc288d08fae7c92789c711ce96b0caf50dde25ba WHIRLPOOL 222538f80fc7e878d142cd4dc44089d12b717ee8ae921e514bb3b85322b972cc96300594ae89d7cc1cb006868a0c75abacaa7ddff15041bc672c27d565a00a4b
DIST fbida-2.10.tar.gz 283490 SHA256 7a5a3aac61b40a6a2bbf716d270a46e2f8e8d5c97e314e927d41398a4d0b6cb6 SHA512 b7371c19d68cc7219faca4bbfa464c85df2eb22c7bd737d4f0a6fb3de481497862ca22832801d29bab57285d5a8d7d0b0009e14426efdce2759d47340f5eca6d WHIRLPOOL 78c5dc34a9f050e560ada960718a9f43e6d8c95fe4c91c052a70c93350de80eebd3e8e9b6c26361ecd8361efe96824e78b2af7a2b2e27430a11e712bb9a02ee0
DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be
diff --git a/media-gfx/fbida/fbida-2.09-r4.ebuild b/media-gfx/fbida/fbida-2.09-r4.ebuild
deleted file mode 100644
index 1b2b7ac..0000000
--- a/media-gfx/fbida/fbida-2.09-r4.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
-HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
-SRC_URI="
- http://www.kraxel.org/releases/${PN}/${P}.tar.gz
- https://dev.gentoo.org/~jer/${P}-jpeg-9a.patch.bz2
- mirror://gentoo/ida.png.bz2
-"
-LICENSE="GPL-2 IJG"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ppc ppc64 ~sh sparc x86"
-IUSE="curl fbcon +gif lirc pdf +png scanner +tiff X +webp"
-REQUIRED_USE="
- pdf? ( tiff )
-"
-
-RDEPEND="
- !media-gfx/fbi
- >=media-libs/fontconfig-2.2
- >=media-libs/freetype-2.0
- media-libs/libexif
- curl? ( net-misc/curl )
- gif? ( media-libs/giflib:= )
- lirc? ( app-misc/lirc )
- png? ( media-libs/libpng )
- scanner? ( media-gfx/sane-backends )
- tiff? ( media-libs/tiff )
- virtual/jpeg
- virtual/ttf-fonts
- webp? ( media-libs/libwebp )
- X? (
- >=x11-libs/motif-2.3:0
- x11-libs/libX11
- x11-libs/libXpm
- x11-libs/libXt
- )
-"
-
-DEPEND="
- ${RDEPEND}
- X? ( x11-proto/xextproto x11-proto/xproto )
- pdf? ( app-text/ghostscript-gpl )
-"
-
-src_prepare() {
- epatch "${FILESDIR}"/ida-desktop.patch
- epatch "${FILESDIR}"/${P}-make.patch
- epatch "${FILESDIR}"/${P}-giflib.patch
-
- pushd jpeg/ >/dev/null
- epatch -p2 "${WORKDIR}"/${P}-jpeg-9a.patch
- popd >/dev/null
-
- sed -i \
- -e 's:DGifOpenFileName,ungif:DGifOpenFileName,gif:' \
- -e 's:-lungif:-lgif:' \
- "${S}"/GNUmakefile || die
-
- if [[ $(gcc-major-version) -lt 4 ]]; then
- sed -i-e 's:-Wno-pointer-sign::' "${S}"/GNUmakefile || die
- fi
-
- tc-export CC CPP
-}
-
-src_configure() {
- # Let autoconf do its job and then fix things to build fbida
- # according to our specifications
- emake Make.config
-
- gentoo_fbida() {
- local useflag=${1}
- local config=${2}
-
- local option="no"
- use ${useflag} && option="yes"
-
- sed -i \
- -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
- "${S}/Make.config" || die
- }
-
- gentoo_fbida X MOTIF
- gentoo_fbida curl LIBCURL
- gentoo_fbida fbcon LINUX_FB_H
- gentoo_fbida gif LIBUNGIF
- gentoo_fbida lirc LIBLIRC
- gentoo_fbida pdf LIBTIFF
- gentoo_fbida png LIBPNG
- gentoo_fbida scanner LIBSANE
- gentoo_fbida tiff LIBTIFF
- gentoo_fbida webp LIBWEBP
-}
-
-src_compile() {
- emake verbose=yes
-}
-
-src_install() {
- emake \
- DESTDIR="${D}" \
- STRIP="" \
- prefix=/usr \
- install
-
- dodoc README
-
- if use fbcon && ! use pdf; then
- rm "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1 || die
- fi
-
- if use X ; then
- doicon "${WORKDIR}"/ida.png
- domenu desktop/ida.desktop
- fi
-}
diff --git a/media-gfx/fbida/files/fbida-2.09-giflib.patch b/media-gfx/fbida/files/fbida-2.09-giflib.patch
deleted file mode 100644
index 50c0055..0000000
--- a/media-gfx/fbida/files/fbida-2.09-giflib.patch
+++ /dev/null
@@ -1,97 +0,0 @@
---- a/rd/read-gif.c
-+++ b/rd/read-gif.c
-@@ -25,7 +25,13 @@
- if (GIF_ERROR == DGifGetRecordType(h->gif,&RecordType)) {
- if (debug)
- fprintf(stderr,"gif: DGifGetRecordType failed\n");
-- PrintGifError();
-+#if GIFLIB_MAJOR >= 5
-+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE);
-+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2)
-+ GifErrorString();
-+#else
-+ PrintGifError();
-+#endif
- return -1;
- }
- switch (RecordType) {
-@@ -42,7 +48,13 @@
- if (rc == GIF_ERROR) {
- if (debug)
- fprintf(stderr,"gif: DGifGetExtension failed\n");
-+#if GIFLIB_MAJOR >= 5
-+ GifErrorString(D_GIF_ERR_NOT_GIF_FILE);
-+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2)
-+ GifErrorString();
-+#else
- PrintGifError();
-+#endif
- return -1;
- }
- if (debug) {
-@@ -93,12 +105,19 @@
- struct gif_state *h;
- GifRecordType RecordType;
- int i, image = 0;
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
-+ int ErrorCode;
-+#endif
-
- h = malloc(sizeof(*h));
- memset(h,0,sizeof(*h));
-
- h->infile = fp;
-+#if GIFLIB_MAJOR >= 5
-+ h->gif = DGifOpenFileHandle(fileno(fp), NULL);
-+#else
- h->gif = DGifOpenFileHandle(fileno(fp));
-+#endif
- h->row = malloc(h->gif->SWidth * sizeof(GifPixelType));
-
- while (0 == image) {
-@@ -108,7 +127,15 @@
- if (GIF_ERROR == DGifGetImageDesc(h->gif)) {
- if (debug)
- fprintf(stderr,"gif: DGifGetImageDesc failed\n");
-+#if (GIFLIB_MAJOR >= 5 && GIFLIB_MINOR >= 1)
-+ GifErrorString(D_GIF_ERR_NO_IMAG_DSCR);
-+#elif GIFLIB_MAJOR >= 5
-+ GifErrorString(NULL);
-+#elif (GIFLIB_MAJOR >= 4 && GIFLIB_MINOR >=2)
-+ GifErrorString();
-+#else
- PrintGifError();
-+#endif
- }
- if (NULL == h->gif->SColorMap &&
- NULL == h->gif->Image.ColorMap) {
-@@ -156,7 +183,11 @@
- oops:
- if (debug)
- fprintf(stderr,"gif: fatal error, aborting\n");
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
-+ DGifCloseFile(h->gif, &ErrorCode);
-+#else
- DGifCloseFile(h->gif);
-+#endif
- fclose(h->infile);
- free(h->row);
- free(h);
-@@ -193,10 +224,17 @@
- gif_done(void *data)
- {
- struct gif_state *h = data;
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
-+ int ErrorCode;
-+#endif
-
- if (debug)
- fprintf(stderr,"gif: done, cleaning up\n");
-+#if (GIFLIB_MAJOR >=5 && GIFLIB_MINOR >= 1)
-+ DGifCloseFile(h->gif, &ErrorCode);
-+#else
- DGifCloseFile(h->gif);
-+#endif
- fclose(h->infile);
- if (h->il)
- free(h->il);
diff --git a/media-gfx/fbida/files/fbida-2.09-make.patch b/media-gfx/fbida/files/fbida-2.09-make.patch
deleted file mode 100644
index 61c19a3..0000000
--- a/media-gfx/fbida/files/fbida-2.09-make.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/GNUmakefile
-+++ b/GNUmakefile
-@@ -30,8 +30,8 @@
-
- ac_jpeg_ver = $(shell \
- $(call ac_init,for libjpeg version);\
-- $(call ac_s_cmd,echo -e '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
-- | cpp | tail -n 1);\
-+ $(call ac_s_cmd,printf '\#include <jpeglib.h>\nJPEG_LIB_VERSION' \
-+ | $(CPP) | tail -n 1);\
- $(call ac_fini))
-
- define make-config
---- a/mk/Autoconf.mk
-+++ b/mk/Autoconf.mk
-@@ -24,7 +24,7 @@ ifneq ($(verbose),no)
- ac_fini = echo "... result is $${rc}" >&2; echo >&2; echo "$${rc}"
- else
- # normal
-- ac_init = echo -n "checking $(1) ... " >&2; rc=no
-+ ac_init = printf '%s' "checking $(1) ... " >&2; rc=no
- ac_b_cmd = $(1) >/dev/null 2>&1 && rc=yes
- ac_s_cmd = rc=`$(1) 2>/dev/null`
- ac_fini = echo "$${rc}" >&2; echo "$${rc}"
-@@ -162,7 +162,7 @@ config: Make.config
- @true
-
- Make.config: $(srcdir)/GNUmakefile
-- @echo -e "$(make-config-q)" > $@
-+ @printf '%b' "$(make-config-q)" > $@
- @echo
- @echo "Make.config written, edit if needed"
- @echo
---
-1.7.5.3
-
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fbida/files/, media-gfx/fbida/
@ 2017-02-24 15:06 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2017-02-24 15:06 UTC (permalink / raw
To: gentoo-commits
commit: 4f6936aae06513a55417f2f8683f8dfdbeb8d5d0
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Feb 24 15:06:16 2017 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 15:06:16 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f6936aa
media-gfx/fbida: Version bump.
Package-Manager: Portage-2.3.3, Repoman-2.3.1
media-gfx/fbida/Manifest | 1 +
media-gfx/fbida/fbida-2.13.ebuild | 122 ++++++++++++++++++++++++
media-gfx/fbida/files/fbida-2.13-Autoconf.patch | 11 +++
3 files changed, 134 insertions(+)
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index eecae916b3..8dd1304765 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,2 +1,3 @@
DIST fbida-2.12.tar.gz 294842 SHA256 d33193105cce77057c919761728cee9bbe8ec8ec4f12a770a600cab33611822f SHA512 383eb766a98137f7252cd981d0e8c9a7382223705a43332f50990ea26763d4882ed1585e72fe9199528502d7f8f9de2e90718dbce71ee08d2181c74aa3e7e515 WHIRLPOOL 7ea067497eee03623fe8f07afbb77c354973187edd09f40b94d73d1b2d7c823db846c277005473c169cd1ad923e378d22d3c065f3522667e544d25917cd6495a
+DIST fbida-2.13.tar.gz 296020 SHA256 a887195dcd189055ee9b787eb03c8b7954df3aec540a1f90d8e92f873126db07 SHA512 a316776f381fac6ec6a5d085ece7a42e8e34b2c0f5ae1cc58ad5b5736dc83d8f2e7776779716abfc0ae9c51baacdf911df6a0be610d2b7b2e3ce6d0c81e1fdc3 WHIRLPOOL d94273ff9b631902d38fc1d65155fe18f50bca5055659bdc8bd945e68b913d1e65da4aa5b13358f9f4f662cee7199c92b244abdc9f89c127a74fce8e5beefabc
DIST ida.png.bz2 11928 SHA256 ce90c13f8da8d2ced4cf0e55d2f960bc236355f6e5dd60ea6c56fbe51e6cabae SHA512 cf3c1bc8d25fe75f10c0a0414b5c082348df2fa94864ec4537c36e0b357cf35b68e2eca205bbf48578a41c27317701aee621c6dd176e0bf3857c52f895d6bfd3 WHIRLPOOL 1b5e7835aa8a555a231ca58da8e249974639b29b1e15586c2d2d5a33e96908df1a3782fbe61d0c51dc888b7304c9f7541a96af4ca2b956b393909feb534ab5be
diff --git a/media-gfx/fbida/fbida-2.13.ebuild b/media-gfx/fbida/fbida-2.13.ebuild
new file mode 100644
index 0000000000..4de73bcf29
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.13.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)"
+HOMEPAGE="http://www.kraxel.org/blog/linux/fbida/"
+SRC_URI="
+ http://www.kraxel.org/releases/${PN}/${P}.tar.gz
+ mirror://gentoo/ida.png.bz2
+"
+LICENSE="GPL-2 IJG"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="curl fbcon ghostscript +gif lirc +png scanner +tiff X +webp"
+REQUIRED_USE="
+ ghostscript? ( tiff )
+"
+
+CDEPEND="
+ !media-gfx/fbi
+ app-text/poppler
+ >=media-libs/fontconfig-2.2
+ >=media-libs/freetype-2.0
+ media-libs/libepoxy
+ media-libs/libexif
+ media-libs/mesa
+ virtual/jpeg:*
+ virtual/ttf-fonts
+ x11-libs/cairo[opengl]
+ x11-libs/libdrm
+ curl? ( net-misc/curl )
+ gif? ( media-libs/giflib:= )
+ lirc? ( app-misc/lirc )
+ png? ( media-libs/libpng:* )
+ scanner? ( media-gfx/sane-backends )
+ tiff? ( media-libs/tiff:* )
+ webp? ( media-libs/libwebp )
+ X? (
+ >=x11-libs/motif-2.3:0
+ x11-libs/libX11
+ x11-libs/libXpm
+ x11-libs/libXt
+ )
+"
+
+DEPEND="
+ ${CDEPEND}
+ X? ( x11-proto/xextproto x11-proto/xproto )
+"
+
+RDEPEND="
+ ${CDEPEND}
+ ghostscript? (
+ app-text/ghostscript-gpl
+ )
+"
+PATCHES=(
+ "${FILESDIR}"/ida-desktop.patch
+ "${FILESDIR}"/${PN}-2.10-giflib-4.2.patch
+ "${FILESDIR}"/${PN}-2.10-fprintf-format.patch
+ "${FILESDIR}"/${PN}-2.13-Autoconf.patch
+)
+
+src_configure() {
+ tc-export CC CPP
+
+ # Let autoconf do its job and then fix things to build fbida
+ # according to our specifications
+ emake Make.config
+
+ gentoo_fbida() {
+ local useflag=${1}
+ local config=${2}
+
+ local option="no"
+ use ${useflag} && option="yes"
+
+ sed -i \
+ -e "s|HAVE_${config}.*|HAVE_${config} := ${option}|" \
+ "${S}/Make.config" || die
+ }
+
+ gentoo_fbida X MOTIF
+ gentoo_fbida curl LIBCURL
+ gentoo_fbida fbcon LINUX_FB_H
+ gentoo_fbida gif LIBUNGIF
+ gentoo_fbida lirc LIBLIRC
+ gentoo_fbida ghostscript LIBTIFF
+ gentoo_fbida png LIBPNG
+ gentoo_fbida scanner LIBSANE
+ gentoo_fbida tiff LIBTIFF
+ gentoo_fbida webp LIBWEBP
+}
+
+src_compile() {
+ emake verbose=yes
+}
+
+src_install() {
+ emake \
+ DESTDIR="${D}" \
+ STRIP="" \
+ prefix=/usr \
+ install
+
+ dodoc README
+
+ if use fbcon && ! use ghostscript; then
+ rm \
+ "${D}"/usr/bin/fbgs \
+ "${D}"/usr/share/man/man1/fbgs.1 \
+ || die
+ fi
+
+ if use X ; then
+ doicon "${WORKDIR}"/ida.png
+ domenu desktop/ida.desktop
+ fi
+}
diff --git a/media-gfx/fbida/files/fbida-2.13-Autoconf.patch b/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
new file mode 100644
index 0000000000..41c4e2f7d9
--- /dev/null
+++ b/media-gfx/fbida/files/fbida-2.13-Autoconf.patch
@@ -0,0 +1,11 @@
+--- a/mk/Autoconf.mk
++++ b/mk/Autoconf.mk
+@@ -162,7 +162,7 @@
+ @true
+
+ Make.config: $(srcdir)/GNUmakefile
+- @echo -e "$(make-config-q)" > $@
++ @printf "$(make-config-q)" > $@
+ @echo
+ @echo "Make.config written, edit if needed"
+ @echo
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/fbida/files/, media-gfx/fbida/
@ 2020-09-04 13:32 Jeroen Roovers
0 siblings, 0 replies; 4+ messages in thread
From: Jeroen Roovers @ 2020-09-04 13:32 UTC (permalink / raw
To: gentoo-commits
commit: 5009428af1da8292bce03582bed1935340bfa2e0
Author: Jeroen Roovers <jer <AT> gentoo <DOT> org>
AuthorDate: Fri Sep 4 13:26:44 2020 +0000
Commit: Jeroen Roovers <jer <AT> gentoo <DOT> org>
CommitDate: Fri Sep 4 13:32:47 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5009428a
media-gfx/fbida: Fix cpp call
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Closes: https://bugs.gentoo.org/740306
Signed-off-by: Jeroen Roovers <jer <AT> gentoo.org>
media-gfx/fbida/fbida-2.14.ebuild | 1 +
media-gfx/fbida/fbida-9999.ebuild | 3 ++-
media-gfx/fbida/files/fbida-2.14-cpp.patch | 6 ++++++
3 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/media-gfx/fbida/fbida-2.14.ebuild b/media-gfx/fbida/fbida-2.14.ebuild
index 9e5d00b136d..4547fdc995f 100644
--- a/media-gfx/fbida/fbida-2.14.ebuild
+++ b/media-gfx/fbida/fbida-2.14.ebuild
@@ -61,6 +61,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 1da49034956..ef3b13cbabc 100644
--- a/media-gfx/fbida/fbida-9999.ebuild
+++ b/media-gfx/fbida/fbida-9999.ebuild
@@ -6,7 +6,7 @@ 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
"
@@ -45,6 +45,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 00000000000..1e7635bbd2a
--- /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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-04 13:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-09-04 13:32 [gentoo-commits] repo/gentoo:master commit in: media-gfx/fbida/files/, media-gfx/fbida/ Jeroen Roovers
-- strict thread matches above, loose matches on Subject: below --
2017-02-24 15:06 Jeroen Roovers
2016-03-30 4:22 Jeroen Roovers
2016-01-24 16:06 Jeroen Roovers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox