[gentoo-commits] repo/gentoo:master commit in: media-libs/Field3D/files/, media-libs/Field3D/
commit: 9d94aa2f823fc2ec729f46314ca0d75d557d9a8d
Author: Bernd Waibel posteo net>
AuthorDate: Tue Nov 15 16:30:30 2022 +
Commit: John Helmert III gentoo org>
CommitDate: Wed Nov 16 03:44:30 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d94aa2f
media-libs/Field3D: drop 1.7.2
Drop for needed dependency on media-libs/ilmbase
Closes: https://bugs.gentoo.org/878243
Signed-off-by: Bernd Waibel posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28285
Signed-off-by: John Helmert III gentoo.org>
media-libs/Field3D/Field3D-1.7.2.ebuild| 39 --
.../Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch | 142 -
2 files changed, 181 deletions(-)
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild
b/media-libs/Field3D/Field3D-1.7.2.ebuild
deleted file mode 100644
index 60cd9f8a5a4e..
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="A library for storing voxel data"
-HOMEPAGE="http://opensource.imageworks.com/?p=field3d;
-SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz ->
${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="mpi"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
- dev-libs/boost:=
- >=media-libs/ilmbase-2.2.0:=
- sci-libs/hdf5:=
- mpi? ( virtual/mpi )
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-Use-PkgConfig-for-IlmBase.patch" )
-
-src_configure() {
- # Needed for now ("fix" compatibility with >=sci-libs/hdf5-1.12)
- # bug #808731
- append-cppflags -DH5_USE_110_API
-
- local mycmakeargs=(
- -DINSTALL_DOCS=OFF # Docs are not finished yet.
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON
- $(cmake_use_find_package mpi MPI)
- )
- cmake_src_configure
-}
diff --git
a/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch
b/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch
deleted file mode 100644
index e967d20244c3..
--- a/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch
+++ /dev/null
@@ -1,142 +0,0 @@
-From 5656d8dc657f4702c67fbabfab8922c80e0cf778 Mon Sep 17 00:00:00 2001
-From: Jonathan Scruggs
-Date: Sat, 23 Sep 2017 16:08:48 +0100
-Subject: [PATCH] Use PkgConfig for IlmBase
-
- CMakeLists.txt | 15 +++---
- cmake/FindILMBase.cmake | 54 -
- 2 files changed, 8 insertions(+), 61 deletions(-)
- delete mode 100644 cmake/FindILMBase.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e9ad44f..864f0d2 100644
a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -35,8 +35,9 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
-
- PROJECT ( field3d )
-
--set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )
-+set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
-
-+FIND_PACKAGE ( PkgConfig )
- FIND_PACKAGE (Doxygen)
- FIND_PACKAGE (HDF5)
- IF ( CMAKE_HOST_WIN32 )
-@@ -49,7 +50,7 @@ FIND_PACKAGE (Boost COMPONENTS regex thread program_options
system)
- FIND_PACKAGE (MPI)
- ENDIF ()
-
--FIND_PACKAGE (ILMBase)
-+PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
-
- # Allow the developer to select if Dynamic or Static libraries are built
- OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
-@@ -65,14 +66,14 @@ INCLUDE_DIRECTORIES ( . )
- INCLUDE_DIRECTORIES ( src )
- INCLUDE_DIRECTORIES ( export )
- INCLUDE_DIRECTORIES ( include )
--INCLUDE_DIRECTORIES ( ${ILMBASE_INCLUDE_DIRS} )
-+INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( ${HDF5_INCLUDE_DIRS} )
- INCLUDE_DIRECTORIES ( ${Boost_INCLUDE_DIR} )
-
- # link directories
- LINK_DIRECTORIES ( ${Boost_LIBRARY_DIRS} )
- LINK_DIRECTORIES ( ${HDF5_LIBRARY_DIRS} )
--LINK_DIRECTORIES ( ${ILMBASE_LIBRARY_DIRS} )
-+LINK_DIRECTORIES ( ${ILMBASE_LIBS_LIBRARY_DIRS} )
-
- IF ( CMAKE_HOST_UNIX )
- ADD_DEFINITIONS ( -fPIC -DREQUIRE_IOSTREAM -Wno-invalid-offsetof )
-@@ -147,7 +148,7 @@ IF ( CMAKE_HOST_UNIX )
- ${MPI_LIBRARIES} )
- ENDIF ( MPI_FOUND )
- LIST ( APPEND Field3D_Libraries_Shared
--Iex Half IlmThread Imath
-+${ILMBASE_LIBS_LIBRARIES}
- pthread dl z )
- SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
- SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
-@@ -155,7 +156,7 @@ IF ( CMAKE_HOST_UNIX )
- ENDIF ( )
- IF ( CMAKE_HOST_WIN32 )
- # Add OpenEXR and zlib release/debug
-- FOREACH ( lib Iex Half IlmThread Imath zdll )
-+ FOREACH ( lib ${ILMBASE_LIBS_LIBRARIES} zdll )
- LIST ( APPEND Field3D_Libraries_Shared
- optimized ${lib}
- debug ${lib}_d )
-@@ -164,7 +165,7 @@ IF ( CMAKE_HOST_WIN32 )
- SET ( Field3D_BIN_Libraries Field3D ${Boost_LIBRARIES} )
- ENDIF ()
-
[gentoo-commits] repo/gentoo:master commit in: media-libs/Field3D/files/, media-libs/Field3D/
commit: d0cabeca83fd2052ffa6b7c57d092a944b3ef190
Author: Jonathan Scruggs gmail com>
AuthorDate: Sat Sep 23 15:27:43 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Sep 23 15:47:22 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d0cabeca
media-libs/Field3D: Fix compiling error for some people
* Replaced patch with more robust one to fix an error that
causes the compile phase to stop.
Closes: https://bugs.gentoo.org/631832
media-libs/Field3D/Field3D-1.7.2.ebuild| 2 +-
.../Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch | 142 +
.../files/Field3D-1.7.2-openexr-fixes.patch| 38 --
3 files changed, 143 insertions(+), 39 deletions(-)
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild
b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 414b9351f9f..780a06db52e 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -22,7 +22,7 @@ RDEPEND="
DEPEND="${RDEPEND}
virtual/pkgconfig"
-PATCHES=( "${FILESDIR}/Field3D-1.7.2-openexr-fixes.patch" )
+PATCHES=( "${FILESDIR}/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch" )
# Docs are not finished yet.
mycmakeargs=( -DINSTALL_DOCS=OFF )
diff --git
a/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch
b/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch
new file mode 100644
index 000..e967d20244c
--- /dev/null
+++ b/media-libs/Field3D/files/Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch
@@ -0,0 +1,142 @@
+From 5656d8dc657f4702c67fbabfab8922c80e0cf778 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs
+Date: Sat, 23 Sep 2017 16:08:48 +0100
+Subject: [PATCH] Use PkgConfig for IlmBase
+
+---
+ CMakeLists.txt | 15 +++---
+ cmake/FindILMBase.cmake | 54 -
+ 2 files changed, 8 insertions(+), 61 deletions(-)
+ delete mode 100644 cmake/FindILMBase.cmake
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e9ad44f..864f0d2 100644
+--- a/CMakeLists.txt
b/CMakeLists.txt
+@@ -35,8 +35,9 @@ CMAKE_MINIMUM_REQUIRED( VERSION 2.8 )
+
+ PROJECT ( field3d )
+
+-set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR}/cmake )
++set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} )
+
++FIND_PACKAGE ( PkgConfig )
+ FIND_PACKAGE (Doxygen)
+ FIND_PACKAGE (HDF5)
+ IF ( CMAKE_HOST_WIN32 )
+@@ -49,7 +50,7 @@ FIND_PACKAGE (Boost COMPONENTS regex thread program_options
system)
+ FIND_PACKAGE (MPI)
+ ENDIF ()
+
+-FIND_PACKAGE (ILMBase)
++PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase )
+
+ # Allow the developer to select if Dynamic or Static libraries are built
+ OPTION (BUILD_SHARED_LIBS "Build Shared Libraries" ON)
+@@ -65,14 +66,14 @@ INCLUDE_DIRECTORIES ( . )
+ INCLUDE_DIRECTORIES ( src )
+ INCLUDE_DIRECTORIES ( export )
+ INCLUDE_DIRECTORIES ( include )
+-INCLUDE_DIRECTORIES ( ${ILMBASE_INCLUDE_DIRS} )
++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( ${HDF5_INCLUDE_DIRS} )
+ INCLUDE_DIRECTORIES ( ${Boost_INCLUDE_DIR} )
+
+ # link directories
+ LINK_DIRECTORIES ( ${Boost_LIBRARY_DIRS} )
+ LINK_DIRECTORIES ( ${HDF5_LIBRARY_DIRS} )
+-LINK_DIRECTORIES ( ${ILMBASE_LIBRARY_DIRS} )
++LINK_DIRECTORIES ( ${ILMBASE_LIBS_LIBRARY_DIRS} )
+
+ IF ( CMAKE_HOST_UNIX )
+ ADD_DEFINITIONS ( -fPIC -DREQUIRE_IOSTREAM -Wno-invalid-offsetof )
+@@ -147,7 +148,7 @@ IF ( CMAKE_HOST_UNIX )
+ ${MPI_LIBRARIES} )
+ ENDIF ( MPI_FOUND )
+ LIST ( APPEND Field3D_Libraries_Shared
+-Iex Half IlmThread Imath
++${ILMBASE_LIBS_LIBRARIES}
+ pthread dl z )
+ SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+ SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
+@@ -155,7 +156,7 @@ IF ( CMAKE_HOST_UNIX )
+ ENDIF ( )
+ IF ( CMAKE_HOST_WIN32 )
+ # Add OpenEXR and zlib release/debug
+- FOREACH ( lib Iex Half IlmThread Imath zdll )
++ FOREACH ( lib ${ILMBASE_LIBS_LIBRARIES} zdll )
+ LIST ( APPEND Field3D_Libraries_Shared
+ optimized ${lib}
+ debug ${lib}_d )
+@@ -164,7 +165,7 @@ IF ( CMAKE_HOST_WIN32 )
+ SET ( Field3D_BIN_Libraries Field3D ${Boost_LIBRARIES} )
+ ENDIF ()
+
+-TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES})
++TARGET_LINK_LIBRARIES ( Field3D ${Field3D_DSO_Libraries} ${Boost_LIBRARIES} )
+
+ # Parase version and soversion from export/ns.h
+
+diff --git a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake
+deleted file mode 100644
+index c555100..000
+--- a/cmake/FindILMBase.cmake
/dev/null
+@@ -1,54 +0,0 @@
+-# Copyright (c) 2009 Sony Pictures Imageworks Inc. et al.
+-#
+-# All rights reserved.
+-#
+-# Redistribution and use in source and binary forms, with or without
+-# modification, are permitted provided that the following conditions
+-# are met:
+-#
+-# Redistributions of source code must retain the above copyright
+-# notice, this list of conditions and the
[gentoo-commits] repo/gentoo:master commit in: media-libs/Field3D/files/, media-libs/Field3D/
commit: ca3952cdeccf9e3c6bd6973e3ed1c0681857aceb
Author: Jonathan Scruggs gmail com>
AuthorDate: Thu Sep 21 08:58:57 2017 +
Commit: David Seifert gentoo org>
CommitDate: Sat Sep 23 08:32:32 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ca3952cd
media-libs/Field3D: New package
Field3D is an open source library for storing voxel data. It
provides C++ classes that handle in-memory storage and a file
format based on HDF5 that allows the C++ objects to be written
to and read from disk.
This is a new dependency for OpenImageIO.
Closes: https://github.com/gentoo/gentoo/pull/5748
media-libs/Field3D/Field3D-1.7.2.ebuild| 28
media-libs/Field3D/Manifest| 1 +
.../files/Field3D-1.7.2-openexr-fixes.patch| 38 ++
media-libs/Field3D/metadata.xml| 25 ++
4 files changed, 92 insertions(+)
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild
b/media-libs/Field3D/Field3D-1.7.2.ebuild
new file mode 100644
index 000..414b9351f9f
--- /dev/null
+++ b/media-libs/Field3D/Field3D-1.7.2.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="A library for storing voxel data"
+HOMEPAGE="http://opensource.imageworks.com/?p=field3d;
+SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz ->
${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+ >=dev-libs/boost-1.62:=
+ >=media-libs/ilmbase-2.2.0:=
+ sci-libs/hdf5:=
+ virtual/mpi"
+
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}/Field3D-1.7.2-openexr-fixes.patch" )
+
+# Docs are not finished yet.
+mycmakeargs=( -DINSTALL_DOCS=OFF )
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
new file mode 100644
index 000..4f9c43edc4f
--- /dev/null
+++ b/media-libs/Field3D/Manifest
@@ -0,0 +1 @@
+DIST Field3D-1.7.2.tar.gz 502481 SHA256
8f7c33ecb4489ed626455cf3998d911a079b4f137f86814d9c37c5765bf4b020 SHA512
e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
WHIRLPOOL
c29702dc0c2f15c65d92871ef82059aa35b9fb7927d9510b496511c8de21f160298cf9b32717d0fbac7a5c1656f5c5757a3d1fe3fdb00121d2100664412b65d2
diff --git a/media-libs/Field3D/files/Field3D-1.7.2-openexr-fixes.patch
b/media-libs/Field3D/files/Field3D-1.7.2-openexr-fixes.patch
new file mode 100644
index 000..41ab1ccf294
--- /dev/null
+++ b/media-libs/Field3D/files/Field3D-1.7.2-openexr-fixes.patch
@@ -0,0 +1,38 @@
+diff -purN a/cmake/FindILMBase.cmake b/cmake/FindILMBase.cmake
+--- a/cmake/FindILMBase.cmake 2016-06-19 05:56:00.0 +0100
b/cmake/FindILMBase.cmake 2017-03-02 11:44:35.449043588 +
+@@ -37,12 +37,17 @@
+ # ILMBASE_FOUND - true if ILMBASE was found on the system
+ # ILMBASE_LIBRARY_DIRS - the full set of library directories
+
++find_package(PkgConfig QUIET)
++if(PKG_CONFIG_FOUND)
++ pkg_check_modules(PC_ILMBASE QUIET IlmBase)
++endif()
++
+ FIND_PATH ( Ilmbase_Base_Dir include/OpenEXR/IlmBaseConfig.h
+ ENV ILMBASE_ROOT
+ )
+
+ IF ( Ilmbase_Base_Dir )
+-
++ SET ( IlmBase_VERSION ${PC_ILMBASE_VERSION} )
+ SET ( ILMBASE_INCLUDE_DIRS
+ ${Ilmbase_Base_Dir}/include
+ ${Ilmbase_Base_Dir}/include/OpenEXR
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2016-06-19 05:56:00.0 +0100
b/CMakeLists.txt 2017-03-02 11:44:37.029035041 +
+@@ -146,8 +146,11 @@ IF ( CMAKE_HOST_UNIX )
+ LIST ( APPEND Field3D_Libraries_Shared
+ ${MPI_LIBRARIES} )
+ ENDIF ( MPI_FOUND )
++ # handle new library names for 2.0.0
++ STRING ( REPLACE "." "_" _IlmBase_VERSION ${IlmBase_VERSION} )
++ STRING ( SUBSTRING ${_IlmBase_VERSION} 0 3 _IlmBase_VERSION )
+ LIST ( APPEND Field3D_Libraries_Shared
+-Iex Half IlmThread Imath
++Iex-${_IlmBase_VERSION} Half IlmThread-${_IlmBase_VERSION}
Imath-${_IlmBase_VERSION}
+ pthread dl z )
+ SET ( Field3D_DSO_Libraries ${Field3D_Libraries_Shared} )
+ SET ( Field3D_BIN_Libraries Field3D ${Field3D_Libraries_Shared}
diff --git a/media-libs/Field3D/metadata.xml b/media-libs/Field3D/metadata.xml
new file mode 100644
index 000..2e6a3587ddc
--- /dev/null
+++ b/media-libs/Field3D/metadata.xml
@@ -0,0 +1,25 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+
+ j.scru...@gmail.com
+ Jonathan Scruggs
+
+
+ agrigo2...@yahoo.com.au
+ Adrian Grigo
+
+
+ proxy-ma...@gentoo.org
+ Proxy Maintainers
+
+
+ Field3D is an open source library for storing voxel data.
+ It provides C++ classes that handle in-memory storage and
+ a file format based on HDF5 that
