Commit Graph

71 Commits

Author SHA1 Message Date
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
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
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
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
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
Bastien Montagne
467526545f Use same opencollada rev as windows' libs. 2013-03-28 20:24:36 +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
Thomas Dinges
92a77d3f0b install_deps.sh:
* Disable OIIO test and cmd tools per default, they are not needed for Blender.
2013-02-24 11:54:28 +00:00
Bastien Montagne
92189ab353 Rename CMake's Boost_USE_ICU to WITH_BOOST_ICU (update your CMake conf if you make static builds!), and add it as CMake option.
Patch by gdh (Gavin Howard), many thanks!
2013-02-23 20:42:15 +00:00
Thomas Dinges
31e6af92c8 Install_deps script:
* Use OIIO 1.1.7, this removes the need for the ugly patch.
* Use official OSL 1.3.0 repo
* Print OSL path for scons

Tested on Ubuntu 12.10 x64.
2013-02-23 00:52:59 +00:00
Bastien Montagne
e0869db01f Patch from Ejner Fergo: enhancements to install_deps.sh.
Mostly, it:
* Adds numpy and opencollada
* Merges both Suse and Fedora/Redhat into a single func (not sure this is a good idea, but would have been to painful to undo this).

Notes:
* I changed a bit how numpy is handled, so that the script does not try to build it when py3.3 was installed from package!
* Bumped oiio 'magic number', as now trying to use libtiff5 means we have to rebuild everything using tiff!
* Only made a quick test on my own system, but Ejner made quite some extensive ones, so it should be safe.
* I’m not sure keeping on extending that horrible bash thing is a good idea. Shell scripts are nice for small, limited stuff, but I personnaly find that one (over 53ko!) unreadable and a pita to maintain. Further more, doing the same for windows would mean to rewrite everything in another language... I have started work to port this as a py3 script, so that we have a nice structure (classes...) easy to extend/tweak/implement in various OSs/etc.!
2013-01-03 15:35:46 +00:00
Bastien Montagne
10fdfb54b5 Minor enhancements to end message of build_deps.sh 2012-12-19 11:07:10 +00:00
Sergey Sharybin
892d21631b Install dependencies used to always mark schro as used for suse.
Now it should respect all features option.

Also removed some duplicated entries.
2012-12-11 19:45:16 +00:00
Brecht Van Lommel
ea464b9659 OSL install deps script: set STOP_ON_WARNING to OFF to disable -Werror. 2012-12-11 08:13:56 +00:00
Bastien Montagne
c2405353b8 Make installation of some libs off by default (use --with-all option to re-enable them). Currently affected libs:
*libspnav
*liblame
*libjack
*libscrhoedinger
*libvpx
*libxvid
2012-12-05 11:58:38 +00:00
Bastien Montagne
b095c31c87 Can't stress how much I hate bash... This should fix a bug with version comparison (at least under fedora, debian looked OK :/ ). 2012-12-04 22:03:39 +00:00
Bastien Montagne
eeece25d82 Add libjeack0 as (Debian and co) dep.
Also add --skip-foo args to command line.
2012-12-03 17:53:01 +00:00
Bastien Montagne
d6a09974e2 Exit when package manager fails (exit status >= 1). 2012-12-03 17:22:52 +00:00
Bastien Montagne
6213c6d69b Add --force-all option to force rebuild of all built libraries. 2012-12-03 13:28:35 +00:00
Bastien Montagne
f00a49baaa Add exhaustive command line options description in --help message... 2012-12-03 12:04:15 +00:00
Bastien Montagne
19e9571b1b Various "user-friendly" edits, mostly adding command-line args parsing... So now you can try to build OSL with just install_deps.sh --with-osl 2012-12-01 18:07:45 +00:00
Sergey Sharybin
40e75fd2eb Dependencies Builder: disable LINKSTATIC for OIIO
It'll likely give issues with system boost libraries in ubuntu/debian due
to this distros doesn't like static linking and not building static libs
with -fPIC flag.

Disabling LINKSTATIC should be quite painless since blender requires the
same image libraries as oiio does.
2012-11-29 08:22:02 +00:00
Sergey Sharybin
777449029b Seems cmake in debian squeeze is broken and fails to handle BOOST_ROOT
I would recommend using debian-backports repo for cmake
2012-11-28 19:37:37 +00:00
Sergey Sharybin
8d4741b501 Dependency builder: reduce amount of needed sudo commands by checking permissions for $INST folder 2012-11-28 13:34:44 +00:00
Sergey Sharybin
406d680cee Dependency builder: fixed sources directory not creating in some cases 2012-11-28 13:27:12 +00:00
Bastien Montagne
7503bd59e1 Fix two stupid mistakes... Btw, osl now compiles with Fedora17, once llvm-3.1 has been compiled! ;) 2012-11-21 15:42:12 +00:00
Bastien Montagne
7011d3cfe2 Enable llvm building for fedora too.
Unfortunately, this does not solve OSL compile problem in this distro (still the same errors, looks related to gnu c++... :/).
2012-11-21 13:13:50 +00:00
Bastien Montagne
dba4444cd8 Bring SUSE target to the same level as others.
Also add compile_LLVM func, needed by openSuse (which llvm package is
completly broken), and probably can help for OSL in Fedora17 too (will test soon).
2012-11-21 09:01:49 +00:00
Bastien Montagne
ade96d2840 Update to use new WITH_STATIC_LIBS CMake flag when ALL_STATIC is true. 2012-11-19 20:24:06 +00:00
Bastien Montagne
89bebee459 More tweaks:
* Prevent ocio from building its python binding, we don't use it, and it looks like OCIO's CMakeList is not robust here (i.e. can try to build it even when Python.h is not found :/ [irc report]).
* Do not build ffmpeg's player, server nor doc.
* Give right paths to static extra libs for ffmpeg when ALL_STATIC is true.
2012-11-19 19:11:01 +00:00
Bastien Montagne
7ecbc39610 Basic work for an ALL_STATIC option, to enable when you want to build blender in a portable way. Still WIP! 2012-11-19 11:12:30 +00:00
Bastien Montagne
063ca9b2a6 No boost system when we have own compiled version! 2012-11-19 10:45:03 +00:00
Bastien Montagne
509e178f72 Definitive fix for version_ge with equal versions like "1.0.0" and "1.0".
Also fixed DEB boost version checking, own fault.
And disabled building ocio's apps, else it would go searching for an oiio lib (and we have not yet built ours) - anyway, if users want them, they can build them on their own!
2012-11-19 08:48:21 +00:00
Bastien Montagne
0aadad0896 Partial fix to version_ge (greater or equal), was not working correctly with eaqual versions, now will do with exact same versions at least (yet have to fix case like comparing 1.0 and 1.0.0).
Also refactored a bit osl/llvm/etc. stuff for DEB (so that now all osl-deps are only installed when we do have a valid llvm and want to [try to!] build osl).

And added osl/llvm/etc. code for RPM (osl does not compile under fedora currently, though :/ ).
2012-11-18 20:31:58 +00:00
Bastien Montagne
00c194718a More cleanup/deduplication. Also explicitly using gawk (so system without it should print a much comprehensive error message!).
Note: RPM-related edits not yet tested.
2012-11-18 17:47:26 +00:00
Bastien Montagne
76c901d342 Better handing of llvm version (now we can be sure to use the same for osl and blender - and the latest one available!).
And more cosmetic cleanups...
2012-11-18 17:27:29 +00:00
Bastien Montagne
03f4e7fba4 Fix own stupid mistake for threads count, and edits to user messages (mostly adding the ldconfig trick for dynamic boost libs). 2012-11-18 14:27:19 +00:00
Sergey Sharybin
ecb11b43fc Install dependencies: added check for minimal version of x264
Also fixed parsing of package version with epoch
2012-11-17 17:58:15 +00:00
Bastien Montagne
f55b9b6e2f Mono-core platform seem to not output the cores field in /proc/cpuinfo :/
Also adding gawk packages (gnu awk), looks like some distro do not have that one by default!
2012-11-17 14:41:18 +00:00
Sergey Sharybin
13ea663590 Install dependencies: workaround for SHA linking issues 2012-11-17 12:59:24 +00:00
Sergey Sharybin
fd15b39438 Install dependencies: abort script if compilation of some component failed 2012-11-17 12:10:35 +00:00
Sergey Sharybin
eae0174b04 Install dependencies: disable OSL for now
It's really horror even for me to compile it on release environment,
i do not want anybody to spend time trying to support this lib in
automatic script or make it so user's are easily frustrated by some
hack added to OSL repository.

If you REALLY want to build OSL with this script, set BUILD_OSL to
truth (it's in the top of the script).
2012-11-17 11:57:10 +00:00