diff options
Diffstat (limited to 'meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch')
-rw-r--r-- | meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch index 3fac2d1cd..890adde50 100644 --- a/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch +++ b/meta-raspberrypi/recipes-multimedia/omxplayer/omxplayer/0006-Prevent-ffmpeg-configure-compile-race-condition.patch @@ -1,4 +1,4 @@ -From 4a13419e3805b541fc58e57f1f27c4a388609ef5 Mon Sep 17 00:00:00 2001 +From f570b9985ff2d57d21c1e64ed08c43b6d89fd0b1 Mon Sep 17 00:00:00 2001 From: Paul Barker <pbarker@toganlabs.com> Date: Thu, 7 Sep 2017 20:02:15 +0000 Subject: [PATCH] Prevent ffmpeg configure/compile race condition @@ -8,15 +8,16 @@ the configure stage is finished before the compile stage starts. Signed-off-by: Paul Barker <pbarker@toganlabs.com> Upstream-status: Pending + --- Makefile.ffmpeg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -diff --git a/Makefile.ffmpeg b/Makefile.ffmpeg -index 8651724..619c49a 100644 ---- a/Makefile.ffmpeg -+++ b/Makefile.ffmpeg -@@ -6,7 +6,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-abi=$(FLOAT) -mno-apcs-stack-check -mstru +Index: git/Makefile.ffmpeg +=================================================================== +--- git.orig/Makefile.ffmpeg ++++ git/Makefile.ffmpeg +@@ -5,7 +5,7 @@ FFMPEG_EXTRA_CFLAGS?=-mfpu=vfp -mfloat-a WORK=$(PWD) .PHONY : all @@ -25,15 +26,12 @@ index 8651724..619c49a 100644 .PHONY : copy copy: -@@ -14,7 +14,7 @@ copy: +@@ -13,7 +13,7 @@ copy: $(HOST)-strip *.so* .PHONY : compile -compile: +compile: configure - +$(MAKE) -C ffmpeg + +$(MAKE) -j$(shell nproc) -C ffmpeg .PHONY : configure --- -2.7.4 - |