haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-09 05:10:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

Blender: build fix (#4118)

Browse Source
This commit is contained in:
miqlas
2019-08-22 18:39:41 +02:00
committed by Sergei Reznikov
parent df2ac4c8b2
commit e0d6bf42e3
2 changed files with 50 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-gfx/blender/blender-2.79b.recipe
View File

@@ -10,7 +10,7 @@ benefit from its unified pipeline and responsive development process."
HOMEPAGE="https://www.blender.org/"
COPYRIGHT="2002-2017 Blender Foundation"
LICENSE="GNU GPL v2"
REVISION="12"
REVISION="13"
SOURCE_URI="https://download.blender.org/source/blender-$portVersion.tar.gz"
CHECKSUM_SHA256="4c944c304a49e68ac687ea06f5758204def049b66dc211e1cffa1857716393bc"
PATCHES="

59
media-gfx/blender/patches/blender-2.79b.patchset
View File

@@ -1,4 +1,4 @@
From 9dc7609dbcd261723fe454410419a3d812daf868 Mon Sep 17 00:00:00 2001
From ec28d64900aebb44e960a910cf6e9493e6fe34f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 19 Sep 2017 23:03:48 +0200
Subject: Haiku patchset
@@ -151,10 +151,10 @@ index b819c51..9fb3fbf 100644
# include <sys/statvfs.h>
# define USE_STATFS_STATVFS
--
2.16.4
2.23.0
From 2caf7afb00c2d0672441fca01de3b78f0f5f0e02 Mon Sep 17 00:00:00 2001
From 9f274c91374ecd01456f441a2e76a89edc221894 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 19 Sep 2017 23:15:20 +0200
Subject: Haiku SDL2 check fix
@@ -174,10 +174,10 @@ index 2a835cf..61b7dee 100644
FIND_LIBRARY(SDL2_LIBRARY
--
2.16.4
2.23.0
From 99dadf68ed78792f9e97d0261908b7e5e9ac2381 Mon Sep 17 00:00:00 2001
From 0430bba05bd566a1ec3c2df6477d94a67581264d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Tue, 19 Sep 2017 23:52:27 +0200
Subject: In-tree glog supporting patches
@@ -373,10 +373,10 @@ index 0000000..4e6703b
+# define NO_FRAME_POINTER
+#endif
--
2.16.4
2.23.0
From 41e370ea7a887817bcb307caeac993e3560da60b Mon Sep 17 00:00:00 2001
From b51551c8c1e8e487e5f219e27d2c227387a4a362 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 16 Dec 2017 17:04:56 +0100
Subject: OpenCollada support
@@ -403,10 +403,10 @@ index 63bc520..28cf0b9 100644
${_opencollada_SEARCH_DIRS}
)
--
2.16.4
2.23.0
From 750ac72aca4db0d927ceb3efaba805a07ae3c967 Mon Sep 17 00:00:00 2001
From a3b457c6aa907ce2a77c46208d042129305e4f7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sat, 4 Aug 2018 12:42:53 +0200
Subject: FFMPEG4 patches
@@ -526,5 +526,44 @@ index e1b3abc..1850ffd 100644
if (avio_open(&rv->of->pb, fname, AVIO_FLAG_WRITE) < 0) {
--
2.16.4
2.23.0
From f77901394473f2c325d4bbf8f5175989f8268cd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Thu, 22 Aug 2019 18:07:13 +0200
Subject: Build fixes from FreeBSD
diff --git a/source/blender/collada/DocumentImporter.cpp b/source/blender/collada/DocumentImporter.cpp
index 435eaa0..8708926 100644
--- a/source/blender/collada/DocumentImporter.cpp
+++ b/source/blender/collada/DocumentImporter.cpp
@@ -1340,6 +1340,11 @@ bool DocumentImporter::writeAnimationList(const COLLADAFW::AnimationList *animat
return anim_importer.write_animation_list(animationList);
}
+bool DocumentImporter::writeAnimationClip(const COLLADAFW::AnimationClip *AnimationClip)
+{
+ return true;
+}
+
/** When this method is called, the writer must write the skin controller data.
* \return The writer should return true, if writing succeeded, false otherwise.*/
bool DocumentImporter::writeSkinControllerData(const COLLADAFW::SkinControllerData *skin)
diff --git a/source/blender/collada/DocumentImporter.h b/source/blender/collada/DocumentImporter.h
index 62f76db..1f3b64f 100644
--- a/source/blender/collada/DocumentImporter.h
+++ b/source/blender/collada/DocumentImporter.h
@@ -108,6 +108,8 @@ public:
bool writeAnimationList(const COLLADAFW::AnimationList*);
+ bool writeAnimationClip( const COLLADAFW::AnimationClip* );
+
bool writeGeometry(const COLLADAFW::Geometry*);
bool writeMaterial(const COLLADAFW::Material*);
--
2.23.0