From: Samuli Suominen Date: Tue, 10 Jan 2012 18:53:49 +0000 (+0000) Subject: Insert -llzma to the Libs.private: -line in the libtiff-4.pc for static linking wrt... X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=6604759036306309f592d7221efbe043c45df299;p=gentoo.git Insert -llzma to the Libs.private: -line in the libtiff-4.pc for static linking wrt #396531 by Alan Hourihane Package-Manager: portage-2.2.0_alpha84/cvs/Linux x86_64 --- diff --git a/media-libs/tiff/ChangeLog b/media-libs/tiff/ChangeLog index eb96f88fd7c9..09cea1a8e624 100644 --- a/media-libs/tiff/ChangeLog +++ b/media-libs/tiff/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for media-libs/tiff -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.178 2011/12/30 12:11:10 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/ChangeLog,v 1.179 2012/01/10 18:53:49 ssuominen Exp $ + +*tiff-4.0.0-r1 (10 Jan 2012) + + 10 Jan 2012; Samuli Suominen +tiff-4.0.0-r1.ebuild, + +files/tiff-4.0.0-missing_lzma_pkgconfig.patch: + Insert -llzma to the Libs.private: -line in the libtiff-4.pc for static + linking wrt #396531 by Alan Hourihane 30 Dec 2011; Samuli Suominen -files/tiff-3.9.2-CVE-2009-2347.patch, -tiff-4.0.0_beta7.ebuild: diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest index fd56f8c72b6a..8468fb057249 100644 --- a/media-libs/tiff/Manifest +++ b/media-libs/tiff/Manifest @@ -1,21 +1,23 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 +AUX tiff-4.0.0-missing_lzma_pkgconfig.patch 685 RMD160 0a32e33a98ff185d811edd02c5e87b14f6c44f98 SHA1 e301a3101b9e2db46cefef47312b60a53fe6524b SHA256 9cbb63df6c1acaf91847c057bc1767a1dd8c9d55ddf754ef3d4782fd2327e804 DIST tiff-3.9.5.tar.gz 1455502 RMD160 c67742bf6b9b10ca0700e69ce575007d40c4f89c SHA1 f40aab20fb2f609b5cbc1171c40b66a1445e3773 SHA256 ecf2e30582698dbc61d269203bbd1e701a1a50fb26c87d709e10d89669badb33 DIST tiff-4.0.0.tar.gz 2008075 RMD160 82b27f00b48c74970faac6a4bb4a8a49a199e3b1 SHA1 85d85520fea40fc9291995a60e3d40cf980b5522 SHA256 9f4c0b2a8446a259db431c6401342bcb2c1be4a604e77a532d109c8448619288 EBUILD tiff-3.9.5-r1.ebuild 1325 RMD160 e66673e83d6c35b1c5a3f748c09e16455a03cf48 SHA1 870a50821cf8af8cb7edaf47489055ab6c93ee42 SHA256 1216172ce9de0ac68618dd5d998548c2850af50315b039480d85a417c15e045d EBUILD tiff-3.9.5.ebuild 1535 RMD160 c1721defb89f93aaa216abf22abad474f9ba4240 SHA1 9acb6a00732c81ae7a8d04ffc7bc639e07247c77 SHA256 07ef04430a12fd8e7cc17bb36437d8fd35aefba712d8c210bb77f7443392a621 +EBUILD tiff-4.0.0-r1.ebuild 1444 RMD160 92a439f68752c20a74172cbf31805157e55b1a2b SHA1 68798b84eebbb7dd17f619998d5ad2bdb03613c8 SHA256 05a61ceca85ba45105386ae530ea0af1b96e15fd75a6a5697a70a284b192eaa3 EBUILD tiff-4.0.0.ebuild 1370 RMD160 9d34686c672dac661f31a3a13981b9733900c878 SHA1 999bdd74306d209a5b88980b91867391d9cd98a2 SHA256 ffc1ae9fb004db7cb602ea7e6925c229eb552f2e0e8b7a98bab0ff32b56e2abb -MISC ChangeLog 24903 RMD160 214b44a6f59401b1e39c7d689b6d9cdc9ad06bfc SHA1 6b1a0b53eb80c4c7bafb5022188f238e0580a419 SHA256 a46455806da4cf0934fed2e69bc10d46b8a0bbf7382b3173c98c04731e04b1b9 +MISC ChangeLog 25175 RMD160 13cbdca63a434b8cadb2a8e4b6f7191223bcc458 SHA1 f6d9018862bd9dc3b02b95cd98941f8de372e6cd SHA256 55dee4e9f4afc14305de92380f31857db1538ae6df9650d0d5bbdfaa7a1a75fa MISC metadata.xml 448 RMD160 0419f91f1f20efdc94d3894f6a4fc6471f22d0a1 SHA1 d743d16f4afb124bbe57a45b217b92f71b515f20 SHA256 61b04082cf0ccec1f58146fab271f88e56009277edee28b3f297eafb0562f4c9 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJO/aoDAAoJEEdUh39IaPFNHegH/iHWmfF8wQosbt6zusdDTlre -JCuCXiU0ses3VP5SaptuY4VmhONNeB78UYN3HF2iaYY3k52+aSxA4adbLJa+1gD5 -sPBslQGPrGPqaLF6jP1TW0qDHsZ6vzre2m3/7ypKqa9zHYv/IIMJE0ZoALU+df3P -QTCAqesGfXdrxY5zUyuSmjdS07taS6hEatGUILw5lyOwU+ow41ngzlYviYn+pwUd -N/RZPdyBXy24tWcCUD1rrvf5aPxVnEoUhNaqVDvevZHXZXJNJcNvmggd3EUuJjdB -ekwhHqMdpdhK65kqxfLcAVPYoqzaTckyJBWWn+0o6WG0cz8Ci1MtW3H6NiJVWDU= -=eK4I +iQEcBAEBAgAGBQJPDIjjAAoJEEdUh39IaPFN5CAH/0IkOEFFbqemMAs/WYF1oCtF +Fu+bWei7Tae2mj/SG0BGWozEMcbYXHYuL6pHS5g6C+cU39Km4OyYJ9vdleclQXo8 +Cbo4c5pujP7A5b9O1bjTmPcyQl63bodM/6Mz5Uz8hd9jQe0gqiWGQ7SK41xcVILp +5YMApKEH3iLa4OFOSsgmLRqYt/FPsrdIDilHjMEIMf5YEdOghXxRfiyI2vTbZ5NL +TOJNkcgJM3hn5X8J8edRYSgwDOaLuCg4yETfX9ZcS4vicK3ON8LHXdN2yGwapwKJ +7lvbRKKMmauWpVdJ5OVUP/zislKNjW65W3HG+7iLlFaSIZN+INGMkEy9dLprbZs= +=mplp -----END PGP SIGNATURE----- diff --git a/media-libs/tiff/files/tiff-4.0.0-missing_lzma_pkgconfig.patch b/media-libs/tiff/files/tiff-4.0.0-missing_lzma_pkgconfig.patch new file mode 100644 index 000000000000..73ef6731c583 --- /dev/null +++ b/media-libs/tiff/files/tiff-4.0.0-missing_lzma_pkgconfig.patch @@ -0,0 +1,22 @@ +http://bugzilla.maptools.org/show_bug.cgi?id=2345 + +--- configure ++++ configure +@@ -18016,6 +18016,7 @@ + $as_echo "#define LZMA_SUPPORT 1" >>confdefs.h + + LIBS="-llzma $LIBS" ++ tiff_libs_private="-llzma ${tiff_libs_private}" + + if test "$HAVE_RPATH" = "yes" -a "x$with_lzma_lib_dir" != "x" ; then + LIBDIR="-R $with_lzma_lib_dir $LIBDIR" +--- configure.ac ++++ configure.ac +@@ -720,6 +720,7 @@ + if test "$HAVE_LZMA" = "yes" ; then + AC_DEFINE(LZMA_SUPPORT,1,[Support LZMA2 compression]) + LIBS="-llzma $LIBS" ++ tiff_libs_private="-llzma ${tiff_libs_private}" + + if test "$HAVE_RPATH" = "yes" -a "x$with_lzma_lib_dir" != "x" ; then + LIBDIR="-R $with_lzma_lib_dir $LIBDIR" diff --git a/media-libs/tiff/tiff-4.0.0-r1.ebuild b/media-libs/tiff/tiff-4.0.0-r1.ebuild new file mode 100644 index 000000000000..267125ee92d5 --- /dev/null +++ b/media-libs/tiff/tiff-4.0.0-r1.ebuild @@ -0,0 +1,47 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-libs/tiff/tiff-4.0.0-r1.ebuild,v 1.1 2012/01/10 18:53:49 ssuominen Exp $ + +EAPI=4 +inherit eutils libtool + +DESCRIPTION="Library for manipulation of TIFF (Tag Image File Format) images" +HOMEPAGE="http://www.remotesensing.org/libtiff/" +SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz + ftp://ftp.remotesensing.org/pub/libtiff/${P}.tar.gz" + +LICENSE="as-is" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="+cxx jbig jpeg lzma static-libs zlib" + +RDEPEND="jpeg? ( virtual/jpeg ) + jbig? ( media-libs/jbigkit ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib )" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-missing_lzma_pkgconfig.patch #396531 + elibtoolize +} + +src_configure() { + econf \ + $(use_enable static-libs static) \ + $(use_enable zlib) \ + $(use_enable jpeg) \ + $(use_enable jbig) \ + $(use_enable lzma) \ + $(use_enable cxx) \ + --without-x \ + --with-docdir="${EPREFIX}"/usr/share/doc/${PF} +} + +src_install() { + default + + rm -f \ + "${ED}"/usr/lib*/libtiff*.la \ + "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} +}