package/utils/bcm27xx-userland/patches/0001-Revert-Add-MMAL-and-MMAL_APPS-to-64bit-builds.patch

   1 From 39c946b5dfcc38d3b2cd16d9c96f47a8341387cd Mon Sep 17 00:00:00 2001
   2 From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com>
   3 Date: Thu, 28 May 2020 15:19:57 +0200
   4 Subject: [PATCH] Revert "Add MMAL and MMAL_APPS to 64bit builds"
   5
   6 This reverts commit 7d3c6b9f4c3ddeecefdeb2b882bada74a235249b.
   7 ---
   8  CMakeLists.txt                         | 18 ++++++++++--------
   9  host_applications/linux/CMakeLists.txt |  4 ++--
  10  interface/mmal/CMakeLists.txt          |  6 ++----
  11  3 files changed, 14 insertions(+), 14 deletions(-)
  12
  13 --- a/CMakeLists.txt
  14 +++ b/CMakeLists.txt
  15 @@ -8,9 +8,13 @@ SET(PROJECT_VER_PATCH 0)
  16  SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}")
  17  SET(PROJECT_APIVER "${PROJECT_VER}")
  18
  19 -set(BUILD_MMAL TRUE)
  20 -set(BUILD_MMAL_APPS TRUE)
  21 -
  22 +if(ARM64)
  23 +   set(BUILD_MMAL FALSE)
  24 +   set(BUILD_MMAL_APPS FALSE)
  25 +else()
  26 +   set(BUILD_MMAL TRUE)
  27 +   set(BUILD_MMAL_APPS TRUE)
  28 +endif()
  29  set(vmcs_root ${PROJECT_SOURCE_DIR})
  30  get_filename_component(VIDEOCORE_ROOT . ABSOLUTE)
  31
  32 @@ -74,11 +78,9 @@ if(BUILD_MMAL)
  33  endif()
  34
  35  # VidTex supports Android and Linux
  36 -if(NOT ARM64)
  37 -   if(BUILD_MMAL_APPS)
  38 -   add_subdirectory(host_applications/android/apps/vidtex)
  39 -   endif(BUILD_MMAL_APPS)
  40 -endif()
  41 +if(BUILD_MMAL_APPS)
  42 +add_subdirectory(host_applications/android/apps/vidtex)
  43 +endif(BUILD_MMAL_APPS)
  44
  45  if(NOT ARM64)
  46     add_subdirectory(middleware/openmaxil)
  47 --- a/host_applications/linux/CMakeLists.txt
  48 +++ b/host_applications/linux/CMakeLists.txt
  49 @@ -4,9 +4,9 @@ add_subdirectory(libs/bcm_host)
  50  add_subdirectory(apps/gencmd)
  51  add_subdirectory(apps/tvservice)
  52  add_subdirectory(apps/vcmailbox)
  53 -add_subdirectory(apps/raspicam)
  54 -add_subdirectory(libs/sm)
  55  if(NOT ARM64)
  56 +   add_subdirectory(apps/raspicam)
  57 +   add_subdirectory(libs/sm)
  58     add_subdirectory(apps/smem)
  59  endif()
  60  add_subdirectory(libs/debug_sym)
  61 --- a/interface/mmal/CMakeLists.txt
  62 +++ b/interface/mmal/CMakeLists.txt
  63 @@ -11,10 +11,8 @@ add_subdirectory(core)
  64  add_subdirectory(util)
  65  add_subdirectory(vc)
  66  add_subdirectory(components)
  67 -if(NOT ARM64)
  68 -   add_subdirectory(openmaxil)
  69 -   add_subdirectory(client)
  70 -endif()
  71 +add_subdirectory(openmaxil)
  72 +add_subdirectory(client)
  73
  74  target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components)
  75