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 C15E7138334 for ; Sun, 14 Apr 2019 16:25:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DA172E0978; Sun, 14 Apr 2019 16:25:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.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 B27FEE0978 for ; Sun, 14 Apr 2019 16:25:40 +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 71052341100 for ; Sun, 14 Apr 2019 16:25:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 1B498594 for ; Sun, 14 Apr 2019 16:25:38 +0000 (UTC) From: "James Le Cuirot" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "James Le Cuirot" Message-ID: <1555259129.106c26f9a93a0c86346a3ef378ee62ec15bc89d1.chewi@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freeimage/files/, media-libs/freeimage/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch media-libs/freeimage/freeimage-3.18.0.ebuild X-VCS-Directories: media-libs/freeimage/ media-libs/freeimage/files/ X-VCS-Committer: chewi X-VCS-Committer-Name: James Le Cuirot X-VCS-Revision: 106c26f9a93a0c86346a3ef378ee62ec15bc89d1 X-VCS-Branch: master Date: Sun, 14 Apr 2019 16:25:38 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 28b8a964-8752-46ab-b0d6-83e7756663a9 X-Archives-Hash: 442f6bd232cb6a4aa474da94c61ab9d2 commit: 106c26f9a93a0c86346a3ef378ee62ec15bc89d1 Author: James Le Cuirot gentoo org> AuthorDate: Sun Apr 14 16:24:41 2019 +0000 Commit: James Le Cuirot gentoo org> CommitDate: Sun Apr 14 16:25:29 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=106c26f9 media-libs/freeimage: Fix building against libjpeg-9 Upstream only applied half of the earlier patch. Closes: https://bugs.gentoo.org/683320 Package-Manager: Portage-2.3.62, Repoman-2.3.12 Signed-off-by: James Le Cuirot gentoo.org> .../files/freeimage-3.18.0-libjpeg9.patch | 24 ++++++++++++++++++++++ media-libs/freeimage/freeimage-3.18.0.ebuild | 1 + 2 files changed, 25 insertions(+) diff --git a/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch new file mode 100644 index 00000000000..fe344229520 --- /dev/null +++ b/media-libs/freeimage/files/freeimage-3.18.0-libjpeg9.patch @@ -0,0 +1,24 @@ +Bug: https://bugs.gentoo.org/647422 +Upstream Patch: https://sourceforge.net/p/freeimage/patches/130/ + +diff -Naur a/Source/FreeImage.h b/Source/FreeImage.h +--- a/Source/FreeImage.h 2018-03-24 23:24:11.066695395 -0400 ++++ b/Source/FreeImage.h 2018-03-24 23:26:35.945391182 -0400 +@@ -117,12 +117,17 @@ + #ifndef _WINDOWS_ + #define _WINDOWS_ + ++#if JPEG_LIB_VERSION < 90 ++ + #ifndef FALSE + #define FALSE 0 + #endif + #ifndef TRUE + #define TRUE 1 + #endif ++ ++#endif ++ + #ifndef NULL + #define NULL 0 + #endif diff --git a/media-libs/freeimage/freeimage-3.18.0.ebuild b/media-libs/freeimage/freeimage-3.18.0.ebuild index 35dd66ffd42..fa58c6fc2f7 100644 --- a/media-libs/freeimage/freeimage-3.18.0.ebuild +++ b/media-libs/freeimage/freeimage-3.18.0.ebuild @@ -48,6 +48,7 @@ PATCHES=( "${FILESDIR}"/${PN}-3.18.0-rename-jpeg_read_icc_profile.patch "${FILESDIR}"/${PN}-3.18.0-disable-plugin-G3.patch "${FILESDIR}"/${PN}-3.18.0-raw.patch + "${FILESDIR}"/${PN}-3.18.0-libjpeg9.patch ) src_prepare() {