summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Seifert <soap@gentoo.org>2019-04-11 16:57:24 +0200
committerDavid Seifert <soap@gentoo.org>2019-04-11 18:45:18 +0200
commit92a96376e1c419e60b6d42ff290dd20a74e6c3d6 (patch)
tree36f6692d1b7dd4a4c77be8900673eccd4094314a /media-libs
parentgames-board/grhino: Disable optional libgnome2 support (diff)
downloadgentoo-92a96376e1c419e60b6d42ff290dd20a74e6c3d6.tar.gz
gentoo-92a96376e1c419e60b6d42ff290dd20a74e6c3d6.tar.bz2
gentoo-92a96376e1c419e60b6d42ff290dd20a74e6c3d6.zip
media-libs/libmng: Fix building with media-libs/jpeg
Closes: https://bugs.gentoo.org/665634 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch14
1 files changed, 9 insertions, 5 deletions
diff --git a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
index 9441f00137d..459b42e7db7 100644
--- a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
@@ -28,13 +28,17 @@ https://bugs.gentoo.org/578744
--- a/libmng_types.h 2015-04-20 21:17:32.000000000 +0200
+++ b/libmng_types.h 2018-09-06 22:56:57.153190623 +0200
-@@ -201,9 +201,6 @@
+@@ -200,13 +200,6 @@
+ #undef FAR /* possibly defined by zlib or lcms */
#endif
#define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */
- /* There has been a change in jpeg-9 : */
+-/* There has been a change in jpeg-9 : */
-#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
-#define HAVE_BOOLEAN
-#endif
- #ifndef _WIN32
- typedef int boolean;
- #endif
+-#ifndef _WIN32
+-typedef int boolean;
+-#endif
+ /* For jpegsrc.v09a: */
+ #include <stdio.h>
+ #include <jpeglib.h>