Github messages for voidlinux
 help / color / mirror / Atom feed
* [PR PATCH] blender: update to 2.81a.
@ 2020-01-26 14:01 voidlinux-github
  2020-01-26 23:38 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: voidlinux-github @ 2020-01-26 14:01 UTC (permalink / raw)
  To: ml

[-- Attachment #1: Type: text/plain, Size: 333 bytes --]

There is a new pull request by Johnnynator against master on the void-packages repository

https://github.com/Johnnynator/void-packages blender
https://github.com/void-linux/void-packages/pull/18569

blender: update to 2.81a.
resolves #18567

A patch file from https://github.com/void-linux/void-packages/pull/18569.patch is attached

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-blender-18569.patch --]
[-- Type: text/x-diff, Size: 5937 bytes --]

From 277519c7fce12586a9a0a479f7b963edad7186b5 Mon Sep 17 00:00:00 2001
From: John <johnz@posteo.net>
Date: Sun, 26 Jan 2020 14:53:00 +0100
Subject: [PATCH] blender: update to 2.81a.

resolves #18567
---
 .../blender/patches/blender-2.78a-musl.patch  | 37 +++++++-------
 srcpkgs/blender/patches/ppc.patch             | 50 -------------------
 srcpkgs/blender/template                      | 11 ++--
 3 files changed, 24 insertions(+), 74 deletions(-)
 delete mode 100644 srcpkgs/blender/patches/ppc.patch

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 <daniel@octaforge.org>
-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..58d9259a712 100644
--- a/srcpkgs/blender/template
+++ b/srcpkgs/blender/template
@@ -1,6 +1,6 @@
 # Template file for 'blender'
 pkgname=blender
-version=2.80
+version=2.81a
 revision=1
 build_style="cmake"
 makedepends="
@@ -8,15 +8,15 @@ makedepends="
  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"
+ opencolorio-devel opencollada-devel python3-numpy libXrender-devel
+ tbb-devel"
 depends="desktop-file-utils hicolor-icon-theme"
 short_desc="3D graphics creation suite"
 maintainer="Enno Boland <gottox@voidlinux.org>"
 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"
@@ -37,6 +37,7 @@ configure_args="
 -DWITH_IMAGE_OPENEXR=ON
 -DWITH_IMAGE_OPENJPEG=ON
 -DWITH_OPENCOLLADA=ON
+-DWITH_BUILDINFO=OFF
 -DPYTHON_VERSION=$py3_ver
 -DPYTHON_LIBPATH=/usr/lib
 -DPYTHON_LIBRARY='python${py3_ver}${py3_abiver}'

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, other threads:[~2020-02-03  9:48 UTC | newest]

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-01-26 14:01 [PR PATCH] blender: update to 2.81a voidlinux-github
2020-01-26 23:38 ` [PR PATCH] [Updated] [WIP] " voidlinux-github
2020-01-29  1:17 ` voidlinux-github
2020-01-29  1:18 ` voidlinux-github
2020-01-29  1:39 ` voidlinux-github
2020-01-29  1:46 ` voidlinux-github
2020-02-03  9:48 ` voidlinux-github
2020-02-03  9:48 ` [PR PATCH] [Closed]: " voidlinux-github

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).