Merge branch 'master' into libretro

.github/extract-foreign-all.sh

@@ -0,0 +1,37 @@
+#!/bin/bash
+
+ARCH_="$1"
+.github/extract-foreign.sh "zlib1g-dev:${ARCH_}"
+.github/extract-foreign.sh "zlib1g:${ARCH_}"
+.github/extract-foreign.sh "libpng-dev:${ARCH_}"
+.github/extract-foreign.sh "libpng[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libsdl1.2-dev:${ARCH_}"
+.github/extract-foreign.sh "libsdl1.2debian:${ARCH_}"
+# endless libsdl deps
+.github/extract-foreign.sh "libasound[2-9]:${ARCH_}"
+.github/extract-foreign.sh "libpulse[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libx11-[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libx11-dev:${ARCH_}"
+.github/extract-foreign.sh "x11proto-dev"
+.github/extract-foreign.sh "libxext[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libxcb1:${ARCH_}"
+.github/extract-foreign.sh "libxau[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libxdmcp[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libcaca[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libdbus-[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libslang[2-9]:${ARCH_}"
+.github/extract-foreign.sh "libncursesw[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libtinfo[6-9]:${ARCH_}"
+.github/extract-foreign.sh "libsystemd[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libwrap[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libsndfile[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libasyncns[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libbsd[0-9]:${ARCH_}"
+.github/extract-foreign.sh "liblzma[0-9]:${ARCH_}"
+.github/extract-foreign.sh "liblz[4-9]-*:${ARCH_}"
+.github/extract-foreign.sh "libgcrypt[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libflac[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libogg[0-9]:${ARCH_}"
+.github/extract-foreign.sh "libvorbis[0-9]*:${ARCH_}"
+.github/extract-foreign.sh "libvorbisenc[2-9]:${ARCH_}"
+.github/extract-foreign.sh "libgpg-error[0-9]:${ARCH_}"

.github/extract-foreign.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+
+url_base="http://ports.ubuntu.com/ubuntu-ports/"
+paths=`apt-cache show "$@" | grep '^Filename:' | awk '{print $2}'`
+for p in $paths; do
+  base=`basename $p`
+  wget -nv "${url_base}${p}"
+  echo "exctacting $base"
+  dpkg-deb -x "$base" .
+done

.github/workflows/ci-linux-arm64.yml

@@ -0,0 +1,22 @@
+name: CI (Linux arm64)
+on: [push, pull_request]
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: |
+        whoami
+        sudo bash -c 'echo ''deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe'' > /etc/apt/sources.list.d/arm64.list'
+        sudo sed -i 's/^deb \([^[]\)/deb [arch=amd64] \1/' /etc/apt/sources.list
+        sudo dpkg --add-architecture arm64
+        sudo apt-get update -qq
+        sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
+        .github/extract-foreign-all.sh arm64
+    - name: configure
+      run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=aarch64-linux-gnu- SDL_CONFIG=usr/bin/sdl-config PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/aarch64-linux-gnu/ -Llib/aarch64-linux-gnu/ -Wl,-rpath-link=lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/,-rpath-link=usr/lib/aarch64-linux-gnu/pulseaudio/' ./configure
+    - name: make
+      run: make

.github/workflows/ci-linux-armhf.yml

@@ -0,0 +1,22 @@
+name: CI (Linux armhf)
+on: [push, pull_request]
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: |
+        whoami
+        sudo bash -c 'echo ''deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe'' > /etc/apt/sources.list.d/armhf.list'
+        sudo sed -i 's/^deb \([^[]\)/deb [arch=amd64] \1/' /etc/apt/sources.list
+        sudo dpkg --add-architecture armhf
+        sudo apt-get update -qq
+        sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
+        .github/extract-foreign-all.sh armhf
+    - name: configure
+      run: DUMP_CONFIG_LOG=1 CROSS_COMPILE=arm-linux-gnueabihf- SDL_CONFIG=usr/bin/sdl-config PATH=$PATH:usr/bin CFLAGS='-Iusr/include/ -Iusr/include/SDL' LDFLAGS='-Lusr/lib/arm-linux-gnueabihf/ -Llib/arm-linux-gnueabihf/ -Wl,-rpath-link=lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/,-rpath-link=usr/lib/arm-linux-gnueabihf/pulseaudio/' ./configure
+    - name: make
+      run: make

.github/workflows/ci-linux.yml

@@ -0,0 +1,17 @@
+name: CI (Linux)
+on: [push, pull_request]
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        submodules: true
+    - name: Install dependencies
+      run: |
+        sudo apt-get update -qq
+        sudo apt-get install -y libsdl1.2-dev libasound2-dev libpng-dev libz-dev
+    - name: configure
+      run: DUMP_CONFIG_LOG=1 ./configure
+    - name: make
+      run: make

README.md

@@ -1,7 +1,7 @@
 PCSX-ReARMed - yet another PCSX fork
 ====================================
 
-[![Build Status](https://travis-ci.org/libretro/pcsx_rearmed.svg?branch=master)](https://travis-ci.org/libretro/pcsx_rearmed)
+![CI (Linux)](https://github.com/notaz/pcsx_rearmed/workflows/CI%20(Linux)/badge.svg)
 
 *see [readme.txt](readme.txt) for more complete documentation*
 

frontend/320240/caanoo.gpe

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+# Wiz's timings are already good, apply this for Caanoo
+if [ -e /dev/accel ]; then
+  ./pollux_set "ram_timings=3,9,4,1,1,1,1"
+fi
+
+# the sync mount causes problems when writing saves,
+# probably due to many write calls, so have to get rid of it
+if grep mmcblk /proc/mounts | grep -q '\<sync\>'; then
+  oldmount=`grep mmcblk /proc/mounts | grep '\<sync\>' | awk '{print $4}'`
+  mount /dev/mmcblk0p1 /mnt/sd/ -o remount,dirsync,noatime
+fi
+
+./pcsx "$@"
+sync
+
+if [ -n "$oldmount" ]; then
+  mount /dev/mmcblk0p1 /mnt/sd/ -o remount,$oldmount
+fi
+
+cd /usr/gp2x
+exec ./gp2xmenu

frontend/320240/haptic_s.cfg

@@ -0,0 +1,3 @@
+0	126
+100	-126
+115	0

frontend/320240/haptic_w.cfg

@@ -0,0 +1,3 @@
+0       54
+100     -126
+105     0

frontend/320240/pcsx_rearmed.ini

@@ -0,0 +1,6 @@
+[info]
+name="PCSX ReARMed"
+icon="/pcsx_rearmed/pcsx26.png"
+path="/pcsx_rearmed/pcsx.gpe"
+title="/pcsx_rearmed/pcsxb.png"
+group="GAMES"