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

2024-04-10 Thread Joonas Niilola 
commit: d6f8a39a7643c24cc24976b64412c6aac5d5aa95
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Apr 10 06:16:33 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Apr 10 06:16:54 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6f8a39a

media-libs/opensubdiv: Stabilize 3.6.0-r1 amd64, #928996

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild
index b5155b620bee..118c43243cc4 100644
--- a/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}"
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="X cuda doc examples +glew +glfw opencl +opengl openmp ptex python tbb 
test tutorials"
 RESTRICT="!test? ( test )"

[gentoo-commits] repo/gentoo:master commit in: media-libs/opensubdiv/, media-libs/ptex/, media-libs/opencollada/, ...

2024-03-16 Thread Joonas Niilola 
commit: 465ab2a20527945c2368d0478ebf7799a56cab4d
Author: Paul Zander  gmail  com>
AuthorDate: Thu Mar 14 14:06:13 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Sat Mar 16 08:49:42 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=465ab2a2

*/*: Take over redchillipadi's packages

Bug: https://bugs.gentoo.org/586392
Bug: https://bugs.gentoo.org/659306
Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Joonas Niilola  gentoo.org>

 media-gfx/blender/metadata.xml  | 4 ++--
 media-gfx/openvdb/metadata.xml  | 4 ++--
 media-libs/Field3D/metadata.xml | 4 ++--
 media-libs/opencollada/metadata.xml | 6 +++---
 media-libs/opensubdiv/metadata.xml  | 4 ++--
 media-libs/osl/metadata.xml | 4 ++--
 media-libs/partio/metadata.xml  | 4 ++--
 media-libs/ptex/metadata.xml| 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml
index 533ef36d911a..b062bde863c4 100644
--- a/media-gfx/blender/metadata.xml
+++ b/media-gfx/blender/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander


darkdefe...@gmail.com

diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml
index c0e6c1dda969..0b41aea83468 100644
--- a/media-gfx/openvdb/metadata.xml
+++ b/media-gfx/openvdb/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/media-libs/Field3D/metadata.xml b/media-libs/Field3D/metadata.xml
index 72e9caa3fb00..c9ecd5661c80 100644
--- a/media-libs/Field3D/metadata.xml
+++ b/media-libs/Field3D/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/media-libs/opencollada/metadata.xml 
b/media-libs/opencollada/metadata.xml
index 092bb954b7cf..3b7c5d96f0f9 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -2,10 +2,10 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander

-   
+   
proxy-ma...@gentoo.org
Proxy Maintainers


diff --git a/media-libs/opensubdiv/metadata.xml 
b/media-libs/opensubdiv/metadata.xml
index 261fb3ca34b8..031b514998a6 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index bd83cdb5a001..4e777e0e9393 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/media-libs/partio/metadata.xml b/media-libs/partio/metadata.xml
index ef50de7bed91..c34a08f06a9e 100644
--- a/media-libs/partio/metadata.xml
+++ b/media-libs/partio/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander


proxy-ma...@gentoo.org

diff --git a/media-libs/ptex/metadata.xml b/media-libs/ptex/metadata.xml
index 0b9a4bd455e6..5c25989d1829 100644
--- a/media-libs/ptex/metadata.xml
+++ b/media-libs/ptex/metadata.xml
@@ -2,8 +2,8 @@
 https://www.gentoo.org/dtd/metadata.dtd;>
 

-   agrigo2...@yahoo.com.au
-   Adrian Grigo
+   negril.nx+gen...@gmail.com
+   Paul Zander


waebbl-gen...@posteo.net

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

2024-02-14 Thread Joonas Niilola 
commit: b9e73f3a9b0d7d5d7d8c8efb6a27d397a4322378
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Feb 14 09:28:32 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 14 09:28:32 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e73f3a

media-libs/opensubdiv: revbump 3.6.0 due to previous enhancements

Signed-off-by: Joonas Niilola  gentoo.org>

 .../opensubdiv/{opensubdiv-3.6.0.ebuild => opensubdiv-3.6.0-r1.ebuild}| 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild
similarity index 100%
rename from media-libs/opensubdiv/opensubdiv-3.6.0.ebuild
rename to media-libs/opensubdiv/opensubdiv-3.6.0-r1.ebuild

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

2024-02-14 Thread Joonas Niilola 
commit: 5b9cb4db94d5520e018a1a99d38d444c9c95d159
Author: Paul Zander  gmail  com>
AuthorDate: Sun Jan 21 18:01:51 2024 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Feb 14 09:26:38 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b9cb4db

media-libs/opensubdiv: 3.6.0 update

Removed all automagic dependencies.

Changed CUDA interaction as a test-case for better binpkg support.
  - We adhere to CUDAARCHS or NVCCFLAGS.
  - For `MERGE_TYPE=source` we fall back to native.
  - For `MERGE_TYPE=buildonly` we fall back to all-major.
  - Removed clunky OSD_CUDA_NVCC_FLAGS which defaulted to ancient ARCHS.

Replace src_install logic that removed extra files in favour of never 
installing them via src_prepare.

Closes: https://bugs.gentoo.org/922952
Closes: https://bugs.gentoo.org/922950
Closes: https://bugs.gentoo.org/904070
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35029
Signed-off-by: Joonas Niilola  gentoo.org>

 .../files/opensubdiv-3.6.0-cudaflags.patch |  20 ++
 .../opensubdiv-3.6.0-use-gnuinstalldirs.patch  |  38 
 media-libs/opensubdiv/metadata.xml |   9 +
 media-libs/opensubdiv/opensubdiv-3.6.0.ebuild  | 222 +++--
 4 files changed, 232 insertions(+), 57 deletions(-)

diff --git a/media-libs/opensubdiv/files/opensubdiv-3.6.0-cudaflags.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.6.0-cudaflags.patch
new file mode 100644
index ..0202c47d13a4
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.6.0-cudaflags.patch
@@ -0,0 +1,20 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -595,7 +595,7 @@ if(CUDA_FOUND)
+ )
+ set(OSD_GPU TRUE)
+ 
+-if (UNIX)
++if (FALSE)
+ list( APPEND CUDA_NVCC_FLAGS -Xcompiler -fPIC )
+ # Use OSD_CUDA_NVCC_FLAGS to specify --gpu-architecture or other CUDA
+ # compilation options. The overrides here are only for compatibility
+@@ -609,7 +609,7 @@ if(CUDA_FOUND)
+ endif()
+ endif()
+ 
+-if (DEFINED OSD_CUDA_NVCC_FLAGS)
++if (FALSE)
+ list( APPEND CUDA_NVCC_FLAGS ${OSD_CUDA_NVCC_FLAGS})
+ endif()
+ 

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.6.0-use-gnuinstalldirs.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.6.0-use-gnuinstalldirs.patch
new file mode 100644
index ..5beb5bc49664
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.6.0-use-gnuinstalldirs.patch
@@ -0,0 +1,38 @@
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -25,6 +25,7 @@
+ cmake_minimum_required(VERSION 3.12)
+ 
+ project(OpenSubdiv)
++include(GNUInstallDirs)
+ 
+ # Set C++ standard requirements, allowing overrides
+ if (NOT DEFINED CMAKE_CXX_STANDARD)
+@@ -81,15 +82,15 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX)
+ endif()
+ 
+ if (NOT DEFINED CMAKE_INCDIR_BASE)
+-set( CMAKE_INCDIR_BASE include/opensubdiv )
++set( CMAKE_INCDIR_BASE ${CMAKE_INSTALL_INCLUDEDIR}/opensubdiv )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_BINDIR_BASE)
+-set( CMAKE_BINDIR_BASE bin )
++set( CMAKE_BINDIR_BASE ${CMAKE_INSTALL_BINDIR} )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_LIBDIR_BASE)
+-set( CMAKE_LIBDIR_BASE lib )
++set( CMAKE_LIBDIR_BASE ${CMAKE_INSTALL_LIBDIR} )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_FRAMEWORKDIR_BASE)
+@@ -101,7 +102,7 @@ if (NOT DEFINED CMAKE_PLUGINDIR_BASE)
+ endif()
+ 
+ if (NOT DEFINED CMAKE_DOCDIR_BASE)
+-set( CMAKE_DOCDIR_BASE share/doc/opensubdiv )
++set( CMAKE_DOCDIR_BASE ${CMAKE_INSTALL_DOCDIR} )
+ else()
+ if (IS_ABSOLUTE ${CMAKE_DOCDIR_BASE})
+ set( CMAKE_DOCDIR_BASE "${CMAKE_DOCDIR_BASE}" )

diff --git a/media-libs/opensubdiv/metadata.xml 
b/media-libs/opensubdiv/metadata.xml
index f88292b52159..261fb3ca34b8 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -10,10 +10,19 @@
Proxy Maintainers


+   
+   Enable support for OpenGL Extension Wrangler Library 
(media-libs/glew)
+   
+   
+   Enable support for OpenGL FrameWork 
(media-libs/glfw)
+   

Adds support for faster per-face texture mapping through
media-libs/ptex

+   
+   Use dev-lang/python to process source and 
documentation source files
+   

Enable multithreading with the Intel Threads Building 
Blocks through
dev-cpp/tbb

diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild
index 571914ada18c..b5155b620bee 100644
--- a/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild
@@ -3,7 +3,9 @@
 
 EAPI=8
 
-inherit cmake cuda toolchain-funcs
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit cmake cuda

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

2024-01-20 Thread Sam James 
commit: c645a8f22e320746e5111d59a500fe37acdd9179
Author: Paul Zander  gmail  com>
AuthorDate: Fri Dec  8 14:19:10 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 12:29:43 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c645a8f2

media-libs/opensubdiv: add 3.5.1, 3.6.0

Closes: https://bugs.gentoo.org/903982
Closes: https://bugs.gentoo.org/891301
Closes: https://bugs.gentoo.org/884463
Closes: https://bugs.gentoo.org/835589
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34546
Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/Manifest|   2 +
 media-libs/opensubdiv/opensubdiv-3.5.1.ebuild | 121 ++
 media-libs/opensubdiv/opensubdiv-3.6.0.ebuild | 121 ++
 3 files changed, 244 insertions(+)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index f158e1b146bd..819ea2eabdac 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,2 +1,4 @@
 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 
53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445
 SHA512 
fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
 DIST opensubdiv-3.5.0.tar.gz 40740801 BLAKE2B 
08ad5cdc4b38b9862e62a8871fa1ed9ee5d9ff3b617c1f5627c2b773804d207028e29517d3e7015c8712b5f8ac378f3e35811de2c67711ff4a320d00bd6ce1a7
 SHA512 
7ede8f3f335a6306486d649199117401ab4285d360a3b53a536f25046d94741b5e7eacbc06a55d8a0bd5798c810c1b3cfd7964859f04f95363ad26411310b320
+DIST opensubdiv-3.5.1.tar.gz 40743642 BLAKE2B 
2e4cf93c38daccc383c9af0c8602e28920be92427ee3aa0eca58d698ce3768fd5a6b030a8942f128500b608ad97e95a8c2e675f4660ae373b3bf5f99084360ab
 SHA512 
ac028a10de9ebe907f573d2a2c7f30cea8ffefbe8c4859035d1782d27128051f8753dba16f9478a0f4e8f1d03cf12cece98031e19cabf24f98c0bda9058d
+DIST opensubdiv-3.6.0.tar.gz 40746688 BLAKE2B 
23f92fa028ae32b430350998299dab3fbb87b8530755abd435ce059223998a8f3d48de17c746028362fd1d2eee33e8a4c7a55b8cf4083202cfd0b6d27de008c7
 SHA512 
a976733a26e2c0f6510f59d4372b1b33f5404a9d536bcbd6ae3a1a0ffd1bba5495df7108bebc854d5c069575772c97c0d00f0f16f79e87611376ba84e9ae7a4b

diff --git a/media-libs/opensubdiv/opensubdiv-3.5.1.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.5.1.ebuild
new file mode 100644
index ..8ddbb2e65dac
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.5.1.ebuild
@@ -0,0 +1,121 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake cuda toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html;
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   examples? (
+   media-libs/glew:=
+   media-libs/glfw:=
+   x11-libs/libXinerama
+   )
+   cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   opencl? ( virtual/opencl )
+   ptex? ( media-libs/ptex )
+"
+DEPEND="
+   ${RDEPEND}
+   tbb? ( dev-cpp/tbb:= )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+   "${FILESDIR}/${PN}-3.4.4-tbb-2021.patch"
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   use cuda && cuda_src_prepare
+}
+
+src_configure() {
+   # GLTESTS are disabled as portage is unable to open a display during 
test phase
+   # TODO: virtx work?
+   local mycmakeargs=(
+   -DGLEW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+   -DGLFW_LOCATION="${ESYSROOT}/usr/$(get_libdir)"
+   -DNO_CLEW=ON
+   -DNO_CUDA=$(usex !cuda)
+   # Docs needed Python 2 so disabled
+   # bug #815172
+   -DNO_DOC=ON
+   -DNO_EXAMPLES=$(usex !examples)
+   -DNO_GLTESTS=ON
+   -DNO_OMP=$(usex !openmp)
+   -DNO_OPENCL=$(usex !opencl)
+   -DNO_PTEX=$(usex !ptex)
+   -DNO_REGRESSION=$(usex !test)
+   -DNO_TBB=$(usex !tbb)
+   -DNO_TESTS=$(usex !test)
+   -DNO_TUTORIALS=$(usex !tutorials)
+   )
+
+   if use cuda; then
+

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

2024-01-20 Thread Sam James 
commit: 9411e1cc1def1926057d4c18b118096e147f05bd
Author: Sam James  gentoo  org>
AuthorDate: Sat Jan 20 12:30:50 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Jan 20 12:30:50 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9411e1cc

media-libs/opensubdiv: use get_libdir

Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.5.1.ebuild | 6 +++---
 media-libs/opensubdiv/opensubdiv-3.6.0.ebuild | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.5.1.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.5.1.ebuild
index 8ddbb2e65dac..9eaf58f5eead 100644
--- a/media-libs/opensubdiv/opensubdiv-3.5.1.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.5.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -104,9 +104,9 @@ src_test() {
 src_install() {
cmake_src_install
 
-   rm -f "${ED}/usr/lib64/libosdCPU.a" || die
+   rm -f "${ED}/usr/$(get_libdir)/libosdCPU.a" || die
if use cuda || use opencl ; then
-   rm -f "${ED}/usr/lib64/libosdGPU.a" || die
+   rm -f "${ED}/usr/$(get_libdir)/libosdGPU.a" || die
fi
if use test; then
rm -f \

diff --git a/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild
index 8670a76affd4..571914ada18c 100644
--- a/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -104,9 +104,9 @@ src_test() {
 src_install() {
cmake_src_install
 
-   rm -f "${ED}/usr/lib64/libosdCPU.a" || die
+   rm -f "${ED}/usr/$(get_libdir)/libosdCPU.a" || die
if use cuda || use opencl ; then
-   rm -f "${ED}/usr/lib64/libosdGPU.a" || die
+   rm -f "${ED}/usr/$(get_libdir)/libosdGPU.a" || die
fi
if use test; then
rm -f \

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

2023-04-07 Thread Miroslav Šulc 
commit: e9ae2ede7ce7d131fb64c1ccf2805c1bbdae5a91
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Fri Apr  7 12:46:19 2023 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Apr  7 12:50:38 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e9ae2ede

media-libs/opensubdiv: bump to 3.5.0, added support for cuda 12 to 3.4.4 & 
3.5.0 + scrubbed patches

Signed-off-by: Miroslav Šulc  gentoo.org>

 media-libs/opensubdiv/Manifest |  1 +
 .../opensubdiv-3.3.0-use-gnuinstalldirs.patch  |  5 +-
 ...ensubdiv-3.4.3-install-tutorials-into-bin.patch | 25 +++---
 ...opensubdiv-3.4.4-add-CUDA11-compatibility.patch | 13 ++-
 .../files/opensubdiv-3.4.4-tbb-2021.patch  | 12 ---
 media-libs/opensubdiv/opensubdiv-3.5.0.ebuild  | 94 ++
 6 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 7d76fbc02ece..f158e1b146bd 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1 +1,2 @@
 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 
53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445
 SHA512 
fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb
+DIST opensubdiv-3.5.0.tar.gz 40740801 BLAKE2B 
08ad5cdc4b38b9862e62a8871fa1ed9ee5d9ff3b617c1f5627c2b773804d207028e29517d3e7015c8712b5f8ac378f3e35811de2c67711ff4a320d00bd6ce1a7
 SHA512 
7ede8f3f335a6306486d649199117401ab4285d360a3b53a536f25046d94741b5e7eacbc06a55d8a0bd5798c810c1b3cfd7964859f04f95363ad26411310b320

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
index 02027763f5ca..024d2f7138f0 100644
--- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
@@ -1,6 +1,5 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
 a/CMakeLists.txt   2017-07-25 21:58:09.0 +0100
-+++ b/CMakeLists.txt   2017-08-15 14:51:36.771044414 +0100
+--- a/CMakeLists.txt
 b/CMakeLists.txt
 @@ -23,6 +23,7 @@
  #
  

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
index f042967a01af..ff7b7b6563f5 100644
--- 
a/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
+++ 
b/media-libs/opensubdiv/files/opensubdiv-3.4.3-install-tutorials-into-bin.patch
@@ -1,6 +1,5 @@
-diff -Naur a/tutorials/far/CMakeLists.txt b/tutorials/far/CMakeLists.txt
 a/tutorials/far/CMakeLists.txt 2020-05-11 14:48:35.145797436 +1000
-+++ b/tutorials/far/CMakeLists.txt 2020-05-11 14:49:39.445969003 +1000
+--- a/tutorials/far/CMakeLists.txt
 b/tutorials/far/CMakeLists.txt
 @@ -30,7 +30,7 @@
  $
   )
@@ -10,9 +9,8 @@ diff -Naur a/tutorials/far/CMakeLists.txt 
b/tutorials/far/CMakeLists.txt
  
  endmacro()
  
-diff -Naur a/tutorials/hbr/tutorial_0/CMakeLists.txt 
b/tutorials/hbr/tutorial_0/CMakeLists.txt
 a/tutorials/hbr/tutorial_0/CMakeLists.txt  2020-05-11 14:48:35.145797436 
+1000
-+++ b/tutorials/hbr/tutorial_0/CMakeLists.txt  2020-05-11 14:50:38.076125987 
+1000
+--- a/tutorials/hbr/tutorial_0/CMakeLists.txt
 b/tutorials/hbr/tutorial_0/CMakeLists.txt
 @@ -30,5 +30,5 @@
  ${SOURCE_FILES}
  )
@@ -20,9 +18,8 @@ diff -Naur a/tutorials/hbr/tutorial_0/CMakeLists.txt 
b/tutorials/hbr/tutorial_0/
 -install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
 +install(TARGETS hbr_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
  
-diff -Naur a/tutorials/hbr/tutorial_1/CMakeLists.txt 
b/tutorials/hbr/tutorial_1/CMakeLists.txt
 a/tutorials/hbr/tutorial_1/CMakeLists.txt  2020-05-11 14:48:35.145797436 
+1000
-+++ b/tutorials/hbr/tutorial_1/CMakeLists.txt  2020-05-11 14:50:10.406051839 
+1000
+--- a/tutorials/hbr/tutorial_1/CMakeLists.txt
 b/tutorials/hbr/tutorial_1/CMakeLists.txt
 @@ -30,5 +30,5 @@
  ${SOURCE_FILES}
  )
@@ -30,9 +27,8 @@ diff -Naur a/tutorials/hbr/tutorial_1/CMakeLists.txt 
b/tutorials/hbr/tutorial_1/
 -install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
 +install(TARGETS hbr_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
  
-diff -Naur a/tutorials/hbr/tutorial_2/CMakeLists.txt 
b/tutorials/hbr/tutorial_2/CMakeLists.txt
 a/tutorials/hbr/tutorial_2/CMakeLists.txt  2020-05-11 14:48:35.145797436 
+1000
-+++ b/tutorials/hbr/tutorial_2/CMakeLists.txt  2020-05-11 14:50:20.706079428 
+1000
+--- a/tutorials/hbr/tutorial_2/CMakeLists.txt
 b/tutorials/hbr/tutorial_2/CMakeLists.txt
 @@ -30,5 +30,5 @@
  ${SOURCE_FILES}
  )
@@ -40,9 +36,8 @@ diff -Naur a/tutorials/hbr/tutorial_2/CMakeLists.txt 
b/tutorials/hbr/tutorial_2/

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

2022-03-20 Thread David Seifert 
commit: d6da82759343230f6dcb8a3e07c8e1faf06bde57
Author: David Seifert  gentoo  org>
AuthorDate: Sun Mar 20 17:01:22 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Mar 20 17:01:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6da8275

media-libs/opensubdiv: drop 3.4.3-r1, 3.4.4-r1, 3.4.4-r2

Signed-off-by: David Seifert  gentoo.org>

 media-libs/opensubdiv/Manifest |  1 -
 .../opensubdiv-3.3.0-add-CUDA9-compatibility.patch | 25 --
 ...ocumentation-CMakeLists.txt-force-python2.patch | 51 
 media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild   | 90 -
 media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild   | 85 
 media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild   | 93 --
 6 files changed, 345 deletions(-)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index ab281bfc665a..7d76fbc02ece 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,2 +1 @@
-DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B 
adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed
 SHA512 
44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
 DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 
53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445
 SHA512 
fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
deleted file mode 100644
index 9fe81c4ee199..
--- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 7b9157bca7138480c387ef3d5b69b6cf1eb498e5 Mon Sep 17 00:00:00 2001
-From: "Daniel M. Weeks" 
-Date: Fri, 15 Dec 2017 22:45:55 -0500
-Subject: [PATCH] CUDA 9 compatible gpu-architecture default
-

- CMakeLists.txt | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 4f3cd9d4..fa438b46 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -513,8 +513,10 @@ if(CUDA_FOUND)
- if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
- if (CUDA_VERSION_MAJOR LESS 6)
- set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
--else()
-+elseif (CUDA_VERSION_MAJOR LESS 9)
- set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
-+else()
-+set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
- endif()
- endif()
- endif()

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
 
b/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
deleted file mode 100644
index 5455ba98e317..
--- 
a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From dc9d14c97fc22ad5b00c9ffb0f83931e42cf2eb0 Mon Sep 17 00:00:00 2001
-From: Bernd Waibel 
-Date: Fri, 2 Aug 2019 19:27:17 +0200
-Subject: [PATCH] documentation/CMakeLists.txt: force python2
-
-The patch forces to use Python-2.x to build the documentation
-
-Signed-off-by: Bernd Waibel 

- documentation/CMakeLists.txt | 8 
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
-index 32b12a3..a93414e 100644
 a/documentation/CMakeLists.txt
-+++ b/documentation/CMakeLists.txt
-@@ -54,10 +54,10 @@ else()
- 
- endif()
- 
--find_package(PythonInterp 2.6)
-+find_package(Python2 COMPONENTS Interpreter)
- 
- # ReST - HTML documentation
--if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
-+if (DOCUTILS_FOUND AND Python2_Interpreter_FOUND)
- 
- set(HTML_FILES
-  search.html
-@@ -198,7 +198,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
- OUTPUT
- "${rstfile}"
- COMMAND
--"${PYTHON_EXECUTABLE}"
-+"${Python2_EXECUTABLE}"
- ARGS
- "${CMAKE_CURRENT_SOURCE_DIR}/processTutorials.py"
- "${infile}"
-@@ -291,7 +291,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
- # build search index and insert navigation tab
- add_custom_target(search_index
- COMMAND
--"${PYTHON_EXECUTABLE}"
-+"${Python2_EXECUTABLE}"
- "${CMAKE_CURRENT_SOURCE_DIR}/processHtml.py"
- "${CMAKE_CURRENT_BINARY_DIR}"
- "${CMAKE_CURRENT_SOURCE_DIR}/nav_template.txt"
--- 
-2.22.0
-
-

diff --git

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

2022-03-20 Thread Sam James 
commit: 6d05aa7b786ea74b1ed7f88fe4b2c3c4ed3b0512
Author: Sam James  gentoo  org>
AuthorDate: Sun Mar 20 16:52:47 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Mar 20 16:52:47 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6d05aa7b

media-libs/opensubdiv: Stabilize 3.4.4-r3 amd64, #835590

Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
index 524b64930836..97c11871340d 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}"
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="cuda examples opencl openmp ptex tbb test tutorials"
 RESTRICT="!test? ( test )"

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

2022-02-12 Thread Sam James 
commit: 2943d53a64fc9448e3a6431f8c56bb19f9e04c5b
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 15:15:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 15:15:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2943d53a

media-libs/opensubdiv: add patch for >= TBB 2021

Bug: https://bugs.gentoo.org/820824
Signed-off-by: Sam James  gentoo.org>

 .../files/opensubdiv-3.4.4-tbb-2021.patch  | 65 +++
 media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild   | 94 ++
 2 files changed, 159 insertions(+)

diff --git a/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch
new file mode 100644
index ..bae9c4a9d1f1
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.4.4-tbb-2021.patch
@@ -0,0 +1,65 @@
+https://github.com/PixarAnimationStudios/OpenSubdiv/pull/1234
+https://bugs.gentoo.org/820824
+
+From 7375c99a4d1337f9b79775fb2c753e7865968642 Mon Sep 17 00:00:00 2001
+From: Artur Sinila 
+Date: Sun, 25 Jul 2021 20:34:48 +0300
+Subject: [PATCH 1/2] Fix typo: schedular -> scheduler
+
+---
+ opensubdiv/osd/tbbEvaluator.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/opensubdiv/osd/tbbEvaluator.h b/opensubdiv/osd/tbbEvaluator.h
+index 6bd365bc5..886a94837 100644
+--- a/opensubdiv/osd/tbbEvaluator.h
 b/opensubdiv/osd/tbbEvaluator.h
+@@ -1226,7 +1226,7 @@ class TbbEvaluator {
+ /// \brief synchronize all asynchronous computation invoked on this 
device.
+ static void Synchronize(void *deviceContext = NULL);
+ 
+-/// \brief initialize tbb task schedular
++/// \brief initialize tbb task scheduler
+ ///(optional: client may use tbb::task_scheduler_init)
+ ///
+ /// @param numThreads  how many threads
+
+From 9079a517f406afba9ea50657b0a0786ad7a7bdcb Mon Sep 17 00:00:00 2001
+From: Artur Sinila 
+Date: Sun, 25 Jul 2021 20:58:27 +0300
+Subject: [PATCH 2/2] Support oneTBB 2021
+
+---
+ opensubdiv/osd/tbbEvaluator.cpp | 12 +++-
+ 1 file changed, 7 insertions(+), 5 deletions(-)
+
+diff --git a/opensubdiv/osd/tbbEvaluator.cpp b/opensubdiv/osd/tbbEvaluator.cpp
+index c98db9f6d..66c2ed58f 100644
+--- a/opensubdiv/osd/tbbEvaluator.cpp
 b/opensubdiv/osd/tbbEvaluator.cpp
+@@ -25,7 +25,8 @@
+ #include "../osd/tbbEvaluator.h"
+ #include "../osd/tbbKernel.h"
+ 
+-#include 
++#define TBB_PREVIEW_GLOBAL_CONTROL true
++#include 
+ 
+ namespace OpenSubdiv {
+ namespace OPENSUBDIV_VERSION {
+@@ -215,10 +216,11 @@ TbbEvaluator::Synchronize(void *) {
+ /* static */
+ void
+ TbbEvaluator::SetNumThreads(int numThreads) {
+-if (numThreads == -1) {
+-tbb::task_scheduler_init init;
+-} else {
+-tbb::task_scheduler_init init(numThreads);
++if (numThreads != -1) {
++  tbb::global_control tbb_global_control(
++  tbb::global_control::max_allowed_parallelism,
++  numThreads
++  );
+ }
+ }
+ 

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
new file mode 100644
index ..524b64930836
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r3.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake cuda toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html;
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   media-libs/glew:=
+   media-libs/glfw:=
+   x11-libs/libXinerama
+   cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   opencl? ( virtual/opencl )
+   ptex? ( media-libs/ptex )
+"
+DEPEND="
+   ${RDEPEND}
+   tbb? ( dev-cpp/tbb:= )
+"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-3.4.3-install-tutorials-into-bin.patch"
+   "${FILESDIR}/${P}-add-CUDA11-compatibility.patch"
+   "${FILESDIR}/${PN}-3.4.4-tbb-2021.patch"
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+   cmake_src_prepare
+
+   use cuda && cuda_src_prepare
+}
+
+src_configure() {
+   # GLTESTS are disabled as portage is unable to open a display during 
test phase
+   # TODO: virtx work?

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

2021-11-22 Thread Joonas Niilola 
commit: fc0a2d9cd04c458e48543abea41bba7882913e93
Author: Alexander Golubev  gmail  com>
AuthorDate: Sat Nov  6 23:14:33 2021 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Nov 22 14:10:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc0a2d9c

media-libs/opensubdiv: use cuda eclass

* Utilize cuda eclass and let it handle gcc selection instead of forcing
  an outdated version.
* Add a fix to provide sane defaults when compiling against a recent
  enough CUDA versions.
* Add an option to pass user-specified NVCCFLAGS and prevent cmake from
  overriding them.

Closes: https://bugs.gentoo.org/744517
Closes: https://bugs.gentoo.org/751382
Signed-off-by: Alexander Golubev  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/22852
Signed-off-by: Joonas Niilola  gentoo.org>

 ...opensubdiv-3.4.4-add-CUDA11-compatibility.patch | 19 +
 media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild   | 93 ++
 2 files changed, 112 insertions(+)

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
new file mode 100644
index ..8f5bfab43a92
--- /dev/null
+++ 
b/media-libs/opensubdiv/files/opensubdiv-3.4.4-add-CUDA11-compatibility.patch
@@ -0,0 +1,19 @@
+From: "Alexander Golubev" 
+
+Set correct default minimal -arch for CUDA 9 and 11
+--- OpenSubdiv-3_4_4/CMakeLists.txt 2021-11-07 02:01:07.899484952 +0300
 OpenSubdiv-3_4_4/CMakeLists.txt.new 2021-11-07 02:01:23.402764409 +0300
+@@ -587,8 +587,12 @@
+ if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
+ if (CUDA_VERSION_MAJOR LESS 6)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
+-else()
++elseif (CUDA_VERSION_MAJOR LESS 9)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
++elseif (CUDA_VERSION_MAJOR LESS 11)
++set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
++else()
++set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_35 )
+ endif()
+ endif()
+ endif()

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
new file mode 100644
index ..e175e9f49681
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r2.ebuild
@@ -0,0 +1,93 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake cuda toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html;
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   media-libs/glew:=
+   media-libs/glfw:=
+   x11-libs/libXinerama
+   cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   opencl? ( virtual/opencl )
+   ptex? ( media-libs/ptex )
+"
+DEPEND="
+   ${RDEPEND}
+   tbb? (

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

2021-10-30 Thread Agostino Sarubbo 
commit: dd99aec351497f8d85138b9b73278d7d31610067
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Sat Oct 30 17:21:56 2021 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Sat Oct 30 17:21:56 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd99aec3

media-libs/opensubdiv: amd64 stable wrt bug #815172

Package-Manager: Portage-3.0.20, Repoman-3.0.3
RepoMan-Options: --include-arches="amd64"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
index 533364777c1..fe2e02e7075 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}"
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="cuda examples opencl openmp ptex tbb test tutorials"
 RESTRICT="!test? ( test )"

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

2021-10-30 Thread Sam James 
commit: 3f32f880956e37949253999b88bf267ce8c56b78
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct 30 17:17:53 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct 30 17:17:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f32f880

media-libs/opensubdiv: needs deprecated TBB features, depend on older version

Bug: https://bugs.gentoo.org/820824
Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild | 2 +-
 media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
index 69421b7d9ef..f9593b44235 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
-   tbb? ( dev-cpp/tbb:= )
+   tbb? (

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

2021-10-29 Thread Sam James 
commit: d4ecda6ce14e21362d2a26a582d651c1dc9ed93a
Author: Sam James  gentoo  org>
AuthorDate: Fri Oct 29 22:16:33 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 29 22:22:42 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4ecda6c

media-libs/opensubdiv: add tbb subslot operator

Signed-off-by: Sam James  gentoo.org>

 .../opensubdiv/{opensubdiv-3.4.3.ebuild => opensubdiv-3.4.3-r1.ebuild}  | 2 +-
 .../opensubdiv/{opensubdiv-3.4.4.ebuild => opensubdiv-3.4.4-r1.ebuild}  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
similarity index 98%
rename from media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
rename to media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
index 765b0146696..69421b7d9ef 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
-   tbb? ( dev-cpp/tbb )
+   tbb? ( dev-cpp/tbb:= )
 "
 BDEPEND="
doc? (

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
similarity index 98%
rename from media-libs/opensubdiv/opensubdiv-3.4.4.ebuild
rename to media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
index 20acfdfe73a..7f1794750aa 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4-r1.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 "
 DEPEND="
${RDEPEND}
-   tbb? ( dev-cpp/tbb )
+   tbb? ( dev-cpp/tbb:= )
 "
 BDEPEND="
cuda? (

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

2021-10-08 Thread Sam James 
commit: e4dfe173407c47cbd202d3fd062f949a11b31e12
Author: Sam James  gentoo  org>
AuthorDate: Sat Oct  9 04:16:23 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Oct  9 04:21:09 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4dfe173

media-libs/opensubdiv: add 3.4.4

Drops docs support as it requires Python 2.

Closes: https://bugs.gentoo.org/774264
Closes: https://bugs.gentoo.org/815172
Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/Manifest|  1 +
 media-libs/opensubdiv/opensubdiv-3.4.4.ebuild | 85 +++
 2 files changed, 86 insertions(+)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 9d551e63ade..ab281bfc665 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1 +1,2 @@
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B 
adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed
 SHA512 
44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2
+DIST opensubdiv-3.4.4.tar.gz 39228037 BLAKE2B 
53bada3ff2652c6041a3becaf037b593c0e1e4c1bd57a285e6c068c11060b06f9ab0617284a57d0e8974f80082abd6563930ede8b1d6bfb801bfa61dd3256445
 SHA512 
fc8f28b79347015c8991150535c1339e695d96947c72fadd4fa27b546a0813c1125cd175ee03bed5aacdb3609f74c4e526ef70103d1195ba9f7df041e73ea9fb

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild
new file mode 100644
index 000..20acfdfe73a
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.4.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR=emake
+
+inherit cmake toolchain-funcs
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="https://graphics.pixar.com/opensubdiv/docs/intro.html;
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+# Modfied Apache-2.0 license, where section 6 has been replaced.
+# See for example CMakeLists.txt for details.
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="cuda examples opencl openmp ptex tbb test tutorials"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+   media-libs/glew:=
+   media-libs/glfw:=
+   x11-libs/libXinerama
+   cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   opencl? ( virtual/opencl )
+   ptex? ( media-libs/ptex )
+"
+DEPEND="
+   ${RDEPEND}
+   tbb? ( dev-cpp/tbb )
+"
+BDEPEND="
+   cuda? (

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

2021-03-05 Thread Sam James 
commit: cbb1d24e63e4026b2e4929b455cd272614079755
Author: Sam James  gentoo  org>
AuthorDate: Fri Mar  5 18:38:46 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Mar  5 18:38:46 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbb1d24e

media-libs/opensubdiv: Keyword 3.4.3 arm64, #556758

Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
index 51707c88fe7..765b0146696 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
 IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
 
 RDEPEND="

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

2021-02-21 Thread Sam James 
commit: b9e4b426fc860f4433a6c91c18ce6e4f75e42a0e
Author: Sam James  gentoo  org>
AuthorDate: Mon Feb 22 07:12:28 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Feb 22 07:12:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9e4b426

media-libs/opensubdiv: Keyword 3.4.3 arm, #556758

Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.4.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
index 6944163c7df..51707c88fe7 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
 
 RDEPEND="

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

2021-02-14 Thread Andreas Sturmlechner 
commit: 0df8bd135a48cd0c18cb82585d76ae947e8acc43
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Sun Feb 14 21:03:53 2021 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Sun Feb 14 21:03:53 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0df8bd13

media-libs/opensubdiv: Drop 3.3.3 and 3.3.3-r1

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/opensubdiv/Manifest |   1 -
 .../files/opensubdiv-3.3.0-fix-quotes.patch|  13 ---
 ...ensubdiv-3.3.3-install-tutorials-into-bin.patch | 130 -
 media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild   |  90 --
 media-libs/opensubdiv/opensubdiv-3.3.3.ebuild  |  64 --
 5 files changed, 298 deletions(-)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 3d73323cadb..9d551e63ade 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,2 +1 @@
-DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 
05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d
 SHA512 
65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
 DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B 
adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed
 SHA512 
44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2

diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
deleted file mode 100644
index 2b5c71a37cb..000
--- a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index e02ce90c..6d4f5342 100644
 a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,7 @@ endif()
- string(REGEX REPLACE "^v" "" OSD_SONAME ${OSD_SONAME})
- 
- add_definitions(
---DOPENSUBDIV_VERSION_STRING="${OSD_SONAME}"
-+-DOPENSUBDIV_VERSION_STRING=\\\"${OSD_SONAME}\\\"
- )
- 
- 
#---

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
deleted file mode 100644
index ec63f47b440..000
--- 
a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
+++ /dev/null
@@ -1,130 +0,0 @@
-diff -Naur a/tutorials/far/tutorial_0/CMakeLists.txt 
b/tutorials/far/tutorial_0/CMakeLists.txt
 a/tutorials/far/tutorial_0/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
-+++ b/tutorials/far/tutorial_0/CMakeLists.txt  2020-05-13 16:06:40.857855388 
+1000
-@@ -33,5 +33,5 @@
- $
- )
- 
--install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_1/CMakeLists.txt 
b/tutorials/far/tutorial_1/CMakeLists.txt
 a/tutorials/far/tutorial_1/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
-+++ b/tutorials/far/tutorial_1/CMakeLists.txt  2020-05-13 16:06:53.137874901 
+1000
-@@ -33,5 +33,5 @@
- $
- )
- 
--install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_2/CMakeLists.txt 
b/tutorials/far/tutorial_2/CMakeLists.txt
 a/tutorials/far/tutorial_2/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
-+++ b/tutorials/far/tutorial_2/CMakeLists.txt  2020-05-13 16:07:04.297892363 
+1000
-@@ -33,5 +33,5 @@
- $
- )
- 
--install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_3/CMakeLists.txt 
b/tutorials/far/tutorial_3/CMakeLists.txt
 a/tutorials/far/tutorial_3/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
-+++ b/tutorials/far/tutorial_3/CMakeLists.txt  2020-05-13 16:07:20.377917078 
+1000
-@@ -33,5 +33,5 @@
- $
- )
- 
--install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}")
- 
-diff -Naur a/tutorials/far/tutorial_4/CMakeLists.txt 
b/tutorials/far/tutorial_4/CMakeLists.txt
 a/tutorials/far/tutorial_4/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
-+++ b/tutorials/far/tutorial_4/CMakeLists.txt  2020-05-13 16:07:36.727941691 
+1000
-@@ -33,5 +33,5 @@
- $
- )
- 
--install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
-+install(TARGETS far_tutorial_4 DESTINATION

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

2020-11-08 Thread Sam James 
commit: fa578f1157e7a15e47f88b3d6c1588300cde8e7a
Author: Sam James  gentoo  org>
AuthorDate: Sun Nov  8 10:28:21 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Nov  8 10:28:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa578f11

media-libs/opensubdiv: Stabilize 3.4.3 amd64, #746740

Signed-off-by: Sam James  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.4.3.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
index 92f1b42c70a..6944163c7df 100644
--- a/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.4.3.ebuild
@@ -17,7 +17,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
 
 RDEPEND="

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

2020-06-08 Thread Joonas Niilola 
commit: de16806017d00dbe9faaa203d086ce3b29b95919
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Wed May 13 06:56:10 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun  8 07:45:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de168060

media-libs/opensubdiv: Update to EAPI 7

Update ebuild to use EAPI 7. Remove eapi7-ver from inherit.

Signed-off-by: Adrian Grigo  yahoo.com.au>
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Joonas Niilola  gentoo.org>

 ...ensubdiv-3.3.3-install-tutorials-into-bin.patch | 130 +
 media-libs/opensubdiv/opensubdiv-3.3.3.ebuild  |  70 +++
 2 files changed, 178 insertions(+), 22 deletions(-)

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
new file mode 100644
index 000..ec63f47b440
--- /dev/null
+++ 
b/media-libs/opensubdiv/files/opensubdiv-3.3.3-install-tutorials-into-bin.patch
@@ -0,0 +1,130 @@
+diff -Naur a/tutorials/far/tutorial_0/CMakeLists.txt 
b/tutorials/far/tutorial_0/CMakeLists.txt
+--- a/tutorials/far/tutorial_0/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_0/CMakeLists.txt  2020-05-13 16:06:40.857855388 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_0 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_1/CMakeLists.txt 
b/tutorials/far/tutorial_1/CMakeLists.txt
+--- a/tutorials/far/tutorial_1/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_1/CMakeLists.txt  2020-05-13 16:06:53.137874901 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_1 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_2/CMakeLists.txt 
b/tutorials/far/tutorial_2/CMakeLists.txt
+--- a/tutorials/far/tutorial_2/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_2/CMakeLists.txt  2020-05-13 16:07:04.297892363 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_2 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_3/CMakeLists.txt 
b/tutorials/far/tutorial_3/CMakeLists.txt
+--- a/tutorials/far/tutorial_3/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_3/CMakeLists.txt  2020-05-13 16:07:20.377917078 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_3 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_4/CMakeLists.txt 
b/tutorials/far/tutorial_4/CMakeLists.txt
+--- a/tutorials/far/tutorial_4/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_4/CMakeLists.txt  2020-05-13 16:07:36.727941691 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_4 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_5/CMakeLists.txt 
b/tutorials/far/tutorial_5/CMakeLists.txt
+--- a/tutorials/far/tutorial_5/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_5/CMakeLists.txt  2020-05-13 16:07:44.797953646 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_5 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_6/CMakeLists.txt 
b/tutorials/far/tutorial_6/CMakeLists.txt
+--- a/tutorials/far/tutorial_6/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_6/CMakeLists.txt  2020-05-13 16:07:53.847966914 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_6 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_7/CMakeLists.txt 
b/tutorials/far/tutorial_7/CMakeLists.txt
+--- a/tutorials/far/tutorial_7/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_7/CMakeLists.txt  2020-05-13 16:08:02.047978804 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+ 
+-install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}/tutorials")
++install(TARGETS far_tutorial_7 DESTINATION "${CMAKE_BINDIR_BASE}")
+ 
+diff -Naur a/tutorials/far/tutorial_8/CMakeLists.txt 
b/tutorials/far/tutorial_8/CMakeLists.txt
+--- a/tutorials/far/tutorial_8/CMakeLists.txt  2020-05-13 16:06:02.537792402 
+1000
 b/tutorials/far/tutorial_8/CMakeLists.txt  2020-05-13 16:08:16.287999162 
+1000
+@@ -33,5 +33,5 @@
+ $
+ )
+

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

2020-06-08 Thread Joonas Niilola 
commit: ac3aeef7d2de3c20b7e53c4faf3d30ac894137bf
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jun  8 07:22:45 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun  8 07:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac3aeef7

media-libs/opensubdiv: redundant long description

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/opensubdiv/metadata.xml | 13 +
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/media-libs/opensubdiv/metadata.xml 
b/media-libs/opensubdiv/metadata.xml
index bc4eae250ff..b043cddb448 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -9,28 +9,25 @@
proxy-ma...@gentoo.org
Proxy Maintainers

-   
-   An Open-Source subdivision surface library.
-   


Enable NVIDIA CUDA Toolkit support through
-   dev-util/nvidia-cuda-toolkit.
+   dev-util/nvidia-cuda-toolkit


Enable OpenCL support through
-   virtual/opencl.
+   virtual/opencl


Adds support for faster per-face texture mapping through
-   media-libs/ptex.
+   media-libs/ptex


Enable multithreading with the Intel Threads Building 
Blocks through
-   dev-cpp/tbb.
+   dev-cpp/tbb


-   Install the tutorials.
+   Install the tutorials

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

2020-06-08 Thread Joonas Niilola 
commit: c280c98bb725da61f5b4af2cf872004aea60cc41
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Wed May 13 01:58:26 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun  8 07:45:20 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c280c98b

media-libs/opensubdiv: Version bump to 3.4.3

Version bump to media-libs/opensubdiv-3.4.3

This version has been updated to EAPI 7 and inherits from cmake rather
than cmake-utils. The license has been corrected to modified apache-2

New USE flags are added to control installation of the docs, examples
and tutorials. The build system is patched to install the tutorials
into /usr/bin, and to use python 2.7 to build the documentation. The
latter fixes bug 722570 for this ebuild.

When using FEATURES="test", the basic and regression tests are enabled.
However the GLTESTS are disabled as portage does not have access to an
X11 display to run them during the build.

A direct dependency on libXinerama was added as this is no longer
included by glfw for wayland users. This fixes bug 708160 for this
ebuild.

For cuda users, the build will fail when using GCC 9+. If an incorrect
version is selected, the ebuild will warn the user to run gcc-config.

Others have found that cuda kernels fail to build with multiple jobs
for previous versions of opensubdiv. I use MAKEOPTS="-j1" to prevent
this, although it has not been an issue for me.

Signed-off-by: Adrian Grigo  yahoo.com.au>
Closes: https://bugs.gentoo.org/696592
Closes: https://bugs.gentoo.org/708160
Closes: https://bugs.gentoo.org/722570
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/opensubdiv/Manifest |  1 +
 ...ocumentation-CMakeLists.txt-force-python2.patch | 51 
 ...ensubdiv-3.4.3-install-tutorials-into-bin.patch | 52 +
 media-libs/opensubdiv/metadata.xml | 19 +++--
 media-libs/opensubdiv/opensubdiv-3.4.3.ebuild  | 90 ++
 5 files changed, 205 insertions(+), 8 deletions(-)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 379d12df0ac..3d73323cadb 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1 +1,2 @@
 DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 
05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d
 SHA512 
65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81
+DIST opensubdiv-3.4.3.tar.gz 39225589 BLAKE2B 
adb3a3e786999029e5b71659425ed49ea1939a92e2d8ba39ae6abf25ec02c873b8b1bdd34d2e32f843911c7acf5e277a779f82621863fbe0641f772e7603beed
 SHA512 
44fd1361d9e7f48c3fa84f3420ed34743571220602aefb082a42f769ca5b8e9ac21907ce8714f6e3a2caadd75adae03c535a1949a8e6450dfea9ae7a2247cfc2

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
 
b/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
new file mode 100644
index 000..5455ba98e31
--- /dev/null
+++ 
b/media-libs/opensubdiv/files/opensubdiv-3.4.0-0001-documentation-CMakeLists.txt-force-python2.patch
@@ -0,0 +1,51 @@
+From dc9d14c97fc22ad5b00c9ffb0f83931e42cf2eb0 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel 
+Date: Fri, 2 Aug 2019 19:27:17 +0200
+Subject: [PATCH] documentation/CMakeLists.txt: force python2
+
+The patch forces to use Python-2.x to build the documentation
+
+Signed-off-by: Bernd Waibel 
+---
+ documentation/CMakeLists.txt | 8 
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
+index 32b12a3..a93414e 100644
+--- a/documentation/CMakeLists.txt
 b/documentation/CMakeLists.txt
+@@ -54,10 +54,10 @@ else()
+ 
+ endif()
+ 
+-find_package(PythonInterp 2.6)
++find_package(Python2 COMPONENTS Interpreter)
+ 
+ # ReST - HTML documentation
+-if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
++if (DOCUTILS_FOUND AND Python2_Interpreter_FOUND)
+ 
+ set(HTML_FILES
+  search.html
+@@ -198,7 +198,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
+ OUTPUT
+ "${rstfile}"
+ COMMAND
+-"${PYTHON_EXECUTABLE}"
++"${Python2_EXECUTABLE}"
+ ARGS
+ "${CMAKE_CURRENT_SOURCE_DIR}/processTutorials.py"
+ "${infile}"
+@@ -291,7 +291,7 @@ if (DOCUTILS_FOUND AND PYTHONINTERP_FOUND)
+ # build search index and insert navigation tab
+ add_custom_target(search_index
+ COMMAND
+-"${PYTHON_EXECUTABLE}"
++"${Python2_EXECUTABLE}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/processHtml.py"
+ "${CMAKE_CURRENT_BINARY_DIR}"
+ "${CMAKE_CURRENT_SOURCE_DIR}/nav_template.txt"
+-- 
+2.22.0
+
+

diff --git

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

2020-06-08 Thread Joonas Niilola 
commit: d8b704713c1d3d78108d58c2b6aab617f59c4841
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jun  8 07:27:26 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun  8 07:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8b70471

media-libs/opensubdiv: undo changes to stable ebuild

Signed-off-by: Joonas Niilola  gentoo.org>

 media-libs/opensubdiv/opensubdiv-3.3.3.ebuild | 64 +++
 1 file changed, 64 insertions(+)

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
new file mode 100644
index 000..cbbf0be097d
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs eapi7-ver
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="http://graphics.pixar.com/opensubdiv/;
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~x86"
+IUSE="cuda doc opencl openmp ptex tbb"
+
+RDEPEND="media-libs/glew:=
+   media-libs/glfw:=
+   cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   opencl? ( virtual/opencl )
+   ptex? ( media-libs/ptex )"
+
+DEPEND="${RDEPEND}
+   doc? (
+   dev-python/docutils
+   app-doc/doxygen
+   )
+   tbb? ( dev-cpp/tbb )"
+
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.3.0-fix-quotes.patch"
+   "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DNO_CLEW=1
+   -DNO_DOC=$(usex !doc)
+   -DNO_TBB=$(usex !tbb)
+   -DNO_PTEX=$(usex !ptex)
+   -DNO_OMP=$(usex !openmp)
+   -DNO_OPENCL=$(usex !opencl)
+   -DNO_CUDA=$(usex !cuda)
+   -DNO_REGRESSION=1 # They don't work with certain settings
+   -DNO_EXAMPLES=1 # Not needed.
+   -DNO_TUTORIALS=1 # They install illegally. Need to find a 
better solution.
+   -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+   -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+   )
+
+   cmake-utils_src_configure
+}

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

2020-06-08 Thread Joonas Niilola 
commit: cb3a876d48da1635dc54a759b29ef5ef90a0666f
Author: Joonas Niilola  gentoo  org>
AuthorDate: Mon Jun  8 07:27:00 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Mon Jun  8 07:45:21 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb3a876d

media-libs/opensubdiv: clean ebuilds

Signed-off-by: Joonas Niilola  gentoo.org>

 .../{opensubdiv-3.3.3.ebuild => opensubdiv-3.3.3-r1.ebuild}   | 8 
 media-libs/opensubdiv/opensubdiv-3.4.3.ebuild | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
similarity index 98%
rename from media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
rename to media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
index c0ddde3439a..92f1b42c70a 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3-r1.ebuild
@@ -17,17 +17,17 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 # See for example CMakeLists.txt for details.
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
 
 RDEPEND="
-   ${PYTHON_DEPENDS}
+   ${PYTHON_DEPS}
media-libs/glew:=
media-libs/glfw:=
+   x11-libs/libXinerama
cuda? ( dev-util/nvidia-cuda-toolkit:* )
opencl? ( virtual/opencl )
ptex? ( media-libs/ptex )
-   x11-libs/libXinerama
 "
 DEPEND="
${RDEPEND}
@@ -35,8 +35,8 @@ DEPEND="
 "
 BDEPEND="
doc? (
-   dev-python/docutils
app-doc/doxygen
+   dev-python/docutils
)
cuda? (

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

2019-06-06 Thread Andreas Sturmlechner 
commit: 4e69aa4975188a533a004f69d9746bd21b7524e7
Author: Andreas Sturmlechner  gentoo  org>
AuthorDate: Thu Jun  6 19:28:46 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Thu Jun  6 20:33:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e69aa49

media-libs/opensubdiv: Drop 3.3.0

Package-Manager: Portage-2.3.67, Repoman-2.3.14
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 media-libs/opensubdiv/Manifest|  1 -
 media-libs/opensubdiv/opensubdiv-3.3.0.ebuild | 64 ---
 2 files changed, 65 deletions(-)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 54d1559b5b3..379d12df0ac 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,2 +1 @@
-DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B 
f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b
 SHA512 
7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
 DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 
05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d
 SHA512 
65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
deleted file mode 100644
index fc3580b365e..000
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs versionator
-
-MY_PV="$(replace_all_version_separators '_')"
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/;
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="cuda doc opencl openmp ptex tbb"
-
-RDEPEND="media-libs/glew:=
-   media-libs/glfw:=
-   cuda? ( dev-util/nvidia-cuda-toolkit:* )
-   opencl? ( virtual/opencl )
-   ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
-   tbb? ( dev-cpp/tbb )
-   doc? (
-   dev-python/docutils
-   app-doc/doxygen
-   )"
-
-S="${WORKDIR}/OpenSubdiv-${MY_PV}"
-
-PATCHES=(
-   "${FILESDIR}/${P}-fix-quotes.patch"
-   "${FILESDIR}/${P}-use-gnuinstalldirs.patch"
-   "${FILESDIR}/${P}-add-CUDA9-compatibility.patch"
-)
-
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DNO_CLEW=1
-   -DNO_DOC=$(usex !doc)
-   -DNO_TBB=$(usex !tbb)
-   -DNO_PTEX=$(usex !ptex)
-   -DNO_OMP=$(usex !openmp)
-   -DNO_OPENCL=$(usex !opencl)
-   -DNO_CUDA=$(usex !cuda)
-   -DNO_REGRESSION=1 # They don't work with certain settings
-   -DNO_EXAMPLES=1 # Not needed.
-   -DNO_TUTORIALS=1 # They install illegally. Need to find a 
better solution.
-   -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-   -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-   -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
-   )
-
-   cmake-utils_src_configure
-}

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

2019-05-25 Thread Mikle Kolyada 
commit: 17eb4866bd370b8058295413f929e2c7e2f24f3e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Sat May 25 08:51:45 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Sat May 25 08:51:45 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17eb4866

media-libs/opensubdiv: amd64 stable wrt bug #639806

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.66, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 media-libs/opensubdiv/opensubdiv-3.3.3.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
index 043b810269d..eedadea9985 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=

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

2019-04-07 Thread Michał Górny 
commit: d31beeaf34beb7090c51cfe1975facf00b225095
Author: Michał Górny  gentoo  org>
AuthorDate: Sun Apr  7 14:21:35 2019 +
Commit: Michał Górny  gentoo  org>
CommitDate: Sun Apr  7 14:22:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d31beeaf

media-libs/opensubdiv: Remove unnecessary maint restrict

Remove restrict="" attribute from  (which was missing
for proxy-maint, by the way) since there is no older versions around.

Signed-off-by: Michał Górny  gentoo.org>

 media-libs/opensubdiv/metadata.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opensubdiv/metadata.xml 
b/media-libs/opensubdiv/metadata.xml
index 864dbf3fb2b..6256d93f312 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -1,11 +1,11 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-   
+   
dracw...@gentoo.org
Jonathan Scruggs

-   
+   
agrigo2...@yahoo.com.au
Adrian Grigo

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

2018-08-07 Thread Jonathan Scruggs 
commit: 1ddbf737efc7d93b883dcb909afdfc68011ca1c2
Author: Jonathan Scruggs  gentoo  org>
AuthorDate: Tue Aug  7 12:53:26 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Aug  7 12:53:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddbf737

media-libs/opensubdiv: version bump to 3.3.3

Package-Manager: Portage-2.3.44, Repoman-2.3.10

 media-libs/opensubdiv/Manifest|  1 +
 media-libs/opensubdiv/opensubdiv-3.3.3.ebuild | 64 +++
 2 files changed, 65 insertions(+)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 91635b62171..54d1559b5b3 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1 +1,2 @@
 DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B 
f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b
 SHA512 
7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
+DIST opensubdiv-3.3.3.tar.gz 19286806 BLAKE2B 
05e25f28a6f2194122d9d4e5299e6d68e236c1e78b4e8494a70191dfb37e45da30968322719bbb784a15d698206fea9e26e92d4689668592bc9ec9bccbc0201d
 SHA512 
65cd72b4240eeb3fdb6d52497a2daa2fc68e10c25c41ffa0cf81449ebcb860e303539043c672265916267a0115f250566570b5705fd5da54f46abe7b9f7baf81

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
new file mode 100644
index 000..043b810269d
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.3.3.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils toolchain-funcs eapi7-ver
+
+MY_PV="$(ver_rs "1-3" '_')"
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="http://graphics.pixar.com/opensubdiv/;
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cuda doc opencl openmp ptex tbb"
+
+RDEPEND="media-libs/glew:=
+   media-libs/glfw:=
+   cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   opencl? ( virtual/opencl )
+   ptex? ( media-libs/ptex )"
+
+DEPEND="${RDEPEND}
+   doc? (
+   dev-python/docutils
+   app-doc/doxygen
+   )
+   tbb? ( dev-cpp/tbb )"
+
+S="${WORKDIR}/OpenSubdiv-${MY_PV}"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-3.3.0-fix-quotes.patch"
+   "${FILESDIR}/${PN}-3.3.0-use-gnuinstalldirs.patch"
+   "${FILESDIR}/${PN}-3.3.0-add-CUDA9-compatibility.patch"
+)
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DNO_CLEW=1
+   -DNO_DOC=$(usex !doc)
+   -DNO_TBB=$(usex !tbb)
+   -DNO_PTEX=$(usex !ptex)
+   -DNO_OMP=$(usex !openmp)
+   -DNO_OPENCL=$(usex !opencl)
+   -DNO_CUDA=$(usex !cuda)
+   -DNO_REGRESSION=1 # They don't work with certain settings
+   -DNO_EXAMPLES=1 # Not needed.
+   -DNO_TUTORIALS=1 # They install illegally. Need to find a 
better solution.
+   -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+   -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+   )
+
+   cmake-utils_src_configure
+}

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

2018-08-07 Thread Jonathan Scruggs 
commit: c022871e406b1a2a84e3d490da42cfc41f38d09a
Author: Jonathan Scruggs  gentoo  org>
AuthorDate: Tue Aug  7 12:51:01 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Aug  7 12:51:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c022871e

media-libs/opensubdiv: remove no_maya configuration option

This option does not exist anymore.
CLoses: https://bugs.gentoo.org/659506
Package-Manager: Portage-2.3.44, Repoman-2.3.10

 media-libs/opensubdiv/opensubdiv-3.3.0.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index 31007283c41..fc3580b365e 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -45,7 +45,6 @@ pkg_setup() {
 
 src_configure() {
local mycmakeargs=(
-   -DNO_MAYA=1
-DNO_CLEW=1
-DNO_DOC=$(usex !doc)
-DNO_TBB=$(usex !tbb)

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

2018-03-30 Thread Aaron Bauman 
commit: 3fbcb778a0b1252341532a73d47c7c6ac069f3fe
Author: Aaron Bauman  gentoo  org>
AuthorDate: Fri Mar 30 15:37:18 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Fri Mar 30 16:04:08 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbcb778

media-libs/opensubdiv: amd64 stable

Bug: https://bugs.gentoo.org/639806
Package-Manager: Portage-2.3.26, Repoman-2.3.7

 media-libs/opensubdiv/opensubdiv-3.3.0.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index f34298cd596..31007283c41 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=

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

2018-01-27 Thread Jonathan Scruggs 
commit: 38c4932b93aa143c977a6c3370cbbb740e812852
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Jan 27 14:54:07 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Sat Jan 27 17:19:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=38c4932b

media-libs/opensubdiv: update metadata information

 media-libs/opensubdiv/metadata.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/media-libs/opensubdiv/metadata.xml 
b/media-libs/opensubdiv/metadata.xml
index 8a3f73ac7b2..864dbf3fb2b 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -2,7 +2,7 @@
 http://www.gentoo.org/dtd/metadata.dtd;>
 

-   j.scru...@gmail.com
+   dracw...@gentoo.org
Jonathan Scruggs

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

2017-12-24 Thread David Seifert 
commit: fb82335ceee9932c7b19e05dffb354e82c27d331
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sun Dec 24 18:39:37 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Dec 24 22:16:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb82335c

media-libs/opensubdiv: Remove old versions and patches

 media-libs/opensubdiv/Manifest |  2 -
 .../opensubdiv-3.1.0-skip-osd-regression.patch | 34 
 media-libs/opensubdiv/opensubdiv-3.1.0.ebuild  | 59 
 media-libs/opensubdiv/opensubdiv-3.1.1.ebuild  | 64 --
 media-libs/opensubdiv/opensubdiv-3.3.0.ebuild  |  6 +-
 5 files changed, 3 insertions(+), 162 deletions(-)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index ed3426db629..91635b62171 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,3 +1 @@
-DIST opensubdiv-3.1.0.tar.gz 18014579 BLAKE2B 
88f16e81eda8c1626b161f94160d02cda7027dff1ac9c795dfe9694250e707dfa106e564dfa22a18bfd3f5e355337626349b6a162c999c10c4d8c8695d03b925
 SHA512 
9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f
-DIST opensubdiv-3.1.1.tar.gz 18014871 BLAKE2B 
5f3a8a7cfb3f2c4cebb8dab1ea65dde1ac3ef6f42a9603e0fa8c89b2ecdd0f16809510b7b03f6a4c3b0fe522e7b07536a09ab476720d44cc7e4289ba1931beb8
 SHA512 
700db7e1dde3e916011721a5b42d5e32ea4ae355ab5e3e415541d62efa2059d56d5f30cef853285e95a93f3a3b5fe24a906547a52cce94d47b101ae20021d5b5
 DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B 
f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b
 SHA512 
7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
deleted file mode 100644
index 2ebb638e383..000
--- a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -purN a/regression/CMakeLists.txt b/regression/CMakeLists.txt
 a/regression/CMakeLists.txt2016-03-25 22:15:29.0 +
-+++ b/regression/CMakeLists.txt2016-06-05 14:09:19.202849569 +0100
-@@ -32,30 +32,4 @@ if (NOT NO_REGRESSION)
- 
- add_subdirectory(far_perf)
- 
--if(OPENGL_FOUND AND (GLEW_FOUND OR APPLE) AND GLFW_FOUND)
--add_subdirectory(osd_regression)
--else()
--set(MISSING "")
--
--if (NOT OPENGL_FOUND)
--list(APPEND MISSING OpenGL)
--endif()
--
--if (NOT GLEW_FOUND)
--list(APPEND MISSING glew)
--endif()
--
--if (NOT GLFW_FOUND)
--list(APPEND MISSING glfw)
--endif()
--
--message(WARNING
--"The following libraries could not be found : ${MISSING}.  "
--"The osd regression test will not be available.  "
--"If you have these libraries installed, please specify their "
--"path to cmake (through the GLEW_LOCATION and GLFW_LOCATION "
--"command line arguments or environment variables)."
--)
--endif()
--
- endif()

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
deleted file mode 100644
index aa63d90eeda..000
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs versionator
-
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/;
-
-MY_PV="$(replace_all_version_separators '_')"
-
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="cuda doc opencl openmp ptex tbb test"
-
-RDEPEND="media-libs/glew:=
-   media-libs/glfw:=
-   cuda? ( dev-util/nvidia-cuda-toolkit:* )
-   ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
-   tbb? ( dev-cpp/tbb )
-   doc? ( dev-python/docutils app-doc/doxygen )"
-
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"/OpenSubdiv-${MY_PV}
-
-PATCHES=( "${FILESDIR}"/${P}-skip-osd-regression.patch )
-
-pkg_pretend() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
-   local mycmakeargs=(
-   -DNO_MAYA=1
-   -DNO_CLEW=1
-   -DNO_DOC=$(usex !doc)
-   -DNO_TBB=$(usex !tbb)
-   -DNO_PTEX=$(usex !ptex)
-   -DNO_OMP=$(usex !openmp)
-   -DNO_OPENCL=$(usex !opencl)
-

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

2017-12-24 Thread David Seifert 
commit: 02baca534283f0b8bfda69c603033418726a34b2
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sun Dec 24 18:37:08 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Dec 24 22:15:56 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02baca53

media-libs/opensubdiv: Add CUDA 9 compatibility patch

Closes: https://bugs.gentoo.org/641242
Closes: https://github.com/gentoo/gentoo/pull/6624

 .../opensubdiv-3.3.0-add-CUDA9-compatibility.patch | 25 ++
 media-libs/opensubdiv/opensubdiv-3.3.0.ebuild  |  7 +++---
 2 files changed, 29 insertions(+), 3 deletions(-)

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
new file mode 100644
index 000..9fe81c4ee19
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
@@ -0,0 +1,25 @@
+From 7b9157bca7138480c387ef3d5b69b6cf1eb498e5 Mon Sep 17 00:00:00 2001
+From: "Daniel M. Weeks" 
+Date: Fri, 15 Dec 2017 22:45:55 -0500
+Subject: [PATCH] CUDA 9 compatible gpu-architecture default
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4f3cd9d4..fa438b46 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -513,8 +513,10 @@ if(CUDA_FOUND)
+ if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
+ if (CUDA_VERSION_MAJOR LESS 6)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
+-else()
++elseif (CUDA_VERSION_MAJOR LESS 9)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
++else()
++set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
+ endif()
+ endif()
+ endif()

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index 1c1abebee36..a85444ac261 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cuda doc opencl openmp ptex tbb"
+IUSE="cuda doc examples opencl openmp ptex tbb tutorials"
 
 RDEPEND="media-libs/glew:=
media-libs/glfw:=
@@ -32,6 +32,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}"
 PATCHES=(
"${FILESDIR}/${P}-fix-quotes.patch"
"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+   "${FILESDIR}/${P}-add-CUDA9-compatibility.patch"
 )
 
 pkg_pretend() {
@@ -53,8 +54,8 @@ src_configure() {
-DNO_OPENCL=$(usex !opencl)
-DNO_CUDA=$(usex !cuda)
-DNO_REGRESSION=1 # They don't work with certain settings
-   -DNO_EXAMPLES=1 # Not needed.
-   -DNO_TUTORIALS=1 # They install illegally. Need to find a 
better solution.
+   -DNO_EXAMPLES=$(usex !examples)
+   -DNO_TUTORIALS=$(usex !tutorials)
-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"

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

2017-10-15 Thread Patrice Clement 
commit: aa959c1ca7cb3dc2b9006f27256646e411967149
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Oct 14 14:52:16 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Oct 15 21:11:10 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa959c1c

media-libs/opensubdiv: add missing virtual/opencl depend.

* This use flag is masked for OpenSubDiv, but this is in prep of
unmasking it after new Blender is in main repo.

 media-libs/opensubdiv/opensubdiv-3.3.0.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index 28ba08cb7a5..1c1abebee36 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -17,6 +17,7 @@ IUSE="cuda doc opencl openmp ptex tbb"
 RDEPEND="media-libs/glew:=
media-libs/glfw:=
cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   opencl? ( virtual/opencl )
ptex? ( media-libs/ptex )"
 
 DEPEND="${RDEPEND}

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

2017-10-15 Thread Patrice Clement 
commit: 91bc5e72afb058ff82626e49cacb9515d0e22307
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Wed Oct 11 18:15:27 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Oct 15 21:11:06 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91bc5e72

media-libs/opensubdiv: ebuild and metadata fixes.

* remove tutorial use flag from metadata.xml.
* remove examples and tutorials as they violate installation
  location rules.

Closes: https://bugs.gentoo.org/633756
Closes: https://github.com/gentoo/gentoo/pull/5919

 media-libs/opensubdiv/metadata.xml| 2 --
 media-libs/opensubdiv/opensubdiv-3.1.0.ebuild | 6 +++---
 media-libs/opensubdiv/opensubdiv-3.1.1.ebuild | 6 +++---
 media-libs/opensubdiv/opensubdiv-3.3.0.ebuild | 8 
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/media-libs/opensubdiv/metadata.xml 
b/media-libs/opensubdiv/metadata.xml
index f4db4009bdd..8a3f73ac7b2 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -33,8 +33,6 @@
Enable OpenCL support through
virtual/opencl.

-   
-   


PixarAnimationStudios/OpenSubdiv

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
index d822c40cc99..aa63d90eeda 100644
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="cuda doc examples opencl openmp ptex tbb test tutorials"
+IUSE="cuda doc opencl openmp ptex tbb test"
 
 RDEPEND="media-libs/glew:=
media-libs/glfw:=
@@ -49,8 +49,8 @@ src_configure() {
-DNO_OPENCL=$(usex !opencl)
-DNO_CUDA=$(usex !cuda)
-DNO_REGRESSION=$(usex !test)
-   -DNO_EXAMPLES=$(usex !examples)
-   -DNO_TUTORIALS=$(usex !tutorials)
+   -DNO_EXAMPLES=1 # broken
+   -DNO_TUTORIALS=1 # broken
-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
)

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
index 0003926a6d4..5c1768b6b37 100644
--- a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 
 LICENSE="ZLIB"
 SLOT="0"
-IUSE="cuda doc examples opencl openmp ptex tbb tutorials"
+IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=
media-libs/glfw:=
@@ -54,8 +54,8 @@ src_configure() {
-DNO_OPENCL=$(usex !opencl)
-DNO_CUDA=$(usex !cuda)
-DNO_REGRESSION=1 # The don't work with certain settings
-   -DNO_EXAMPLES=$(usex !examples)
-   -DNO_TUTORIALS=$(usex !tutorials)
+   -DNO_EXAMPLES=1 # Broken
+   -DNO_TUTORIALS=1 # Broken
-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
)

diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index b73f2a25deb..28ba08cb7a5 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -12,7 +12,7 @@ 
SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.t
 LICENSE="ZLIB"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="cuda doc examples opencl openmp ptex tbb tutorials"
+IUSE="cuda doc opencl openmp ptex tbb"
 
 RDEPEND="media-libs/glew:=
media-libs/glfw:=
@@ -21,7 +21,7 @@ RDEPEND="media-libs/glew:=
 
 DEPEND="${RDEPEND}
tbb? ( dev-cpp/tbb )
-   doc? ( 
+   doc? (
dev-python/docutils
app-doc/doxygen
)"
@@ -52,8 +52,8 @@ src_configure() {
-DNO_OPENCL=$(usex !opencl)
-DNO_CUDA=$(usex !cuda)
-DNO_REGRESSION=1 # They don't work with certain settings
-   -DNO_EXAMPLES=$(usex !examples)
-   -DNO_TUTORIALS=$(usex !tutorials)
+   -DNO_EXAMPLES=1 # Not needed.
+   -DNO_TUTORIALS=1 # They install illegally. Need to find a 
better solution.
-DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"

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

2017-09-23 Thread David Seifert 
commit: 072d9adafab829b7f934637f7ba8a8f29c2ea3db
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Thu Sep 21 09:14:47 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Sep 23 08:36:15 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=072d9ada

media-libs/opensubdiv: Version bump to 3.3 and remove ati-drivers

* Fixed compile error about stray quotes
* Changed hardcoded paths to GNUInstallDirs which
  fixed multilib-strict check fail

Closes: https://bugs.gentoo.org/605958
Closes: https://bugs.gentoo.org/611844
Closes: https://github.com/gentoo/gentoo/pull/5751

 media-libs/opensubdiv/Manifest |  1 +
 .../files/opensubdiv-3.3.0-fix-quotes.patch| 13 
 .../opensubdiv-3.3.0-use-gnuinstalldirs.patch  | 39 ++
 media-libs/opensubdiv/opensubdiv-3.1.0.ebuild  |  2 --
 media-libs/opensubdiv/opensubdiv-3.1.1.ebuild  |  9 +++--
 ...subdiv-3.1.1.ebuild => opensubdiv-3.3.0.ebuild} | 22 +++-
 6 files changed, 73 insertions(+), 13 deletions(-)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index a86411c5c8d..26ccdac0e65 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,2 +1,3 @@
 DIST opensubdiv-3.1.0.tar.gz 18014579 SHA256 
ff3f2cdeeaa8ac4abe83394b1fea27ea3ade8258aff86da5fdfba37415485aba SHA512 
9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f
 WHIRLPOOL 
0765a01209781b237df9f51717d7e14dcde57b5e00e7cfaa81e02d6fd409bb2df3bc7c95f26b5ed20bb8cbd6c2b3aaa9ad28861198c25ffd3ec3c6b699a32444
 DIST opensubdiv-3.1.1.tar.gz 18014871 SHA256 
6a2043c0c8b6e85bdc34dbd6d05e6bc7504a4d01dcfb165b4abe180c50d41164 SHA512 
700db7e1dde3e916011721a5b42d5e32ea4ae355ab5e3e415541d62efa2059d56d5f30cef853285e95a93f3a3b5fe24a906547a52cce94d47b101ae20021d5b5
 WHIRLPOOL 
b36136cc88e2f68d6ddb94ad500b449fb8ea9c0104b864d873ac7fd2966ac8ee44d7f4296ad96bcb65ae9f7858f1c6a9703f6d90754bd0dd1ad27db1b9fc1628
+DIST opensubdiv-3.3.0.tar.gz 19263469 SHA256 
93d364340518515129fe199c80c4030f666ff71414d9c543e1526f14b5ffc8d0 SHA512 
7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
 WHIRLPOOL 
a1915d3fff1bce076f22bdc64efc0c07c372614d6ee0b36548bad9310da7a1c9a8863a3f638e07091cef28b99c01b6d77f0a9301415044806976674f434a7195

diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
new file mode 100644
index 000..2b5c71a37cb
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-fix-quotes.patch
@@ -0,0 +1,13 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e02ce90c..6d4f5342 100644
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -48,7 +48,7 @@ endif()
+ string(REGEX REPLACE "^v" "" OSD_SONAME ${OSD_SONAME})
+ 
+ add_definitions(
+--DOPENSUBDIV_VERSION_STRING="${OSD_SONAME}"
++-DOPENSUBDIV_VERSION_STRING=\\\"${OSD_SONAME}\\\"
+ )
+ 
+ 
#---

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
new file mode 100644
index 000..02027763f5c
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-use-gnuinstalldirs.patch
@@ -0,0 +1,39 @@
+diff -purN a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt   2017-07-25 21:58:09.0 +0100
 b/CMakeLists.txt   2017-08-15 14:51:36.771044414 +0100
+@@ -23,6 +23,7 @@
+ #
+ 
+ project(OpenSubdiv)
++include(GNUInstallDirs)
+ 
+ cmake_minimum_required(VERSION 2.8.6)
+ 
+@@ -63,15 +64,15 @@ if (NOT DEFINED CMAKE_INSTALL_PREFIX)
+ endif()
+ 
+ if (NOT DEFINED CMAKE_INCDIR_BASE)
+-set( CMAKE_INCDIR_BASE include/opensubdiv )
++set( CMAKE_INCDIR_BASE ${CMAKE_INSTALL_INCLUDEDIR}/opensubdiv )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_BINDIR_BASE)
+-set( CMAKE_BINDIR_BASE bin )
++set( CMAKE_BINDIR_BASE ${CMAKE_INSTALL_BINDIR} )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_LIBDIR_BASE)
+-set( CMAKE_LIBDIR_BASE lib )
++set( CMAKE_LIBDIR_BASE ${CMAKE_INSTALL_LIBDIR} )
+ endif()
+ 
+ if (NOT DEFINED CMAKE_FRAMEWORKDIR_BASE)
+@@ -83,7 +84,7 @@ if (NOT DEFINED CMAKE_PLUGINDIR_BASE)
+ endif()
+ 
+ if (NOT DEFINED CMAKE_DOCDIR_BASE)
+-set( CMAKE_DOCDIR_BASE share/doc/opensubdiv )
++set( CMAKE_DOCDIR_BASE ${CMAKE_INSTALL_DOCDIR} )
+ else()
+ if (IS_ABSOLUTE ${CMAKE_DOCDIR_BASE})
+ set( CMAKE_DOCDIR_BASE "${CMAKE_DOCDIR_BASE}" )

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
index c729c1d7990..d822c40cc99 100644
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
@@ -15,10 +15,8 @@ LICENSE="ZLIB"
 SLOT="0"
 IUSE="cuda doc examples

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

2017-01-15 Thread David Seifert 
commit: 382a648334ac66b50d68f02d3fe65502e750aa03
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Jan 14 16:41:29 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 15 11:14:26 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382a6483

media-libs/opensubdiv: Version bump to 3.3.1

* Removed test USE Flag as they are broken. Upstream is working on
  a fix. Will re-enable when fixed.
Closes: https://github.com/gentoo/gentoo/pull/3472

 media-libs/opensubdiv/Manifest|  1 +
 media-libs/opensubdiv/opensubdiv-3.1.1.ebuild | 60 +++
 2 files changed, 61 insertions(+)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 74e0750..a86411c 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1 +1,2 @@
 DIST opensubdiv-3.1.0.tar.gz 18014579 SHA256 
ff3f2cdeeaa8ac4abe83394b1fea27ea3ade8258aff86da5fdfba37415485aba SHA512 
9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f
 WHIRLPOOL 
0765a01209781b237df9f51717d7e14dcde57b5e00e7cfaa81e02d6fd409bb2df3bc7c95f26b5ed20bb8cbd6c2b3aaa9ad28861198c25ffd3ec3c6b699a32444
+DIST opensubdiv-3.1.1.tar.gz 18014871 SHA256 
6a2043c0c8b6e85bdc34dbd6d05e6bc7504a4d01dcfb165b4abe180c50d41164 SHA512 
700db7e1dde3e916011721a5b42d5e32ea4ae355ab5e3e415541d62efa2059d56d5f30cef853285e95a93f3a3b5fe24a906547a52cce94d47b101ae20021d5b5
 WHIRLPOOL 
b36136cc88e2f68d6ddb94ad500b449fb8ea9c0104b864d873ac7fd2966ac8ee44d7f4296ad96bcb65ae9f7858f1c6a9703f6d90754bd0dd1ad27db1b9fc1628

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
new file mode 100644
index ..4f305e5
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+inherit cmake-utils toolchain-funcs versionator
+
+DESCRIPTION="An Open-Source subdivision surface library"
+HOMEPAGE="http://graphics.pixar.com/opensubdiv/;
+
+MY_PV="$(replace_all_version_separators '_')"
+
+SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz
 -> ${P}.tar.gz"
+
+LICENSE="ZLIB"
+SLOT="0"
+IUSE="cuda doc examples opencl openmp ptex tbb tutorials"
+
+# OpenCL does not work with Open Source drivers or nVidia binaries.
+RDEPEND="media-libs/glew:=
+   media-libs/glfw:=
+   opencl? ( x11-drivers/ati-drivers:* )
+   cuda? ( dev-util/nvidia-cuda-toolkit:* )
+   ptex? ( media-libs/ptex )"
+
+DEPEND="${RDEPEND}
+   tbb? ( dev-cpp/tbb )
+   doc? ( dev-python/docutils app-doc/doxygen )"
+
+KEYWORDS="~amd64 ~x86"
+
+S="${WORKDIR}"/OpenSubdiv-${MY_PV}
+
+pkg_pretend() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_configure() {
+   local mycmakeargs=(
+   -DNO_MAYA=1
+   -DNO_CLEW=1
+   -DNO_DOC=$(usex !doc)
+   -DNO_TBB=$(usex !tbb)
+   -DNO_PTEX=$(usex !ptex)
+   -DNO_OMP=$(usex !openmp)
+   -DNO_OPENCL=$(usex !opencl)
+   -DNO_CUDA=$(usex !cuda)
+   -DNO_REGRESSION=1 # The don't work with certain settings
+   -DNO_EXAMPLES=$(usex !examples)
+   -DNO_TUTORIALS=$(usex !tutorials)
+   -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+   -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
+   )
+
+   cmake-utils_src_configure
+}

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

2016-10-22 Thread David Seifert 
commit: 8e68c375c5637e926b7a16c2b3196ee7bf0cee38
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sat Oct 22 17:22:17 2016 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Oct 22 23:25:21 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8e68c375

media-libs/opensubdiv: New package

OpenSubdiv is a set of open source libraries that implement high
performance subdivision surface (subdiv) evaluation on massively
parallel CPU and GPU architectures. This code path is optimized
for drawing deforming surfaces with static topology at
interactive framerates.

OpenSubdiv is an API ready to be integrated into 3rd party
digital content creation tools. It is not an application, nor a
tool that can be used directly to create digital assets.

Gentoo-Bug: 586380

Signed off by: Jonathan Scruggs (j.scruggs  gmail.com, irc: Dracwyrm)
Signed off by: Adrian Grigo (agrigo2001  yahoo.com.au)
Closes: https://github.com/gentoo/gentoo/pull/2531

Signed-off-by: David Seifert  gentoo.org>

 media-libs/opensubdiv/Manifest |  1 +
 .../opensubdiv-3.1.0-skip-osd-regression.patch | 34 
 media-libs/opensubdiv/metadata.xml | 39 ++
 media-libs/opensubdiv/opensubdiv-3.1.0.ebuild  | 62 ++
 4 files changed, 136 insertions(+)

diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
new file mode 100644
index ..74e0750
--- /dev/null
+++ b/media-libs/opensubdiv/Manifest
@@ -0,0 +1 @@
+DIST opensubdiv-3.1.0.tar.gz 18014579 SHA256 
ff3f2cdeeaa8ac4abe83394b1fea27ea3ade8258aff86da5fdfba37415485aba SHA512 
9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f
 WHIRLPOOL 
0765a01209781b237df9f51717d7e14dcde57b5e00e7cfaa81e02d6fd409bb2df3bc7c95f26b5ed20bb8cbd6c2b3aaa9ad28861198c25ffd3ec3c6b699a32444

diff --git 
a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch 
b/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
new file mode 100644
index ..2ebb638
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
@@ -0,0 +1,34 @@
+diff -purN a/regression/CMakeLists.txt b/regression/CMakeLists.txt
+--- a/regression/CMakeLists.txt2016-03-25 22:15:29.0 +
 b/regression/CMakeLists.txt2016-06-05 14:09:19.202849569 +0100
+@@ -32,30 +32,4 @@ if (NOT NO_REGRESSION)
+ 
+ add_subdirectory(far_perf)
+ 
+-if(OPENGL_FOUND AND (GLEW_FOUND OR APPLE) AND GLFW_FOUND)
+-add_subdirectory(osd_regression)
+-else()
+-set(MISSING "")
+-
+-if (NOT OPENGL_FOUND)
+-list(APPEND MISSING OpenGL)
+-endif()
+-
+-if (NOT GLEW_FOUND)
+-list(APPEND MISSING glew)
+-endif()
+-
+-if (NOT GLFW_FOUND)
+-list(APPEND MISSING glfw)
+-endif()
+-
+-message(WARNING
+-"The following libraries could not be found : ${MISSING}.  "
+-"The osd regression test will not be available.  "
+-"If you have these libraries installed, please specify their "
+-"path to cmake (through the GLEW_LOCATION and GLFW_LOCATION "
+-"command line arguments or environment variables)."
+-)
+-endif()
+-
+ endif()

diff --git a/media-libs/opensubdiv/metadata.xml 
b/media-libs/opensubdiv/metadata.xml
new file mode 100644
index ..1bff353
--- /dev/null
+++ b/media-libs/opensubdiv/metadata.xml
@@ -0,0 +1,39 @@
+
+http://www.gentoo.org/dtd/metadata.dtd;>
+
+   
+   j.scru...@gmail.com
+   Jonathan Scruggs
+
+   
+   agrigo2...@yahoo.com.au
+   Adrian Grigo
+   
+   
+   proxy-ma...@gentoo.org
+   Proxy Maintainers
+   
+   
+   An Open-Source subdivision surface library.
+   
+   
+   
+   Adds support for faster per-face texture mapping through
+   media-libs/ptex.
+   
+   
+   Enable NVIDIA CUDA Toolkit support through
+   dev-util/nvidia-cuda-toolkit.
+   
+   
+   Enable multithreading with the Intel Threads Building 
Blocks through
+   dev-cpp/tbb.
+   
+   
+   Enable OpenCL support through
+   virtual/opencl.
+   
+   
+   
+   
+

diff --git a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild 
b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
new file mode 100644
index ..94a1b00
--- /dev/null
+++ b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+