diff options
| -rw-r--r-- | media-gfx/xloadimage/ChangeLog | 8 | ||||
| -rw-r--r-- | media-gfx/xloadimage/Manifest | 18 | ||||
| -rw-r--r-- | media-gfx/xloadimage/xloadimage-4.1-r11.ebuild | 10 |
3 files changed, 22 insertions, 14 deletions
diff --git a/media-gfx/xloadimage/ChangeLog b/media-gfx/xloadimage/ChangeLog index 7b158d6e630e..cc2a253582e6 100644 --- a/media-gfx/xloadimage/ChangeLog +++ b/media-gfx/xloadimage/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-gfx/xloadimage -# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.64 2011/11/05 04:31:06 ssuominen Exp $ +# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/ChangeLog,v 1.65 2012/01/22 20:16:27 ssuominen Exp $ + + 22 Jan 2012; Samuli Suominen <ssuominen@gentoo.org> + xloadimage-4.1-r11.ebuild: + Fix building with media-libs/tiff >= 4.0.0_pre wrt #319383 by Helmut Jarausch 23 Oct 2011; Samuli Suominen <ssuominen@gentoo.org> -xloadimage-4.1-r10.ebuild: diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index 9f58e39a234f..88482d577a32 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -11,17 +11,17 @@ AUX xloadimage-4.1-zio-shell-meta-char.diff 1372 RMD160 bdff2a42743659179ff9faaf AUX xloadimage-gentoo.patch 8956 RMD160 f60ed7543ae72a598d37d665d2fd1b3e000a69c2 SHA1 4fa12fa375187f04f5f71dafe7b02b858273b050 SHA256 e03f0584b32a0be68f7baeb13df2ad29277ecdbb54baed0b5f878301122e0c30 DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 RMD160 57f09f43e96fea7c103cd283aaea35245a44071a SHA1 2b577a1c230a99201a2cb48ba4b5d122f34da3c7 SHA256 addfd04c0a5667bb9c3f4ae6a9da35a443776086e30b84b2c3afa5eac161144a DIST xloadimage.4.1.tar.gz 596021 RMD160 000271b40f58601cd1057b4e99c31a30da6e10af SHA1 0a8ee9b185702750706f68e4a34e086873f17690 SHA256 400bc7d84dcfb3265a7a1ce51819679dc3adaeda231514bd89b0f932b78ff5c4 -EBUILD xloadimage-4.1-r11.ebuild 2336 RMD160 d8aeeed0ce716be3ca0133621a0689cda526129f SHA1 09a8a90d0e8a7cd48822fe7bc6774365aabc3ee7 SHA256 216a0b87a6d09146d07a6cc8a7167e19b4af90e42952213f8b6fd6a0d37f3d07 -MISC ChangeLog 9901 RMD160 315b93c1e47034e1bec70eea0f10ac7b99530cc6 SHA1 4b7037ee1089eab439d477589c99b02602ebbfd8 SHA256 f4c77915a4dfd8260fa63b83f1e4bb4629564e94efe21549839316092c95cc56 +EBUILD xloadimage-4.1-r11.ebuild 2495 RMD160 8443c4a00c4fcb5ce2db1a87938d8dfb50f3e0b6 SHA1 219087b04eba9e39b4c2a3cc5dd8de47e0f299fa SHA256 adf8cac520f84c407b7536d9adfc336d659ece4b04d2351d8dbb417cc783d23a +MISC ChangeLog 10065 RMD160 fa60457ff1ab76569124abe59b0f206e07bb9044 SHA1 046ce9ca22f00e83d421a26692c76ec559896bd2 SHA256 ad4817adef0a06be03bb3dadf02e692eb1d1c209dcdf446f8e297f76bf6f4a8e MISC metadata.xml 163 RMD160 9cdda004bed83a887f4a756cb1550fab6ce563ce SHA1 bfc4f31690e338a159152dcd46d56ff7fd6b6e1b SHA256 212655100c50c4193072996553f15984b9788fb20fb4175efd2418b80d428564 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iQEcBAEBAgAGBQJOtLvvAAoJEEdUh39IaPFNSacIAJhXIOWGW6Mv7u316B2ocEWI -YCkAF6TeBngWb+eZlhirn+YdBd7gnQHlm/mpwzSxZoWVX1hWKEifTCYeDvylo02U -0JDUVCu4HR7q8rMU8MNp4zJswslp8w+0A/4CZhLsogankXmC/opG0Oa8gkkjCnjG -fNZ49uGVg3E3m/5EvwN/pMnC7tMIPdTrE51bwpjGaYxGNsDQ7AMooR/WNlutLQrV -WVYoDzluT7qK5gzJQ9PGwR4B8c92DvE1SGSU2YUrvUdyuFtK8yiUeWfcqxnxj09v -6duLSD3rJhzzncoz/Wu7EVXSi14DUD7/9Vfbk862MZOSRx7Hfo+psh9NvAmlmjc= -=S4VF +iQEcBAEBAgAGBQJPHG4TAAoJEEdUh39IaPFNtSUH/1U8L92XRY2ZYagBzTBRoN2M +PTn/OrRrG5vSTD86DZMj5EQ1AtrkUuz1EXx+ASIgPffx+/K/raOm9jypj87nBeBy +TqZpq7cgBtm77v0KsxjkbdaH0KQeIsmsWxfx6tKwd3Xv+NEpF4QyvyhVvVbNIGKU +EGlEgbn6YHoOumwydkCozfGpa3zLnU+Y0IQ+loOwXuI7qhiqNAN7pGGx5rBYOJdU +CUpguVI3LyXKcaY7uv7l2Vpkt0j7jE59JxWFXcb+JKbExM15epyis7eQTidYY4Ff +WOxmrmMNsY8uPD1FnKKbBT0dMCvaJYzI5ZQ6E7BKISXpF1Xgcg63IQpAGyd3gC4= +=ttTO -----END PGP SIGNATURE----- diff --git a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild index a02bbdb75dcc..ba0238ed2df0 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2011 Gentoo Foundation +# Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.11 2011/10/23 15:49:23 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/xloadimage/xloadimage-4.1-r11.ebuild,v 1.12 2012/01/22 20:16:27 ssuominen Exp $ EAPI=2 -inherit autotools eutils toolchain-funcs +inherit autotools eutils flag-o-matic toolchain-funcs DESCRIPTION="utility to view many different types of images under X11" HOMEPAGE="http://world.std.com/~jimf/xloadimage.html" @@ -59,6 +59,10 @@ src_prepare() { } src_configure() { + # Set TIFFHeader to TIFFHeaderCommon wrt #319383 + has_version '>=media-libs/tiff-4.0.0_pre' && \ + append-flags -DTIFFHeader=TIFFHeaderCommon + tc-export CC econf $(use_with jpeg) \ $(use_with png) \ |