Merge branch 'release-0.3.4'

Author: paperManu

Makefile.am

@@ -5,9 +5,10 @@ SUBDIRS = addons \
           src \
           data \
 		  tests \
-		  tools \
 		  osx
 
+#SUBDIRS += tools
+
 if HAVE_MARKDOWN
 dist_man_MANS = README.md
 $(top_builddir): markdown.stamp

NEWS

@@ -1,6 +1,22 @@
 Slash release notes
 ===================
 
+Splash 0.3.4 (2015-09-30)
+-------------------------
+New features:
+* Sound support in Image_FFmpeg
+* Seeking in Image_FFmpeg
+* Added architecture for effects on video
+* SMPTE LTC support, though not active yet
+
+Improvements:
+* Various fixes to enable building on OSX / Homebrew
+* Now using GLAD as a GL loader
+* Improved HTTP server
+
+Bug fixed:
+* Camera calibration
+
 Splash 0.3.2 (2015-08-05)
 -------------------------
 New features:

README.md

@@ -107,9 +107,9 @@ And you should be ready to go!
 
 If you want to get a more up to date version, you can try compiling and installing the latest version from the develop branch of this repository. Note that these version are more likely to contain bugs alongside new features / optimizations.
 
-    sudo apt-get install build-essential git-core subversion cmake automake libtool clang libxrandr-dev libxi-dev libboost-dev
-    sudo apt-get install libglm-dev libglew-dev libopenimageio-dev libshmdata-0.8-dev libjsoncpp-dev libgsl0-dev libzmq3-dev libsnappy-dev libgphoto2-dev
-    sudo apt-get install libglfw3-dev
+    sudo apt-get install build-essential git-core subversion cmake automake libtool clang libxrandr-dev libxi-dev libboost-system-dev
+    sudo apt-get install libglm-dev libglew-dev libopenimageio-dev libshmdata-1.0-dev libjsoncpp-dev libgsl0-dev libzmq3-dev libsnappy-dev libgphoto2-dev
+    sudo apt-get install libglfw3-dev libxinerama-dev libxcursor-dev
 
     git clone git://github.com/paperManu/splash
     cd splash
@@ -124,9 +124,13 @@ You can now try launching Splash:
 
 #### Mac OSX
 
+Before anything, note that you can grab the latest release version of Splash for OSX right [here](https://github.com/paperManu/splash/releases), as an application bundle.
+
 OSX installation is still a work in progress and has not been extensively tested (far from it!). Also, our current tests have shown that it is far easier to install on OSX version 10.9 or newer, as they switched from libstdc++ (GCC standard library) to libc++ (Clang standard library) as default which seems to solve tedious linking issues.
 
-So, let's start with the installation of the dependencies. Firstly download and install [MacPorts](https://www.macports.org/install.php), after having installed Xcode Developer Tools and XCode Command Line Developer Tools (from the [Apple Developer website](https://developer.apple.com/downloads)).
+So, let's start with the installation of the dependencies. Firstly download and install [MacPorts](https://www.macports.org/install.php) or [Homebrew](https://brew.sh), after having installed Xcode Developer Tools and XCode Command Line Developer Tools (from the [Apple Developer website](https://developer.apple.com/downloads)).
+
+The following steps will be using the port command from MacPorts, you may replace it with the brew equivalent if you are more of a Homebrew user. Note that compiling with the Homebrew versions of the libraries has not been tested, so please report issues (and ideally solutions as I do not have a Mac with Homebrew...).
 
 You can now install the command line tools we will need to download and compile the sources:
 
@@ -137,13 +141,13 @@ Grab and install OpenImageIO, the only library needed by Splash which is not pac
     sudo port install tiff openexr libpng boost
     git clone https://github.com/OpenImageIO/oiio
     cd oiio
-    git checkout Release-1.3.14
+    git checkout Release-1.5.18
     mkdir build && cd build
     cmake ..
     make && sudo make install
     cd ..
 
-We then install Shmdata, which depends on GStreamer:
+We then install Shmdata, which depends on GStreamer. Note that Shmdata is only needed if you want Splash to communicate with other Shmdata-compatible softwares. If you want to read video files or feed Splash through Syphon, you can skip this step.
 
     sudo port install libgstreamer1.0-dev libgstreamer-plugins-base1.0-dev python3-dev
     git clone https://github.com/nicobou/shmdata
@@ -170,8 +174,14 @@ You should now be able to launch Splash:
 
     splash --help
 
-It is also possible to create an app bundle automatically, the resulting bundle will be placed in the 'osx' subdirectory:
+It is also possible to create an app bundle automatically, the resulting bundle will be placed in the 'osx' subdirectory. You need to install a small tool which will take care of bundling the necessary libraries:
 
+    git clone https://github.com/auriamg/macdylibbundler
+    cd dylibbundler
+    make && sudo make install
+    cd ..
+    git clone https://github.com/paperManu/splash
+    cd splash
     ./build_osx.sh
 
 Remember that it is a very early port to OSX. Please report any issue you encounter!
@@ -685,7 +695,7 @@ User interface
 
 The user interface is currently separated in two parts: the first one is the json configuration file, where the Cameras, Windows and various Images and Meshes are set. There is currently no way to add any of these objects during runtime, although it is planned.
 
-The second part is a GUI which appears in the very first Window created (this means that if you prefer having the GUI in its own window, you can specify the first window as empty, i.e. no link to anything, this can be very handy). Once Splash is launched, the GUI appears by pressing the tabulation key. The Splash Control Panel is divided in subpanels, as follows:
+The second part is a GUI which appears in the very first Window created (this means that if you prefer having the GUI in its own window, you can specify the first window as empty, i.e. no link to anything, this can be very handy). Once Splash is launched, the GUI appears by pressing Ctrl + Tab. The Splash Control Panel is divided in subpanels, as follows:
 
 - Base commands: contains very generic commands, like saving and computing the blending map,
 - Shortcuts: shows a list of the shortcuts,
@@ -706,7 +716,7 @@ The way calibration works in Splash is to reproduce as closely as possible the p
 
 Once the configuration file is set and each videoprojector has an output, do the following on the screen which has the GUI :
 
-- Press 'tab' to make the GUI appear,
+- Press 'Ctrl + Tab' to make the GUI appear,
 - open the camera views, in the Views panel of the GUI,
 - while hovering the View panelpress space to navigate through all the cameras, until you find the one you want to calibrage,
 - press 'W' to switch the view to wireframe,
@@ -729,7 +739,7 @@ Color calibration is done by capturing (automatically) a bunch of photographs of
 
 - Connect a PTP-compatible camera to the computer. The list of compatible cameras can be found [there](http://gphoto.org/proj/libgphoto2/support.php).
 - Set the camera in manual mode, chose sensitivity (the lower the better regarding noise) and the aperture (between 1/5.6 and 1/8 to reduce vignetting).
-- Open the GUI by pressing 'tab'.
+- Open the GUI by pressing 'Ctrl + Tab'.
 - Go to the Control panel, find the "colorCalibrator" object in the list.
 - Set the various options, default values are a good start:
     - colorSamples is the number of samples taken for each channel of each projector,

addons/blender/Makefile.am

@@ -12,7 +12,8 @@ blenderSplash.zip:
 clean: clean-recursive
 	rm -f blenderSplash.zip Makefile
 
-distclean: distclean-recursive clean
+distclean: distclean-recursive
+	rm -f blenderSplash.zip Makefile
 
 datasdir = $(datadir)/splash/
 datas_DATA = \

configure.ac

@@ -2,13 +2,13 @@
 # Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.68)
-AC_INIT(SPLASH, 0.3.2, [email protected])
+AC_INIT(SPLASH, 0.3.4, [email protected])
 AC_CONFIG_MACRO_DIR([m4])
 AC_PROG_LIBTOOL
 AM_INIT_AUTOMAKE([1.9 tar-ustar])
 AC_CONFIG_HEADERS([include/config.h])
 
-AC_SUBST([LIBSPLASH_SO_VERSION], [0:3:2])
+AC_SUBST([LIBSPLASH_SO_VERSION], [0:3:4])
 AC_SUBST([LIBSPLASH_API_VERSION], [0.3])
 AC_DEFINE(LIBSPLASH_API_VERSION, ["0.3"], [API version])
 
@@ -31,10 +31,13 @@ case "$host" in *-darwin* | *-macos10*)
   LIBTOOL="glibtool"
   CXXFLAGS+=" -D__Darwin"
   LDFLAGS+=" -undefined dynamic_lookup -Wl,-headerpad_max_install_names"
+  CPPFLAGS+=" -I/usr/local/include -I/usr/local/include/jsoncpp"
+  CXXFLAGS+=" -I/usr/local/include -I/usr/local/include/jsoncpp"
+  LDFLAGS+=" -L/usr/local/lib"
   if test -d /opt/local ; then
-	CPPFLAGS+=" -I/usr/local/include -I/opt/local/include"
-	CXXFLAGS+=" -I/usr/local/include -I/opt/local/include"
-	LDFLAGS+=" -L/usr/local/lib -L/opt/local/lib"
+	CPPFLAGS+=" -I/opt/local/include"
+	CXXFLAGS+=" -I/opt/local/include"
+	LDFLAGS+=" -L/opt/local/lib"
   elif test -d /sw ; then
 	CPPFLAGS+=" -I/sw/include"
 	CXXFLAGS+=" -I/sw/include"
@@ -63,12 +66,6 @@ esac
 # Check for SSE
 AX_EXT
 
-# Also, GLEW is currently needed under OSX
-PKG_CHECK_MODULES([GLEW], [glew], have_glew=true, have_glew=false)
-if test "x${have_glew}" = "xfalse" && test "$HAVE_OSX" = "true" ; then
-  AC_MSG_ERROR([Missing glew, which is needed for building on OSX])
-fi
-
 # GLFW
 PKG_CHECK_MODULES([GLFW], [glfw3 >= 3.0.3])
 if test "x${have_glfw}" = "xfalse" ; then
@@ -152,6 +149,12 @@ PKG_CHECK_MODULES([FFMPEG], [libavformat libavcodec libavutil libswscale],
     AC_DEFINE([HAVE_FFMPEG], [0], [Defined to 1 if ffmpeg is detected]))
 AM_CONDITIONAL(HAVE_FFMPEG, test -n "$FFMPEG_LIBS")
 
+# PortAudio, to play sound
+PKG_CHECK_MODULES([PORTAUDIO], [portaudio-2.0],
+    AC_DEFINE([HAVE_PORTAUDIO], [1], [Defined to 1 if portaudio-2.0 is detected]),
+    AC_DEFINE([HAVE_PORTAUDIO], [0], [Defined to 1 if portaudio-2.0 is detected]))
+AM_CONDITIONAL(HAVE_PORTAUDIO, test -n "$PORTAUDIO_LIBS")
+
 # OpenCV, for their hardware support
 PKG_CHECK_MODULES([OPENCV], [opencv],
     AC_DEFINE([HAVE_OPENCV], [1], [Defined to 1 if OpenCV is detected]),
@@ -162,6 +165,12 @@ AM_CONDITIONAL(HAVE_OPENCV, test -n "$OPENCV_LIBS")
 BOOST_REQUIRE([1.50])
 BOOST_ASIO
 
+# LTC, for synchronization with a SMTPE clock through audio input
+PKG_CHECK_MODULES([LTC], [ltc],
+    AC_DEFINE([HAVE_LTC], [1], [Defined to 1 if ltc is detected]),
+    AC_DEFINE([HAVE_LTC], [0], [Defined to 1 if ltc is detected]))
+AM_CONDITIONAL(HAVE_LTC, test -n "$LTC_LIBS")
+
 # Check for Markdown to generate documentation
 AC_CHECK_PROGS([MARKDOWN], [markdown])
 if test "x$MARKDOWN" = "xtrue" ; then
@@ -187,6 +196,8 @@ AC_CONFIG_FILES([
     osx/Info.plist:osx/Info.plist.in
     osx/Makefile
 	tests/Makefile
-    tools/Makefile
 	])
+
+    #tools/Makefile
+
 AC_OUTPUT