kodi-17: Fix build for qemuarm and update to latest

Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
Khem Raj
2016-11-28 16:38:53 -08:00
committed by Martin Jansa
parent 54edcc5700
commit e5d586750e
3 changed files with 144 additions and 1 deletions

View File

@@ -0,0 +1,54 @@
From 19a1ffc1450bd3ecfb7419d74c733b2e16bf47f3 Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@balintreczey.hu>
Date: Wed, 26 Aug 2015 08:14:41 +0200
Subject: [PATCH 11/12] Let configure pass on unknown architectures setting
sane defaults
This helps porting Kodi to new architectures while emitting warnings about
entering uncharted territory.
---
configure.ac | 3 ++-
m4/xbmc_arch.m4 | 6 ++++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 925466a..8369615 100644
--- a/configure.ac
+++ b/configure.ac
@@ -658,7 +658,8 @@ case $host in
USE_STATIC_FFMPEG=1
;;
*)
- AC_MSG_ERROR(unsupported host ($host))
+ ARCH=$host_cpu"-"$host_os
+ AC_MSG_WARN([unsupported host ($host), guessing ARCH as $ARCH.])
esac
AC_SUBST([ARCH])
diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4
index ff5dc20..dfb45fd 100644
--- a/m4/xbmc_arch.m4
+++ b/m4/xbmc_arch.m4
@@ -27,7 +27,8 @@ case $build in
AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
;;
*)
- AC_MSG_ERROR(unsupported native build platform: $build)
+ AC_MSG_WARN([unsupported native build platform: $build])
+ AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
esac
@@ -70,7 +71,8 @@ case $host in
AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID")
;;
*)
- AC_MSG_ERROR(unsupported build target: $host)
+ AC_MSG_WARN([unsupported native build platform: $build])
+ AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX")
esac
if test "$target_platform" = "target_android" ; then
--
2.10.2

View File

@@ -0,0 +1,87 @@
From 9e88aa086083b80c05b2bf057b92682186c4e6dc Mon Sep 17 00:00:00 2001
From: Balint Reczey <balint@balintreczey.hu>
Date: Thu, 6 Oct 2016 18:12:18 +0200
Subject: [PATCH 12/12] Revert "[droid] fix builds with AML disabled"
This reverts commit 4733383b8f1c1dd0b95e9e5358425d8a0b7ba8fc.
---
xbmc/utils/SystemInfo.cpp | 4 ----
xbmc/windowing/egl/EGLWrapper.cpp | 16 ++++++----------
2 files changed, 6 insertions(+), 14 deletions(-)
diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
index fcc6733..52e7fa3 100644
--- a/xbmc/utils/SystemInfo.cpp
+++ b/xbmc/utils/SystemInfo.cpp
@@ -57,10 +57,8 @@
#include "utils/XMLUtils.h"
#if defined(TARGET_ANDROID)
#include "platform/android/jni/Build.h"
-#if defined(HAS_LIBAMCODEC)
#include "utils/AMLUtils.h"
#endif
-#endif
/* Platform identification */
#if defined(TARGET_DARWIN)
@@ -873,11 +871,9 @@ bool CSysInfo::IsAeroDisabled()
bool CSysInfo::HasHW3DInterlaced()
{
#if defined(TARGET_ANDROID)
-#if defined(HAS_LIBAMCODEC)
if (aml_hw3d_present())
return true;
#endif
-#endif
return false;
}
diff --git a/xbmc/windowing/egl/EGLWrapper.cpp b/xbmc/windowing/egl/EGLWrapper.cpp
index 30f5757..583d43a 100644
--- a/xbmc/windowing/egl/EGLWrapper.cpp
+++ b/xbmc/windowing/egl/EGLWrapper.cpp
@@ -24,19 +24,15 @@
#include <assert.h>
#if defined(TARGET_ANDROID)
#include "EGLNativeTypeAndroid.h"
-#if defined(HAS_LIBAMCODEC)
#include "EGLNativeTypeAmlAndroid.h"
#endif
-#endif
#if defined(TARGET_RASPBERRY_PI)
#include "EGLNativeTypeRaspberryPI.h"
#endif
#if defined(HAS_IMXVPU)
#include "EGLNativeTypeIMX.h"
#endif
-#if defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC)
#include "EGLNativeTypeAmlogic.h"
-#endif
#include "EGLWrapper.h"
#define CheckError() m_result = eglGetError(); if(m_result != EGL_SUCCESS) CLog::Log(LOGERROR, "EGL error in %s: %x",__FUNCTION__, m_result);
@@ -91,15 +87,15 @@ bool CEGLWrapper::Initialize(const std::string &implementation)
// Try to create each backend in sequence and go with the first one
// that we know will work
if (
-#if defined(TARGET_ANDROID) && defined(HAS_LIBAMCODEC)
- (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation))
-#elif defined(TARGET_ANDROID)
- (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation))
-#elif defined(TARGET_RASPBERRY_PI)
+#if defined(TARGET_ANDROID)
+ (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation)) ||
+ (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation)) ||
+#endif
+#if defined(TARGET_RASPBERRY_PI)
(nativeGuess = CreateEGLNativeType<CEGLNativeTypeRaspberryPI>(implementation))
#elif defined(HAS_IMXVPU)
(nativeGuess = CreateEGLNativeType<CEGLNativeTypeIMX>(implementation))
-#elif defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC)
+#else
(nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlogic>(implementation))
#endif
)
--
2.10.2

View File

@@ -63,7 +63,7 @@ PROVIDES = "xbmc"
SRCREV = "a10c5048f2487bd9b2dc1f35d2fee48a25945a70"
PV = "17.0+gitr${SRCPV}"
SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \
SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \
file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \
file://0004-handle-SIGTERM.patch \
file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \
@@ -72,6 +72,8 @@ SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \
file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \
file://0009-build-Add-support-for-musl-triplets.patch \
file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \
file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \
file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \
"
SRC_URI_append_libc-musl = " \