1 |
commit: 1e76cacb7c6e5105c343e028dcf0722e88e74260 |
2 |
Author: Johannes Huber <johu <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat May 26 11:01:37 2018 +0000 |
4 |
Commit: Johannes Huber <johu <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat May 26 11:01:49 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1e76cacb |
7 |
|
8 |
media-libs/opencolorio: Remove 1.0.9-r2 |
9 |
|
10 |
Overshadowed by 1.1.0-r1. |
11 |
|
12 |
Package-Manager: Portage-2.3.39, Repoman-2.3.9 |
13 |
|
14 |
media-libs/opencolorio/Manifest | 2 - |
15 |
.../opencolorio-1.0.8-documentation-gen.patch | 54 -------------- |
16 |
...lorio-1.0.9-remove-external-doc-utilities.patch | 65 ---------------- |
17 |
media-libs/opencolorio/metadata.xml | 4 - |
18 |
media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild | 87 ---------------------- |
19 |
5 files changed, 212 deletions(-) |
20 |
|
21 |
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest |
22 |
index 61692b3aa83..43489473eb6 100644 |
23 |
--- a/media-libs/opencolorio/Manifest |
24 |
+++ b/media-libs/opencolorio/Manifest |
25 |
@@ -1,3 +1 @@ |
26 |
-DIST opencolorio-1.0.9-yaml-0.5-compat-v2.patch.bz2 15418 BLAKE2B 6eaabec7780cb4be9ec4b0b16f79b7114b187b13e3027b6cae3662c6a2b6dacb6566e36fbdf7b2edc77855be505e4cd2c84e16b58d49ccdc59341359419b7cc4 SHA512 8383bc84e209b67aa34c6420348634d0d2a34f1dafda6a10b0c4a15776c2094057a38b00d078b59b648131178f2d65f695890204dbee411602689a0bb7419ecc |
27 |
-DIST opencolorio-1.0.9.tar.gz 12473406 BLAKE2B 54c867521b66d7479c175f65046ffd50ce41fb665c640cf5097b7178cc11dbf17cd324e7d861e4a56c990a109d7f80041d5e83a2438bbfb550e2d8affab7c2da SHA512 f5310cd6d3048d5f307adb41ac1ac807f087a6344c96324cb0f13d0eae1fa3fe5f8005f17adf77664044daf762902223b650b5d8c1636c7801183cd3b4e03ac8 |
28 |
DIST opencolorio-1.1.0.tar.gz 13826812 BLAKE2B 555a5ac393170503c944c3471ea482b1a22be7c98ee7b81af37f52db185c8b61c5318102c139a8711f4828d306b6c4322f5d839c4df08ce41ebbb9dcb2bda152 SHA512 909874a9f91a8d229622810fc70233680c6e75203bd8555179322de2873da00bf302432e19f189b787ffcda3157ddec1e4601c97f75a36e16f644fe7d42f6998 |
29 |
|
30 |
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch b/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch |
31 |
deleted file mode 100644 |
32 |
index 7a396b3b735..00000000000 |
33 |
--- a/media-libs/opencolorio/files/opencolorio-1.0.8-documentation-gen.patch |
34 |
+++ /dev/null |
35 |
@@ -1,54 +0,0 @@ |
36 |
---- a/docs/CMakeLists.txt 2013-01-08 03:19:23.649162615 +0400 |
37 |
-+++ b/docs/CMakeLists.txt 2013-01-08 03:22:29.647329174 +0400 |
38 |
-@@ -81,7 +81,7 @@ |
39 |
- ExtractRstCPP(${CMAKE_SOURCE_DIR}/export/OpenColorIO/OpenColorTypes.h developers/api/OpenColorTypes.rst) |
40 |
- |
41 |
- add_custom_target(doc ALL |
42 |
-- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html |
43 |
-+ COMMAND sphinx-build -b html . ${CMAKE_CURRENT_BINARY_DIR}/build-html |
44 |
- DEPENDS |
45 |
- OpenColorIO |
46 |
- PyOpenColorIO |
47 |
-@@ -93,20 +93,18 @@ |
48 |
- COMMENT "Building html docs" |
49 |
- SOURCES ${DOCFILES}) |
50 |
- |
51 |
--# note: ExternalProject will not build when added to a add_custom_target this |
52 |
--# works around this problem. This seems to be fixed in the cmake ^HEAD |
53 |
--add_dependencies(doc Sphinx) |
54 |
-- |
55 |
- install(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/build-html/ |
56 |
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/html |
57 |
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/html |
58 |
- PATTERN .* EXCLUDE |
59 |
- ) |
60 |
- |
61 |
-+if(OCIO_BUILD_PDF_DOCS) |
62 |
-+ |
63 |
- find_package(LATEX) |
64 |
- if(PDFLATEX_COMPILER) |
65 |
- |
66 |
- add_custom_target(latex |
67 |
-- COMMAND PYTHONPATH=${PYTHONPATH} ${EXTDIST_BINPATH}/sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex |
68 |
-+ COMMAND sphinx-build -b latex . ${CMAKE_CURRENT_BINARY_DIR}/build-latex |
69 |
- DEPENDS |
70 |
- OpenColorIO |
71 |
- ${CMAKE_BINARY_DIR}/docs/conf.py |
72 |
-@@ -116,7 +114,6 @@ |
73 |
- ${RSTDOC_OUTPUT} |
74 |
- COMMENT "Building latex doc" |
75 |
- SOURCES ${DOCFILES}) |
76 |
-- add_dependencies(latex Sphinx) |
77 |
- |
78 |
- add_custom_target(pdf ALL |
79 |
- COMMAND ${PDFLATEX_COMPILER} OpenColorIO.tex |
80 |
-@@ -126,6 +123,8 @@ |
81 |
- add_dependencies(pdf latex) |
82 |
- |
83 |
- install(FILES ${CMAKE_CURRENT_BINARY_DIR}/build-latex/OpenColorIO.pdf |
84 |
-- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/OpenColorIO/) |
85 |
-+ DESTINATION ${CMAKE_INSTALL_PREFIX}/share/doc/$ENV{P}/) |
86 |
- |
87 |
- endif() |
88 |
-+ |
89 |
-+endif() |
90 |
|
91 |
diff --git a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch b/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch |
92 |
deleted file mode 100644 |
93 |
index d30b662e613..00000000000 |
94 |
--- a/media-libs/opencolorio/files/opencolorio-1.0.9-remove-external-doc-utilities.patch |
95 |
+++ /dev/null |
96 |
@@ -1,65 +0,0 @@ |
97 |
---- a/docs/CMakeLists.txt 2013-09-24 13:13:47.572222731 +0400 |
98 |
-+++ b/docs/CMakeLists.txt 2013-09-24 13:14:07.931224505 +0400 |
99 |
-@@ -1,62 +1,3 @@ |
100 |
-- |
101 |
--############################################################################### |
102 |
--### External Doc Apps ### |
103 |
-- |
104 |
--# distribute |
105 |
--set(DISTRIBUTE_VERSION 0.6.36) |
106 |
--ExternalProject_Add(distribute |
107 |
-- URL ${CMAKE_SOURCE_DIR}/ext/distribute-${DISTRIBUTE_VERSION}.tar.gz |
108 |
-- BUILD_IN_SOURCE 1 |
109 |
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} |
110 |
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build |
111 |
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} |
112 |
--) |
113 |
-- |
114 |
--# docutils |
115 |
--set(DOCUTILS_VERSION 0.10) |
116 |
--ExternalProject_Add(docutils |
117 |
-- DEPENDS distribute |
118 |
-- URL ${CMAKE_SOURCE_DIR}/ext/docutils-${DOCUTILS_VERSION}.tar.gz |
119 |
-- BUILD_IN_SOURCE 1 |
120 |
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} |
121 |
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build |
122 |
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} |
123 |
--) |
124 |
-- |
125 |
--# jinja2 |
126 |
--set(JINJA2_VERSION 2.5.5) |
127 |
--ExternalProject_Add(Jinja2 |
128 |
-- DEPENDS distribute |
129 |
-- URL ${CMAKE_SOURCE_DIR}/ext/Jinja2-${JINJA2_VERSION}.tar.gz |
130 |
-- BUILD_IN_SOURCE 1 |
131 |
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} |
132 |
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build |
133 |
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} |
134 |
--) |
135 |
-- |
136 |
--# Pygments |
137 |
--set(PYGMENTS_VERSION 1.3.1) |
138 |
--ExternalProject_Add(Pygments |
139 |
-- DEPENDS distribute |
140 |
-- URL ${CMAKE_SOURCE_DIR}/ext/Pygments-${PYGMENTS_VERSION}.tar.gz |
141 |
-- BUILD_IN_SOURCE 1 |
142 |
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} |
143 |
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build |
144 |
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} |
145 |
--) |
146 |
-- |
147 |
--# sphinx |
148 |
--set(SPHINX_VERSION 1.2b1) |
149 |
--ExternalProject_Add(Sphinx |
150 |
-- DEPENDS distribute docutils Jinja2 Pygments |
151 |
-- URL ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.tar.gz |
152 |
-- PATCH_COMMAND patch -p1 < ${CMAKE_SOURCE_DIR}/ext/Sphinx-${SPHINX_VERSION}.patch |
153 |
-- BUILD_IN_SOURCE 1 |
154 |
-- CONFIGURE_COMMAND ${CMAKE_COMMAND} -E make_directory ${EXTDIST_PYTHONPATH} |
155 |
-- BUILD_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py build |
156 |
-- INSTALL_COMMAND PYTHONPATH=${PYTHONPATH} ${PYTHON} setup.py install --prefix=${EXTDIST_ROOT} --install-scripts=${EXTDIST_ROOT}/bin |
157 |
--) |
158 |
-- |
159 |
- ############################################################################### |
160 |
- ### Create Doc Targets ### |
161 |
- |
162 |
|
163 |
diff --git a/media-libs/opencolorio/metadata.xml b/media-libs/opencolorio/metadata.xml |
164 |
index 8622e02f2f8..ea85c9e1ea2 100644 |
165 |
--- a/media-libs/opencolorio/metadata.xml |
166 |
+++ b/media-libs/opencolorio/metadata.xml |
167 |
@@ -6,10 +6,6 @@ |
168 |
<name>Gentoo Graphics Project</name> |
169 |
</maintainer> |
170 |
<longdescription lang="en">OpenColorIO (OCIO) is a complete color management solution geared towards motion picture production with an emphasis on visual effects and computer animation.</longdescription> |
171 |
- <use> |
172 |
- <flag name="pdf" restrict="<=media-libs/opencolorio-1.1.0-r1"> |
173 |
- Install extra documentation in PDF format</flag> |
174 |
- </use> |
175 |
<upstream> |
176 |
<remote-id type="github">imageworks/OpenColorIO</remote-id> |
177 |
</upstream> |
178 |
|
179 |
diff --git a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild b/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild |
180 |
deleted file mode 100644 |
181 |
index 1d80450f58a..00000000000 |
182 |
--- a/media-libs/opencolorio/opencolorio-1.0.9-r2.ebuild |
183 |
+++ /dev/null |
184 |
@@ -1,87 +0,0 @@ |
185 |
-# Copyright 1999-2017 Gentoo Foundation |
186 |
-# Distributed under the terms of the GNU General Public License v2 |
187 |
- |
188 |
-EAPI=6 |
189 |
- |
190 |
-# Compatibility with Python 3 is declared by upstream, but it is broken in fact, check on bump |
191 |
-PYTHON_COMPAT=( python2_7 ) |
192 |
- |
193 |
-inherit cmake-utils python-single-r1 vcs-snapshot |
194 |
- |
195 |
-DESCRIPTION="A color management framework for visual effects and animation" |
196 |
-HOMEPAGE="http://opencolorio.org/" |
197 |
-SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz \ |
198 |
- -> ${P}.tar.gz |
199 |
- https://dev.gentoo.org/~pinkbyte/distfiles/patches/${P}-yaml-0.5-compat-v2.patch.bz2" |
200 |
- |
201 |
-LICENSE="BSD" |
202 |
-SLOT="0" |
203 |
-KEYWORDS="amd64 x86" |
204 |
-IUSE="doc opengl pdf python cpu_flags_x86_sse2 test" |
205 |
- |
206 |
-RDEPEND="opengl? ( |
207 |
- media-libs/lcms:2 |
208 |
- >=media-libs/openimageio-1.1.0 |
209 |
- media-libs/glew:0= |
210 |
- media-libs/freeglut |
211 |
- virtual/opengl |
212 |
- ) |
213 |
- python? ( ${PYTHON_DEPS} ) |
214 |
- >=dev-cpp/yaml-cpp-0.5 |
215 |
- dev-libs/tinyxml |
216 |
- " |
217 |
-DEPEND="${RDEPEND} |
218 |
- doc? ( |
219 |
- pdf? ( dev-python/sphinx[latex,${PYTHON_USEDEP}] ) |
220 |
- !pdf? ( dev-python/sphinx[${PYTHON_USEDEP}] ) |
221 |
- ) |
222 |
- " |
223 |
- |
224 |
-# Documentation building requires Python bindings building |
225 |
-REQUIRED_USE="doc? ( python ) python? ( ${PYTHON_REQUIRED_USE} )" |
226 |
- |
227 |
-# Restricting tests, bugs #439790 and #447908 |
228 |
-RESTRICT="test" |
229 |
- |
230 |
-PATCHES=( |
231 |
- "${FILESDIR}/${PN}-1.0.8-documentation-gen.patch" |
232 |
- "${FILESDIR}/${P}-remove-external-doc-utilities.patch" |
233 |
- "${WORKDIR}/${P}-yaml-0.5-compat-v2.patch" |
234 |
-) |
235 |
- |
236 |
-pkg_setup() { |
237 |
- use python && python-single-r1_pkg_setup |
238 |
-} |
239 |
- |
240 |
-src_prepare() { |
241 |
- cmake-utils_src_prepare |
242 |
- |
243 |
- use python && python_fix_shebang . |
244 |
-} |
245 |
- |
246 |
-src_configure() { |
247 |
- # Missing features: |
248 |
- # - Truelight and Nuke are not in portage for now, so their support are disabled |
249 |
- # - Java bindings was not tested, so disabled |
250 |
- # Notes: |
251 |
- # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl) |
252 |
- # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl) |
253 |
- local mycmakeargs=( |
254 |
- -DOCIO_BUILD_JNIGLUE=OFF |
255 |
- -DOCIO_BUILD_NUKE=OFF |
256 |
- -DOCIO_BUILD_SHARED=ON |
257 |
- -DOCIO_BUILD_STATIC=OFF |
258 |
- -DOCIO_STATIC_JNIGLUE=OFF |
259 |
- -DOCIO_BUILD_TRUELIGHT=OFF |
260 |
- -DUSE_EXTERNAL_LCMS=ON |
261 |
- -DUSE_EXTERNAL_TINYXML=ON |
262 |
- -DUSE_EXTERNAL_YAML=ON |
263 |
- -DOCIO_BUILD_DOCS="$(usex doc)" |
264 |
- -DOCIO_BUILD_APPS="$(usex opengl)" |
265 |
- -DOCIO_BUILD_PDF_DOCS="$(usex pdf)" |
266 |
- -DOCIO_BUILD_PYGLUE="$(usex python)" |
267 |
- -DOCIO_USE_SSE="$(usex cpu_flags_x86_sse2)" |
268 |
- -DOCIO_BUILD_TESTS="$(usex test)" |
269 |
- ) |
270 |
- cmake-utils_src_configure |
271 |
-} |