[FFmpeg-cvslog] Merge commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 20:39:37 2017 -0300| [6c35f890678346ae91d318c17da84f1894e0c127] | committer: James Almer

Merge commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285'

* commit 'c599c43fa147d7a001cdbf8f3b7da0a965f2e285':
  configure: Add missing arch dependencies for arch extensions

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6c35f890678346ae91d318c17da84f1894e0c127
---

 configure | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/configure b/configure
index fe1c8f7dbd..dbf4ef3c95 100755
--- a/configure
+++ b/configure
@@ -2323,25 +2323,25 @@ setend_deps="arm"
 
 map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
 
+altivec_deps="ppc"
+dcbzl_deps="ppc"
+ldbrx_deps="ppc"
+ppc4xx_deps="ppc"
+vsx_deps="altivec"
+power8_deps="vsx"
+
 loongson2_deps="mips"
 loongson3_deps="mips"
-mipsfpu_deps="mips"
-mipsdsp_deps="mips"
-mipsdspr2_deps="mips"
 mips32r2_deps="mips"
 mips32r5_deps="mips"
 mips32r6_deps="mips"
 mips64r2_deps="mips"
 mips64r6_deps="mips"
-msa_deps="mipsfpu"
+mipsfpu_deps="mips"
+mipsdsp_deps="mips"
+mipsdspr2_deps="mips"
 mmi_deps="mips"
-
-altivec_deps="ppc"
-dcbzl_deps="ppc"
-ldbrx_deps="ppc"
-ppc4xx_deps="ppc"
-vsx_deps="altivec"
-power8_deps="vsx"
+msa_deps="mipsfpu"
 
 cpunop_deps="i686"
 x86_64_select="i686"


======================================================================

diff --cc configure
index fe1c8f7dbd,995928069e..dbf4ef3c95
--- a/configure
+++ b/configure
@@@ -2323,25 -1888,22 +2323,25 @@@ setend_deps="arm
  
  map 'eval ${v}_inline_deps=inline_asm' $ARCH_EXT_LIST_ARM
  
+ altivec_deps="ppc"
+ dcbzl_deps="ppc"
+ ldbrx_deps="ppc"
+ ppc4xx_deps="ppc"
+ vsx_deps="altivec"
+ power8_deps="vsx"
+ 
 -loongson_deps="mips"
 -mips32r1_deps="mips32"
 -mips32r2_deps="mips32"
 -mips32r6_deps="mips32"
 -mips64r1_deps="mips64"
 -mips64r2_deps="mips64"
 -mips64r6_deps="mips64"
 -
 -vis_deps="sparc"
 +loongson2_deps="mips"
 +loongson3_deps="mips"
- mipsfpu_deps="mips"
- mipsdsp_deps="mips"
- mipsdspr2_deps="mips"
 +mips32r2_deps="mips"
 +mips32r5_deps="mips"
 +mips32r6_deps="mips"
 +mips64r2_deps="mips"
 +mips64r6_deps="mips"
- msa_deps="mipsfpu"
++mipsfpu_deps="mips"
++mipsdsp_deps="mips"
++mipsdspr2_deps="mips"
 +mmi_deps="mips"
- 
- altivec_deps="ppc"
- dcbzl_deps="ppc"
- ldbrx_deps="ppc"
- ppc4xx_deps="ppc"
- vsx_deps="altivec"
- power8_deps="vsx"
++msa_deps="mipsfpu"
  
  cpunop_deps="i686"
  x86_64_select="i686"