diff options
Diffstat (limited to 'package/utils')
| -rw-r--r-- | package/utils/bcm27xx-userland/Makefile | 4 | ||||
| -rw-r--r-- | package/utils/bcm27xx-userland/patches/0001-Revert-Add-MMAL-and-MMAL_APPS-to-64bit-builds.patch | 75 |
2 files changed, 2 insertions, 77 deletions
diff --git a/package/utils/bcm27xx-userland/Makefile b/package/utils/bcm27xx-userland/Makefile index b625b9c0d5..098c039f1f 100644 --- a/package/utils/bcm27xx-userland/Makefile +++ b/package/utils/bcm27xx-userland/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=bcm27xx-userland -PKG_VERSION:=f4bccc38f9d0a740aeb7818d33ca1fd551e325de +PKG_VERSION:=4a0a19b88b43e48c6b51b526b9378289fb712a4c PKG_RELEASE:=1 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE_URL:=https://codeload.github.com/raspberrypi/userland/tar.gz/$(PKG_VERSION)? -PKG_HASH:=3a4ea8788809bf889da9fe61759e4f8daafab3444264c011db9c6b25237fd044 +PKG_HASH:=0f42d48095d1f680cbe8781c2e974b76bdd0507aaef64cce8b8b472ca3a09588 PKG_FLAGS:=nonshared diff --git a/package/utils/bcm27xx-userland/patches/0001-Revert-Add-MMAL-and-MMAL_APPS-to-64bit-builds.patch b/package/utils/bcm27xx-userland/patches/0001-Revert-Add-MMAL-and-MMAL_APPS-to-64bit-builds.patch deleted file mode 100644 index 89295c9ff0..0000000000 --- a/package/utils/bcm27xx-userland/patches/0001-Revert-Add-MMAL-and-MMAL_APPS-to-64bit-builds.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 39c946b5dfcc38d3b2cd16d9c96f47a8341387cd Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?=C3=81lvaro=20Fern=C3=A1ndez=20Rojas?= <noltari@gmail.com> -Date: Thu, 28 May 2020 15:19:57 +0200 -Subject: [PATCH] Revert "Add MMAL and MMAL_APPS to 64bit builds" - -This reverts commit 7d3c6b9f4c3ddeecefdeb2b882bada74a235249b. ---- - CMakeLists.txt | 18 ++++++++++-------- - host_applications/linux/CMakeLists.txt | 4 ++-- - interface/mmal/CMakeLists.txt | 6 ++---- - 3 files changed, 14 insertions(+), 14 deletions(-) - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -8,9 +8,13 @@ SET(PROJECT_VER_PATCH 0) - SET(PROJECT_VER "${PROJECT_VER_MAJOR}.${PROJECT_VER_MINOR}.${PROJECT_VER_PATCH}") - SET(PROJECT_APIVER "${PROJECT_VER}") - --set(BUILD_MMAL TRUE) --set(BUILD_MMAL_APPS TRUE) -- -+if(ARM64) -+ set(BUILD_MMAL FALSE) -+ set(BUILD_MMAL_APPS FALSE) -+else() -+ set(BUILD_MMAL TRUE) -+ set(BUILD_MMAL_APPS TRUE) -+endif() - set(vmcs_root ${PROJECT_SOURCE_DIR}) - get_filename_component(VIDEOCORE_ROOT . ABSOLUTE) - -@@ -74,11 +78,9 @@ if(BUILD_MMAL) - endif() - - # VidTex supports Android and Linux --if(NOT ARM64) -- if(BUILD_MMAL_APPS) -- add_subdirectory(host_applications/android/apps/vidtex) -- endif(BUILD_MMAL_APPS) --endif() -+if(BUILD_MMAL_APPS) -+add_subdirectory(host_applications/android/apps/vidtex) -+endif(BUILD_MMAL_APPS) - - if(NOT ARM64) - add_subdirectory(middleware/openmaxil) ---- a/host_applications/linux/CMakeLists.txt -+++ b/host_applications/linux/CMakeLists.txt -@@ -4,9 +4,9 @@ add_subdirectory(libs/bcm_host) - add_subdirectory(apps/gencmd) - add_subdirectory(apps/tvservice) - add_subdirectory(apps/vcmailbox) --add_subdirectory(apps/raspicam) --add_subdirectory(libs/sm) - if(NOT ARM64) -+ add_subdirectory(apps/raspicam) -+ add_subdirectory(libs/sm) - add_subdirectory(apps/smem) - endif() - add_subdirectory(libs/debug_sym) ---- a/interface/mmal/CMakeLists.txt -+++ b/interface/mmal/CMakeLists.txt -@@ -11,10 +11,8 @@ add_subdirectory(core) - add_subdirectory(util) - add_subdirectory(vc) - add_subdirectory(components) --if(NOT ARM64) -- add_subdirectory(openmaxil) -- add_subdirectory(client) --endif() -+add_subdirectory(openmaxil) -+add_subdirectory(client) - - target_link_libraries(mmal mmal_core mmal_util mmal_vc_client vcos mmal_components) - |