From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AA287158086 for ; Mon, 8 Nov 2021 11:25:45 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 56A272BC0EA; Mon, 8 Nov 2021 11:25:44 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 187E52BC0E6 for ; Mon, 8 Nov 2021 11:25:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C1A9E342B55 for ; Mon, 8 Nov 2021 11:25:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 45189156 for ; Mon, 8 Nov 2021 11:25:41 +0000 (UTC) From: "Michał Górny" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michał Górny" Message-ID: <1636370720.4a316631991487a4e893b22db1942a296bbda87d.mgorny@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/blender/, media-gfx/blender/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/blender/Manifest media-gfx/blender/blender-2.83.15-r1.ebuild media-gfx/blender/blender-2.83.16-r1.ebuild media-gfx/blender/blender-2.83.17-r1.ebuild media-gfx/blender/files/blender-2.83.13-ffmpeg-4_4.patch media-gfx/blender/files/blender-2.83.6-constraints_test.patch media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch X-VCS-Directories: media-gfx/blender/ media-gfx/blender/files/ X-VCS-Committer: mgorny X-VCS-Committer-Name: Michał Górny X-VCS-Revision: 4a316631991487a4e893b22db1942a296bbda87d X-VCS-Branch: master Date: Mon, 8 Nov 2021 11:25:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 45bb4d51-2cf2-43d9-b89b-b019db137cd9 X-Archives-Hash: d517ffdbb47e66e558e69be4ddeffbae commit: 4a316631991487a4e893b22db1942a296bbda87d Author: Michał Górny gentoo org> AuthorDate: Mon Nov 8 10:57:44 2021 +0000 Commit: Michał Górny gentoo org> CommitDate: Mon Nov 8 11:25:20 2021 +0000 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..00000000000 --- 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} = *9999* ]] ; 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 ) - standalone? ( cycles ) - test? ( color-management osl )" - -# Library versions for official builds can be found in the blender source directory in: -# build_files/build_environment/install_deps.sh -RDEPEND="${PYTHON_DEPS} - dev-libs/boost:=[nls?,threads(+)] - dev-libs/lzo:2= - $(python_gen_cond_dep ' - dev-python/numpy[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - ') - 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/openimageio-2.2.13.1:= ) - openexr? ( - media-libs/ilmbase:= - media-libs/openexr:= - ) - opensubdiv? ( >=media-libs/opensubdiv-3.4.0[cuda=,opencl=] ) - openvdb? ( - >=media-gfx/openvdb-7.0.0 - dev-libs/c-blosc:= - ) - osl? ( -Date: Fri, 7 May 2021 16:51:28 +0200 -Subject: [PATCH] Fix: No sound is exported with ffmpeg 4.4 - -We were not assigning the amount of sound channels to the output frames. -Newer ffmpeg releases has sanity checks in place and doesn't fall back -to two channels anymore. ---- - source/blender/blenkernel/intern/writeffmpeg.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c -index 7fc9e8cc0ef..e5550cee124 100644 ---- a/source/blender/blenkernel/intern/writeffmpeg.c -+++ b/source/blender/blenkernel/intern/writeffmpeg.c -@@ -164,6 +164,7 @@ static int write_audio_frame(FFMpegContext *context) - frame->pts = context->audio_time / av_q2d(c->time_base); - frame->nb_samples = context->audio_input_samples; - frame->format = c->sample_fmt; -+ frame->channels = c->channels; - # ifdef FFMPEG_HAVE_FRAME_CHANNEL_LAYOUT - frame->channel_layout = c->channel_layout; - # endif --- -2.26.3 - diff --git a/media-gfx/blender/files/blender-2.83.6-constraints_test.patch b/media-gfx/blender/files/blender-2.83.6-constraints_test.patch deleted file mode 100644 index ab1e9a6d2d4..00000000000 --- a/media-gfx/blender/files/blender-2.83.6-constraints_test.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/tests/python/bl_constraints.py b/tests/python/bl_constraints.py -index 323dd874ac0..7cbc46d680a 100644 ---- a/tests/python/bl_constraints.py -+++ b/tests/python/bl_constraints.py -@@ -44,7 +44,7 @@ class AbstractConstraintTests(unittest.TestCase): - collection = top_collection.children[self.layer_collection] - collection.exclude = False - -- def assert_matrix(self, actual_matrix, expect_matrix, object_name: str, places=6, delta=None): -+ def assert_matrix(self, actual_matrix, expect_matrix, object_name: str, places=None, delta=1e-6): - """Asserts that the matrices almost equal.""" - self.assertEqual(len(actual_matrix), 4, 'Expected a 4x4 matrix') - diff --git a/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch b/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch deleted file mode 100644 index b7537f97fc0..00000000000 --- a/media-gfx/blender/files/blender-2.83.6-fix_opevdb_abi.patch +++ /dev/null @@ -1,21 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1552,7 +1552,7 @@ - CMAKE_C_COMPILER_ID MATCHES "Intel" - ) - # TODO(sergey): Do we want c++11 or gnu-c++11 here? -- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") -+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++14") - else() - message(FATAL_ERROR "Unknown compiler ${CMAKE_C_COMPILER_ID}, can't enable C++11 build") - endif() ---- a/extern/mantaflow/CMakeLists.txt -+++ b/extern/mantaflow/CMakeLists.txt -@@ -51,7 +51,6 @@ - - if(WITH_OPENVDB) - add_definitions(-DOPENVDB=1) -- add_definitions(-DOPENVDB_STATICLIB) - endif() - - if(WIN32 diff --git a/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch b/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch deleted file mode 100644 index 1392510a23a..00000000000 --- a/media-gfx/blender/files/blender-2.83.6-libmv_eigen_alignment.patch +++ /dev/null @@ -1,219 +0,0 @@ -diff --git a/intern/libmv/libmv/base/vector.h b/intern/libmv/libmv/base/vector.h -index bdc4392155c..300291c5679 100644 ---- a/intern/libmv/libmv/base/vector.h -+++ b/intern/libmv/libmv/base/vector.h -@@ -25,151 +25,18 @@ - #ifndef LIBMV_BASE_VECTOR_H - #define LIBMV_BASE_VECTOR_H - --#include --#include -+#include - - #include - - namespace libmv { - --// A simple container class, which guarantees 16 byte alignment needed for most --// vectorization. Don't use this container for classes that cannot be copied --// via memcpy. --// FIXME: this class has some issues: --// - doesn't support iterators. --// - impede compatibility with code using STL. --// - the STL already provide support for custom allocators --// it could be replaced with a simple --// template class vector : std::vector {} declaration --// provided it doesn't break code relying on libmv::vector specific behavior --template > --class vector { -- public: -- ~vector() { clear(); } -+// A simple container class, which guarantees the correct memory alignment -+// needed for most eigen vectorization. Don't use this container for classes -+// that cannot be copied via memcpy. - -- vector() { init(); } -- vector(int size) { init(); resize(size); } -- vector(int size, const T & val) { -- init(); -- resize(size); -- std::fill(data_, data_+size_, val); } -- -- // Copy constructor and assignment. -- vector(const vector &rhs) { -- init(); -- copy(rhs); -- } -- vector &operator=(const vector &rhs) { -- if (&rhs != this) { -- copy(rhs); -- } -- return *this; -- } -- -- /// Swaps the contents of two vectors in constant time. -- void swap(vector &other) { -- std::swap(allocator_, other.allocator_); -- std::swap(size_, other.size_); -- std::swap(capacity_, other.capacity_); -- std::swap(data_, other.data_); -- } -- -- T *data() const { return data_; } -- int size() const { return size_; } -- int capacity() const { return capacity_; } -- const T& back() const { return data_[size_ - 1]; } -- T& back() { return data_[size_ - 1]; } -- const T& front() const { return data_[0]; } -- T& front() { return data_[0]; } -- const T& operator[](int n) const { return data_[n]; } -- T& operator[](int n) { return data_[n]; } -- const T& at(int n) const { return data_[n]; } -- T& at(int n) { return data_[n]; } -- const T * begin() const { return data_; } -- const T * end() const { return data_+size_; } -- T * begin() { return data_; } -- T * end() { return data_+size_; } -- -- void resize(size_t size) { -- reserve(size); -- if (size > size_) { -- construct(size_, size); -- } else if (size < size_) { -- destruct(size, size_); -- } -- size_ = size; -- } -- -- void push_back(const T &value) { -- if (size_ == capacity_) { -- reserve(size_ ? 2 * size_ : 1); -- } -- new (&data_[size_++]) T(value); -- } -- -- void pop_back() { -- resize(size_ - 1); -- } -- -- void clear() { -- destruct(0, size_); -- deallocate(); -- init(); -- } -- -- void reserve(unsigned int size) { -- if (size > size_) { -- T *data = static_cast(allocate(size)); -- memcpy(static_cast(data), data_, sizeof(*data)*size_); -- allocator_.deallocate(data_, capacity_); -- data_ = data; -- capacity_ = size; -- } -- } -- -- bool empty() { -- return size_ == 0; -- } -- -- private: -- void construct(int start, int end) { -- for (int i = start; i < end; ++i) { -- new (&data_[i]) T; -- } -- } -- void destruct(int start, int end) { -- for (int i = start; i < end; ++i) { -- data_[i].~T(); -- } -- } -- void init() { -- size_ = 0; -- data_ = 0; -- capacity_ = 0; -- } -- -- void *allocate(int size) { -- return size ? allocator_.allocate(size) : 0; -- } -- -- void deallocate() { -- allocator_.deallocate(data_, size_); -- data_ = 0; -- } -- -- void copy(const vector &rhs) { -- resize(rhs.size()); -- for (int i = 0; i < rhs.size(); ++i) { -- (*this)[i] = rhs[i]; -- } -- } -- -- Allocator allocator_; -- size_t size_; -- size_t capacity_; -- T *data_; --}; -+template -+using vector = std::vector>; - - } // namespace libmv - -diff --git a/intern/libmv/libmv/base/vector_test.cc b/intern/libmv/libmv/base/vector_test.cc -index f17718c3926..44b9a152148 100644 ---- a/intern/libmv/libmv/base/vector_test.cc -+++ b/intern/libmv/libmv/base/vector_test.cc -@@ -115,31 +115,24 @@ TEST_F(VectorTest, ResizeConstructsAndDestructsAsExpected) { - // Create one object. - v.resize(1); - EXPECT_EQ(1, v.size()); -- EXPECT_EQ(1, v.capacity()); - EXPECT_EQ(1, foo_construct_calls); -- EXPECT_EQ(0, foo_destruct_calls); - EXPECT_EQ(5, v[0].value); - - // Create two more. - v.resize(3); - EXPECT_EQ(3, v.size()); -- EXPECT_EQ(3, v.capacity()); - EXPECT_EQ(3, foo_construct_calls); -- EXPECT_EQ(0, foo_destruct_calls); - - // Delete the last one. - v.resize(2); - EXPECT_EQ(2, v.size()); - EXPECT_EQ(3, v.capacity()); - EXPECT_EQ(3, foo_construct_calls); -- EXPECT_EQ(1, foo_destruct_calls); - - // Delete the remaining two. - v.resize(0); - EXPECT_EQ(0, v.size()); -- EXPECT_EQ(3, v.capacity()); - EXPECT_EQ(3, foo_construct_calls); -- EXPECT_EQ(3, foo_destruct_calls); - } - - TEST_F(VectorTest, PushPopBack) { -@@ -192,15 +185,15 @@ TEST_F(VectorTest, STLFind) { - a.push_back(5); - a.push_back(3); - -- // Find return an int * -+ // Find returns an int * - EXPECT_EQ(std::find(&a[0], &a[2], 1) == &a[0], true); - EXPECT_EQ(std::find(&a[0], &a[2], 5) == &a[1], true); - EXPECT_EQ(std::find(&a[0], &a[2], 3) == &a[2], true); - -- // Find return a const int * -- EXPECT_EQ(std::find(a.begin(), a.end(), 1) == &a[0], true); -- EXPECT_EQ(std::find(a.begin(), a.end(), 5) == &a[1], true); -- EXPECT_EQ(std::find(a.begin(), a.end(), 3) == &a[2], true); -+ // Find returns an interator -+ EXPECT_EQ(std::find(a.begin(), a.end(), 1) == std::next(a.begin(), 0), true); -+ EXPECT_EQ(std::find(a.begin(), a.end(), 5) == std::next(a.begin(), 1), true); -+ EXPECT_EQ(std::find(a.begin(), a.end(), 3) == std::next(a.begin(), 2), true); - - // Search value that are not in the vector - EXPECT_EQ(std::find(a.begin(), a.end(), 0) == a.end(), true);