diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 09:42:59 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2010-05-12 09:42:59 +0000 |
| commit | 8e1e0c8d08a33bbb31eb7395c4e8045c97d94778 (patch) | |
| tree | 450fd9c68043782bc9f74113575096511faa3d5f /media-gfx/k3d | |
| parent | Fix obvious typo in USE flag name. (diff) | |
| download | gentoo-2-8e1e0c8d08a33bbb31eb7395c4e8045c97d94778.tar.gz gentoo-2-8e1e0c8d08a33bbb31eb7395c4e8045c97d94778.tar.bz2 gentoo-2-8e1e0c8d08a33bbb31eb7395c4e8045c97d94778.zip | |
Fix building with libpng14.
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'media-gfx/k3d')
| -rw-r--r-- | media-gfx/k3d/ChangeLog | 6 | ||||
| -rw-r--r-- | media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch | 54 | ||||
| -rw-r--r-- | media-gfx/k3d/k3d-0.7.11.0-r1.ebuild | 4 |
3 files changed, 60 insertions, 4 deletions
diff --git a/media-gfx/k3d/ChangeLog b/media-gfx/k3d/ChangeLog index 22641c95c533..7db363425eb5 100644 --- a/media-gfx/k3d/ChangeLog +++ b/media-gfx/k3d/ChangeLog @@ -1,10 +1,10 @@ # ChangeLog for media-gfx/k3d # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.49 2010/05/12 09:04:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/ChangeLog,v 1.50 2010/05/12 09:42:59 ssuominen Exp $ 12 May 2010; Samuli Suominen <ssuominen@gentoo.org> - k3d-0.7.11.0-r1.ebuild: - Fix libpng detection wrt #319339 by Vladimir <v_2e AT ukr.net>. + k3d-0.7.11.0-r1.ebuild, +files/k3d-0.7.11.0-libpng14.patch: + Fix building with libpng14 wrt #319339 by Vladimir <v_2e AT ukr.net>. 01 Jan 2010; Raúl Porcel <armin76@gentoo.org> k3d-0.6.7.0-r1.ebuild: Drop sparc keywords diff --git a/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch b/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch new file mode 100644 index 000000000000..6396ffc156ee --- /dev/null +++ b/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch @@ -0,0 +1,54 @@ +diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp +--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200 ++++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300 +@@ -148,12 +148,12 @@ + // allocate/initialize the image information data
+ _info_ptr = png_create_info_struct(_png_ptr);
+ if (_info_ptr == NULL) {
+- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL);
++ png_destroy_read_struct(&_png_ptr,NULL,NULL);
+ io_error("png_get_file_size: fail to call png_create_info_struct()");
+ }
+ if (setjmp(png_jmpbuf(_png_ptr))) {
+ //free all of the memory associated with the png_ptr and info_ptr
+- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL);
++ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL);
+ io_error("png_get_file_size: fail to call setjmp()");
+ }
+ png_init_io(_png_ptr, get());
+@@ -165,7 +165,7 @@ + png_reader(const char* filename) : file_mgr(filename, "rb") { init(); }
+
+ ~png_reader() {
+- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL);
++ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL);
+ }
+ point2<std::ptrdiff_t> get_dimensions() {
+ return point2<std::ptrdiff_t>(png_get_image_width(_png_ptr,_info_ptr),
+@@ -177,7 +177,7 @@ + int bit_depth, color_type, interlace_type;
+ png_get_IHDR(_png_ptr, _info_ptr,
+ &width, &height,&bit_depth,&color_type,&interlace_type,
+- int_p_NULL, int_p_NULL);
++ (int *) NULL, (int *) NULL);
+ io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+ "png_read_view: input view size does not match PNG file size");
+
+@@ -219,7 +219,7 @@ + int bit_depth, color_type, interlace_type;
+ png_get_IHDR(_png_ptr, _info_ptr,
+ &width, &height,&bit_depth,&color_type,&interlace_type,
+- int_p_NULL, int_p_NULL);
++ (int *) NULL, (int *) NULL);
+ io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height),
+ "png_reader_color_convert::apply(): input view size does not match PNG file size");
+ switch (color_type) {
+@@ -308,7 +308,7 @@ + io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()");
+ _info_ptr = png_create_info_struct(_png_ptr);
+ if (!_info_ptr) {
+- png_destroy_write_struct(&_png_ptr,png_infopp_NULL);
++ png_destroy_write_struct(&_png_ptr,NULL);
+ io_error("png_write_initialize: fail to call png_create_info_struct()");
+ }
+ if (setjmp(png_jmpbuf(_png_ptr))) {
diff --git a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild index 6ab2d4748ef8..796a538aaebc 100644 --- a/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild +++ b/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.4 2010/05/12 09:04:21 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-gfx/k3d/k3d-0.7.11.0-r1.ebuild,v 1.5 2010/05/12 09:42:59 ssuominen Exp $ EAPI="2" @@ -72,6 +72,8 @@ src_prepare() { -e '/PKG_CHECK_MODULES/s:libpng12:libpng:' \ cmake/modules/K3DFindPNG.cmake || die + epatch "${FILESDIR}"/${P}-libpng14.patch + epatch "${FILESDIR}"/${P}-fix-potfiles.patch \ "${FILESDIR}"/${P}-cuda.patch \ "${FILESDIR}"/${P}-gcc44.patch |