Skip to content

Commit 06442b6

Browse files
notaznotaz
committed
Merge branch 'master' into libretro
2 parents 9593502 + 79c4d43 commit 06442b6

36 files changed

+2049
-68
lines changed

‎.github/extract-foreign-all.sh

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
#!/bin/bash
2+
3+
ARCH_="$1"
4+
.github/extract-foreign.sh "zlib1g-dev:${ARCH_}"
5+
.github/extract-foreign.sh "zlib1g:${ARCH_}"
6+
.github/extract-foreign.sh "libpng-dev:${ARCH_}"
7+
.github/extract-foreign.sh "libpng[0-9]*:${ARCH_}"
8+
.github/extract-foreign.sh "libsdl1.2-dev:${ARCH_}"
9+
.github/extract-foreign.sh "libsdl1.2debian:${ARCH_}"
10+
# endless libsdl deps
11+
.github/extract-foreign.sh "libasound[2-9]:${ARCH_}"
12+
.github/extract-foreign.sh "libpulse[0-9]:${ARCH_}"
13+
.github/extract-foreign.sh "libx11-[6-9]:${ARCH_}"
14+
.github/extract-foreign.sh "libx11-dev:${ARCH_}"
15+
.github/extract-foreign.sh "x11proto-dev"
16+
.github/extract-foreign.sh "libxext[6-9]:${ARCH_}"
17+
.github/extract-foreign.sh "libxcb1:${ARCH_}"
18+
.github/extract-foreign.sh "libxau[6-9]:${ARCH_}"
19+
.github/extract-foreign.sh "libxdmcp[6-9]:${ARCH_}"
20+
.github/extract-foreign.sh "libcaca[0-9]:${ARCH_}"
21+
.github/extract-foreign.sh "libdbus-[0-9]*:${ARCH_}"
22+
.github/extract-foreign.sh "libslang[2-9]:${ARCH_}"
23+
.github/extract-foreign.sh "libncursesw[6-9]:${ARCH_}"
24+
.github/extract-foreign.sh "libtinfo[6-9]:${ARCH_}"
25+
.github/extract-foreign.sh "libsystemd[0-9]:${ARCH_}"
26+
.github/extract-foreign.sh "libwrap[0-9]:${ARCH_}"
27+
.github/extract-foreign.sh "libsndfile[0-9]:${ARCH_}"
28+
.github/extract-foreign.sh "libasyncns[0-9]:${ARCH_}"
29+
.github/extract-foreign.sh "libbsd[0-9]:${ARCH_}"
30+
.github/extract-foreign.sh "liblzma[0-9]:${ARCH_}"
31+
.github/extract-foreign.sh "liblz[4-9]-*:${ARCH_}"
32+
.github/extract-foreign.sh "libgcrypt[0-9]*:${ARCH_}"
33+
.github/extract-foreign.sh "libflac[0-9]:${ARCH_}"
34+
.github/extract-foreign.sh "libogg[0-9]:${ARCH_}"
35+
.github/extract-foreign.sh "libvorbis[0-9]*:${ARCH_}"
36+
.github/extract-foreign.sh "libvorbisenc[2-9]:${ARCH_}"
37+
.github/extract-foreign.sh "libgpg-error[0-9]:${ARCH_}"

‎.github/extract-foreign.sh

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

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

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: CI (Linux arm64)
2+
on: [push, pull_request]
3+
jobs:
4+
build-linux:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
with:
9+
submodules: true
10+
- name: Install dependencies
11+
run: |
12+
whoami
13+
sudo bash -c 'echo ''deb [arch=arm64] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe'' > /etc/apt/sources.list.d/arm64.list'
14+
sudo sed -i 's/^deb \([^[]\)/deb [arch=amd64] \1/' /etc/apt/sources.list
15+
sudo dpkg --add-architecture arm64
16+
sudo apt-get update -qq
17+
sudo apt-get install -y gcc-aarch64-linux-gnu g++-aarch64-linux-gnu
18+
.github/extract-foreign-all.sh arm64
19+
- name: configure
20+
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
21+
- name: make
22+
run: make

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

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
name: CI (Linux armhf)
2+
on: [push, pull_request]
3+
jobs:
4+
build-linux:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
with:
9+
submodules: true
10+
- name: Install dependencies
11+
run: |
12+
whoami
13+
sudo bash -c 'echo ''deb [arch=armhf] http://ports.ubuntu.com/ubuntu-ports focal main restricted universe'' > /etc/apt/sources.list.d/armhf.list'
14+
sudo sed -i 's/^deb \([^[]\)/deb [arch=amd64] \1/' /etc/apt/sources.list
15+
sudo dpkg --add-architecture armhf
16+
sudo apt-get update -qq
17+
sudo apt-get install -y gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
18+
.github/extract-foreign-all.sh armhf
19+
- name: configure
20+
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
21+
- name: make
22+
run: make

‎.github/workflows/ci-linux.yml

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
name: CI (Linux)
2+
on: [push, pull_request]
3+
jobs:
4+
build-linux:
5+
runs-on: ubuntu-latest
6+
steps:
7+
- uses: actions/checkout@v2
8+
with:
9+
submodules: true
10+
- name: Install dependencies
11+
run: |
12+
sudo apt-get update -qq
13+
sudo apt-get install -y libsdl1.2-dev libasound2-dev libpng-dev libz-dev
14+
- name: configure
15+
run: DUMP_CONFIG_LOG=1 ./configure
16+
- name: make
17+
run: make

‎.gitmodules

-3
This file was deleted.

‎.travis.yml

-33
This file was deleted.

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
PCSX-ReARMed - yet another PCSX fork
22
====================================
33

4-
[![Build Status](https://travis-ci.org/libretro/pcsx_rearmed.svg?branch=master)](https://travis-ci.org/libretro/pcsx_rearmed)
4+
![CI (Linux)](https://github.com/notaz/pcsx_rearmed/workflows/CI%20(Linux)/badge.svg)
55

66
*see [readme.txt](readme.txt) for more complete documentation*
77

‎frontend/320240/caanoo.gpe

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
#!/bin/sh
2+
3+
# Wiz's timings are already good, apply this for Caanoo
4+
if [ -e /dev/accel ]; then
5+
./pollux_set "ram_timings=3,9,4,1,1,1,1"
6+
fi
7+
8+
# the sync mount causes problems when writing saves,
9+
# probably due to many write calls, so have to get rid of it
10+
if grep mmcblk /proc/mounts | grep -q '\<sync\>'; then
11+
oldmount=`grep mmcblk /proc/mounts | grep '\<sync\>' | awk '{print $4}'`
12+
mount /dev/mmcblk0p1 /mnt/sd/ -o remount,dirsync,noatime
13+
fi
14+
15+
./pcsx "$@"
16+
sync
17+
18+
if [ -n "$oldmount" ]; then
19+
mount /dev/mmcblk0p1 /mnt/sd/ -o remount,$oldmount
20+
fi
21+
22+
cd /usr/gp2x
23+
exec ./gp2xmenu

‎frontend/320240/haptic_s.cfg

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
0 126
2+
100 -126
3+
115 0

‎frontend/320240/haptic_w.cfg

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
0 54
2+
100 -126
3+
105 0

‎frontend/320240/pcsx26.png

4.65 KB
Loading

‎frontend/320240/pcsx_rearmed.ini

+6
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
[info]
2+
name="PCSX ReARMed"
3+
icon="/pcsx_rearmed/pcsx26.png"
4+
path="/pcsx_rearmed/pcsx.gpe"
5+
title="/pcsx_rearmed/pcsxb.png"
6+
group="GAMES"

‎frontend/320240/pcsxb.png

24.2 KB
Loading

0 commit comments

Comments
 (0)