Switch to 'functions' branch.

4 files changed, 68 insertions, 115 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8a91f61e16f0..665e9a8416c4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
-pkgbase = blender-fracture_modifier-git
-	pkgdesc = Development version of Blenders fracture_modifier branch
-	pkgver = 2.79b.r70678.g233ad61cb8d
+pkgbase = blender-functions-git
+	pkgdesc = Development version of Blenders functions branch
+	pkgver = 2.83.r95931.gbeed795e5aa
 	pkgrel = 1
 	url = https://blender.org/
 	arch = i686
@@ -31,40 +31,22 @@ pkgbase = blender-fracture_modifier-git
 	depends = libtiff
 	depends = libpng
 	optdepends = cuda: CUDA support in Cycles
-	provides = blender-fracture_modifier
-	conflicts = blender-fracture_modifier
-	source = git://git.blender.org/blender.git#branch=fracture_modifier
+	provides = blender-functions
+	conflicts = blender-functions
+	source = git://git.blender.org/blender.git#branch=functions
 	source = blender-addons.git::git://git.blender.org/blender-addons.git
 	source = blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git
 	source = blender-translations.git::git://git.blender.org/blender-translations.git
 	source = blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git
-	source = git+https://github.com/scorpion81/blender-fracture-helper.git
 	source = SelectCudaComputeArch.patch
-	source = gcc8.patch
-	source = gcc9.patch
-	source = ffmpeg.patch
-	source = openvdb.patch
-	source = collada1668.patch
-	source = oiio-2.0.patch
-	source = Cleanup-use-PyImport_GetModuleDict.patch
-	source = python3.8.patch
 	source = addon_path.patch
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = SKIP
-	sha256sums = 39ab45862044a838e49720c93ef5d246c3192e1438bf3ceca169e3ed0439ea18
-	sha256sums = 6093024b0a27f1fd144f5f8a25121939f74f41bcc164d8b8b58f33d3c364e456
-	sha256sums = ec95ba11ef9f41ca3123b330f25ab767f7916531f39943b4f92f28f36e1e0725
-	sha256sums = 450a3ec68360981e47503e734e8229a4ad06554ad009664b4abfb6bf317962d9
-	sha256sums = e22d5908877165958991161c6800dac9f8810e2d92fb18c6fe09fe1a24e5d18c
-	sha256sums = ba390c37ea5a63e603c97350f9401fe1794c54406243a48f860195cc0c6085ab
-	sha256sums = 5ff48d0e35025f21ee45274b56d1788b2e1768fa4d86b5032a40941057695176
-	sha256sums = f4fea95b9d27fb5c30a13cd57ae22d8f3091d456719377e28572091793e941c2
-	sha256sums = 229853b98bb62e1dec835aea6b2eab4c3dabbc8be591206573a3c1b85f10be59
-	sha256sums = e959c2ae13baa35e9ee6d9ff8f30fea55a60ccd59a0b8d047df134aee4b5424e
+	sha256sums = 66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c
+	sha256sums = 81e0047ba48662ee0ec1da1ffd427641305a0edc68c7913da9460ae4c1fefe72
 
-pkgname = blender-fracture_modifier-git
+pkgname = blender-functions-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 257bffb722c0..552b4ebc599c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,12 +7,12 @@
 ((TRAVIS)) && _cuda_capability+=(sm_50 sm_52 sm_60 sm_61 sm_70 sm_75) # Travis memory limit is not enough to build for arch 3.x.
 
 # Configuration.
-_branch="fracture_modifier"
+_branch="functions"
 _sufix=${_branch}
 _fragment="#branch=${_branch}"
 
 pkgname=blender-${_sufix}-git
-pkgver=2.79b.r70678.g233ad61cb8d
+pkgver=2.83.r95931.gbeed795e5aa
 _blenver=${pkgver:0:4}
 pkgrel=1
 pkgdesc="Development version of Blenders ${_branch} branch"
@@ -39,16 +39,7 @@ source=("git://git.blender.org/blender.git${_fragment}"
         'blender-addons-contrib.git::git://git.blender.org/blender-addons-contrib.git'
         'blender-translations.git::git://git.blender.org/blender-translations.git'
         'blender-dev-tools.git::git://git.blender.org/blender-dev-tools.git'
-        'git+https://github.com/scorpion81/blender-fracture-helper.git'
         SelectCudaComputeArch.patch
-        gcc8.patch
-        gcc9.patch
-        ffmpeg.patch
-        openvdb.patch
-        collada1668.patch
-        oiio-2.0.patch
-        Cleanup-use-PyImport_GetModuleDict.patch
-        python3.8.patch
         addon_path.patch
         )
 sha256sums=('SKIP'
@@ -56,21 +47,12 @@ sha256sums=('SKIP'
             'SKIP'
             'SKIP'
             'SKIP'
-            'SKIP'
-            '39ab45862044a838e49720c93ef5d246c3192e1438bf3ceca169e3ed0439ea18'
-            '6093024b0a27f1fd144f5f8a25121939f74f41bcc164d8b8b58f33d3c364e456'
-            'ec95ba11ef9f41ca3123b330f25ab767f7916531f39943b4f92f28f36e1e0725'
-            '450a3ec68360981e47503e734e8229a4ad06554ad009664b4abfb6bf317962d9'
-            'e22d5908877165958991161c6800dac9f8810e2d92fb18c6fe09fe1a24e5d18c'
-            'ba390c37ea5a63e603c97350f9401fe1794c54406243a48f860195cc0c6085ab'
-            '5ff48d0e35025f21ee45274b56d1788b2e1768fa4d86b5032a40941057695176'
-            'f4fea95b9d27fb5c30a13cd57ae22d8f3091d456719377e28572091793e941c2'
-            '229853b98bb62e1dec835aea6b2eab4c3dabbc8be591206573a3c1b85f10be59'
-            'e959c2ae13baa35e9ee6d9ff8f30fea55a60ccd59a0b8d047df134aee4b5424e')
+            '66b9bf3db441f35119ef0eb5f855142f2e773e8002ac0216e056bcc6f8ac409c'
+            '81e0047ba48662ee0ec1da1ffd427641305a0edc68c7913da9460ae4c1fefe72')
 
 pkgver() {
   cd "$srcdir/blender"
-  printf "%sb.r%s.g%s" "$(grep -Po "BLENDER_VERSION *\K[0-9]{3}" source/blender/blenkernel/BKE_blender_version.h|sed 's/./&./1')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "%s.r%s.g%s" "$(grep -Po "BLENDER_VERSION *\K[0-9]{3}" source/blender/blenkernel/BKE_blender_version.h|sed 's/./&./1')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
 prepare() {
@@ -80,14 +62,6 @@ prepare() {
   if [[ ! -v _cuda_capability ]] && grep -q nvidia <(lsmod); then
     git apply -v "${srcdir}/SelectCudaComputeArch.patch"
   fi
-  git apply -v "${srcdir}/gcc8.patch"
-  git apply -v "${srcdir}/ffmpeg.patch"
-  git apply -v "${srcdir}/openvdb.patch"
-  git apply -v "${srcdir}/collada1668.patch"
-  git apply -v "${srcdir}/gcc9.patch"
-  git apply -v "${srcdir}/oiio-2.0.patch"
-  git apply -v "${srcdir}/Cleanup-use-PyImport_GetModuleDict.patch"
-  git apply -v "${srcdir}/python3.8.patch"
   if [[ -v _sufix ]]; then
     git apply -v <(sed "s/@@_sufix@@/${_sufix}/g" "${srcdir}/addon_path.patch")
   fi
@@ -142,9 +116,6 @@ package() {
   export DESTDIR="$pkgdir"
   if ((DISABLE_NINJA)); then make install; else ninja install; fi
 
-  msg "install fracture-helper addon"
-  install -Dm644 "${srcdir}"/blender-fracture-helper/*.py "${pkgdir}/usr/share/blender/${_blenver}_${_sufix}/scripts/addons/"
-
   if [[ -v _sufix ]]; then
     msg "add -${_sufix} sufix to desktop shortcut"
     sed -i "s/=blender/=blender-${_sufix}/g" "${pkgdir}/usr/share/applications/blender.desktop"
diff --git a/SelectCudaComputeArch.patch b/SelectCudaComputeArch.patch
index 229e6bc7e2c9..c6b3ffc73d4f 100644
--- a/SelectCudaComputeArch.patch
+++ b/SelectCudaComputeArch.patch
@@ -3,14 +3,14 @@ index 5bf681792ca..b975fb5db14 100644
 --- a/intern/cycles/cmake/external_libs.cmake
 +++ b/intern/cycles/cmake/external_libs.cmake
 @@ -41,6 +41,11 @@ if(WITH_CYCLES_CUDA_BINARIES OR NOT WITH_CUDA_DYNLOAD)
- 	find_package(CUDA) # Try to auto locate CUDA toolkit
- 	if(CUDA_FOUND)
- 		message(STATUS "CUDA nvcc = ${CUDA_NVCC_EXECUTABLE}")
-+		CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS Auto)
-+		string(REGEX REPLACE " compute_[0-9]+" "" CYCLES_CUDA_BINARIES_ARCH "${CUDA_ARCH_FLAGS_readable}")
-+		string(REGEX REPLACE " " ";" CYCLES_CUDA_BINARIES_ARCH "${CYCLES_CUDA_BINARIES_ARCH}")
-+		message(STATUS "Enabling CUDA support (version: ${CUDA_VERSION_STRING},"
-+			" archs: ${CYCLES_CUDA_BINARIES_ARCH})")
- 	else()
- 		message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES")
- 		set(WITH_CYCLES_CUDA_BINARIES OFF)
+   find_package(CUDA) # Try to auto locate CUDA toolkit
+   if(CUDA_FOUND)
+     message(STATUS "CUDA nvcc = ${CUDA_NVCC_EXECUTABLE}")
++      CUDA_SELECT_NVCC_ARCH_FLAGS(CUDA_ARCH_FLAGS Auto)
++        string(REGEX REPLACE " compute_[0-9]+" "" CYCLES_CUDA_BINARIES_ARCH "${CUDA_ARCH_FLAGS_readable}")
++        string(REGEX REPLACE " " ";" CYCLES_CUDA_BINARIES_ARCH "${CYCLES_CUDA_BINARIES_ARCH}")
++        message(STATUS "Enabling CUDA support (version: ${CUDA_VERSION_STRING},"
++          " archs: ${CYCLES_CUDA_BINARIES_ARCH})")
+   else()
+     message(STATUS "CUDA compiler not found, disabling WITH_CYCLES_CUDA_BINARIES")
+     set(WITH_CYCLES_CUDA_BINARIES OFF)
diff --git a/addon_path.patch b/addon_path.patch
index 9b21afdf2045..ba166d1a715b 100644
--- a/addon_path.patch
+++ b/addon_path.patch
@@ -4,39 +4,39 @@ index 8fd6aee28da..99d61882451 100644
 +++ b/intern/ghost/intern/GHOST_SystemPathsUnix.cpp
 @@ -56,7 +56,7 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getSystemDir(int, const char *versions
  {
- 	/* no prefix assumes a portable build which only uses bundled scripts */
- 	if (static_path) {
--		static string system_path = string(static_path) + "/blender/" + versionstr;
-+		static string system_path = string(static_path) + "/blender/" + versionstr + "_@@_sufix@@";
- 		return (GHOST_TUns8 *)system_path.c_str();
- 	}
+   /* no prefix assumes a portable build which only uses bundled scripts */
+   if (static_path) {
+-    static string system_path = string(static_path) + "/blender/" + versionstr;
++    static string system_path = string(static_path) + "/blender/" + versionstr + "_@@_sufix@@";
+     return (GHOST_TUns8 *)system_path.c_str();
+   }
  
 @@ -77,7 +77,7 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserDir(int version, const char *ve
- 			last_version = version;
+       last_version = version;
  
- 			if (home) {
--				user_path = string(home) + "/.blender/" + versionstr;
-+				user_path = string(home) + "/.blender/" + versionstr + "_@@_sufix@@";
- 			}
- 			else {
- 				return NULL;
+       if (home) {
+-        user_path = string(home) + "/.blender/" + versionstr;
++        user_path = string(home) + "/.blender/" + versionstr + "_@@_sufix@@";
+       }
+       else {
+         return NULL;
 @@ -92,7 +92,7 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserDir(int version, const char *ve
- 			last_version = version;
+       last_version = version;
  
- 			if (home) {
--				user_path = string(home) + "/blender/" + versionstr;
-+				user_path = string(home) + "/blender/" + versionstr + "_@@_sufix@@";
- 			}
- 			else {
- 				home = getenv("HOME");
+       if (home) {
+-        user_path = string(home) + "/blender/" + versionstr;
++        user_path = string(home) + "/blender/" + versionstr + "_@@_sufix@@";
+       }
+       else {
+         home = getenv("HOME");
 @@ -100,7 +100,7 @@ const GHOST_TUns8 *GHOST_SystemPathsUnix::getUserDir(int version, const char *ve
- 				if (home == NULL)
- 					home = getpwuid(getuid())->pw_dir;
+         if (home == NULL)
+           home = getpwuid(getuid())->pw_dir;
  
--				user_path = string(home) + "/.config/blender/" + versionstr;
-+				user_path = string(home) + "/.config/blender/" + versionstr + "_@@_sufix@@";
- 			}
- 		}
+-        user_path = string(home) + "/.config/blender/" + versionstr;
++        user_path = string(home) + "/.config/blender/" + versionstr + "_@@_sufix@@";
+       }
+     }
  
 diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt
 index 8fb04c320a0..3102752ec97 100644
@@ -44,21 +44,21 @@ index 8fb04c320a0..3102752ec97 100644
 +++ b/source/creator/CMakeLists.txt
 @@ -303,15 +303,15 @@ endif()
  if(UNIX AND NOT APPLE)
- 	if(WITH_PYTHON_MODULE)
- 		if(WITH_INSTALL_PORTABLE)
--			set(TARGETDIR_VER ${BLENDER_VERSION})
-+			set(TARGETDIR_VER ${BLENDER_VERSION}_@@_sufix@@)
- 		else()
--			set(TARGETDIR_VER ${PYTHON_SITE_PACKAGES}/${BLENDER_VERSION})
-+			set(TARGETDIR_VER ${PYTHON_SITE_PACKAGES}/${BLENDER_VERSION}_@@_sufix@@)
- 		endif()
- 	else()
- 		if(WITH_INSTALL_PORTABLE)
--			set(TARGETDIR_VER ${BLENDER_VERSION})
-+			set(TARGETDIR_VER ${BLENDER_VERSION}_@@_sufix@@)
- 		else()
--			set(TARGETDIR_VER share/blender/${BLENDER_VERSION})
-+			set(TARGETDIR_VER share/blender/${BLENDER_VERSION}_@@_sufix@@)
- 		endif()
- 	endif()
+   if(WITH_PYTHON_MODULE)
+     if(WITH_INSTALL_PORTABLE)
+-      set(TARGETDIR_VER ${BLENDER_VERSION})
++      set(TARGETDIR_VER ${BLENDER_VERSION}_@@_sufix@@)
+     else()
+-      set(TARGETDIR_VER ${PYTHON_SITE_PACKAGES}/${BLENDER_VERSION})
++      set(TARGETDIR_VER ${PYTHON_SITE_PACKAGES}/${BLENDER_VERSION}_@@_sufix@@)
+     endif()
+   else()
+     if(WITH_INSTALL_PORTABLE)
+-      set(TARGETDIR_VER ${BLENDER_VERSION})
++      set(TARGETDIR_VER ${BLENDER_VERSION}_@@_sufix@@)
+     else()
+-      set(TARGETDIR_VER share/blender/${BLENDER_VERSION})
++      set(TARGETDIR_VER share/blender/${BLENDER_VERSION}_@@_sufix@@)
+     endif()
+   endif()