From 20d7236b069f80cea7d9b7c4f65052219cd9c177 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Tue, 23 Jan 2024 04:00:15 +0100 Subject: bcm28xx-vc: remove package, use bcm28xx-utils --- ...tch-host_applications_linux_apps_dtmerge_dtmerge_c | 10 ---------- ...host_applications_linux_apps_gencmd_CMakeLists_txt | 11 ----------- ...h-host_applications_linux_apps_smem_CMakeLists_txt | 11 ----------- ...st_applications_linux_libs_bcm_host_CMakeLists_txt | 19 ------------------- ...tch-host_applications_linux_libs_sm_CMakeLists_txt | 11 ----------- .../patches/patch-interface_khronos_CMakeLists_txt | 17 ----------------- .../patches/patch-interface_mmal_CMakeLists_txt | 11 ----------- .../patches/patch-interface_vcos_CMakeLists_txt | 11 ----------- .../patch-interface_vcos_pthreads_CMakeLists_txt | 11 ----------- .../patch-interface_vmcs_host_vc_vchi_tvservice_c | 18 ------------------ 10 files changed, 130 deletions(-) delete mode 100644 package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c delete mode 100644 package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt delete mode 100644 package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c (limited to 'package/bcm28xx-vc/patches') diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c deleted file mode 100644 index fa78c0e3a..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c +++ /dev/null @@ -1,10 +0,0 @@ ---- bcm28xx-vc-7c026fa7a4ded2c525916cc853a32731c072ed1e.orig/host_applications/linux/apps/dtmerge/dtmerge.c 2016-09-20 09:43:37.000000000 +0200 -+++ bcm28xx-vc-7c026fa7a4ded2c525916cc853a32731c072ed1e/host_applications/linux/apps/dtmerge/dtmerge.c 2016-09-20 10:22:23.000000000 +0200 -@@ -28,6 +28,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBI - #include - #include - #include -+#include - - #include "dtoverlay.h" - diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt deleted file mode 100644 index d67980b11..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/linux/apps/gencmd/CMakeLists.txt 2015-10-27 10:59:47.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/linux/apps/gencmd/CMakeLists.txt 2015-11-16 20:30:46.553286656 +0100 -@@ -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/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt deleted file mode 100644 index f1e293abe..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/linux/apps/smem/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/linux/apps/smem/CMakeLists.txt 2015-11-16 20:31:12.527571311 +0100 -@@ -4,7 +4,7 @@ get_filename_component (VIDEOCORE_ROOT . - include (${VIDEOCORE_ROOT}/makefiles/cmake/global_settings.cmake) - - if (NOT WIN32) -- add_definitions(-Wall -Werror) -+ add_definitions(-Wall) - endif () - - include_directories ( diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt deleted file mode 100644 index 2b6a25111..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt +++ /dev/null @@ -1,19 +0,0 @@ ---- bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18.orig/host_applications/linux/libs/bcm_host/CMakeLists.txt 2017-06-27 18:59:31.000000000 +0200 -+++ bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18/host_applications/linux/libs/bcm_host/CMakeLists.txt 2017-07-01 14:33:21.139286425 +0200 -@@ -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( ../../../.. -@@ -20,3 +20,7 @@ target_link_libraries(bcm_host vcos vcho - - install(TARGETS bcm_host DESTINATION lib) - -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/bcm_host.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/bcm_host.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") diff --git a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt deleted file mode 100644 index 3269c550c..000000000 --- a/package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/host_applications/linux/libs/sm/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/host_applications/linux/libs/sm/CMakeLists.txt 2015-11-16 20:31:27.946553043 +0100 -@@ -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/package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt deleted file mode 100644 index 068283106..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt +++ /dev/null @@ -1,17 +0,0 @@ ---- bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18.orig/interface/khronos/CMakeLists.txt 2017-06-27 18:59:31.000000000 +0200 -+++ bcm28xx-vc-8d518460723779f95b49efafc04c183e83da3a18/interface/khronos/CMakeLists.txt 2017-07-01 14:33:21.139286425 +0200 -@@ -80,6 +80,14 @@ target_link_libraries(OpenVG EGL) - - install(TARGETS EGL GLESv2 OpenVG WFC khrn_client DESTINATION lib) - install(TARGETS EGL_static GLESv2_static khrn_static DESTINATION lib) -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/egl/egl.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/egl/egl.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") -+configure_file("${CMAKE_CURRENT_SOURCE_DIR}/glxx/glesv2.pc.in" -+ "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" @ONLY) -+install(FILES "${CMAKE_CURRENT_BINARY_DIR}/glxx/glesv2.pc" -+ DESTINATION "${CMAKE_INSTALL_PREFIX}/lib/pkgconfig") - - # recommended names to use to avoid conflicts with mesa libs - add_library(brcmEGL ${SHARED} ${EGL_SOURCE}) diff --git a/package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt deleted file mode 100644 index 8e4a1dace..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/mmal/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/mmal/CMakeLists.txt 2015-11-16 20:18:59.755962062 +0100 -@@ -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/package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt deleted file mode 100644 index c962c3acf..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/vcos/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/vcos/CMakeLists.txt 2015-11-16 20:22:22.274588157 +0100 -@@ -43,7 +43,7 @@ foreach (header ${HEADERS}) - endforeach () - - if (CMAKE_COMPILER_IS_GNUCC) -- add_definitions (-ggdb -Werror -Wall) -+ add_definitions (-Wall) - endif () - - if (CMAKE_COMPILER_2005) diff --git a/package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt b/package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt deleted file mode 100644 index 34ac618fb..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt +++ /dev/null @@ -1,11 +0,0 @@ ---- bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8.orig/interface/vcos/pthreads/CMakeLists.txt 2015-10-27 10:59:48.000000000 +0100 -+++ bcm28xx-vc-c2f27fb8e581f8e5af83bf28422553ade8f7a7c8/interface/vcos/pthreads/CMakeLists.txt 2015-11-16 20:22:39.353464208 +0100 -@@ -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 () - diff --git a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c b/package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c deleted file mode 100644 index 2dfbf722c..000000000 --- a/package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c +++ /dev/null @@ -1,18 +0,0 @@ ---- bcm28xx-vc-9cc14b29288f913ef0e3286f4b3232bf73ab59d2.orig/interface/vmcs_host/vc_vchi_tvservice.c 2015-05-25 13:22:55.000000000 -0500 -+++ bcm28xx-vc-9cc14b29288f913ef0e3286f4b3232bf73ab59d2/interface/vmcs_host/vc_vchi_tvservice.c 2015-06-08 13:01:47.348595327 -0500 -@@ -417,7 +417,6 @@ VCHPRE_ void VCHPOST_ vc_tv_register_cal - ***********************************************************/ - VCHPRE_ void VCHPOST_ vc_tv_unregister_callback(TVSERVICE_CALLBACK_T callback) - { -- vcos_assert(callback != NULL); - - vcos_log_trace("[%s]", VCOS_FUNCTION); - if(tvservice_lock_obtain() == 0) -@@ -433,7 +432,6 @@ VCHPRE_ void VCHPOST_ vc_tv_unregister_c - done = 1; - } // if - } // for -- vcos_assert(done); - tvservice_lock_release(); - } - } -- cgit v1.2.3