0012-Revert-droid-fix-builds-with-AML-disabled.patch 2.9 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687
  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. This reverts commit 4733383b8f1c1dd0b95e9e5358425d8a0b7ba8fc.
  6. ---
  7. xbmc/utils/SystemInfo.cpp | 4 ----
  8. xbmc/windowing/egl/EGLWrapper.cpp | 16 ++++++----------
  9. 2 files changed, 6 insertions(+), 14 deletions(-)
  10. diff --git a/xbmc/utils/SystemInfo.cpp b/xbmc/utils/SystemInfo.cpp
  11. index fcc6733..52e7fa3 100644
  12. --- a/xbmc/utils/SystemInfo.cpp
  13. +++ b/xbmc/utils/SystemInfo.cpp
  14. @@ -57,10 +57,8 @@
  15. #include "utils/XMLUtils.h"
  16. #if defined(TARGET_ANDROID)
  17. #include "platform/android/jni/Build.h"
  18. -#if defined(HAS_LIBAMCODEC)
  19. #include "utils/AMLUtils.h"
  20. #endif
  21. -#endif
  22. /* Platform identification */
  23. #if defined(TARGET_DARWIN)
  24. @@ -873,11 +871,9 @@ bool CSysInfo::IsAeroDisabled()
  25. bool CSysInfo::HasHW3DInterlaced()
  26. {
  27. #if defined(TARGET_ANDROID)
  28. -#if defined(HAS_LIBAMCODEC)
  29. if (aml_hw3d_present())
  30. return true;
  31. #endif
  32. -#endif
  33. return false;
  34. }
  35. diff --git a/xbmc/windowing/egl/EGLWrapper.cpp b/xbmc/windowing/egl/EGLWrapper.cpp
  36. index 30f5757..583d43a 100644
  37. --- a/xbmc/windowing/egl/EGLWrapper.cpp
  38. +++ b/xbmc/windowing/egl/EGLWrapper.cpp
  39. @@ -24,19 +24,15 @@
  40. #include <assert.h>
  41. #if defined(TARGET_ANDROID)
  42. #include "EGLNativeTypeAndroid.h"
  43. -#if defined(HAS_LIBAMCODEC)
  44. #include "EGLNativeTypeAmlAndroid.h"
  45. #endif
  46. -#endif
  47. #if defined(TARGET_RASPBERRY_PI)
  48. #include "EGLNativeTypeRaspberryPI.h"
  49. #endif
  50. #if defined(HAS_IMXVPU)
  51. #include "EGLNativeTypeIMX.h"
  52. #endif
  53. -#if defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC)
  54. #include "EGLNativeTypeAmlogic.h"
  55. -#endif
  56. #include "EGLWrapper.h"
  57. #define CheckError() m_result = eglGetError(); if(m_result != EGL_SUCCESS) CLog::Log(LOGERROR, "EGL error in %s: %x",__FUNCTION__, m_result);
  58. @@ -91,15 +87,15 @@ bool CEGLWrapper::Initialize(const std::string &implementation)
  59. // Try to create each backend in sequence and go with the first one
  60. // that we know will work
  61. if (
  62. -#if defined(TARGET_ANDROID) && defined(HAS_LIBAMCODEC)
  63. - (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation))
  64. -#elif defined(TARGET_ANDROID)
  65. - (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation))
  66. -#elif defined(TARGET_RASPBERRY_PI)
  67. +#if defined(TARGET_ANDROID)
  68. + (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlAndroid>(implementation)) ||
  69. + (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAndroid>(implementation)) ||
  70. +#endif
  71. +#if defined(TARGET_RASPBERRY_PI)
  72. (nativeGuess = CreateEGLNativeType<CEGLNativeTypeRaspberryPI>(implementation))
  73. #elif defined(HAS_IMXVPU)
  74. (nativeGuess = CreateEGLNativeType<CEGLNativeTypeIMX>(implementation))
  75. -#elif defined(TARGET_LINUX) && defined(HAS_LIBAMCODEC)
  76. +#else
  77. (nativeGuess = CreateEGLNativeType<CEGLNativeTypeAmlogic>(implementation))
  78. #endif
  79. )
  80. --
  81. 2.10.2