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

[Sam James]

commit:     682acf3bd5806be9c459e74d4d1dbe9d56a3b9e7
Author:     Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 14 18:51:11 2022 +0000
Commit:     Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 18:51:11 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=682acf3b

media-gfx/blender: use devspace for patch

Signed-off-by: Sam James <sam <AT> gentoo.org>

 media-gfx/blender/Manifest                 | 1 +
 media-gfx/blender/blender-2.93.8-r5.ebuild | 4 +++-
 media-gfx/blender/blender-3.0.1-r5.ebuild  | 4 +++-
 3 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest
index 01cbb2cd7716..1101bc01e18b 100644
--- a/media-gfx/blender/Manifest
+++ b/media-gfx/blender/Manifest
@@ -4,6 +4,7 @@ DIST blender-2.93.6.tar.xz 43031980 BLAKE2B 
235b9a08d9eb4ba83c30a4de333cc5b56eef
 DIST blender-2.93.8.tar.xz 43024356 BLAKE2B 
f69edf2bff0e97897d03b123516a66037fc690f518801dbb5f6851aa743c768bb1a56df2cc3e036d8fbae4ca3cfca295f34c7ae33dd37f0e16513c56f5d46572
 SHA512 
75213907ef7969f30468ce959a1da9287334b6f8b6edbf4b65e02d57a8b306fad6f86646d088eee8fd6f53f3e7511554b9a963f7a15527b17c3353db24f58249
 DIST blender-3.0.0-tests.tar.bz2 302064577 BLAKE2B 
c86a47231bb704124fe5ed59963176ca45ccc7e92bf8b00ce31d432cf6e35b9593ddb0d71f56aab0af6d1922f08eb158f9b7e355b5323d715b2b075ceafe9294
 SHA512 
e343f5da88aa7d2bc2a0758c01d3849b61c6ff3a0d65ac4d967aa02b701a5a02bfc8e7ed92b8f67af37e08f138987de8a27b8c7faa3cd8cfc3535adb8c624506
 DIST blender-3.0.0.tar.xz 40169212 BLAKE2B 
0dd8327cb92d1d5b00ede020fa2fe07fc3f4d02b249e0ed528c330d6423ce28c731055bc623cffa66f2824c3ae667b5b84be2d6c5e2b01baf490468c4b6f42a2
 SHA512 
727d722e7b750b77b0fe691605a84de58baf15a3cc01af267be0440bd0879772e14dbdfdb16209023df3c28b94d8009b0c389915097cdb0b49bdf42c8de1ef21
+DIST blender-3.0.1-ffmpeg-5.0.patch.bz2 8198 BLAKE2B 
2acb1e441bd17cf2d972f981358981d42742ad37656366a52b0adb52efb3f1a6cda0479e1c79d9327b51c8fd3d2c6cb291552adc7716e6a1938ac27b237186b9
 SHA512 
c09ca2d5a5b99652abcae827965304506e354fc6fc4d6d59c9433c8246e865a0622ddac3118009ad433292690212292a86f7e43e764583525555ca6d653da809
 DIST blender-3.0.1.tar.xz 40155604 BLAKE2B 
b611f08617f1be217604e87cfafe88f6cc9904ed6321a74bea4ee5ad14f3cf4002b12d82fa3b3c6111a681fd7e1c530f66be28c506973ff7722175a9036a19da
 SHA512 
b9af6d49201eb26ec77a3cecdb9c0945ffc915d4eecaaa36091365340244bfd1565a7679c8b7a81d3335383f158dc01339ea8edc108730835d81db1de84049bf
 DIST blender-3.1.0-tests.tar.bz2 643279044 BLAKE2B 
acbf0800c384f881c215ea22140b02e8e61c7395eb35fdb76fad3c785c565ecfc6c59d74848bdd3f9f9b762f86328f6b60cb7871e6ef4615db1ef03f2749b655
 SHA512 
9fd202c582576d170c29c8adbc9bc4a62b6d67a4a1500f6980201e3d904f4a4a15e5680530663382c34672bd634543dd330c5f75523cf0058928a549ff4a0782
 DIST blender-3.1.0.tar.xz 41017620 BLAKE2B 
f626266a41f9d72b03690fe8d7fe1f183ffdef01501ff6a458e5760eea66c959ca297d70dc541b27aa85466a7b8d65306e293c84487c1ff1467cd31cfdba0203
 SHA512 
354d4e7c92233e610d0e938c10d966aff7ee34fd21993b65b645b4d01e37f90f741206190817a7ab6932c5321d698827a09ec0e1d966c28596d130b4af2ce6bb

diff --git a/media-gfx/blender/blender-2.93.8-r5.ebuild 
b/media-gfx/blender/blender-2.93.8-r5.ebuild
index 0c4998e2e4c2..7112d2413a97 100644
--- a/media-gfx/blender/blender-2.93.8-r5.ebuild
+++ b/media-gfx/blender/blender-2.93.8-r5.ebuild
@@ -16,6 +16,8 @@ if [[ ${PV} = *9999* ]] ; 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";
+
        TEST_TARBALL_VERSION=2.93.0
        SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
 )"
        KEYWORDS="amd64 ~arm ~arm64"
@@ -127,7 +129,7 @@ PATCHES=(
        
"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
        "${FILESDIR}"/${PN}-3.0.1-openexr.patch
        "${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
-       "${FILESDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
+       "${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
 )
 
 blender_check_requirements() {

diff --git a/media-gfx/blender/blender-3.0.1-r5.ebuild 
b/media-gfx/blender/blender-3.0.1-r5.ebuild
index 4e86970281c1..5f9da3900d6d 100644
--- a/media-gfx/blender/blender-3.0.1-r5.ebuild
+++ b/media-gfx/blender/blender-3.0.1-r5.ebuild
@@ -16,6 +16,8 @@ if [[ ${PV} = *9999* ]] ; 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";
+
        # Update these between major releases.
        TEST_TARBALL_VERSION="3.0.0"
        SRC_URI+=" test? ( 
https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-${TEST_TARBALL_VERSION}-tests.tar.bz2
 )"
@@ -127,7 +129,7 @@ PATCHES=(
        
"${FILESDIR}"/${PN}-3.0.0-intern-ghost-fix-typo-in-finding-XF86VMODE.patch
        "${FILESDIR}"/${PN}-3.0.1-openexr.patch
        "${FILESDIR}"/${PN}-3.0.1-openimageio-2.3.patch
-       "${FILESDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
+       "${WORKDIR}"/${PN}-3.0.1-ffmpeg-5.0.patch
 )
 
 blender_check_requirements() {