From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1RDjHb-000705-23 for garchives@archives.gentoo.org; Tue, 11 Oct 2011 20:50:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7A8E721C031; Tue, 11 Oct 2011 20:50:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 31FB521C02B for ; Tue, 11 Oct 2011 20:50:26 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 987FE1B4028 for ; Tue, 11 Oct 2011 20:50:25 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id E0F5A80042 for ; Tue, 11 Oct 2011 20:50:24 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <31f73020c2fad31dd8beb989bcaeb20915761549.jlec@gentoo> Subject: [gentoo-commits] proj/sci:master commit in: sci-chemistry/coot/files/, sci-chemistry/coot/ X-VCS-Repository: proj/sci X-VCS-Files: sci-chemistry/coot/ChangeLog sci-chemistry/coot/coot-9999.ebuild sci-chemistry/coot/files/9999-libpng-1.5.patch X-VCS-Directories: sci-chemistry/coot/files/ sci-chemistry/coot/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: 31f73020c2fad31dd8beb989bcaeb20915761549 Date: Tue, 11 Oct 2011 20:50:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 10021ac1e32f0c67f53d27bcb2d0eef5 commit: 31f73020c2fad31dd8beb989bcaeb20915761549 Author: Justin Lecher gentoo org> AuthorDate: Thu Oct 6 20:42:07 2011 +0000 Commit: Justin Lecher gentoo org> CommitDate: Thu Oct 6 20:42:07 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/sci.git;a=3Dc= ommit;h=3D31f73020 Add png15 support and don't build static libs (Portage version: 2.2.0_alpha62/git/Linux x86_64, signed Manifest commit = with key 70EB7916) --- sci-chemistry/coot/ChangeLog | 4 +++ sci-chemistry/coot/coot-9999.ebuild | 2 + sci-chemistry/coot/files/9999-libpng-1.5.patch | 29 ++++++++++++++++++= ++++++ 3 files changed, 35 insertions(+), 0 deletions(-) diff --git a/sci-chemistry/coot/ChangeLog b/sci-chemistry/coot/ChangeLog index 7f7c6e4..164b64e 100644 --- a/sci-chemistry/coot/ChangeLog +++ b/sci-chemistry/coot/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 06 Oct 2011; Justin Lecher +files/9999-libpng-1.5.pa= tch, + coot-9999.ebuild: + Add png15 support and don't build static libs + 16 Jul 2011; Justin Lecher +files/9999-ssm.patch, coot-9999.ebuild: Adopt to unbundled ssm diff --git a/sci-chemistry/coot/coot-9999.ebuild b/sci-chemistry/coot/coo= t-9999.ebuild index 93859d2..c3f3455 100644 --- a/sci-chemistry/coot/coot-9999.ebuild +++ b/sci-chemistry/coot/coot-9999.ebuild @@ -84,6 +84,7 @@ PATCHES=3D( "${FILESDIR}"/${PV}-mmdb-config.patch "${FILESDIR}"/${PV}-test.patch "${FILESDIR}"/${PV}-ssm.patch + "${FILESDIR}"/${PV}-libpng-1.5.patch ) =20 src_unpack() { @@ -109,6 +110,7 @@ src_configure() { # All the --with's are used to activate various parts. # Yes, this is broken behavior. econf \ + --disable-static \ --includedir=3D'${prefix}/include/coot' \ --with-gtkcanvas-prefix=3D"${EPREFIX}/usr" \ --with-gtkgl-prefix=3D"${EPREFIX}/usr" \ diff --git a/sci-chemistry/coot/files/9999-libpng-1.5.patch b/sci-chemist= ry/coot/files/9999-libpng-1.5.patch new file mode 100644 index 0000000..bddd251 --- /dev/null +++ b/sci-chemistry/coot/files/9999-libpng-1.5.patch @@ -0,0 +1,29 @@ +--- ccp4mg-utils/ppmutil.cc ++++ ccp4mg-utils/ppmutil.cc +@@ -2494,15 +2494,21 @@ +=20 + pixels =3D new unsigned char[width*height*colourspace]; +=20 ++ png_colorp palette; ++ int num_trans; ++#if PNG_LIBPNG_VER_MAJOR >=3D 1 && PNG_LIBPNG_VER_MINOR >=3D4 ++ png_bytep trans_alpha; ++#endif ++ + for (int i=3D0; ipalette[= row_pointers[i][j]].red; +- pixels[i*width*colourspace+j*colourspace+1] =3D png_ptr->palett= e[row_pointers[i][j]].green; +- pixels[i*width*colourspace+j*colourspace+2] =3D png_ptr->palett= e[row_pointers[i][j]].blue; +- if(row_pointers[i][j]num_trans){ ++ pixels[i*width*colourspace+j*colourspace] =3D palette[row_point= ers[i][j]].red; ++ pixels[i*width*colourspace+j*colourspace+1] =3D palette[row_poi= nters[i][j]].green; ++ pixels[i*width*colourspace+j*colourspace+2] =3D palette[row_poi= nters[i][j]].blue; ++ if(row_pointers[i][j]=3D 1 && PNG_LIBPNG_VER_MINOR >=3D4 +- pixels[i*width*colourspace+j*colourspace+3] =3D png_ptr->trans= _alpha[row_pointers[i][j]]; ++ pixels[i*width*colourspace+j*colourspace+3] =3D trans_alpha[ro= w_pointers[i][j]]; + #else + pixels[i*width*colourspace+j*colourspace+3] =3D png_ptr->trans= [row_pointers[i][j]]; + #endif