| 1 |
commit: 343ed2ea158c870e3fe36e4c05e7c916e38bae36 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 11 21:53:02 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 11 21:53:52 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=343ed2ea |
| 7 |
|
| 8 |
media-gfx/fim: Fix building with media-libs/jpeg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/670020 |
| 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/fim/files/fim-0.5_rc3-jpeg-9c.patch | 26 ++++++++++++++++++++++++++ |
| 15 |
media-gfx/fim/fim-0.5_rc3.ebuild | 1 + |
| 16 |
2 files changed, 27 insertions(+) |
| 17 |
|
| 18 |
diff --git a/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch |
| 19 |
new file mode 100644 |
| 20 |
index 00000000000..3e0c3067a31 |
| 21 |
--- /dev/null |
| 22 |
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch |
| 23 |
@@ -0,0 +1,26 @@ |
| 24 |
+https://bugs.gentoo.org/670020 |
| 25 |
+ |
| 26 |
+--- a/src/FbiStuffJpeg.cpp |
| 27 |
++++ b/src/FbiStuffJpeg.cpp |
| 28 |
+@@ -115,7 +115,7 @@ |
| 29 |
+ cinfo->src->bytes_in_buffer = h->tsize; |
| 30 |
+ }*/ |
| 31 |
+ |
| 32 |
+-static int thumbnail_src_fill(struct jpeg_decompress_struct *cinfo) |
| 33 |
++static boolean thumbnail_src_fill(struct jpeg_decompress_struct *cinfo) |
| 34 |
+ { |
| 35 |
+ FIM_FBI_PRINTF("jpeg: panic: no more thumbnail input data\n"); |
| 36 |
+ exit(1); |
| 37 |
+--- a/src/FramebufferDevice.h |
| 38 |
++++ b/src/FramebufferDevice.h |
| 39 |
+@@ -37,8 +37,8 @@ |
| 40 |
+ #include "DisplayDevice.h" |
| 41 |
+ |
| 42 |
+ /* these are required by FbiStuffJpeg.cpp */ |
| 43 |
+-#define FIM_FBI_TRUE 1 |
| 44 |
+-#define FIM_FBI_FALSE 0 |
| 45 |
++#define FIM_FBI_TRUE TRUE |
| 46 |
++#define FIM_FBI_FALSE FALSE |
| 47 |
+ |
| 48 |
+ #ifndef FIM_WITH_NO_FRAMEBUFFER |
| 49 |
+ |
| 50 |
|
| 51 |
diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild |
| 52 |
index 95f133f017f..3e4bdf97f88 100644 |
| 53 |
--- a/media-gfx/fim/fim-0.5_rc3.ebuild |
| 54 |
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild |
| 55 |
@@ -42,6 +42,7 @@ PATCHES=( |
| 56 |
"${FILESDIR}/${PN}-0.4_rc3-poppler031.patch" |
| 57 |
"${FILESDIR}/${PN}-0.5_rc3-jpeg.patch" |
| 58 |
"${FILESDIR}/${PN}-0.5_rc3-libsdl.patch" |
| 59 |
+ "${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch" |
| 60 |
) |
| 61 |
|
| 62 |
src_prepare() { |
Archives