| 1 |
commit: bc9d0ab7531be52dcde085e832feac2f3a9b7e99 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 11 20:48:11 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 11 20:48:53 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc9d0ab7 |
| 7 |
|
| 8 |
sci-visualization/gle: Fix building with media-libs/jpeg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/647626 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
.../gle/files/gle-4.2.5-jpeg-9c.patch | 22 ++++++++++++++++++++++ |
| 15 |
sci-visualization/gle/gle-4.2.5-r1.ebuild | 10 ++++++---- |
| 16 |
2 files changed, 28 insertions(+), 4 deletions(-) |
| 17 |
|
| 18 |
diff --git a/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..c5dd2205dc4 |
| 21 |
--- /dev/null |
| 22 |
+++ b/sci-visualization/gle/files/gle-4.2.5-jpeg-9c.patch |
| 23 |
@@ -0,0 +1,22 @@ |
| 24 |
+https://bugs.gentoo.org/647626 |
| 25 |
+ |
| 26 |
+--- a/src/gle/gle-poppler.cpp |
| 27 |
++++ b/src/gle/gle-poppler.cpp |
| 28 |
+@@ -194,7 +194,7 @@ |
| 29 |
+ boolean gle_jpeg_empty_output_buffer(j_compress_ptr cinfo) { |
| 30 |
+ gle_jpeg_term_destination(cinfo); |
| 31 |
+ gle_jpeg_init_destination(cinfo); |
| 32 |
+- return true; |
| 33 |
++ return TRUE; |
| 34 |
+ } |
| 35 |
+ |
| 36 |
+ void gle_jpeg_memory_dest(j_compress_ptr cinfo, JOCTET* buffer, GLEWriteFuncAndClosure writeCallback) { |
| 37 |
+@@ -237,7 +237,7 @@ |
| 38 |
+ cinfo.in_color_space = JCS_RGB; |
| 39 |
+ } |
| 40 |
+ jpeg_set_defaults(&cinfo); |
| 41 |
+- jpeg_start_compress(&cinfo, true); |
| 42 |
++ jpeg_start_compress(&cinfo, TRUE); |
| 43 |
+ JSAMPROW row = new JSAMPLE[cinfo.input_components * width]; |
| 44 |
+ JSAMPROW row_pointer[1]; |
| 45 |
+ row_pointer[0] = row; |
| 46 |
|
| 47 |
diff --git a/sci-visualization/gle/gle-4.2.5-r1.ebuild b/sci-visualization/gle/gle-4.2.5-r1.ebuild |
| 48 |
index c9157c01809..f0d2a19ba6a 100644 |
| 49 |
--- a/sci-visualization/gle/gle-4.2.5-r1.ebuild |
| 50 |
+++ b/sci-visualization/gle/gle-4.2.5-r1.ebuild |
| 51 |
@@ -1,4 +1,4 @@ |
| 52 |
-# Copyright 1999-2018 Gentoo Foundation |
| 53 |
+# Copyright 1999-2019 Gentoo Authors |
| 54 |
# Distributed under the terms of the GNU General Public License v2 |
| 55 |
|
| 56 |
EAPI=6 |
| 57 |
@@ -30,9 +30,11 @@ RDEPEND="${DEPEND} |
| 58 |
|
| 59 |
S="${WORKDIR}"/${MY_P} |
| 60 |
|
| 61 |
-PATCHES=( "${FILESDIR}"/${P}-parallel.patch |
| 62 |
- "${FILESDIR}"/${P}-c++14.patch |
| 63 |
- ) |
| 64 |
+PATCHES=( |
| 65 |
+ "${FILESDIR}"/${P}-parallel.patch |
| 66 |
+ "${FILESDIR}"/${P}-c++14.patch |
| 67 |
+ "${FILESDIR}"/${P}-jpeg-9c.patch |
| 68 |
+) |
| 69 |
|
| 70 |
src_prepare() { |
| 71 |
default |
Archives