[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/

[gentoo-commits] repo/gentoo:master commit in: media-libs/openimageio/files/

[Andreas Sturmlechner]

commit:     8e7a873aef81bab45819b6f2153b3298a9c8c3a1
Author:     Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Dec 13 08:30:59 2020 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Dec 26 23:46:01 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7a873a

media-libs/openimageio: remove unused patch(es)

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/18634
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 .../files/openimageio-1.8.17-boostpython.patch     | 28 ----------------------
 .../files/openimageio-2.2.6.1-pugixml.patch        | 21 ----------------
 2 files changed, 49 deletions(-)

diff --git a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
deleted file mode 100644
index 970ada64a1f..00000000000
--- a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 22ce65bfbaa24d79427852755c4bf8a1d77159b4 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 16 Jul 2019 17:03:40 +0200
-Subject: [PATCH] Find Boost_PYTHON
-
----
- src/python/CMakeLists.txt | 5 ++---
- 1 file changed, 2 insertions(+), 3 deletions(-)
-
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt
-index e58d372d..98d91c48 100644
---- a/src/python/CMakeLists.txt
-+++ b/src/python/CMakeLists.txt
-@@ -16,9 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED)
- if (NOT BOOST_CUSTOM)
-     # Finding the python component for boost is a little tricky, since it has
-     # different names on different systems. Try the most common ones.
--    foreach (_py_lib python-${PYTHON_VERSION_FOUND} python
--             python${PYTHON_VERSION_MAJOR}
--             python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR})
-+    foreach (_py_lib python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}
-+             python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR})
-         find_package (Boost QUIET COMPONENTS ${_py_lib})
-         string (TOUPPER ${_py_lib} _py_lib_name)
-         if (Boost_${_py_lib_name}_FOUND)
--- 
-2.22.0
-

diff --git a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch b/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
deleted file mode 100644
index d5cef06d38d..00000000000
--- a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-https://github.com/OpenImageIO/oiio/issues/2732
-
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake
-index 1240f22..5cc5a2e 100644
---- a/src/cmake/externalpackages.cmake
-+++ b/src/cmake/externalpackages.cmake
-@@ -227,6 +227,14 @@ endif ()
- # allow this to be overridden to use the distro-provided package if desired.
- option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF)
- if (USE_EXTERNAL_PUGIXML)
-+    find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp)
-+    find_library (PUGIXML_LIBRARIES NAMES pugixml)
-+
-+    set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR})
-+    set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR})
-+    set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES})
-+    set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR})
-+
-     checked_find_package (pugixml REQUIRED
-                           DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1)
- endif()