| 1 |
commit: 096cba611287ea75dac3046d8545fea46816831f |
| 2 |
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue Apr 4 12:14:49 2017 +0000 |
| 4 |
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue Apr 4 12:18:28 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=096cba61 |
| 7 |
|
| 8 |
media-gfx/greycstoration: Fix gcc6 support, bug #594140 by Peter Levine |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.5, Repoman-2.3.2 |
| 11 |
|
| 12 |
.../files/greycstoration-2.9-gcc6.patch | 11 ++++++++ |
| 13 |
.../files/greycstoration-2.9-libpng14.patch | 4 +-- |
| 14 |
...-2.9-r1.ebuild => greycstoration-2.9-r2.ebuild} | 31 +++++++++++++--------- |
| 15 |
3 files changed, 31 insertions(+), 15 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-gfx/greycstoration/files/greycstoration-2.9-gcc6.patch b/media-gfx/greycstoration/files/greycstoration-2.9-gcc6.patch |
| 18 |
new file mode 100644 |
| 19 |
index 00000000000..5b957c6ece9 |
| 20 |
--- /dev/null |
| 21 |
+++ b/media-gfx/greycstoration/files/greycstoration-2.9-gcc6.patch |
| 22 |
@@ -0,0 +1,11 @@ |
| 23 |
+--- a/plugins/greycstoration.h 2016-09-22 22:46:42.907946423 -0400 |
| 24 |
++++ b/plugins/greycstoration.h 2016-09-22 22:49:56.439530308 -0400 |
| 25 |
+@@ -454,7 +454,7 @@ |
| 26 |
+ p.temporary = 0; |
| 27 |
+ p.counter = 0; |
| 28 |
+ p.tile = p.tile_border = p.thread = p.nb_threads = 0; |
| 29 |
+- p.stop_request = false; |
| 30 |
++ p.stop_request = NULL; |
| 31 |
+ greycstoration_mutex_destroy(p); |
| 32 |
+ } |
| 33 |
+ p.is_running = false; |
| 34 |
|
| 35 |
diff --git a/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch b/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch |
| 36 |
index e8c0276f891..087f20fb875 100644 |
| 37 |
--- a/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch |
| 38 |
+++ b/media-gfx/greycstoration/files/greycstoration-2.9-libpng14.patch |
| 39 |
@@ -1,7 +1,7 @@ |
| 40 |
http://repos.archlinux.org/wsvn/community/greycstoration/trunk/libpng14.patch |
| 41 |
|
| 42 |
---- CImg.h |
| 43 |
-+++ CImg.h |
| 44 |
+--- a/CImg.h |
| 45 |
++++ b/CImg.h |
| 46 |
@@ -25671,7 +25671,7 @@ |
| 47 |
png_read_info(png_ptr,info_ptr); |
| 48 |
png_uint_32 W, H; |
| 49 |
|
| 50 |
diff --git a/media-gfx/greycstoration/greycstoration-2.9-r1.ebuild b/media-gfx/greycstoration/greycstoration-2.9-r2.ebuild |
| 51 |
similarity index 77% |
| 52 |
rename from media-gfx/greycstoration/greycstoration-2.9-r1.ebuild |
| 53 |
rename to media-gfx/greycstoration/greycstoration-2.9-r2.ebuild |
| 54 |
index dac64f5350c..393b930c5b2 100644 |
| 55 |
--- a/media-gfx/greycstoration/greycstoration-2.9-r1.ebuild |
| 56 |
+++ b/media-gfx/greycstoration/greycstoration-2.9-r2.ebuild |
| 57 |
@@ -1,9 +1,8 @@ |
| 58 |
-# Copyright 1999-2013 Gentoo Foundation |
| 59 |
+# Copyright 1999-2017 Gentoo Foundation |
| 60 |
# Distributed under the terms of the GNU General Public License v2 |
| 61 |
|
| 62 |
-EAPI=5 |
| 63 |
- |
| 64 |
-inherit eutils toolchain-funcs |
| 65 |
+EAPI=6 |
| 66 |
+inherit toolchain-funcs |
| 67 |
|
| 68 |
DESCRIPTION="Image regularization algorithm for denoising, inpainting and resizing" |
| 69 |
HOMEPAGE="http://www.greyc.ensicaen.fr/~dtschump/greycstoration/" |
| 70 |
@@ -18,23 +17,29 @@ RDEPEND=" |
| 71 |
x11-libs/libX11 |
| 72 |
x11-libs/libXext |
| 73 |
x11-libs/libXrandr |
| 74 |
- fftw? ( >=sci-libs/fftw-3 ) |
| 75 |
- imagemagick? ( media-gfx/imagemagick ) |
| 76 |
- jpeg? ( virtual/jpeg ) |
| 77 |
+ fftw? ( >=sci-libs/fftw-3:3.0= ) |
| 78 |
+ imagemagick? ( media-gfx/imagemagick:0= ) |
| 79 |
+ jpeg? ( virtual/jpeg:0 ) |
| 80 |
lapack? ( virtual/lapack ) |
| 81 |
- png? ( >=media-libs/libpng-1.4 ) |
| 82 |
- tiff? ( media-libs/tiff )" |
| 83 |
+ png? ( >=media-libs/libpng-1.4:0= ) |
| 84 |
+ tiff? ( media-libs/tiff:0 ) |
| 85 |
+" |
| 86 |
DEPEND="${RDEPEND} |
| 87 |
app-arch/unzip |
| 88 |
fftw? ( virtual/pkgconfig ) |
| 89 |
lapack? ( virtual/pkgconfig ) |
| 90 |
- png? ( virtual/pkgconfig )" |
| 91 |
+ png? ( virtual/pkgconfig ) |
| 92 |
+" |
| 93 |
|
| 94 |
-S=${WORKDIR}/GREYCstoration-${PV}/src |
| 95 |
+S="${WORKDIR}/GREYCstoration-${PV}/src" |
| 96 |
|
| 97 |
-src_prepare() { |
| 98 |
- epatch "${FILESDIR}"/${P}-libpng14.patch |
| 99 |
+PATCHES=( |
| 100 |
+ "${FILESDIR}"/${P}-libpng14.patch |
| 101 |
+ "${FILESDIR}"/${P}-gcc6.patch |
| 102 |
+) |
| 103 |
|
| 104 |
+src_prepare() { |
| 105 |
+ default |
| 106 |
sed -i \ |
| 107 |
-e "s:../CImg.h:CImg.h:" \ |
| 108 |
greycstoration.cpp || die |
Archives