1 |
commit: 8e7a873aef81bab45819b6f2153b3298a9c8c3a1 |
2 |
Author: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail <DOT> com> |
3 |
AuthorDate: Sun Dec 13 08:30:59 2020 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Dec 26 23:46:01 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e7a873a |
7 |
|
8 |
media-libs/openimageio: remove unused patch(es) |
9 |
|
10 |
Package-Manager: Portage-3.0.12, Repoman-3.0.2 |
11 |
Signed-off-by: Michael Mair-Keimberger <m.mairkeimberger <AT> gmail.com> |
12 |
Closes: https://github.com/gentoo/gentoo/pull/18634 |
13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
14 |
|
15 |
.../files/openimageio-1.8.17-boostpython.patch | 28 ---------------------- |
16 |
.../files/openimageio-2.2.6.1-pugixml.patch | 21 ---------------- |
17 |
2 files changed, 49 deletions(-) |
18 |
|
19 |
diff --git a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch b/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch |
20 |
deleted file mode 100644 |
21 |
index 970ada64a1f..00000000000 |
22 |
--- a/media-libs/openimageio/files/openimageio-1.8.17-boostpython.patch |
23 |
+++ /dev/null |
24 |
@@ -1,28 +0,0 @@ |
25 |
-From 22ce65bfbaa24d79427852755c4bf8a1d77159b4 Mon Sep 17 00:00:00 2001 |
26 |
-From: Andreas Sturmlechner <asturm@g.o> |
27 |
-Date: Tue, 16 Jul 2019 17:03:40 +0200 |
28 |
-Subject: [PATCH] Find Boost_PYTHON |
29 |
- |
30 |
---- |
31 |
- src/python/CMakeLists.txt | 5 ++--- |
32 |
- 1 file changed, 2 insertions(+), 3 deletions(-) |
33 |
- |
34 |
-diff --git a/src/python/CMakeLists.txt b/src/python/CMakeLists.txt |
35 |
-index e58d372d..98d91c48 100644 |
36 |
---- a/src/python/CMakeLists.txt |
37 |
-+++ b/src/python/CMakeLists.txt |
38 |
-@@ -16,9 +16,8 @@ find_package (PythonLibs ${PYTHON_VERSION_FOUND} REQUIRED) |
39 |
- if (NOT BOOST_CUSTOM) |
40 |
- # Finding the python component for boost is a little tricky, since it has |
41 |
- # different names on different systems. Try the most common ones. |
42 |
-- foreach (_py_lib python-${PYTHON_VERSION_FOUND} python |
43 |
-- python${PYTHON_VERSION_MAJOR} |
44 |
-- python-py${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR}) |
45 |
-+ foreach (_py_lib python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} |
46 |
-+ python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}) |
47 |
- find_package (Boost QUIET COMPONENTS ${_py_lib}) |
48 |
- string (TOUPPER ${_py_lib} _py_lib_name) |
49 |
- if (Boost_${_py_lib_name}_FOUND) |
50 |
--- |
51 |
-2.22.0 |
52 |
- |
53 |
|
54 |
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 |
55 |
deleted file mode 100644 |
56 |
index d5cef06d38d..00000000000 |
57 |
--- a/media-libs/openimageio/files/openimageio-2.2.6.1-pugixml.patch |
58 |
+++ /dev/null |
59 |
@@ -1,21 +0,0 @@ |
60 |
-https://github.com/OpenImageIO/oiio/issues/2732 |
61 |
- |
62 |
-diff --git a/src/cmake/externalpackages.cmake b/src/cmake/externalpackages.cmake |
63 |
-index 1240f22..5cc5a2e 100644 |
64 |
---- a/src/cmake/externalpackages.cmake |
65 |
-+++ b/src/cmake/externalpackages.cmake |
66 |
-@@ -227,6 +227,14 @@ endif () |
67 |
- # allow this to be overridden to use the distro-provided package if desired. |
68 |
- option (USE_EXTERNAL_PUGIXML "Use an externally built shared library version of the pugixml library" OFF) |
69 |
- if (USE_EXTERNAL_PUGIXML) |
70 |
-+ find_path (PUGIXML_INCLUDE_DIR NAMES pugixml.hpp) |
71 |
-+ find_library (PUGIXML_LIBRARIES NAMES pugixml) |
72 |
-+ |
73 |
-+ set (PUGIXML_INCLUDE_DIR ${PUGIXML_INCLUDE_DIR}) |
74 |
-+ set (PUGIXML_INCLUDE_DIRS ${PUGIXML_INCLUDE_DIR}) |
75 |
-+ set (PUGIXML_LIBRARIES ${PUGIXML_LIBRARIES}) |
76 |
-+ set (PUGIXML_INCLUDES ${PUGIXML_INCLUDE_DIR}) |
77 |
-+ |
78 |
- checked_find_package (pugixml REQUIRED |
79 |
- DEFINITIONS -DUSE_EXTERNAL_PUGIXML=1) |
80 |
- endif() |