media-libs/freeimage: support OpenEXR 3 / imath

Bug: https://bugs.gentoo.org/833158
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
Sam James
2022-02-15 19:50:23 +00:00
parent 150ec56310
commit c1949e9bba
2 changed files with 266 additions and 0 deletions
@@ -0,0 +1,144 @@
diff --git a/Source/FreeImage/PluginEXR.cpp b/Source/FreeImage/PluginEXR.cpp
index faa8037..e88bd2d 100644
--- a/Source/FreeImage/PluginEXR.cpp
+++ b/Source/FreeImage/PluginEXR.cpp
@@ -28,16 +28,32 @@
#pragma warning (disable : 4800) // ImfVersion.h - 'const int' : forcing value to bool 'true' or 'false' (performance warning)
#endif
-#include <ImfIO.h>
-#include <Iex.h>
-#include <ImfOutputFile.h>
-#include <ImfInputFile.h>
-#include <ImfRgbaFile.h>
-#include <ImfChannelList.h>
-#include <ImfRgba.h>
-#include <ImfArray.h>
-#include <ImfPreviewImage.h>
-#include <half.h>
+#include <OpenEXR/ImfIO.h>
+#include <OpenEXR/Iex.h>
+#include <OpenEXR/ImfOutputFile.h>
+#include <OpenEXR/ImfInputFile.h>
+#include <OpenEXR/ImfRgbaFile.h>
+#include <OpenEXR/ImfChannelList.h>
+#include <OpenEXR/ImfRgba.h>
+#include <OpenEXR/ImfArray.h>
+#include <OpenEXR/ImfPreviewImage.h>
+
+// The version can reliably be found in this header file from OpenEXR,
+// for both 2.x and 3.x:
+#include <OpenEXR/OpenEXRConfig.h>
+#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
+ (100*OPENEXR_VERSION_MINOR) + \
+ OPENEXR_VERSION_PATCH)
+
+// There's just no easy way to have an `#include` that works in both
+// cases, so we use the version to switch which set of include files we
+// use.
+#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
+# include <Imath/half.h>
+#else
+ // OpenEXR 2.x, use the old locations
+# include <OpenEXR/half.h>
+#endif
// ==========================================================
@@ -66,11 +82,11 @@ public:
return ((unsigned)n != _io->read_proc(c, 1, n, _handle));
}
- virtual Imath::Int64 tellg() {
+ virtual uint64_t tellg() {
return _io->tell_proc(_handle);
}
- virtual void seekg(Imath::Int64 pos) {
+ virtual void seekg(uint64_t pos) {
_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
}
@@ -100,11 +116,11 @@ public:
}
}
- virtual Imath::Int64 tellp() {
+ virtual uint64_t tellp() {
return _io->tell_proc(_handle);
}
- virtual void seekp(Imath::Int64 pos) {
+ virtual void seekp(uint64_t pos) {
_io->seek_proc(_handle, (unsigned)pos, SEEK_SET);
}
};
diff --git a/Source/FreeImage/PluginTIFF.cpp b/Source/FreeImage/PluginTIFF.cpp
index b9da767..96da4d7 100644
--- a/Source/FreeImage/PluginTIFF.cpp
+++ b/Source/FreeImage/PluginTIFF.cpp
@@ -39,7 +39,24 @@
#include "Utilities.h"
#include "tiffiop.h"
#include "../Metadata/FreeImageTag.h"
-#include <half.h>
+// The version can reliably be found in this header file from OpenEXR,
+// for both 2.x and 3.x:
+#include <OpenEXR/OpenEXRConfig.h>
+#define COMBINED_OPENEXR_VERSION ((10000*OPENEXR_VERSION_MAJOR) + \
+ (100*OPENEXR_VERSION_MINOR) + \
+ OPENEXR_VERSION_PATCH)
+
+// There's just no easy way to have an `#include` that works in both
+// cases, so we use the version to switch which set of include files we
+// use.
+#if COMBINED_OPENEXR_VERSION >= 20599 /* 2.5.99: pre-3.0 */
+# include <Imath/ImathVec.h>
+# include <Imath/half.h>
+#else
+ // OpenEXR 2.x, use the old locations
+# include <OpenEXR/ImathVec.h>
+# include <OpenEXR/half.h>
+#endif
#include "FreeImageIO.h"
#include "PSDParser.h"
diff --git a/Makefile.fip b/Makefile.fip
index 60bedbc..193126d 100644
--- a/Makefile.fip
+++ b/Makefile.fip
@@ -28,7 +28,7 @@ LIBRARIES-$(USE_JPEG) += -ljpeg
LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
LIBRARIES-$(USE_MNG) += -lmng
LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
-LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
+LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 Imath)
LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
diff --git a/Makefile.gnu b/Makefile.gnu
index b11c554..3de5a1b 100644
--- a/Makefile.gnu
+++ b/Makefile.gnu
@@ -28,7 +28,7 @@ LIBRARIES-$(USE_JPEG) += -ljpeg
LIBRARIES-$(USE_JPEG2K) += $(shell $(PKG_CONFIG) --libs libopenjp2)
LIBRARIES-$(USE_MNG) += -lmng
LIBRARIES-$(USE_PNG) += $(shell $(PKG_CONFIG) --libs libpng)
-LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 IlmBase)
+LIBRARIES-$(USE_TIFF) += $(shell $(PKG_CONFIG) --libs libtiff-4 Imath)
LIBRARIES-$(USE_RAW) += $(shell $(PKG_CONFIG) --libs libraw)
LIBRARIES-$(USE_WEBP) += $(shell $(PKG_CONFIG) --libs libwebp libwebpmux)
diff --git a/Makefile.srcs b/Makefile.srcs
index 26e1a6d..d97eacf 100644
--- a/Makefile.srcs
+++ b/Makefile.srcs
@@ -180,7 +180,7 @@ INCLUDE-$(USE_JPEG) += -DUSE_JPEG
INCLUDE-$(USE_JPEG2K) += -DUSE_JPEG2K $(shell $(PKG_CONFIG) --cflags-only-I libopenjp2)
INCLUDE-$(USE_MNG) += -DUSE_MNG
INCLUDE-$(USE_PNG) += -DUSE_PNG $(shell $(PKG_CONFIG) --cflags-only-I libpng)
-INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 IlmBase)
+INCLUDE-$(USE_TIFF) += -DUSE_TIFF $(shell $(PKG_CONFIG) --cflags-only-I libtiff-4 Imath)
INCLUDE-$(USE_RAW) += -DUSE_RAW $(shell $(PKG_CONFIG) --cflags-only-I libraw)
INCLUDE-$(USE_WEBP) += -DUSE_WEBP $(shell $(PKG_CONFIG) --cflags-only-I libwebp libwebpmux)
INCLUDE = $(INCLUDE-yes)
@@ -0,0 +1,122 @@
# Copyright 1999-2022 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
inherit edos2unix toolchain-funcs
MY_PN=FreeImage
MY_PV=${PV//.}
MY_P=${MY_PN}${MY_PV}
DESCRIPTION="Image library supporting many formats"
HOMEPAGE="https://freeimage.sourceforge.io/"
SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip
mirror://sourceforge/${PN}/${MY_P}.pdf
https://dev.gentoo.org/~juippis/distfiles/tmp/freeimage-3.18.0-unbundling.patch"
LICENSE="|| ( GPL-2 FIPL-1.0 )"
SLOT="0"
KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
IUSE="jpeg jpeg2k mng openexr png raw static-libs tiff webp"
# The tiff/ilmbase isn't a typo. The TIFF plugin cheats and
# uses code from it to handle 16bit<->float conversions.
RDEPEND="
sys-libs/zlib
jpeg? ( virtual/jpeg:0 )
jpeg2k? ( media-libs/openjpeg:2= )
mng? ( media-libs/libmng:= )
openexr? ( media-libs/openexr:0= )
png? ( media-libs/libpng:0= )
raw? ( media-libs/libraw:= )
tiff? (
dev-libs/imath:=
media-libs/tiff:0
)
webp? ( media-libs/libwebp:= )"
DEPEND="${RDEPEND}"
BDEPEND="
app-arch/unzip
virtual/pkgconfig"
S=${WORKDIR}/${MY_PN}
DOCS=( "${DISTDIR}"/${MY_P}.pdf README.linux Whatsnew.txt )
PATCHES=(
"${DISTDIR}"/${PN}-3.18.0-unbundling.patch
"${FILESDIR}"/${PN}-3.18.0-remove-jpeg-transform.patch
"${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
"${FILESDIR}"/${PN}-3.18.0-CVE-2019-12211-CVE-2019-12213.patch
"${FILESDIR}"/${PN}-3.18.0-openexr-3-imath.patch
)
src_prepare() {
pushd Source >/dev/null || die
cp LibJPEG/{transupp.c,transupp.h,jinclude.h} . || die
cp LibTIFF4/{tiffiop,tif_dir}.h . || die
rm -rf LibPNG LibMNG LibOpenJPEG ZLib OpenEXR LibRawLite LibTIFF4 LibJPEG LibWebP LibJXR || die
popd >/dev/null || die
edos2unix Makefile.{gnu,fip,srcs} fipMakefile.srcs */*.h */*/*.cpp
sed -i \
-e "s:/./:/:g" \
-e "s: ./: :g" \
-e 's: Source: \\\n\tSource:g' \
-e 's: Wrapper: \\\n\tWrapper:g' \
-e 's: Examples: \\\n\tExamples:g' \
-e 's: TestAPI: \\\n\tTestAPI:g' \
-e 's: -ISource: \\\n\t-ISource:g' \
-e 's: -IWrapper: \\\n\t-IWrapper:g' \
-e 's:INCLS:\nINCLS:g' \
Makefile.srcs fipMakefile.srcs || die
sed -i \
-e "/LibJPEG/d" \
-e "/LibJXR/d" \
-e "/LibPNG/d" \
-e "/LibTIFF/d" \
-e "/Source\/ZLib/d" \
-e "/LibOpenJPEG/d" \
-e "/OpenEXR/d" \
-e "/LibRawLite/d" \
-e "/LibMNG/d" \
-e "/LibWebP/d" \
-e "/LibJXR/d" \
Makefile.srcs fipMakefile.srcs || die
default
}
foreach_make() {
local m
for m in Makefile.{gnu,fip} ; do
emake -f ${m} \
USE_EXR=$(usex openexr) \
USE_JPEG=$(usex jpeg) \
USE_JPEG2K=$(usex jpeg2k) \
USE_MNG=$(usex mng) \
USE_PNG=$(usex png) \
USE_TIFF=$(usex tiff) \
USE_RAW=$(usex raw) \
USE_WEBP=$(usex webp) \
$(usex static-libs '' STATICLIB=) \
"$@"
done
}
src_compile() {
tc-export AR PKG_CONFIG
foreach_make \
CXX="$(tc-getCXX) -fPIC" \
CC="$(tc-getCC) -fPIC" \
${MY_PN}
}
src_install() {
foreach_make install DESTDIR="${ED}" INSTALLDIR="${ED}"/usr/$(get_libdir)
einstalldocs
}