Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/swftools/, media-gfx/swftools/files/
Date: Wed, 07 Feb 2018 22:33:34
Message-Id: 1518042798.0ea565c59a608e42a1a8653b95e4dd8ff51e6796.asturm@gentoo
1 commit: 0ea565c59a608e42a1a8653b95e4dd8ff51e6796
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 7 22:16:49 2018 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 7 22:33:18 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea565c5
7
8 media-gfx/swftools: Fix build with jpeg-9
9
10 Closes: https://bugs.gentoo.org/520934
11 Package-Manager: Portage-2.3.24, Repoman-2.3.6
12
13 media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch | 17 +++++++++++++++++
14 media-gfx/swftools/swftools-0.9.2-r1.ebuild | 3 ++-
15 2 files changed, 19 insertions(+), 1 deletion(-)
16
17 diff --git a/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch b/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
18 new file mode 100644
19 index 00000000000..7f809ea9983
20 --- /dev/null
21 +++ b/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch
22 @@ -0,0 +1,17 @@
23 +Patch kindly borrowed from macports.org.
24 +
25 +--- a/lib/jpeg.c 2011-10-14 15:46:10.000000000 -0500
26 ++++ b/lib/jpeg.c 2014-08-06 20:15:51.000000000 -0500
27 +@@ -5,6 +5,12 @@
28 + #include "../config.h"
29 +
30 + #ifdef HAVE_JPEGLIB
31 ++#ifndef FALSE
32 ++#define FALSE 0
33 ++#endif
34 ++#ifndef TRUE
35 ++#define TRUE 1
36 ++#endif
37 + #define HAVE_BOOLEAN
38 + #include <jpeglib.h>
39 +
40
41 diff --git a/media-gfx/swftools/swftools-0.9.2-r1.ebuild b/media-gfx/swftools/swftools-0.9.2-r1.ebuild
42 index de698a91aa5..cbdcdb3e1c7 100644
43 --- a/media-gfx/swftools/swftools-0.9.2-r1.ebuild
44 +++ b/media-gfx/swftools/swftools-0.9.2-r1.ebuild
45 @@ -1,4 +1,4 @@
46 -# Copyright 1999-2016 Gentoo Foundation
47 +# Copyright 1999-2018 Gentoo Foundation
48 # Distributed under the terms of the GNU General Public License v2
49
50 EAPI=5
51 @@ -29,6 +29,7 @@ src_prepare() {
52 epatch "${FILESDIR}"/${P}_general.patch
53 epatch "${FILESDIR}"/${P}_giflib.patch
54 epatch "${FILESDIR}"/${P}_giflib5.patch
55 + epatch "${FILESDIR}"/${P}-jpeg-9.patch
56 }
57
58 src_configure() {