diff options
author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-12-17 04:11:34 +0300 |
---|---|---|
committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2019-01-09 02:21:44 +0300 |
commit | 1a4b7ee28bf7413af6513fb45ad0d0736048f866 (patch) | |
tree | 79f6d8ea698cab8f2eaf4f54b793d2ca7a1451ce /meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch | |
parent | 5b9ede0403237c7dace972affa65cf64a1aadd0e (diff) | |
download | openbmc-1a4b7ee28bf7413af6513fb45ad0d0736048f866.tar.xz |
reset upstream subtrees to yocto 2.6
Reset the following subtrees on thud HEAD:
poky: 87e3a9739d
meta-openembedded: 6094ae18c8
meta-security: 31dc4e7532
meta-raspberrypi: a48743dc36
meta-xilinx: c42016e2e6
Also re-apply backports that didn't make it into thud:
poky:
17726d0 systemd-systemctl-native: handle Install wildcards
meta-openembedded:
4321a5d libtinyxml2: update to 7.0.1
042f0a3 libcereal: Add native and nativesdk classes
e23284f libcereal: Allow empty package
030e8d4 rsyslog: curl-less build with fmhttp PACKAGECONFIG
179a1b9 gtest: update to 1.8.1
Squashed OpenBMC subtree compatibility updates:
meta-aspeed:
Brad Bishop (1):
aspeed: add yocto 2.6 compatibility
meta-ibm:
Brad Bishop (1):
ibm: prepare for yocto 2.6
meta-ingrasys:
Brad Bishop (1):
ingrasys: set layer compatibility to yocto 2.6
meta-openpower:
Brad Bishop (1):
openpower: set layer compatibility to yocto 2.6
meta-phosphor:
Brad Bishop (3):
phosphor: set layer compatibility to thud
phosphor: libgpg-error: drop patches
phosphor: react to fitimage artifact rename
Ed Tanous (4):
Dropbear: upgrade options for latest upgrade
yocto2.6: update openssl options
busybox: remove upstream watchdog patch
systemd: Rebase CONFIG_CGROUP_BPF patch
Change-Id: I7b1fe71cca880d0372a82d94b5fd785323e3a9e7
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Diffstat (limited to 'meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch')
-rw-r--r-- | meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch | 87 |
1 files changed, 0 insertions, 87 deletions
diff --git a/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch b/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch deleted file mode 100644 index 8d70b3f8f..000000000 --- a/meta-openembedded/meta-multimedia/recipes-mediacenter/kodi/kodi-17/0012-Revert-droid-fix-builds-with-AML-disabled.patch +++ /dev/null @@ -1,87 +0,0 @@ -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 - |