Fix building with -Wl,--as-needed wrt #247731. Fix building with libpng14.

(Portage version: 2.2_rc66/cvs/Linux x86_64)

5 files changed, 56 insertions, 126 deletions

diff --git a/media-gfx/greycstoration/ChangeLog b/media-gfx/greycstoration/ChangeLog
index bf67acb82890..62615f7821f4 100644
--- a/media-gfx/greycstoration/ChangeLog
+++ b/media-gfx/greycstoration/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-gfx/greycstoration
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.5 2009/12/15 14:41:02 pva Exp $
+# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/ChangeLog,v 1.6 2010/03/10 15:18:00 ssuominen Exp $
+
+  10 Mar 2010; Samuli Suominen <ssuominen@gentoo.org>
+  greycstoration-2.9.ebuild, +files/greycstoration-2.9-libpng14.patch:
+  Fix building with -Wl,--as-needed wrt #247731. Fix building with libpng14.
 
   15 Dec 2009; Peter Volkov <pva@gentoo.org> metadata.xml:
   metadata.xml: put required herd tag.
diff --git a/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch b/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch
new file mode 100644
index 000000000000..e8c0276f8917
--- /dev/null
+++ b/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch
@@ -0,0 +1,22 @@
+http://repos.archlinux.org/wsvn/community/greycstoration/trunk/libpng14.patch
+
+--- CImg.h
++++ CImg.h
+@@ -25671,7 +25671,7 @@
+       png_read_info(png_ptr,info_ptr);
+       png_uint_32 W, H;
+       int bit_depth, color_type, interlace_type;
+-      png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,int_p_NULL,int_p_NULL);
++      png_get_IHDR(png_ptr,info_ptr,&W,&H,&bit_depth,&color_type,&interlace_type,NULL,NULL);
+       int new_bit_depth = bit_depth;
+       int new_color_type = color_type;
+ 
+@@ -25682,7 +25682,7 @@
+         new_bit_depth = 8;
+       }
+       if (new_color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8){
+-        png_set_gray_1_2_4_to_8(png_ptr);
++        png_set_expand_gray_1_2_4_to_8(png_ptr);
+         new_bit_depth = 8;
+       }
+       if (png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS))
diff --git a/media-gfx/greycstoration/greycstoration-1.2.7.ebuild b/media-gfx/greycstoration/greycstoration-1.2.7.ebuild
deleted file mode 100644
index 1585c8687d40..000000000000
--- a/media-gfx/greycstoration/greycstoration-1.2.7.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-1.2.7.ebuild,v 1.1 2008/02/25 23:18:31 calchan Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
-HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
-SRC_URI="mirror://sourceforge/cimg/CImg-${PV}.tar.gz"
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw imagemagick jpeg lapack png tiff X"
-
-DEPEND="fftw? ( >=sci-libs/fftw-3 )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	lapack? ( virtual/lapack )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr )"
-
-S="${WORKDIR}/CImg-${PV}/examples"
-
-src_compile() {
-	local MY_CONF
-
-	use X && MY_CONF+=" -lX11 -Dcimg_use_xshm -lXext -Dcimg_use_xrandr -lXrandr"
-	use png && MY_CONF+=" -Dcimg_use_png -lpng -lz"
-	use jpeg && MY_CONF+=" -Dcimg_use_jpeg -ljpeg"
-	use tiff && MY_CONF+=" -Dcimg_use_tiff -ltiff"
-	use imagemagick && MY_CONF+=" -Dcimg_use_magick $(Magick++-config --cppflags) \
-		$(Magick++-config --ldflags) $(Magick++-config --libs)"
-	use fftw && MY_CONF+=" -Dcimg_use_fftw3 -lfftw3"
-	use lapack && MY_CONF+=" -Dcimg_use_lapack -llapack"
-
-	$(tc-getCXX) -o greycstoration greycstoration.cpp \
-		${MY_CONF} -lm -lpthread \
-		${CXXFLAGS} ${LDFLAGS} \
-		|| die "Compilation failed"
-}
-
-src_install() {
-	dobin greycstoration
-}
diff --git a/media-gfx/greycstoration/greycstoration-2.8.ebuild b/media-gfx/greycstoration/greycstoration-2.8.ebuild
deleted file mode 100644
index 08645cf4cbb0..000000000000
--- a/media-gfx/greycstoration/greycstoration-2.8.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.8.ebuild,v 1.2 2008/05/30 11:13:08 calchan Exp $
-
-inherit toolchain-funcs
-
-DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
-HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
-SRC_URI="mirror://sourceforge/cimg/GREYCstoration-${PV}.zip"
-LICENSE="CeCILL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw imagemagick jpeg lapack png tiff X"
-
-RDEPEND="fftw? ( >=sci-libs/fftw-3 )
-	imagemagick? ( media-gfx/imagemagick )
-	jpeg? ( media-libs/jpeg )
-	lapack? ( virtual/lapack )
-	png? ( media-libs/libpng )
-	tiff? ( media-libs/tiff )
-	X? ( x11-libs/libX11
-		x11-libs/libXext
-		x11-libs/libXrandr )"
-DEPEND="${RDEPEND}
-	app-arch/unzip"
-
-S="${WORKDIR}/GREYCstoration-${PV}/src"
-
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:../CImg.h:CImg.h:" "${S}"/greycstoration.cpp || die "sed failed"
-}
-
-src_compile() {
-	local MY_CONF
-
-	use X && MY_CONF+=" -lX11 -Dcimg_use_xshm -lXext -Dcimg_use_xrandr -lXrandr"
-	use png && MY_CONF+=" -Dcimg_use_png -lpng -lz"
-	use jpeg && MY_CONF+=" -Dcimg_use_jpeg -ljpeg"
-	use tiff && MY_CONF+=" -Dcimg_use_tiff -ltiff"
-	use imagemagick && MY_CONF+=" -Dcimg_use_magick $(Magick++-config --cppflags) \
-		$(Magick++-config --ldflags) $(Magick++-config --libs)"
-	use fftw && MY_CONF+=" -Dcimg_use_fftw3 -lfftw3"
-	use lapack && MY_CONF+=" -Dcimg_use_lapack -llapack"
-
-	$(tc-getCXX) -o greycstoration greycstoration.cpp \
-		${MY_CONF} -lm -lpthread \
-		${CXXFLAGS} ${LDFLAGS} \
-		|| die "Compilation failed"
-}
-
-src_install() {
-	dobin greycstoration
-}
diff --git a/media-gfx/greycstoration/greycstoration-2.9.ebuild b/media-gfx/greycstoration/greycstoration-2.9.ebuild
index 0e537639245a..2b1d621b464a 100644
--- a/media-gfx/greycstoration/greycstoration-2.9.ebuild
+++ b/media-gfx/greycstoration/greycstoration-2.9.ebuild
@@ -1,12 +1,14 @@
-# Copyright 1999-2008 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/greycstoration/greycstoration-2.9.ebuild,v 1.1 2008/08/30 22:28:00 calchan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/greycstoration/greycstoration-2.9.ebuild,v 1.2 2010/03/10 15:18:00 ssuominen Exp $
 
-inherit toolchain-funcs
+EAPI=2
+inherit eutils toolchain-funcs
 
 DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing"
 HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/"
 SRC_URI="mirror://sourceforge/cimg/GREYCstoration-${PV}.zip"
+
 LICENSE="CeCILL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
@@ -24,31 +26,34 @@ RDEPEND="fftw? ( >=sci-libs/fftw-3 )
 DEPEND="${RDEPEND}
 	app-arch/unzip"
 
-S="${WORKDIR}/GREYCstoration-${PV}/src"
+S=${WORKDIR}/GREYCstoration-${PV}/src
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-libpng14.patch
 
-src_unpack() {
-	unpack ${A}
-	sed -i -e "s:../CImg.h:CImg.h:" "${S}"/greycstoration.cpp || die "sed failed"
+	sed -i \
+		-e "s:../CImg.h:CImg.h:" \
+		greycstoration.cpp || die
 }
 
 src_compile() {
-	local MY_CONF
-
-	use X && MY_CONF+=" -lX11 -Dcimg_use_xshm -lXext -Dcimg_use_xrandr -lXrandr"
-	use png && MY_CONF+=" -Dcimg_use_png -lpng -lz"
-	use jpeg && MY_CONF+=" -Dcimg_use_jpeg -ljpeg"
-	use tiff && MY_CONF+=" -Dcimg_use_tiff -ltiff"
-	use imagemagick && MY_CONF+=" -Dcimg_use_magick $(Magick++-config --cppflags) \
-		$(Magick++-config --ldflags) $(Magick++-config --libs)"
-	use fftw && MY_CONF+=" -Dcimg_use_fftw3 -lfftw3"
-	use lapack && MY_CONF+=" -Dcimg_use_lapack -llapack"
-
-	$(tc-getCXX) -o greycstoration greycstoration.cpp \
-		${MY_CONF} -lm -lpthread \
-		${CXXFLAGS} ${LDFLAGS} -fno-tree-pre \
-		|| die "Compilation failed"
+	local myconf
+
+	use X && myconf+=" -Dcimg_use_xshm -Dcimg_use_xrandr -lX11 -lXext -lXrandr"
+	use png && myconf+=" -Dcimg_use_png -lpng -lz"
+	use jpeg && myconf+=" -Dcimg_use_jpeg -ljpeg"
+	use tiff && myconf+=" -Dcimg_use_tiff -ltiff"
+	use imagemagick && myconf+=" -Dcimg_use_magick $(Magick++-config --cppflags)
+		$(Magick++-config --libs)"
+	use fftw && myconf+=" -Dcimg_use_fftw3 -lfftw3"
+	use lapack && myconf+=" -Dcimg_use_lapack -llapack"
+
+	$(tc-getCXX) ${LDFLAGS} ${CXXFLAGS} -fno-tree-pre \
+		-o greycstoration greycstoration.cpp \
+		${myconf} -lm -lpthread \
+		|| die
 }
 
 src_install() {
-	dobin greycstoration
+	dobin greycstoration || die
 }