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

blender: add dependency on openimageio

Browse Source 
* have cmake check vendor-packages for python modules.
This commit is contained in:
Jerome Duval
2015-06-08 19:35:11 +00:00
parent 674d1b8548
commit 554881a69e
2 changed files with 27 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
media-gfx/blender/blender-2.74.recipe
View File

@@ -14,7 +14,7 @@ CHECKSUM_SHA256="0ca3ceb6c656ae7c556f81ab0994e6aa7a6c64324824cbc94a87caf36f0a119
REVISION="1"
LICENSE="GNU GPL v2"
COPYRIGHT="2002-2009 Blender Foundation"
ARCHITECTURES="!x86 !x86_64"
ARCHITECTURES="!x86 x86_64"
PATCHES="blender-$portVersion.patchset"
@@ -32,6 +32,7 @@ REQUIRES="
lib:libpng16$secondaryArchSuffix
lib:libtiff$secondaryArchSuffix
lib:libz$secondaryArchSuffix
lib:libopenimageio$secondaryArchSuffix
"
BUILD_REQUIRES="
@@ -44,10 +45,12 @@ BUILD_REQUIRES="
devel:libpng16$secondaryArchSuffix
devel:libtiff$secondaryArchSuffix
devel:libz$secondaryArchSuffix
devel:libopenimageio$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:python3
python3_numpy
cmd:python34
cmd:cmake
cmd:make
cmd:gcc$secondaryArchSuffix

23
media-gfx/blender/patches/blender-2.74.patchset
View File

@@ -1,4 +1,4 @@
From c6d0b625b94812c9b8fa52eed1fdc884ca9aca37 Mon Sep 17 00:00:00 2001
From 33ad3170459bfdaaac326a2d0a09c5a24ad9fb7b Mon Sep 17 00:00:00 2001
From: Jerome Duval <jerome.duval@gmail.com>
Date: Sat, 6 Jun 2015 10:06:04 +0000
Subject: Haiku patch
@@ -17,6 +17,27 @@ index b52dd05..382c8a9 100644
set(WITH_X11 ON)
endif()
diff --git a/build_files/cmake/macros.cmake b/build_files/cmake/macros.cmake
index 33c7644..1457f65 100644
--- a/build_files/cmake/macros.cmake
+++ b/build_files/cmake/macros.cmake
@@ -1390,6 +1390,7 @@ macro(find_python_package
PATH_SUFFIXES
site-packages
dist-packages
+ vendor-packages
NO_DEFAULT_PATH
)
@@ -1399,6 +1400,8 @@ macro(find_python_package
"'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/site-packages/${package}', "
"'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/dist-packages/${package}', "
"'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/dist-packages/${package}', "
+ "'${PYTHON_LIBPATH}/python${PYTHON_VERSION}/vendor-packages/${package}', "
+ "'${PYTHON_LIBPATH}/python${_PY_VER_MAJOR}/vendor-packages/${package}', "
"WITH_PYTHON_INSTALL_${_upper_package} option will be ignored when installing python")
set(WITH_PYTHON_INSTALL_${_upper_package} OFF)
else()
diff --git a/extern/libmv/third_party/glog/src/config.h b/extern/libmv/third_party/glog/src/config.h
index f5c9c0b..2703b7b 100644
--- a/extern/libmv/third_party/glog/src/config.h