ci: Amiberry: Implement Amiberry v7 build

Author: MichaIng

.build/software/Amiberry/build.bash

@@ -1,19 +1,18 @@
 #!/bin/bash
 {
 . /boot/dietpi/func/dietpi-globals || exit 1
-
-[[ $1 ]] && PLATFORM=$1
-[[ $PLATFORM ]] || { G_WHIP_INPUTBOX 'Build Amiberry? Enter platform: https://github.com/BlitterStudio/amiberry/blob/master/Makefile' && PLATFORM=$G_WHIP_RETURNED_VALUE || exit 0; }
-G_DIETPI-NOTIFY 2 "Amiberry will be built for platform: \e[33m$PLATFORM"
+grep -q '^ID=raspbian' /etc/os-release && G_HW_ARCH=1 G_HW_ARCH_NAME='armv6l'
 
 # APT dependencies
-# - wget: Used for WHDLoad database update: https://github.com/BlitterStudio/amiberry/commit/d6c103e
 # - kbd: For "chvt" used in systemd service
-adeps_build=('autoconf' 'make' 'cmake' 'g++' 'pkg-config' 'libdrm-dev' 'libgbm-dev' 'libudev-dev' 'libxml2-dev' 'libpng-dev' 'libfreetype6-dev' 'libflac-dev' 'libmpg123-dev' 'libmpeg2-4-dev' 'libasound2-dev' 'libserialport-dev' 'libportmidi-dev' 'wget' 'kbd')
-adeps=('libdrm2' 'libgl1-mesa-dri' 'libgbm1' 'libegl1' 'libudev1' 'libxml2' 'libpng16-16' 'libfreetype6' 'libmpg123-0' 'libmpeg2-4' 'libasound2' 'libserialport0' 'libportmidi0' 'wget' 'kbd')
-(( $G_DISTRO > 6 )) && adeps+=('libflac12') || adeps+=('libflac8')
-# - Deps for RPi DispmanX builds
-[[ $PLATFORM == 'rpi'[1-5] || $PLATFORM == 'rpi'[345]'-64-dmx' ]] && adeps_build+=('libraspberrypi-dev') adeps+=('libraspberrypi0')
+adeps_build=('autoconf' 'make' 'cmake' 'g++' 'pkg-config' 'libdrm-dev' 'libgbm-dev' 'libudev-dev' 'libxml2-dev' 'libpng-dev' 'libfreetype6-dev' 'libflac-dev' 'libmpg123-dev' 'libmpeg2-4-dev' 'libasound2-dev' 'libserialport-dev' 'libportmidi-dev' 'libenet-dev' 'kbd')
+adeps=('libdrm2' 'libgl1-mesa-dri' 'libgbm1' 'libegl1' 'libudev1' 'libxml2' 'libpng16-16' 'libfreetype6' 'libmpg123-0' 'libmpeg2-4' 'libasound2' 'libserialport0' 'libportmidi0' 'libenet7' 'kbd')
+case $G_DISTRO in
+	6) adeps+=('libflac8');;
+	7) adeps+=('libflac12');;
+	8) adeps+=('libflac14');;
+	*) G_DIETPI-NOTIFY 1 "Unsupported distro version: $G_DISTRO_NAME (ID=$G_DISTRO)"; exit 1;;
+esac
 # - Graphics rendering flags and deps
 (( $G_HW_ARCH == 10 )) && opengl_flags=('--disable-video-opengles2' '--enable-video-opengl') adeps_build+=('libgl1-mesa-dev') adeps+=('libgl1') || opengl_flags=('--enable-video-opengles2' '--disable-video-opengl') adeps_build+=('libgles2-mesa-dev') adeps+=('libgles2')
 
@@ -28,7 +27,7 @@ do
 done
 
 # Build libSDL2
-v_sdl=$(curl -sSf 'https://api.github.com/repos/libsdl-org/SDL/releases/latest' | mawk -F\" '/^  "name"/{print $4}')
+v_sdl=$(curl -sSf 'https://api.github.com/repos/libsdl-org/SDL/releases' | mawk -F\" '/^ *"name": "2./{print $4}' | head -1)
 [[ $v_sdl ]] || { G_DIETPI-NOTIFY 1 'No latest LibSDL2 version found, aborting ...'; exit 1; }
 if [[ ! -d /tmp/SDL2-$v_sdl ]]
 then
@@ -48,7 +47,7 @@ else
 fi
 
 # Build libSDL2_image
-v_img=$(curl -sSf 'https://api.github.com/repos/libsdl-org/SDL_image/releases/latest' | mawk -F\" '/^  "name"/{print $4}')
+v_img=$(curl -sSf 'https://api.github.com/repos/libsdl-org/SDL_image/releases' | mawk -F\" '/^ *"name": "2./{print $4}' | head -1)
 [[ $v_img ]] || { G_DIETPI-NOTIFY 1 'No latest libSDL2_image version found, aborting ...'; exit 1; }
 if [[ ! -d /tmp/SDL2_image-$v_img ]]
 then
@@ -68,7 +67,7 @@ else
 fi
 
 # Build libSDL2_ttf
-v_ttf=$(curl -sSf 'https://api.github.com/repos/libsdl-org/SDL_ttf/releases/latest' | mawk -F\" '/^  "name"/{print $4}')
+v_ttf=$(curl -sSf 'https://api.github.com/repos/libsdl-org/SDL_ttf/releases' | mawk -F\" '/^ *"name": "2./{print $4}' | head -1)
 [[ $v_ttf ]] || { G_DIETPI-NOTIFY 1 'No latest libSDL2_ttf version found, aborting ...'; exit 1; }
 if [[ ! -d /tmp/SDL2_ttf-$v_ttf ]]
 then
@@ -87,79 +86,72 @@ else
 	G_DIETPI-NOTIFY 2 'Skipping libSDL2_ttf which has been built already'
 fi
 
-# Build capsimg: IPF support
-if [[ ! -d '/tmp/capsimg-master' ]]
-then
-	G_DIETPI-NOTIFY 2 'Building capsimg'
-	G_EXEC cd /tmp
-	G_EXEC curl -sSfLO 'https://github.com/FrodeSolheim/capsimg/archive/master.tar.gz'
-	G_EXEC tar xf master.tar.gz
-	G_EXEC rm master.tar.gz
-	G_EXEC cd capsimg-master
-	# RISC-V: "checking build system type... ./config.guess: unable to guess system type"
-	G_EXEC curl -sSfo CAPSImg/config.guess 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD'
-	G_EXEC curl -sSfo CAPSImg/config.sub 'https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD'
-	G_EXEC_OUTPUT=1 G_EXEC ./bootstrap
-	G_EXEC_OUTPUT=1 G_EXEC ./configure CFLAGS='-g0 -O3' CXXFLAGS='-g0 -O3'
-	G_EXEC_OUTPUT=1 G_EXEC make "-j$(nproc)"
-	G_EXEC strip --strip-unneeded --remove-section=.comment --remove-section=.note capsimg.so
-else
-	G_DIETPI-NOTIFY 2 'Skipping capsimg which has been built already'
-fi
-
 # Build Amiberry
 v_ami=$(curl -sSf 'https://api.github.com/repos/BlitterStudio/amiberry/releases/latest' | mawk -F\" '/^  "tag_name"/{print $4}')
 [[ $v_ami ]] || { G_DIETPI-NOTIFY 1 'No latest Amiberry version found, aborting ...'; exit 1; }
 v_ami=${v_ami#v}
-# - ARMv6: v5.7.2 dropped support for Raspberry Pi 1, hence use v5.7.1
-# - Build v5.7.4 until v7.0.0 stable has been released. It requires a major rework, using cmake and no device-specific targets anymore.
-[[ $PLATFORM == 'rpi1'* ]] && v_ami='5.7.1' || v_ami='5.7.4'
-G_DIETPI-NOTIFY 2 "Building Amiberry version \e[33m$v_ami\e[90m for platform: \e[33m$PLATFORM"
+G_DIETPI-NOTIFY 2 "Building Amiberry version \e[33m$v_ami"
 G_EXEC cd /tmp
 G_EXEC curl -sSfLO "https://github.com/BlitterStudio/amiberry/archive/v$v_ami.tar.gz"
 [[ -d amiberry-$v_ami ]] && G_EXEC rm -R "amiberry-$v_ami"
 G_EXEC tar xf "v$v_ami.tar.gz"
 G_EXEC rm "v$v_ami.tar.gz"
 G_EXEC cd "amiberry-$v_ami"
 # - RISC-V: Workaround for missing ld.gold: https://github.com/BlitterStudio/amiberry/issues/1213
-RISCV_LD=()
-(( $G_HW_ARCH == 11 )) && RISCV_LD=('USE_LD=bfd')
-G_EXEC_OUTPUT=1 G_EXEC make "-j$(nproc)" "PLATFORM=$PLATFORM" "${RISCV_LD[@]}" # Passing flags here overrides some mandatory flags in the Makefile, where -O3 is set as well.
-G_EXEC strip --remove-section=.comment --remove-section=.note amiberry
+#RISCV_LD=()
+#(( $G_HW_ARCH == 11 )) && RISCV_LD=('USE_LD=bfd')
+G_EXEC_OUTPUT=1 G_EXEC cmake -B build -DCMAKE_INSTALL_PREFIX=/usr
+G_EXEC_OUTPUT=1 G_EXEC cmake --build build
+G_EXEC strip --remove-section=.comment --remove-section=.note build/amiberry
 
 # Prepare DEB package
 G_DIETPI-NOTIFY 2 'Building Amiberry DEB package'
 G_EXEC cd /tmp
-DIR="amiberry_$PLATFORM"
+DIR="amiberry_$G_HW_ARCH_NAME"
 [[ -d $DIR ]] && G_EXEC rm -R "$DIR"
-G_EXEC mkdir -p "$DIR/"{DEBIAN,mnt/dietpi_userdata/amiberry/lib,lib/systemd/system}
+G_EXEC mkdir -p "$DIR/"{DEBIAN,mnt/dietpi_userdata/amiberry,lib/systemd/system}
 
 # - Copy files in place
-G_EXEC mv "/tmp/amiberry-$v_ami/"{abr,conf,controllers,data,kickstarts,savestates,screenshots,whdboot,amiberry} "$DIR/mnt/dietpi_userdata/amiberry/"
-G_EXEC cp -aL /usr/local/lib/libSDL2{,_image,_ttf}-2.0.so.0 "$DIR/mnt/dietpi_userdata/amiberry/lib/"
-G_EXEC cp -a /tmp/capsimg-master/capsimg.so "$DIR/mnt/dietpi_userdata/amiberry/lib/"
+G_EXEC_OUTPUT=1 G_EXEC cmake --install "amiberry-$v_ami/build" --prefix "$DIR/usr"
+# - Obtain library dir
+LIB_DIR=$(find "$DIR/usr/lib/"*'/amiberry' -maxdepth 0)
+G_EXEC cp -aL /usr/local/lib/libSDL2{,_image,_ttf}-2.0.so.0 "$LIB_DIR/"
 
 # - systemd service
-cat << '_EOF_' > "$DIR/lib/systemd/system/amiberry.service"
+cat << _EOF_ > "$DIR/lib/systemd/system/amiberry.service"
 [Unit]
 Description=Amiberry Amiga Emulator (DietPi)
 Documentation=https://github.com/BlitterStudio/amiberry/wiki
 
 [Service]
+Environment=LD_LIBRARY_PATH=${LIB_DIR#"$DIR"}
+Environment=HOME=/mnt/dietpi_userdata/amiberry
+Environment=XDG_DATA_HOME=/mnt/dietpi_userdata
+Environment=XDG_CONFIG_HOME=/mnt/dietpi_userdata
+Environment=AMIBERRY_HOME_DIR=/mnt/dietpi_userdata/amiberry
+Environment=AMIBERRY_CONFIG_DIR=/mnt/dietpi_userdata/amiberry/conf
 WorkingDirectory=/mnt/dietpi_userdata/amiberry
-Environment=LD_LIBRARY_PATH=/mnt/dietpi_userdata/amiberry/lib
 StandardInput=tty
 TTYPath=/dev/tty3
 ExecStartPre=/bin/chvt 3
-ExecStart=/mnt/dietpi_userdata/amiberry/amiberry
+ExecStart=/usr/bin/amiberry
 ExecStopPost=/bin/chvt 1
 
 [Install]
-WantedBy=local-fs.target
+WantedBy=multi-user.target
 _EOF_
 
-# - conffiles
-echo '/mnt/dietpi_userdata/amiberry/conf/amiberry.conf' > "$DIR/DEBIAN/conffiles"
+# - preinst
+cat << '_EOF_' > "$DIR/DEBIAN/preinst"
+#!/bin/sh
+if [ -d '/mnt/dietpi_userdata/amiberry' ] && [ ! -d '/mnt/dietpi_userdata/amiberry_v5_bak' ] && dpkg --compare-versions "$2" le '5.7.4'
+then
+	echo 'Backing up Amiberry v5 config/data dir to /mnt/dietpi_userdata/amiberry_v5_bak ...'
+	rm -Rf /mnt/dietpi_userdata/amiberry/amiberry /mnt/dietpi_userdata/amiberry/data /mnt/dietpi_userdata/amiberry/lib
+	cp -a /mnt/dietpi_userdata/amiberry /mnt/dietpi_userdata/amiberry_v5_bak
+	[ -f '/mnt/dietpi_userdata/amiberry/conf/amiberry.conf' ] && mv /mnt/dietpi_userdata/amiberry/conf/amiberry.conf /mnt/dietpi_userdata/amiberry/amiberry.conf
+fi
+_EOF_
 
 # - prerm
 cat << '_EOF_' > "$DIR/DEBIAN/prerm"
@@ -198,9 +190,9 @@ DEPS_APT_VERSIONED=${DEPS_APT_VERSIONED%,}
 grep -q '^ID=raspbian' /etc/os-release && DEPS_APT_VERSIONED=$(sed 's/+rp[it][0-9]\+[^)]*)/)/g' <<< "$DEPS_APT_VERSIONED") || DEPS_APT_VERSIONED=$(sed 's/+b[0-9]\+)/)/g' <<< "$DEPS_APT_VERSIONED")
 
 # - Obtain version suffix
-G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/amiberry_$PLATFORM.deb"
+G_EXEC_NOHALT=1 G_EXEC curl -sSfo package.deb "https://dietpi.com/downloads/binaries/$G_DISTRO_NAME/amiberry_$G_HW_ARCH_NAME.deb"
 old_version=$(dpkg-deb -f package.deb Version)
-G_EXEC rm package.deb
+G_EXEC_NOHALT=1 G_EXEC rm package.deb
 suffix=${old_version#*-dietpi}
 [[ $old_version == "$v_ami-"* ]] && v_ami+="-dietpi$((suffix+1))" || v_ami+="-dietpi1"
 
@@ -217,15 +209,15 @@ Section: games
 Priority: optional
 Homepage: https://amiberry.com/
 Description: Optimized Amiga emulator for the Raspberry Pi and other ARM boards
- This package ships with optimized libSDL2 and capsimg builds.
+ This package ships with optimized libSDL2 builds.
 _EOF_
 G_CONFIG_INJECT 'Installed-Size: ' "Installed-Size: $(du -sk "$DIR" | mawk '{print $1}')" "$DIR/DEBIAN/control"
 
 # - Permissions
 G_EXEC chown -R 0:0 "$DIR"
 G_EXEC find "$DIR" -type f -exec chmod 0644 {} +
 G_EXEC find "$DIR" -type d -exec chmod 0755 {} +
-G_EXEC chmod +x "$DIR/mnt/dietpi_userdata/amiberry/amiberry" "$DIR/DEBIAN/"{prerm,postrm}
+G_EXEC chmod +x "$DIR/usr/bin/amiberry" "$DIR/DEBIAN/"{preinst,prerm,postrm}
 
 # Build DEB package
 G_EXEC_OUTPUT=1 G_EXEC dpkg-deb -b "$DIR"