From: "Samuli Suominen (ssuominen)" <ssuominen@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-gfx/fbv: ChangeLog fbv-1.0b.ebuild
Date: Wed, 14 Sep 2011 11:31:48 +0000 (UTC) [thread overview]
Message-ID: <20110914113148.D34E72004C@flycatcher.gentoo.org> (raw)
ssuominen 11/09/14 11:31:48
Modified: ChangeLog fbv-1.0b.ebuild
Log:
Fix building with libpng15 wrt #381413 by Diego Elio Pettenò
(Portage version: 2.2.0_alpha55/cvs/Linux x86_64)
Revision Changes Path
1.20 media-gfx/fbv/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/ChangeLog?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/ChangeLog?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/ChangeLog?r1=1.19&r2=1.20
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ChangeLog 20 Jul 2011 14:32:29 -0000 1.19
+++ ChangeLog 14 Sep 2011 11:31:48 -0000 1.20
@@ -1,6 +1,10 @@
# ChangeLog for media-gfx/fbv
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.19 2011/07/20 14:32:29 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/ChangeLog,v 1.20 2011/09/14 11:31:48 ssuominen Exp $
+
+ 14 Sep 2011; Samuli Suominen <ssuominen@gentoo.org> fbv-1.0b.ebuild,
+ +files/fbv-1.0b-libpng15.patch:
+ Fix building with libpng15 wrt #381413 by Diego Elio Pettenò
20 Jul 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
Drop maintainer due retirement, bug #34534
1.15 media-gfx/fbv/fbv-1.0b.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild?rev=1.15&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild?rev=1.15&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild?r1=1.14&r2=1.15
Index: fbv-1.0b.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- fbv-1.0b.ebuild 26 Feb 2011 17:08:40 -0000 1.14
+++ fbv-1.0b.ebuild 14 Sep 2011 11:31:48 -0000 1.15
@@ -1,8 +1,9 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.14 2011/02/26 17:08:40 signals Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbv/fbv-1.0b.ebuild,v 1.15 2011/09/14 11:31:48 ssuominen Exp $
-inherit toolchain-funcs eutils
+EAPI=4
+inherit eutils toolchain-funcs
DESCRIPTION="simple program to view pictures on a linux framebuffer device"
HOMEPAGE="http://freshmeat.net/projects/fbv/"
@@ -13,33 +14,39 @@
KEYWORDS="~amd64 arm ~ppc ppc64 sh x86"
IUSE="gif jpeg png"
-DEPEND="gif? ( media-libs/giflib )
+RDEPEND="gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg )
png? ( media-libs/libpng )"
+DEPEND="${RDEPEND}"
-src_unpack() {
- unpack ${A}
- cd "${S}"
- epatch "${FILESDIR}"/oob-segfault-fbv-${PV}.diff
- sed -e 's/-lungif/-lgif/g' -i Makefile -i configure
+src_prepare() {
+ epatch \
+ "${FILESDIR}"/oob-segfault-fbv-${PV}.diff \
+ "${FILESDIR}"/${P}-libpng15.patch
+
+ sed -i -e 's:-lungif:-lgif:g' configure Makefile || die
}
-src_compile() {
- local myconf=""
- myconf="${myconf} --without-bmp"
+src_configure() {
+ local myconf="--without-bmp"
+
use png || myconf="${myconf} --without-libpng"
use gif || myconf="${myconf} --without-libungif"
use jpeg || myconf="${myconf} --without-libjpeg"
+
./configure \
--prefix=/usr \
--mandir=/usr/share/man \
--infodir=/usr/share/info \
- ${myconf} || die "configure failed"
- emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}" || die "emake failed"
+ ${myconf} || die
+}
+
+src_compile() {
+ emake CC="$(tc-getCC)" CFLAGS="${CFLAGS}"
}
src_install() {
- dobin fbv || die "dobin failed"
+ dobin fbv
doman fbv.1
dodoc ChangeLog README TODO VERSION
}
next reply other threads:[~2011-09-14 11:31 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-14 11:31 Samuli Suominen (ssuominen) [this message]
-- strict thread matches above, loose matches on Subject: below --
2011-02-26 17:08 [gentoo-commits] gentoo-x86 commit in media-gfx/fbv: ChangeLog fbv-1.0b.ebuild Kevin McCarthy (signals)
2010-02-16 4:12 Steve Dibb (beandog)
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110914113148.D34E72004C@flycatcher.gentoo.org \
--to=ssuominen@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox