From 4f2d7949f03e1c198bc888f2d05f421d35c57e21 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 9 Oct 2017 18:53:29 +0100 Subject: reinit the tree, so we can have metadata --- media-gfx/metapixel/Manifest | 8 ++ .../metapixel/files/metapixel-1.0.2-giflib5.patch | 21 +++ .../metapixel/files/metapixel-1.0.2-libpng15.patch | 141 +++++++++++++++++++++ media-gfx/metapixel/metadata.xml | 8 ++ media-gfx/metapixel/metapixel-1.0.2-r1.ebuild | 44 +++++++ media-gfx/metapixel/metapixel-1.0.2.ebuild | 37 ++++++ 6 files changed, 259 insertions(+) create mode 100644 media-gfx/metapixel/Manifest create mode 100644 media-gfx/metapixel/files/metapixel-1.0.2-giflib5.patch create mode 100644 media-gfx/metapixel/files/metapixel-1.0.2-libpng15.patch create mode 100644 media-gfx/metapixel/metadata.xml create mode 100644 media-gfx/metapixel/metapixel-1.0.2-r1.ebuild create mode 100644 media-gfx/metapixel/metapixel-1.0.2.ebuild (limited to 'media-gfx/metapixel') diff --git a/media-gfx/metapixel/Manifest b/media-gfx/metapixel/Manifest new file mode 100644 index 000000000000..909f4365d9a3 --- /dev/null +++ b/media-gfx/metapixel/Manifest @@ -0,0 +1,8 @@ +AUX metapixel-1.0.2-giflib5.patch 529 SHA256 3cd1577270db71766b88138e9de8d4f059c483fb5ae60262aa7fd23153c0706a SHA512 1e6636ae03f05b9b1ce3a766cae4b19503a1eddd85cb4a97dcd63511d1520bd11dde3e3d76d3ec6ff23839e49be62a8fa704e25323ed28232e27eaf625fe4b17 WHIRLPOOL a8f8fbf3f99a8ba221c4f0b5f31e0c46f38a4204ba09bf7b7a1746b922f960d247d7f69e6af8110c7cf2a7adc2dbc07fb36fe756b6c3ad9bbca9e23a73e3800a +AUX metapixel-1.0.2-libpng15.patch 4395 SHA256 a23d9186888b64ff2e6b52556b18f746204437de57c5daa752cb39822e5a995b SHA512 5edf6adb335de038996589bbfa799df471aeb8aec41d46f639ff4165fe9574b8a103bfdbdf086ac48de29d11dd263166e0787aad8ebc1298a9865837cc2d3282 WHIRLPOOL 8b34dd93dbfc3fb912a4e2a70f296c5da97ab5d8e171ad21b1acce0423fc174e5af9f85c0bb75e4441c1a2288b62267f333a9edf67187574d4936430ab19542d +DIST metapixel-1.0.2.tar.gz 63197 SHA256 8d77810978da397c070b9b4e228ae6204e9f5c524518ad1a4fcab9462171f55b SHA512 88a718fc349b9063c61a8ac24fc41923c742b25fb7e84c6b565ac92a301a04b46870750d5c06f751b2104c3f36108365b45214b52a6ede98da83441e2e30e156 WHIRLPOOL f6fa39af34d54a2d8940ce4e1b66347a606bd7eef78f0edc574826cc95b93ce25c6528f9857f7ba6420054fcf4ff03271e3ddd9447298b49e19c954f3634393e +EBUILD metapixel-1.0.2-r1.ebuild 906 SHA256 5f66a43c4bc7b0ea0455cb41dda780efaa94874f88a2b7d033258947e6488419 SHA512 36cb8e252ac3cd90d168e9780b43d236fc9bd7afd80ed5034cfdc03db7264bf08fb79a063d0fe5ff94523363d418fa50b5a1c3f7c986d200ff586d70cac7b4e2 WHIRLPOOL 038567fe75253eeab8684ab71c92d1b2bffe65088741a23aa8628ed2fc15cd8bcf2002ae2bd69f4c5808fd7683515f9165a4708b1150d946512a8b3a5bed55cf +EBUILD metapixel-1.0.2.ebuild 849 SHA256 dd7b79f75893a242a71a9e202b2f65a31914994d81263d201d2113c237ea1cc5 SHA512 d533ea2001fd5d02e33b724a1b2afac2e2f63b25c3f7ee1cda02544684b732257e0139da1ec42b88da5e0047d5a6f9aeb413cd442f598d682e79c27aa65edf9f WHIRLPOOL f675ec2255088d232665551e4b4a74c75e82c1a39f9a240888286e92a96772ac4dffc90cf416b417082e9f7fc5f8f93a2f0081b1e74f075477809eb116326750 +MISC ChangeLog 2894 SHA256 8603727c424e192e1cf951f567bb5400fbcf93a1d1908ae0ea3c972d8192b760 SHA512 1783ddf48ecb04b24befd59fd8ea2f19baa32f3ad91743ba9dd734724fa4ea22c7bc6b69f0ec85538889e7e878964dc166f9ede249cd19b54980721ae61dc32d WHIRLPOOL 59cc3abfc330ba633b44b7b59a98b5e322d345550aad02d8aefd940a6f1b0437c2aa69e3af12d9dfdbb108374c6501198f54f839f05a814a6ecc34dbe0aa9697 +MISC ChangeLog-2015 872 SHA256 e55fc699bfad682919db4055cf82bedea3e2dd747cea7ca7a5279e4ac86734fc SHA512 b014ad2409c59e5ec14eae0af603831a046884b090649219d2a7279e12475bf63b71a4d5f1c924a4bcd0c7e0a9a87e9b7539c8e4e7304be2e9b7ed13937f8da6 WHIRLPOOL 9f444406284c9b1d1d76d8e0b4aabc9eea7870ffa8826f5a217be8d664a4b4d3a9ce686ff94263c3084daa08cd855d4796043870bcc5e2b9407c67f155fc8892 +MISC metadata.xml 255 SHA256 3e7137870fc49956d79719e3dfe029775cbaaa097e85748c139713c46fcd1798 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f WHIRLPOOL 392188d7e069f1720be9329edfb31b11b176bf0c411023b2ceeaeabef1cacf842d70657a2a14ac2ddabbdad70a304275f3b587e9bcdfe77be63a0092e370252c diff --git a/media-gfx/metapixel/files/metapixel-1.0.2-giflib5.patch b/media-gfx/metapixel/files/metapixel-1.0.2-giflib5.patch new file mode 100644 index 000000000000..b543dc4c783b --- /dev/null +++ b/media-gfx/metapixel/files/metapixel-1.0.2-giflib5.patch @@ -0,0 +1,21 @@ +diff -u metapixel-1.0.2/debian/changelog metapixel-1.0.2/debian/changelog +--- metapixel-1.0.2.orig/rwimg/rwgif.c ++++ metapixel-1.0.2/rwimg/rwgif.c +@@ -54,7 +54,7 @@ + + assert(data != 0); + +- data->file = DGifOpenFileName(filename); ++ data->file = DGifOpenFileName(filename, NULL); + + assert(data->file !=0); + +@@ -137,7 +137,7 @@ + } + free(buffer); + +- assert(DGifCloseFile(data->file) == GIF_OK); ++ assert(DGifCloseFile(data->file, NULL) == GIF_OK); + + return data; + } diff --git a/media-gfx/metapixel/files/metapixel-1.0.2-libpng15.patch b/media-gfx/metapixel/files/metapixel-1.0.2-libpng15.patch new file mode 100644 index 000000000000..f766fb14e02a --- /dev/null +++ b/media-gfx/metapixel/files/metapixel-1.0.2-libpng15.patch @@ -0,0 +1,141 @@ +--- a/rwimg/rwpng.c ++++ b/rwimg/rwpng.c +@@ -42,6 +42,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,_interlace_type,_compression,_filter; + + assert(data != 0); + +@@ -57,19 +58,20 @@ + 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; +- +- assert(data->info_ptr->bit_depth == 8 || data->info_ptr->bit_depth == 16); +- assert(data->info_ptr->color_type == PNG_COLOR_TYPE_RGB || data->info_ptr->color_type == PNG_COLOR_TYPE_RGB_ALPHA); +- assert(data->info_ptr->interlace_type == PNG_INTERLACE_NONE); ++ png_get_IHDR(data->png_ptr,data->info_ptr, ++ (png_uint_32 *)width,(png_uint_32 *)height, ++ &_bit_depth,&_color_type,&_interlace_type,&_compression,&_filter); ++ ++ assert(_bit_depth == 8 || _bit_depth == 16); ++ assert(_color_type == PNG_COLOR_TYPE_RGB || _color_type == PNG_COLOR_TYPE_RGB_ALPHA); ++ assert(_interlace_type == PNG_INTERLACE_NONE); + + data->have_read = 0; + +@@ -83,30 +85,36 @@ + int i; + int bps, spp; + unsigned char *row; ++ png_uint_32 _width,_height; ++ int _bit_depth,_color_type,_interlace_type,_compression,_filter; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + +- if (data->info_ptr->color_type == PNG_COLOR_TYPE_RGB) ++ png_get_IHDR(data->png_ptr,data->info_ptr, ++ &_width,&_height,&_bit_depth,&_color_type,&_interlace_type, ++ &_compression,&_filter); ++ ++ if (_color_type == PNG_COLOR_TYPE_RGB) + spp = 3; + else + spp = 4; + +- if (data->info_ptr->bit_depth == 16) ++ if (_bit_depth == 16) + bps = 2; + else + bps = 1; + +- row = (unsigned char*)malloc(data->info_ptr->width * spp * bps); ++ row = (unsigned char*)malloc(_width * spp * bps); + + for (i = 0; i < num_lines; ++i) + { + int j, channel; + + png_read_row(data->png_ptr, (png_bytep)row, 0); +- 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 + channel * bps]; ++ lines[i * _width * 3 + j * 3 + channel] = row[j * spp * bps + channel * bps]; + } + + free(row); +@@ -119,7 +127,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) +@@ -148,7 +156,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) +@@ -156,18 +164,14 @@ + + png_init_io(data->png_ptr, data->file); + +- data->info_ptr->width = width; +- data->info_ptr->height = height; +- data->info_ptr->valid = 0; ++ 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); ++ /* setting these to 0 so just skipping ... + 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; ++ data->info_ptr->num_trans = 0; */ + + png_write_info(data->png_ptr, data->info_ptr); + +@@ -182,7 +186,7 @@ + png_data_t *data = (png_data_t*)_data; + int i; + +- if (setjmp(data->png_ptr->jmpbuf)) ++ if (setjmp(png_jmpbuf(data->png_ptr))) + assert(0); + + for (i = 0; i < num_lines; ++i) +@@ -194,7 +198,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); diff --git a/media-gfx/metapixel/metadata.xml b/media-gfx/metapixel/metadata.xml new file mode 100644 index 000000000000..19bf1be2581e --- /dev/null +++ b/media-gfx/metapixel/metadata.xml @@ -0,0 +1,8 @@ + + + + + graphics@gentoo.org + Gentoo Graphics Project + + diff --git a/media-gfx/metapixel/metapixel-1.0.2-r1.ebuild b/media-gfx/metapixel/metapixel-1.0.2-r1.ebuild new file mode 100644 index 000000000000..ac2b134a26c8 --- /dev/null +++ b/media-gfx/metapixel/metapixel-1.0.2-r1.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +inherit toolchain-funcs + +DESCRIPTION="a program for generating photomosaics" +HOMEPAGE="http://www.complang.tuwien.ac.at/schani/metapixel" +SRC_URI="http://www.complang.tuwien.ac.at/schani/${PN}/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND=" + dev-lang/perl + >=media-libs/giflib-5:0= + >=media-libs/libpng-1.4:0= + virtual/jpeg:0 +" +DEPEND="${RDEPEND}" + +PATCHES=( + "${FILESDIR}"/${P}-libpng15.patch + "${FILESDIR}"/${P}-giflib5.patch +) + +src_prepare() { + default + + sed -i -e 's:/usr/X11R6:/usr:g' Makefile || die + sed -i -e 's:ar:$(AR):' rwimg/Makefile || die +} + +src_compile() { + emake AR="$(tc-getAR)" CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" LDOPTS="${LDFLAGS}" +} + +src_install() { + dobin ${PN}{,-prepare,-imagesize,-sizesort} + doman ${PN}.1 + dodoc NEWS README +} diff --git a/media-gfx/metapixel/metapixel-1.0.2.ebuild b/media-gfx/metapixel/metapixel-1.0.2.ebuild new file mode 100644 index 000000000000..3f70113b8623 --- /dev/null +++ b/media-gfx/metapixel/metapixel-1.0.2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 +inherit eutils toolchain-funcs + +DESCRIPTION="a program for generating photomosaics" +HOMEPAGE="http://www.complang.tuwien.ac.at/schani/metapixel" +SRC_URI="http://www.complang.tuwien.ac.at/schani/${PN}/files/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="amd64 x86" +IUSE="" + +RDEPEND="dev-lang/perl + media-libs/giflib + >=media-libs/libpng-1.4 + virtual/jpeg" +DEPEND="${RDEPEND}" + +src_prepare() { + epatch "${FILESDIR}"/${P}-libpng15.patch + + sed -i -e 's:/usr/X11R6:/usr:g' Makefile || die + sed -i -e 's:ar:$(AR):' rwimg/Makefile || die +} + +src_compile() { + emake AR="$(tc-getAR)" CC="$(tc-getCC)" OPTIMIZE="${CFLAGS}" LDOPTS="${LDFLAGS}" +} + +src_install() { + dobin ${PN}{,-prepare,-imagesize,-sizesort} + doman ${PN}.1 + dodoc NEWS README +} -- cgit v1.2.3