diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-05 17:41:38 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2011-04-05 17:41:38 +0000 |
| commit | 07f6bd762511a5a2c1061bdb7d569ec1be65b416 (patch) | |
| tree | 19bd2a374777bafeab2d53294aeba587de2b2b45 /media-libs/openjpeg | |
| parent | Use static-libs useflag. Punt .la files. (diff) | |
| download | gentoo-2-07f6bd762511a5a2c1061bdb7d569ec1be65b416.tar.gz gentoo-2-07f6bd762511a5a2c1061bdb7d569ec1be65b416.tar.bz2 gentoo-2-07f6bd762511a5a2c1061bdb7d569ec1be65b416.zip | |
Fix building with libpng-1.5. Fixes bug #361319.
(Portage version: 2.2.0_alpha29/cvs/Linux x86_64)
Diffstat (limited to 'media-libs/openjpeg')
| -rw-r--r-- | media-libs/openjpeg/ChangeLog | 6 | ||||
| -rw-r--r-- | media-libs/openjpeg/files/openjpeg-1.4-libpng15.patch | 19 | ||||
| -rw-r--r-- | media-libs/openjpeg/openjpeg-1.4-r1.ebuild | 3 |
3 files changed, 26 insertions, 2 deletions
diff --git a/media-libs/openjpeg/ChangeLog b/media-libs/openjpeg/ChangeLog index 31f3991b2c80..1fd3c9f537f8 100644 --- a/media-libs/openjpeg/ChangeLog +++ b/media-libs/openjpeg/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-libs/openjpeg # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.44 2011/03/30 13:24:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/ChangeLog,v 1.45 2011/04/05 17:41:38 scarabeus Exp $ + + 05 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> openjpeg-1.4-r1.ebuild, + +files/openjpeg-1.4-libpng15.patch: + Fix building with libpng-1.5. Fixes bug #361319. *openjpeg-1.4-r1 (30 Mar 2011) diff --git a/media-libs/openjpeg/files/openjpeg-1.4-libpng15.patch b/media-libs/openjpeg/files/openjpeg-1.4-libpng15.patch new file mode 100644 index 000000000000..d6e4babea220 --- /dev/null +++ b/media-libs/openjpeg/files/openjpeg-1.4-libpng15.patch @@ -0,0 +1,19 @@ +libpng: Version 1.5.1beta04 [January 16, 2011] + Mentioned in the documentation that applications must #include "zlib.h" + if they need access to anything in zlib.h. +--- + codec/convert.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/codec/convert.c b/codec/convert.c +index 25e715b..153c4b9 100644 +--- a/codec/convert.c ++++ b/codec/convert.c +@@ -47,6 +47,7 @@ + #ifdef _WIN32 + #include "../libs/png/png.h" + #else ++#include <zlib.h> + #include <png.h> + #endif /* _WIN32 */ + #endif /* HAVE_LIBPNG */ diff --git a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild b/media-libs/openjpeg/openjpeg-1.4-r1.ebuild index f4b81151a0cf..6c15e7447ef5 100644 --- a/media-libs/openjpeg/openjpeg-1.4-r1.ebuild +++ b/media-libs/openjpeg/openjpeg-1.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.4-r1.ebuild,v 1.1 2011/03/30 13:24:42 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/openjpeg/openjpeg-1.4-r1.ebuild,v 1.2 2011/04/05 17:41:38 scarabeus Exp $ EAPI=4 @@ -29,6 +29,7 @@ DEPEND="${RDEPEND} S=${WORKDIR}/${MY_P} PATCHES=( + "${FILESDIR}/${P}-libpng15.patch" "${FILESDIR}/${P}-linking.patch" "${FILESDIR}/${P}-pkgconfig.patch" ) |