diff --git a/.gitignore b/.gitignore index 5572f28cc866..58f65c965df0 100644 --- a/.gitignore +++ b/.gitignore @@ -35,11 +35,11 @@ external/cache/sources/evalcache external/cache/sources/oh-my-zsh external/cache/sources/sunxi-tools external/cache/sources/rkbin-tools +external/cache/sources/ffmpeg_kodi* external/cache/sources/orangepi-test -external/cache/sources/rk3588_packages +external/cache/sources/rk3588_packages* external/cache/sources/rk-rootfs-build* external/cache/sources/orangepi-firmware* -external/cache/sources/ffmpeg_kodi* external/cache/sources/rk3399_gst_xserver_libs external/cache/sources/arm-trusted-firmware-sunxi-mainline external/cache/debs/arm64/balena-etcher-electron_1.7.9+5945ab1f_arm64.deb diff --git a/external/cache/debs/arm64/.gitignore b/external/cache/debs/arm64/.gitignore index 75914522d2bb..3249e43f68ce 100644 --- a/external/cache/debs/arm64/.gitignore +++ b/external/cache/debs/arm64/.gitignore @@ -1,3 +1,3 @@ -chromium-browser_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb -chromium-codecs-ffmpeg-extra_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb -firefox-esr_102.1.0esr+build1-0ubuntu0.22.04.1_arm64.deb +chromium-browser* +chromium-codecs-ffmpeg-extra* +firefox-esr* diff --git a/external/config/desktop/jammy/environments/gnome/config_base/packages.uninstall b/external/config/desktop/jammy/environments/gnome/config_base/packages.uninstall new file mode 100644 index 000000000000..ec0762d75173 --- /dev/null +++ b/external/config/desktop/jammy/environments/gnome/config_base/packages.uninstall @@ -0,0 +1 @@ +gdm3 \ No newline at end of file diff --git a/external/config/kernel/linux-rockchip-rk3588-legacy.config b/external/config/kernel/linux-rockchip-rk3588-legacy.config index 21e6824fcd87..77230c8dd4fa 100644 --- a/external/config/kernel/linux-rockchip-rk3588-legacy.config +++ b/external/config/kernel/linux-rockchip-rk3588-legacy.config @@ -1727,9 +1727,10 @@ CONFIG_CAN_SOFTING=m # # CAN SPI interfaces # -# CONFIG_CAN_HI311X is not set +CONFIG_CAN_HI311X=m CONFIG_CAN_MCP251X=m -# CONFIG_CAN_MCP251XFD is not set +CONFIG_CAN_MCP251XFD=m +# CONFIG_CAN_MCP251XFD_SANITY is not set # end of CAN SPI interfaces # diff --git a/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages new file mode 100644 index 000000000000..e99b72162b98 --- /dev/null +++ b/external/config/optional/families/rockchip-rk3588/_config/desktop/jammy/environments/xfce/config_base/packages @@ -0,0 +1,242 @@ +libqt5opengl5 +libass9 +libblas3 +libbs2b0 +libdc1394-25 +libdecor-0-0 +libflite1 +libgfortran5 +liblapack3 +libmysofa1 +libopenal-data +libopenal1 +libpocketsphinx3 +librubberband2 +libsdl2-2.0-0 +libsndio7.0 +libsphinxbase3 +libvidstab1.1 +libzimg2 +libdvdnav4 +libdvdread8 +liblua5.2-0 +libmujs1 +libplacebo192 +libsixel1 +libva-wayland2 +libvulkan1 +libbrotli-dev +libdrm-dev +libdrm-etnaviv1 +libdrm-freedreno1 +libdrm-tegra0 +libfontenc-dev +libfreetype-dev +libfreetype6-dev +libgl-dev +libglx-dev +libpciaccess-dev +libpixman-1-dev +libpng-dev +libpthread-stubs0-dev +libx11-dev +libxau-dev +libxcb1-dev +libxcvt-dev +libxdmcp-dev +libxfont-dev +libxkbfile-dev +mesa-common-dev +x11proto-dev +xorg-sgml-doctools +xtrans-dev +glmark2 +glmark2-es2 +libdw-dev +libelf-dev +liblzma-dev +libunwind-dev +gir1.2-gudev-1.0 +libegl-dev +libgbm-dev +libgles-dev +libgles1 +libgudev-1.0-dev +liborc-0.4-dev +liborc-0.4-dev-bin +libudev-dev +libwayland-bin +libwayland-dev +libx11-xcb-dev +audacity +policykit-1-gnome +libdw-dev +libelf-dev +liblzma-dev +libunwind-dev +gir1.2-gudev-1.0 +libegl-dev +libgbm-dev +libgles-dev +libgles1 +libgudev-1.0-dev +liborc-0.4-dev +liborc-0.4-dev-bin +libudev-dev +libwayland-bin +libwayland-dev +libx11-xcb-dev +gdal-data +ibverbs-providers +libaec0 +libarmadillo10 +libarpack2 +libblosc1 +libcfitsio9 +libcharls2 +libdc1394-dev +libdca0 +libde265-0 +libdeflate-dev +libevent-pthreads-2.1-7 +libexif-dev +libfaad2 +libfabric1 +libfluidsynth3 +libfreeaptx0 +libfreexl1 +libfyba0 +libgdal30 +libgdcm-dev +libgdcm3.0 +libgeos-c1v5 +libgeos3.10.2 +libgeotiff5 +libgif7 +libgl2ps1.4 +libglew2.2 +libgphoto2-dev +libgssdp-1.2-0 +libgstreamer-plugins-good1.0-dev +libgupnp-1.2-1 +libgupnp-igd-1.0-4 +libhdf4-0-alt +libhdf5-103-1 +libhdf5-hl-100 +libheif1 +libhwloc-plugins +libhwloc15 +libibverbs1 +libilmbase-dev +libilmbase25 +libinstpatch-1.0-2 +libjbig-dev +libjpeg-dev +libjpeg-turbo8-dev +libjpeg8-dev +libjsoncpp25 +libkate1 +libkmlbase1 +libkmldom1 +libkmlengine1 +libldacbt-enc2 +liblept5 +libltc11 +libminizip1 +libmjpegutils-2.1-0 +libmodplug1 +libmpcdec6 +libmpeg2encpp-2.1-0 +libmplex2-2.1-0 +libmysqlclient21 +libnetcdf19 +libnice10 +libodbc2 +libodbcinst2 +libogdi4.1 +libopencv-calib3d-dev +libopencv-calib3d4.5d +libopencv-contrib-dev +libopencv-contrib4.5d +libopencv-core-dev +libopencv-core4.5d +libopencv-dev +libopencv-dnn-dev +libopencv-dnn4.5d +libopencv-features2d-dev +libopencv-features2d4.5d +libopencv-flann-dev +libopencv-flann4.5d +libopencv-highgui-dev +libopencv-highgui4.5d +libopencv-imgcodecs-dev +libopencv-imgcodecs4.5d +libopencv-imgproc-dev +libopencv-imgproc4.5d +libopencv-ml-dev +libopencv-ml4.5d +libopencv-objdetect-dev +libopencv-objdetect4.5d +libopencv-photo-dev +libopencv-photo4.5d +libopencv-shape-dev +libopencv-shape4.5d +libopencv-stitching-dev +libopencv-stitching4.5d +libopencv-superres-dev +libopencv-superres4.5d +libopencv-video-dev +libopencv-video4.5d +libopencv-videoio-dev +libopencv-videoio4.5d +libopencv-videostab-dev +libopencv-videostab4.5d +libopencv-viz-dev +libopencv-viz4.5d +libopenexr-dev +libopenexr25 +libopengl0 +libopenh264-6 +libopenmpi3 +libopenni2-0 +libpmix2 +libpq5 +libproj22 +libqhull-r8.0 +libraw1394-dev +librdmacm1 +librttopo1 +libsocket++1 +libspandsp2 +libspatialite7 +libsrtp2-1 +libsuperlu5 +libsz2 +libtbb-dev +libtbb12 +libtbb2 +libtbbmalloc2 +libtesseract4 +libtiff-dev +libtiffxx5 +libtk8.6 +libucx0 +liburiparser1 +libvo-aacenc0 +libvo-amrwbenc0 +libvtk9.1 +libwildmidi2 +libwpe-1.0-1 +libwpebackend-fdo-1.0-1 +libwpewebkit-1.0-3 +libxerces-c3.2 +libxnvctrl0 +libzbar0 +libzxingcore1 +mysql-common +proj-data +timgm6mb-soundfont +unixodbc-common +libgraphene-1.0-0 +tightvncserver +xrdp diff --git a/external/config/sources/families/include/rk3588_gpu_vpu.inc b/external/config/sources/families/include/rk3588_gpu_vpu.inc index 29a28cfe5cbd..2e0f201212bc 100755 --- a/external/config/sources/families/include/rk3588_gpu_vpu.inc +++ b/external/config/sources/families/include/rk3588_gpu_vpu.inc @@ -8,111 +8,111 @@ rk3588_gpu_vpu_tweaks() #chroot $SDCARD /bin/bash -c "apt-get upgrade -y" # RK GPU VPU - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/rga2/librga2_2.2.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/rga2/librga-dev_2.2.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga2_2.2.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rga2/librga-dev_2.2.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/mpp/librockchip-mpp1_1.5.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/mpp/librockchip-mpp-dev_1.5.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/mpp/librockchip-vpu0_1.5.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/mpp/rockchip-mpp-demos_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp1_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-mpp-dev_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/librockchip-vpu0_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpp/rockchip-mpp-demos_1.5.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-rkmpp/gstreamer1.0-rockchip1_1.14-4_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-rkmpp/gstreamer1.0-rockchip1_1.14-4_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gstreamer/gir1.2-gstreamer-1.0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gstreamer/gstreamer1.0-tools_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gstreamer/libgstreamer1.0-0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gstreamer/libgstreamer1.0-dev_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer/gir1.2-gstreamer-1.0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer/gstreamer1.0-tools_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer/libgstreamer1.0-0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gstreamer/libgstreamer1.0-dev_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/gir1.2-gst-plugins-base-1.0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/gstreamer1.0-alsa_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/gstreamer1.0-gl_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/gstreamer1.0-plugins-base_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/gstreamer1.0-plugins-base-apps_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/gstreamer1.0-x_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gir1.2-gst-plugins-base-1.0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-alsa_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-gl_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-plugins-base_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-plugins-base-apps_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/gstreamer1.0-x_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/gir1.2-gst-plugins-bad-1.0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/libgstreamer-opencv1.0-0_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/gstreamer1.0-opencv_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/gstreamer1.0-plugins-bad-apps_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/gstreamer1.0-wpe_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-dev_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gir1.2-gst-plugins-bad-1.0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/libgstreamer-opencv1.0-0_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-opencv_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-plugins-bad-apps_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/gstreamer1.0-wpe_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-dev_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-good1.0/gstreamer1.0-gtk3_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-good1.0/gstreamer1.0-qt5_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-gtk3_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-good1.0/gstreamer1.0-qt5_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-plugins-ugly1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-plugins-ugly1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/gst-libav1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/gst-libav1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libdvbv5-0_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/dvb-tools_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/ir-keytable_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libdvbv5-dev_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libdvbv5-doc_1.20.0-2_all.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libv4l-0_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libv4l2rds0_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libv4lconvert0_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libv4l-dev_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/libv4l-rkmpp_1.4.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/v4l-utils_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libv4l/qv4l2_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libdvbv5-0_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/dvb-tools_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/ir-keytable_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libdvbv5-dev_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libdvbv5-doc_1.20.0-2_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4l-0_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4l2rds0_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4lconvert0_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4l-dev_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/libv4l-rkmpp_1.4.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/v4l-utils_1.20.0-2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libv4l/qv4l2_1.20.0-2_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/xserver/xserver-xorg-core_1.20.11-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/xserver/xserver-common_1.20.11-1_all.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/xserver/xserver-xorg-dev_1.20.11-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/xserver/xserver-xorg-legacy_1.20.11-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-xorg-core_1.20.11-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-common_1.20.11-1_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-xorg-dev_1.20.11-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/xserver/xserver-xorg-legacy_1.20.11-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/chromium/chromium-x11_91.0.4472.164_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/chromium/chromium-x11_91.0.4472.164_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libdrm/libkms1_2.4.104-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libdrm/libkms1_2.4.104-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/glmark2/glmark2-data_2021.02+ds-1_all.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/glmark2/glmark2-drm_2021.02+ds-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/glmark2/glmark2-es2-drm_2021.02+ds-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/glmark2/glmark2-es2-wayland_2021.02+ds-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/glmark2/glmark2-es2-x11_2021.02+ds-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/glmark2/glmark2-wayland_2021.02+ds-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/glmark2/glmark2-x11_2021.02+ds-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/glmark2/glmark2-data_2021.02+ds-1_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/glmark2/glmark2-drm_2021.02+ds-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/glmark2/glmark2-es2-drm_2021.02+ds-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/glmark2/glmark2-es2-wayland_2021.02+ds-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/glmark2/glmark2-es2-x11_2021.02+ds-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/glmark2/glmark2-wayland_2021.02+ds-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/glmark2/glmark2-x11_2021.02+ds-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/rktoolkit/rktoolkit_1.0.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/rktoolkit/rktoolkit_1.0.0-1_arm64.deb" - install_deb_chroot "$EXTER/cache/sources/rk3588_packages/libmali/libmali-valhall-g610-g6p0-x11_1.9-1_arm64.deb" + install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/libmali/libmali-valhall-g610-g6p0-x11_1.9-1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavutil56_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavutil-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libpostproc55_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libpostproc-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libswresample3_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libswresample-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libswscale5_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libswscale-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavcodec58_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavcodec-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavformat58_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavformat-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavresample4_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavresample-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavfilter7_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavfilter-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavdevice58_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/libavdevice-dev_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/ffmpeg/ffmpeg_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavutil56_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavutil-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libpostproc55_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libpostproc-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswresample3_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswresample-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswscale5_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libswscale-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavcodec58_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavcodec-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavformat58_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavformat-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavresample4_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavresample-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavfilter7_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavfilter-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavdevice58_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/libavdevice-dev_4.3.5-0+deb11u1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/ffmpeg/ffmpeg_4.3.5-0+deb11u1_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/mpv/libmpv1_0.32.0-3_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/mpv/libmpv-dev_0.32.0-3_arm64.deb" - dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages/mpv/mpv_0.32.0-3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpv/libmpv1_0.32.0-3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpv/libmpv-dev_0.32.0-3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_${RELEASE}/mpv/mpv_0.32.0-3_arm64.deb" chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X" @@ -124,4 +124,130 @@ rk3588_gpu_vpu_tweaks() chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/" fi + + if [[ ${BOARD} =~ orangepi5 && ${SELECTED_CONFIGURATION} == desktop && ${RELEASE} == jammy ]]; then + + chroot $SDCARD /bin/bash -c "chmod o+x /usr/lib/dbus-1.0/dbus-daemon-launch-helper" + + #chroot $SDCARD /bin/bash -c "apt-get update" + #chroot $SDCARD /bin/bash -c "apt-get upgrade -y" > /dev/null + chroot $SDCARD /bin/bash -c "apt-get install -y libgraphene-1.0-0" > /dev/null + + # RK GPU VPU + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rkaiq/camera-engine-rkaiq_rk3588_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga2_2.2.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rga2/librga-dev_2.2.0-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp1_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-mpp-dev_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/librockchip-vpu0_1.5.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpp/rockchip-mpp-demos_1.5.0-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-rkmpp/gstreamer1.0-rockchip1_1.14-4_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gstreamer/gir1.2-gstreamer-1.0_1.20.3-0ubuntu1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gstreamer/gstreamer1.0-tools_1.20.3-0ubuntu1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gstreamer/libgstreamer1.0-0_1.20.3-0ubuntu1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gstreamer/libgstreamer1.0-dev_1.20.3-0ubuntu1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/gir1.2-gst-plugins-base-1.0_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/gstreamer1.0-alsa_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/gstreamer1.0-gl_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/gstreamer1.0-plugins-base_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/gstreamer1.0-plugins-base-apps_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/gstreamer1.0-x_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/libgstreamer-gl1.0-0_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/libgstreamer-plugins-base1.0-0_1.20.3-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-base1.0/libgstreamer-plugins-base1.0-dev_1.20.3-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gir1.2-gst-plugins-bad-1.0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-opencv1.0-0_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-opencv_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-plugins-bad_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-plugins-bad-apps_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/gstreamer1.0-wpe_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-bad1.0/libgstreamer-plugins-bad1.0-dev_1.18.5-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-gtk3_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-plugins-good_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-pulseaudio_1.18.5-1_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-good1.0/gstreamer1.0-qt5_1.18.5-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-plugins-ugly1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/gst-libav1.0/gstreamer1.0-plugins-ugly_1.18.5-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libdvbv5-0_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/dvb-tools_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/ir-keytable_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libdvbv5-dev_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libdvbv5-doc_1.22.1-2build1_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-0_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l2rds0_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4lconvert0_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-dev_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/libv4l-rkmpp_1.5.0-1.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/v4l-utils_1.22.1-2build1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libv4l/qv4l2_1.22.1-2build1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-xorg-core_21.1.3-2ubuntu2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-common_21.1.3-2ubuntu2_all.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-xorg-dev_21.1.3-2ubuntu2_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/xserver/xserver-xorg-legacy_21.1.3-2ubuntu2_arm64.deb" + + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/chromium/chromium-x11_91.0.4472.164_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm/libkms1_2.4.110-1ubuntu1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm-cursor/libdrm-cursor_1.4.0-1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libdrm-cursor/libdrm-cursor-dev_1.4.0-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/rktoolkit/rktoolkit_1.0.0-1_arm64.deb" + + install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/libmali/libmali-valhall-g610-g6p0-x11_1.9-1_arm64.deb" + + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavutil56_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavutil-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libpostproc55_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libpostproc-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libswresample3_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libswresample-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libswscale5_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libswscale-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavcodec58_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavcodec-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavformat58_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavformat-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavfilter7_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavfilter-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavdevice58_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/libavdevice-dev_4.4.2-0ubuntu0.22.04.1_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/ffmpeg/ffmpeg_4.4.2-0ubuntu0.22.04.1_arm64.deb" + + chroot $SDCARD /bin/bash -c "rm /etc/mpv/mpv.conf" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpv/libmpv1_0.34.1-1ubuntu3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpv/libmpv-dev_0.34.1-1ubuntu3_arm64.deb" + dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mpv/mpv_0.34.1-1ubuntu3_arm64.deb" + + chroot $SDCARD /bin/bash -c "sed -i '5aexport LD_PRELOAD=libdrm-cursor.so.1' /usr/bin/X" + + ## The chromium using fixed pathes for libv4l2.so + chroot $SDCARD /bin/bash -c "ln -rsf /usr/lib/*/libv4l2.so /usr/lib/" + chroot $SDCARD /bin/bash -c "[ -e /usr/lib/aarch64-linux-gnu/ ] && ln -Tsf lib /usr/lib64" + + chroot $SDCARD /bin/bash -c "cd /usr/lib/aarch64-linux-gnu/dri/;cp kms_swrast_dri.so swrast_dri.so rockchip_dri.so /" + chroot $SDCARD /bin/bash -c "rm /usr/lib/aarch64-linux-gnu/dri/*.so;mv /*.so /usr/lib/aarch64-linux-gnu/dri/" + + ## for panfork - ok + #cp ${EXTER}/packages/bsp/mali_csffw.bin $SDCARD/lib/firmware/ + #chroot $SDCARD /bin/bash -c "apt-get install -y glmark2 glmark2-es2" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgbm1_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglapi-mesa_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libgl1-mesa-dri_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libegl-mesa0_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" + #dpkg_install_deb_chroot "$EXTER/cache/sources/rk3588_packages_jammy/mesa/libglx-mesa0_23.0~panfork~csf~git221206.c0a7a787026~j_arm64.deb" + + fi } diff --git a/external/config/sources/families/include/rockchip64_common.inc b/external/config/sources/families/include/rockchip64_common.inc index 81c84e6bad29..4887a8af30bd 100644 --- a/external/config/sources/families/include/rockchip64_common.inc +++ b/external/config/sources/families/include/rockchip64_common.inc @@ -279,8 +279,8 @@ family_tweaks() if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_chromium == yes ]]; then - chromium_name="chromium-browser_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb" - chromium_extra_name="chromium-codecs-ffmpeg-extra_101.0.4951.15-0ubuntu1~ppa1~22.04.1_arm64.deb" + chromium_name="chromium-browser_107.0.5304.62-0ubuntu1~ppa1~22.04.1_arm64.deb" + chromium_extra_name="chromium-codecs-ffmpeg-extra_107.0.5304.62-0ubuntu1~ppa1~22.04.1_arm64.deb" chromium_url="http://ppa.launchpadcontent.net/saiarcot895/chromium-beta/ubuntu/pool/main/c/chromium-browser" chromium=${EXTER}/cache/debs/arm64/${chromium_name} chromium_extra=${EXTER}/cache/debs/arm64/${chromium_extra_name} @@ -297,7 +297,7 @@ family_tweaks() if [[ $RELEASE == jammy && $BUILD_DESKTOP == yes && $install_firefox == yes ]]; then - firefox_name="firefox-esr_102.1.0esr+build1-0ubuntu0.22.04.1_arm64.deb" + firefox_name="firefox-esr_102.6.0esr+build1-0ubuntu0.22.04.1_arm64.deb" firefox_url="https://ppa.launchpadcontent.net/mozillateam/ppa/ubuntu/pool/main/f/firefox-esr/" firefox=${EXTER}/cache/debs/arm64/${firefox_name} diff --git a/external/config/sources/families/rockchip-rk3588.conf b/external/config/sources/families/rockchip-rk3588.conf index 4a7a10f48558..1ffaddf1dbea 100644 --- a/external/config/sources/families/rockchip-rk3588.conf +++ b/external/config/sources/families/rockchip-rk3588.conf @@ -45,22 +45,24 @@ install_balenaEtcher(){ fi } - family_tweaks_s() { rsync -a "${EXTER}"/packages/bsp/rk3588/* ${SDCARD}/ + [[ ${RELEASE} == jammy ]] && rm ${SDCARD}/etc/profile.d/orangepi-ssh-title.sh # for adbd + + if [[ -f "${SDCARD}"/etc/profile.d/im-config_wayland.sh ]]; then + chroot $SDCARD /bin/bash -c "rm /etc/profile.d/im-config_wayland.sh" # for adbd + fi # enable additional services chroot "${SDCARD}" /bin/bash -c "systemctl --no-reload enable usbdevice.service >/dev/null 2>&1" - chroot $SDCARD /bin/bash -c "rm /etc/profile.d/im-config_wayland.sh" sed "s/^SIZE=.*/SIZE=200M/" -i "${SDCARD}"/etc/default/orangepi-ramlog chroot "${SDCARD}" /bin/bash -c "ln -fs /usr/share/zoneinfo/Asia/Shanghai /etc/localtime" chroot "${SDCARD}" /bin/bash -c "dpkg-reconfigure -f noninteractive tzdata" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 - chroot $SDCARD /bin/bash -c "apt-get -y -qq install lm-sensors" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 - install_deb_chroot "$EXTER/cache/debs/arm64/wiringpi_2.46.deb" + install_wiringop install_docker install_balenaEtcher } diff --git a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization index c82f6193a540..189b93ad5925 100755 --- a/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization +++ b/external/packages/bsp/common/usr/lib/orangepi/orangepi-hardware-optimization @@ -110,12 +110,10 @@ prepare_board() { chown root.video /dev/video-* fi - if [[ ${DISTRIBUTION_CODENAME} == "bullseye" ]]; then - for p in $(modetest|grep "^Planes:" -A 9999|grep -o "^[0-9]*"); - do - modetest -M rockchip -aw $p:ASYNC_COMMIT:1 &>/dev/null - done - fi + for p in $(modetest|grep "^Planes:" -A 9999|grep -o "^[0-9]*"); + do + modetest -M rockchip -aw $p:ASYNC_COMMIT:1 &>/dev/null + done bt_status=$(cat /proc/device-tree/wireless-bluetooth/status) if [[ ${bt_status} == "okay" ]]; then diff --git a/external/packages/bsp/mali_csffw.bin b/external/packages/bsp/mali_csffw.bin new file mode 100755 index 000000000000..710d362c28cb Binary files /dev/null and b/external/packages/bsp/mali_csffw.bin differ diff --git a/external/packages/bsp/rk3588/usr/local/bin/set_vnc.sh b/external/packages/bsp/rk3588/usr/local/bin/set_vnc.sh index 330005089ba9..63cd43e17187 100755 --- a/external/packages/bsp/rk3588/usr/local/bin/set_vnc.sh +++ b/external/packages/bsp/rk3588/usr/local/bin/set_vnc.sh @@ -15,3 +15,5 @@ EOF chmod +x ~/.vnc/xstartup vncserver + +sync diff --git a/external/packages/bsp/rk3588/usr/local/bin/test_dec_mpv.sh b/external/packages/bsp/rk3588/usr/local/bin/test_dec_mpv.sh new file mode 100755 index 000000000000..6ab755518c48 --- /dev/null +++ b/external/packages/bsp/rk3588/usr/local/bin/test_dec_mpv.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +export DISPLAY=:0.0 +#export GST_DEBUG=*:5 +#export GST_DEBUG_FILE=/tmp/2.txt + +# xv vo +mpv --hwdec=rkmpp --vd-lavc-software-fallback=no --vo=xv /usr/local/test.mp4 diff --git a/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh b/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh index d5d31149ad76..ab9439b67794 100755 --- a/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh +++ b/external/packages/bsp/rk3588/usr/local/bin/vpu_debug.sh @@ -1,3 +1,3 @@ #!/bin/bash -echo 0x100 > /sys/module/rk_vcodec/parameters/mpp_dev_debug +sudo bash -c "echo 0x100 > /sys/module/rk_vcodec/parameters/mpp_dev_debug" diff --git a/scripts/general.sh b/scripts/general.sh index 2f012392c091..0eed17dc6769 100755 --- a/scripts/general.sh +++ b/scripts/general.sh @@ -1813,6 +1813,11 @@ show_checklist_variables () done } +install_wiringop() +{ + install_deb_chroot "$EXTER/cache/debs/arm64/wiringpi_2.46.deb" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 + chroot "${SDCARD}" /bin/bash -c "apt-mark hold wiringpi" >> "${DEST}"/${LOG_SUBPATH}/install.log 2>&1 +} install_docker() { diff --git a/scripts/main.sh b/scripts/main.sh index 12e0a5a56984..25e6018aaf23 100755 --- a/scripts/main.sh +++ b/scripts/main.sh @@ -442,9 +442,9 @@ if [[ ${IGNORE_UPDATES} != yes ]]; then fi - if [[ ${BOARD} =~ orangepi5 && $RELEASE =~ bullseye ]]; then + if [[ ${BOARD} =~ orangepi5 && $RELEASE =~ bullseye|jammy ]]; then - [[ ${BUILD_OPT} == image ]] && fetch_from_repo "https://github.com/orangepi-xunlong/rk-rootfs-build.git" "${EXTER}/cache/sources/rk3588_packages" "branch:rk3588_packages" + [[ ${BUILD_OPT} == image ]] && fetch_from_repo "https://github.com/orangepi-xunlong/rk-rootfs-build.git" "${EXTER}/cache/sources/rk3588_packages_${RELEASE}" "branch:rk3588_packages_${RELEASE}" fi