| 1 |
commit: 92a96376e1c419e60b6d42ff290dd20a74e6c3d6 |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Apr 11 14:57:24 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Apr 11 16:45:18 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=92a96376 |
| 7 |
|
| 8 |
media-libs/libmng: Fix building with media-libs/jpeg |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/665634 |
| 11 |
Package-Manager: Portage-2.3.62, Repoman-2.3.12 |
| 12 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 13 |
|
| 14 |
media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch | 14 +++++++++----- |
| 15 |
1 file changed, 9 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
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 |
| 18 |
index 9441f00137d..459b42e7db7 100644 |
| 19 |
--- a/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch |
| 20 |
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch |
| 21 |
@@ -28,13 +28,17 @@ https://bugs.gentoo.org/578744 |
| 22 |
|
| 23 |
--- a/libmng_types.h 2015-04-20 21:17:32.000000000 +0200 |
| 24 |
+++ b/libmng_types.h 2018-09-06 22:56:57.153190623 +0200 |
| 25 |
-@@ -201,9 +201,6 @@ |
| 26 |
+@@ -200,13 +200,6 @@ |
| 27 |
+ #undef FAR /* possibly defined by zlib or lcms */ |
| 28 |
#endif |
| 29 |
#define JPEG_INTERNAL_OPTIONS /* for RGB_PIXELSIZE */ |
| 30 |
- /* There has been a change in jpeg-9 : */ |
| 31 |
+-/* There has been a change in jpeg-9 : */ |
| 32 |
-#if !defined(HAVE_BOOLEAN) && !defined(_WIN32) |
| 33 |
-#define HAVE_BOOLEAN |
| 34 |
-#endif |
| 35 |
- #ifndef _WIN32 |
| 36 |
- typedef int boolean; |
| 37 |
- #endif |
| 38 |
+-#ifndef _WIN32 |
| 39 |
+-typedef int boolean; |
| 40 |
+-#endif |
| 41 |
+ /* For jpegsrc.v09a: */ |
| 42 |
+ #include <stdio.h> |
| 43 |
+ #include <jpeglib.h> |
Archives