summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-02-18 22:07:10 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-02-18 22:07:10 +0000
commit309756e07bd2c3e19f10de6f8c8545cab3aef4a3 (patch)
tree01cdfc52b560c5caf661bccd65d4d16c6d240bb9 /media-gfx/freepv
parentMoved in from sci overlay (diff)
downloadgentoo-2-309756e07bd2c3e19f10de6f8c8545cab3aef4a3.tar.gz
gentoo-2-309756e07bd2c3e19f10de6f8c8545cab3aef4a3.tar.bz2
gentoo-2-309756e07bd2c3e19f10de6f8c8545cab3aef4a3.zip
Fix building with jpeg-8 by renaming jpeg_mem_src to freepv_jpeg_mem_src since jpeg has it's own.
(Portage version: 2.2_rc62/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/freepv')
-rw-r--r--media-gfx/freepv/ChangeLog9
-rw-r--r--media-gfx/freepv/freepv-0.3.0-r1.ebuild7
2 files changed, 12 insertions, 4 deletions
diff --git a/media-gfx/freepv/ChangeLog b/media-gfx/freepv/ChangeLog
index 358a5832dbd7..0193d03d68bf 100644
--- a/media-gfx/freepv/ChangeLog
+++ b/media-gfx/freepv/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for media-gfx/freepv
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.5 2009/09/29 09:25:14 maekke Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/ChangeLog,v 1.6 2010/02/18 22:07:10 ssuominen Exp $
+
+ 18 Feb 2010; Samuli Suominen <ssuominen@gentoo.org>
+ freepv-0.3.0-r1.ebuild:
+ Fix building with jpeg-8 by renaming jpeg_mem_src to freepv_jpeg_mem_src
+ since jpeg has it's own.
29 Sep 2009; Markus Meier <maekke@gentoo.org> freepv-0.3.0-r1.ebuild:
amd64/x86 stable, bug #286347
diff --git a/media-gfx/freepv/freepv-0.3.0-r1.ebuild b/media-gfx/freepv/freepv-0.3.0-r1.ebuild
index 09b20c7571dc..89ed328a1de8 100644
--- a/media-gfx/freepv/freepv-0.3.0-r1.ebuild
+++ b/media-gfx/freepv/freepv-0.3.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r1.ebuild,v 1.2 2009/09/29 09:25:14 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/freepv/freepv-0.3.0-r1.ebuild,v 1.3 2010/02/18 22:07:10 ssuominen Exp $
EAPI=2
@@ -31,6 +31,9 @@ S=${WORKDIR}/${P/_beta?/}
src_prepare() {
epatch "${FILESDIR}"/${P}-gcc44.patch
epatch "${FILESDIR}"/${P}-xulrunner-1.9.1.patch
+ sed -i \
+ -e 's:jpeg_mem_src:freepv_jpeg_mem_src:g' \
+ src/libfreepv/JpegReader.cpp || die
}
src_install() {