Fix Ubuntu Xenial package build

.dockerignore

+debian/tmp
+obj-*/

Dockerfile.debian

@@ -7,5 +7,5 @@ RUN apt-get update -qq && \
 	doxygen graphviz cmake git devscripts
 VOLUME /app
 WORKDIR /app/libshadertoy-0.0.1
+ENV SHADERTOY_ENTRYPOINT ubuntu
 ENTRYPOINT ["/app/libshadertoy-0.0.1/entrypoint.sh"]
-

Dockerfile.ubuntu

+FROM ubuntu:xenial
+MAINTAINER Vincent Tavernier <vincent.tavernier@inria.fr>
+RUN apt-get update -qq && \
+	apt-get install -y build-essential ca-certificates cmake \
+	debhelper devscripts doxygen dpkg-dev git graphviz \
+	libboost-all-dev libc6-dev libglew-dev libglfw3-dev \
+	libpng-dev libsoil-dev libstdc++6
+VOLUME /app
+WORKDIR /app/libshadertoy-0.0.1
+ENV SHADERTOY_ENTRYPOINT ubuntu
+ENTRYPOINT ["/app/libshadertoy-0.0.1/entrypoint.sh"]

build.sh

 #!/bin/bash
 
+# Safe mode
+set -e
+
 build_docker () {
 	# Build deb using docker
 	docker build -t libshadertoy/$OPTARG -f Dockerfile.$OPTARG .
 
 	# Run container
-	docker run --rm -it -v $(pwd)/..:/app -v $HOME/.gnupg:/root/.gnupg \
+	docker run --rm -it -v $(pwd)/..:/app -v $HOME/.gnupg:/root/.gnupg-src:ro \
 		libshadertoy/$OPTARG:latest
 
 	# Quit

debian/files

 libshadertoy-dev_0.0.1_amd64.deb libdevel optional
-libshadertoy0-dbgsym_0.0.1_amd64.deb debug extra
 libshadertoy0_0.0.1_amd64.deb libs optional
-libshadertoy_0.0.1_amd64.buildinfo libs optional

entrypoint.sh

 #!/bin/bash
 
 if [ "$EUID" -eq 0 ]; then
-	# Update sources
-	apt-get update -qq
+	if [ "$SHADERTOY_ENTRYPOINT" != "ubuntu" ]; then
+		# Update sources
+		apt-get update -qq
+
+		# Install build dependencies
+		apt-get -y build-dep .
+	fi
 
-	# Install build dependencies
-	apt-get -y build-dep .
+	cp -r /root/.gnupg-src /root/.gnupg
 fi
 
 if [ "$EUID" -eq 0 ] && [ -n "$BUILD_UID" ]; then
@@ -13,5 +17,14 @@ if [ "$EUID" -eq 0 ] && [ -n "$BUILD_UID" ]; then
 	exec sudo -u buildusr "$0"
 fi
 
+if [ "$SHADERTOY_ENTRYPOINT" = "ubuntu" ]; then
+	export DEBSIGN_PROGRAM=gpg2
+
+	apt-get update -qq
+	apt-get install -y gnupg2
+	mv /usr/bin/gpg /usr/bin/gpg1
+	ln -fs /usr/bin/gpg2 /usr/bin/gpg
+fi
+
 # Build package
 debuild

examples/00-build/CMakeLists.txt

@@ -30,3 +30,6 @@ target_link_libraries(example00-build
 	${GLEW_LIBRARIES}
 	${glfw3_LIBRARIES}
 	${shadertoy_LIBRARIES})
+
+# C++14
+set_property(TARGET example00-build PROPERTY CXX_STANDARD 14)