* [gentoo-commits] dev/ikelos:master commit in: media-gfx/mathmap/files/, media-gfx/mathmap/
@ 2011-12-25 14:08 Mike Auty
0 siblings, 0 replies; 3+ messages in thread
From: Mike Auty @ 2011-12-25 14:08 UTC (permalink / raw
To: gentoo-commits
commit: 233a0b5d01b3959791722908e6a22c1df51b28ec
Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 25 14:08:17 2011 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun Dec 25 14:08:17 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=233a0b5d
Add in mathmap patch for libpng15 from Fedora, but it seems not to help. See bug 356625.
---
media-gfx/mathmap/Manifest | 5 +-
media-gfx/mathmap/files/mathmap-libpng15.patch | 58 ++++++++++++++++++++++++
media-gfx/mathmap/mathmap-1.3.2.ebuild | 39 ----------------
media-gfx/mathmap/mathmap-1.3.5.ebuild | 4 ++
4 files changed, 64 insertions(+), 42 deletions(-)
diff --git a/media-gfx/mathmap/Manifest b/media-gfx/mathmap/Manifest
index 895b462..0c55ace 100644
--- a/media-gfx/mathmap/Manifest
+++ b/media-gfx/mathmap/Manifest
@@ -1,4 +1,3 @@
-DIST mathmap-1.3.2.tar.gz 404420 RMD160 0705030a71dcd99810d335ed49dcce9678f673eb SHA1 e4b978585e8217140be02ca183ef818b575c47ed SHA256 526e389983e4d76611bf50825a259309d36ec58ce4a2470cb008a685836e9809
+AUX mathmap-libpng15.patch 1808 RMD160 82ab1ab8df786ed5560934308980b5aaefddef20 SHA1 c019efeee99b222581b1155dd881459e606535c4 SHA256 be380471bfcea173fea30816eef8baac302d3094792ad407d28d422d2f36e621
DIST mathmap-1.3.5.tar.gz 2059832 RMD160 5803a80271ec84dd21af3560513be73b56c82113 SHA1 caddf75e77f26d75f9f1127f638b9945b1d752a4 SHA256 1d0542de10b189f8785a5adc62b7d49e6c1c7be1fa9cf1fecdd88e609ebd2172
-EBUILD mathmap-1.3.2.ebuild 960 RMD160 27e3b3e9888b7064b798cde6edab7cbff233ae03 SHA1 b990e1712fea885c7f1f1fd53fc617f9dea69ff5 SHA256 bbdb3045da3990d4f8e9dd78bbdd39a529e50a31afebadd2388e3c3f3e0444ec
-EBUILD mathmap-1.3.5.ebuild 714 RMD160 567352a14017140a3872ebd3e20503255c2d1f98 SHA1 9707c51d2456b0a3929a9b401bb69d3493e39f0b SHA256 d8089119708997843ae7354d478fcb07a45bbedd913ff815fbdedfeace7a46be
+EBUILD mathmap-1.3.5.ebuild 776 RMD160 85f34587fe204bb58df3168ccc35d18076487f1a SHA1 778e24b23f4bba45d178f23f3702992342278589 SHA256 08ce331c5bb9a686282724bfed4f92f072e7794170f160b6b838653cc033e7b7
diff --git a/media-gfx/mathmap/files/mathmap-libpng15.patch b/media-gfx/mathmap/files/mathmap-libpng15.patch
new file mode 100644
index 0000000..7a8268f
--- /dev/null
+++ b/media-gfx/mathmap/files/mathmap-libpng15.patch
@@ -0,0 +1,58 @@
+diff --git a/rwimg/rwpng.c b/rwimg/rwpng.c
+index 840d13f..b54cff3 100644
+--- a/rwimg/rwpng.c
++++ b/rwimg/rwpng.c
+@@ -58,7 +58,7 @@ open_png_file_reading (const char *filename, int *width, int *height)
+ data->end_info = png_create_info_struct(data->png_ptr);
+ assert(data->end_info != 0);
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ png_init_io(data->png_ptr, data->file);
+@@ -105,7 +105,7 @@ png_read_lines (void *_data, unsigned char *lines, int num_lines)
+ int bps, spp;
+ unsigned char *row;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
+@@ -151,7 +151,7 @@ png_free_reader_data (void *_data)
+ {
+ png_data_t *data = (png_data_t*)_data;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ if (data->have_read)
+@@ -180,7 +180,7 @@ open_png_file_writing (const char *filename, int width, int height, int pixel_st
+ data->info_ptr = png_create_info_struct(data->png_ptr);
+ assert(data->info_ptr != 0);
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ if (pixel_stride == 4)
+@@ -216,7 +216,7 @@ png_write_lines (void *_data, unsigned char *lines, int num_lines)
+ unsigned char *packed_line;
+ int i;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ if (data->pixel_stride != 3)
+@@ -257,7 +257,7 @@ png_free_writer_data (void *_data)
+ {
+ png_data_t *data = (png_data_t*)_data;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp(png_jmpbuf(data->png_ptr)))
+ assert(0);
+
+ png_write_end(data->png_ptr, data->info_ptr);
diff --git a/media-gfx/mathmap/mathmap-1.3.2.ebuild b/media-gfx/mathmap/mathmap-1.3.2.ebuild
deleted file mode 100644
index c694186..0000000
--- a/media-gfx/mathmap/mathmap-1.3.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-inherit eutils
-
-DESCRIPTION="Mathmap is an image manipulation scripting plugin for the Gimp"
-HOMEPAGE="http://www.complang.tuwien.ac.at/schani/mathmap/index.html"
-SRC_URI="http://www.complang.tuwien.ac.at/schani/mathmap/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE=""
-
-DEPEND=">=media-gfx/gimp-2.2
- sci-libs/gsl
- x11-libs/gtksourceview
- gnome-base/libgnomecanvas"
-RDEPEND="${DEPEND}"
-
-pkg_setup() {
- if ! $(built_with_use sci-libs/gsl cblas); then
- die "sci-libs/gsl must be built with USE='cblas'"
- fi
-}
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
- sed -i -e 's/GIMPDATADIR := /GIMPDATADIR := $(DESTDIR)/' Makefile
- sed -i -e 's/--install-admin-bin/--prefix=$(DESTDIR) --install-admin-bin/' Makefile
- sed -i -e 's/mkdir/mkdir -p/' Makefile
-}
-
-src_install() {
- emake install DESTDIR=${D} || die "Failed to install"
-}
-
diff --git a/media-gfx/mathmap/mathmap-1.3.5.ebuild b/media-gfx/mathmap/mathmap-1.3.5.ebuild
index 205dec8..ec3b370 100644
--- a/media-gfx/mathmap/mathmap-1.3.5.ebuild
+++ b/media-gfx/mathmap/mathmap-1.3.5.ebuild
@@ -23,6 +23,10 @@ RDEPEND=">=media-gfx/gimp-2.2
DEPEND="${RDEPEND}
app-doc/doxygen"
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-libpng15.patch"
+}
+
src_compile() {
emake -j1 || die "Failed to compile"
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: media-gfx/mathmap/files/, media-gfx/mathmap/
@ 2013-06-09 12:29 Mike Auty
0 siblings, 0 replies; 3+ messages in thread
From: Mike Auty @ 2013-06-09 12:29 UTC (permalink / raw
To: gentoo-commits
commit: f41e95c3c1f5ebd1526d165f2115952a1d8a9b3a
Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sun Jun 9 12:28:51 2013 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sun Jun 9 12:28:51 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=f41e95c3
Bump mathmap to (hopefully) include better support for libpng. Thanks to Maks Verver for pointing out the issue.
---
media-gfx/mathmap/Manifest | 8 +-
media-gfx/mathmap/files/mathmap-libpng16.patch | 199 +++++++++++++++++++++++++
media-gfx/mathmap/mathmap-1.3.5-r1.ebuild | 37 +++++
3 files changed, 241 insertions(+), 3 deletions(-)
diff --git a/media-gfx/mathmap/Manifest b/media-gfx/mathmap/Manifest
index 0c55ace..44e70c9 100644
--- a/media-gfx/mathmap/Manifest
+++ b/media-gfx/mathmap/Manifest
@@ -1,3 +1,5 @@
-AUX mathmap-libpng15.patch 1808 RMD160 82ab1ab8df786ed5560934308980b5aaefddef20 SHA1 c019efeee99b222581b1155dd881459e606535c4 SHA256 be380471bfcea173fea30816eef8baac302d3094792ad407d28d422d2f36e621
-DIST mathmap-1.3.5.tar.gz 2059832 RMD160 5803a80271ec84dd21af3560513be73b56c82113 SHA1 caddf75e77f26d75f9f1127f638b9945b1d752a4 SHA256 1d0542de10b189f8785a5adc62b7d49e6c1c7be1fa9cf1fecdd88e609ebd2172
-EBUILD mathmap-1.3.5.ebuild 776 RMD160 85f34587fe204bb58df3168ccc35d18076487f1a SHA1 778e24b23f4bba45d178f23f3702992342278589 SHA256 08ce331c5bb9a686282724bfed4f92f072e7794170f160b6b838653cc033e7b7
+AUX mathmap-libpng15.patch 1808 SHA256 be380471bfcea173fea30816eef8baac302d3094792ad407d28d422d2f36e621 SHA512 1e101858bc3fad5472b3a5658ff8ea74a6167b3c9122d71d49c4ca42dd6d98eaf1c19d7405dd98fc6093e2727c43db730a1133262650d0af22a41e362f309589 WHIRLPOOL fa53fbe296852452df7ebd94daae2d89be9a1b09f346a39da1c3a7e4cd5440f36f3cf3100ccdba5ba309c90a50dfc3e4e50dac172b592652fbf00b659e62d073
+AUX mathmap-libpng16.patch 6361 SHA256 236b85999c5998921d317cb7fa777a8b647a53f7cc12b43c2a8618511151d2f9 SHA512 8b1cd669dd8ca0d30a02398b867138b955f4fd98429aaa4282c76fd2e36c148e7d5f1e30cdadc0ef748a085ef7cc87b150baf43e206ef6215304f0e44e177e46 WHIRLPOOL ee88b656afc2b6782e6c64f39dc4fa3d1ccff342fc325321a7a0cbd8d9dc3bbaea8da3836dc4a3ae3953f883da9c7da5875fec5b2a9710fece220b6e9177e871
+DIST mathmap-1.3.5.tar.gz 2059832 SHA256 1d0542de10b189f8785a5adc62b7d49e6c1c7be1fa9cf1fecdd88e609ebd2172 SHA512 18b6d590640ede9c0b42614cb330314732a85fb5615dd82cffdc251a1c73654d33604113145fa643b081e12784768761300d8313082508a15f96c0ecaa5b3436 WHIRLPOOL a76fe0b8bc265d1e80150ba2cb5306fbd533da5ad4fff7e3144b5032fb249c2324fc5dfc94cde45274c86ccbe3bf927bbe4f261228e1bc4f8280460cc3238f30
+EBUILD mathmap-1.3.5-r1.ebuild 776 SHA256 3d8e082294e857c19a85c904708b3c0213a3085dd56f140cfa81d32795037152 SHA512 3c12e94c84d434036b66c2b6e1ca085f1e6d92fed9de1a90cdf84e9d5aa877f0f39f250db7488317a90bc4bd4fb73722c90398415fb2cc783098cbb0161bfba9 WHIRLPOOL 63b20e5946c55790460db0ae6a16309d3b430436cda398fd823d3799db7cb88f0b6cec10e379c6367fee531701bb6d9de0a74b4b3f561cbb45a27387f6292618
+EBUILD mathmap-1.3.5.ebuild 776 SHA256 08ce331c5bb9a686282724bfed4f92f072e7794170f160b6b838653cc033e7b7 SHA512 3272570949d7f1320ee90f975e1af81145ed177449bcb0aad10b394a425f31c140fc1136c89b3b9bc7dbb01381353c149dbeff8bcab67412c78eed60d6f3860a WHIRLPOOL bbe06a4468c42988d75e6dc7e5a3c7de3a0c681946908e06f018d64487c4883685cfdb2bc73f53e2c5abb7e64bf1ba76c4b1a378a95f54b9c31fdccef5af5e1e
diff --git a/media-gfx/mathmap/files/mathmap-libpng16.patch b/media-gfx/mathmap/files/mathmap-libpng16.patch
new file mode 100644
index 0000000..5d71932
--- /dev/null
+++ b/media-gfx/mathmap/files/mathmap-libpng16.patch
@@ -0,0 +1,199 @@
+From 945cbf9e5104f09cd7c1473035c282998d34e78e Mon Sep 17 00:00:00 2001
+From: Mark Probst <mark.probst@gmail.com>
+Date: Fri, 6 Apr 2012 10:50:32 +0200
+Subject: [PATCH] Fixes for libpng 1.5.
+
+---
+ rwpng.c | 73 ++++++++++++++++++++++++++++++++---------------------------------
+ 1 file changed, 36 insertions(+), 37 deletions(-)
+
+diff --git a/rwimg/rwpng.c b/rwimg/rwpng.c
+index 840d13f..a550172 100644
+--- a/rwimg/rwpng.c
++++ b/rwimg/rwpng.c
+@@ -43,6 +43,7 @@
+ open_png_file_reading (const char *filename, int *width, int *height)
+ {
+ png_data_t *data = (png_data_t*)malloc(sizeof(png_data_t));
++ int bit_depth, color_type;
+
+ assert(data != 0);
+
+@@ -58,34 +59,36 @@
+ data->end_info = png_create_info_struct(data->png_ptr);
+ assert(data->end_info != 0);
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (data->png_ptr)))
+ assert(0);
+
+ png_init_io(data->png_ptr, data->file);
+
+ png_read_info(data->png_ptr, data->info_ptr);
+
+- *width = data->info_ptr->width;
+- *height = data->info_ptr->height;
++ *width = png_get_image_width (data->png_ptr, data->info_ptr);
++ *height = png_get_image_height (data->png_ptr, data->info_ptr);
+
+- if (data->info_ptr->bit_depth != 8 && data->info_ptr->bit_depth != 16)
++ bit_depth = png_get_bit_depth (data->png_ptr, data->info_ptr);
++ if (bit_depth != 8 && bit_depth != 16)
+ {
+ fprintf(stderr, "PNG files are only supported with bit depths 8 and 16.\n");
+ /* FIXME: free stuff */
+ return 0;
+ }
+
+- if (data->info_ptr->color_type != PNG_COLOR_TYPE_RGB
+- && data->info_ptr->color_type != PNG_COLOR_TYPE_RGB_ALPHA
+- && data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY
+- && data->info_ptr->color_type != PNG_COLOR_TYPE_GRAY_ALPHA)
++ color_type = png_get_color_type (data->png_ptr, data->info_ptr);
++ if (color_type != PNG_COLOR_TYPE_RGB
++ && color_type != PNG_COLOR_TYPE_RGB_ALPHA
++ && color_type != PNG_COLOR_TYPE_GRAY
++ && color_type != PNG_COLOR_TYPE_GRAY_ALPHA)
+ {
+ fprintf(stderr, "PNG files are only supported in RGB and Gray, with or without alpha.\n");
+ /* FIXME: free stuff */
+ return 0;
+ }
+
+- if (data->info_ptr->interlace_type != PNG_INTERLACE_NONE)
++ if (png_get_interlace_type (data->png_ptr, data->info_ptr) != PNG_INTERLACE_NONE)
+ {
+ fprintf(stderr, "Interlaced PNG files are not supported.\n");
+ /* FIXME: free stuff */
+@@ -104,25 +107,28 @@
+ int i;
+ int bps, spp;
+ unsigned char *row;
++ int color_type, width;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (data->png_ptr)))
+ assert(0);
+
+- if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY)
++ color_type = png_get_color_type (data->png_ptr, data->info_ptr);
++ if (color_type == PNG_COLOR_TYPE_GRAY)
+ spp = 1;
+- else if (data->info_ptr->color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
++ else if (color_type == PNG_COLOR_TYPE_GRAY_ALPHA)
+ spp = 2;
+- else if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB)
++ else if (color_type == PNG_COLOR_TYPE_RGB)
+ spp = 3;
+ else
+ spp = 4;
+
+- if (data->info_ptr->bit_depth == 16)
++ if (png_get_bit_depth (data->png_ptr, data->info_ptr) == 16)
+ bps = 2;
+ else
+ bps = 1;
+
+- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps);
++ width = png_get_image_width (data->png_ptr, data->info_ptr);
++ row = (unsigned char*)malloc (width * spp * bps);
+
+ for (i = 0; i < num_lines; ++i)
+ {
+@@ -131,13 +137,13 @@
+ png_read_row(data->png_ptr, (png_bytep)row, 0);
+
+ if (spp <= 2)
+- for (j = 0; j < data->info_ptr->width; ++j)
++ for (j = 0; j < width; ++j)
+ for (channel = 0; channel < 3; ++channel)
+- lines[i * data->info_ptr->width * 3 + j * 3 + channel] = row[j * spp * bps];
++ lines[i * width * 3 + j * 3 + channel] = row[j * spp * bps];
+ else
+- for (j = 0; j < data->info_ptr->width; ++j)
++ for (j = 0; j < width; ++j)
+ for (channel = 0; channel < 3; ++channel)
+- lines[i * data->info_ptr->width * 3 + j * 3 + channel]
++ lines[i * width * 3 + j * 3 + channel]
+ = row[j * spp * bps + channel * bps];
+ }
+
+@@ -151,7 +157,7 @@
+ {
+ png_data_t *data = (png_data_t*)_data;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (data->png_ptr)))
+ assert(0);
+
+ if (data->have_read)
+@@ -180,7 +186,7 @@
+ data->info_ptr = png_create_info_struct(data->png_ptr);
+ assert(data->info_ptr != 0);
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (data->png_ptr)))
+ assert(0);
+
+ if (pixel_stride == 4)
+@@ -188,18 +194,9 @@
+
+ png_init_io(data->png_ptr, data->file);
+
+- data->info_ptr->width = width;
+- data->info_ptr->height = height;
+- data->info_ptr->valid = 0;
+- data->info_ptr->rowbytes = width * 3;
+- data->info_ptr->palette = 0;
+- data->info_ptr->num_palette = 0;
+- data->info_ptr->num_trans = 0;
+- data->info_ptr->bit_depth = 8;
+- data->info_ptr->color_type = PNG_COLOR_TYPE_RGB;
+- data->info_ptr->compression_type = PNG_COMPRESSION_TYPE_DEFAULT;
+- data->info_ptr->filter_type = PNG_FILTER_TYPE_DEFAULT;
+- data->info_ptr->interlace_type = PNG_INTERLACE_NONE;
++ png_set_IHDR (data->png_ptr, data->info_ptr,
++ width, height, 8, PNG_COLOR_TYPE_RGB,
++ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT);
+
+ png_write_info(data->png_ptr, data->info_ptr);
+
+@@ -215,13 +212,15 @@
+ png_data_t *data = (png_data_t*)_data;
+ unsigned char *packed_line;
+ int i;
++ int width;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (data->png_ptr)))
+ assert(0);
+
++ width = png_get_image_width (data->png_ptr, data->info_ptr);
+ if (data->pixel_stride != 3)
+ {
+- packed_line = (unsigned char*)malloc(data->info_ptr->width * 3);
++ packed_line = (unsigned char*)malloc(width * 3);
+ assert(packed_line != 0);
+ }
+ else
+@@ -235,7 +234,7 @@
+ {
+ int j;
+
+- for (j = 0; j < data->info_ptr->width; ++j)
++ for (j = 0; j < width; ++j)
+ {
+ packed_line[j * 3 + 0] = p[j * data->pixel_stride + 0];
+ packed_line[j * 3 + 1] = p[j * data->pixel_stride + 1];
+@@ -257,7 +256,7 @@
+ {
+ png_data_t *data = (png_data_t*)_data;
+
+- if (setjmp(data->png_ptr->jmpbuf))
++ if (setjmp (png_jmpbuf (data->png_ptr)))
+ assert(0);
+
+ png_write_end(data->png_ptr, data->info_ptr);
+--
+1.8.1.6
+
diff --git a/media-gfx/mathmap/mathmap-1.3.5-r1.ebuild b/media-gfx/mathmap/mathmap-1.3.5-r1.ebuild
new file mode 100644
index 0000000..dd26f7d
--- /dev/null
+++ b/media-gfx/mathmap/mathmap-1.3.5-r1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI="4"
+
+inherit eutils
+
+DESCRIPTION="Mathmap is an image manipulation scripting plugin for the Gimp"
+HOMEPAGE="http://www.complang.tuwien.ac.at/schani/mathmap/index.html"
+SRC_URI="http://www.complang.tuwien.ac.at/schani/mathmap/files/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE=""
+
+RDEPEND=">=media-gfx/gimp-2.2
+ sci-libs/gsl
+ x11-libs/gtksourceview
+ gnome-base/libgnomecanvas
+ sci-libs/fftw:3.0"
+DEPEND="${RDEPEND}
+ app-doc/doxygen"
+
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-libpng16.patch"
+}
+
+src_compile() {
+ emake -j1 || die "Failed to compile"
+}
+
+src_install() {
+ emake install DESTDIR=${D} || die "Failed to install"
+}
+
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] dev/ikelos:master commit in: media-gfx/mathmap/files/, media-gfx/mathmap/
@ 2013-06-15 14:50 Mike Auty
0 siblings, 0 replies; 3+ messages in thread
From: Mike Auty @ 2013-06-15 14:50 UTC (permalink / raw
To: gentoo-commits
commit: 0dc68183c56f691a5fa04858e2262f5759c922f1
Author: Mike Auty <ikelos <AT> gentoo <DOT> org>
AuthorDate: Sat Jun 15 14:49:50 2013 +0000
Commit: Mike Auty <ikelos <AT> gentoo <DOT> org>
CommitDate: Sat Jun 15 14:49:50 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=dev/ikelos.git;a=commit;h=0dc68183
Finish fixing up mathmap for more recent libpng versions.
---
media-gfx/mathmap/Manifest | 3 ++-
.../mathmap/files/mathmap-remove-png_set_filler.patch | 19 +++++++++++++++++++
media-gfx/mathmap/mathmap-1.3.5-r1.ebuild | 1 +
3 files changed, 22 insertions(+), 1 deletion(-)
diff --git a/media-gfx/mathmap/Manifest b/media-gfx/mathmap/Manifest
index 96da529..f53c459 100644
--- a/media-gfx/mathmap/Manifest
+++ b/media-gfx/mathmap/Manifest
@@ -1,5 +1,6 @@
AUX mathmap-libpng15.patch 1808 SHA256 be380471bfcea173fea30816eef8baac302d3094792ad407d28d422d2f36e621 SHA512 1e101858bc3fad5472b3a5658ff8ea74a6167b3c9122d71d49c4ca42dd6d98eaf1c19d7405dd98fc6093e2727c43db730a1133262650d0af22a41e362f309589 WHIRLPOOL fa53fbe296852452df7ebd94daae2d89be9a1b09f346a39da1c3a7e4cd5440f36f3cf3100ccdba5ba309c90a50dfc3e4e50dac172b592652fbf00b659e62d073
AUX mathmap-libpng16.patch 6361 SHA256 236b85999c5998921d317cb7fa777a8b647a53f7cc12b43c2a8618511151d2f9 SHA512 8b1cd669dd8ca0d30a02398b867138b955f4fd98429aaa4282c76fd2e36c148e7d5f1e30cdadc0ef748a085ef7cc87b150baf43e206ef6215304f0e44e177e46 WHIRLPOOL ee88b656afc2b6782e6c64f39dc4fa3d1ccff342fc325321a7a0cbd8d9dc3bbaea8da3836dc4a3ae3953f883da9c7da5875fec5b2a9710fece220b6e9177e871
+AUX mathmap-remove-png_set_filler.patch 708 SHA256 835e1e9a58beec44a5d66d63a2f79e717801ee02297686efeb8d96db2c0e085b SHA512 df4abec4956ea32eedd288a332c700d829a454b11cf3ff532a31a9ecfd6fa3c5632f1a9ebd2e6a89be2b175dedcf37cb2ab2e0caeef77f11bc1b02e047273856 WHIRLPOOL fb57f6b23fa7df737a3e111201c33f5e883a25176ef823b6a17a9ce6d6ed67850eb4b3968dc64a847dc055621aa5e72fe665540c80436a48dbeef46f6c4538cf
DIST mathmap-1.3.5.tar.gz 2059832 SHA256 1d0542de10b189f8785a5adc62b7d49e6c1c7be1fa9cf1fecdd88e609ebd2172 SHA512 18b6d590640ede9c0b42614cb330314732a85fb5615dd82cffdc251a1c73654d33604113145fa643b081e12784768761300d8313082508a15f96c0ecaa5b3436 WHIRLPOOL a76fe0b8bc265d1e80150ba2cb5306fbd533da5ad4fff7e3144b5032fb249c2324fc5dfc94cde45274c86ccbe3bf927bbe4f261228e1bc4f8280460cc3238f30
-EBUILD mathmap-1.3.5-r1.ebuild 803 SHA256 e9561f639360da9809687bc6c20332857569a4a7b86fc25615e22e88da09cd2a SHA512 f1bfe422a3b8a9d1bda6bfbcf6569d9be51ea23e06abd52060dbd9c6f74f53aa7e69c17c86b8e12731bbab971bbc233e845bd39385e1a53ab53e46f02db7a104 WHIRLPOOL 9af9ad2c592dba064fcd6bb5127858c2c7fdaa26682a7b3889f2d05246cb8eb65ea99139b2aa72d8048659b81874c2d7349e00660aae02d1932ccf0bac71cd03
+EBUILD mathmap-1.3.5-r1.ebuild 859 SHA256 58f160bcaa8824870189f9e9e33807680e411cfefbcb26b323d5070a958752ac SHA512 8e6ec15a4afec9899e1b05618551eb1aaf0db701af44bc18b9cada302c5c284aa0ae7c66d654bfa1bf9c7d476aa4b54d43e04c2167d742e65aebf4cd271e359b WHIRLPOOL 765121789dcae4e1502487c3e37f3f0580f466bf1761c7037f9c24d457913fe7a12fd33a7473c76c1f80ad49e7850e5bc36b51979e2a93d0efb1e2910ae438d7
EBUILD mathmap-1.3.5.ebuild 776 SHA256 08ce331c5bb9a686282724bfed4f92f072e7794170f160b6b838653cc033e7b7 SHA512 3272570949d7f1320ee90f975e1af81145ed177449bcb0aad10b394a425f31c140fc1136c89b3b9bc7dbb01381353c149dbeff8bcab67412c78eed60d6f3860a WHIRLPOOL bbe06a4468c42988d75e6dc7e5a3c7de3a0c681946908e06f018d64487c4883685cfdb2bc73f53e2c5abb7e64bf1ba76c4b1a378a95f54b9c31fdccef5af5e1e
diff --git a/media-gfx/mathmap/files/mathmap-remove-png_set_filler.patch b/media-gfx/mathmap/files/mathmap-remove-png_set_filler.patch
new file mode 100644
index 0000000..196ad72
--- /dev/null
+++ b/media-gfx/mathmap/files/mathmap-remove-png_set_filler.patch
@@ -0,0 +1,19 @@
+Only in mathmap-1.3.5/rwimg: librwimg.a
+Only in mathmap-1.3.5/rwimg: readimage.o
+Only in mathmap-1.3.5/rwimg: rwgif.o
+Only in mathmap-1.3.5/rwimg: rwjpeg.o
+diff -ru mathmap-1.3.5-orig/rwimg/rwpng.c mathmap-1.3.5/rwimg/rwpng.c
+--- mathmap-1.3.5-orig/rwimg/rwpng.c 2013-06-09 22:45:53.000000000 +0200
++++ mathmap-1.3.5/rwimg/rwpng.c 2013-06-09 22:46:40.000000000 +0200
+@@ -189,9 +189,6 @@
+ if (setjmp (png_jmpbuf (data->png_ptr)))
+ assert(0);
+
+- if (pixel_stride == 4)
+- png_set_filler(data->png_ptr, 0, PNG_FILLER_AFTER);
+-
+ png_init_io(data->png_ptr, data->file);
+
+ png_set_IHDR (data->png_ptr, data->info_ptr,
+Only in mathmap-1.3.5/rwimg: rwpng.o
+Only in mathmap-1.3.5/rwimg: writeimage.o
diff --git a/media-gfx/mathmap/mathmap-1.3.5-r1.ebuild b/media-gfx/mathmap/mathmap-1.3.5-r1.ebuild
index 4cc0789..e3fd83d 100644
--- a/media-gfx/mathmap/mathmap-1.3.5-r1.ebuild
+++ b/media-gfx/mathmap/mathmap-1.3.5-r1.ebuild
@@ -26,6 +26,7 @@ DEPEND="${RDEPEND}
src_prepare() {
epatch "${FILESDIR}/${PN}-libpng16.patch"
+ epatch "${FILESDIR}/${PN}-remove-png_set_filler.patch"
}
src_compile() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-06-15 14:50 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-12-25 14:08 [gentoo-commits] dev/ikelos:master commit in: media-gfx/mathmap/files/, media-gfx/mathmap/ Mike Auty
-- strict thread matches above, loose matches on Subject: below --
2013-06-09 12:29 Mike Auty
2013-06-15 14:50 Mike Auty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox