From 5bc39ec1c9692539168da3e071aed5cd45bad05e Mon Sep 17 00:00:00 2001 From: Arne Augenstein Date: Fri, 22 Apr 2016 20:31:42 +0200 Subject: [PATCH 1/3] correct position of #!/bin/sh --- piomxtextures_tools/prepare_openmaxil_backend.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/piomxtextures_tools/prepare_openmaxil_backend.sh b/piomxtextures_tools/prepare_openmaxil_backend.sh index b4ac0e7..fd23ab5 100755 --- a/piomxtextures_tools/prepare_openmaxil_backend.sh +++ b/piomxtextures_tools/prepare_openmaxil_backend.sh @@ -1,10 +1,10 @@ +#!/bin/sh # # Project: OpenMAXIL QtMultimedia Plugin # Company: - # Author: Luca Carlon (carlon.luca (AT) gmail.com) # Date: 04.21.2013 # -#!/bin/sh # This script can be used to prepare everything you need to compile the OpenMAXIL QtMultimedia backend # into Qt sources. Run this script and PiOmxTextures and ffmpeg libs will be built and placed into From baf1877fcb590188658904379659e952a272f119 Mon Sep 17 00:00:00 2001 From: Arne Augenstein Date: Fri, 22 Apr 2016 20:44:24 +0200 Subject: [PATCH 2/3] fixing ffmpeg paths --- piomxtextures_tools/compile_ffmpeg.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/piomxtextures_tools/compile_ffmpeg.sh b/piomxtextures_tools/compile_ffmpeg.sh index dcaf01d..7d1bed2 100755 --- a/piomxtextures_tools/compile_ffmpeg.sh +++ b/piomxtextures_tools/compile_ffmpeg.sh @@ -536,7 +536,7 @@ make -j$(grep -c "^processor" /proc/cpuinfo) make install echo "Cleaning up..." -mv ffmpeg_compiled/include ../ffmpeg_$1 -mv ffmpeg_compiled/lib ../ffmpeg_$1 +mv ffmpeg_compiled/include ../ +mv ffmpeg_compiled/lib ../ echo "Done! Bye bye! ;-)" From d27cbebeed48e4977ad05d29e7e6742f4ac9f435 Mon Sep 17 00:00:00 2001 From: Arne Augenstein Date: Fri, 22 Apr 2016 21:36:32 +0200 Subject: [PATCH 3/3] fixing script errors --- piomxtextures_tools/compile_ffmpeg.sh | 4 ++-- piomxtextures_tools/prepare_openmaxil_backend.sh | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/piomxtextures_tools/compile_ffmpeg.sh b/piomxtextures_tools/compile_ffmpeg.sh index 7d1bed2..dcaf01d 100755 --- a/piomxtextures_tools/compile_ffmpeg.sh +++ b/piomxtextures_tools/compile_ffmpeg.sh @@ -536,7 +536,7 @@ make -j$(grep -c "^processor" /proc/cpuinfo) make install echo "Cleaning up..." -mv ffmpeg_compiled/include ../ -mv ffmpeg_compiled/lib ../ +mv ffmpeg_compiled/include ../ffmpeg_$1 +mv ffmpeg_compiled/lib ../ffmpeg_$1 echo "Done! Bye bye! ;-)" diff --git a/piomxtextures_tools/prepare_openmaxil_backend.sh b/piomxtextures_tools/prepare_openmaxil_backend.sh index fd23ab5..c6579a7 100755 --- a/piomxtextures_tools/prepare_openmaxil_backend.sh +++ b/piomxtextures_tools/prepare_openmaxil_backend.sh @@ -22,7 +22,10 @@ fi echo "This script will automatically download and build the dependencies..." -if [ ! -d ../3rdparty/ffmpeg/lib ] || [ ! -d ../3rdparty/ffmpeg/include ]; then +if [ ! -d ../3rdparty/ffmpeg/ffmpeg_pi1/lib ] && [ ! -d ../3rdparty/ffmpeg/ffmpeg_pi2/lib ]; then + echo "It seems you did not compile ffmpeg. Please run compile_ffmpeg.sh first." + exit +elif [ ! -d ../3rdparty/ffmpeg/ffmpeg_pi1/include ] && [ ! -d ../3rdparty/ffmpeg/ffmpeg_pi2/include ]; then echo "It seems you did not compile ffmpeg. Please run compile_ffmpeg.sh first." exit fi