From e0989597bde64968f5f4cf84ec1204102fae5c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timo=20Ter=C3=A4s?= Date: Tue, 7 Feb 2017 14:51:54 +0000 Subject: testing/blender: upgrade to 2.78a, minor improvements --- testing/blender/APKBUILD | 26 +++++------- testing/blender/blender-2.77a-musl.patch | 72 -------------------------------- testing/blender/blender-2.78a-musl.patch | 67 +++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+), 87 deletions(-) delete mode 100644 testing/blender/blender-2.77a-musl.patch create mode 100644 testing/blender/blender-2.78a-musl.patch (limited to 'testing') diff --git a/testing/blender/APKBUILD b/testing/blender/APKBUILD index eff8b5ac03..3897914870 100644 --- a/testing/blender/APKBUILD +++ b/testing/blender/APKBUILD @@ -1,7 +1,8 @@ # Contributor: Mark Riedesel # Maintainer: Mark Riedesel pkgname=blender -pkgver=2.77a +pkgver=2.78a +_pkgver=${pkgver/[a-z]} pkgrel=0 pkgdesc="3D Creation/Animation/Publishing System" url="http://www.blender.org/" @@ -13,9 +14,9 @@ makedepends="cmake libx11-dev jpeg-dev zlib-dev libpng-dev freetype-dev python3- fftw-dev tiff-dev mesa-dev libxi-dev libsndfile-dev libxmu-dev boost-dev openexr-dev py-numpy-dev opensubdiv-dev" install="" -subpackages="$pkgname-doc $pkgname-shared $pkgname-headless $pkgname-player py3-$pkgname:python" +subpackages="$pkgname-doc $pkgname-shared::noarch $pkgname-headless $pkgname-player py3-$pkgname:python" source="http://download.blender.org/source/${pkgname}-${pkgver}.tar.gz - blender-2.77a-musl.patch" + blender-2.78a-musl.patch" builddir="$srcdir"/$pkgname-$pkgver @@ -60,9 +61,6 @@ _build() { package() { - local PY_VERSION=$(python3 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))') - local VERSION=$(echo $pkgver | grep -o '[0-9]+\.[0-9]+') - # Install headless files cd "$builddir"/build-headless make DESTDIR="$pkgdir"/headless install || return 1 @@ -83,7 +81,6 @@ package() { shared() { pkgdesc="Blender shared runtime data and add-on scripts" - arch="noarch" mkdir -p "$subpkgdir"/usr/share/ mv "$pkgdir"/usr/share/blender "$subpkgdir"/usr/share/ } @@ -103,7 +100,6 @@ player() { python() { local PY_VERSION=$(python3 -c 'import sys; print("%i.%i" % (sys.version_info.major, sys.version_info.minor))') - local VERSION=$(echo $pkgver | grep -o '[0-9]*\.[0-9]*') pkgdesc="Blender modules for Python 3" mkdir -p "$subpkgdir"/usr/lib/python${PY_VERSION}/site-packages @@ -111,12 +107,12 @@ python() { rm -rf "$pkgdir"/usr/lib # Symlink to the blender-shared files - ln -s /usr/share/blender/${VERSION} "$subpkgdir"/usr/lib/python${PY_VERSION}/site-packages/${VERSION} + ln -s /usr/share/blender/${_pkgver} "$subpkgdir"/usr/lib/python${PY_VERSION}/site-packages/${_pkgver} } -md5sums="bb192274fe5957ce62bce9f0557ea4b4 blender-2.77a.tar.gz -93bda85f6a3c0c587ee7790b7d35e4cc blender-2.77a-musl.patch" -sha256sums="3770fa00f50a6654eb8b5fe625ca8942ab5672ac4685b7af24597251ace85c67 blender-2.77a.tar.gz -f536a69354bd1a4b482a6150542d528a92a0107ff639832500f7dc28c64360ec blender-2.77a-musl.patch" -sha512sums="4f8223a3786b80fa613ace27bea9349309b5857bcc1fafdb7d769f6192d5cb455ce4faf60920d7a1c2cb82ef8c40a10b25a760748b305c16c550657cf1e4df93 blender-2.77a.tar.gz -6ecf4a6a9b56f045c9d14093ae13c6cb714ce8dff2212a08830edcf540ec47f143c2670e197a97ca42f380a60825abab4e7b3d7dbc88c44265fae7f83f2cd602 blender-2.77a-musl.patch" +md5sums="8f75b9d7c8507c563bda882c4f73c2d2 blender-2.78a.tar.gz +3b31965a3dc3addfacddd0ae7b10a63b blender-2.78a-musl.patch" +sha256sums="014a14b1ba00c0e651f106469b2e5dd444f11be5a7af48056f0ed59de90cceaf blender-2.78a.tar.gz +2f40e664f04c8f40a38e65ac546643c289c146a43053d585c59f9fb3f241965b blender-2.78a-musl.patch" +sha512sums="57239b6ce473aaef114453f97a6e88535ec0a2f50cfecd221fa6bdcca6fe6559dcbefd48c3f20dc2235c195de13c59a1a155d5b64d777be31812d32e68be9370 blender-2.78a.tar.gz +47e8a6a017cea8c004d7e4205f201f167dd81ba95a4aadf9e55d01e81cc4a23e4d7f1d6aa7a6d1300fe3a5f5c98c664f584e7551fcde7fb1137147e2438f7ed5 blender-2.78a-musl.patch" diff --git a/testing/blender/blender-2.77a-musl.patch b/testing/blender/blender-2.77a-musl.patch deleted file mode 100644 index 38b78f42d6..0000000000 --- a/testing/blender/blender-2.77a-musl.patch +++ /dev/null @@ -1,72 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1efaa14..20a75a1 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1220,6 +1220,19 @@ if(UNIX AND NOT APPLE) - set(PLATFORM_LINKFLAGS "${PLATFORM_LINKFLAGS} -static-intel") - endif() - -+ # musl-libc related checks (missing execinfo.h, and feenableexcept()) -+ include(CheckIncludeFiles) -+ check_include_files(execinfo.h HAVE_EXECINFO_H) -+ if (HAVE_EXECINFO_H) -+ add_definitions(-DHAVE_EXECINFO_H) -+ endif() -+ -+ include(CheckLibraryExists) -+ check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT) -+ if (HAVE_FEENABLEEXCEPT) -+ add_definitions(-DHAVE_FEENABLEEXCEPT) -+ endif() -+ - elseif(WIN32) - - add_definitions(-DWIN32) -diff --git a/intern/guardedalloc/intern/mallocn_intern.h b/intern/guardedalloc/intern/mallocn_intern.h -index 3f7e462..4fb49f3 100644 ---- a/intern/guardedalloc/intern/mallocn_intern.h -+++ b/intern/guardedalloc/intern/mallocn_intern.h -@@ -52,7 +52,7 @@ - #undef HAVE_MALLOC_STATS - #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ - --#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__) -+#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__) - # include - # define HAVE_MALLOC_STATS - #elif defined(__FreeBSD__) -diff --git a/source/blender/blenlib/intern/system.c b/source/blender/blenlib/intern/system.c -index 5d1bdd6..b1c004f 100644 ---- a/source/blender/blenlib/intern/system.c -+++ b/source/blender/blenlib/intern/system.c -@@ -30,7 +30,7 @@ - #include "MEM_guardedalloc.h" - - /* for backtrace */ --#if defined(__linux__) || defined(__APPLE__) -+#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__) - # include - #elif defined(WIN32) - # include -@@ -76,7 +76,7 @@ void BLI_system_backtrace(FILE *fp) - { - /* ------------- */ - /* Linux / Apple */ --#if defined(__linux__) || defined(__APPLE__) -+#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__) - - #define SIZE 100 - void *buffer[SIZE]; -diff --git a/source/creator/creator.c b/source/creator/creator.c -index bf8347d..1dabe60 100644 ---- a/source/creator/creator.c -+++ b/source/creator/creator.c -@@ -618,7 +618,7 @@ static int set_fpe(int UNUSED(argc), const char **UNUSED(argv), void *UNUSED(dat - * set breakpoints on fpe_handler */ - signal(SIGFPE, fpe_handler); - --# if defined(__linux__) && defined(__GNUC__) -+# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT) - feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); - # endif /* defined(__linux__) && defined(__GNUC__) */ - # if defined(OSX_SSE_FPE) diff --git a/testing/blender/blender-2.78a-musl.patch b/testing/blender/blender-2.78a-musl.patch new file mode 100644 index 0000000000..1ffd09cd57 --- /dev/null +++ b/testing/blender/blender-2.78a-musl.patch @@ -0,0 +1,67 @@ +diff -ru blender-2.78.orig/CMakeLists.txt blender-2.78a/CMakeLists.txt +--- blender-2.78.orig/CMakeLists.txt 2016-10-25 12:09:56.000000000 +0000 ++++ blender-2.78a/CMakeLists.txt 2017-02-07 14:50:03.967828817 +0000 +@@ -181,6 +181,18 @@ + set(_init_SDL OFF) + set(_init_FFTW3 OFF) + set(_init_OPENSUBDIV OFF) ++ # musl-libc related checks (missing execinfo.h, and feenableexcept()) ++ include(CheckIncludeFiles) ++ check_include_files(execinfo.h HAVE_EXECINFO_H) ++ if (HAVE_EXECINFO_H) ++ add_definitions(-DHAVE_EXECINFO_H) ++ endif() ++ ++ include(CheckLibraryExists) ++ check_library_exists(m feenableexcept "fenv.h" HAVE_FEENABLEEXCEPT) ++ if (HAVE_FEENABLEEXCEPT) ++ add_definitions(-DHAVE_FEENABLEEXCEPT) ++ endif() + elseif(WIN32) + set(_init_JACK OFF) + elseif(APPLE) +diff -ru blender-2.78.orig/intern/guardedalloc/intern/mallocn_intern.h blender-2.78a/intern/guardedalloc/intern/mallocn_intern.h +--- blender-2.78.orig/intern/guardedalloc/intern/mallocn_intern.h 2016-09-28 09:26:55.000000000 +0000 ++++ blender-2.78a/intern/guardedalloc/intern/mallocn_intern.h 2017-02-07 14:44:35.213040733 +0000 +@@ -52,7 +52,7 @@ + #undef HAVE_MALLOC_STATS + #define USE_MALLOC_USABLE_SIZE /* internal, when we have malloc_usable_size() */ + +-#if defined(__linux__) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__) ++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || (defined(__FreeBSD_kernel__) && !defined(__FreeBSD__)) || defined(__GLIBC__) + # include + # define HAVE_MALLOC_STATS + #elif defined(__FreeBSD__) +diff -ru blender-2.78.orig/source/blender/blenlib/intern/system.c blender-2.78a/source/blender/blenlib/intern/system.c +--- blender-2.78.orig/source/blender/blenlib/intern/system.c 2016-10-25 09:59:23.000000000 +0000 ++++ blender-2.78a/source/blender/blenlib/intern/system.c 2017-02-07 14:44:35.213040733 +0000 +@@ -31,7 +31,7 @@ + #include "MEM_guardedalloc.h" + + /* for backtrace */ +-#if defined(__linux__) || defined(__APPLE__) ++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__) + # include + #elif defined(WIN32) + # include +@@ -77,7 +77,7 @@ + { + /* ------------- */ + /* Linux / Apple */ +-#if defined(__linux__) || defined(__APPLE__) ++#if (defined(__linux__) && defined(HAVE_EXECINFO_H)) || defined(__APPLE__) + + #define SIZE 100 + void *buffer[SIZE]; +diff -ru blender-2.78.orig/source/creator/creator_signals.c blender-2.78a/source/creator/creator_signals.c +--- blender-2.78.orig/source/creator/creator_signals.c 2016-10-24 14:13:56.000000000 +0000 ++++ blender-2.78a/source/creator/creator_signals.c 2017-02-07 14:47:01.888625973 +0000 +@@ -309,7 +309,7 @@ + * set breakpoints on sig_handle_fpe */ + signal(SIGFPE, sig_handle_fpe); + +-# if defined(__linux__) && defined(__GNUC__) ++# if defined(__linux__) && defined(__GNUC__) && defined(HAVE_FEENABLEEXCEPT) + feenableexcept(FE_DIVBYZERO | FE_INVALID | FE_OVERFLOW); + # endif /* defined(__linux__) && defined(__GNUC__) */ + # if defined(OSX_SSE_FPE) -- cgit v1.2.3