| 1 |
commit: 91bc5e72afb058ff82626e49cacb9515d0e22307 |
| 2 |
Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Oct 11 18:15:27 2017 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 15 21:11:06 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bc5e72 |
| 7 |
|
| 8 |
media-libs/opensubdiv: ebuild and metadata fixes. |
| 9 |
|
| 10 |
* remove tutorial use flag from metadata.xml. |
| 11 |
* remove examples and tutorials as they violate installation |
| 12 |
location rules. |
| 13 |
|
| 14 |
Closes: https://bugs.gentoo.org/633756 |
| 15 |
Closes: https://github.com/gentoo/gentoo/pull/5919 |
| 16 |
|
| 17 |
media-libs/opensubdiv/metadata.xml | 2 -- |
| 18 |
media-libs/opensubdiv/opensubdiv-3.1.0.ebuild | 6 +++--- |
| 19 |
media-libs/opensubdiv/opensubdiv-3.1.1.ebuild | 6 +++--- |
| 20 |
media-libs/opensubdiv/opensubdiv-3.3.0.ebuild | 8 ++++---- |
| 21 |
4 files changed, 10 insertions(+), 12 deletions(-) |
| 22 |
|
| 23 |
diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml |
| 24 |
index f4db4009bdd..8a3f73ac7b2 100644 |
| 25 |
--- a/media-libs/opensubdiv/metadata.xml |
| 26 |
+++ b/media-libs/opensubdiv/metadata.xml |
| 27 |
@@ -33,8 +33,6 @@ |
| 28 |
Enable OpenCL support through |
| 29 |
<pkg>virtual/opencl</pkg>. |
| 30 |
</flag> |
| 31 |
- <flag name="tutorials"> |
| 32 |
- </flag> |
| 33 |
</use> |
| 34 |
<upstream> |
| 35 |
<remote-id type="github">PixarAnimationStudios/OpenSubdiv</remote-id> |
| 36 |
|
| 37 |
diff --git a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild |
| 38 |
index d822c40cc99..aa63d90eeda 100644 |
| 39 |
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild |
| 40 |
+++ b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild |
| 41 |
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t |
| 42 |
|
| 43 |
LICENSE="ZLIB" |
| 44 |
SLOT="0" |
| 45 |
-IUSE="cuda doc examples opencl openmp ptex tbb test tutorials" |
| 46 |
+IUSE="cuda doc opencl openmp ptex tbb test" |
| 47 |
|
| 48 |
RDEPEND="media-libs/glew:= |
| 49 |
media-libs/glfw:= |
| 50 |
@@ -49,8 +49,8 @@ src_configure() { |
| 51 |
-DNO_OPENCL=$(usex !opencl) |
| 52 |
-DNO_CUDA=$(usex !cuda) |
| 53 |
-DNO_REGRESSION=$(usex !test) |
| 54 |
- -DNO_EXAMPLES=$(usex !examples) |
| 55 |
- -DNO_TUTORIALS=$(usex !tutorials) |
| 56 |
+ -DNO_EXAMPLES=1 # broken |
| 57 |
+ -DNO_TUTORIALS=1 # broken |
| 58 |
-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)" |
| 59 |
-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)" |
| 60 |
) |
| 61 |
|
| 62 |
diff --git a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild |
| 63 |
index 0003926a6d4..5c1768b6b37 100644 |
| 64 |
--- a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild |
| 65 |
+++ b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild |
| 66 |
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t |
| 67 |
|
| 68 |
LICENSE="ZLIB" |
| 69 |
SLOT="0" |
| 70 |
-IUSE="cuda doc examples opencl openmp ptex tbb tutorials" |
| 71 |
+IUSE="cuda doc opencl openmp ptex tbb" |
| 72 |
|
| 73 |
RDEPEND="media-libs/glew:= |
| 74 |
media-libs/glfw:= |
| 75 |
@@ -54,8 +54,8 @@ src_configure() { |
| 76 |
-DNO_OPENCL=$(usex !opencl) |
| 77 |
-DNO_CUDA=$(usex !cuda) |
| 78 |
-DNO_REGRESSION=1 # The don't work with certain settings |
| 79 |
- -DNO_EXAMPLES=$(usex !examples) |
| 80 |
- -DNO_TUTORIALS=$(usex !tutorials) |
| 81 |
+ -DNO_EXAMPLES=1 # Broken |
| 82 |
+ -DNO_TUTORIALS=1 # Broken |
| 83 |
-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)" |
| 84 |
-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)" |
| 85 |
) |
| 86 |
|
| 87 |
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild |
| 88 |
index b73f2a25deb..28ba08cb7a5 100644 |
| 89 |
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild |
| 90 |
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild |
| 91 |
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t |
| 92 |
LICENSE="ZLIB" |
| 93 |
SLOT="0" |
| 94 |
KEYWORDS="~amd64 ~x86" |
| 95 |
-IUSE="cuda doc examples opencl openmp ptex tbb tutorials" |
| 96 |
+IUSE="cuda doc opencl openmp ptex tbb" |
| 97 |
|
| 98 |
RDEPEND="media-libs/glew:= |
| 99 |
media-libs/glfw:= |
| 100 |
@@ -21,7 +21,7 @@ RDEPEND="media-libs/glew:= |
| 101 |
|
| 102 |
DEPEND="${RDEPEND} |
| 103 |
tbb? ( dev-cpp/tbb ) |
| 104 |
- doc? ( |
| 105 |
+ doc? ( |
| 106 |
dev-python/docutils |
| 107 |
app-doc/doxygen |
| 108 |
)" |
| 109 |
@@ -52,8 +52,8 @@ src_configure() { |
| 110 |
-DNO_OPENCL=$(usex !opencl) |
| 111 |
-DNO_CUDA=$(usex !cuda) |
| 112 |
-DNO_REGRESSION=1 # They don't work with certain settings |
| 113 |
- -DNO_EXAMPLES=$(usex !examples) |
| 114 |
- -DNO_TUTORIALS=$(usex !tutorials) |
| 115 |
+ -DNO_EXAMPLES=1 # Not needed. |
| 116 |
+ -DNO_TUTORIALS=1 # They install illegally. Need to find a better solution. |
| 117 |
-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)" |
| 118 |
-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)" |
| 119 |
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
Archives