doc fixes

Author: devernay

Documentation/TuttleOFX-README.txt

@@ -294,9 +294,10 @@ launchctl setenv PATH /opt/local/bin:/opt/local/sbin:/usr/bin:/bin:/usr/sbin:/sb
 (cd Natron;git checkout workshop;git submodule update -i; git submodule foreach git pull origin master)
 cd Natron
 cat > config.pri << EOF
+boost-serialization-lib: LIBS += -L/opt/local/lib -lboost_serialization-mt
 boost{
     INCLUDEPATH += /opt/local/include
-    LIBS += -L/opt/local/lib -lboost_serialization-mt -lboost_thread-mt -lboost_system-mt
+    LIBS += -L/opt/local/lib -lboost_thread-mt -lboost_system-mt
 }
 EOF
 

INSTALL_FREEBSD.md

@@ -38,7 +38,8 @@ INCLUDEPATH is the path to the include files
 LIBS is the path to the libs
 
 ```pri
-boost: LIBS += -lboost_serialization
+boost-serialization-lib: LIBS += -lboost_serialization
+boost: LIBS += -lboost_thread -lboost_system
 PKGCONFIG += expat
 PKGCONFIG += fontconfig
 cairo {

INSTALL_LINUX.md

@@ -115,7 +115,8 @@ LIBS is the path to the libs
 ```
 ----- copy and paste the following in a terminal -----
 cat > config.pri << EOF
-boost: LIBS += -lboost_serialization
+boost-serialization-lib: LIBS += -lboost_serialization
+boost: LIBS += -lboost_thread -lboost_system
 expat: LIBS += -lexpat
 expat: PKGCONFIG -= expat
 cairo: PKGCONFIG -= cairo
@@ -191,7 +192,8 @@ It should be installed in `/usr/local/lib`
 For the config.pri, use the following:
 
 ```pri
-boost: LIBS += -lboost_serialization
+boost-serialization-lib: LIBS += -lboost_serialization
+boost: LIBS += -lboost_thread -lboost_system
 expat: LIBS += -lexpat
 expat: PKGCONFIG -= expat
 cairo {
@@ -231,13 +233,14 @@ sudo add-apt-repository -y ppa:irie/boost
 ```
 Install the required packages:
 ```
-sudo apt-get install libqt4-dev libboost-serialization-dev libexpat1-dev libcairo2-dev python-dev python-pyside libpyside-dev libshiboken-dev
+sudo apt-get install libqt4-dev libboost-serialization-dev libboost-system-dev libexpat1-dev libcairo2-dev python-dev python-pyside libpyside-dev libshiboken-dev
 ```
 
 For the config.pri use:
 
 ```
-boost: LIBS += -lboost_serialization
+boost-serialization-lib: LIBS += -lboost_serialization
+boost: LIBS += -lboost_thread -lboost_system
 expat: LIBS += -lexpat
 expat: PKGCONFIG -= expat
 cairo: PKGCONFIG -= cairo
@@ -260,7 +263,8 @@ yum install fontconfig-devel gcc-c++ expat-devel python-pyside-devel shiboken-de
 
 config.pri:
 ```pri
-boost: LIBS += -lboost_serialization
+boost-serialization-lib: LIBS += -lboost_serialization
+boost: LIBS += -lboost_thread -lboost_system
 PKGCONFIG += expat
 PKGCONFIG += fontconfig
 cairo {

INSTALL_OSX.md

@@ -215,7 +215,8 @@ config.pri:
  # copy and paste the following in a terminal
 cat > config.pri << EOF
 boost: INCLUDEPATH += /opt/local/include
-boost: LIBS += -L/opt/local/lib -lboost_serialization-mt
+boost-serialization-lib: LIBS += -lboost_serialization-mt
+boost: LIBS += -L/opt/local/lib -lboost_thread-mt -lboost_system-mt
 openmp {
   INCLUDEPATH += /opt/local/include/libomp
   LIBS += -L/opt/local/lib/libomp -liomp5
@@ -242,7 +243,8 @@ config.pri:
  # copy and paste the following in a terminal
 cat > config.pri << EOF
 boost: INCLUDEPATH += /usr/local/include
-boost: LIBS += -L/usr/local/lib -lboost_serialization-mt -lboost_thread-mt -lboost_system-mt
+boost-serialization-lib: LIBS += -lboost_serialization-mt
+boost: LIBS += -L/usr/local/lib -lboost_thread-mt -lboost_system-mt
 expat: PKGCONFIG -= expat
 expat: INCLUDEPATH += /usr/local/opt/expat/include
 expat: LIBS += -L/usr/local/opt/expat/lib -lexpat

INSTALL_WINDOWS.md

@@ -80,14 +80,17 @@ INCLUDEPATH is the path to the include files
 
 LIBS is the path to the libs
 
-    ----- copy and paste the following in a terminal -----
-    cat > config.pri << EOF
-    boost: LIBS += -lboost_serialization
-    expat: LIBS += -lexpat
-    expat: PKGCONFIG -= expat
-    cairo: PKGCONFIG -= cairo
-    EOF
-    ----- end -----
+```
+----- copy and paste the following in a terminal -----
+cat > config.pri << EOF
+boost-serialization-lib: LIBS += -lboost_serialization
+boost: LIBS += -lboost_thread -lboost_system
+expat: LIBS += -lexpat
+expat: PKGCONFIG -= expat
+cairo: PKGCONFIG -= cairo
+EOF
+----- end -----
+```
 
 ***note:*** *the last line for cairo is only necessary if the package for cairo in your distribution
 is lower than version 1.12 (as it is on Ubuntu 12.04 LTS for example).*
@@ -225,8 +228,8 @@ Here's an example of a config.pri file that supports both 32bit and 64bit builds
 
 boost {
         INCLUDEPATH +=  $$quote(C:\\boost)
-        CONFIG(release, debug|release): LIBS += -L$$quote(C:\\boost\\x64) -lboost_serialization-vc100-mt-1_57
-		CONFIG(debug, debug|release):  LIBS += -L$$quote(C:\\boost\\x64) -lboost_serialization-vc100-mt-gd-1_57
+        CONFIG(release, debug|release): LIBS += -L$$quote(C:\\boost\\x64) -lboost_serialization-vc100-mt-1_57 -lboost_thread-vc100-mt-1_57 -lboost_system-vc100-mt-1_57
+		CONFIG(debug, debug|release):  LIBS += -L$$quote(C:\\boost\\x64) -lboost_serialization-vc100-mt-gd-1_57 -lboost_thread-vc100-mt-gd-1_57 -lboost_system-vc100-mt-gd-1_57
 }
 
 expat{
@@ -265,8 +268,8 @@ shiboken {
 
 boost {
         INCLUDEPATH +=  $$quote(C:\\boost)
-        CONFIG(release, debug|release): LIBS += -L$$quote(C:\\boost\\win32) -lboost_serialization-vc100-mt-1_57
-		CONFIG(debug, debug|release): LIBS += -L$$quote(C:\\boost\\win32) -lboost_serialization-vc100-mt-gd-1_57
+        CONFIG(release, debug|release): LIBS += -L$$quote(C:\\boost\\win32) -lboost_serialization-vc100-mt-1_57 -lboost_thread-vc100-mt-1_57 -lboost_system-vc100-mt-1_57
+		CONFIG(debug, debug|release): LIBS += -L$$quote(C:\\boost\\win32) -lboost_serialization-vc100-mt-gd-1_57 -lboost_thread-vc100-mt-gd-1_57 -lboost_system-vc100-mt-gd-1_57
 }
 
 expat{

Natron.spec

@@ -35,7 +35,8 @@ Open source compositing software. Node-graph based. Similar in functionalities t
 %build
 mv Natron-OpenColorIO-Configs-2.1.0 OpenColorIO-Configs
 cat << 'EOF' > config.pri
-boost: LIBS += -lboost_serialization
+boost-serialization-lib: LIBS += -lboost_serialization
+boost: LIBS += -lboost_thread -lboost_system
 PKGCONFIG += expat
 PKGCONFIG += fontconfig
 cairo {

Tests/BaseTest.cpp

@@ -263,7 +263,7 @@ TEST_F(BaseTest, SetValues)
 
     assert(generator);
     KnobDoublePtr knob = toKnobDouble(generator->getKnobByName("noiseZ"));
-    EXPECT_TRUE(knob);
+    EXPECT_TRUE( bool(knob) );
     if (!knob) {
         return;
     }