summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorbartus2018-06-20 16:19:35 +0200
committerbartus2018-06-20 16:19:35 +0200
commitd3fede6b483c12d45e0a4b473cce1887f1a7a959 (patch)
treef6dee7b07b9d421371cf64af8a76faa46cb80b80
parentb6b826e8a0a245ae8b0050e71f44d9f8e15fa62d (diff)
downloadaur-d3fede6b483c12d45e0a4b473cce1887f1a7a959.tar.gz
non conflicting patch: change version 2.79>2.81
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD5
-rw-r--r--version.patch17
3 files changed, 23 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index a11ae47b408..807d90f690d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -44,6 +44,7 @@ pkgbase = blender-fracture_modifier-git
source = blender-fracture_modifier.desktop
source = SelectCudaComputeArch.patch
source = gcc8.patch
+ source = version.patch
source = ffmpeg.patch
source = openvdb.patch
md5sums = SKIP
@@ -55,6 +56,7 @@ pkgbase = blender-fracture_modifier-git
md5sums = 0a4847775c9eec16a76ec7d3a03a678d
md5sums = 9454ff7e994f72ead5027356e227cbd2
md5sums = df6f12c3327678b0a05f9e48e9ace67c
+ md5sums = 975cef0e17c77517ed8727701abc8a0c
md5sums = bb325c8c879d677ad1f1c54797268716
md5sums = fe709e616e52c1acc47c1cc0f77c2694
diff --git a/PKGBUILD b/PKGBUILD
index ccb499a058a..8be2040016f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
_branch="fracture_modifier"
_sufix=${_branch}
-_blenver=2.79
+_blenver=2.81
_fragment="#branch=${_branch}"
pkgname=blender-${_sufix}-git
pkgver=v2.79b.r2130.g9a21afd18d4
@@ -34,6 +34,7 @@ source=("git://git.blender.org/blender.git${_fragment}" \
blender-fracture_modifier.desktop \
SelectCudaComputeArch.patch \
gcc8.patch \
+ version.patch \
ffmpeg.patch \
openvdb.patch \
)
@@ -46,6 +47,7 @@ md5sums=('SKIP'
'0a4847775c9eec16a76ec7d3a03a678d'
'9454ff7e994f72ead5027356e227cbd2'
'df6f12c3327678b0a05f9e48e9ace67c'
+ '975cef0e17c77517ed8727701abc8a0c'
'bb325c8c879d677ad1f1c54797268716'
'fe709e616e52c1acc47c1cc0f77c2694')
@@ -71,6 +73,7 @@ prepare() {
git apply -v ${srcdir}/gcc8.patch
git apply -v ${srcdir}/ffmpeg.patch
git apply -v ${srcdir}/openvdb.patch
+ git apply -v ${srcdir}/version.patch
}
build() {
diff --git a/version.patch b/version.patch
new file mode 100644
index 00000000000..1c819513060
--- /dev/null
+++ b/version.patch
@@ -0,0 +1,17 @@
+diff --git a/source/blender/blenkernel/BKE_blender_version.h b/source/blender/blenkernel/BKE_blender_version.h
+index 7139c00edf6..5ac0c705c52 100644
+--- a/source/blender/blenkernel/BKE_blender_version.h
++++ b/source/blender/blenkernel/BKE_blender_version.h
+@@ -27,10 +27,10 @@
+ /* these lines are grep'd, watch out for our not-so-awesome regex
+ * and keep comment above the defines.
+ * Use STRINGIFY() rather than defining with quotes */
+-#define BLENDER_VERSION 279
++#define BLENDER_VERSION 281
+ #define BLENDER_SUBVERSION 0
+ /* Several breakages with 270, e.g. constraint deg vs rad */
+-#define BLENDER_MINVERSION 270
++#define BLENDER_MINVERSION 281
+ #define BLENDER_MINSUBVERSION 6
+
+ /* used by packaging tools */