[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/, profiles/arch/base/, ...

2024-04-21 Thread Sam James 
commit: 175d65e779e69e5702ca52cb3af973a2fa0b0e62
Author: Paul Zander  gmail  com>
AuthorDate: Thu Mar 28 22:08:25 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Apr 21 12:50:05 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=175d65e7

media-gfx/blender: add 4.0.2-r1, cleanup

hopefully fixed osl build
re-added hip flag in 4.0.2-r1
hide test code in release versions

Bug: https://bugs.gentoo.org/693200
Closes: https://bugs.gentoo.org/925534
Closes: https://bugs.gentoo.org/927281
Closes: https://bugs.gentoo.org/927715
Closes: https://bugs.gentoo.org/927835
Closes: https://bugs.gentoo.org/927931
Signed-off-by: Paul Zander  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35973
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/blender-3.3.15.ebuild|   4 +-
 media-gfx/blender/blender-3.3.8.ebuild |   4 +-
 media-gfx/blender/blender-3.6.8.ebuild |   4 +-
 ...lender-4.0.2.ebuild => blender-4.0.2-r1.ebuild} | 128 +---
 media-gfx/blender/blender-.ebuild  | 119 ---
 .../blender/files/blender-4.0.1-openvdb-11.patch   |   2 +
 .../files/blender-4.0.2-CUDA_NVCC_FLAGS.patch  |  14 +
 .../blender/files/blender-4.0.2-FindClang.patch|  14 +
 .../blender/files/blender-4.0.2-r1-osl-1.13.patch  | 342 +
 profiles/arch/amd64/package.use.mask   |   4 +
 profiles/arch/base/package.use.mask|   4 +
 11 files changed, 556 insertions(+), 83 deletions(-)

diff --git a/media-gfx/blender/blender-3.3.15.ebuild 
b/media-gfx/blender/blender-3.3.15.ebuild
index ff1e6ffd66d6..1582fb82925a 100644
--- a/media-gfx/blender/blender-3.3.15.ebuild
+++ b/media-gfx/blender/blender-3.3.15.ebuild
@@ -22,8 +22,8 @@ else
KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
-SLOT="${PV%.*}"
 LICENSE="|| ( GPL-3 BL )"
+SLOT="${PV%.*}"
 IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
@@ -94,7 +94,7 @@ RDEPEND="${PYTHON_DEPS}
)
opensubdiv? ( >=media-libs/opensubdiv-3.4.0 )
openvdb? (
-   >=media-gfx/openvdb-9.0.0:=[nanovdb?]
+   =media-libs/opensubdiv-3.4.0 )
openvdb? (
-   >=media-gfx/openvdb-9.0.0:=[nanovdb?]
+   =media-libs/opensubdiv-3.4.0 )
openvdb? (
-   >=media-gfx/openvdb-9.0.0:=[nanovdb?]
+   https://www.blender.org;
 
 if [[ ${PV} = ** ]] ; then
-   # Subversion is needed for downloading unit test files
-   inherit git-r3 subversion
+   EGIT_LFS="yes"
+   inherit git-r3
EGIT_REPO_URI="https://projects.blender.org/blender/blender.git;
+   EGIT_SUBMODULES=( '*' '-lib/*' )

ADDONS_EGIT_REPO_URI="https://projects.blender.org/blender/blender-addons.git;
+   RESTRICT="!test? ( test )"
 else
-   SRC_URI="https://download.blender.org/source/${P}.tar.xz;
-   # Update these between major releases.
-   TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
-   # SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
 )"
+   SRC_URI="
+   https://download.blender.org/source/${P}.tar.xz
+   "
+   #   test? (
+   #   
https://projects.blender.org/blender/blender-test-data/archive/blender-v$(ver_cut
 1-2)-release.tar.gz
+   #   )
+   # "
KEYWORDS="~amd64 ~arm ~arm64"
+   RESTRICT="test" # the test archive returns LFS references.
 fi
 
-SLOT="${PV%.*}"
 LICENSE="|| ( GPL-3 BL )"
+SLOT="${PV%.*}"
 IUSE="+bullet +fluid +openexr +tbb
alembic collada +color-management cuda +cycles cycles-bin-kernels
-   debug doc +embree +ffmpeg +fftw +gmp jack jemalloc jpeg2k
+   debug doc +embree +ffmpeg +fftw +gmp gnome hip jack jemalloc jpeg2k
man +nanovdb ndof nls openal +oidn +openmp +openpgl +opensubdiv
+openvdb optix osl +pdf +potrace +pugixml pulseaudio sdl
+sndfile test +tiff valgrind wayland +webp X"
-RESTRICT="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
alembic? ( openexr )
cuda? ( cycles )
cycles? ( openexr tiff tbb )
fluid? ( tbb )
+   gnome? ( wayland )
+   hip? ( cycles )
nanovdb? ( openvdb )
openvdb? ( tbb openexr )
optix? ( cuda )
@@ -45,7 +54,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
test? ( color-management )"
 
 # Library versions for official builds can be found in the blender source 
directory in:
-# build_files/build_environment/install_deps.sh
+# build_files/build_environment/cmake/versions.cmake
 RDEPEND="${PYTHON_DEPS}
app-arch/zstd
dev-libs/boost:=[nls?]
@@ -70,10 +79,12 @@ RDEPEND="${PYTHON_DEPS}
collada? ( >=media-libs/opencollada-1.6.68 )
color-management? ( media-libs/opencolorio:= )
cuda? (

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2024-01-21 Thread Sam James 
commit: 32822cad445a3b80067723488e8d9fa487dfc03d
Author: Sv. Lockal  gmail  com>
AuthorDate: Sun Jan 21 09:47:07 2024 +
Commit: Sam James  gentoo  org>
CommitDate: Sun Jan 21 11:20:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=32822cad

media-gfx/blender: fix error "string sub-command REGEX, mode REPLACE needs at 
least 6 arguments"

See also: 
https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba
Closes: https://bugs.gentoo.org/922324

Signed-off-by: Sv. Lockal  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/blender-4.0.1.ebuild |  4 +++
 .../files/blender-4.0.1-fix-cflags-cleaner.patch   | 39 ++
 2 files changed, 43 insertions(+)

diff --git a/media-gfx/blender/blender-4.0.1.ebuild 
b/media-gfx/blender/blender-4.0.1.ebuild
index 389d34b7495b..f25d645c6efb 100644
--- a/media-gfx/blender/blender-4.0.1.ebuild
+++ b/media-gfx/blender/blender-4.0.1.ebuild
@@ -141,6 +141,10 @@ BDEPEND="
)
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-4.0.1-fix-cflags-cleaner.patch"  # to be dropped for 
releases after Dec 8, 2023
+)
+
 blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 

diff --git a/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch 
b/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
new file mode 100644
index ..d28db84d8c36
--- /dev/null
+++ b/media-gfx/blender/files/blender-4.0.1-fix-cflags-cleaner.patch
@@ -0,0 +1,39 @@
+Fix CMake Error: string sub-command REGEX, mode REPLACE needs at least 6 
arguments total to command.
+https://bugs.gentoo.org/922324
+https://github.com/blender/blender/commit/ecd307041e4181f721bf5d2248c02ffe980edcba
+--- a/build_files/cmake/macros.cmake
 b/build_files/cmake/macros.cmake
+@@ -750,11 +750,11 @@ macro(remove_c_flag
+   _flag)
+ 
+   foreach(f ${ARGV})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG ${CMAKE_C_FLAGS_DEBUG})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE 
${CMAKE_C_FLAGS_RELEASE})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL 
${CMAKE_C_FLAGS_MINSIZEREL})
+-string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO 
${CMAKE_C_FLAGS_RELWITHDEBINFO})
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS "${CMAKE_C_FLAGS}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELEASE 
"${CMAKE_C_FLAGS_RELEASE}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_MINSIZEREL 
"${CMAKE_C_FLAGS_MINSIZEREL}")
++string(REGEX REPLACE ${f} "" CMAKE_C_FLAGS_RELWITHDEBINFO 
"${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+   endforeach()
+   unset(f)
+ endmacro()
+@@ -763,11 +763,11 @@ macro(remove_cxx_flag
+   _flag)
+ 
+   foreach(f ${ARGV})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG 
${CMAKE_CXX_FLAGS_DEBUG})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE 
${CMAKE_CXX_FLAGS_RELEASE})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL 
${CMAKE_CXX_FLAGS_MINSIZEREL})
+-string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO 
${CMAKE_CXX_FLAGS_RELWITHDEBINFO})
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_DEBUG 
"${CMAKE_CXX_FLAGS_DEBUG}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELEASE 
"${CMAKE_CXX_FLAGS_RELEASE}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_MINSIZEREL 
"${CMAKE_CXX_FLAGS_MINSIZEREL}")
++string(REGEX REPLACE ${f} "" CMAKE_CXX_FLAGS_RELWITHDEBINFO 
"${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+   endforeach()
+   unset(f)
+ endmacro()
\ No newline at end of file

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2023-10-26 Thread Sam James 
commit: 2fd9968e3b41730859eb6eca2ac6e71a8fb871a6
Author: Paul Zander  gmail  com>
AuthorDate: Wed Oct 11 21:23:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 27 03:15:27 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2fd9968e

media-gfx/blender: add 3.6.5, update 

* add 3.6.5 LTS

* upstream fixed
https://projects.blender.org/blender/blender/pulls/113163 in
https://projects.blender.org/blender/blender/issues/112917
* add it to 3.6.5
* drop blockers for 3.6.5 and 

Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/Manifest |   1 +
 .../{blender-.ebuild => blender-3.6.5.ebuild}  |  12 ++-
 media-gfx/blender/blender-.ebuild  |   4 +-
 .../blender/files/blender-4.0.0-ocio-2.3.0.patch   | 110 +
 4 files changed, 119 insertions(+), 8 deletions(-)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b3c42c94fb98..7c56592c6b76 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,3 +3,4 @@ DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 
7fb24afe2151bba53d8c25160bd697145aced
 DIST blender-3.4.1.tar.xz 53666296 BLAKE2B 
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
 SHA512 
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
 DIST blender-3.5.1.tar.xz 69780800 BLAKE2B 
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
 SHA512 
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
 DIST blender-3.6.0.tar.xz 70428872 BLAKE2B 
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
 SHA512 
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
+DIST blender-3.6.5.tar.xz 70447868 BLAKE2B 
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
 SHA512 
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae

diff --git a/media-gfx/blender/blender-.ebuild 
b/media-gfx/blender/blender-3.6.5.ebuild
similarity index 97%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-3.6.5.ebuild
index 38dad31c44af..666044f4f4ae 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
-   SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
 )"
+   # SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
 )"
KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 # Library versions for official builds can be found in the blender source 
directory in:
 # build_files/build_environment/install_deps.sh
-#
-# https://projects.blender.org/blender/blender/issues/112917.
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
@@ -68,7 +66,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
-   color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? ( 
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
@@ -140,6 +138,10 @@ BDEPEND="
)
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-4.0.0-ocio-2.3.0.patch"
+)
+
 blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
@@ -174,7 +176,7 @@ src_unpack() {
git-r3_src_unpack
 
git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
-   git-r3_checkout "${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons"
+   git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
 
if use test; then

TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests

diff --git a/media-gfx/blender/blender-.ebuild 
b/media-gfx/blender/blender-.ebuild
index 38dad31c44af..d4e734739dd6 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 # Library versions for official builds can be found in the blender source 
directory in:
 #

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2023-10-26 Thread Sam James 
commit: 824eb57e50e0f5039d42f39e0caa5461d8d73468
Author: Paul Zander  gmail  com>
AuthorDate: Wed Oct 11 21:23:32 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Oct 27 02:31:52 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=824eb57e

media-gfx/blender: add 3.6.5, update 

* add 3.6.5 LTS

* upstream fixed
https://projects.blender.org/blender/blender/pulls/113163 in
https://projects.blender.org/blender/blender/issues/112917
* add it to 3.6.5
* drop blockers for 3.6.5 and 

Signed-off-by: Paul Zander  gmail.com>
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/Manifest |   1 +
 .../{blender-.ebuild => blender-3.6.5.ebuild}  |  12 ++-
 media-gfx/blender/blender-.ebuild  |   4 +-
 .../blender/files/blender-4.0.0-ocio-2.3.0.patch   | 110 +
 4 files changed, 119 insertions(+), 8 deletions(-)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index b3c42c94fb98..7c56592c6b76 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -3,3 +3,4 @@ DIST blender-3.3.8.tar.xz 41915180 BLAKE2B 
7fb24afe2151bba53d8c25160bd697145aced
 DIST blender-3.4.1.tar.xz 53666296 BLAKE2B 
ec5b2771c1b55ecdf3c2c86a413ae5599545800fc072eff45cf212b32c74af60fc3d650ad931fff221c1073adb2b447df3287a965f884a4760a5d972c9877aee
 SHA512 
d6de3ec9cd1a1e4d4e4a838af0cfc113c91c3c1b66703027e0ed61bd818dafc4e4304fd041738ddea32fc76b1ad9b7737cbdcf74d56a0406a87c457375d907ab
 DIST blender-3.5.1.tar.xz 69780800 BLAKE2B 
6961280b9d5fb606a35137ce355bf07b4dc16908d5d52cfd3a914907721da16108b8780b1894413a69ab69d455f5d1575697079a24c2bdcecb17174cf7a7c7c7
 SHA512 
7c9c03de8532884f8ab39fecf1450f8be4bc937a018bd14240ace81a89e422625aba9c4865f6efbb8371f5f01e930932fa5cf03c9d14d44c5312db33e3c56131
 DIST blender-3.6.0.tar.xz 70428872 BLAKE2B 
a43f2c0a2db6fa624b1bd96264462312d31f2e3983c463da9d17b0c793d0d344dfbbc13acfb8bab53cc37f5b5b3479d60b8046475aa6c977074ef35414640eaf
 SHA512 
5fbb7a48d1f18e5cc6430bdefb4d7d9e8a52d387cf92a319c7fbc8836a3f5a6f90fab13f152be49c3558a8f70ed9f0d1f7aeddb264a938496a2f93254bb569cb
+DIST blender-3.6.5.tar.xz 70447868 BLAKE2B 
efa366b8aff5c8870c9ed060063eba1115a9ae50b0345c56fbaaab228976afad6f4c6b9c374f22d146fe88db6e0e7aab3d61b1797e71f30f6adfc594599ea2be
 SHA512 
d07e53c708a1e6df18853eb5f0dc032459c74ef43f9559880720170f98ac8729064edb143835f8cec411ab6de42619bed3f0ef1143b288f2a2eb6f05fdfc32ae

diff --git a/media-gfx/blender/blender-.ebuild 
b/media-gfx/blender/blender-3.6.5.ebuild
similarity index 97%
copy from media-gfx/blender/blender-.ebuild
copy to media-gfx/blender/blender-3.6.5.ebuild
index a637534483c4..1f87c0fac6ef 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-3.6.5.ebuild
@@ -19,7 +19,7 @@ else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
# Update these between major releases.
TEST_TARBALL_VERSION="$(ver_cut 1-2).0"
-   SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
 )"
+   # SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.xz
 )"
KEYWORDS="~amd64 ~arm ~arm64"
 fi
 
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 # Library versions for official builds can be found in the blender source 
directory in:
 # build_files/build_environment/install_deps.sh
-#
-# https://projects.blender.org/blender/blender/issues/112917.
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?]
dev-libs/lzo:2=
@@ -68,7 +66,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
-   color-management? ( =media-libs/embree-3.10.0[raymask] )
ffmpeg? ( 
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
@@ -140,6 +138,10 @@ BDEPEND="
)
 "
 
+PATCHES=(
+   "${FILESDIR}/${PN}-4.0.0-ocio-2.3.0.patch"
+)
+
 blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 
@@ -174,7 +176,7 @@ src_unpack() {
git-r3_src_unpack
 
git-r3_fetch "${ADDONS_EGIT_REPO_URI}"
-   git-r3_checkout "${ADDONS_EGIT_REPO_URI} ${S}/scripts/addons"
+   git-r3_checkout "${ADDONS_EGIT_REPO_URI}" "${S}/scripts/addons"
 
if use test; then

TESTS_SVN_URL=https://svn.blender.org/svnroot/bf-blender/trunk/lib/tests

diff --git a/media-gfx/blender/blender-.ebuild 
b/media-gfx/blender/blender-.ebuild
index a637534483c4..d32731e15fef 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -45,8 +45,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 # Library versions for official builds can be found in the blender source 
directory in:
 #

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2023-10-03 Thread Sam James 
commit: 580ee060c186678d960994df4f6d21133ac4b393
Author: Sam James  gentoo  org>
AuthorDate: Tue Oct  3 16:22:20 2023 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Oct  3 16:22:20 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=580ee060

media-gfx/blender: fix build w/ gcc 13

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

 media-gfx/blender/blender-3.3.6-r1.ebuild|  1 +
 media-gfx/blender/blender-3.3.8.ebuild   |  1 +
 media-gfx/blender/blender-3.4.1-r3.ebuild|  1 +
 media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch | 12 
 4 files changed, 15 insertions(+)

diff --git a/media-gfx/blender/blender-3.3.6-r1.ebuild 
b/media-gfx/blender/blender-3.3.6-r1.ebuild
index 5680b3b6a336..8452075832d4 100644
--- a/media-gfx/blender/blender-3.3.6-r1.ebuild
+++ b/media-gfx/blender/blender-3.3.6-r1.ebuild
@@ -133,6 +133,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch

"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+   "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
 )
 
 blender_check_requirements() {

diff --git a/media-gfx/blender/blender-3.3.8.ebuild 
b/media-gfx/blender/blender-3.3.8.ebuild
index fac6a83ed7f7..920d4210ff7c 100644
--- a/media-gfx/blender/blender-3.3.8.ebuild
+++ b/media-gfx/blender/blender-3.3.8.ebuild
@@ -133,6 +133,7 @@ PATCHES=(

"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch

"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+   "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
 )
 
 blender_check_requirements() {

diff --git a/media-gfx/blender/blender-3.4.1-r3.ebuild 
b/media-gfx/blender/blender-3.4.1-r3.ebuild
index 7a0b020b28fc..801a0d0bf0db 100644
--- a/media-gfx/blender/blender-3.4.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.4.1-r3.ebuild
@@ -140,6 +140,7 @@ BDEPEND="
 
 PATCHES=(
"${FILESDIR}"/${PN}-3.3.0-fix-build-with-boost-1.81.patch
+   "${FILESDIR}"/${PN}-3.3.6-cycles-gcc13.patch
 )
 
 blender_check_requirements() {

diff --git a/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch 
b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
new file mode 100644
index ..955be2424e19
--- /dev/null
+++ b/media-gfx/blender/files/blender-3.3.6-cycles-gcc13.patch
@@ -0,0 +1,12 @@
+https://bugs.gentoo.org/914740
+--- a/intern/cycles/util/thread.cpp
 b/intern/cycles/util/thread.cpp
+@@ -6,6 +6,8 @@
+ #include "util/system.h"
+ #include "util/windows.h"
+ 
++#include 
++
+ CCL_NAMESPACE_BEGIN
+ 
+ thread::thread(function run_cb) : run_cb_(run_cb), joined_(false)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2022-09-25 Thread Ionen Wolkens 
commit: 240b8b5737d5451ad70466ccc16e49630c295863
Author: Bernd Waibel  posteo  net>
AuthorDate: Sat Sep 17 09:06:21 2022 +
Commit: Ionen Wolkens  gentoo  org>
CommitDate: Sun Sep 25 12:22:38 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=240b8b57

media-gfx/blender: add optix support

Add compile and runtime support for the NVIDIA OptiX library.

Signed-off-by: Bernd Waibel  posteo.net>
Closes: https://bugs.gentoo.org/741564
Signed-off-by: Ionen Wolkens  gentoo.org>

 media-gfx/blender/blender-3.2.2.ebuild |  15 ++-
 ...option-to-specify-OptiX-runtime-root-dire.patch | 108 +
 ...-wrong-Cycles-OptiX-runtime-compilation-i.patch |  23 +
 media-gfx/blender/metadata.xml |   3 +
 4 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/media-gfx/blender/blender-3.2.2.ebuild 
b/media-gfx/blender/blender-3.2.2.ebuild
index b8269d9b77fb..4442e89a027e 100644
--- a/media-gfx/blender/blender-3.2.2.ebuild
+++ b/media-gfx/blender/blender-3.2.2.ebuild
@@ -28,7 +28,8 @@ IUSE="+bullet +dds +fluid +openexr +tbb \
alembic collada +color-management cuda +cycles \
debug doc +embree +ffmpeg +fftw +gmp headless jack jemalloc jpeg2k \
man +nanovdb ndof nls openal +oidn +openimageio +openmp +opensubdiv \
-   +openvdb +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile test +tiff 
valgrind"
+   +openvdb optix +osl +pdf +potrace +pugixml pulseaudio sdl +sndfile \
+   test +tiff valgrind"
 RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
@@ -37,6 +38,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
cycles? ( openexr tiff openimageio )
fluid? ( tbb )
openvdb? ( tbb )
+   optix? ( cuda )
osl? ( cycles )
test? ( color-management )"
 
@@ -93,6 +95,7 @@ RDEPEND="${PYTHON_DEPS}
>=media-gfx/openvdb-9.0.0:=[nanovdb?]
dev-libs/c-blosc:=
)
+   optix? ( =media-libs/osl-1.11.16.0-r3:= )
pdf? ( media-libs/libharu )
potrace? ( media-gfx/potrace )
@@ -126,6 +129,8 @@ BDEPEND="
 PATCHES=(
"${FILESDIR}"/${PN}-3.2.2-support-building-with-musl-libc.patch
"${FILESDIR}"/${PN}-3.2.2-musl-glibc-prereq.patch
+   
"${FILESDIR}"/${PN}-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
+   
"${FILESDIR}"/${PN}-3.2.2-Fix-T100845-wrong-Cycles-OptiX-runtime-compilation-i.patch
 )
 
 blender_check_requirements() {
@@ -222,6 +227,7 @@ src_configure() {
-DWITH_CXX_GUARDEDALLOC=$(usex debug)
-DWITH_CYCLES=$(usex cycles)
-DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE)
+   -DWITH_CYCLES_DEVICE_OPTIX=$(usex optix)
-DWITH_CYCLES_EMBREE=$(usex embree)
-DWITH_CYCLES_OSL=$(usex osl)
-DWITH_CYCLES_STANDALONE=OFF
@@ -269,6 +275,13 @@ src_configure() {
-DWITH_XR_OPENXR=OFF
)
 
+   if use optix; then
+   mycmakeargs+=(
+   -DCYCLES_RUNTIME_OPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+   -DOPTIX_ROOT_DIR="${EPREFIX}"/opt/optix
+   )
+   fi
+
append-flags $(usex debug '-DDEBUG' '-DNDEBUG')
 
if tc-is-gcc ; then

diff --git 
a/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
 
b/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
new file mode 100644
index ..2a7b33cf8ac4
--- /dev/null
+++ 
b/media-gfx/blender/files/blender-3.2.2-Cycles-add-option-to-specify-OptiX-runtime-root-dire.patch
@@ -0,0 +1,108 @@
+From https://developer.blender.org/rB74caf773619bbf6a0f95c598b66261a6bef392ee
+From: Brecht Van Lommel 
+Date: Mon, 29 Aug 2022 19:12:15 +0200
+Subject: [PATCH 001/539] Cycles: add option to specify OptiX runtime root
+ directory
+
+This allows individual users or Linux distributions to specify a directory
+Cycles will automatically look for the OptiX include folder, to compile kernels
+at runtime.
+
+It is still possible to override this with the OPTIX_ROOT_DIR environment
+variable at runtime.
+
+Based on patch by Sebastian Parborg.
+
+Ref D15792
+--- a/CMakeLists.txt
 b/CMakeLists.txt
+@@ -435,10 +435,16 @@ if(NOT APPLE)
+   option(WITH_CYCLES_CUBIN_COMPILER"Build cubins with nvrtc based 
compiler instead of nvcc" OFF)
+   option(WITH_CYCLES_CUDA_BUILD_SERIAL "Build cubins one after another 
(useful on machines with limited RAM)" OFF)
+   option(WITH_CUDA_DYNLOAD "Dynamically load CUDA libraries at 
runtime (for developers, makes cuda-gdb work)" ON)
++
++  set(OPTIX_ROOT_DIR   "" CACHE PATH "Path to the OptiX SDK 
root directory, for building Cycles OptiX kernels.")
++  set(CYCLES_RUNTIME_OPTIX_ROOT_DIR"" CACHE PATH "Path to the OptiX SDK 
root directory. When set, this path will be used at runtime to compile OptiX 
kernels.")
++

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2022-03-14 Thread Sam James 
commit: b03f30e16bf9ad41c6c835a89c7ccc3f1ff81e04
Author: Sam James  gentoo  org>
AuthorDate: Mon Mar 14 18:51:51 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 14 18:52:01 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b03f30e1

media-gfx/blender: fix SizeViolation

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

 media-gfx/blender/blender-3.0.1-r5.ebuild  |2 +-
 .../blender/files/blender-3.0.1-ffmpeg-5.0.patch   | 1045 
 2 files changed, 1 insertion(+), 1046 deletions(-)

diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild 
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index 5f9da3900d6d..f9c141963446 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} = ** ]] ; then
EGIT_REPO_URI="https://git.blender.org/blender.git;
 else
SRC_URI="https://download.blender.org/source/${P}.tar.xz;
-SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
+   SRC_URI+=" 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.0.1-ffmpeg-5.0.patch.bz2;
 
# Update these between major releases.
TEST_TARBALL_VERSION="3.0.0"

diff --git a/media-gfx/blender/files/blender-3.0.1-ffmpeg-5.0.patch 
b/media-gfx/blender/files/blender-3.0.1-ffmpeg-5.0.patch
deleted file mode 100644
index 5cd23b9e4b21..
--- a/media-gfx/blender/files/blender-3.0.1-ffmpeg-5.0.patch
+++ /dev/null
@@ -1,1045 +0,0 @@
-commit af6a1b08e3f0d0070ac9423868d2d3f81057717a
-Author: Sebastian Parborg 
-Date:   Fri Feb 18 18:20:06 2022 +0100
-
-VSE: Refactor our code to be compatible with ffmpeg 5.0
-
-In ffmpeg 5.0, several variables were made const to try to prevent bad API 
usage.
-Removed some dead code that wasn't used anymore as well.
-
-Reviewed By: Richard Antalik
-
-Differential Revision: http://developer.blender.org/D14063
-
-diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp 
b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
-index de3ca099696..69bb45119a6 100644
 a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
-+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
-@@ -177,7 +177,7 @@ void FFMPEGReader::init(int stream)
- 
-   // get a decoder and open it
- #ifndef FFMPEG_OLD_CODE
--  AVCodec* aCodec = 
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
-+  const AVCodec* aCodec = 
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
- 
-   if(!aCodec)
-   AUD_THROW(FileException, "File couldn't be read, no decoder 
found with ffmpeg.");
-diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp 
b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
-index 10517d1d596..32eb2330594 100644
 a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
-+++ b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
-@@ -23,6 +23,7 @@
- extern "C" {
- #include 
- #include 
-+#include 
- }
- 
- AUD_NAMESPACE_BEGIN
-@@ -171,66 +172,66 @@ FFMPEGWriter::FFMPEGWriter(std::string filename, 
DeviceSpecs specs, Container fo
-   if(avformat_alloc_output_context2(_formatCtx, nullptr, 
formats[format], filename.c_str()) < 0)
-   AUD_THROW(FileException, "File couldn't be written, format 
couldn't be found with ffmpeg.");
- 
--  AVOutputFormat* outputFmt = m_formatCtx->oformat;
-+  const AVOutputFormat* outputFmt = m_formatCtx->oformat;
- 
-   if(!outputFmt) {
-   avformat_free_context(m_formatCtx);
-   AUD_THROW(FileException, "File couldn't be written, output 
format couldn't be found with ffmpeg.");
-   }
- 
--  outputFmt->audio_codec = AV_CODEC_ID_NONE;
-+  AVCodecID audio_codec = AV_CODEC_ID_NONE;
- 
-   switch(codec)
-   {
-   case CODEC_AAC:
--  outputFmt->audio_codec = AV_CODEC_ID_AAC;
-+  audio_codec = AV_CODEC_ID_AAC;
-   break;
-   case CODEC_AC3:
--  outputFmt->audio_codec = AV_CODEC_ID_AC3;
-+  audio_codec = AV_CODEC_ID_AC3;
-   break;
-   case CODEC_FLAC:
--  outputFmt->audio_codec = AV_CODEC_ID_FLAC;
-+  audio_codec = AV_CODEC_ID_FLAC;
-   break;
-   case CODEC_MP2:
--  outputFmt->audio_codec = AV_CODEC_ID_MP2;
-+  audio_codec = AV_CODEC_ID_MP2;
-   break;
-   case CODEC_MP3:
--  outputFmt->audio_codec = AV_CODEC_ID_MP3;
-+  audio_codec = AV_CODEC_ID_MP3;
-   break;
-   case CODEC_OPUS:
--  outputFmt->audio_codec = AV_CODEC_ID_OPUS;
-+  audio_codec = AV_CODEC_ID_OPUS;
-   break;
-   case CODEC_PCM:
-   switch(specs.format)
-   {
-   case FORMAT_U8:
--  outputFmt->audio_codec = AV_CODEC_ID_PCM_U8;
-+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2022-03-14 Thread Sam James 
commit: 0538d70bf6187eba8bb550253eb9cf436b6ad9bf
Author: Sebastian Parborg  gmail  com>
AuthorDate: Mon Mar 14 15:32:13 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Mar 14 18:43:22 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0538d70b

media-gfx/blender: Fix building with ffmpeg 5.0

Closes: https://bugs.gentoo.org/834380
Signed-off-by: Sebastian Parborg  gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/24558
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/blender-2.93.0-r1.ebuild |2 +-
 media-gfx/blender/blender-2.93.6.ebuild|2 +-
 media-gfx/blender/blender-2.93.8-r4.ebuild |2 +-
 ...r-2.93.8-r4.ebuild => blender-2.93.8-r5.ebuild} |1 +
 media-gfx/blender/blender-3.0.0-r1.ebuild  |2 +-
 media-gfx/blender/blender-3.0.1-r4.ebuild  |2 +-
 ...der-3.0.1-r4.ebuild => blender-3.0.1-r5.ebuild} |1 +
 .../blender/files/blender-3.0.1-ffmpeg-5.0.patch   | 1045 
 8 files changed, 1052 insertions(+), 5 deletions(-)

diff --git a/media-gfx/blender/blender-2.93.0-r1.ebuild 
b/media-gfx/blender/blender-2.93.0-r1.ebuild
index 3ebf8b183f5f..5759d72da06c 100644
--- a/media-gfx/blender/blender-2.93.0-r1.ebuild
+++ b/media-gfx/blender/blender-2.93.0-r1.ebuild
@@ -63,7 +63,7 @@ RDEPEND="${PYTHON_DEPS}
color-management? ( >=media-libs/opencolorio-2.0.0 )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
embree? ( >=media-libs/embree-3.10.0[raymask] )
-   ffmpeg? ( 
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+   ffmpeg? ( 
=media-libs/opencolorio-2.1.1-r7:= )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
embree? ( >=media-libs/embree-3.10.0[raymask] )
-   ffmpeg? ( 
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+   ffmpeg? ( 
=media-libs/opencolorio-2.1.1-r7:= )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
embree? ( >=media-libs/embree-3.10.0[raymask] )
-   ffmpeg? ( 
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?,vpx,vorbis,opus,xvid] )
+   ffmpeg? ( 

+Date:   Fri Feb 18 18:20:06 2022 +0100
+
+VSE: Refactor our code to be compatible with ffmpeg 5.0
+
+In ffmpeg 5.0, several variables were made const to try to prevent bad API 
usage.
+Removed some dead code that wasn't used anymore as well.
+
+Reviewed By: Richard Antalik
+
+Differential Revision: http://developer.blender.org/D14063
+
+diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp 
b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
+index de3ca099696..69bb45119a6 100644
+--- a/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
 b/extern/audaspace/plugins/ffmpeg/FFMPEGReader.cpp
+@@ -177,7 +177,7 @@ void FFMPEGReader::init(int stream)
+ 
+   // get a decoder and open it
+ #ifndef FFMPEG_OLD_CODE
+-  AVCodec* aCodec = 
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
++  const AVCodec* aCodec = 
avcodec_find_decoder(m_formatCtx->streams[m_stream]->codecpar->codec_id);
+ 
+   if(!aCodec)
+   AUD_THROW(FileException, "File couldn't be read, no decoder 
found with ffmpeg.");
+diff --git a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp 
b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
+index 10517d1d596..32eb2330594 100644
+--- a/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
 b/extern/audaspace/plugins/ffmpeg/FFMPEGWriter.cpp
+@@ -23,6 +23,7 @@
+ extern "C" {
+ #include 
+ #include 
++#include 
+ }
+ 
+ AUD_NAMESPACE_BEGIN
+@@ -171,66 +172,66 @@ FFMPEGWriter::FFMPEGWriter(std::string filename, 
DeviceSpecs specs, Container fo
+   if(avformat_alloc_output_context2(_formatCtx, nullptr, 
formats[format], filename.c_str()) < 0)
+   AUD_THROW(FileException, "File couldn't be written, format 
couldn't be found with ffmpeg.");
+ 
+-  AVOutputFormat* outputFmt = m_formatCtx->oformat;
++  const AVOutputFormat* outputFmt = m_formatCtx->oformat;
+ 
+   if(!outputFmt) {
+   avformat_free_context(m_formatCtx);
+   AUD_THROW(FileException, "File couldn't be written, output 
format couldn't be found with ffmpeg.");
+   }
+ 
+-  outputFmt->audio_codec = AV_CODEC_ID_NONE;
++  AVCodecID audio_codec = AV_CODEC_ID_NONE;
+ 
+   switch(codec)
+   {
+   case CODEC_AAC:
+-  outputFmt->audio_codec = AV_CODEC_ID_AAC;
++  audio_codec = AV_CODEC_ID_AAC;
+   break;
+   case CODEC_AC3:
+-  outputFmt->audio_codec = AV_CODEC_ID_AC3;
++  audio_codec = AV_CODEC_ID_AC3;
+   break;
+   case CODEC_FLAC:
+-  outputFmt->audio_codec = AV_CODEC_ID_FLAC;
++  audio_codec = AV_CODEC_ID_FLAC;
+   break;
+   case CODEC_MP2:
+-  outputFmt->audio_codec = AV_CODEC_ID_MP2;
++  audio_codec = AV_CODEC_ID_MP2;
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2022-02-15 Thread Sam James 
commit: 22d23e6ab87569d482db5b5aad1f9e11d8c7c377
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 18:01:28 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Feb 15 19:49:50 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22d23e6a

media-gfx/blender: adjust to unslotted OpenEXR

Bug: https://bugs.gentoo.org/833197
Bug: https://bugs.gentoo.org/828441
Bug: https://bugs.gentoo.org/833265
Bug: https://bugs.gentoo.org/833196
Bug: https://bugs.gentoo.org/833158
Bug: https://bugs.gentoo.org/831357
Bug: https://bugs.gentoo.org/832862
Bug: https://bugs.gentoo.org/821247
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/blender-2.93.8-r2.ebuild |   4 +-
 media-gfx/blender/blender-3.0.1-r3.ebuild  |   6 +-
 media-gfx/blender/blender-.ebuild  |   2 +-
 .../blender/files/blender-3.0.1-openexr.patch  | 161 +
 4 files changed, 75 insertions(+), 98 deletions(-)

diff --git a/media-gfx/blender/blender-2.93.8-r2.ebuild 
b/media-gfx/blender/blender-2.93.8-r2.ebuild
index 91f10fa0ecec..6de91d891438 100644
--- a/media-gfx/blender/blender-2.93.8-r2.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r2.ebuild
@@ -43,8 +43,6 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}
 
 # Library versions for official builds can be found in the blender source 
directory in:
 # build_files/build_environment/install_deps.sh
-# We can use a lower version of OIO but we need a version we know we've
-# switched to OpenEXR 3.
 RDEPEND="${PYTHON_DEPS}
dev-libs/boost:=[nls?,threads(+)]
dev-libs/lzo:2=
@@ -88,7 +86,7 @@ RDEPEND="${PYTHON_DEPS}
openimageio? ( >=media-libs/openimageio-2.3.12.0:= )
openexr? (
dev-libs/imath:=
-   media-libs/openexr:3=
+   media-libs/openexr:=
)
opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] )
openvdb? (

diff --git a/media-gfx/blender/blender-3.0.1-r3.ebuild 
b/media-gfx/blender/blender-3.0.1-r3.ebuild
index ed6d2a645173..1d4c81b283d6 100644
--- a/media-gfx/blender/blender-3.0.1-r3.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r3.ebuild
@@ -62,7 +62,7 @@ RDEPEND="${PYTHON_DEPS}
virtual/opengl
alembic? ( >=media-gfx/alembic-1.8.3-r2[boost(+),hdf(+)] )
collada? ( >=media-libs/opencollada-1.6.68 )
-   color-management? ( >=media-libs/opencolorio-2.1.1-r3:= )
+   color-management? ( >=media-libs/opencolorio-2.1.1-r4:= )
cuda? ( dev-util/nvidia-cuda-toolkit:= )
embree? ( >=media-libs/embree-3.10.0[raymask] )
ffmpeg? ( 
media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k,vpx,vorbis,opus,xvid] )
@@ -83,10 +83,10 @@ RDEPEND="${PYTHON_DEPS}
nls? ( virtual/libiconv )
openal? ( media-libs/openal )
oidn? ( >=media-libs/oidn-1.4.1 )
-   openimageio? ( >=media-libs/openimageio-2.3.12.0:= )
+   openimageio? ( >=media-libs/openimageio-2.3.12.0-r1:= )
openexr? (
dev-libs/imath:=
-   media-libs/openexr:3=
+   media-libs/openexr:=
)
opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
openvdb? (

diff --git a/media-gfx/blender/blender-.ebuild 
b/media-gfx/blender/blender-.ebuild
index 43041614f74c..42b0254daa05 100644
--- a/media-gfx/blender/blender-.ebuild
+++ b/media-gfx/blender/blender-.ebuild
@@ -86,7 +86,7 @@ RDEPEND="${PYTHON_DEPS}
openimageio? ( >=media-libs/openimageio-2.3.12.0:= )
openexr? (
dev-libs/imath:=
-   media-libs/openexr:3=
+   >=media-libs/openexr-3:=
)
opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=] )
openvdb? (

diff --git a/media-gfx/blender/files/blender-3.0.1-openexr.patch 
b/media-gfx/blender/files/blender-3.0.1-openexr.patch
index 3ff6b213b05f..435498cd8a3d 100644
--- a/media-gfx/blender/files/blender-3.0.1-openexr.patch
+++ b/media-gfx/blender/files/blender-3.0.1-openexr.patch
@@ -1,79 +1,13 @@
-Based on 
https://src.fedoraproject.org/rpms/blender/blob/rawhide/f/blender-openexr.patch
+https://src.fedoraproject.org/rpms/blender/blob/rawhide/f/blender-openexr.patch
 
-The issue is that our dependencies are fragile and want to be linked againt 
OpenEXR 3
-usually, and we've had to give in and go with it. The patches needed to 
Blender to
-make it go with this (outside of issues related to slotting and adapting to it)
-are simple, and will hopefuly bring less pain / build errors / etc than before.
-diff --git a/build_files/cmake/Modules/FindOpenEXR.cmake 
b/build_files/cmake/Modules/FindOpenEXR.cmake
-index 09af546..dfe15cd 100644
 a/build_files/cmake/Modules/FindOpenEXR.cmake
-+++ b/build_files/cmake/Modules/FindOpenEXR.cmake
-@@ -33,6 +33,17 @@ ENDIF()
- # Old versions (before 2.0?) do not have any version string, just assuming 
this should be fine though.
- SET(_openexr_libs_ver_init "2.0")
- 
-+find_package(Imath-3 CONFIG QUIET)
-+if(TARGET

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2022-02-12 Thread Sam James 
commit: 065ec4efaff92d4abe6e55ecbc7c58ba1544d541
Author: Sam James  gentoo  org>
AuthorDate: Sat Feb 12 14:58:16 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Feb 12 14:58:16 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=065ec4ef

media-gfx/blender: force finding imath-3 in 2.93.8/3.0.1

We'd pick up media-libs/ilmbase even if we (probably) wouldn't
use it, so let's not do that, as we're switching to OpenEXR 3.

Bug: https://bugs.gentoo.org/832862
Closes: https://bugs.gentoo.org/833184
Signed-off-by: Sam James  gentoo.org>

 .../blender/{blender-2.93.8-r1.ebuild => blender-2.93.8-r2.ebuild}| 0
 .../blender/{blender-3.0.1-r2.ebuild => blender-3.0.1-r3.ebuild}  | 0
 media-gfx/blender/files/blender-3.0.1-openexr.patch   | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/media-gfx/blender/blender-2.93.8-r1.ebuild 
b/media-gfx/blender/blender-2.93.8-r2.ebuild
similarity index 100%
rename from media-gfx/blender/blender-2.93.8-r1.ebuild
rename to media-gfx/blender/blender-2.93.8-r2.ebuild

diff --git a/media-gfx/blender/blender-3.0.1-r2.ebuild 
b/media-gfx/blender/blender-3.0.1-r3.ebuild
similarity index 100%
rename from media-gfx/blender/blender-3.0.1-r2.ebuild
rename to media-gfx/blender/blender-3.0.1-r3.ebuild

diff --git a/media-gfx/blender/files/blender-3.0.1-openexr.patch 
b/media-gfx/blender/files/blender-3.0.1-openexr.patch
index b1ea45acc76e..3ff6b213b05f 100644
--- a/media-gfx/blender/files/blender-3.0.1-openexr.patch
+++ b/media-gfx/blender/files/blender-3.0.1-openexr.patch
@@ -12,8 +12,8 @@ index 09af546..dfe15cd 100644
  # Old versions (before 2.0?) do not have any version string, just assuming 
this should be fine though.
  SET(_openexr_libs_ver_init "2.0")
  
-+find_package(Imath CONFIG QUIET)
-+if(TARGET Imath::Imath)
++find_package(Imath-3 CONFIG QUIET)
++if(TARGET Imath-3::Imath)
 +SET(_openexr_FIND_COMPONENTS
 +  Imath
 +  Iex

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2021-12-03 Thread Sam James 
commit: 872bf6f1f8baed1e7f76ef593df2b87da9a0eac8
Author: Sam James  gentoo  org>
AuthorDate: Sat Dec  4 00:53:59 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Sat Dec  4 00:54:19 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=872bf6f1

media-gfx/blender: fix linking against libXxf86vm

See: https://developer.blender.org/D13464
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/blender-3.0.0.ebuild |  4 +++
 ...ntern-ghost-fix-typo-in-finding-XF86VMODE.patch | 31 ++
 2 files changed, 35 insertions(+)

diff --git a/media-gfx/blender/blender-3.0.0.ebuild 
b/media-gfx/blender/blender-3.0.0.ebuild
index ad4ed0c1d319..65bfc2f8e6d4 100644
--- a/media-gfx/blender/blender-3.0.0.ebuild
+++ b/media-gfx/blender/blender-3.0.0.ebuild
@@ -123,6 +123,10 @@ BDEPEND="
nls? ( sys-devel/gettext )
 "
 
+PATCHES=(
+   "${FILESDIR}"/${P}-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
+)
+
 blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 

diff --git 
a/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
 
b/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
new file mode 100644
index ..51d8ded23366
--- /dev/null
+++ 
b/media-gfx/blender/files/blender-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
@@ -0,0 +1,31 @@
+https://developer.blender.org/D13464
+
+From 781c56f054b4c7717739752336427a811f7633eb Mon Sep 17 00:00:00 2001
+From: Sam James 
+Date: Sat, 4 Dec 2021 00:38:59 +
+Subject: [PATCH] intern/ghost: fix typo in finding XF86VMODE
+
+---
+ intern/ghost/CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
+index 4164231..663598e 100644
+--- a/intern/ghost/CMakeLists.txt
 b/intern/ghost/CMakeLists.txt
+@@ -245,10 +245,10 @@ elseif(WITH_GHOST_X11 OR WITH_GHOST_WAYLAND)
+ if(WITH_X11_XF86VMODE)
+   add_definitions(-DWITH_X11_XF86VMODE)
+   list(APPEND INC_SYS
+-${X11_xf86vmode_INCLUDE_PATH}
++${X11_Xxf86vmode_INCLUDE_PATH}
+   )
+   list(APPEND LIB
+-${X11_Xf86vmode_LIB}
++${X11_Xxf86vmode_LIB}
+   )
+ endif()
+ 
+-- 
+2.34.1
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2021-11-08 Thread Michał Górny 
commit: 4a316631991487a4e893b22db1942a296bbda87d
Author: Michał Górny  gentoo  org>
AuthorDate: Mon Nov  8 10:57:44 2021 +
Commit: Michał Górny  gentoo  org>
CommitDate: Mon Nov  8 11:25:20 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4a316631

media-gfx/blender: Remove versions requiring LLVM 10

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

 media-gfx/blender/Manifest |   4 -
 media-gfx/blender/blender-2.83.15-r1.ebuild| 380 -
 media-gfx/blender/blender-2.83.16-r1.ebuild| 380 -
 media-gfx/blender/blender-2.83.17-r1.ebuild| 377 
 .../blender/files/blender-2.83.13-ffmpeg-4_4.patch |  27 --
 .../files/blender-2.83.6-constraints_test.patch|  13 -
 .../files/blender-2.83.6-fix_opevdb_abi.patch  |  21 --
 .../blender-2.83.6-libmv_eigen_alignment.patch | 219 
 8 files changed, 1421 deletions(-)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 142447598c2..24a6d396c78 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,7 +1,3 @@
-DIST blender-2.83.1-tests.tar.bz2 266633785 BLAKE2B 
8d8102c3107480de95dfd9ef9dabba1cd82893aad553af2ff5ef1afadc831dc5ccf5553c41466511ecb2a1435bc79c936ad64a78bdd4375e3e30af85b69807c6
 SHA512 
3ffba6fa8401bba3e2bdbccf7067761114d516371c7778a2f6604a243fd8610e26a30b88a32728c26f7e6274182d298752f32b5e76abf8216be0ec4b3ce38cd9
-DIST blender-2.83.15.tar.xz 39125740 BLAKE2B 
687097b45b76b474b1c172c9b8ccf5da1bfc24539d0db894d04c7837572b16c1f552757fd1482219d58afa56c573229878fb43bbecd95e3d61314f2ab05efafa
 SHA512 
2836533691bae0a7942197e67232b396b892cd95c0f07ab561f7de8458b354fe4045453855585484dd533ae76588ea3888f880763b042a264fb813a43933fc25
-DIST blender-2.83.16.tar.xz 39135184 BLAKE2B 
2515822373f6a9343c760ad656de732094ee58a9354423e0f3d7bf1042220fc54af7e1d9f5b59a170a23e8b1b57a4b7f09867a000a57a6e4e820ff5c6cdd47b6
 SHA512 
ef78278387ae981972942ee4724abcb11ca19da2b88a3c8bbe1e9aafb93f28d84d4c79d01542e11218bd58bfec80fcfdbffdfd28896d146edd34181a7439dbd5
-DIST blender-2.83.17.tar.xz 39128468 BLAKE2B 
3a20f6125f94e0d6de4d78e7a784c5a37faf23603e055a28ee67e48a41d09d3715222b2ac4f04ed38619dca686e7e0985ad60c983ee3a15c96042e419f152e69
 SHA512 
1e4c9a1f604802fb94c8e844f3878756e2ba0a6c29a6fb8863bc21ada1c8e14e775b203ab21bc4d53e85eb4e909e889204bb9f5befcff56cec3d56c2e987c2a0
 DIST blender-2.93.0-tests.tar.bz2 286918586 BLAKE2B 
a2c2c2e900e401a470208e8e5d0082d45e2f8db13b45213f31808d50ae5ea330360702b8e775bdb3307eb753aa7c3264803e9e470b3fb778f8bd87272cd72513
 SHA512 
0e5e4c67944c4f76df62cdbaf26ba284c415675074e66685c01ec9584a544c47f616bae8fb2ff2b7e03290620d54dc1033b4b0fc617acb1232a90439e96325fe
 DIST blender-2.93.0.tar.xz 42967016 BLAKE2B 
1e7b54f08415de8a8908a285ae35c1e18558bf7cab42c5c135323d10ac9a73ec69aa0addd536355a4d19262438a615e03f09dc123b697cbab484e33350bb5ee3
 SHA512 
660962e5368c8ff52ed095aba97d63c22aa8e2fdcb2042b1299b6d6edeb7eb1f702a9ee95ee7e47824681f9f48b971d2e32ec32cc6264165a4196b5f36c4a66d
 DIST blender-2.93.1.tar.xz 42960100 BLAKE2B 
eda0a8c0414d1f7c89d21e34ba238b0cbe337ea755d6f10792e7c3bd5e15934184d3bd853ed636764776095ce1e3f081d63386b7c13fb7ac666580bf9eeb43c8
 SHA512 
b14e8cca248c53e4a93976d7fa1cd1ab92a7d18a3809b2a535881731aad2f68d8d155ad175b27aa1890714b81aa6648604a614cacc90e95b7269569661e393b1

diff --git a/media-gfx/blender/blender-2.83.15-r1.ebuild 
b/media-gfx/blender/blender-2.83.15-r1.ebuild
deleted file mode 100644
index 6175ce97526..000
--- a/media-gfx/blender/blender-2.83.15-r1.ebuild
+++ /dev/null
@@ -1,380 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8} )
-
-inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 
toolchain-funcs xdg-utils
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="https://www.blender.org;
-
-if [[ ${PV} = ** ]] ; then
-   inherit git-r3
-   EGIT_REPO_URI="https://git.blender.org/blender.git;
-else
-   SRC_URI="https://download.blender.org/source/${P}.tar.xz;
-   TEST_TARBALL_VERSION=2.83.1
-   SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
 )"
-   KEYWORDS="amd64 ~x86"
-fi
-
-SLOT="${PV%.*}"
-LICENSE="|| ( GPL-3 BL )"
-IUSE="+bullet +dds +fluid +openexr +system-python +system-numpy +tbb \
-   alembic collada +color-management cuda cycles \
-   debug doc ffmpeg fftw headless jack jemalloc jpeg2k \
-   man ndof nls openal opencl openimageio openmp opensubdiv \
-   openvdb osl sdl sndfile standalone test tiff valgrind"
-RESTRICT="!test? ( test )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   alembic? ( openexr )
-   cuda? ( cycles )
-   cycles? ( openexr tiff openimageio )
-   fluid? ( tbb )
-   opencl? ( cycles )
-   openvdb? ( tbb )
-   osl? ( cycles )
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2020-12-02 Thread Joonas Niilola 
commit: 406cafd8aab1d7d2a166513504800a57396d9bcd
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Fri Nov 27 03:13:08 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec  3 07:32:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=406cafd8

media-gfx/blender: Set Build Type for Blender

Blender requires that the build type is set to None, Debug, Release,
RelWithDebInfo or MinSizeRel. This requires it to be overridden.

If this is not done, then it is set to Gentoo by cmake.eclass, and the
scripts in CMakeLists fail to set one of DEBUG or NDEBUG.

In blender 2.91, this results in not defining
GPU_vertex_buffer._data_end, but also attempting to execute an
assert which requires it to be defined.

Setting CMAKE_BUILD_TYPE to Release resolves the issue by setting
NDEBUG to prevent compilation of the assert, and unsetting DEBUG so
that the _data_end is not compiled.

This means that the patch to prevent the compilation of the assert is
no longer required.

Older version of blender in the tree also have the same requirement
for the value of CMAKE_BUILD_TYPE, but so far compiled correctly even
when it was set to Gentoo.

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

 media-gfx/blender/blender-2.83.4-r1.ebuild |  2 ++
 media-gfx/blender/blender-2.90.1-r1.ebuild |  2 ++
 media-gfx/blender/blender-2.91.0.ebuild|  4 +---
 .../blender/files/blender-2.91.0-define-data-end.patch | 14 --
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/media-gfx/blender/blender-2.83.4-r1.ebuild 
b/media-gfx/blender/blender-2.83.4-r1.ebuild
index 055f713caf7..f28ba088062 100644
--- a/media-gfx/blender/blender-2.83.4-r1.ebuild
+++ b/media-gfx/blender/blender-2.83.4-r1.ebuild
@@ -114,6 +114,8 @@ BDEPEND="
nls? ( sys-devel/gettext )
 "
 
+CMAKE_BUILD_TYPE="Release"
+
 blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 

diff --git a/media-gfx/blender/blender-2.90.1-r1.ebuild 
b/media-gfx/blender/blender-2.90.1-r1.ebuild
index 04d9740cdfc..7c7ab67c366 100644
--- a/media-gfx/blender/blender-2.90.1-r1.ebuild
+++ b/media-gfx/blender/blender-2.90.1-r1.ebuild
@@ -114,6 +114,8 @@ BDEPEND="
nls? ( sys-devel/gettext )
 "
 
+CMAKE_BUILD_TYPE="Release"
+
 blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
 

diff --git a/media-gfx/blender/blender-2.91.0.ebuild 
b/media-gfx/blender/blender-2.91.0.ebuild
index fbb40039d4f..495bfc89e17 100644
--- a/media-gfx/blender/blender-2.91.0.ebuild
+++ b/media-gfx/blender/blender-2.91.0.ebuild
@@ -118,9 +118,7 @@ BDEPEND="
nls? ( sys-devel/gettext )
 "
 
-PATCHES=(
-   "${FILESDIR}/${P}-define-data-end.patch"
-)
+CMAKE_BUILD_TYPE="Release"
 
 blender_check_requirements() {
[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp

diff --git a/media-gfx/blender/files/blender-2.91.0-define-data-end.patch 
b/media-gfx/blender/files/blender-2.91.0-define-data-end.patch
deleted file mode 100644
index 99705adae25..000
--- a/media-gfx/blender/files/blender-2.91.0-define-data-end.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Naur a/source/blender/gpu/GPU_vertex_buffer.h 
b/source/blender/gpu/GPU_vertex_buffer.h
 a/source/blender/gpu/GPU_vertex_buffer.h   2020-11-26 16:36:36.226883721 
+1100
-+++ b/source/blender/gpu/GPU_vertex_buffer.h   2020-11-26 16:38:08.691212985 
+1100
-@@ -118,7 +118,10 @@
- {
-   unsigned char *data = a->data;
-   a->data += a->stride;
-+#ifdef DEBUG
-+  /* Assert only compiles if _data_end exists */
-   BLI_assert(data < a->_data_end);
-+#endif
-   return (void *)data;
- }
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2020-12-02 Thread Joonas Niilola 
commit: bfaf3fdaf0656a4c63704bd09eea20ba1547faf9
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Fri Nov 27 02:09:03 2020 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Thu Dec  3 07:32:12 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bfaf3fda

media-gfx/blender: Version bump to 2.91.0

Version bump to blender 2.91.0

This version adds four new dependencies (gmp, pugixml, potrace and
fontconfig)

A patch is added for a compilation error that occurs when DEBUG is not
set. GPUVertBufferRaw._data_end is only declared when DEBUG is set, but
an assert that the data pointer is less than _data_end occurs
regardless, resulting in a failure to compile as the symbol does not
exist.

The fix is to make the assert conditional on DEBUG, and the compilation
succeeds.

The subslot binder is used for media-libs/osl to force recompilation
when it changes. This ensures that the oso compiled files are the
correct version, and that preserved libraries are not left behind.

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

 media-gfx/blender/Manifest |   1 +
 media-gfx/blender/blender-2.91.0.ebuild| 327 +
 .../files/blender-2.91.0-define-data-end.patch |  14 +
 3 files changed, 342 insertions(+)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 5f4b3e32e53..c9763933a6b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1,3 @@
 DIST blender-2.83.4.tar.xz 38528352 BLAKE2B 
54596207cbee34fcaa6b81a0d829976b42c28c793b88de81d78c1c3fdfe9dd2a0189a314be281b2a0f1829a0b7fd30d37bceaa28d35c9794dcb0f009fa71e83d
 SHA512 
061735273159742784ed210d13fb39ad076efbbfd5f0291bab1b983699d43b20462dc7e4795e28dab0cd191c9879b43d9ad0f0545c24ef5da23c74679e5ccab5
 DIST blender-2.90.1.tar.xz 38836408 BLAKE2B 
42622e742ebd397dc035c85cf26ab72ffee64f2cd46f1523de78dc8861bc19286a7d87b9e31a0d6afdf9a931da7018ccbdb9b4185b8535b4529656c6d85efc34
 SHA512 
e7d6f8df598f2a2a99f64716331ec4e981a5a49c76b307caf7856480c778455cfc4bbb56fbedc8b22d1e10951ebaeb6844d1ead9476847bf2824dddf5b135992
+DIST blender-2.91.0.tar.xz 41528920 BLAKE2B 
f28bce92b0b63e380c7ce2c9dae0ae4235792ae7c7dff52c2c9c0c5baa81b4d540f853f49d7622f6feca8c7f403b254b55f200758a64e4d95bd43709e5509c1d
 SHA512 
a4b6cb09765d735274fb4a61ac301cbd6ee16f09ab77b19a6e283454b9b8a8c76f1b181501dc285b288130da9e283d3343b948b2855eea00bcb9e114636d55aa

diff --git a/media-gfx/blender/blender-2.91.0.ebuild 
b/media-gfx/blender/blender-2.91.0.ebuild
new file mode 100644
index 000..fbb40039d4f
--- /dev/null
+++ b/media-gfx/blender/blender-2.91.0.ebuild
@@ -0,0 +1,327 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_7 )
+
+inherit check-reqs cmake flag-o-matic pax-utils python-single-r1 \
+   toolchain-funcs xdg-utils
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="https://www.blender.org;
+
+SRC_URI="https://download.blender.org/source/${P}.tar.xz;
+
+# Blender can have letters in the version string,
+# so strip off the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +openexr +system-python +system-numpy +tbb \
+   abi6-compat abi7-compat alembic collada color-management cuda cycles \
+   debug doc ffmpeg fftw headless jack jemalloc jpeg2k llvm \
+   man ndof nls openal opencl openimageio openmp opensubdiv \
+   openvdb osl sdl sndfile standalone test tiff valgrind"
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   alembic? ( openexr )
+   cuda? ( cycles )
+   cycles? ( openexr tiff openimageio )
+   elbeem? ( tbb )
+   opencl? ( cycles )
+   openvdb? (
+   ^^ ( abi6-compat abi7-compat )
+   tbb
+   )
+   osl? ( cycles llvm )
+   standalone? ( cycles )"
+
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/boost:=[nls?,threads(+)]
+   dev-libs/gmp
+   dev-libs/pugixml
+   dev-libs/lzo:2=
+   $(python_gen_cond_dep '
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   ')
+   media-gfx/potrace
+   media-libs/fontconfig:=
+   media-libs/freetype:=
+   media-libs/glew:*
+   media-libs/libpng:=
+   media-libs/libsamplerate
+   sys-libs/zlib:=
+   virtual/glu
+   virtual/jpeg
+   virtual/libintl
+   virtual/opengl
+   alembic? ( >=media-gfx/alembic-1.7.12[boost(+),hdf(+)] )
+   collada? ( >=media-libs/opencollada-1.6.68 )
+   color-management? ( media-libs/opencolorio )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
+   ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+   fftw? ( sci-libs/fftw:3.0= )
+   !headless? (
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2020-08-24 Thread Sam James 
commit: ac89d92c599585bf639ab0512237bc005ba8c2ba
Author: Adrian Grigo  yahoo  com  au>
AuthorDate: Sat Aug 22 01:00:36 2020 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Aug 24 13:41:55 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac89d92c

media-gfx/blender: Patch for opencollada > 1.65

Opencollada 1.65 added a pure virtual function to writeAnimationClip
which prevents blender from creating an implementation of
DocumentImporter in the usual manner.

These patches are backported from blender 2.80-rc1 which add
definitions for writeAnimationClip to DoucmentImporter resolving the
issue.

Thanks to Dennis Schridde for finding them.

Signed-off-by: Adrian Grigo  yahoo.com.au>
Closes: https://bugs.gentoo.org/733500
Package-Manager: Portage-2.3.103, Repoman-2.3.23
Signed-off-by: Sam James  gentoo.org>

 media-gfx/blender/blender-2.79b-r2.ebuild  |   1 +
 .../files/blender-2.79b-fix-opencollada.patch  | 112 +
 2 files changed, 113 insertions(+)

diff --git a/media-gfx/blender/blender-2.79b-r2.ebuild 
b/media-gfx/blender/blender-2.79b-r2.ebuild
index 0a45c711273..1b08a01395b 100644
--- a/media-gfx/blender/blender-2.79b-r2.ebuild
+++ b/media-gfx/blender/blender-2.79b-r2.ebuild
@@ -106,6 +106,7 @@ PATCHES=(
"${FILESDIR}/${P}-gcc-8.patch"
"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
"${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
+   "${FILESDIR}/${P}-fix-opencollada.patch"
 )
 
 blender_check_requirements() {

diff --git a/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch 
b/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch
new file mode 100644
index 000..ab1704864a0
--- /dev/null
+++ b/media-gfx/blender/files/blender-2.79b-fix-opencollada.patch
@@ -0,0 +1,112 @@
+Opencollada 1.65 and later added a pure virtual function writeAnimationClip
+so the compiler is unable to create a DocumentImporter implementation.
+These patches are backported from blender 2.80-r1 which fix the issue.
+
+See https://developer.blender.org/rB10c50d7dbf7578b35b3bf19a1948f556f9eb203b
+and https://developer.blender.org/rB3552731551ef1845b493ffebf78be5a42527e9f2
+
+Thanks to Dennis Schridde for finding them.
+
+--- blender-2.79b/source/blender/collada/CMakeLists.txt.orig   2020-07-23 
18:00:09.421620416 +0200
 blender-2.79b/source/blender/collada/CMakeLists.txt2020-07-23 
18:00:13.868584964 +0200
+@@ -25,6 +25,18 @@
+ 
+ remove_strict_flags()
+ 
++FIND_FILE(_opencollada_with_animation_clip
++  NAMES
++COLLADAFWAnimationClip.h
++  PATHS
++${OPENCOLLADA_INCLUDE_DIRS}
++  NO_DEFAULT_PATH
++)
++
++IF(_opencollada_with_animation_clip)
++   add_compile_definitions(OPENCOLLADA_WITH_ANIMATION_CLIP)
++ENDIF()
++
+ set(INC
+   .
+   ../blenkernel
+--- blender-2.79b/source/blender/collada/DocumentImporter.h.orig   
2018-03-23 16:10:23.0 +0100
 blender-2.79b/source/blender/collada/DocumentImporter.h2020-07-23 
18:00:13.897584733 +0200
+@@ -108,6 +108,11 @@
+ 
+   bool writeAnimationList(const COLLADAFW::AnimationList*);
+ 
++#if OPENCOLLADA_WITH_ANIMATION_CLIP
++  // Please enable this when building with Collada 1.6.65 or newer (also 
in DocumentImporter.cpp)
++  bool writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip);
++#endif
++
+   bool writeGeometry(const COLLADAFW::Geometry*);
+ 
+   bool writeMaterial(const COLLADAFW::Material*);
+--- blender-2.79b/source/blender/collada/DocumentImporter.cpp.orig 
2018-03-23 16:22:25.0 +0100
 blender-2.79b/source/blender/collada/DocumentImporter.cpp  2020-07-23 
18:00:13.896584741 +0200
+@@ -1349,6 +1349,19 @@
+ 
++#if OPENCOLLADA_WITH_ANIMATION_CLIP
++// Since opencollada 1.6.68
++// called on post-process stage after writeVisualScenes
++bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip 
*AnimationClip)
++{
++  if (mImportStage != General)
++  return true;
++
++  return true;
++  //return animation_clip_importer.write_animation_clip(animationClip); 
// TODO: implement import of AnimationClips
++}
++#endif
++
+ // this is called on postprocess, before writeVisualScenes
+ bool DocumentImporter::writeController(const COLLADAFW::Controller 
*controller)
+ {
+   if (mImportStage != General)
+   return true;
+--- blender-2.79b/source/blender/collada/CMakeLists.txt.orig   2020-07-23 
18:00:45.035336449 +0200
 blender-2.79b/source/blender/collada/CMakeLists.txt2020-07-23 
18:00:52.459277244 +0200
+@@ -24,8 +24,7 @@
+ # * END GPL LICENSE BLOCK *
+ 
+ remove_strict_flags()
+-
+-FIND_FILE(_opencollada_with_animation_clip
++FIND_FILE(OPENCOLLADA_ANIMATION_CLIP
+   NAMES
+ COLLADAFWAnimationClip.h
+   PATHS
+@@ -33,8 +32,11 @@
+   NO_DEFAULT_PATH
+ )
+ 
+-IF(_opencollada_with_animation_clip)
+-   add_compile_definitions(OPENCOLLADA_WITH_ANIMATION_CLIP)

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2019-11-12 Thread Miroslav Šulc 
commit: 4f0c93f505f5c48ad580f6a926a0f226de215171
Author: Miroslav Šulc  gentoo  org>
AuthorDate: Tue Nov 12 12:32:55 2019 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Tue Nov 12 12:33:15 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4f0c93f5

media-gfx/blender-2.79b: fix #685922

Closes: https://bugs.gentoo.org/685922
Package-Manager: Portage-2.3.79, Repoman-2.3.18
Signed-off-by: Miroslav Šulc  gentoo.org>

 media-gfx/blender/blender-2.79b-r1.ebuild  |  2 ++
 79b-fix-for-gcc9-new-openmp-data-sharing.patch | 31 ++
 2 files changed, 33 insertions(+)

diff --git a/media-gfx/blender/blender-2.79b-r1.ebuild 
b/media-gfx/blender/blender-2.79b-r1.ebuild
index 147bcd56b0d..a84c696b9b1 100644
--- a/media-gfx/blender/blender-2.79b-r1.ebuild
+++ b/media-gfx/blender/blender-2.79b-r1.ebuild
@@ -24,6 +24,7 @@ IUSE="+bullet +dds +elbeem +game-engine +openexr collada 
color-management \
cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
osl player sdl sndfile test tiff valgrind"
+RESTRICT="!test? ( test )"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
cuda? ( cycles )
@@ -98,6 +99,7 @@ PATCHES=(
"${FILESDIR}/${PN}-fix-install-rules.patch"
"${FILESDIR}/${P}-gcc-8.patch"
"${FILESDIR}/${P}-ffmpeg-4-compat.patch"
+   "${FILESDIR}/${P}-fix-for-gcc9-new-openmp-data-sharing.patch"
 )
 
 blender_check_requirements() {

diff --git 
a/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
 
b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
new file mode 100644
index 000..0ecc960d28e
--- /dev/null
+++ 
b/media-gfx/blender/files/blender-2.79b-fix-for-gcc9-new-openmp-data-sharing.patch
@@ -0,0 +1,31 @@
+diff --git a/intern/elbeem/intern/solver_main.cpp 
b/intern/elbeem/intern/solver_main.cpp
+index 68f7c04..514087b 100644
+--- a/intern/elbeem/intern/solver_main.cpp
 b/intern/elbeem/intern/solver_main.cpp
+@@ -381,7 +381,7 @@ LbmFsgrSolver::mainLoop(const int lev)
+   GRID_REGION_INIT();
+ #if PARALLEL==1
+   const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ calcCurrentMass,calcCurrentVolume, \
+   calcCellsFilled,calcCellsEmptied, \
+@@ -1126,7 +1126,7 @@ LbmFsgrSolver::preinitGrids()
+   GRID_REGION_INIT();
+ #if PARALLEL==1
+   const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ calcCurrentMass,calcCurrentVolume, \
+   calcCellsFilled,calcCellsEmptied, \
+@@ -1164,7 +1164,7 @@ LbmFsgrSolver::standingFluidPreinit()
+   GRID_REGION_INIT();
+ #if PARALLEL==1
+   const int gDebugLevel = ::gDebugLevel;
+-#pragma omp parallel default(none) num_threads(mNumOMPThreads) \
++#pragma omp parallel num_threads(mNumOMPThreads) \
+   reduction(+: \
+ calcCurrentMass,calcCurrentVolume, \
+   calcCellsFilled,calcCellsEmptied, \

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2018-08-15 Thread Jonathan Scruggs 
commit: b0b0f8fb104fdd0867db97591866bc1b5af425d6
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Wed Aug 15 17:44:26 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Wed Aug 15 20:08:18 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b0b0f8fb

media-gfx/blender: bump to version 1.79b

Add patch from Mark Wright  gentoo.org> for GCC 8
compatibility.

Closes: https://bugs.gentoo.org/650592
Closes: https://bugs.gentoo.org/661066

 media-gfx/blender/Manifest|   1 +
 media-gfx/blender/blender-2.79b.ebuild| 290 ++
 media-gfx/blender/files/blender-2.79b-gcc-8.patch |  22 ++
 3 files changed, 313 insertions(+)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index aa35aa9dcac..42826ca0c67 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,2 +1,3 @@
 DIST blender-2.72b.tar.gz 52018242 BLAKE2B 
fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9
 SHA512 
9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
 DIST blender-2.79.tar.gz 50145270 BLAKE2B 
5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338
 SHA512 
9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f
+DIST blender-2.79b.tar.gz 50204270 BLAKE2B 
78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0
 SHA512 
2db21ace446168dd683cdb5aad9dec001fae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f

diff --git a/media-gfx/blender/blender-2.79b.ebuild 
b/media-gfx/blender/blender-2.79b.ebuild
new file mode 100644
index 000..4dc6dd61ee6
--- /dev/null
+++ b/media-gfx/blender/blender-2.79b.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
+   pax-utils python-single-r1 toolchain-funcs eapi7-ver
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org;
+
+SRC_URI="http://download.blender.org/source/${P}.tar.gz;
+
+# Blender can have letters in the version string,
+# so strip of the letter if it exists.
+MY_PV="$(ver_cut 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
+   cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+   llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+   osl player sdl sndfile test tiff valgrind"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   cuda? ( cycles )
+   cycles? ( openexr tiff openimageio )
+   opencl? ( cycles )
+   osl? ( cycles llvm )
+   player? ( game-engine !headless )"
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/boost-1.62:=[nls?,threads(+)]
+   dev-libs/lzo:2
+   >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   media-libs/freetype
+   media-libs/glew:*
+   media-libs/libpng:0=
+   media-libs/libsamplerate
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:0=
+   virtual/libintl
+   virtual/opengl
+   collada? ( >=media-libs/opencollada-1.6.18:= )
+   colorio? ( media-libs/opencolorio )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
+   ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+   libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+   fftw? ( sci-libs/fftw:3.0= )
+   !headless? (
+   x11-libs/libX11
+   x11-libs/libXi
+   x11-libs/libXxf86vm
+   )
+   jack? ( virtual/jack )
+   jemalloc? ( dev-libs/jemalloc:= )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   llvm? ( sys-devel/llvm:= )
+   ndof? (
+   app-misc/spacenavd
+   dev-libs/libspnav
+   )
+   nls? ( virtual/libiconv )
+   openal? ( media-libs/openal )
+   opencl? ( virtual/opencl )
+   openimageio? ( >=media-libs/openimageio-1.7.0 )
+   openexr? (
+   >=media-libs/ilmbase-2.2.0:=
+   >=media-libs/openexr-2.2.0:=
+   )
+   opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
+   openvdb? (
+   media-gfx/openvdb[${PYTHON_USEDEP},-abi3-compat(-)]
+   dev-cpp/tbb
+   >=dev-libs/c-blosc-1.5.2
+   )
+   osl? ( media-libs/osl:= )
+   sdl? ( media-libs/libsdl2[sound,joystick] )
+   sndfile? ( media-libs/libsndfile )
+   tiff? ( media-libs/tiff:0

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2018-01-30 Thread Jonathan Scruggs 
commit: 1f42d5c611fea036935b4a59b2cfbde2863e1c12
Author: Jonathan Scruggs  gentoo  org>
AuthorDate: Mon Jan 29 14:57:36 2018 +
Commit: Jonathan Scruggs  gentoo  org>
CommitDate: Tue Jan 30 18:42:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f42d5c6

media-gfx/blender: add fix to build with osl 1.9

Package-Manager: Portage-2.3.20, Repoman-2.3.6

 media-gfx/blender/blender-2.79-r1.ebuild   | 290 +
 .../blender-2.79-fix-build-with-OSL-1.9.x.patch|  26 ++
 2 files changed, 316 insertions(+)

diff --git a/media-gfx/blender/blender-2.79-r1.ebuild 
b/media-gfx/blender/blender-2.79-r1.ebuild
new file mode 100644
index 000..108783768d0
--- /dev/null
+++ b/media-gfx/blender/blender-2.79-r1.ebuild
@@ -0,0 +1,290 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python{3_5,3_6} )
+
+inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \
+   pax-utils python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org;
+
+SRC_URI="http://download.blender.org/source/${P}.tar.gz;
+
+# Blender can have letters in the version string,
+# so strip of the letter if it exists.
+MY_PV="$(get_version_component_range 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \
+   cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+   llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+   osl player sdl sndfile test tiff valgrind"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   player? ( game-engine !headless )
+   cuda? ( cycles )
+   cycles? ( openexr tiff openimageio )
+   opencl? ( cycles )
+   osl? ( cycles llvm )"
+
+RDEPEND="${PYTHON_DEPS}
+   >=dev-libs/boost-1.62:=[nls?,threads(+)]
+   dev-libs/lzo:2
+   >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   media-libs/freetype
+   media-libs/glew:*
+   media-libs/libpng:0=
+   media-libs/libsamplerate
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:0=
+   virtual/libintl
+   virtual/opengl
+   collada? ( >=media-libs/opencollada-1.6.18:= )
+   colorio? ( media-libs/opencolorio )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
+   ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+   libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+   fftw? ( sci-libs/fftw:3.0= )
+   !headless? (
+   x11-libs/libX11
+   x11-libs/libXi
+   x11-libs/libXxf86vm
+   )
+   jack? ( virtual/jack )
+   jemalloc? ( dev-libs/jemalloc:= )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   llvm? ( sys-devel/llvm:= )
+   ndof? (
+   app-misc/spacenavd
+   dev-libs/libspnav
+   )
+   nls? ( virtual/libiconv )
+   openal? ( media-libs/openal )
+   opencl? ( virtual/opencl )
+   openimageio? ( >=media-libs/openimageio-1.7.0 )
+   openexr? (
+   >=media-libs/ilmbase-2.2.0:=
+   >=media-libs/openexr-2.2.0:=
+   )
+   opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] )
+   openvdb? (
+   
media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)]
+   dev-cpp/tbb
+   >=dev-libs/c-blosc-1.5.2
+   )
+   osl? ( media-libs/osl:= )
+   sdl? ( media-libs/libsdl2[sound,joystick] )
+   sndfile? ( media-libs/libsndfile )
+   tiff? ( media-libs/tiff:0 )
+   valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+   virtual/pkgconfig
+   >=dev-cpp/eigen-3.2.8:3
+   nls? ( sys-devel/gettext )
+   doc? (
+   app-doc/doxygen[-nodot(-),dot(+),latex]
+   dev-python/sphinx[latex]
+   )"
+
+PATCHES=(
+   "${FILESDIR}/${PN}-fix-install-rules.patch"
+   "${FILESDIR}/${P}-fix-build-with-OSL-1.9.x.patch"
+)
+
+blender_check_requirements() {
+   [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+
+   if use doc; then
+   CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+   fi
+}
+
+pkg_pretend() {
+   blender_check_requirements
+}
+
+pkg_setup() {
+   blender_check_requirements
+   python-single-r1_pkg_setup
+}
+
+src_prepare() {
+   cmake-utils_src_prepare
+
+   # we don't want static glew, but it's scattered across
+   # multiple files that differ from version to version
+   # !!!CHECK THIS SED ON EVERY VERSION BUMP!!!
+   local file
+   while IFS="" read -d $'\0' -r file ; do
+   sed -i -e '/-DGLEW_STATIC/d' "${file}" || die
+   done < <(find . -type f -name "CMakeLists.txt")
+
+   # Disable MS Windows help

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2017-12-25 Thread David Seifert 
commit: 11ee236d87324ee51737df4d4f2c36425cdc97e2
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sun Dec 24 18:10:31 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 25 16:09:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ee236d

media-gfx/blender: Remove old versions

 media-gfx/blender/Manifest |   2 -
 media-gfx/blender/blender-2.78-r1.ebuild   | 296 -
 media-gfx/blender/blender-2.78a-r1.ebuild  | 295 
 .../files/blender-2.78-C++11-build-fix.patch   |  11 -
 .../blender/files/blender-2.78-eigen-3.3.1.patch   |  25 --
 5 files changed, 629 deletions(-)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 261c9f70119..aa35aa9dcac 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -1,4 +1,2 @@
 DIST blender-2.72b.tar.gz 52018242 BLAKE2B 
fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9
 SHA512 
9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124
-DIST blender-2.78.tar.gz 44489809 BLAKE2B 
98377ec7db3d1c0f1df12c12061761aba5b2b2000b3ec3738b3a2e7841cff9022f99859fcd410351534a839ae5db1a6883308984b108ee98981b7ee1e46c
 SHA512 
9144ce28377271dafe973b59721da41b6e3954736c705e1540be8dba3124e4c32e5cce5fb3ef7158505d45401478d257720350b38fa8e8649cc35cbd28a2f978
-DIST blender-2.78a.tar.gz 44188123 BLAKE2B 
2e475e4ff4d5b57c739c413d4e09de25af653d7363fe816424c44e478818fbc3a65b0606b17a9bc2a97255866644772ff95f995697334a4fbe4eecb2cf50f2c0
 SHA512 
57239b6ce473aaef114453f97a6e88535ec0a2f50cfecd221fa6bdcca6fe6559dcbefd48c3f20dc2235c195de13c59a1a155d5b64d777be31812d32e68be9370
 DIST blender-2.79.tar.gz 50145270 BLAKE2B 
5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338
 SHA512 
9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f

diff --git a/media-gfx/blender/blender-2.78-r1.ebuild 
b/media-gfx/blender/blender-2.78-r1.ebuild
deleted file mode 100644
index 8fa57249234..000
--- a/media-gfx/blender/blender-2.78-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_5 )
-
-inherit check-reqs cmake-utils fdo-mime flag-o-matic gnome2-utils \
-   pax-utils python-single-r1 toolchain-funcs versionator
-
-DESCRIPTION="3D Creation/Animation/Publishing System"
-HOMEPAGE="http://www.blender.org;
-
-SRC_URI="http://download.blender.org/source/${P}.tar.gz;
-
-# Blender can have letters in the version string,
-# so strip of the letter if it exists.
-MY_PV="$(get_version_component_range 1-2)"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 BL )"
-KEYWORDS="~amd64 ~x86"
-IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \
-   cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
-   llvm man ndof nls openal openimageio openmp opensubdiv openvdb \
-   player sdl sndfile test tiff valgrind"
-
-# OpenCL and nVidia performance is rubbish with Blender
-# If you have nVidia, use CUDA.
-REQUIRED_USE="${PYTHON_REQUIRED_USE}
-   player? ( game-engine !headless )
-   cuda? ( cycles )
-   cycles? ( boost openexr tiff openimageio )
-   colorio? ( boost )
-   openvdb? ( boost )
-   opensubdiv? ( cuda )
-   nls? ( boost )
-   openal? ( boost )
-   game-engine? ( boost )
-   ?? ( ffmpeg libav )"
-
-# Since not using OpenCL with nVidia, depend on ATI binary
-# blobs as Cycles with OpenCL does not work with any open
-# source drivers.
-RDEPEND="${PYTHON_DEPS}
-   dev-libs/lzo:2
-   >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
-   dev-python/requests[${PYTHON_USEDEP}]
-   media-libs/freetype
-   media-libs/glew:*
-   media-libs/libpng:0=
-   media-libs/libsamplerate
-   sys-libs/zlib
-   virtual/glu
-   virtual/jpeg:0=
-   virtual/libintl
-   virtual/opengl
-   boost? ( >=dev-libs/boost-1.62:=[nls?,threads(+)] )
-   collada? ( >=media-libs/opencollada-1.6.18:= )
-   colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
-   cuda? ( dev-util/nvidia-cuda-toolkit:= )
-   ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
-   libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
-   fftw? ( sci-libs/fftw:3.0= )
-   !headless? (
-   x11-libs/libX11
-   x11-libs/libXi
-   x11-libs/libXxf86vm
-   )
-   jack? ( media-sound/jack-audio-connection-kit )
-   jemalloc? ( dev-libs/jemalloc:= )
-   jpeg2k? ( media-libs/openjpeg:0 )
-   llvm? ( sys-devel/llvm )
-   ndof? (
-

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2017-01-15 Thread David Seifert 
commit: b3127967bd21afb9068011688a951c91fda5f54f
Author: Jonathan Scruggs  gmail  com>
AuthorDate: Sun Jan 15 12:00:01 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Jan 15 13:25:23 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3127967

media-gfx/blender: eigen 3.3.1 compile fix and openvdb 4 support

* Added a patch to compile against eigen 3.3.1
* Added compile fix against OpenVDB 4
* OpenVDB 4 hard enables compression, so removed USE Flags and
  hard enable it for OVB 3.2 for future compatibility

Signed-off by: Jonathan Scruggs (j.scruggs  gmail.com)
Closes: https://github.com/gentoo/gentoo/pull/3474

 media-gfx/blender/blender-2.78-r1.ebuild   | 300 +
 media-gfx/blender/blender-2.78a-r1.ebuild  | 299 
 .../blender/files/blender-2.78-eigen-3.3.1.patch   |  25 ++
 media-gfx/blender/metadata.xml |   4 -
 4 files changed, 624 insertions(+), 4 deletions(-)

diff --git a/media-gfx/blender/blender-2.78-r1.ebuild 
b/media-gfx/blender/blender-2.78-r1.ebuild
new file mode 100644
index ..6ee5c38
--- /dev/null
+++ b/media-gfx/blender/blender-2.78-r1.ebuild
@@ -0,0 +1,300 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python3_5 )
+
+inherit check-reqs cmake-utils fdo-mime flag-o-matic gnome2-utils \
+   pax-utils python-single-r1 toolchain-funcs versionator
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org;
+
+SRC_URI="http://download.blender.org/source/${P}.tar.gz;
+
+# Blender can have letters in the version string,
+# so strip of the letter if it exists.
+MY_PV="$(get_version_component_range 1-2)"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \
+   cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \
+   llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \
+   player sdl sndfile test tiff valgrind"
+
+# OpenCL and nVidia performance is rubbish with Blender
+# If you have nVidia, use CUDA.
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   player? ( game-engine !headless )
+   cuda? ( cycles !opencl )
+   cycles? ( boost openexr tiff openimageio )
+   colorio? ( boost )
+   openvdb? ( boost )
+   opensubdiv? ( cuda )
+   nls? ( boost )
+   openal? ( boost )
+   opencl? ( cycles )
+   game-engine? ( boost )
+   ?? ( ffmpeg libav )"
+
+# Since not using OpenCL with nVidia, depend on ATI binary
+# blobs as Cycles with OpenCL does not work with any open
+# source drivers.
+RDEPEND="${PYTHON_DEPS}
+   dev-libs/lzo:2
+   >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   media-libs/freetype
+   media-libs/glew:*
+   media-libs/libpng:0=
+   media-libs/libsamplerate
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:0=
+   virtual/libintl
+   virtual/opengl
+   boost? ( >=dev-libs/boost-1.62:=[nls?,threads(+)] )
+   collada? ( >=media-libs/opencollada-1.6.18:= )
+   colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
+   cuda? ( dev-util/nvidia-cuda-toolkit:= )
+   ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] )
+   libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] )
+   fftw? ( sci-libs/fftw:3.0= )
+   !headless? (
+   x11-libs/libX11
+   x11-libs/libXi
+   x11-libs/libXxf86vm
+   )
+   jack? ( media-sound/jack-audio-connection-kit )
+   jemalloc? ( dev-libs/jemalloc:= )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   llvm? ( sys-devel/llvm )
+   ndof? (
+   app-misc/spacenavd
+   dev-libs/libspnav
+   )
+   nls? ( virtual/libiconv )
+   openal? ( media-libs/openal )
+   openimageio? ( >=media-libs/openimageio-1.6.9 )
+   opencl? ( x11-drivers/ati-drivers:* )
+   openexr? (
+   >=media-libs/ilmbase-2.2.0:=
+   >=media-libs/openexr-2.2.0:=
+   )
+   opensubdiv? ( media-libs/opensubdiv[cuda=,opencl=] )
+   openvdb? (
+   
media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)]
+   dev-cpp/tbb
+   >=dev-libs/c-blosc-1.5.2
+   )
+   sdl? ( media-libs/libsdl2[sound,joystick] )
+   sndfile? ( media-libs/libsndfile )
+   tiff? ( media-libs/tiff:0 )
+   valgrind? ( dev-util/valgrind )"
+
+DEPEND="${RDEPEND}
+   >=dev-cpp/eigen-3.2.8:3
+   nls? ( sys-devel/gettext )
+   doc? (
+   app-doc/doxygen[-nodot(-),dot(+),latex]
+   dev-python/sphinx[latex]
+   )"
+
+PATCHES=( "${FILESDIR}"/${P}-C++11-build-fix.patch
+ "${FILESDIR}"/${PN}-fix-install-rules.patch
+

[gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/

2016-06-16 Thread Amy Winston 
commit: 58ae358937ae0c36da5f1d30cbd1aec644c1b76e
Author: dracwyrm  gmail  com>
AuthorDate: Thu Jun 16 16:06:25 2016 +
Commit: Amy Winston  gentoo  org>
CommitDate: Thu Jun 16 19:59:54 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=58ae3589

media-gfx/blender: bug fixes and update metadata.xml

Gentoo Bugs: 533514, 523928, 585730
Updated metadata.xml with new proxy maintainers
Switched to EAPI 6
Added in doc building hack for binary drivers

 media-gfx/blender/blender-2.72b-r4.ebuild  | 291 +
 media-gfx/blender/files/blender-2.72-T42797.diff   |   4 +-
 .../files/blender-2.72b-fix-util_simd.patch|  10 +
 media-gfx/blender/metadata.xml | 112 
 4 files changed, 364 insertions(+), 53 deletions(-)

diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild 
b/media-gfx/blender/blender-2.72b-r4.ebuild
new file mode 100644
index 000..c0a7e4d
--- /dev/null
+++ b/media-gfx/blender/blender-2.72b-r4.ebuild
@@ -0,0 +1,291 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+## BUNDLED-DEPS:
+# extern/cuew
+# extern/Eigen3
+# extern/xdnd
+# extern/carve
+# extern/glew
+# extern/libmv
+# extern/clew
+# extern/colamd
+# extern/lzma
+# extern/gtest
+# extern/rangetree
+# extern/libredcode
+# extern/wcwidth
+# extern/binreloc
+# extern/recastnavigation
+# extern/bullet2
+# extern/lzo
+# extern/libopenjpeg
+# extern/libmv/third_party/msinttypes
+# extern/libmv/third_party/ceres
+# extern/libmv/third_party/gflags
+# extern/libmv/third_party/glog
+
+EAPI=6
+PYTHON_COMPAT=( python3_4 )
+#PATCHSET="1"
+
+inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 
versionator flag-o-matic toolchain-funcs pax-utils check-reqs
+
+DESCRIPTION="3D Creation/Animation/Publishing System"
+HOMEPAGE="http://www.blender.org;
+
+case ${PV} in
+   *_p*)
+   SRC_URI="https://dev.gentoo.org/~lu_zero/${P}.tar.gz; ;;
+   *)
+   SRC_URI="http://download.blender.org/source/${P}.tar.gz; ;;
+esac
+
+if [[ -n ${PATCHSET} ]]; then
+   SRC_URI+=" 
https://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz;
+fi
+
+SLOT="0"
+LICENSE="|| ( GPL-2 BL )"
+KEYWORDS="~amd64 ~x86"
+IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw 
+game-engine jack jpeg2k libav ndof nls openal openimageio +opennl openmp 
+openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}
+   player? ( game-engine )
+   redcode? ( jpeg2k ffmpeg )
+   cycles? ( boost openexr tiff )
+   nls? ( boost )
+   colorio? ( boost )
+   openal? ( boost )
+   game-engine? ( boost )
+   ?? ( ffmpeg libav )"
+
+RDEPEND="
+   ${PYTHON_DEPS}
+   dev-python/numpy[${PYTHON_USEDEP}]
+   dev-python/requests[${PYTHON_USEDEP}]
+   >=media-libs/freetype-2.0:2
+   media-libs/glew
+   media-libs/libpng:0
+   media-libs/libsamplerate
+   sci-libs/ldl
+   sys-libs/zlib
+   virtual/glu
+   virtual/jpeg:0
+   virtual/libintl
+   virtual/opengl
+   x11-libs/libX11
+   x11-libs/libXi
+   x11-libs/libXxf86vm
+   boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] )
+   collada? ( >=media-libs/opencollada-1.6.18 )
+   colorio? ( >=media-libs/opencolorio-1.0.9-r2 )
+   cycles? (
+   media-libs/openimageio
+   )
+   ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] )
+   libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] )
+   fftw? ( sci-libs/fftw:3.0 )
+   jack? ( media-sound/jack-audio-connection-kit )
+   jpeg2k? ( media-libs/openjpeg:0 )
+   ndof? (
+   app-misc/spacenavd
+   dev-libs/libspnav
+   )
+   nls? ( virtual/libiconv )
+   openal? ( >=media-libs/openal-1.6.372 )
+   openimageio? ( media-libs/openimageio )
+   openexr? ( media-libs/ilmbase media-libs/openexr )
+   sdl? ( media-libs/libsdl[sound,joystick] )
+   sndfile? ( media-libs/libsndfile )
+   tiff? ( media-libs/tiff:0 )"
+DEPEND="${RDEPEND}
+   doc? (
+   app-doc/doxygen[-nodot(-),dot(+)]
+   dev-python/sphinx
+   )
+   nls? ( sys-devel/gettext )"
+
+PATCHES=(
+   "${FILESDIR}"/${PN}-2.68-doxyfile.patch
+   "${FILESDIR}"/${PN}-2.68-fix-install-rules.patch
+   "${FILESDIR}"/${PN}-2.70-sse2.patch
+   "${FILESDIR}"/${PN}-2.72-T42797.diff
+   "${FILESDIR}"/${P}-fix-util_simd.patch
+)
+
+pkg_pretend() {
+   if use openmp && ! tc-has-openmp; then
+   eerror "You are using gcc built without 'openmp' USE."
+   eerror "Switch CXX to an OpenMP capable compiler."
+   die "Need openmp"
+   fi
+
+   if use doc; then
+   CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend
+   fi
+}
+