From 5fb5210319e48c8822c9c7786713d1a31b0886b4 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 26 Jan 2020 14:53:00 +0100 Subject: [PATCH 1/2] blender: update to 2.81a. resolves #18567 --- common/shlibs | 1 + .../blender/patches/blender-2.78a-musl.patch | 37 +++++++------- srcpkgs/blender/patches/ppc.patch | 50 ------------------- srcpkgs/blender/template | 15 +++--- 4 files changed, 28 insertions(+), 75 deletions(-) delete mode 100644 srcpkgs/blender/patches/ppc.patch diff --git a/common/shlibs b/common/shlibs index 23d0a6a3c8e..dc25201b0ea 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3745,3 +3745,4 @@ libigdgmm.so.11 intel-gmmlib-19.4.1_1 libgtk-layer-shell.so.0 wf-shell-0.3_1 librdkafka.so.1 librdkafka-1.3.0_1 librdkafka++.so.1 librdkafka-1.3.0_1 +libPtex.so ptex-2.3.2_1 diff --git a/srcpkgs/blender/patches/blender-2.78a-musl.patch b/srcpkgs/blender/patches/blender-2.78a-musl.patch index bddae1f8d3c..ebf55e5f316 100644 --- a/srcpkgs/blender/patches/blender-2.78a-musl.patch +++ b/srcpkgs/blender/patches/blender-2.78a-musl.patch @@ -1,24 +1,23 @@ -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() +--- a/CMakeLists.txt 2019-12-04 12:00:31.000000000 +0100 ++++ - 2020-01-26 14:37:19.575701782 +0100 +@@ -185,6 +185,18 @@ + set(_init_OPENSUBDIV OFF) + set(_init_OPENVDB OFF) + set(_init_OPENIMAGEDENOISE 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() ++ 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) + set(_init_JACK OFF) elseif(APPLE) 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 diff --git a/srcpkgs/blender/patches/ppc.patch b/srcpkgs/blender/patches/ppc.patch deleted file mode 100644 index 7bd73bc01cb..00000000000 --- a/srcpkgs/blender/patches/ppc.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 90ac05e3d81c604df532122b7da53a4a15c79a37 Mon Sep 17 00:00:00 2001 -From: q66 -Date: Mon, 23 Dec 2019 22:48:50 +0100 -Subject: [PATCH] add ppc support in build_config.h - ---- - intern/numaapi/source/build_config.h | 20 ++++++++++++++++++++ - 1 file changed, 20 insertions(+) - -diff --git a/intern/numaapi/source/build_config.h b/intern/numaapi/source/build_config.h -index 444adcc..f7c072a 100644 ---- a/intern/numaapi/source/build_config.h -+++ b/intern/numaapi/source/build_config.h -@@ -307,6 +307,20 @@ - # define ARCH_CPU_32_BITS 1 - # define ARCH_CPU_BIG_ENDIAN 1 - # endif -+#elif defined(__powerpc64__) -+# define ARCH_CPU_PPC64_FAMILY 1 -+# define ARCH_CPU_PPC64 1 -+# define ARCH_CPU_64_BITS 1 -+# if defined(__LITTLE_ENDIAN__) -+# define ARCH_CPU_LITTLE_ENDIAN 1 -+# else -+# define ARCH_CPU_BIG_ENDIAN 1 -+# endif -+#elif defined(__powerpc__) -+# define ARCH_CPU_PPC_FAMILY 1 -+# define ARCH_CPU_PPC 1 -+# define ARCH_CPU_32_BITS 1 -+# define ARCH_CPU_BIG_ENDIAN 1 - #else - # error Please add support for your architecture in build_config.h - #endif -@@ -337,6 +351,12 @@ - #if !defined(ARCH_CPU_MIPS64_FAMILY) - # define ARCH_CPU_MIPS64_FAMILY 0 - #endif -+#if !defined(ARCH_CPU_PPC64_FAMILY) -+# define ARCH_CPU_PPC64_FAMILY 0 -+#endif -+#if !defined(ARCH_CPU_PPC_FAMILY) -+# define ARCH_CPU_PPC_FAMILY 0 -+#endif - - //////////////////////////////////////////////////////////////////////////////// - // Sizes of platform-dependent types. --- -2.24.0 - diff --git a/srcpkgs/blender/template b/srcpkgs/blender/template index 2beb7f96dd8..248ae685d08 100644 --- a/srcpkgs/blender/template +++ b/srcpkgs/blender/template @@ -1,22 +1,22 @@ # Template file for 'blender' pkgname=blender -version=2.80 +version=2.81a revision=1 build_style="cmake" makedepends=" libgomp-devel libpng-devel tiff-devel python3-devel glu-devel glew-devel freetype-devel jack-devel libopenal-devel libsndfile-devel libsamplerate-devel ffmpeg-devel fftw-devel boost-devel pcre-devel llvm - libopenexr-devel libopenjpeg-devel libXi-devel openimageio-devel - opencolorio-devel opencollada-devel python3-numpy" + libopenexr-devel libopenjpeg2-devel libXi-devel openimageio-devel + opencolorio-devel opencollada-devel python3-numpy libXrender-devel + OpenSubdiv-devel tbb-devel libxml2-devel" depends="desktop-file-utils hicolor-icon-theme" short_desc="3D graphics creation suite" maintainer="Enno Boland " license="GPL-2.0-or-later" homepage="http://www.blender.org" -#distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.gz" -distfiles="https://ftp.halifax.rwth-aachen.de/blender/source/blender-${version}.tar.gz" -checksum=cd9d7e505c1f6e63a4f72366ed04d446859977eeb34cde21283aaea6a304a5c0 +distfiles="http://download.blender.org/source/${pkgname}-${version}.tar.xz" +checksum=52ac4145cef3d49ca6a36cbc6d009598ca2833143fd6c4f1caba4f5c525680fe patch_args="-Np1" pycompile_version="$py3_ver" @@ -36,7 +36,10 @@ configure_args=" -DWITH_OPENCOLORIO=ON -DWITH_IMAGE_OPENEXR=ON -DWITH_IMAGE_OPENJPEG=ON +-DWITH_OPENSUBDIV=ON -DWITH_OPENCOLLADA=ON +-DWITH_SYSTEM_GLEW=ON +-DWITH_BUILDINFO=OFF -DPYTHON_VERSION=$py3_ver -DPYTHON_LIBPATH=/usr/lib -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}' From 00ceddfba5528f04741f44e8a650b02c8740f762 Mon Sep 17 00:00:00 2001 From: John Date: Sun, 26 Jan 2020 23:55:28 +0100 Subject: [PATCH 2/2] New package: OpenSubdiv-3.4.0 --- common/shlibs | 2 ++ srcpkgs/OpenSubdiv-devel | 1 + srcpkgs/OpenSubdiv/template | 26 ++++++++++++++++++++++++++ 3 files changed, 29 insertions(+) create mode 120000 srcpkgs/OpenSubdiv-devel create mode 100644 srcpkgs/OpenSubdiv/template diff --git a/common/shlibs b/common/shlibs index dc25201b0ea..aba9c8bd214 100644 --- a/common/shlibs +++ b/common/shlibs @@ -3746,3 +3746,5 @@ libgtk-layer-shell.so.0 wf-shell-0.3_1 librdkafka.so.1 librdkafka-1.3.0_1 librdkafka++.so.1 librdkafka-1.3.0_1 libPtex.so ptex-2.3.2_1 +libosdGPU.so.3.4.0 OpenSubdiv-3.4.0_1 +libosdCPU.so.3.4.0 OpenSubdiv-3.4.0_1 diff --git a/srcpkgs/OpenSubdiv-devel b/srcpkgs/OpenSubdiv-devel new file mode 120000 index 00000000000..3b6ad59f809 --- /dev/null +++ b/srcpkgs/OpenSubdiv-devel @@ -0,0 +1 @@ +OpenSubdiv \ No newline at end of file diff --git a/srcpkgs/OpenSubdiv/template b/srcpkgs/OpenSubdiv/template new file mode 100644 index 00000000000..5816bae8695 --- /dev/null +++ b/srcpkgs/OpenSubdiv/template @@ -0,0 +1,26 @@ +# Template file for 'OpenSubdiv' +pkgname=OpenSubdiv +version=3.4.0 +revision=1 +wrksrc="OpenSubdiv-${version//./_}" +build_style=cmake +configure_args="-DOpenGL_GL_PREFERENCE=GLVND" +# TODO: CUDA/OpenCL support +makedepends="libXrandr-devel libXinerama-devel libXcursor-devel zlib-devel + libgomp-devel glfw-devel glew-devel tbb-devel" +short_desc="Open-Source subdivision surface library" +maintainer="John " +license="Apache-2.0" +homepage="http://graphics.pixar.com/opensubdiv/docs/intro.html" +distfiles="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${version//./_}.tar.gz" +checksum=d932b292f83371c7518960b2135c7a5b931efb43cdd8720e0b27268a698973e4 + +OpenSubdiv-devel_package() { + depends="${sourcepkg}>=${version}_${revision}" + short_desc+=" - development files" + pkg_install() { + vmove usr/include + vmove "usr/lib/*.a" + vmove "usr/lib/*.so" + } +}