diff --git a/.appveyor.yml b/.appveyor.yml index 7d49f38..933f517 100644 --- a/.appveyor.yml +++ b/.appveyor.yml @@ -48,13 +48,3 @@ for: artifacts: - path: Chiaki.dmg name: Chiaki - -#deploy: -# description: 'Chiaki Binaries' -# provider: GitHub -# draft: true -# auth_token: -# secure: Amvzm3PMM5nv+iFsqaU7TZ9fgyYt/YIrOLV0QMiCyOoUlLRIaiYxWiJ7maTpxhZ9 -# artifact: "Chiaki" -# on: -# appveyor_repo_tag: true diff --git a/.builds/android.yml b/.builds/android.yml index 2f6361a..7b64ab4 100644 --- a/.builds/android.yml +++ b/.builds/android.yml @@ -4,7 +4,7 @@ packages: - docker sources: -- https://github.com/thestr4ng3r/chiaki +- https://git.sr.ht/~thestr4ng3r/chiaki artifacts: - Chiaki.apk diff --git a/.builds/common.yml b/.builds/common.yml index d59cf54..46b754f 100644 --- a/.builds/common.yml +++ b/.builds/common.yml @@ -2,7 +2,7 @@ image: alpine/latest sources: - - https://github.com/thestr4ng3r/chiaki + - https://git.sr.ht/~thestr4ng3r/chiaki packages: - cmake diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 404f51b..caa9016 100644 --- a/.builds/freebsd.yml +++ b/.builds/freebsd.yml @@ -2,7 +2,7 @@ image: freebsd/latest sources: - - https://github.com/thestr4ng3r/chiaki + - https://git.sr.ht/~thestr4ng3r/chiaki packages: - cmake diff --git a/.builds/openbsd.yml b/.builds/openbsd.yml index b7f5156..b8785ef 100644 --- a/.builds/openbsd.yml +++ b/.builds/openbsd.yml @@ -2,7 +2,7 @@ image: openbsd/6.7 sources: - - https://github.com/thestr4ng3r/chiaki + - https://git.sr.ht/~thestr4ng3r/chiaki packages: - cmake diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 3168563..0000000 --- a/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,46 +0,0 @@ ---- -name: Bug report -about: Create a report to help us improve -title: '' -labels: '' -assignees: '' - ---- - - - -**Environment** - - OS/Distribution: - - Desktop Environment: - - Hardware: - - Exact Version or Commit Hash and Installation Method: - -**Describe the bug** -A clear and concise description of what the bug is. - -**To Reproduce** -Steps to reproduce the behavior: -1. Go to '...' -2. Click on '....' -3. Scroll down to '....' -4. See error - -**Expected behavior** -A clear and concise description of what you expected to happen. - -**Log Files** -If your issue is about Registration or Streaming, you MUST attach a log file of a session that showed your issue here. -Do not enable Verbose Logging unless explicitly told to. -On desktop, you can see the directory that log files are written to in the Settings under "Log Directory". -On Android, go into Settings -> Session Logs and export one from there. - -**Screenshots** -If applicable, add screenshots to help explain your problem. - -**Additional context** -Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index c874dee..0000000 --- a/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,31 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for this project -title: '' -labels: '' -assignees: '' - ---- - - - -**What platform does your feature request apply to?** -Choose one or more: Desktop/Android/Both/... - -**Is your feature request related to a problem? Please describe.** -A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] - -**Describe the solution you'd like** -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** -A clear and concise description of any alternative solutions or features you've considered. - -**Additional context** -Add any other context or screenshots about the feature request here. - diff --git a/.gitmodules b/.gitmodules index 6635f42..ac87125 100644 --- a/.gitmodules +++ b/.gitmodules @@ -6,10 +6,10 @@ url = https://github.com/nanopb/nanopb.git [submodule "third-party/jerasure"] path = third-party/jerasure - url = https://github.com/thestr4ng3r/jerasure.git + url = https://git.sr.ht/~thestr4ng3r/jerasure [submodule "third-party/gf-complete"] path = third-party/gf-complete - url = https://github.com/thestr4ng3r/gf-complete.git + url = https://git.sr.ht/~thestr4ng3r/gf-complete [submodule "android/app/src/main/cpp/oboe"] path = android/app/src/main/cpp/oboe url = https://github.com/google/oboe diff --git a/README.md b/README.md index 7eca7d0..ef5a797 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,6 @@ for Linux, FreeBSD, OpenBSD, Android, macOS, Windows, Nintendo Switch and potent Everything necessary for a full streaming session, including the initial registration and wakeup of the console, is supported. The following features however are yet to be implemented: -* H264 Error Concealment (FEC and active error recovery however are implemented) -* Touchpad support (Triggering the Touchpad Button is currently possible from the keyboard though) * Rumble * Accelerometer/Gyroscope @@ -30,10 +28,10 @@ You can either download a pre-built release (easier) or build Chiaki from source Builds are provided for Linux, Android, macOS and Windows. -You can download them [here](https://github.com/thestr4ng3r/chiaki/releases). +You can download them [here](https://git.sr.ht/~thestr4ng3r/chiaki/refs). * **Linux**: The provided file is an [AppImage](https://appimage.org/). Simply make it executable (`chmod +x .AppImage`) and run it. -* **Android**: Install from [Google Play](https://play.google.com/store/apps/details?id=com.metallic.chiaki), [F-Droid](https://f-droid.org/packages/com.metallic.chiaki/) or download the APK from GitHub. +* **Android**: Install from [Google Play](https://play.google.com/store/apps/details?id=com.metallic.chiaki), [F-Droid](https://f-droid.org/packages/com.metallic.chiaki/) or download the APK from Sourcehut. * **macOS**: Drag the application from the `.dmg` into your Applications folder. * **Windows**: Extract the `.zip` file and execute `chiaki.exe`. * **Switch**: Follow README specific [instructions](./switch/README.md) diff --git a/android/app/src/main/res/values/strings.xml b/android/app/src/main/res/values/strings.xml index 41ee3de..6b34497 100644 --- a/android/app/src/main/res/values/strings.xml +++ b/android/app/src/main/res/values/strings.xml @@ -31,7 +31,7 @@ PS4 ≥ 7.0, < 8 PS4 ≥ 8.0 About obtaining your Account ID, see - https://github.com/thestr4ng3r/chiaki/blob/master/README.md#obtaining-your-psn-accountid + https://git.sr.ht/~thestr4ng3r/chiaki/tree/master/item/README.md#obtaining-your-psn-accountid PSN Online ID (username, case-sensitive) PSN Account ID (8 bytes, base64) PIN diff --git a/gui/re.chiaki.Chiaki.appdata.xml b/gui/re.chiaki.Chiaki.appdata.xml index 36f3c86..ba494cc 100644 --- a/gui/re.chiaki.Chiaki.appdata.xml +++ b/gui/re.chiaki.Chiaki.appdata.xml @@ -8,8 +8,8 @@ CC0-1.0 AGPL-3.0-only Florian Märkl - https://github.com/thestr4ng3r/chiaki - https://github.com/thestr4ng3r/chiaki/blob/master/README.md#usage + https://chiaki.re + https://git.sr.ht/~thestr4ng3r/chiaki/tree/master/item/README.md#usage

Chiaki is a Free and Open Source Client for PlayStation 4 Remote Play. It can be used to play in real time on a PlayStation 4 as long as there is a network connection. @@ -17,7 +17,7 @@ - https://raw.githubusercontent.com/thestr4ng3r/chiaki/master/assets/screenshot.png + https://git.sr.ht/~thestr4ng3r/chiaki/blob/refs/heads/master/assets/screenshot.png chiaki@metallic.software diff --git a/scripts/Dockerfile b/scripts/Dockerfile deleted file mode 100644 index 87bfbe9..0000000 --- a/scripts/Dockerfile +++ /dev/null @@ -1,46 +0,0 @@ - -FROM utensils/opengl:19.0.8 AS builder -LABEL maintainer="chiaki-docker@florianmaerkl.de" -WORKDIR /app -RUN echo "@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing" >> /etc/apk/repositories \ - && apk update \ - && apk --no-cache add \ - build-base \ - cmake \ - ffmpeg-dev \ - git \ - openssl \ - opus-dev \ - protobuf \ -# py3-protobuf@testing \ # Enable this when the OpenGL image updates alpine - qt5-qtbase \ - qt5-qtmultimedia-dev \ - qt5-qtsvg-dev \ - sdl2-dev \ - && pip3 install protobuf \ - && git clone https://github.com/thestr4ng3r/chiaki.git /app \ - && git submodule update --init \ - && mkdir build \ - && cd build \ - && cmake .. \ - && make \ - && ./test/chiaki-unit \ - && rm -rf /var/cache/apk/* - -FROM utensils/opengl:19.0.8 -RUN apk update \ - && apk --no-cache add \ - ffmpeg \ - qt5-qtbase \ - qt5-qtmultimedia \ - qt5-qtsvg \ - sdl2 \ - && rm -rf /var/cache/apk/* \ - && addgroup ps4 && adduser -D -G ps4 ps4 \ - && chown -R ps4: /home/ps4 -WORKDIR /home/ps4 -COPY --from=builder /app/build/gui/chiaki . -USER ps4 -VOLUME /home/ps4/.local/share/Chiaki -CMD ["/home/ps4/chiaki"] - diff --git a/scripts/chiaki.rb.in b/scripts/chiaki.rb.in deleted file mode 100644 index c9fd136..0000000 --- a/scripts/chiaki.rb.in +++ /dev/null @@ -1,16 +0,0 @@ -cask 'chiaki' do - version '@CHIAKI_VERSION@' - sha256 '@CHIAKI_DMG_SHA256@' - - url "https://github.com/thestr4ng3r/chiaki/releases/download/v#{version}/Chiaki-v#{version}-macOS-x86_64.dmg" - appcast 'https://github.com/thestr4ng3r/chiaki/releases.atom' - name 'Chiaki' - homepage 'https://github.com/thestr4ng3r/chiaki' - - app 'Chiaki.app' - - zap trash: [ - '~/Library/Application Support/Chiaki', - '~/Library/Preferences/com.chiaki.Chiaki.plist', - ] -end diff --git a/scripts/configure-cask.cmake b/scripts/configure-cask.cmake deleted file mode 100644 index 62a7dae..0000000 --- a/scripts/configure-cask.cmake +++ /dev/null @@ -1,11 +0,0 @@ - -if(NOT CHIAKI_VERSION OR NOT CHIAKI_DMG OR NOT CHIAKI_CASK_OUT) - message(FATAL_ERROR "CHIAKI_VERSION, CHIAKI_DMG and CHIAKI_CASK_OUT must be set.") -endif() - -if(CHIAKI_VERSION MATCHES "^v([0-9].*)$") - set(CHIAKI_VERSION "${CMAKE_MATCH_1}") -endif() - -file(SHA256 "${CHIAKI_DMG}" CHIAKI_DMG_SHA256) -configure_file("${CMAKE_CURRENT_LIST_DIR}/chiaki.rb.in" "${CHIAKI_CASK_OUT}") diff --git a/scripts/flatpak/com.github.thestr4ng3r.Chiaki.json b/scripts/flatpak/com.github.thestr4ng3r.Chiaki.json index 905ac2a..7cc6c43 100644 --- a/scripts/flatpak/com.github.thestr4ng3r.Chiaki.json +++ b/scripts/flatpak/com.github.thestr4ng3r.Chiaki.json @@ -88,7 +88,7 @@ "sources": [ { "type": "git", - "url": "https://github.com/thestr4ng3r/chiaki.git", + "url": "https://git.sr.ht/~thestr4ng3r/chiaki", "tag": "v1.3.0", "commit": "702d31eb01d37518e77f5c1be3ea493df9f18323" } diff --git a/switch/README.md b/switch/README.md index e536d9b..9a5f6db 100644 --- a/switch/README.md +++ b/switch/README.md @@ -55,7 +55,7 @@ this file contains sensitive data. (do not share this file) host_ip = X.X.X.X # required: sony oline id (login) psn_online_id = ps4_online_id -# required (PS4>7.0 Only): https://github.com/thestr4ng3r/chiaki#obtaining-your-psn-accountid +# required (PS4>7.0 Only): https://git.sr.ht/~thestr4ng3r/chiaki/tree/master/item/README.md#obtaining-your-psn-accountid psn_account_id = ps4_base64_account_id # optional(default 60): remote play fps (must be 30 or 60) video_fps = 60 diff --git a/switch/src/io.cpp b/switch/src/io.cpp index c81788e..bcbfd76 100644 --- a/switch/src/io.cpp +++ b/switch/src/io.cpp @@ -15,7 +15,7 @@ #define SWITCH_TOUCHSCREEN_MAX_Y 720 // source: -// https://github.com/thestr4ng3r/chiaki/blob/master/gui/src/avopenglwidget.cpp +// gui/src/avopenglwidget.cpp // // examples : // https://www.roxlu.com/2014/039/decoding-h264-and-yuv420p-playback