| 1 |
commit: 92d976e1989d6a319bad89b4c83d0507a80be435 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 11 10:36:50 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 11 10:38:40 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92d976e1 |
| 7 |
|
| 8 |
media-gfx/maim: Fix building with libjpeg |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/656520 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch | 16 ++++++++++++++++ |
| 15 |
media-gfx/maim/maim-5.5.1.ebuild | 4 +++- |
| 16 |
2 files changed, 19 insertions(+), 1 deletion(-) |
| 17 |
|
| 18 |
diff --git a/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch b/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..83029fab828 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/maim/files/maim-5.5.1-libjpeg-9c.patch |
| 23 |
@@ -0,0 +1,16 @@ |
| 24 |
+Allow building with libjpeg-9c |
| 25 |
+Bug: https://bugs.gentoo.org/656520 |
| 26 |
+ |
| 27 |
+--- a/src/image.cpp |
| 28 |
++++ b/src/image.cpp |
| 29 |
+@@ -187,8 +187,8 @@ |
| 30 |
+ |
| 31 |
+ jpeg_set_defaults(&cinfo); |
| 32 |
+ // Convert quality from scale 1-10 to 0-100 |
| 33 |
+- jpeg_set_quality (&cinfo, (int)((float)quality-1.f)*(100.f/9.f), true); |
| 34 |
+- jpeg_start_compress(&cinfo, true); |
| 35 |
++ jpeg_set_quality (&cinfo, (int)((float)quality-1.f)*(100.f/9.f), TRUE); |
| 36 |
++ jpeg_start_compress(&cinfo, TRUE); |
| 37 |
+ |
| 38 |
+ JSAMPROW row_pointer; |
| 39 |
+ unsigned char* buffer = (unsigned char*)data; |
| 40 |
|
| 41 |
diff --git a/media-gfx/maim/maim-5.5.1.ebuild b/media-gfx/maim/maim-5.5.1.ebuild |
| 42 |
index cb8869b7b80..a225be4803a 100644 |
| 43 |
--- a/media-gfx/maim/maim-5.5.1.ebuild |
| 44 |
+++ b/media-gfx/maim/maim-5.5.1.ebuild |
| 45 |
@@ -1,4 +1,4 @@ |
| 46 |
-# Copyright 1999-2018 Gentoo Foundation |
| 47 |
+# Copyright 1999-2019 Gentoo Authors |
| 48 |
# Distributed under the terms of the GNU General Public License v2 |
| 49 |
|
| 50 |
EAPI=6 |
| 51 |
@@ -35,6 +35,8 @@ RDEPEND=" |
| 52 |
" |
| 53 |
DEPEND="${RDEPEND}" |
| 54 |
|
| 55 |
+PATCHES=( "${FILESDIR}"/${PN}-5.5.1-libjpeg-9c.patch ) |
| 56 |
+ |
| 57 |
src_configure() { |
| 58 |
local mycmakeargs=( |
| 59 |
-DMAIM_UNICODE=$(usex unicode) |
Archives