deepcrayon/buildroot
deepcrayon/buildroot
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

package/mplayer: fix aarch64 compilation

Browse source 
Added code to define HAVE_ARMV8 when needed.

Fixes
http://autobuild.buildroot.net/results/5f8/5f85c32eb89aac48ae8da892d9800bd13274cd3e/

Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
This commit is contained in:
Bernd Kuhls 2016-05-28 11:03:12 +02:00 committed by Thomas Petazzoni
parent 4d185e5ec5
commit 5468ce85d5
2 changed files with 47 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
package/mplayer/0003-configure-armv8.patch Normal file
View file

@ -0,0 +1,43 @@
Fix aarch64 compile by adding HAVE_ARMV8 define
Fixes build errors seen on the buildroot autobuilders:
http://autobuild.buildroot.net/results/5f8/5f85c32eb89aac48ae8da892d9800bd13274cd3e/build-end.log
libavutil/aarch64/cpu.c: In function 'ff_get_cpu_flags_aarch64':
libavutil/aarch64/cpu.c:25:32: error: 'HAVE_ARMV8' undeclared (first use in this function)
return AV_CPU_FLAG_ARMV8 * HAVE_ARMV8 |
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
(patch sent upstream:
http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2016-May/073496.html)
Index: configure
===================================================================
--- a/configure (revision 37871)
+++ b/configure (working copy)
@@ -1445,6 +1445,8 @@
--disable-armv6) _armv6=no ;;
--enable-armv6t2) _armv6t2=yes ;;
--disable-armv6t2) _armv6t2=no ;;
+ --enable-armv8) _armv8=yes ;;
+ --disable-armv8) _armv8=no ;;
--enable-armvfp) _armvfp=yes ;;
--disable-armvfp) _armvfp=no ;;
--enable-vfpv3) vfpv3=yes ;;
@@ -3261,7 +3263,7 @@
echores "$_iwmmxt"
fi
-cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
+cpuexts_all='ALTIVEC XOP AVX AVX2 FMA3 FMA4 MMX MMX2 MMXEXT AMD3DNOW AMD3DNOWEXT SSE SSE2 SSE3 SSSE3 SSE4 SSE42 FAST_CMOV I686 FAST_CLZ ARMV5TE ARMV6 ARMV6T2 ARMV8 VFP VFPV3 SETEND NEON IWMMXT MMI VIS MVI'
test "$_altivec" = yes && cpuexts="ALTIVEC $cpuexts"
test "$_mmx" = yes && cpuexts="MMX $cpuexts"
test "$_mmxext" = yes && cpuexts="MMX2 $cpuexts"
@@ -3285,6 +3287,7 @@
test "$_armv5te" = yes && cpuexts="ARMV5TE $cpuexts"
test "$_armv6" = yes && cpuexts="ARMV6 $cpuexts"
test "$_armv6t2" = yes && cpuexts="ARMV6T2 $cpuexts"
+test "$_armv8" = yes && cpuexts="ARMV8 $cpuexts"
test "$_armvfp" = yes && cpuexts="VFP $cpuexts"
test "$vfpv3" = yes && cpuexts="VFPV3 $cpuexts"
test "$setend" = yes && cpuexts="SETEND $cpuexts"

4
package/mplayer/mplayer.mk
View file

@ -254,6 +254,10 @@ ifeq ($(BR2_ARM_CPU_ARMV6)$(BR2_ARM_CPU_ARMV7A),y)
MPLAYER_CONF_OPTS += --enable-armv6
endif
ifeq ($(BR2_aarch64),y)
MPLAYER_CONF_OPTS += --enable-armv8
endif
ifeq ($(BR2_ARM_SOFT_FLOAT),)
ifeq ($(BR2_ARM_CPU_HAS_NEON),y)
MPLAYER_CONF_OPTS += --enable-neon