Update internal libjpeg headers to 8a wrt #307923, thanks to Rob Wallace for reporting.

Package-Manager: portage-2.2_rc63/cvs/Linux x86_64

3 files changed, 114 insertions, 3 deletions

diff --git a/media-gfx/fbida/ChangeLog b/media-gfx/fbida/ChangeLog
index 85e945a43e0f..c85f1b853465 100644
--- a/media-gfx/fbida/ChangeLog
+++ b/media-gfx/fbida/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-gfx/fbida
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.68 2009/12/26 17:37:12 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/ChangeLog,v 1.69 2010/03/05 19:08:27 ssuominen Exp $
+
+*fbida-2.07-r2 (05 Mar 2010)
+
+  05 Mar 2010; Samuli Suominen <ssuominen@gentoo.org> +fbida-2.07-r2.ebuild:
+  Update internal libjpeg headers to 8a wrt #307923, thanks to Rob Wallace
+  for reporting.
 
   26 Dec 2009; Peter Volkov <pva@gentoo.org> fbida-2.07-r1.ebuild:
   virtual/ghostscript->app-text/ghostscript-gpl: ghostscript-gpl is the only
diff --git a/media-gfx/fbida/Manifest b/media-gfx/fbida/Manifest
index 03d207137ecc..2d6d3f424e71 100644
--- a/media-gfx/fbida/Manifest
+++ b/media-gfx/fbida/Manifest
@@ -1,7 +1,9 @@
 AUX ida-desktop.patch 453 RMD160 389f2b32fc2154a7c120447a72793a3b748cb59b SHA1 d06b70f2d581a1a3e9e0909b5af7f3f71ed54717 SHA256 51dabac02c6326e7f2d28db304f0b481cbcef7371807eb93618b2b5eb0104907
 AUX ida.png 11458 RMD160 3ebfaba3ae9219c3c840f5aa2a4be04065f28f49 SHA1 97da34d4e72ed004280d8c8416b2be5efb666c66 SHA256 57a21e900eb13c1a2b2d25e1dd78693e4fcf9fb86eef1138bf750f8a45819993
 DIST fbida-2.07-jpeg-7.patch.bz2 14334 RMD160 8dd34aa36ce6e8ba5d22ad93f15f15a049a91b39 SHA1 8745d82349df3c80bc3d3480e186b496fd9ae9c2 SHA256 5d464561f9259885bfcd6e66908283dd764585d13cf6dc378d9e08ffac34b32f
+DIST fbida-2.07-libjpeg-8a.patch.bz2 16001 RMD160 2cbb3c588259b2e41e696ad65ce715034acce92d SHA1 42f36ab3a73dcbc8dc929e4addbf72c81118561c SHA256 51f86a08161b6db7b88000d7c34e3d77d856b07d7b6757cb78161492a11d4d04
 DIST fbida-2.07.tar.gz 213622 RMD160 edd9174468e7c7e43b70b0364ac72655415b0c83 SHA1 4758178299e09d5251b9cf20337a81cc20553d45 SHA256 6510dee7c4f45cb63094d540e66aa39d53215c59f46944b8bb050c26b71bdb44
 EBUILD fbida-2.07-r1.ebuild 2490 RMD160 de038b8b27b6a00704d685bf5946abd4cd9ded09 SHA1 64384bb323f2f1d39ec8664cee3b830e5d139377 SHA256 2db8d30094c78c724d470a7e46ca5e539c0dd194d6107943e9919fecc762b063
-MISC ChangeLog 8600 RMD160 12ec1356cbe6a41ee93fb9ad24f87dc0f3b8f87a SHA1 9f3dabf7ec5d25bf6dc060c5333e556aebea04a6 SHA256 e3d7a0e4239048aee82412506b28806ef9906e2c1dd753c4699abf40d9bcabb5
+EBUILD fbida-2.07-r2.ebuild 2524 RMD160 502069377858cdd7a4fda5431ec738c295ba566c SHA1 32adc74a4d1a21d24aca7ad47daeeed7f4f53f3c SHA256 a0af78fd4f7225ecdd475649cbefd4932b7f72cf3c0952ed37d3e2c24e2b7c1e
+MISC ChangeLog 8806 RMD160 1e026ec80eb717baec0ea01eead1ae9790b85779 SHA1 3ae7295c5cc8e70b62d40b3c7ac413c9f68a11f0 SHA256 a673f64ad2fdc767b0d764548da061d012bd249fb0f7c1302357b5587a304bb5
 MISC metadata.xml 221 RMD160 90fef1dff5d0b3945073e90bb7ffec583ff1bbe8 SHA1 f35d1b1858e1223f4dc7b2c03fdf17e50091f1ca SHA256 fd573abb9cf89f320d00d1c107a25a46a5dfba633087d4179d0b8bd9aa539c8e
diff --git a/media-gfx/fbida/fbida-2.07-r2.ebuild b/media-gfx/fbida/fbida-2.07-r2.ebuild
new file mode 100644
index 000000000000..d81305c5f5a6
--- /dev/null
+++ b/media-gfx/fbida/fbida-2.07-r2.ebuild
@@ -0,0 +1,103 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/fbida/fbida-2.07-r2.ebuild,v 1.1 2010/03/05 19:08:27 ssuominen Exp $
+
+inherit eutils toolchain-funcs
+
+DESCRIPTION="Image viewers for the framebuffer console (fbi) and X11 (ida)."
+HOMEPAGE="http://linux.bytesex.org/fbida/"
+SRC_URI="http://dl.bytesex.org/releases/${PN}/${P}.tar.gz
+	http://dev.gentoo.org/~ssuominen/${P}-libjpeg-8a.patch.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="curl fbcon gif imagemagick lirc pdf png scanner tiff X"
+
+RDEPEND="png? ( media-libs/libpng )
+	gif? ( media-libs/giflib )
+	pdf? ( app-text/ghostscript-gpl media-libs/tiff )
+	tiff? ( media-libs/tiff )
+	curl? ( net-misc/curl )
+	lirc? ( app-misc/lirc )
+	imagemagick? ( media-gfx/imagemagick )
+	scanner? ( media-gfx/sane-backends )
+	X? ( x11-libs/libX11
+		x11-libs/libXt
+		x11-libs/libXpm
+		x11-libs/openmotif
+	)
+	!media-gfx/fbi
+	>=media-libs/jpeg-8a
+	media-libs/libexif
+	>=media-libs/freetype-2.0
+	>=media-libs/fontconfig-2.2
+	media-fonts/ttf-bitstream-vera"
+
+DEPEND="${RDEPEND}
+	X? ( x11-proto/xextproto x11-proto/xproto )"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -e 's/DGifOpenFileName,ungif/DGifOpenFileName,gif/' \
+		-e 's/-lungif/-lgif/' -i "${S}/GNUmakefile"
+
+	if [[ `gcc-major-version` -lt 4 ]]; then
+		sed	-e 's/-Wno-pointer-sign//' -i "${S}/GNUmakefile"
+	fi
+
+	epatch "${FILESDIR}/ida-desktop.patch"
+	epatch "${WORKDIR}/fbida-2.07-libjpeg-8a.patch"
+}
+
+src_compile() {
+	# Let autoconf do its job and then fix things to build fbida
+	# according to our specifications
+	emake Make.config || die
+
+	set_feat() {
+		local useflag=${1}
+		local config=${2}
+
+		local option="yes"
+		if ! use ${useflag}; then
+			option="no"
+		fi
+
+		sed -e "s/${config}.*/${config} := ${option}/" -i "${S}/Make.config"
+	}
+
+	set_feat fbcon 	HAVE_LINUX_FB_H
+	set_feat X 		HAVE_MOTIF
+	set_feat tiff 	HAVE_LIBTIFF
+
+	# The 'pdf' flag forces the use of libtiff.
+	set_feat pdf	HAVE_LIBTIFF
+	set_feat png 	HAVE_LIBPNG
+	set_feat gif 	HAVE_LIBUNGIF
+	set_feat lirc 	HAVE_LIBLIRC
+	set_feat curl 	HAVE_LIBCURL
+	set_feat scanner HAVE_LIBSANE
+	set_feat imagemagick HAVE_LIBMAGICK
+
+	emake || die
+}
+
+src_install() {
+	make \
+		DESTDIR="${D}" \
+		STRIP="" \
+		prefix=/usr \
+		install || die
+	dodoc README
+
+	if ! use pdf; then
+		rm -f "${D}"/usr/bin/fbgs "${D}"/usr/share/man/man1/fbgs.1
+	fi
+
+	if use X ; then
+		doicon "${FILESDIR}/ida.png"
+		domenu desktop/ida.desktop
+	fi
+}