aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Marz <lmarz@cs.uni-frankfurt.de>2021-02-25 19:02:43 +0100
committerLeo <thinkabit.ukim@gmail.com>2021-02-25 19:12:01 +0000
commitb767a8abe1b4b13b95e76c5741d0d52d90f5ae30 (patch)
tree2ef68e5572f40c96d5cdec7d04bd4040c22cbd95
parent0a066e067a74efcf1eb9ebd6aef0cb5a05fd6c45 (diff)
downloadaports-b767a8abe1b4b13b95e76c5741d0d52d90f5ae30.tar.gz
aports-b767a8abe1b4b13b95e76c5741d0d52d90f5ae30.tar.bz2
aports-b767a8abe1b4b13b95e76c5741d0d52d90f5ae30.tar.xz
testing/blender: upgrade to 2.92.0
-rw-r--r--testing/blender/0001-musl-fixes.patch6
-rw-r--r--testing/blender/0002-fix-linking-issue.patch8
-rw-r--r--testing/blender/0003-increase-thread-stack-size-for-musl.patch4
-rw-r--r--testing/blender/APKBUILD57
4 files changed, 54 insertions, 21 deletions
diff --git a/testing/blender/0001-musl-fixes.patch b/testing/blender/0001-musl-fixes.patch
index 25762ee31f..a2c7f72b34 100644
--- a/testing/blender/0001-musl-fixes.patch
+++ b/testing/blender/0001-musl-fixes.patch
@@ -1,4 +1,4 @@
-From 9153ab7a37603571f4caddea39591410206595e0 Mon Sep 17 00:00:00 2001
+From e530dc5b32695c208aa46bfe460ac7d76159a6d3 Mon Sep 17 00:00:00 2001
From: Leon Marz <lmarz@cs.uni-frankfurt.de>
Date: Wed, 25 Nov 2020 10:10:41 +0100
Subject: [PATCH 1/3] musl fixes
@@ -13,7 +13,7 @@ Original patch by Nathanael Copa
5 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h
-index 8fc3e43..6a9035e 100644
+index aa95615..f7e347d 100644
--- a/intern/guardedalloc/intern/mallocn_intern.h
+++ b/intern/guardedalloc/intern/mallocn_intern.h
@@ -33,7 +33,7 @@
@@ -92,5 +92,5 @@ index 29e12a9..d90da8f 100644
# endif /* defined(__linux__) && defined(__GNUC__) */
# if defined(OSX_SSE_FPE)
--
-2.29.2
+2.30.1
diff --git a/testing/blender/0002-fix-linking-issue.patch b/testing/blender/0002-fix-linking-issue.patch
index fed1d7ef11..552938cb54 100644
--- a/testing/blender/0002-fix-linking-issue.patch
+++ b/testing/blender/0002-fix-linking-issue.patch
@@ -1,4 +1,4 @@
-From 6619c6afaf2f7f98dc81125fc9a35df767282dff Mon Sep 17 00:00:00 2001
+From 54f5929131f537b6cbb74b5a7da45858cef6020b Mon Sep 17 00:00:00 2001
From: Leon Marz <lmarz@cs.uni-frankfurt.de>
Date: Tue, 1 Sep 2020 09:11:18 +0200
Subject: [PATCH 2/3] fix linking issue
@@ -8,10 +8,10 @@ Subject: [PATCH 2/3] fix linking issue
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/intern/ghost/CMakeLists.txt b/intern/ghost/CMakeLists.txt
-index 77e777d..da33241 100644
+index 1739659..d6b442b 100644
--- a/intern/ghost/CMakeLists.txt
+++ b/intern/ghost/CMakeLists.txt
-@@ -466,5 +466,5 @@ if(WITH_XR_OPENXR)
+@@ -484,5 +484,5 @@ if(WITH_XR_OPENXR)
endif()
add_definitions(${GL_DEFINITIONS})
@@ -19,5 +19,5 @@ index 77e777d..da33241 100644
+list(APPEND LIB "-lX11" "-lXi" "-lXxf86vm" "-lXfixes" "-lXrender")
blender_add_lib(bf_intern_ghost "${SRC}" "${INC}" "${INC_SYS}" "${LIB}")
--
-2.29.2
+2.30.1
diff --git a/testing/blender/0003-increase-thread-stack-size-for-musl.patch b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
index 5f3ddbf38b..c09ad05e88 100644
--- a/testing/blender/0003-increase-thread-stack-size-for-musl.patch
+++ b/testing/blender/0003-increase-thread-stack-size-for-musl.patch
@@ -1,4 +1,4 @@
-From aa586696787091ee851c2dc00f76d2b159683c84 Mon Sep 17 00:00:00 2001
+From 3c99b60fddf616268347b3569fea480076c00bef Mon Sep 17 00:00:00 2001
From: Damian Kurek <starfire24680@gmail.com>
Date: Sun, 22 Nov 2020 02:03:11 +0100
Subject: [PATCH 3/3] increase thread stack size for musl
@@ -44,5 +44,5 @@ index 29f9bec..58a63ce 100644
#else
std::thread std_thread;
--
-2.29.2
+2.30.1
diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD
index d795d482b0..e92d505b38 100644
--- a/testing/blender/APKBUILD
+++ b/testing/blender/APKBUILD
@@ -2,20 +2,53 @@
# Contributor: Leon Marz <lmarz@cs.uni-frankfurt.de>
# Maintainer: Mark Riedesel <mark@klowner.com>
pkgname=blender
-pkgver=2.91.2
+pkgver=2.92.0
_pkgver=${pkgver%.[0-9]}
-pkgrel=1
+pkgrel=0
pkgdesc="3D Creation/Animation/Publishing System"
url="https://www.blender.org/"
arch="x86_64" # only on x86_64, mainly because of openvdb
license="GPL-2.0-or-later"
depends="blender-shared=$pkgver-r$pkgrel"
-makedepends="cmake libx11-dev libjpeg-turbo-dev libpng-dev freetype-dev python3-dev
- openimageio-dev opencolorio-dev glew-dev openal-soft-dev ffmpeg-dev blosc-dev
- fftw-dev tiff-dev libxi-dev libsndfile-dev boost-dev openexr-dev py3-numpy-dev
- opensubdiv-dev lzo-dev libxrender-dev openjpeg-dev openxr-dev libtbb-dev libtbb
- llvm10-dev eigen-dev sdl2-dev jack-dev alembic-dev osl-dev osl embree-dev
- embree-static openvdb-dev gmp-dev potrace-dev pugixml-dev"
+makedepends="cmake
+ alembic-dev
+ blosc-dev
+ boost-dev
+ eigen-dev
+ embree-dev
+ embree-static
+ ffmpeg-dev
+ fftw-dev
+ freetype-dev
+ glew-dev
+ gmp-dev
+ jack-dev
+ libjpeg-turbo-dev
+ libpng-dev
+ libsndfile-dev
+ libtbb-dev
+ libx11-dev
+ libxi-dev
+ libxrender-dev
+ llvm10-dev
+ lzo-dev
+ openal-soft-dev
+ opencolorio-dev
+ openexr-dev
+ openimageio-dev
+ openjpeg-dev
+ opensubdiv-dev
+ openvdb-dev
+ openxr-dev
+ osl
+ osl-dev
+ potrace-dev
+ pugixml-dev
+ py3-numpy-dev
+ python3-dev
+ sdl2-dev
+ tiff-dev
+ "
subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless py3-$pkgname:python"
source="https://download.blender.org/source/blender-$pkgver.tar.xz
0001-musl-fixes.patch
@@ -103,7 +136,7 @@ python() {
ln -s /usr/share/blender/"$_pkgver" "$subpkgdir"/usr/lib/python"$_py_version"/site-packages/"$_pkgver"
}
-sha512sums="9a3bae01bd09b1d665af4882f53e8a88d85ff44678233c90788a7801ce0d551a3cc1f71026b71ea1c77d7eaedf7ab6fc8709104c22b564f4fc6cc0d5b3b76f5e blender-2.91.2.tar.xz
-a94245186e126f936f17bc75e4b202b7b9feda00f02b103f274d9d30d68269e86527fe3376dda44d0c3bd27f08b5c4254bfb1ac464e8f871dc3edf5d3e670a5b 0001-musl-fixes.patch
-82ecdf920c2db1b335ce2c6184b852e3e116aaea4d4067e2f5cfa5d32645552dbf4c4619ea195ed3c7e638661745843f32b4da0dcb3bcac959e2f64832eb07c8 0002-fix-linking-issue.patch
-e7d2559eda58bc355c8e8dde57fb3f9c1fdb5cd53e0ececfb81aaa0da9a84f0b271c74fda494cc023af449b2d5e5099b0546c0352739320874b3b01453bfd626 0003-increase-thread-stack-size-for-musl.patch"
+sha512sums="a2116a2b9d86d938c00b50ffdd93e561a29462e589db73361e7e0d43468ae0eb7c09337b832d70e29e0146d5a4ac40a9a20b0c7ca944faddb4187007ccca853f blender-2.92.0.tar.xz
+5c3c46c301cfbf9ba50ce8e2c6d1a96e85389db3fe74ddccf4150a6247312ca4b483c2bc46e540fb84b56c4cc529c4bec12ceb03ed163fd76cfa04c5fd1c748b 0001-musl-fixes.patch
+62dad98f6750d4f145a6b9f15c60d44e571d0b5a09f4ab71e5087b2ce546ba948195d3bdbd322f5da2222b0a89c81418d1ce3f0073aaf4da1e643ffc668b5b2f 0002-fix-linking-issue.patch
+43b793ef26e0ea066c39020762439ad31aaf3d9ccb9e7836dc6f46c6a1ca89f9ba0eefeaa458a7eec5ebd9702170b1682fa1343ad7bd5cf1cc49cc921a297888 0003-increase-thread-stack-size-for-musl.patch"