Commit Graph

813 Commits

Author SHA1 Message Date
Bastien Montagne
8e5cd99e0b Fix for building Blender with OSL, and no OpenEXR headers in standard paths (like /usr/include/OpenEXR).
As OSL headers mix #include <OpenEXR/foo.h> and #include <foo.h>, we need both /path/to/openexr/include and /path/to/openexr/include/OpenEXR include paths... :/

Issue investigated by doug65536 on IRC, thanks.
2013-06-16 18:59:50 +00:00
Nathan Letwory
fc4f6a7bad Set up OurSpawn for MinGW compile environment on Windows. 2013-06-15 21:20:06 +00:00
Brecht Van Lommel
344ffb99ae Buildbot: use relative path for redistributable dlls on windows. 2013-06-15 14:01:12 +00:00
Brecht Van Lommel
790e8b6eda Buildbot: use 1 thread for windows builds. 2013-06-15 10:16:01 +00:00
Bastien Montagne
0794c2722d Add USE_PYTHON=OFF and USE_OCIO=OFF to OIIO compilation (we do not need either of those). 2013-06-15 08:56:04 +00:00
Campbell Barton
412c043474 Python script auto-execution changes:
- script execution is off by default

- if a blend file attempts to execute a script
  this shows a message in the header with the action
  that was suppressed (script/driver/game-autostart) and 2 buttons to either reload the file trusted, or to ignore the message.

- the file selector will always default to use the trust setting in the user preferences,
  but reloading an open file will keep using the current setting (whatever was set before or set on the command-line).

- added SCons setting WITH_BF_PYTHON_SECURITY, this sets the default state for the user prefereces not to trust blend files on load.
  ... this option was in CMake before, but always off, now its enabled by default for SCons and CMake, and forced on in CMake for now.
2013-06-10 00:42:16 +00:00
Antony Riakiotakis
29871b29b5 Fix compilation on MinGW32 scons. The compiled library there is already static, revert renaming of linked library 2013-06-03 06:40:25 +00:00
Sergey Sharybin
732c566f2f Fix #35587: Cycles: image movie to single image crashing
Crash was happening on windows platforms only and was caused
by some specifics about how CRT works.

Basically, blender and all of the .dll are compiled with /MT
flag, which means blender.exe and all .dll are using separate
environments. This makes it impossible to pass file descriptors
from blender to other dll, because it becomes invalid in the dll.

And this is exactly what was happening: OIIO was trying to open
movie file with all known plugins and one of them was zlib. And
the way OIIO was using zlib API is opening the file using Boost
and passing a file descriptor to zlib. And since zlib was a
dynamic library this lead to general issues using this descriptor
in zlib code.

Solved by linking to zlib statically. This allows to safely pass
file descriptor to zlib API. Alternative would be to compile all
the stuff with /MD flag, but that's much bigger and less robust
way to fix the issue.

Tested on windows using msvc2008, scons plus cmake both 32 and 64
bit versions. Seems to be working fine.

Further tweaks for mingw and msvc2012 could be needed tho.
2013-06-02 15:02:17 +00:00
Sergey Sharybin
b453516cf2 Updtae buildbot's master.vfg 2013-06-01 10:18:47 +00:00
Bastien Montagne
686e6acf5d Stupid typo, reported by Eugenio Pignataro on ML, thx. 2013-05-31 17:39:43 +00:00
Bastien Montagne
d4480a0fd8 Various fixes for install_deps' scons options.
Also svn-ignore BUILD_NOTES.txt generated file.
2013-05-29 18:57:36 +00:00
Bastien Montagne
9a79e03752 Various fixes to scons for linux:
* Better handling of "multiarch" python stuff (libs also need two different paths).
* Fix Opencollada default paths.

Hopefully this won't break anything...
2013-05-29 18:55:02 +00:00
Sergey Sharybin
c987aa7df5 Hopefully scons+llvm works again. 2013-05-28 14:05:12 +00:00
Bastien Montagne
5a96c739c1 And add Aarch (tested with amd64). Everything should be functionnal now... 2013-05-27 13:22:55 +00:00
Bastien Montagne
d3f9fb677b Various fixes. Tested with OpenSuse 12.3 (amd64). 2013-05-26 15:00:42 +00:00
Bastien Montagne
7c9f7e7566 Some cleanup/reorganisation, and:
* Script should now remove relevant dirs in $INST when a package becomes suitable
* Script systematically runs relevant ldconfig commands when building boost/oiio
2013-05-25 14:49:29 +00:00
Bastien Montagne
e082aad99f Enabled new openexr for RPM-based distro. Checked with FC18/amd64 for now, will check with Suse later. 2013-05-25 09:31:45 +00:00
Bastien Montagne
66c86d8702 A bunch of fixes to install_deps.sh (most notably, a bug in oiio's embeded version of tbb, buggy oiio archive handling, moved ilmbase files into openexr dir (as expected by Blender), ...).
Tested with debian testing/i386 this time.
2013-05-24 14:31:57 +00:00
Bastien Montagne
36db48f2c4 First attempt to handle openexr/ilmbase 2.0 in install_deps.sh (linux builds).
Only activated for Deb-like distro for now, only tested with testing/amd64. Notes :
* Had to add a hell of patches to ilmbase/openexr/oiio cmake files (some are real, stupid bugs fixing [like files missing in lists or wrong linking order], others are "enhancements" [like being able to compile both static and dyn libs for openexr]).
* Unfortunately, I could not manage to keep oiio static (can't compile osl later, as it does not link all deps of oiio, tiff, jpeg, png, etc.). I’ll try to fix this later, but for now, you'll have to do as with boost (ldconfig).

I won't say here what I think about not having any (reliable) way to really link a static lib into another one... :/

Will test and enable other distro in following day(s), I do not *expect* much difficulties here.
2013-05-24 10:16:07 +00:00
Jens Verwiebe
07c31b8a86 OSX/scons: use ditto --arch <arch> instead of cp, to thin out unused architecture on the fly 2013-05-21 16:44:39 +00:00
Campbell Barton
7781312346 code cleanup: rename bmesh operator files to be more consistent 2013-05-20 07:38:11 +00:00
Campbell Barton
417ca7b451 fix for finding openjpeg on some systems. 2013-05-15 09:57:17 +00:00
Brecht Van Lommel
13c0ef139f Fix OS X 32 bit build error, and bring buildbot config in sync with default. 2013-05-07 18:32:37 +00:00
Sergey Sharybin
8caefd44f2 Fix for a typo in scons configuration 2013-04-29 07:24:45 +00:00
Sergey Sharybin
aa206bcd14 Strip unneeded folders and files from numpy 2013-04-23 15:51:41 +00:00
Sergey Sharybin
ddf01af533 Buildbot tweaks
Add numpy installation to blender player configuration,
this is so because player is building first and it installs
python, which prevented numpy installation from blender
configuration.
2013-04-23 15:29:39 +00:00
Sergey Sharybin
85363c79bf Enable numpy install for buildbot
Numpy is compiled at build environment, but
importing it from blender somehow fails.

Will need help of Campbell for this.
2013-04-18 12:25:13 +00:00
Antony Riakiotakis
f3f5e9553e Turn OpenMP on for MinGW, it works the 32 bit compiler. 2013-04-17 19:54:25 +00:00
Campbell Barton
456f3b318a code cleanup: minor changes, clang checker option for exact size matches and use vector functions. 2013-04-14 12:01:12 +00:00
Antony Riakiotakis
15f3bbfe9e Fix some compilation errors for MinGW. Thanks to vildas on irc for
bringing this to attention.
2013-04-13 16:29:18 +00:00
Campbell Barton
502ddd3128 code cleanup: warnings and style. 2013-04-12 00:50:40 +00:00
Jens Verwiebe
367de67889 OSX: remove the applescript and env var for omp_set_treads from plist 2013-04-10 15:22:39 +00:00
Campbell Barton
b14f68521e select-camera operator could select hidden cameras, also disable freestyle for make lite target. 2013-04-08 04:54:57 +00:00
Bastien Montagne
c0ab8a15c3 Raise magic numbers for OSL and OpenCollada (should have done that much earlier), this will force rebuild of those libs next time, hopefully will solve user's issues with outdated libs. 2013-04-07 15:02:34 +00:00
Tamito Kajiyama
eeb95280be Missing build_files updates in the merger in revision 55847. 2013-04-07 06:44:33 +00:00
Thomas Dinges
95080ea5cd Freestyle / Scons:
* Changes in tools\Blender.py were not merged, causing compile failure.
2013-04-06 22:21:42 +00:00
Jens Verwiebe
be2626f9f4 Fix freestyle compile with scons 2013-04-06 18:06:06 +00:00
Bastien Montagne
d070940192 More fixes for install_deps.sh under ubuntu 10.04: git package is called "git-core", and 'apt-cache policy' returns a different result than newer versions when no package is found, changed the "available deb package" test to use "apt-cache show" instead. 2013-04-05 13:34:32 +00:00
Bastien Montagne
4cfffd863b First fix for install_deps and ubuntu 10.04 (no libtiff5, only libtiff4, wonder why this package does not work as jpeg or png ones)...
This allows compilation of OIIO, install_deps.sh still working though (on this old OS, all libs have to be compiled, takes time... :/).
2013-04-05 12:37:48 +00:00
Campbell Barton
c7e2a31bf2 correct too-big allocation in mesh beautify. 2013-04-01 07:57:33 +00:00
Bastien Montagne
467526545f Use same opencollada rev as windows' libs. 2013-03-28 20:24:36 +00:00
Campbell Barton
8e3d590b76 code cleanup: python/pep8 and double-promotion warnings. 2013-03-28 19:33:14 +00:00
Gaia Clary
4707f1de17 modified build system for updated opencollada libraries (windows only, other platforms might want to update as well) 2013-03-28 18:02:24 +00:00
Sergey Sharybin
31eee77a45 Fix #33518: Jack sync doesn't work in 2.64, 2.64 or 2.65 stable versions
Added new build option WITH_JACK_DYNLOAD for CMake and
WITH_BF_JACK_DYNLOAD for SCons, which means there'll be
no build-time linking against libjack and getting symbols
from libjack will happen runtime using dlopen and dlsym
tricks.

Alternative would be to use weak linking, but it'll require
having wrapper for preloading libjack.

This new options are disabled by default and they only
intended to be used on linux. Other platforms shall not
be using this and there shall be no functional changes
on non-linux platforms at all.
2013-03-27 07:19:54 +00:00
Bastien Montagne
d9eadf442e Fix for opencollada building in install_deps.sh script.
Stick to rev c89cf095c40aa2a518b1104c448825eacc92d174 of opencollada repo, next commit breaks API and prevent blender from building anymore... :(
2013-03-23 17:28:24 +00:00
Bastien Montagne
3949e23ddf Patch [#34680] Updated install_deps script, by Ejner Fergo (ejnersan), thanks!
The script is updated with:

Arch Linux support
Numpy 1.7.0 final
Fedora 17 / 18 support
OpenSUSE 12.2 / 12.3 support
Use FFMPEG from RPM-distro repos
RPM-distro fixes
Removed Schroedinger codec
Fixes for Cmake/Scons config

Reviewed by Sergey and me.
2013-03-22 16:26:33 +00:00
Campbell Barton
d9c9209608 code cleanup: quiet some -Wshadow warnings, mix of obvious mistakes and harmless global/local naming conflict. 2013-03-15 22:55:10 +00:00
Campbell Barton
6a51379bf7 tweaks to clang so blender can build with -Werror 2013-03-14 07:25:54 +00:00
Campbell Barton
aff410b558 style cleanup: odd indentation 2013-03-14 05:52:30 +00:00
Sergey Sharybin
36887c0ed0 Woops, installing dlls shall happen after all the folders are created. 2013-03-12 09:24:52 +00:00