gentoo (valentine's day) resync : 14.02.2021

5 files changed, 0 insertions, 217 deletions

diff --git a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch b/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
deleted file mode 100644
index d36e2503427f..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0001-Fix-to-find-boost-with-cmake-3.11.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From 2060f95c43685895f36269667c30acf7499b81b6 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:19:57 +0200
-Subject: [PATCH 1/5] Fix to find boost with >=cmake-3.11
-
-Cmake version 3.11 and later has a new syntax introduced, when
-looking for boost libraries.
-This patches adds this syntax if an appropriate cmake version is used.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicBoost.cmake        | 10 +++++++++-
- python/PyAlembic/CMakeLists.txt |  8 ++++----
- 2 files changed, 13 insertions(+), 5 deletions(-)
-
-diff --git a/cmake/AlembicBoost.cmake b/cmake/AlembicBoost.cmake
-index 21b3515..db59157 100644
---- a/cmake/AlembicBoost.cmake
-+++ b/cmake/AlembicBoost.cmake
-@@ -79,7 +79,15 @@ IF (USE_PYALEMBIC AND APPLE)
- ENDIF()
- 
- IF (USE_PYALEMBIC)
--    FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    # cmake>=3.11 has a new syntax when searching for boost, which
-+    # needs to add the python version.
-+    # Hardcode the python version number, as PYTHON_VERSION_{MAJOR,MINOR}
-+    # are not yet know in the configuration phase.
-+    IF(CMAKE_MINOR_VERSION VERSION_GREATER 10)
-+         FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python27)
-+    ELSE()
-+         FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options python)
-+    ENDIF()
- ELSE()
-     FIND_PACKAGE(Boost 1.42.0 COMPONENTS program_options)
- ENDIF()
-diff --git a/python/PyAlembic/CMakeLists.txt b/python/PyAlembic/CMakeLists.txt
-index a3fdb31..af8dcb5 100644
---- a/python/PyAlembic/CMakeLists.txt
-+++ b/python/PyAlembic/CMakeLists.txt
-@@ -33,12 +33,12 @@
- ##
- ##-*****************************************************************************
- 
--MESSAGE(STATUS "Boost_PYTHON_LIBRARY: ${Boost_PYTHON_LIBRARY}")
-+MESSAGE(STATUS "Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
- 
- # set core libs
--IF (Boost_PYTHON_LIBRARY AND ALEMBIC_PYTHON_LIBRARY)
--    MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON_LIBRARY}")
--    SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON_LIBRARY})
-+IF (Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE AND ALEMBIC_PYTHON_LIBRARY)
-+    MESSAGE(STATUS "Found libboost_python: ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE}")
-+    SET(PLIBS ${ALEMBIC_PYTHON_LIBRARY} ${Boost_PYTHON${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}_LIBRARY_RELEASE})
- 
-     # lots of warnings coming from unused local typedefs inside boost python
-     IF (NOT WINDOWS)
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch b/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
deleted file mode 100644
index c561e26a6656..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0002-Find-IlmBase-by-setting-a-proper-ILMBASE_ROOT-value.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 60bbcde225f3c28a36d8643c451509d9deb09222 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 13:34:09 +0200
-Subject: [PATCH 2/5] Find IlmBase by setting a proper ILMBASE_ROOT value and
- by using pkg-config to determine the installed ilmbase version, instead of
- using the cmake STRINGS command.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/Modules/FindIlmBase.cmake   | 18 +++++++++++++++++-
- cmake/Modules/FindPyIlmBase.cmake |  2 +-
- 2 files changed, 18 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/Modules/FindIlmBase.cmake b/cmake/Modules/FindIlmBase.cmake
-index 679a02f..0fe2b1a 100644
---- a/cmake/Modules/FindIlmBase.cmake
-+++ b/cmake/Modules/FindIlmBase.cmake
-@@ -52,7 +52,7 @@ IF(NOT DEFINED ILMBASE_ROOT)
-           SET( ALEMBIC_ILMBASE_ROOT NOTFOUND )
-         ELSE()
-           # TODO: set to default install path when shipping out
--          SET( ALEMBIC_ILMBASE_ROOT "/usr/local/ilmbase-1.0.1/" )
-+          SET( ALEMBIC_ILMBASE_ROOT "/usr" )
-         ENDIF()
-     ELSE()
-         IF ( ${WINDOWS} )
-@@ -87,6 +87,21 @@ SET(_ilmbase_SEARCH_DIRS
-     /usr/freeware
- )
- 
-+# use pkg-config to determine the correct version
-+include(FindPkgConfig)
-+IF(PKG_CONFIG_FOUND)
-+    PKG_CHECK_MODULES(PC_ILMBASE QUIET IlmBase)
-+    IF(PC_ILMBASE_FOUND)
-+        SET(ILMBASE_VERSION ${PC_ILMBASE_VERSION})
-+        SET(ALEMBIC_ILMBASE_INCLUDE_DIRECTORY ${PC_ILMBASE_INCLUDE_DIRS})
-+        STRING(REGEX MATCH "-lHalf" ALEMBIC_ILMBASE_HALF_LIB ${PC_ILMBASE_LDFLAGS})
-+        STRING(REGEX MATCH "-lIex" ALEMBIC_ILMBASE_IEX_LIB ${PC_ILMBASE_LDFLAGS})
-+        STRING(REGEX MATCH "-lIexMath" ALEMBIC_ILMBASE_IEXMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+        STRING(REGEX MATCH "-lIlmThread" ALEMBIC_ILMBASE_ILMTHREAD_LIB ${PC_ILMBASE_LDFLAGS})
-+        String(REGEX MATCH "-lImath" ALEMBIC_ILMBASE_IMATH_LIB ${PC_ILMBASE_LDFLAGS})
-+    ENDIF()
-+ELSE(PKG_CONFIG_FOUND)
-+
- FIND_PATH(ILMBASE_INCLUDE_DIR
-   NAMES
-     IlmBaseConfig.h
-@@ -179,6 +194,7 @@ IF ( ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY} STREQUAL "ALEMBIC_ILMBASE_INCLUDE_DIRE
-   MESSAGE( FATAL_ERROR "ilmbase header files not found, required: ALEMBIC_ILMBASE_ROOT: ${ALEMBIC_ILMBASE_ROOT}" )
- ENDIF()
- 
-+ENDIF(PKG_CONFIG_FOUND)
- 
- MESSAGE( STATUS "ILMBASE INCLUDE PATH: ${ALEMBIC_ILMBASE_INCLUDE_DIRECTORY}" )
- MESSAGE( STATUS "HALF LIB: ${ALEMBIC_ILMBASE_HALF_LIB}" )
-diff --git a/cmake/Modules/FindPyIlmBase.cmake b/cmake/Modules/FindPyIlmBase.cmake
-index d55f8d3..b5f3cb5 100644
---- a/cmake/Modules/FindPyIlmBase.cmake
-+++ b/cmake/Modules/FindPyIlmBase.cmake
-@@ -44,7 +44,7 @@ ELSE()
-               SET(ALEMBIC_PYILMBASE_ROOT NOTFOUND)
-             ELSE()
-               # TODO: set to default install path when shipping out
--              SET(ALEMBIC_PYILMBASE_ROOT "/usr/local/pyilmbase/")
-+              SET(ALEMBIC_PYILMBASE_ROOT "/usr")
-             ENDIF()
-         ELSE()
-             IF (${WINDOWS})
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch b/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
deleted file mode 100644
index 9777bad13e8b..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0003-Fix-env-var-for-renderman.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3ca71af0e83fce89df0bfb472b28abe3c4e08c57 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 15:13:03 +0200
-Subject: [PATCH 3/5] Fix env var for renderman. This is called RMANTREE on
- linux.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- cmake/AlembicPRMan.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cmake/AlembicPRMan.cmake b/cmake/AlembicPRMan.cmake
-index e02b237..fdbf26c 100644
---- a/cmake/AlembicPRMan.cmake
-+++ b/cmake/AlembicPRMan.cmake
-@@ -66,8 +66,8 @@ ELSE()
- ENDIF()
- 
- # Prefer PRMAN_ROOT set from the environment over the CMakeCache'd variable
--IF(NOT $ENV{PRMAN_ROOT}x STREQUAL "x")
--  SET( ALEMBIC_PRMAN_ROOT $ENV{PRMAN_ROOT})
-+IF(NOT $ENV{RMANTREE}x STREQUAL "x")
-+  SET( ALEMBIC_PRMAN_ROOT $ENV{RMANTREE})
- ENDIF()
- 
- 
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch b/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
deleted file mode 100644
index 73e989ba6a6f..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0004-Fix-a-compile-issue-with-const.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d1895084e41970c8f91e9357fcb739ac29c47109 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Sat, 15 Jun 2019 16:19:30 +0200
-Subject: [PATCH 4/5] WriteGeo.cpp: Fix a compile issue, where an invalid
- conversion from char* to const char* took place.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- prman/Procedural/WriteGeo.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/prman/Procedural/WriteGeo.cpp b/prman/Procedural/WriteGeo.cpp
-index 95b4867..5ad0b71 100644
---- a/prman/Procedural/WriteGeo.cpp
-+++ b/prman/Procedural/WriteGeo.cpp
-@@ -898,7 +898,7 @@ void ProcessCurves( ICurves &curves, ProcArgs &args )
- void WriteIdentifier( const ObjectHeader &ohead )
- {
-     std::string name = ohead.getFullName();
--    char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
-+    const char* nameArray[] = { const_cast<char*>( name.c_str() ), RI_NULL };
- 
-     RiAttribute(const_cast<char*>( "identifier" ), const_cast<char*>( "name" ),
-                 nameArray, RI_NULL );
--- 
-2.22.0
-
diff --git a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch b/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
deleted file mode 100644
index 6bb8090344f1..000000000000
--- a/media-gfx/alembic/files/alembic-1.7.11-0006-python-PyAlembic-Tests-CMakeLists.txt-fix-variable.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 13b88370a862e16b417e9df6e40c2a9cba10852c Mon Sep 17 00:00:00 2001
-From: Bernd Waibel <waebbl@gmail.com>
-Date: Fri, 2 Aug 2019 21:31:03 +0200
-Subject: [PATCH] python/PyAlembic/Tests/CMakeLists.txt: fix variable
-
-The patch fixes a boost_python related variable which didn't had
-the version suffix for python.
-
-Signed-off-by: Bernd Waibel <waebbl@gmail.com>
----
- python/PyAlembic/Tests/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/python/PyAlembic/Tests/CMakeLists.txt b/python/PyAlembic/Tests/CMakeLists.txt
-index c32a018..ed9b23d 100644
---- a/python/PyAlembic/Tests/CMakeLists.txt
-+++ b/python/PyAlembic/Tests/CMakeLists.txt
-@@ -57,7 +57,7 @@ TARGET_LINK_LIBRARIES(PyAlembic_Test Alembic::Alembic ${ALEMBIC_PYILMBASE_LIBS})
- 
- ADD_TEST(PyAlembic_Python_TEST PyAlembic_Test)
- 
--GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON_LIBRARY} PATH)
-+GET_FILENAME_COMPONENT(BOOST_LIBRARY_DIR ${Boost_PYTHON27_LIBRARY} PATH)
- GET_FILENAME_COMPONENT(ILMBASE_LIBRARY_DIR ${ALEMBIC_ILMBASE_IMATH_LIB} PATH)
- 
- CONFIGURE_FILE(
--- 
-2.22.0
-