Merge branch 'release/v0.1.0'

- First very alpha release. Feature complete at a high level, but buggy, and
  the API will likely change.

Author: artclarke

README.md

@@ -82,7 +82,9 @@ To cross-compile for linux and windows in addition to Mac OS X, run:
 
 ## Linux Build Notes
 
-You need to make sure the Chef recipes that are in `./Vagrantfile` get installed on your Linux box. I've only tested on Ubuntu 12.04 LTS, so that's all that suppored to build on.
+You need to make sure the Chef recipes that are in `./Vagrantfile` get installed on your Linux box. Those recipes are in the humble-video-chef project. 
+
+I've only tested on Ubuntu 12.04 LTS, so that's all that supported to build on, and it's a work in progress so hang tight..
 
 To build, once the chef recipes have run on a clean box, just run:
 

Vagrantfile

@@ -4,6 +4,8 @@
 # Vagrantfile API/syntax version. Don't touch unless you know what you're doing!
 VAGRANTFILE_API_VERSION = "2"
 
+Vagrant.require_version ">= 1.6.3"
+
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # All Vagrant configuration is done here. The most common configuration
   # options are documented and commented below. For a complete reference,
@@ -19,7 +21,8 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Create a forwarded port mapping which allows access to a specific port
   # within the machine from a port on the host machine. In the example below,
   # accessing "localhost:8080" will access port 80 on the guest machine.
-  config.vm.network :forwarded_port, guest: 80, host: 9080
+  config.vm.network "forwarded_port", guest: 80, host: 9080
+  
 
   # Create a private network, which allows host-only access to the machine
   # using a specific IP.
@@ -44,13 +47,13 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # backing providers for Vagrant. These expose provider-specific options.
   # Example for VirtualBox:
   #
-  # config.vm.provider :virtualbox do |vb|
+  config.vm.provider :virtualbox do |vb|
   #   # Don't boot with headless mode
   #   vb.gui = true
   #
   #   # Use VBoxManage to customize the VM. For example to change memory:
   #   vb.customize ["modifyvm", :id, "--memory", "1024"]
-  # end
+  end
   #
   # View the documentation for the provider you're using for more
   # information on available options.
@@ -90,7 +93,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
     chef.add_recipe "build-essential"
     chef.add_recipe "git"
     chef.add_recipe "ohai"
-    chef.add_recipe "iptables"
+#    chef.add_recipe "iptables"
     chef.add_recipe "apache2"
     chef.add_recipe "nginx"
     chef.add_recipe "yum"

humble-video-captive/src/main/gnu/cross-configure.sh

@@ -6,13 +6,22 @@ HOST=$( ${DIR}/mk/config.guess )
 
 humble_configure()
 {
-  PREFIX="$1/humble-video-arch-$2/target/native"
   BUILD=$2
+  PREFIX_DEBUG="$1/humble-video-arch-$2-debug/target/native"
+  if [ ! -e ./${cross_os}-debug/Makefile ]; then
+    echo "Building ${DIR}/configure in ${PREFIX_DEBUG}"
+    mkdir -p ./${cross_os}-debug
+    mkdir -p "${PREFIX_DEBUG}"
+    (cd ./${cross_os}-debug && (${DIR}/configure --enable-optimizations=no --prefix="${PREFIX_DEBUG}" --host="${BUILD}" ${HUMBLE_CONFIGURE} | tee configure.log))
+  else
+    echo "Makefile appears to be up-to-date in ${cross_os}-debug"
+  fi
+  PREFIX="$1/humble-video-arch-$2/target/native"
   if [ ! -e ./${cross_os}/Makefile ]; then
     echo "Building ${DIR}/configure in ${PREFIX}"
     mkdir -p ./$cross_os
     mkdir -p "${PREFIX}"
-    (cd ./${cross_os} && (${DIR}/configure --prefix="${PREFIX}" --host="${BUILD}" ${HUMBLE_CONFIGURE} | tee configure.log))
+    (cd ./${cross_os} && (${DIR}/configure --enable-optimizations=yes --prefix="${PREFIX}" --host="${BUILD}" ${HUMBLE_CONFIGURE} | tee configure.log))
   else
     echo "Makefile appears to be up-to-date in ${cross_os}"
   fi

humble-video-captive/src/main/gnu/libtheora/incarcerate.in

@@ -18,16 +18,18 @@ else
 fi
 
 DISABLE_ASM=
+VS_CFLAGS="@CFLAGS@"
 case $HOST_OS in
   *darwin*)
   DISABLE_ASM="--disable-asm"
+  VS_CFLAGS="-Wno-error=unused-command-line-argument-hard-error-in-future @CFLAGS@"
   ;;
   *)
   ;;
 esac
 
 CC="@CC@" \
-CFLAGS="-I@includedir@ @CFLAGS@" \
+CFLAGS="-I@includedir@ ${VS_CFLAGS}" \
 LD="@LD@" \
 LDFLAGS="-L@libdir@ @LDFLAGS@" \
 CPP="@CPP@" \

humble-video-captive/src/main/gnu/libx264/csrc/configure

@@ -464,7 +464,8 @@ case $host_os in
         ;;
     darwin*)
         SYS="MACOSX"
-        CFLAGS="$CFLAGS -falign-loops=16"
+# From http://stackoverflow.com/questions/22678938/error-compiling-x264-on-mac-os-x
+        CFLAGS="$CFLAGS"
         libm="-lm"
         if [ "$pic" = "no" ]; then
             cc_check "" -mdynamic-no-pic && CFLAGS="$CFLAGS -mdynamic-no-pic"

humble-video-chef/cookbooks/humble-ubuntu-development/recipes/default.rb

@@ -2,39 +2,58 @@
 # Cookbook Name:: humble_development
 # Recipe:: default
 #
-# Copyright 2013, Humble Software
+# Copyright 2014, Humble Software
 #
 # All rights reserved - Do Not Redistribute
 #
+#
+apt_repository "saucy" do
+   uri "http://ubuntu.mirror.cambrium.nl/ubuntu/" 
+   distribution "saucy"
+   components ["main"]
+end
 
 package "autoconf" do
+  version "2.69-1.1"
   action :upgrade
 end
-package "automake" do
+package "automake" do   
+  version "1:1.13.3-1.1ubuntu2"
   action :upgrade
 end
+apt_repository "saucy" do
+   action :remove
+end
 package "libtool" do
+  version "2.4.2-1ubuntu1"
   action :upgrade
 end
 package "pkg-config" do
+  version "0.26-1ubuntu1"
   action :upgrade
 end
 package "gcc-multilib" do
+  version "4:4.6.3-1ubuntu5"
   action :upgrade
 end
 package "g++-multilib" do
+  version "4:4.6.3-1ubuntu5"
   action :upgrade
 end
 package "mingw-w64" do
+  version "2.0.1-1"
   action :upgrade
 end
 package "g++-mingw-w64" do
+  version "4.6.3-1ubuntu5+5ubuntu1"
   action :upgrade
 end
 package "gcc-mingw-w64" do
+  version "4.6.3-1ubuntu5+5ubuntu1"
   action :upgrade
 end
 package "binutils-mingw-w64" do
+  version "2.22-2ubuntu1+1"
   action :upgrade
 end
 # There is a bug in virtualbox that cause 'strip' of a '.dll' file
@@ -70,17 +89,22 @@
   not_if {File.exists?("/usr/bin/i686-w64-mingw32-strip")}
 end
 package "doxygen" do
+  version "1.7.6.1-2ubuntu1"
   action :upgrade
 end
 package "valgrind" do
+  version "1.3.7.0-0"
   action :upgrade
 end
 package "graphviz" do
+  version "2.26.3-10"
   action :upgrade
 end
 package "maven" do
+  version "3.0.4-2"
   action :upgrade
 end
 package "libpcre3-dev" do
+  version "8.12-4"
   action :upgrade
 end

humble-video-native/src/main/gnu/Makefile.am

@@ -167,9 +167,9 @@ EXTRA_DIST= \
   mk/lib
 
 install-exec-hook:
-	@$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${host}
-	@cp -f pom-@host@.xml $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${host}/pom.xml
-	@(cd $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${host} && mvn install)
+	@$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}
+	@cp -f pom.xml $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/pom.xml
+	@(cd $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST} && mvn install)
 
 doc: doxygen-doc
 

humble-video-native/src/main/gnu/Makefile.in

@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.13.2 from Makefile.am.
+# Makefile.in generated by automake 1.14.1 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -84,11 +84,12 @@ DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \
 	$(top_srcdir)/mk/Makefile.global.in \
 	$(top_srcdir)/mk/Makefile.dependencies.in \
 	$(top_srcdir)/mk/memcheck.in $(top_srcdir)/mk/pom.xml.in \
-	COPYING mk/README mk/ar-lib mk/config.guess mk/config.sub \
-	mk/depcomp mk/install-sh mk/missing mk/ltmain.sh \
-	$(top_srcdir)/mk/ar-lib $(top_srcdir)/mk/config.guess \
-	$(top_srcdir)/mk/config.sub $(top_srcdir)/mk/install-sh \
-	$(top_srcdir)/mk/ltmain.sh $(top_srcdir)/mk/missing
+	COPYING mk/README mk/ar-lib mk/compile mk/config.guess \
+	mk/config.sub mk/depcomp mk/install-sh mk/missing mk/ltmain.sh \
+	$(top_srcdir)/mk/ar-lib $(top_srcdir)/mk/compile \
+	$(top_srcdir)/mk/config.guess $(top_srcdir)/mk/config.sub \
+	$(top_srcdir)/mk/install-sh $(top_srcdir)/mk/ltmain.sh \
+	$(top_srcdir)/mk/missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_compiler_vendor.m4 \
 	$(top_srcdir)/m4/ax_prog_doxygen.m4 \
@@ -103,7 +104,7 @@ am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 mkinstalldirs = $(install_sh) -d
 CONFIG_HEADER = $(top_builddir)/src/io/humble/ferry/config.h
 CONFIG_CLEAN_FILES = mk/Makefile.global mk/Makefile.dependencies \
-	mk/memcheck pom-${host}.xml
+	mk/memcheck pom.xml
 CONFIG_CLEAN_VPATH_FILES =
 AM_V_P = $(am__v_P_@AM_V@)
 am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
@@ -323,6 +324,7 @@ VS_LDFLAGS = @VS_LDFLAGS@
 VS_LIBGCC = @VS_LIBGCC@
 VS_LIBGCC_EH = @VS_LIBGCC_EH@
 VS_LIBSTDCXX = @VS_LIBSTDCXX@
+VS_MVN_HOST = @VS_MVN_HOST@
 VS_OS_WINDOWS = @VS_OS_WINDOWS@
 VS_PROJECT_NAME = @VS_PROJECT_NAME@
 VS_SWIG = @VS_SWIG@
@@ -455,7 +457,7 @@ mk/Makefile.dependencies: $(top_builddir)/config.status $(top_srcdir)/mk/Makefil
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 mk/memcheck: $(top_builddir)/config.status $(top_srcdir)/mk/memcheck.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
-pom-${host}.xml: $(top_builddir)/config.status $(top_srcdir)/mk/pom.xml.in
+pom.xml: $(top_builddir)/config.status $(top_srcdir)/mk/pom.xml.in
 	cd $(top_builddir) && $(SHELL) ./config.status $@
 
 mostlyclean-libtool:
@@ -657,10 +659,16 @@ dist-xz: distdir
 	$(am__post_remove_distdir)
 
 dist-tarZ: distdir
+	@echo WARNING: "Support for shar distribution archives is" \
+	               "deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z
 	$(am__post_remove_distdir)
 
 dist-shar: distdir
+	@echo WARNING: "Support for distribution archives compressed with" \
+		       "legacy program 'compress' is deprecated." >&2
+	@echo WARNING: "It will be removed altogether in Automake 2.0" >&2
 	shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz
 	$(am__post_remove_distdir)
 
@@ -702,9 +710,10 @@ distcheck: dist
 	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure \
 	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	    --srcdir=.. --prefix="$$dc_install_base" \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
 	  && $(MAKE) $(AM_MAKEFLAGS) check \
@@ -932,9 +941,9 @@ include $(abs_top_builddir)/mk/Makefile.global
 @DX_COND_doc_TRUE@	$(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG)
 
 install-exec-hook:
-	@$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${host}
-	@cp -f pom-@host@.xml $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${host}/pom.xml
-	@(cd $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${host} && mvn install)
+	@$(MKDIR_P) $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}
+	@cp -f pom.xml $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST}/pom.xml
+	@(cd $(abs_top_srcdir)/../../../../humble-video-stage/humble-video-arch-${VS_MVN_HOST} && mvn install)
 
 doc: doxygen-doc