Merge branch 'libretro:master' into master

EmulatorJS · Dec 23, 2023 · c8a6c20 · c8a6c20
2 parents 713ae2d + 6101a00
commit c8a6c20
Show file tree

Hide file tree

Showing 44 changed files with 964 additions and 577 deletions.
diff --git a/.github/workflows/ci-gp2x.yml b/.github/workflows/ci-gp2x.yml
diff --git a/.github/workflows/ci-libretro-default.yml b/.github/workflows/ci-libretro-default.yml
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml
diff --git a/.github/workflows/ci-pandora.yml b/.github/workflows/ci-pandora.yml
diff --git a/.github/workflows/ci-psp.yml b/.github/workflows/ci-psp.yml
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -0,0 +1,241 @@
+name: Picodrive CI
+on: [push, pull_request]
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      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 -j2
+
+  build-libretro:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: make
+      run: LDFLAGS=-Wl,--no-undefined make -j2 -f Makefile.libretro
+
+
+  build-gp2x:
+    runs-on: ubuntu-latest
+    container: ghcr.io/irixxxx/toolchain-gp2x
+    permissions:
+      packages: read
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=gp2x
+        make -j2 PLATFORM_MP3=0
+        make -C platform/gp2x rel VER=$ver
+        mv PicoDrive_$ver.zip PicoDrive-gph_$ver.zip
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: GP2X
+        path: PicoDrive-gph_*.zip
+
+  build-pandora:
+    runs-on: ubuntu-latest
+    container: ghcr.io/irixxxx/toolchain-pandora
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=pandora
+        make -j2
+        mv PicoDrive PicoDrive-pandora
+        ${CROSS_COMPILE}strip PicoDrive-pandora
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Pandora
+        path: PicoDrive-pandora
+
+  build-psp:
+    runs-on: ubuntu-latest
+    container: ghcr.io/pspdev/pspdev
+    steps:
+    - name: build environment
+      run: |
+        apk add git gcc g++ zip
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        export CROSS_COMPILE=psp-
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=psp
+        make -j2
+        make -C platform/psp rel VER=$ver
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: PSP
+        path: PicoDrive_psp_*.zip
+
+
+  build-dingux:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: read
+    container: ghcr.io/irixxxx/toolchain-dingux
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=dingux
+        make -j2
+        mv PicoDrive-dge.zip PicoDrive-dge-$ver.zip
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Dingux
+        path: PicoDrive-dge*.zip
+
+  build-gcw0:
+    runs-on: ubuntu-latest
+    container: ghcr.io/irixxxx/toolchain-opendingux
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=gcw0
+        make -j2
+        mv PicoDrive.opk PicoDrive-gcw0-$ver.opk
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: GCW0
+        path: PicoDrive-gcw0*.opk
+
+  build-opendingux:
+    runs-on: ubuntu-latest
+    container: ghcr.io/irixxxx/toolchain-opendingux
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=opendingux
+        make -j2
+        mv PicoDrive.opk PicoDrive-opendingux-$ver.opk
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Opendingux
+        path: PicoDrive-opendingux*.opk
+
+  build-miyoo:
+    runs-on: ubuntu-latest
+    permissions:
+      packages: read
+    container: miyoocfw/toolchain
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        export CROSS_COMPILE=arm-buildroot-linux-musleabi-
+        git config --global --add safe.directory /home/picodrive
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=miyoo
+        make -j2
+        mv PicoDrive.zip PicoDrive-miyoo-$ver.zip
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: Miyoo
+        path: PicoDrive-miyoo*.zip
+
+  build-retrofw:
+    runs-on: ubuntu-latest
+    container: ghcr.io/irixxxx/toolchain-retrofw
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=retrofw
+        make -j2
+        mv PicoDrive.opk PicoDrive-retrofw-$ver.opk
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: RetroFW
+        path: PicoDrive-retrofw*.opk
+
+  build-odbeta-gcw0:
+    runs-on: ubuntu-latest
+    container: ghcr.io/irixxxx/toolchain-odbeta-gcw0
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=opendingux
+        make -j2
+        mv PicoDrive.opk PicoDrive-odbeta-gcw0-$ver.opk
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: ODbeta gcw0
+        path: PicoDrive-odbeta-*.opk
+
+  build-odbeta-lepus:
+    runs-on: ubuntu-latest
+    container: ghcr.io/irixxxx/toolchain-odbeta-lepus
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: build
+      run: |
+        git config --global --add safe.directory $PWD
+        ver=$(cut -d'"' -f2 platform/common/version.h)-$(git rev-parse --short HEAD)
+        ./configure --platform=opendingux
+        make -j2
+        mv PicoDrive.opk PicoDrive-odbeta-lepus-$ver.opk
+    - name: artifacts
+      uses: actions/upload-artifact@v3
+      with:
+        name: ODbeta lepus
+        path: PicoDrive-odbeta-*.opk
diff --git a/.github/workflows/prepare.yml b/.github/workflows/prepare.yml
@@ -0,0 +1,19 @@
+name: prepare
+on: workflow_call
+
+jobs:
+  prepare:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: true
+    - name: create release
+      id: create_release
+      if: ${{ github.ref_type == 'tag' }}
+      env:
+        GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      run: |
+        tag=$(echo ${{ github.ref }} | sed 's:refs/tags/::')
+        gh release create "$tag" --verify-tag -d -t "$tag" -n "$tag"
+
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -38,10 +38,6 @@ include:
   # MacOS ARM 64-bit
   - project: 'libretro-infrastructure/ci-templates'
     file: '/osx-arm64.yml'
-
-  # MacOS PPC
-  - project: 'libretro-infrastructure/ci-templates'
-    file: '/osx-ppc.yml'
 
   ################################## CELLULAR ################################
   # Android
@@ -153,16 +149,6 @@ libretro-build-osx-arm64:
     - .libretro-osx-arm64-make-default
     - .core-defs
 
-# MacOS PPC
-libretro-build-osx-ppc:
-  extends:
-    - .libretro-osx-ppc-make-default
-    - .core-defs
-  variables:
-    CFLAGS:   -mmacosx-version-min=10.4
-    CXXFLAGS: -mmacosx-version-min=10.4
-    LDFLAGS:  -mmacosx-version-min=10.4
-
 ################################### CELLULAR #################################
 # Android ARMv7a
 android-armeabi-v7a:

diff --git a/.gitmodules b/.gitmodules
@@ -7,9 +7,10 @@
 [submodule "pico/sound/emu2413"]
 	path = pico/sound/emu2413
 	url = https://github.com/digital-sound-antiques/emu2413.git
+	branch = main
 [submodule "pico/cd/libchdr"]
 	path = pico/cd/libchdr
-	url = https://github.com/rtissera/libchdr.git
+	url = https://github.com/irixxxx/libchdr.git
 [submodule "platform/common/dr_libs"]
 	path = platform/common/dr_libs
 	url = https://github.com/mackron/dr_libs.git