Commit Graph

116 Commits

Author SHA1 Message Date
Bastien Montagne
f5687323a3 Install_deps: explicitely disable OSL/LLVM seems needed... 2014-05-05 20:57:52 +02:00
Bastien Montagne
f7aac45488 Fix T40025: install_deps.sh generating wrong make flag for OSL
Most cases should be handled OK now (not all though, would make script way too much tricky -
bash is a hell of a messy language :/).
2014-05-04 21:34:19 +02:00
Bastien Montagne
a4408f405d install_deps: always specify openexr/ilmbase versions to OIIO and OSL cmake, might help in some cases... 2014-05-03 12:46:12 +02:00
Bastien Montagne
1e9c4639c2 Install_deps.sh: do not use terminfo in our own llvm build.
llvm-config does not report it as link arg as it should
(see http://stackoverflow.com/questions/21477407/llvm-3-5-fails-to-link).
2014-05-01 16:25:39 +02:00
Bastien Montagne
9fb4c487ed Fix T39938: install_deps.sh fails when compiling OSL
Should always use a fixed rev in git repos!

Also done some other cleanup/fixes.
2014-05-01 09:30:11 +02:00
Campbell Barton
b96d531bc9 Python: move to version 3.4x on all platforms 2014-04-30 23:19:16 +10:00
Bastien Montagne
60b015d1fc Update ffmpeg in install_deps.sh to 2.1.4. 2014-04-23 14:17:39 +02:00
Bastien Montagne
db8e7d7a88 install_deps: update to py3.4 and numpy1.8. 2014-04-22 10:08:39 +02:00
Bastien Montagne
959ec27ac9 Install_deps.sh: tweaks to support new LLVM-3.4.
Issue is, looks like Debian testing's graphic backend now uses LLVM-3.4,
which conflicts with 3.3 in Blender and makes it crash.

So add support to handle 3.4, by both allowing to force a specific version for some libs,
and switching back to head of official repo for OSL.
2014-04-06 17:50:50 +02:00
Bastien Montagne
cfbfb5e626 Great, now Debian Jessie as well can cause libyaml-cpp version mismatch... Update warning message! 2014-04-04 22:45:23 +02:00
Bastien Montagne
6ff0fcdae7 Some stupid systems give limited powers to sudo... So add a --no-sudo option disabling usage of sudo!
Note in this case, script becomes more or less useless, just spit out names of packages to install...

Requested by Dalai Felinto over IRC.
2014-04-04 22:38:49 +02:00
Lawrence D'Oliveiro
317f29d753 Resubmission: Avoid UUOC in install_deps.sh
This is a resubmission of the original patch from D255. Sorry, I didn’t understand that subsequent patches added to a diff are considered to //override// previous ones, rather than add to them.

Basically the comment for commit rB554eca1c288e has been applied to the wrong patch.

Reviewers: mont29

Reviewed By: mont29

Differential Revision: https://developer.blender.org/D359
2014-02-27 10:02:13 +01:00
Lawrence D'Oliveiro
554eca1c28 Avoid UUOC in install_deps.sh
The file ##build_files/build_environment/install_deps.sh## contains the following line:

  THREADS=`cat /proc/cpuinfo | grep processor | wc -l`

The command within the backticks is a [[ http://catb.org/jargon/html/U/UUOC.html | Useless Use Of Cat ]].

A more compact way of writing the same thing (saving two subprocesses) is

  THREADS=`grep -c processor /proc/cpuinfo`

or (using POSIX-preferred command-substitution parentheses instead of backticks)

  THREADS=$(grep -c processor /proc/cpuinfo)

But the most compact, and least Linux-specific, way is to use the ##nproc##(1) command from the [[ http://www.gnu.org/software/coreutils/manual/html_node/nproc-invocation.html | GNU coreutils package ]]:

  THREADS=$(nproc)

Reviewers: sergey, mont29

Reviewed by: mont29

Differential Revision: https://developer.blender.org/D255
2014-02-22 14:31:43 +01:00
Bastien Montagne
e2e9c51900 Fix T38370: Ubuntu 14.04 opencolorio segfaults blender on parsing colormanagement/config.ocio
Ubuntu hack: add a --libyaml-cpp-ver parameter, to try to force installing a given version of this lib...
(only for DEB-like distro, I dare hope Trusty (!) is the only affected distro.
Not happy at all to have such things here, this is actually an Ubuntu bug, but will have to live with it I guess.
2014-02-07 15:24:17 +01:00
Bastien Montagne
142228433a Cleanup: remove completely all-static option, just too complex to support in modern linuxes! 2014-02-04 16:52:33 +01:00
Bastien Montagne
2ebffd01da Deb-like distro may use either jack or jack2, add support for this. 2014-02-04 16:52:33 +01:00
Bastien Montagne
90283843e3 install_deps.sh: Fix output conf for CMake (specifying root dirs for OIIO/OCIO is not needed when you use default path, but mandatory otherwise, simpler to always give them).
Spotted by dingto on IRC, thanks!
2014-01-18 16:03:23 +01:00
Bastien Montagne
61ce7a26f3 Raise Python version to 3.3.3. 2013-12-19 22:44:51 +01:00
Bastien Montagne
163df7ff43 Better handling of new libnames of OpenEXR 2.1 (same solution as one used in OIIO/OSL source). 2013-12-16 21:16:02 +01:00
Bastien Montagne
740c7e677b Fix typo in previous own commit (thanks to _FrnchFrgg_ for noticing this!). 2013-12-15 15:53:50 +01:00
Bastien Montagne
05fe9a435a Make libyaml-cpp-dev not-breaking case for deb-like distros, and colors for messages! 2013-12-14 15:52:15 +01:00
Bastien Montagne
400fc9f86f Raise llvm min version to 3.3, looks like this is needed for OSL nowadays... 2013-12-12 17:24:41 +01:00
Bastien Montagne
b7ac2b1467 Add libxml2, libyaml-cpp and libtinyxml to default dependencies (always-installed packages), looks like they are needed... 2013-12-12 11:08:56 +01:00
Bastien Montagne
05e17242c9 More updates, fixes and cleanup to install_deps.sh.
So, after hours of wild hunt, I think both CMake and Scons builds work again.
There were several small issues hiding here and there, esp. for scons.

*WARNING* the --all-static is currently officially broken (it was already quite useless in fact).
          I’m seriously considering dropping it completely, having a script compiling a chain
          of static libs in a complete working way for *two* different build systems is just
          too much work (static libs are *really* a nightmare at link time).

Builders who want to generate static Blender (to share it e.g.) will have to handle things by hand for now.

Main other points changed:

* Many changes to generated settings for scons (notably, I had to hack around the fact that the short ld -l
  option does not work with lib names like 'Iex-2_1', which is not that surprising).
* Opencollada remains the only lib built statically (can't get it to build dyn currently).
* All other libs, even ILMBase ones, are now fully dynamic ones.
* Some general cleanup with CMake definitions of built libs.
* Git-libs do not clone again and again the repo anymore!
2013-12-11 22:12:09 +01:00
Bastien Montagne
9bca996c5e Minor fix to generated settings for scons (affected ilmbase/openexr). 2013-12-10 22:28:02 +01:00
Bastien Montagne
bac86a0825 Update install_deps.sh to OIIO 1.39 and OSL 1.4.0.
Note that I also updated OpenEXR to 2.1.0 (and updated our CMake openexr module as well).

Users will have to update their build settings as told by the script (also in BUILD_NOTES.txt generated file)!

Note I removed all ugly patches from this script, we are currently using custom git repo for OpenEXR/OIIO/OSL,
hopefully we will soon be able to use vanillia code from official repos!
2013-12-08 18:29:54 +01:00
Bastien Montagne
bdc3e1e5de Minor update to r60953. 2013-10-31 13:11:01 +00:00
Bastien Montagne
e293a0b153 Update OpenEXR to 2.0.1, this seems to fix some issues.
I *really* have to go back over all our patches in this script and try to port them back in respective projects!
2013-10-27 08:19:08 +00:00
Bastien Montagne
58af8d4387 Fix for conf instructions for scons... 2013-10-07 07:42:00 +00:00
Bastien Montagne
60e1fc70d2 install_deps.sh fix: add explicit OGG lib handling, we need it to pass correct values for ffmpeg libraries (at least for static builds).
I’m not close to understand why this has worked fine until today... :/

Only tested with Debian, but I would not expect any issue with Fedora/Suse/Arch, this is a quite simple change!
2013-09-27 13:56:16 +00:00
Bastien Montagne
67ae8cfcf5 Fix own stupid error in previous commit... :/ 2013-09-19 20:27:26 +00:00
Bastien Montagne
0be2e21e2d Potential fix for install_deps.sh OSL build issues reported by users: run ldconfig immediately after lib compile (looks like OSL compile process needs boost libs...). 2013-09-19 11:25:47 +00:00
Bastien Montagne
b35f1eaa84 Fix py/numpy build under Suse, and minor other fixes/enhancements.
Also switch to python3.3.2
2013-09-17 11:01:52 +00:00
Sergey Sharybin
4478197ef6 Somplify one-liner for CPU cores detection and make it aware of multi-CPU computers 2013-09-17 09:17:10 +00:00
Bastien Montagne
31b84c9c28 Grrr, forgot to update getopt command for updated args... 2013-09-16 15:48:37 +00:00
Bastien Montagne
01747a9cf0 Add --required-numpy to force compilation of both py3.3 and numpy1.7 in case you really need numpy and 1.7 is not available! 2013-09-16 15:22:10 +00:00
Daniel Salazar
0732375d35 Making install_deps.sh correctly see hyperthreading 2013-09-16 14:38:33 +00:00
Bastien Montagne
fa1683e713 Install_deps.sh updates:
* Raise OpenCOLLADA version to 18da7f4109a8eafaa290a33f5550501cc4c8bae8 as requested by Gaia.
* Made OSL build/install ON by default (no more an experimental feature!).
* Use default LLVM version under Debian (specifying a version does not work with OSL when you have more that one installed :( ).
2013-09-16 13:02:49 +00:00
Bastien Montagne
4c38db307e Fix [#36534] Errors in install_deps.sh script when running on Arch Linux
Patch provided by Darren Beck, thanks!
2013-08-22 06:05:40 +00:00
Bastien Montagne
65b4f41342 Linux install_deps: update OpenCOLLADA to 828b60384552b83e55d2af7055f07d2c40b4d3f4 repo UID. 2013-08-10 11:06:46 +00:00
Bastien Montagne
2c506fd70c Patch [#35897] install_deps: add OpenEXR to ldconfig by Gavin Howard, thanks. 2013-06-30 16:20:59 +00:00
Bastien Montagne
ba2ee5f5f3 Update osl magic number when updating version ;) 2013-06-26 12:37:48 +00:00
Thomas Dinges
d5fd3b3688 Install Deps script:
* Use recent OSL 1.3.2 release.
2013-06-26 11:30:37 +00:00
Daniel Salazar
b2e01fa6bb Updating suse packman repo url, name and alias to go in line with what suse does right now. At least this should avoid duplicate packman repos on 12.3 2013-06-20 21:36:30 +00:00
Bastien Montagne
6a269e2a8e Install_deps.sh: ask suse users whether they want to install packman or not (can be already installed/enabled from a different URL, Suse repositories management is to complex to be handled automatically at this point). 2013-06-20 19:19:11 +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
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