[gentoo-commits] repo/gentoo:master commit in: media-libs/libmng/, media-libs/libmng/files/

[Andreas Sturmlechner]

commit:     a5109d66d2d08c47bbf301590e6587e3c5b1edd5
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  6 21:03:46 2018 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Thu Sep  6 21:05:59 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a5109d66

media-libs/libmng: Adapt jpeg-9a.patch for 2.0.3

Bug: https://bugs.gentoo.org/578744
Package-Manager: Portage-2.3.49, Repoman-2.3.10

 media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch | 40 ++++++++++++++++++++++
 media-libs/libmng/libmng-2.0.3.ebuild              |  2 ++
 2 files changed, 42 insertions(+)

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
new file mode 100644
index 00000000000..9441f00137d
--- /dev/null
+++ b/media-libs/libmng/files/libmng-2.0.3-jpeg-9a.patch
@@ -0,0 +1,40 @@
+http://bugs.gentoo.org/520906
+
+This kludge is unnecessary with jpeg-9a and is in fact breaking the build...
+
+libmng_jpeg.c:108:10: error: 'FALSE' undeclared (first use in this function)
+libmng_jpeg.c:536:48: error: 'TRUE' undeclared (first use in this function)
+libmng_jpeg_c:890:49: error: 'TRUE' undeclared (first use in this function)
+
+...because jmorecfg.h of jpeg-9a has this:
+
+#ifndef HAVE_BOOLEAN
+#if defined FALSE || defined TRUE || defined QGLOBAL_H
+/* Qt3 defines FALSE and TRUE as "const" variables in qglobal.h */
+typedef int boolean;
+#ifndef FALSE                   /* in case these macros already exist */
+#define FALSE   0               /* values of boolean */
+#endif
+#ifndef TRUE
+#define TRUE    1
+#endif
+#else
+typedef enum { FALSE = 0, TRUE = 1 } boolean;
+#endif
+#endif
+
[phone]: Adjusted for libmng-2.0.3
+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 @@
+ #endif
+ #define JPEG_INTERNAL_OPTIONS          /* for RGB_PIXELSIZE */
+ /* There has been a change in jpeg-9 : */
+-#if !defined(HAVE_BOOLEAN) && !defined(_WIN32)
+-#define HAVE_BOOLEAN
+-#endif
+ #ifndef _WIN32
+ typedef int boolean;
+ #endif

diff --git a/media-libs/libmng/libmng-2.0.3.ebuild b/media-libs/libmng/libmng-2.0.3.ebuild
index 6e68deaa68d..02e62532f37 100644
--- a/media-libs/libmng/libmng-2.0.3.ebuild
+++ b/media-libs/libmng/libmng-2.0.3.ebuild
@@ -20,6 +20,8 @@ RDEPEND="
 	lcms? ( >=media-libs/lcms-2.5:2[static-libs?,${MULTILIB_USEDEP}] )"
 DEPEND="${RDEPEND}"
 
+PATCHES=( "${FILESDIR}"/${P}-jpeg-9a.patch )
+
 src_prepare() {
 	emake distclean
 	default