Merge branch 'master' of https://github.com/avTranscoder/avTranscoder into dev_pyTest

Clement Champetier · Clement Champetier · commit aa99dd2e164c · 2014-10-20T17:30:31.000+02:00
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -125,7 +125,7 @@ if(SWIG_FOUND)
 		ADD_CUSTOM_COMMAND(
 			TARGET avtranscoder-java
 			POST_BUILD
-			COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.java"
+			COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "\"${AVTRANSCODER_JAVA_OUTPUT_PATH}\"/*.java"
 			COMMAND ${Java_JAR_EXECUTABLE} cf ${AVTRANSCODER_JAR_NAME} "-C" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "."
 		)
 
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -4,8 +4,6 @@ lsb_release -a
 sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
 sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty-updates main restricted universe multiverse"
 sudo apt-add-repository "deb http://security.ubuntu.com/ubuntu trusty-security main restricted universe multiverse"
-sudo add-apt-repository -y ppa:motumedia/libav-daily
-sudo apt-get update
+sudo apt-get update -qq
 sudo apt-get install -qq gcc g++ cmake swig swig2.0
-sudo apt-get install -qq python-nose
-sudo apt-get install -qq libavcodec56 libavformat56 libavutil54 libswscale3 libavresample2 python-dev freeglut3-dev libxmu-dev doxygen
+sudo apt-get install -qq libavdevice-dev libavformat-dev libavcodec-dev libavutil-dev libswscale-dev libavresample-dev python-dev freeglut3-dev libxmu-dev doxygen

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ if(SWIG_FOUND)`
`125`	`125`	`ADD_CUSTOM_COMMAND(`
`126`	`126`	`TARGET avtranscoder-java`
`127`	`127`	`POST_BUILD`
`128`		`- COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "${AVTRANSCODER_JAVA_OUTPUT_PATH}/*.java"`
	`128`	`+ COMMAND ${Java_JAVAC_EXECUTABLE} "-d" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "\"${AVTRANSCODER_JAVA_OUTPUT_PATH}\"/*.java"`
`129`	`129`	`COMMAND ${Java_JAR_EXECUTABLE} cf ${AVTRANSCODER_JAR_NAME} "-C" ${AVTRANSCODER_JAVA_CLASS_OUTPUT_PATH} "."`
`130`	`130`	`)`
`131`	`131`