Merge pull request #718 from ROCKNIX/dev

PR for release

Author: r3claimer

CHANGELOG

@@ -20,7 +20,8 @@ RUN adduser --disabled-password --gecos '' docker \
 RUN apt-get install -y \
     bc default-jre file gawk gcc git golang-go gperf libjson-perl libncurses5-dev \
     libparse-yapp-perl libxml-parser-perl lzop make patchutils python-is-python3  \
-    python3 parted unzip wget curl xfonts-utils xsltproc zip zstd rdfind
+    python3 parted unzip wget curl xfonts-utils xsltproc zip zstd rdfind automake \
+    xmlstarlet
 
 ### Cross compiling on ARM
 RUN if [ "$(uname -m)" = "aarch64" ]; then apt-get install -y --no-install-recommends qemu-user-binfmt libc6-dev-amd64-cross; fi

Dockerfile

@@ -24,18 +24,13 @@ src-pkg:
 docs:
 	./tools/foreach './scripts/clean emulators && ./scripts/build emulators'
 
-world: RK3588 RK3566 RK3566-X55 RK3326 RK3399 S922X
+world: RK3588 RK3566 RK3326 RK3399 S922X SD865
 
 AMD64:
 	unset DEVICE_ROOT
 	PROJECT=PC DEVICE=AMD64 ARCH=i686 ./scripts/build_distro
 	PROJECT=PC DEVICE=AMD64 ARCH=x86_64 ./scripts/build_distro
 
-INTEL64:
-	unset DEVICE_ROOT
-	PROJECT=PC DEVICE=INTEL64 ARCH=i686 ./scripts/build_distro
-	PROJECT=PC DEVICE=INTEL64 ARCH=x86_64 ./scripts/build_distro
-
 RK3588:
 	unset DEVICE_ROOT
 	PROJECT=Rockchip DEVICE=RK3588 ARCH=arm ./scripts/build_distro
@@ -56,10 +51,6 @@ RK3566:
 	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=arm ./scripts/build_distro
 	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566 ARCH=aarch64 ./scripts/build_distro
 
-RK3566-X55:
-	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=arm ./scripts/build_distro
-	DEVICE_ROOT=RK3566 PROJECT=Rockchip DEVICE=RK3566-X55 ARCH=aarch64 ./scripts/build_distro
-
 RK3326:
 	unset DEVICE_ROOT
 	PROJECT=Rockchip DEVICE=RK3326 ARCH=arm ./scripts/build_distro
@@ -75,6 +66,11 @@ H700:
 	PROJECT=Allwinner DEVICE=H700 ARCH=arm ./scripts/build_distro
 	PROJECT=Allwinner DEVICE=H700 ARCH=aarch64 ./scripts/build_distro
 
+SD865:
+	unset DEVICE_ROOT
+	PROJECT=Qualcomm DEVICE=SD865 ARCH=arm ./scripts/build_distro
+	PROJECT=Qualcomm DEVICE=SD865 ARCH=aarch64 ./scripts/build_distro
+
 update:
 	PROJECT=Rockchip DEVICE=RK3588 ARCH=aarch64 ./scripts/update_packages
 
@@ -144,4 +140,4 @@ docker-image-pull:
 
 # Wire up docker to call equivalent make files using % to match and $* to pass the value matched by %
 docker-%:
-	BUILD_DIR=$(DOCKER_WORK_DIR) $(DOCKER_CMD) run $(PODMAN_ARGS) $(INTERACTIVE) --init --env-file .env --rm --user $(UID):$(GID) $(GLOBAL_SETTINGS) $(LOCAL_SSH_KEYS_FILE) $(EMULATIONSTATION_SRC) -v $(PWD):$(DOCKER_WORK_DIR) -w $(DOCKER_WORK_DIR) $(DOCKER_EXTRA_OPTS) $(DOCKER_IMAGE) $(COMMAND)
+	BUILD_DIR=$(DOCKER_WORK_DIR) $(DOCKER_CMD) run $(PODMAN_ARGS) $(INTERACTIVE) --init --env-file .env --rm --user $(UID):$(GID) $(GLOBAL_SETTINGS) $(LOCAL_SSH_KEYS_FILE) $(EMULATIONSTATION_SRC) -v $(PWD):$(DOCKER_WORK_DIR) -w $(DOCKER_WORK_DIR) $(DOCKER_EXTRA_OPTS) $(DOCKER_IMAGE) $(COMMAND)

Makefile

@@ -51,7 +51,7 @@ Under the following terms:
 
 ### ROCKNIX Software
 
-Copyright 2024 [ROCKNIX](https://github.com/ROCKNIX)
+Copyright (C) 2024-present [ROCKNIX](https://github.com/ROCKNIX)
 
 Original software and scripts developed by the ROCKNIX are licensed under the terms of the [GNU GPL Version 2](https://choosealicense.com/licenses/gpl-2.0/).  The full license can be found in this project's licenses folder.
 

README.md

@@ -47,13 +47,6 @@
       TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
       TARGET_FEATURES+=" neon"
       ;;
-      cortex-a55|cortex-a76.cortex-a55)
-      TARGET_SUBARCH=armv8.2-a
-      TARGET_ABI=eabi
-      TARGET_FPU_FLAGS="-mfloat-abi=$TARGET_FLOAT -mfpu=$TARGET_FPU"
-      TARGET_FEATURES+=" neon"
-      ;;
-
   esac
 
 #  if [ "${TARGET_FLOAT}" = "hard" ]; then

config/arch.arm

@@ -5,6 +5,7 @@ dolphin-sa # Wayland patch is now broken upstream
 drastic-sa # Package is closed source bin
 duckstation-lr # Libretro support removed from upstream.
 duckstation-sa # Patches need to be reworked.
+flycast-sa # Patched need to rebased
 gptokeyb # Newer versions break hotkeys
 gzdoom-sa # Stick to release versions.
 idtech-lr # Just a dummy package

config/blocklist

@@ -516,7 +516,7 @@ c = '${CC}'
 cpp = '${CXX}'
 ar = '${AR}'
 strip = '${STRIP}'
-pkgconfig = '${PKG_CONFIG}'
+pkg-config = '${PKG_CONFIG}'
 llvm-config = '${TOOLCHAIN}/bin/llvm-config'
 
 [host_machine]
@@ -547,7 +547,7 @@ c = '${TARGET_CC}'
 cpp = '${TARGET_CXX}'
 ar = '${TARGET_AR}'
 strip = '${TARGET_STRIP}'
-pkgconfig = '${PKG_CONFIG}'
+pkg-config = '${PKG_CONFIG}'
 llvm-config = '${SYSROOT_PREFIX}/usr/bin/llvm-config'
 libgcrypt-config = '${SYSROOT_PREFIX}/usr/bin/libgcrypt-config'
 

config/functions

@@ -54,6 +54,7 @@ get_graphicdrivers() {
 
   if listcontains "${GRAPHIC_DRIVERS}" "freedreno"; then
     GALLIUM_DRIVERS+=" freedreno"
+    VULKAN_DRIVERS_MESA+=" freedreno"
     V4L2_SUPPORT="yes"
     VAAPI_SUPPORT="no"
     VDPAU_SUPPORT="no"

config/graphic

@@ -5,6 +5,11 @@ show_config() {
   dashes="==========================="
   config_message="${config_message}\n ${dashes}${dashes}${dashes}"
   config_message="${config_message}\n Configuration for ${DISTRONAME} v${OS_VERSION}"
+  if [ "${OFFICIAL}" = "yes" ]; then
+    config_message+="(official)"
+  else
+    config_message+="(community)"
+  fi
   config_message="${config_message}\n ${dashes}${dashes}${dashes}"
 
   # Build options

config/show_config

@@ -80,7 +80,7 @@
   AVAHI_DAEMON="no"
 
 # build with NFS support (mounting nfs shares via the OS) (yes / no)
-  NFS_SUPPORT="no"
+  NFS_SUPPORT="yes"
 
 # build with Samba Client support (mounting samba shares via the OS) (yes / no)
   SAMBA_SUPPORT="no"