bcm28xx-vc: remove package, use bcm28xx-utils

package/bcm28xx-vc/Makefile

@@ -1,84 +0,0 @@
-# This file is part of the OpenADK project. OpenADK is copyrighted
-# material, please see the LICENCE file in the top-level directory.
-
-include $(ADK_TOPDIR)/rules.mk
-
-PKG_NAME:=		bcm28xx-vc
-PKG_VERSION:=		44a3953fd13d5f0b9b0cd120b904aa7db370244e
-PKG_GIT:=		hash
-PKG_RELEASE:=		1
-PKG_DESCR:=		videocore tools and libraries
-PKG_SECTION:=		libs/video
-PKG_BUILDDEP:=		cmake-host
-PKG_NEEDS:=		c++ threads
-PKG_URL:=		https://github.com/raspberrypi/userland
-PKG_SITES:=		https://github.com/raspberrypi/userland.git
-
-PKG_SUBPKGS:=		BCM28XX_VC_TOOLS BCM28XX_VC_LIBS BCM28XX_VC_GL_LIBS BCM28XX_VC_DEBUG
-PKGSS_BCM28XX_VC_TOOLS:=bcm28xx-vc-libs
-PKGSC_BCM28XX_VC_TOOLS:=sys/hw
-PKGSD_BCM28XX_VC_TOOLS:=videocore tools (vcgencmd,..)
-PKGSC_BCM28XX_VC_LIBS:=	libs/misc
-PKGSD_BCM28XX_VC_LIBS:=videocore library
-PKGSC_BCM28XX_VC_DEBUG:=libs/misc
-PKGSD_BCM28XX_VC_DEBUG:=videocore debug library
-PKGSC_BCM28XX_VC_GL_LIBS:=libs/video
-PKGSS_BCM28XX_VC_GL_LIBS:=bcm28xx-vc-libs
-PKGSD_BCM28XX_VC_GL_LIBS:=videocore gl library
-
-PKG_SYSTEM_DEPENDS:=	raspberry-pi raspberry-pi0 raspberry-pi2 raspberry-pi3 raspberry-pi3-64 raspberry-pi4 raspberry-pi4-64
-
-include $(ADK_TOPDIR)/mk/package.mk
-
-$(eval $(call PKG_template,BCM28XX_VC_TOOLS,bcm28xx-vc-tools,$(PKG_VERSION)-$(PKG_RELEASE),$(PKGSS_BCM28XX_VC_TOOLS),$(PKG_DESCR),$(PKGSC_BCM28XX_VC_TOOLS)))
-$(eval $(call PKG_template,BCM28XX_VC_LIBS,bcm28xx-vc-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-$(eval $(call PKG_template,BCM28XX_VC_DEBUG,bcm28xx-vc-debug,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-$(eval $(call PKG_template,BCM28XX_VC_GL_LIBS,bcm28xx-vc-gl-libs,$(PKG_VERSION)-$(PKG_RELEASE),$(PKG_DEPENDS),$(PKG_DESCR),$(PKG_SECTION)))
-
-CONFIG_STYLE:=          cmake
-CMAKE_FLAGS+=		-DVMCS_INSTALL_PREFIX=/usr
-
-bcm28xx-vc-tools-install:
-	$(INSTALL_DIR) $(IDIR_BCM28XX_VC_TOOLS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/vcgencmd \
-		$(IDIR_BCM28XX_VC_TOOLS)/usr/bin
-	$(INSTALL_BIN) $(WRKINST)/usr/bin/dtoverlay \
-		$(IDIR_BCM28XX_VC_TOOLS)/usr/bin
-
-bcm28xx-vc-debug-install:
-	$(INSTALL_DIR) $(IDIR_BCM28XX_VC_DEBUG)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libdebug_sym.so \
-		$(IDIR_BCM28XX_VC_DEBUG)/usr/lib
-
-bcm28xx-vc-libs-install:
-	$(INSTALL_DIR) $(IDIR_BCM28XX_VC_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libvcos.so \
-		$(IDIR_BCM28XX_VC_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libvchiq_arm.so \
-		$(IDIR_BCM28XX_VC_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libbcm_host.so \
-		$(IDIR_BCM28XX_VC_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libcontainers.so \
-		$(IDIR_BCM28XX_VC_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libdtovl.so \
-		$(IDIR_BCM28XX_VC_LIBS)/usr/lib
-
-bcm28xx-vc-gl-libs-install:
-	$(INSTALL_DIR) $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libmmal*.so \
-		$(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libopenmaxil.so \
-		$(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libvcsm.so \
-		$(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libEGL.so \
-		$(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libGLESv2.so \
-		$(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libOpenVG.so \
-		$(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	$(CP) $(WRKINST)/usr/lib/libbrcm*.so \
-		$(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib
-	(cd $(IDIR_BCM28XX_VC_GL_LIBS)/usr/lib && ln -sf libEGL.so libEGL.so.1)
-
-include $(ADK_TOPDIR)/mk/pkg-bottom.mk

package/bcm28xx-vc/patches/patch-host_applications_linux_apps_dtmerge_dtmerge_c

@@ -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 <stdio.h>
- #include <stdlib.h>
- #include <libfdt.h>
-+#include <stdarg.h>
- 
- #include "dtoverlay.h"
- 

package/bcm28xx-vc/patches/patch-host_applications_linux_apps_gencmd_CMakeLists_txt

@@ -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( ../../../.. 

package/bcm28xx-vc/patches/patch-host_applications_linux_apps_smem_CMakeLists_txt

@@ -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 (

package/bcm28xx-vc/patches/patch-host_applications_linux_libs_bcm_host_CMakeLists_txt

@@ -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")

package/bcm28xx-vc/patches/patch-host_applications_linux_libs_sm_CMakeLists_txt

@@ -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( ../../../..

package/bcm28xx-vc/patches/patch-interface_khronos_CMakeLists_txt

@@ -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})

package/bcm28xx-vc/patches/patch-interface_mmal_CMakeLists_txt

@@ -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)
- 

package/bcm28xx-vc/patches/patch-interface_vcos_CMakeLists_txt

@@ -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)

package/bcm28xx-vc/patches/patch-interface_vcos_pthreads_CMakeLists_txt

@@ -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 ()
- 

package/bcm28xx-vc/patches/patch-interface_vmcs_host_vc_vchi_tvservice_c

@@ -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();
-    }
- }

package/bcm28xx-vc/src/host_applications/linux/libs/bcm_host/bcm_host.pc.in

@@ -1,10 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: bcm_host
-Description: Broadcom VideoCore host API library
-Version: 1
-Libs: -L${libdir} -lbcm_host -lvcos -lvchiq_arm
-Cflags: -I${includedir} -I${includedir}/interface/vmcs_host/linux -I${includedir}/interface/vcos/pthreads -DUSE_VCHIQ_ARM

package/bcm28xx-vc/src/interface/khronos/egl/egl.pc.in

@@ -1,11 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: egl
-Description: RasberryPi implementation of EGL
-Version: 10
-Libs: -L${libdir} -lEGL -lGLESv2 -lbcm_host -lvchostif
-Cflags: -I${includedir}/ -I${includedir}/interface/vcos/pthreads/ \
-        -I${includedir}/interface/vmcs_host/linux/

package/bcm28xx-vc/src/interface/khronos/glxx/glesv2.pc.in

@@ -1,10 +0,0 @@
-prefix=@CMAKE_INSTALL_PREFIX@
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: glesv2
-Description: RasberryPi implementation of OpenGL ESv2
-Version: 2.0
-Libs: -L${libdir} -lGLESv2
-Cflags: -I${includedir}/