aboutsummaryrefslogtreecommitdiffstats
path: root/meta-multimedia/recipes-mediacentre/xbmc/xbmc/0004-Support-for-qemuarm.patch
blob: 48f3d2975df6852e749cff0143dec7be67cd2e57 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
From 54ce0e5fef8d8f4a374eb9df68c22781f989b52d Mon Sep 17 00:00:00 2001
From: Andrei Gherzan <andrei.gherzan@windriver.com>
Date: Sun, 17 Aug 2014 14:47:36 +0200
Subject: [PATCH] Add support for qemuarm

Signed-off-by: Andrei Gherzan <andrei.gherzan@windriver.com>

Upstream-Status: Inappropriate [OE specific]

---
 configure.in           | 17 +++++++++++++++++
 m4/xbmc_arch.m4        |  3 +++
 xbmc/utils/MathUtils.h |  6 ++++--
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/configure.in b/configure.in
index a195d00..6e2d432 100644
--- a/configure.in
+++ b/configure.in
@@ -231,6 +231,12 @@ AC_ARG_ENABLE([neon],
   [use_neon=$enableval],
   [use_neon=no])
 
+AC_ARG_ENABLE([vfp],
+  [AS_HELP_STRING([--enable-vfp],
+  [enable vfp passing to ffmpeg (default is yes)])],
+  [use_vfp=$enableval],
+  [use_vfp=yes])
+
 AC_ARG_ENABLE([optimizations],
   [AS_HELP_STRING([--enable-optimizations],
   [enable optimization (default is yes)])],
@@ -750,6 +756,11 @@ case $use_platform in
      CXXFLAGS="$CXXFLAGS"
      ffmpeg_target_os=linux
      ;;
+  qemuarm)
+     use_arch="arm"
+     use_neon=no
+     use_vfp=no
+     ;;
 esac
 
 XBMC_SETUP_ARCH_DEFINES()
@@ -2757,6 +2768,11 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
       else
         ffmpg_config="$ffmpg_config --disable-neon"
       fi
+      if test "$use_vfp"  = "yes"; then
+        ffmpg_config="$ffmpg_config --enable-vfp"
+      else
+        ffmpg_config="$ffmpg_config --disable-vfp"
+      fi
     else
       ffmpg_config="$ffmpg_config --disable-amd3dnow"
     fi
@@ -2815,6 +2831,7 @@ XB_CONFIG_MODULE([lib/ffmpeg], [
       `if test "$use_arch" != "no"; then echo --arch=$use_arch; fi`\
       `if test "$use_cpu" != "no"; then echo --cpu=$use_cpu; fi`\
       `if test "$use_neon" = "yes"; then echo --enable-neon; else echo --disable-neon; fi`\
+      `if test "$use_vfp" = "yes"; then echo --enable-vfp; else echo --disable-vfp; fi`\
       --target-os=$ffmpeg_target_os \
       --disable-muxers \
       --enable-muxer=spdif \
diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4
index 5bcdd81..f349cb2 100644
--- a/m4/xbmc_arch.m4
+++ b/m4/xbmc_arch.m4
@@ -47,5 +47,8 @@ case $use_platform in
   raspberry-pi)
      AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -D_ARMEL -DTARGET_RASPBERRY_PI")
      ;;
+  qemuarm)
+     AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_QEMUARM")
+     ;;
 esac
 ])
diff --git a/xbmc/utils/MathUtils.h b/xbmc/utils/MathUtils.h
index 96af9f4..69fd058 100644
--- a/xbmc/utils/MathUtils.h
+++ b/xbmc/utils/MathUtils.h
@@ -36,7 +36,8 @@
     defined(__powerpc__) || \
    (defined(TARGET_DARWIN_IOS) && defined(__llvm__)) || \
    (defined(TARGET_ANDROID) && defined(__arm__)) || \
-    defined(TARGET_RASPBERRY_PI)
+    defined(TARGET_RASPBERRY_PI) || \
+    defined(TARGET_QEMUARM)
   #define DISABLE_MATHUTILS_ASM_ROUND_INT
 #endif
 
@@ -44,7 +45,8 @@
     defined(__powerpc__) || \
    (defined(TARGET_DARWIN) && defined(__llvm__)) || \
    (defined(TARGET_ANDROID) && defined(__arm__)) || \
-    defined(TARGET_RASPBERRY_PI)
+    defined(TARGET_RASPBERRY_PI) || \
+    defined(TARGET_QEMUARM)
   #define DISABLE_MATHUTILS_ASM_TRUNCATE_INT
 #endif
 
-- 
1.9.3