pp_rk: add colortrans

Config.in

@@ -1,10 +1,12 @@
+source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/mali-driver-custom/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/rkdeveloptool/Config.in.host"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/aic8800/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/rtl88x2cu/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/rtl88x2eu/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/rtl8812au/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/wifibroadcast-ng/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/wfb-server/Config.in"
+source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/librga/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/rockchip-mpp/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/pixelpilot/Config.in"
 source "$BR2_EXTERNAL_OPENIPC_SBC_GS_PATH/package/adaptive-link/Config.in"

configs/emax_wyvern-link_defconfig

@@ -47,6 +47,11 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_FBV=y
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_LLVM=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
+BR2_PACKAGE_MESA3D_OPENGL_EGL=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_PARTED=y
@@ -115,6 +120,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_KMOD_XZ=y
 BR2_PACKAGE_HOST_SWIG=y
+BR2_PACKAGE_MALI_DRIVER_CUSTOM=y
 BR2_PACKAGE_HOST_RKDEVELOPTOOL=y
 BR2_PACKAGE_AIC8800=y
 BR2_PACKAGE_RTL88X2CU=y
@@ -123,6 +129,7 @@ BR2_PACKAGE_RTL8812AU=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WIFIBROADCAST_NG=y
 BR2_PACKAGE_WFB_SERVER=y
+BR2_PACKAGE_LIBRGA=y
 BR2_PACKAGE_PIXELPILOT=y
 BR2_PACKAGE_ADAPTIVE_LINK=y
 BR2_PACKAGE_YAML_CLI=y

configs/openipc_bonnet_defconfig

@@ -47,6 +47,11 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_FBV=y
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_LLVM=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
+BR2_PACKAGE_MESA3D_OPENGL_EGL=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_PARTED=y
@@ -115,6 +120,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_KMOD_XZ=y
 BR2_PACKAGE_HOST_SWIG=y
+BR2_PACKAGE_MALI_DRIVER_CUSTOM=y
 BR2_PACKAGE_HOST_RKDEVELOPTOOL=y
 BR2_PACKAGE_AIC8800=y
 BR2_PACKAGE_RTL88X2CU=y
@@ -123,6 +129,7 @@ BR2_PACKAGE_RTL8812AU=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WIFIBROADCAST_NG=y
 BR2_PACKAGE_WFB_SERVER=y
+BR2_PACKAGE_LIBRGA=y
 BR2_PACKAGE_PIXELPILOT=y
 BR2_PACKAGE_ADAPTIVE_LINK=y
 BR2_PACKAGE_YAML_CLI=y

configs/radxa_zero3_defconfig

@@ -47,6 +47,11 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_FBV=y
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_LLVM=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
+BR2_PACKAGE_MESA3D_OPENGL_EGL=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_PARTED=y
@@ -115,6 +120,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_KMOD_XZ=y
 BR2_PACKAGE_HOST_SWIG=y
+BR2_PACKAGE_MALI_DRIVER_CUSTOM=y
 BR2_PACKAGE_HOST_RKDEVELOPTOOL=y
 BR2_PACKAGE_AIC8800=y
 BR2_PACKAGE_RTL88X2CU=y
@@ -123,6 +129,7 @@ BR2_PACKAGE_RTL8812AU=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WIFIBROADCAST_NG=y
 BR2_PACKAGE_WFB_SERVER=y
+BR2_PACKAGE_LIBRGA=y
 BR2_PACKAGE_PIXELPILOT=y
 BR2_PACKAGE_ADAPTIVE_LINK=y
 BR2_PACKAGE_YAML_CLI=y

configs/runcam_wifilink_defconfig

@@ -47,6 +47,11 @@ BR2_PACKAGE_DOSFSTOOLS_FSCK_FAT=y
 BR2_PACKAGE_DOSFSTOOLS_MKFS_FAT=y
 BR2_PACKAGE_E2FSPROGS_RESIZE2FS=y
 BR2_PACKAGE_FBV=y
+BR2_PACKAGE_MESA3D=y
+BR2_PACKAGE_MESA3D_LLVM=y
+BR2_PACKAGE_MESA3D_GALLIUM_DRIVER_PANFROST=y
+BR2_PACKAGE_MESA3D_OPENGL_EGL=y
+BR2_PACKAGE_MESA3D_OPENGL_ES=y
 BR2_PACKAGE_LINUX_FIRMWARE=y
 BR2_PACKAGE_LINUX_FIRMWARE_RTL_815X=y
 BR2_PACKAGE_PARTED=y
@@ -115,6 +120,7 @@ BR2_PACKAGE_HOST_E2FSPROGS=y
 BR2_PACKAGE_HOST_GENIMAGE=y
 BR2_PACKAGE_HOST_KMOD_XZ=y
 BR2_PACKAGE_HOST_SWIG=y
+BR2_PACKAGE_MALI_DRIVER_CUSTOM=y
 BR2_PACKAGE_HOST_RKDEVELOPTOOL=y
 BR2_PACKAGE_AIC8800=y
 BR2_PACKAGE_RTL88X2CU=y
@@ -123,6 +129,7 @@ BR2_PACKAGE_RTL8812AU=y
 BR2_PACKAGE_WIRELESS_REGDB=y
 BR2_PACKAGE_WIFIBROADCAST_NG=y
 BR2_PACKAGE_WFB_SERVER=y
+BR2_PACKAGE_LIBRGA=y
 BR2_PACKAGE_PIXELPILOT=y
 BR2_PACKAGE_ADAPTIVE_LINK=y
 BR2_PACKAGE_YAML_CLI=y

external.mk

@@ -2,3 +2,44 @@ include $(sort $(wildcard $(BR2_EXTERNAL_OPENIPC_SBC_GS_PATH)/package/*/*.mk))
 ifeq ($(BR2_PACKAGE_HOST_RKDEVELOPTOOL),y)
 include $(BR2_EXTERNAL_OPENIPC_SBC_GS_PATH)/board/radxa/zero3/flash.mk
 endif
+
+# we don't need cland on target
+define CLANG_DELETE_TARGET
+	rm -rf $(TARGET_DIR)/usr/include/clang-c \
+		$(TARGET_DIR)/usr/include/clang \
+		$(TARGET_DIR)/usr/include/clang \
+		$(TARGET_DIR)/usr/lib/libclang* \
+		$(TARGET_DIR)/usr/lib/cmake/clang* \
+		$(TARGET_DIR)/usr/lib/libclang* \
+		$(TARGET_DIR)/usr/lib/clang \
+		$(TARGET_DIR)/usr/share/man/man1/scan-build.1 \
+		$(TARGET_DIR)/usr/bin/diagtool \
+		$(TARGET_DIR)/usr/bin/hmaptool \
+		$(TARGET_DIR)/usr/bin/analyze-build \
+		$(TARGET_DIR)/usr/bin/scan-build-py \
+		$(TARGET_DIR)/usr/bin/intercept-build \
+		$(TARGET_DIR)/usr/bin/amdgpu-arch \
+		$(TARGET_DIR)/usr/bin/nvptx-arch \
+		$(TARGET_DIR)/usr/libexec/intercept-cc \
+		$(TARGET_DIR)/usr/libexec/analyze-cc \
+		$(TARGET_DIR)/usr/libexec/analyze-c++ \
+		$(TARGET_DIR)/usr/libexec/intercept-c++ \
+		$(TARGET_DIR)/usr/lib/libear \
+		$(TARGET_DIR)/usr/lib/libscanbuild \
+		$(TARGET_DIR)/usr/lib/cmake
+endef
+CLANG_POST_INSTALL_TARGET_HOOKS += CLANG_DELETE_TARGET
+
+# We don't nee samba python
+#
+# Override to disable Python support
+SAMBA4_CONF_OPTS += --disable-python
+
+# Clear Python-related variables
+SAMBA4_PYTHON = 
+
+# we do not need libclc on target
+define LIBCLC_DELETE_TARGET
+	rm -rf $(TARGET_DIR)/usr/share/clc
+endef
+LIBCLC_POST_INSTALL_TARGET_HOOKS += LIBCLC_DELETE_TARGET

package/librga/Config.in

@@ -0,0 +1,6 @@
+config BR2_PACKAGE_LIBRGA
+	bool "librga"
+	help
+	  Rockchip RGA (Raster Graphic Acceleration Unit)
+
+	  https://gitee.com/nyanmisaka/rga

package/librga/librga.mk

@@ -0,0 +1,9 @@
+LIBRGA_VERSION = linux-rga-multi
+LIBRGA_SITE = https://gitee.com/nyanmisaka/rga.git
+LIBRGA_SITE_METHOD = git
+LIBRGA_INSTALL_STAGING = YES
+LIBRGA_INSTALL_TARGET = YES
+
+#$(eval $(cmake-package))
+$(eval $(meson-package))
+

package/mali-driver-custom/Config.in

@@ -0,0 +1,15 @@
+comment "mali-driver needs a Linux kernel to be built"
+	depends on !BR2_LINUX_KERNEL
+
+config BR2_PACKAGE_MALI_DRIVER_CUSTOM
+	bool "mali-driver-custom"
+	depends on BR2_aarch64 || BR2_arm
+	depends on BR2_LINUX_KERNEL
+	help
+	  This package builds and installs the Linux kernel driver for
+	  the Mali Midgard/Bifrost GPU, compatible with recent Linux
+	  kernels (>= 5.4). Note that it should be installed together
+	  with the corresponding userspace OpenGL libraries, which are
+	  usually provided as binaries only by hardware vendors.
+
+	  mali-driver requires a Linux kernel >= 5.4.

package/mali-driver-custom/mali-driver-custom.mk

@@ -0,0 +1,8 @@
+# Disable hash checking
+MALI_DRIVER_CUSTOM_VERSION = bd00164528dba21ad4b22765b3fd4268f5f814de
+MALI_DRIVER_CUSTOM_SITE = $(call github,Kwiboo,mali-rockchip,$(MALI_DRIVER_CUSTOM_VERSION))
+MALI_DRIVER_CUSTOM_DEPENDENCIES = linux
+MALI_DRIVER_CUSTOM_MODULE_SUBDIRS = driver/product/kernel/drivers/gpu/arm/midgard
+
+$(eval $(kernel-module))
+$(eval $(generic-package))

package/pixelpilot/files/gsmenu.sh

@@ -733,6 +733,68 @@ case "$@" in
     "values gs wfbng txpower")
         echo -n -e "1\n100"
         ;;
+
+    "values gs system dvr_mode"*)
+        echo -n -e "raw\nreencode\nboth"
+        ;;
+    "get gs system dvr_mode"*)
+        . /etc/default/pixelpilot
+        echo $PIXELPILOT_DVR_MODE
+        ;;
+    "set gs system dvr_mode"*)
+        sed -i "s/^PIXELPILOT_DVR_MODE=.*/PIXELPILOT_DVR_MODE=\"$5\"/" /etc/default/pixelpilot
+        ;;
+    "values gs system dvr_max_size"*)
+        echo -n "1 40" # This will be multiplied by 100
+        ;;
+    "get gs system dvr_max_size"*)
+        . /etc/default/pixelpilot
+        echo $(( $PIXELPILOT_DVR_MAX_SIZE / 100 ))
+        ;;
+    "set gs system dvr_max_size"*)
+        sed -i "s/^PIXELPILOT_DVR_MAX_SIZE=.*/PIXELPILOT_DVR_MAX_SIZE=\"$(( $5 * 100 ))\"/" /etc/default/pixelpilot
+        ;;
+    "values gs system dvr_reenc_codec"*)
+        echo -n -e "h264\nh265"
+        ;;
+    "values gs system dvr_reenc_resolution"*)
+        echo -n -e "720p\n1080p"
+        ;;
+    "values gs system dvr_reenc_fps"*)
+        echo -n -e "30\n60"
+        ;;
+    "values gs system dvr_reenc_bitrate"*)
+        echo -n -e "5000\n10000\n15000\n20000\n25000\n30000\n35000\n40000\n45000\n50000"
+        ;;
+
+    "set gs system dvr_reenc_enabled"*)
+        if [ "$5" = "on" ]
+        then
+            sed -i "s/^PIXELPILOT_DVR_REENC=.*/PIXELPILOT_DVR_REENC=\"--dvr-reenc\"/" /etc/default/pixelpilot
+        else
+            sed -i "s/^PIXELPILOT_DVR_REENC=.*/PIXELPILOT_DVR_REENC=\"\"/" /etc/default/pixelpilot
+        fi
+        ;;
+    "set gs system dvr_reenc_resolution"*)
+        sed -i "s/^PIXELPILOT_DVR_RESOLUTION=.*/PIXELPILOT_DVR_RESOLUTION=\"$5\"/" /etc/default/pixelpilot
+        ;;
+    "set gs system dvr_reenc_codec"*)
+        sed -i "s/^PIXELPILOT_DVR_CODEC=.*/PIXELPILOT_DVR_CODEC=\"$5\"/" /etc/default/pixelpilot
+        ;;
+    "set gs system dvr_reenc_fps"*)
+        sed -i "s/^PIXELPILOT_DVR_FPS=.*/PIXELPILOT_DVR_FPS=\"$5\"/" /etc/default/pixelpilot
+        ;;
+    "set gs system dvr_reenc_bitrate"*)
+        sed -i "s/^PIXELPILOT_DVR_BITRATE=.*/PIXELPILOT_DVR_BITRATE=\"$5\"/" /etc/default/pixelpilot
+        ;;
+    "set gs system dvr_osd"*)
+        if [ "$5" = "on" ]
+        then
+            sed -i "s/^PIXELPILOT_DVR_OSD=.*/PIXELPILOT_DVR_OSD=\"--dvr-osd\"/" /etc/default/pixelpilot
+        else
+            sed -i "s/^PIXELPILOT_DVR_OSD=.*/PIXELPILOT_DVR_OSD=\"\"/" /etc/default/pixelpilot
+        fi
+        ;;
     "values gs system rx_codec")
         echo -n -e "h264\nh265"
         ;;
@@ -778,6 +840,14 @@ case "$@" in
     "set gs system rx_codec"*)
         sed -i "s/^PIXELPILOT_CODEC=.*/PIXELPILOT_CODEC=\"$5\"/" /etc/default/pixelpilot
     ;;
+    "set gs system gs_live_colortrans"*)
+        if [ "$5" = "on" ]
+        then
+            sed -i "s/^PIXELPILOT_LIVE_COLORTRANS=.*/PIXELPILOT_LIVE_COLORTRANS=\"--live-colortrans\"/" /etc/default/pixelpilot
+        else
+            sed -i "s/^PIXELPILOT_LIVE_COLORTRANS=.*/PIXELPILOT_LIVE_COLORTRANS=\"\"/" /etc/default/pixelpilot
+        fi
+    ;;
     "set gs system rx_mode"*)
             EXCLUDE_IFACE="wlan0"
             SSID="${6:-OpenIPC}"

package/pixelpilot/files/pixelpilot

@@ -5,5 +5,14 @@ PIXELPILOT_SCREEN_MODE="1920x1080@60"
 PIXELPILOT_DVR_FRAMERATE="60"
 PIXELPILOT_CODEC="h265"
 PIXELPILOT_VIDEO_SCALE=1.0
+PIXELPILOT_LIVE_COLORTRANS=""
+PIXELPILOT_DVR_REENC=""
+PIXELPILOT_DVR_CODEC="h264"
+PIXELPILOT_DVR_BITRATE="25000"
+PIXELPILOT_DVR_FPS="30"
+PIXELPILOT_DVR_OSD=""
+PIXELPILOT_DVR_RESOLUTION="1080p"
+PIXELPILOT_DVR_MODE="raw"
+PIXELPILOT_DVR_MAX_SIZE="4000"
 
-PIXELPILOT_ARGS="--config $PIXELPILOT_CONFIG_YAML $PIXELPILOT_OSD_ARGS --codec $PIXELPILOT_CODEC --screen-mode $PIXELPILOT_SCREEN_MODE --video-scale $PIXELPILOT_VIDEO_SCALE --dvr-framerate $PIXELPILOT_DVR_FRAMERATE --dvr-fmp4 --dvr-sequenced-files --dvr-template /media/dvr/record_%Y-%m-%d_%H-%M-%S.mp4"
+PIXELPILOT_ARGS="--config $PIXELPILOT_CONFIG_YAML $PIXELPILOT_OSD_ARGS --codec $PIXELPILOT_CODEC --screen-mode $PIXELPILOT_SCREEN_MODE --video-scale $PIXELPILOT_VIDEO_SCALE --dvr-framerate $PIXELPILOT_DVR_FRAMERATE --dvr-fmp4 --dvr-sequenced-files --dvr-template /media/dvr/record_%Y-%m-%d_%H-%M-%S.mp4 $PIXELPILOT_LIVE_COLORTRANS $PIXELPILOT_DVR_REENC --dvr-reenc-codec $PIXELPILOT_DVR_CODEC --dvr-reenc-bitrate $PIXELPILOT_DVR_BITRATE --dvr-reenc-fps $PIXELPILOT_DVR_FPS $PIXELPILOT_DVR_OSD --dvr-reenc-resolution $PIXELPILOT_DVR_RESOLUTION --dvr-mode $PIXELPILOT_DVR_MODE --dvr-max-size $PIXELPILOT_DVR_MAX_SIZE"

package/pixelpilot/pixelpilot.mk

@@ -4,7 +4,7 @@
 #
 ###############################################################################
 
-PIXELPILOT_VERSION=53a2d52fdcd9fc0cc94a2f11d534482ef81c1d6f
+PIXELPILOT_VERSION=21872fdabac24af48f701cf3802ad82c8f0116aa
 PIXELPILOT_SITE=https://github.com/OpenIPC/PixelPilot_rk.git
 PIXELPILOT_SITE_METHOD = git
 PIXELPILOT_GIT_SUBMODULES = YES