media-gfx/fim: Fix building with media-libs/jpeg

Closes: https://bugs.gentoo.org/670020
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: David Seifert <soap@gentoo.org>

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
new file mode 100644 (file)
index 0000000..3e0c306
--- /dev/null
+++ b/media-gfx/fim/files/fim-0.5_rc3-jpeg-9c.patch
@@ -0,0 +1,26 @@
+https://bugs.gentoo.org/670020
+
+--- a/src/FbiStuffJpeg.cpp
++++ b/src/FbiStuffJpeg.cpp
+@@ -115,7 +115,7 @@
+     cinfo->src->bytes_in_buffer = h->tsize;
+ }*/
+ 
+-static int thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
++static boolean thumbnail_src_fill(struct jpeg_decompress_struct *cinfo)
+ {
+     FIM_FBI_PRINTF("jpeg: panic: no more thumbnail input data\n");
+     exit(1);
+--- a/src/FramebufferDevice.h
++++ b/src/FramebufferDevice.h
+@@ -37,8 +37,8 @@
+ #include "DisplayDevice.h"
+ 
+ /* these are required by FbiStuffJpeg.cpp */
+-#define FIM_FBI_TRUE            1
+-#define FIM_FBI_FALSE           0
++#define FIM_FBI_TRUE            TRUE
++#define FIM_FBI_FALSE           FALSE
+ 
+ #ifndef FIM_WITH_NO_FRAMEBUFFER
+ 

diff --git a/media-gfx/fim/fim-0.5_rc3.ebuild b/media-gfx/fim/fim-0.5_rc3.ebuild
index 95f133f017fab58d3bddd7fddb99dc1624cec565..3e4bdf97f88a4f15a252444ab6c86d74e6ea70ee 100644 (file)
--- a/media-gfx/fim/fim-0.5_rc3.ebuild
+++ b/media-gfx/fim/fim-0.5_rc3.ebuild
@@ -42,6 +42,7 @@ PATCHES=(
        "${FILESDIR}/${PN}-0.4_rc3-poppler031.patch"
        "${FILESDIR}/${PN}-0.5_rc3-jpeg.patch"
        "${FILESDIR}/${PN}-0.5_rc3-libsdl.patch"
+       "${FILESDIR}/${PN}-0.5_rc3-jpeg-9c.patch"
 )
 
 src_prepare() {