diff options
| author |   James Le Cuirot <chewi@gentoo.org> | 2019-04-14 17:24:41 +0100 |
|---|---|---|
| committer | James Le Cuirot <chewi@gentoo.org> | 2019-04-14 17:25:29 +0100 |
| commit | 106c26f9a93a0c86346a3ef378ee62ec15bc89d1 (patch) | |
| tree | 68af374d861677c6eb40b774a79a164d25db7e18 /media-libs | |
| parent | x11-wm/marco: x86 stable wrt bug #682168 (diff) | |
| download | gentoo-106c26f9a93a0c86346a3ef378ee62ec15bc89d1.tar.gz gentoo-106c26f9a93a0c86346a3ef378ee62ec15bc89d1.tar.bz2 gentoo-106c26f9a93a0c86346a3ef378ee62ec15bc89d1.zip | |
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@gentoo.org>
Diffstat (limited to 'media-libs')
| -rw-r--r-- | media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch | 24 | ||||
| -rw-r--r-- | media-libs/freeimage/freeimage-3.18.0.ebuild | 1 |
2 files changed, 25 insertions, 0 deletions
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 000000000000..fe344229520f --- /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 35dd66ffd42f..fa58c6fc2f75 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() { |