From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B8C51382C5 for ; Wed, 7 Feb 2018 22:33:34 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 92FF0E0AFE; Wed, 7 Feb 2018 22:33:33 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 758C3E0AFE for ; Wed, 7 Feb 2018 22:33:33 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id F213B335C07 for ; Wed, 7 Feb 2018 22:33:31 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 7D9171DE for ; Wed, 7 Feb 2018 22:33:30 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1518042798.0ea565c59a608e42a1a8653b95e4dd8ff51e6796.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/swftools/, media-gfx/swftools/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch media-gfx/swftools/swftools-0.9.2-r1.ebuild X-VCS-Directories: media-gfx/swftools/files/ media-gfx/swftools/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 0ea565c59a608e42a1a8653b95e4dd8ff51e6796 X-VCS-Branch: master Date: Wed, 7 Feb 2018 22:33:30 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 8583e63e-ee6c-4f86-b06e-ce6aebf66ca7 X-Archives-Hash: c4ca72f30ea9c9607468f2de43476168 commit: 0ea565c59a608e42a1a8653b95e4dd8ff51e6796 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Feb 7 22:16:49 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Feb 7 22:33:18 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0ea565c5 media-gfx/swftools: Fix build with jpeg-9 Closes: https://bugs.gentoo.org/520934 Package-Manager: Portage-2.3.24, Repoman-2.3.6 media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch | 17 +++++++++++++++++ media-gfx/swftools/swftools-0.9.2-r1.ebuild | 3 ++- 2 files changed, 19 insertions(+), 1 deletion(-) 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 new file mode 100644 index 00000000000..7f809ea9983 --- /dev/null +++ b/media-gfx/swftools/files/swftools-0.9.2-jpeg-9.patch @@ -0,0 +1,17 @@ +Patch kindly borrowed from macports.org. + +--- a/lib/jpeg.c 2011-10-14 15:46:10.000000000 -0500 ++++ b/lib/jpeg.c 2014-08-06 20:15:51.000000000 -0500 +@@ -5,6 +5,12 @@ + #include "../config.h" + + #ifdef HAVE_JPEGLIB ++#ifndef FALSE ++#define FALSE 0 ++#endif ++#ifndef TRUE ++#define TRUE 1 ++#endif + #define HAVE_BOOLEAN + #include + diff --git a/media-gfx/swftools/swftools-0.9.2-r1.ebuild b/media-gfx/swftools/swftools-0.9.2-r1.ebuild index de698a91aa5..cbdcdb3e1c7 100644 --- a/media-gfx/swftools/swftools-0.9.2-r1.ebuild +++ b/media-gfx/swftools/swftools-0.9.2-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -29,6 +29,7 @@ src_prepare() { epatch "${FILESDIR}"/${P}_general.patch epatch "${FILESDIR}"/${P}_giflib.patch epatch "${FILESDIR}"/${P}_giflib5.patch + epatch "${FILESDIR}"/${P}-jpeg-9.patch } src_configure() {