[gnome-build-meta/valentindavid/rpi4-ostree] Remove -Werror in build of RPI4 userland tools

[Valentin David <valentindavid src gnome org>]

commit 1fd963ce243dc3022fe31de406bb1a06d28178d4
Author: Valentin David <valentin david codethink co uk>
Date:   Wed Jun 3 15:15:43 2020 +0200

    Remove -Werror in build of RPI4 userland tools

 .../boards/raspberrypi-4/bsp/userland-utils.bst    |   2 +
 .../raspberrypi-4/userland-utils/no-werror.patch   | 142 +++++++++++++++++++++
 2 files changed, 144 insertions(+)
---
diff --git a/elements/boards/raspberrypi-4/bsp/userland-utils.bst 
b/elements/boards/raspberrypi-4/bsp/userland-utils.bst
index 1790f6e1..d635d873 100644
--- a/elements/boards/raspberrypi-4/bsp/userland-utils.bst
+++ b/elements/boards/raspberrypi-4/bsp/userland-utils.bst
@@ -4,6 +4,8 @@ sources:
 - kind: git_tag
   url: https://github.com/raspberrypi/userland/
   track: a246147c21ae5be92ad1b85199b5b0bb447e0544
+- kind: patch
+  path: files/boards/raspberrypi-4/userland-utils/no-werror.patch
 
 build-depends:
 - freedesktop-sdk.bst:public-stacks/buildsystem-cmake.bst
diff --git a/files/boards/raspberrypi-4/userland-utils/no-werror.patch 
b/files/boards/raspberrypi-4/userland-utils/no-werror.patch
new file mode 100644
index 00000000..f4a82921
--- /dev/null
+++ b/files/boards/raspberrypi-4/userland-utils/no-werror.patch
@@ -0,0 +1,142 @@
+diff --git a/host_applications/android/apps/vidtex/CMakeLists.txt 
b/host_applications/android/apps/vidtex/CMakeLists.txt
+index 6d66d69..06a3192 100644
+--- a/host_applications/android/apps/vidtex/CMakeLists.txt
++++ b/host_applications/android/apps/vidtex/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ cmake_minimum_required(VERSION 2.8)
+ 
+-SET(COMPILE_DEFINITIONS -Werror -Wall)
++SET(COMPILE_DEFINITIONS -Wall)
+ 
+ # Set --no-as-needed to stop the linker discarding mmal_vc_client
+ # as it can't see that the constructor registers a load of functionality
+diff --git a/host_applications/linux/apps/dtmerge/CMakeLists.txt 
b/host_applications/linux/apps/dtmerge/CMakeLists.txt
+index d173697..f37345f 100755
+--- a/host_applications/linux/apps/dtmerge/CMakeLists.txt
++++ b/host_applications/linux/apps/dtmerge/CMakeLists.txt
+@@ -4,7 +4,7 @@ get_filename_component (VIDEOCORE_ROOT ../../../.. ABSOLUTE)
+ include (${VIDEOCORE_ROOT}/makefiles/cmake/global_settings.cmake)
+ 
+ if (NOT WIN32)
+-   add_definitions(-Wall -Werror)
++   add_definitions(-Wall)
+ endif ()
+ 
+ include_directories (
+diff --git a/host_applications/linux/apps/dtoverlay/CMakeLists.txt 
b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+index dd48d83..83613ab 100755
+--- a/host_applications/linux/apps/dtoverlay/CMakeLists.txt
++++ b/host_applications/linux/apps/dtoverlay/CMakeLists.txt
+@@ -4,7 +4,7 @@ get_filename_component (VIDEOCORE_ROOT ../../../.. ABSOLUTE)
+ include (${VIDEOCORE_ROOT}/makefiles/cmake/global_settings.cmake)
+ 
+ if (NOT WIN32)
+-   add_definitions(-Wall -Werror)
++   add_definitions(-Wall)
+ endif ()
+ 
+ include_directories (
+diff --git a/host_applications/linux/apps/gencmd/CMakeLists.txt 
b/host_applications/linux/apps/gencmd/CMakeLists.txt
+index f95d1a1..02e09fe 100644
+--- a/host_applications/linux/apps/gencmd/CMakeLists.txt
++++ b/host_applications/linux/apps/gencmd/CMakeLists.txt
+@@ -4,7 +4,7 @@ if (WIN32)
+    set(VCOS_PLATFORM win32)
+ else ()
+    set(VCOS_PLATFORM pthreads)
+-   add_definitions(-Wall -Werror)
++   add_definitions(-Wall)
+ endif ()
+ 
+ include_directories( ../../../.. 
+diff --git a/host_applications/linux/apps/raspicam/CMakeLists.txt 
b/host_applications/linux/apps/raspicam/CMakeLists.txt
+index 656a9a0..83e0f7b 100644
+--- a/host_applications/linux/apps/raspicam/CMakeLists.txt
++++ b/host_applications/linux/apps/raspicam/CMakeLists.txt
+@@ -1,8 +1,6 @@
+ 
+ # raspistill/raspivid/raspiyuv
+ 
+-SET(COMPILE_DEFINITIONS -Werror)
+-
+ # Set --no-as-needed to stop the linker discarding mmal_vc_client
+ # as it can't see that the constructor registers a load of functionality
+ # with the MMAL core.
+diff --git a/host_applications/linux/apps/smem/CMakeLists.txt 
b/host_applications/linux/apps/smem/CMakeLists.txt
+index 0fa8328..b840917 100644
+--- a/host_applications/linux/apps/smem/CMakeLists.txt
++++ b/host_applications/linux/apps/smem/CMakeLists.txt
+@@ -4,7 +4,7 @@ get_filename_component (VIDEOCORE_ROOT ../../../.. ABSOLUTE)
+ include (${VIDEOCORE_ROOT}/makefiles/cmake/global_settings.cmake)
+ 
+ if (NOT WIN32)
+-   add_definitions(-Wall -Werror)
++   add_definitions(-Wall)
+ endif ()
+ 
+ include_directories (
+diff --git a/host_applications/linux/libs/bcm_host/CMakeLists.txt 
b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+index a863cb6..5d7b339 100644
+--- a/host_applications/linux/libs/bcm_host/CMakeLists.txt
++++ b/host_applications/linux/libs/bcm_host/CMakeLists.txt
+@@ -3,7 +3,7 @@ if (WIN32)
+    set(VCOS_PLATFORM win32)
+ else ()
+    set(VCOS_PLATFORM pthreads)
+-   add_definitions(-Wall -Werror)
++   add_definitions(-Wall)
+ endif ()
+ 
+ # set this as we want all the source of vchostif to be available in libbcm_host
+diff --git a/host_applications/linux/libs/sm/CMakeLists.txt b/host_applications/linux/libs/sm/CMakeLists.txt
+index 5ce5aca..c41d729 100644
+--- a/host_applications/linux/libs/sm/CMakeLists.txt
++++ b/host_applications/linux/libs/sm/CMakeLists.txt
+@@ -3,7 +3,7 @@ if (WIN32)
+    set(VCOS_PLATFORM win32)
+ else ()
+    set(VCOS_PLATFORM pthreads)
+-   add_definitions(-Wall -Werror)
++   add_definitions(-Wall)
+ endif ()
+ 
+ include_directories( ../../../..
+diff --git a/interface/mmal/CMakeLists.txt b/interface/mmal/CMakeLists.txt
+index 8208f7c..59dae6a 100644
+--- a/interface/mmal/CMakeLists.txt
++++ b/interface/mmal/CMakeLists.txt
+@@ -3,7 +3,7 @@ if (NOT DEFINED LIBRARY_TYPE)
+ set(LIBRARY_TYPE SHARED)
+ endif (NOT DEFINED LIBRARY_TYPE)
+ 
+-add_definitions(-Wall -Werror)
++add_definitions(-Wall)
+ 
+ add_library(mmal SHARED util/mmal_util.c)
+ 
+diff --git a/interface/vcos/CMakeLists.txt b/interface/vcos/CMakeLists.txt
+index 23a8d72..8e72b18 100644
+--- a/interface/vcos/CMakeLists.txt
++++ b/interface/vcos/CMakeLists.txt
+@@ -43,7 +43,7 @@ foreach (header ${HEADERS})
+ endforeach ()
+ 
+ if (CMAKE_COMPILER_IS_GNUCC)
+-   add_definitions (-ggdb -Werror -Wall)
++   add_definitions (-ggdb -Wall)
+ endif ()
+ 
+ if (CMAKE_COMPILER_2005)
+diff --git a/interface/vcos/pthreads/CMakeLists.txt b/interface/vcos/pthreads/CMakeLists.txt
+index 1d81ca3..38d4813 100644
+--- a/interface/vcos/pthreads/CMakeLists.txt
++++ b/interface/vcos/pthreads/CMakeLists.txt
+@@ -1,7 +1,7 @@
+ # MSVC5 does not fully support C99, enabling declaration-after-statement
+ # warnings allows a common MSVC5 build error to be detected in Linux builds.
+ if (CMAKE_COMPILER_IS_GNUCC)
+-   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Werror -Wdeclaration-after-statement")
++   set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wdeclaration-after-statement")
+    add_definitions (-D_GNU_SOURCE)
+ endif ()
+