Skip to content

Commit

Permalink
Changelog: update
Browse files Browse the repository at this point in the history
  • Loading branch information
devernay committed Jun 1, 2017
1 parent effb4fe commit dd4ea07
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 3 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@

- Radial, Rectangle and generators: when the Extent is set to Size, and Reformat is not checked, Bottom Left and Size can be animated.
- add Box filter to Transform, CornerPin, GodRays, and all Distortion nodes.
- ContactSheet: Make a contact sheet from several inputs or frames (beta)

## Version 2.2.7

Expand Down
37 changes: 34 additions & 3 deletions INSTALL_OSX.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ Now, if you want to use turbojpeg instead of jpeg:

And finally install the required packages:

sudo port -v install qt4-mac boost cairo expat gsed py27-pyside py27-sphinx
yes | sudo port -v install qt4-mac boost cairo expat gsed py27-pyside py27-sphinx
sudo ln -s python2.7-config /opt/local/bin/python2-config

Create the file /opt/local/lib/pkgconfig/glu.pc containing GLU
Expand All @@ -82,11 +82,11 @@ EOF

If you intend to build the [openfx-io](https://github.com/MrKepzie/openfx-io) plugins too, you will need these additional packages:

sudo port -v install x264 +high10 libvpx +highbitdepth libraw +gpl2 openexr ffmpeg +gpl2 +high10 +highbitdepth opencolorio openimageio +natron seexpr
yes | sudo port -v install x264 +high10 libvpx +highbitdepth libraw +gpl2 openexr ffmpeg +gpl2 +high10 +highbitdepth opencolorio openimageio +natron seexpr

and for [openfx-arena](https://github.com/olear/openfx-arena) (note that it installs a version of ImageMagick without support for many image I/O libraries):

sudo port -v install librsvg ImageMagick +natron poppler librevenge libcdr-0.1 libzip
yes | sudo port -v install librsvg ImageMagick +natron poppler librevenge libcdr-0.1 libzip

### Homebrew

Expand Down Expand Up @@ -337,6 +337,37 @@ It is also recommended in Xcode Preferences, select "Locations", then
the advanced settings to set the build location to Legacy (if not,
build files are somewhere under `~/Library/Developer/Xcode`.

### Build on Xcode with openmp clang

See instructions under "Using clang-omp with Xcode" at the following page https://clang-omp.github.io

On Macports clang now ships with openmp by default, to install:
sudo port install clang-4.0


In your config.pri file, add the following lines and change the paths according to your installation of clang

openmp {
INCLUDEPATH += /opt/local/include/libomp
LIBS += -L/opt/local/lib/libomp -liomp5

cc_setting.name = CC
cc_setting.value = /opt/local/bin/clang-mp-4.0
cxx_setting.name = CXX
cxx_setting.value = /opt/local/bin/clang++-mp-4.0
QMAKE_MAC_XCODE_SETTINGS += cc_setting cxx_setting
QMAKE_LFLAGS += "-B /usr/bin"

}


The qmake call should add CONFIG+=openmp

qmake -r -spec macx-xcode CONFIG+=debug CONFIG+=enable-osmesa LLVM_PATH=/opt/llvm OSMESA_PATH=/opt/osmesa CONFIG+=openmp


Then you can just build and run using Xcode

### Xcode caveats

Whenever the .pro files change, Xcode will try to launch qmake and
Expand Down

0 comments on commit dd4ea07

Please sign in to comment.