commit: 106c26f9a93a0c86346a3ef378ee62ec15bc89d1 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org> AuthorDate: Sun Apr 14 16:24:41 2019 +0000 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org> CommitDate: Sun Apr 14 16:25:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106c26f9
media-libs/freeimage: Fix building against libjpeg-9 Upstream only applied half of the earlier patch. Closes: https://bugs.gentoo.org/683320 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: James Le Cuirot <chewi <AT> gentoo.org> .../files/freeimage-3.18.0-libjpeg9.patch | 24 ++++++++++++++++++++++ media-libs/freeimage/freeimage-3.18.0.ebuild | 1 + 2 files changed, 25 insertions(+) diff --git a/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch new file mode 100644 index 00000000000..fe344229520 --- /dev/null +++ b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch @@ -0,0 +1,24 @@ +Bug: https://bugs.gentoo.org/647422 +Upstream Patch: https://sourceforge.net/p/freeimage/patches/130/ + +diff -Naur a/Source/FreeImage.h b/Source/FreeImage.h +--- a/Source/FreeImage.h 2018-03-24 23:24:11.066695395 -0400 ++++ b/Source/FreeImage.h 2018-03-24 23:26:35.945391182 -0400 +@@ -117,12 +117,17 @@ + #ifndef _WINDOWS_ + #define _WINDOWS_ + ++#if JPEG_LIB_VERSION < 90 ++ + #ifndef FALSE + #define FALSE 0 + #endif + #ifndef TRUE + #define TRUE 1 + #endif ++ ++#endif ++ + #ifndef NULL + #define NULL 0 + #endif diff --git a/media-libs/freeimage/freeimage-3.18.0.ebuild b/media-libs/freeimage/freeimage-3.18.0.ebuild index 35dd66ffd42..fa58c6fc2f7 100644 --- a/media-libs/freeimage/freeimage-3.18.0.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0.ebuild @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch "${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch "${FILESDIR}"/${PN}-3.18.0-raw.patch + "${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch ) src_prepare() {
