Updated.

brothermechanic · Apr 21, 2024 · 5a3b00c · 5a3b00c
1 parent 3eabf42
commit 5a3b00c
Show file tree

Hide file tree

Showing 10 changed files with 2,173 additions and 10 deletions.
diff --git a/media-gfx/blender/blender-4.1.0.ebuild → media-gfx/blender/blender-4.1.1.ebuild b/media-gfx/blender/blender-4.1.0.ebuild → media-gfx/blender/blender-4.1.1.ebuild
diff --git a/media-gfx/blender/blender-9999.ebuild b/media-gfx/blender/blender-9999.ebuild
@@ -17,7 +17,8 @@ EGIT_REPO_URI_LIST="https://projects.blender.org/blender/blender-addons.git http
 EGIT_SUBMODULES=()
 if [[ ${PV} == 9999 ]]; then
 	EGIT_BRANCH="main"
-	EGIT_COMMIT="8f09fffef7a2fad67c8111b31c9bd0206657f26c"
+	EGIT_COMMIT="463a4c6211e5df2fa7e2a9a9ca8347262266c44e"
+	#EGIT_COMMIT="8f09fffef7a2fad67c8111b31c9bd0206657f26c"
 	#EGIT_CLONE_TYPE="shallow"
 	MY_PV="4.2"
 	KEYWORDS=""
@@ -212,7 +213,7 @@ RDEPEND="
 		>=media-libs/materialx-1.38.8[${PYTHON_SINGLE_USEDEP},python]
 	)
 	nls? ( virtual/libiconv )
-	media-libs/audaspace:=[python,openal?,sdl?,pulseaudio?]
+	>=media-libs/audaspace-1.5.0:=[python,openal?,sdl?,pulseaudio?]
 	oneapi? (
 		sys-devel/DPC++
 	)
@@ -573,6 +574,7 @@ src_configure() {
 		-DWITH_HARU=$(usex pdf)									# export format support
 		-DWITH_IO_GPENCIL=$(usex pdf)							# export format support
 		-DWITH_INSTALL_PORTABLE=$(usex portable)
+		-DWITH_CPU_CHECK=$(usex portable)
 		-DWITH_IMAGE_CINEON=$(usex dpx)
 		-DWITH_IMAGE_OPENEXR=$(usex openexr)
 		-DWITH_IMAGE_OPENJPEG=$(usex jpeg2k)

diff --git a/media-gfx/blender/files/4.2/blender-fix-clang-build.patch b/media-gfx/blender/files/4.2/blender-fix-clang-build.patch
@@ -3,7 +3,7 @@
 @@ -54,37 +54,7 @@ find_path(CLANG_INCLUDE_DIR
 
 
- set(_CLANG_FIND_COMPONENTS
+ set(_clang_FIND_COMPONENTS
 -  clangDependencyScanning
 -  clangDynamicASTMatchers
 -  clangFrontendTool
@@ -38,4 +38,4 @@
 +  clang-cpp
  )
 
- set(_CLANG_LIBRARIES)
+ set(_clang_LIBRARIES)
diff --git a/media-libs/audaspace/Manifest b/media-libs/audaspace/Manifest
@@ -1 +1 @@
-DIST audaspace-1.4.0_p20230525.tar.gz 2228389 BLAKE2B c91392aedad7fa790faf26214ebdb259bd58e9fc0c7df4ca2e2280a9950422fd0b6c3cd9817204fc6bbc8032c3b1a88f4153cfb6e990412d9dfa1e3d7c269e01 SHA512 93f76b26f4e1661e401897f7b72e09c0a8b93c9d190a2f68b2c6034d078b52753e61abf55bcf8962bd36c265f0a8034c80e9a879bc6300667e1633b4f1bdf313
+DIST audaspace-1.5.0.tar.gz 2396492 BLAKE2B 7fae3f864675af38d3ec6402be2f6d08d9458ca0d4d27151b51a4fb556cde089a5892f5a66cd193b99b620826ee3ac5af33a10e7925971036cf893fd06f64349 SHA512 9c463c2ddfc2de10537590d678bcdee09e15f3f3ca386aebe8eb0a9f7bd9249b7a8cab51aabc9fd8fc640842bb78ae1ad229521144c3796894f0205217b23479
diff --git a/...udaspace/audaspace-1.4.0_p20230525.ebuild → media-libs/audaspace/audaspace-1.5.0.ebuild b/...udaspace/audaspace-1.4.0_p20230525.ebuild → media-libs/audaspace/audaspace-1.5.0.ebuild
diff --git a/media-libs/audaspace/audaspace-9999.ebuild b/media-libs/audaspace/audaspace-9999.ebuild
@@ -21,9 +21,9 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_SUBMODULES=()
 	KEYWORDS=""
 else
-	COMMIT="04eeb56b359a5099fb9d5c132988d8422629bdfc"
-	SRC_URI="https://github.com/neXyon/audaspace/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${COMMIT}
+	#COMMIT="04eeb56b359a5099fb9d5c132988d8422629bdfc"
+	SRC_URI="https://github.com/neXyon/audaspace/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	#S=${WORKDIR}/${PN}-${COMMIT}
 	KEYWORDS="~amd64 ~x86 ~arm64 ~arm"
 fi
 

diff --git a/media-libs/openusd/Manifest b/media-libs/openusd/Manifest
@@ -1,2 +1,2 @@
 DIST openusd-23.11.tar.gz 108149632 BLAKE2B d44a8cfb52f729bb31c8d2c1d3417865cf8640f790f9003e4fd089a7fbc1593f97d6096216659a32fdb13fc2a6a1578bb10d6d2460f98d5476e419785499a300 SHA512 a6f718c8c227cabcc467de80bd5197470bcf335aaf1738e49e37d8d0fa4b47a0c0d9dc1518032de8c603e3ef303d22f9960504caeede4c5053ab1d3c84987304
-DIST openusd.svg 560 BLAKE2B 27d269afae0eb856837dcbf79868e6ebf361285fe1790c13ea643a02472dafdee234e28669a55a517679c042ac20768b279b49561a1890475b77c596536ae759 SHA512 68ac4457a249ea20d5ecc5b9d090f95865ed0de557cd4b651507990738458454b96c5b15751fcee9e386fee871ca918f9d1fed4014004c3381902ba71e92dfbb
+DIST openusd-24.05.tar.gz 125139666 BLAKE2B db5bf738452f33e265309eacf547b4fc0ceb5b2e72b31d8e99bea3b9476d8ddba1e190c03e9642842e04805a03578a4971207f02c1280603a464270329095be6 SHA512 e510f6421caba5e74c6efe5b56b17e9c9741ece0cfd5020148ca89b3ac32bd8781ab00dfc7a134163c85af3f4f01f2529a9baa5a9df9b0c80cbca003e6d199e2
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		DIST audaspace-1.4.0_p20230525.tar.gz 2228389 BLAKE2B c91392aedad7fa790faf26214ebdb259bd58e9fc0c7df4ca2e2280a9950422fd0b6c3cd9817204fc6bbc8032c3b1a88f4153cfb6e990412d9dfa1e3d7c269e01 SHA512 93f76b26f4e1661e401897f7b72e09c0a8b93c9d190a2f68b2c6034d078b52753e61abf55bcf8962bd36c265f0a8034c80e9a879bc6300667e1633b4f1bdf313
		DIST audaspace-1.5.0.tar.gz 2396492 BLAKE2B 7fae3f864675af38d3ec6402be2f6d08d9458ca0d4d27151b51a4fb556cde089a5892f5a66cd193b99b620826ee3ac5af33a10e7925971036cf893fd06f64349 SHA512 9c463c2ddfc2de10537590d678bcdee09e15f3f3ca386aebe8eb0a9f7bd9249b7a8cab51aabc9fd8fc640842bb78ae1ad229521144c3796894f0205217b23479