diff options
Diffstat (limited to 'meta-multimedia')
3 files changed, 144 insertions, 1 deletions
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0011-Let-configure-pass-on-unknown-architectures-setting-.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0011-Let-configure-pass-on-unknown-architectures-setting-.patch new file mode 100644 index 000000000..7ee44f1c4 --- /dev/null +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0011-Let-configure-pass-on-unknown-architectures-setting-.patch | |||
@@ -0,0 +1,54 @@ | |||
1 | From 19a1ffc1450bd3ecfb7419d74c733b2e16bf47f3 Mon Sep 17 00:00:00 2001 | ||
2 | From: Balint Reczey <balint@balintreczey.hu> | ||
3 | Date: Wed, 26 Aug 2015 08:14:41 +0200 | ||
4 | Subject: [PATCH 11/12] Let configure pass on unknown architectures setting | ||
5 | sane defaults | ||
6 | |||
7 | This helps porting Kodi to new architectures while emitting warnings about | ||
8 | entering uncharted territory. | ||
9 | --- | ||
10 | configure.ac | 3 ++- | ||
11 | m4/xbmc_arch.m4 | 6 ++++-- | ||
12 | 2 files changed, 6 insertions(+), 3 deletions(-) | ||
13 | |||
14 | diff --git a/configure.ac b/configure.ac | ||
15 | index 925466a..8369615 100644 | ||
16 | --- a/configure.ac | ||
17 | +++ b/configure.ac | ||
18 | @@ -658,7 +658,8 @@ case $host in | ||
19 | USE_STATIC_FFMPEG=1 | ||
20 | ;; | ||
21 | *) | ||
22 | - AC_MSG_ERROR(unsupported host ($host)) | ||
23 | + ARCH=$host_cpu"-"$host_os | ||
24 | + AC_MSG_WARN([unsupported host ($host), guessing ARCH as $ARCH.]) | ||
25 | esac | ||
26 | AC_SUBST([ARCH]) | ||
27 | |||
28 | diff --git a/m4/xbmc_arch.m4 b/m4/xbmc_arch.m4 | ||
29 | index ff5dc20..dfb45fd 100644 | ||
30 | --- a/m4/xbmc_arch.m4 | ||
31 | +++ b/m4/xbmc_arch.m4 | ||
32 | @@ -27,7 +27,8 @@ case $build in | ||
33 | AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") | ||
34 | ;; | ||
35 | *) | ||
36 | - AC_MSG_ERROR(unsupported native build platform: $build) | ||
37 | + AC_MSG_WARN([unsupported native build platform: $build]) | ||
38 | + AC_SUBST(NATIVE_ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") | ||
39 | esac | ||
40 | |||
41 | |||
42 | @@ -70,7 +71,8 @@ case $host in | ||
43 | AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX -DTARGET_ANDROID") | ||
44 | ;; | ||
45 | *) | ||
46 | - AC_MSG_ERROR(unsupported build target: $host) | ||
47 | + AC_MSG_WARN([unsupported native build platform: $build]) | ||
48 | + AC_SUBST(ARCH_DEFINES, "-DTARGET_POSIX -DTARGET_LINUX -D_LINUX") | ||
49 | esac | ||
50 | |||
51 | if test "$target_platform" = "target_android" ; then | ||
52 | -- | ||
53 | 2.10.2 | ||
54 | |||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch new file mode 100644 index 000000000..8d70b3f8f --- /dev/null +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch | |||
@@ -0,0 +1,87 @@ | |||
1 | From 9e88aa086083b80c05b2bf057b92682186c4e6dc Mon Sep 17 00:00:00 2001 | ||
2 | From: Balint Reczey <balint@balintreczey.hu> | ||
3 | Date: Thu, 6 Oct 2016 18:12:18 +0200 | ||
4 | Subject: [PATCH 12/12] Revert "[droid] fix builds with AML disabled" | ||
5 | |||
6 | This reverts commit 4733383b8f1c1dd0b95e9e5358425d8a0b7ba8fc. | ||
7 | --- | ||
8 | xbmc/utils/SystemInfo.cpp | 4 ---- | ||
9 | xbmc/windowing/egl/EGLWrapper.cpp | 16 ++++++---------- | ||
10 | 2 files changed, 6 insertions(+), 14 deletions(-) | ||
11 | |||
12 | diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp | ||
13 | index fcc6733..52e7fa3 100644 | ||
14 | --- a/xbmc/utils/SystemInfo.cpp | ||
15 | +++ b/xbmc/utils/SystemInfo.cpp | ||
16 | @@ -57,10 +57,8 @@ | ||
17 | #include "utils/XMLUtils.h" | ||
18 | #if defined(TARGET_ANDROID) | ||
19 | #include "platform/android/jni/Build.h" | ||
20 | -#if defined(HAS_LIBAMCODEC) | ||
21 | #include "utils/AMLUtils.h" | ||
22 | #endif | ||
23 | -#endif | ||
24 | |||
25 | /* Platform identification */ | ||
26 | #if defined(TARGET_DARWIN) | ||
27 | @@ -873,11 +871,9 @@ bool CSysInfo::IsAeroDisabled() | ||
28 | bool CSysInfo::HasHW3DInterlaced() | ||
29 | { | ||
30 | #if defined(TARGET_ANDROID) | ||
31 | -#if defined(HAS_LIBAMCODEC) | ||
32 | if (aml_hw3d_present()) | ||
33 | return true; | ||
34 | #endif | ||
35 | -#endif | ||
36 | return false; | ||
37 | } | ||
38 | |||
39 | diff --git a/xbmc/windowing/egl/EGLWrapper.cpp b/xbmc/windowing/egl/EGLWrapper.cpp | ||
40 | index 30f5757..583d43a 100644 | ||
41 | --- a/xbmc/windowing/egl/EGLWrapper.cpp | ||
42 | +++ b/xbmc/windowing/egl/EGLWrapper.cpp | ||
43 | @@ -24,19 +24,15 @@ | ||
44 | #include <assert.h> | ||
45 | #if defined(TARGET_ANDROID) | ||
46 | #include "EGLNativeTypeAndroid.h" | ||
47 | -#if defined(HAS_LIBAMCODEC) | ||
48 | #include "EGLNativeTypeAmlAndroid.h" | ||
49 | #endif | ||
50 | -#endif | ||
51 | #if defined(TARGET_RASPBERRY_PI) | ||
52 | #include "EGLNativeTypeRaspberryPI.h" | ||
53 | #endif | ||
54 | #if defined(HAS_IMXVPU) | ||
55 | #include "EGLNativeTypeIMX.h" | ||
56 | #endif | ||
57 | -#if defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC) | ||
58 | #include "EGLNativeTypeAmlogic.h" | ||
59 | -#endif | ||
60 | #include "EGLWrapper.h" | ||
61 | |||
62 | #define CheckError() m_result = eglGetError(); if(m_result != EGL_SUCCESS) CLog::Log(LOGERROR, "EGL error in %s: %x",__FUNCTION__, m_result); | ||
63 | @@ -91,15 +87,15 @@ bool CEGLWrapper::Initialize(const std::string &implementation) | ||
64 | // Try to create each backend in sequence and go with the first one | ||
65 | // that we know will work | ||
66 | if ( | ||
67 | -#if defined(TARGET_ANDROID) && defined(HAS_LIBAMCODEC) | ||
68 | - (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation)) | ||
69 | -#elif defined(TARGET_ANDROID) | ||
70 | - (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation)) | ||
71 | -#elif defined(TARGET_RASPBERRY_PI) | ||
72 | +#if defined(TARGET_ANDROID) | ||
73 | + (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation)) || | ||
74 | + (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation)) || | ||
75 | +#endif | ||
76 | +#if defined(TARGET_RASPBERRY_PI) | ||
77 | (nativeGuess = CreateEGLNativeType<CEGLNativeTypeRaspberryPI>(implementation)) | ||
78 | #elif defined(HAS_IMXVPU) | ||
79 | (nativeGuess = CreateEGLNativeType<CEGLNativeTypeIMX>(implementation)) | ||
80 | -#elif defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC) | ||
81 | +#else | ||
82 | (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlogic>(implementation)) | ||
83 | #endif | ||
84 | ) | ||
85 | -- | ||
86 | 2.10.2 | ||
87 | |||
diff --git a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb index 432798ed8..6d8f2a204 100644 --- a/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb +++ b/meta-multimedia/recipes-mediacenter/kodi/kodi_17.bb | |||
@@ -63,7 +63,7 @@ PROVIDES = "xbmc" | |||
63 | 63 | ||
64 | SRCREV = "a10c5048f2487bd9b2dc1f35d2fee48a25945a70" | 64 | SRCREV = "a10c5048f2487bd9b2dc1f35d2fee48a25945a70" |
65 | PV = "17.0+gitr${SRCPV}" | 65 | PV = "17.0+gitr${SRCPV}" |
66 | SRC_URI = "git://github.com/xbmc/xbmc.git;branch=master \ | 66 | SRC_URI = "git://github.com/xbmc/xbmc.git;branch=Krypton \ |
67 | file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ | 67 | file://0003-configure-don-t-try-to-run-stuff-to-find-tinyxml.patch \ |
68 | file://0004-handle-SIGTERM.patch \ | 68 | file://0004-handle-SIGTERM.patch \ |
69 | file://0005-add-support-to-read-frequency-output-if-using-intel-.patch \ | 69 | 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 \ | |||
72 | file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \ | 72 | file://0008-kodi-config.cmake-use-CMAKE_FIND_ROOT_PATH-to-fix-cr.patch \ |
73 | file://0009-build-Add-support-for-musl-triplets.patch \ | 73 | file://0009-build-Add-support-for-musl-triplets.patch \ |
74 | file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ | 74 | file://0010-RssReader-Fix-compiler-warning-comparing-pointer-to-.patch \ |
75 | file://0011-Let-configure-pass-on-unknown-architectures-setting-.patch \ | ||
76 | file://0012-Revert-droid-fix-builds-with-AML-disabled.patch \ | ||
75 | " | 77 | " |
76 | 78 | ||
77 | SRC_URI_append_libc-musl = " \ | 79 | SRC_URI_append_libc-musl = " \ |