switch: Update ffmpeg to 6.1

xfangfang · Oct 31, 2023 · df528cb · df528cb
1 parent 44ae11c
commit df528cb
Show file tree

Hide file tree

Showing 11 changed files with 301 additions and 1,121 deletions.
diff --git a/README.md b/README.md
@@ -31,7 +31,6 @@
 [![aur](https://img.shields.io/aur/version/wiliwili-git?color=blue&logo=archlinux)](https://aur.archlinux.org/packages/wiliwili-git/)
 [![nightly.link](https://img.shields.io/badge/nightly.link-%E6%B5%8B%E8%AF%95%E7%89%88-green)](https://nightly.link/xfangfang/wiliwili/workflows/build.yaml/dev)
 [![layout](https://img.shields.io/badge/wiliwili-自定义布局-yellow)](https://github.com/xfangfang/wiliwili_theme)
-[![QQ](https://img.shields.io/badge/QQ频道-wiliwili-red)](https://pd.qq.com/s/1gqqxfogy)
 
 <br>
 
@@ -67,6 +66,8 @@ wiliwili 拥有非常接近官方PC客户端的B站浏览体验
 
 桌面图标会优先尝试打开 `switch/wiliwili.nro`，如果其不存在，则尝试打开 `switch/wiliwili/wiliwili.nro`，如果这两个路径都不存在，则打开 hbmenu 自行选择路径。
 
+默认提供的为 OpenGL 版本，最高只能播放 4k@30，你也可以下载到支持原生图形 api 的 [deko3d 版本](https://nightly.link/xfangfang/wiliwili/workflows/build.yaml/dev)，可以流畅播放 4k@60，不过可能会偶尔崩溃。
+
 </details>
 
 ### PSVita
@@ -75,6 +76,12 @@ wiliwili 拥有非常接近官方PC客户端的B站浏览体验
 
 拥有不是很稳定的硬解支持，目前推荐使用软解搭配 360P 分辨率使用。
 
+### PS4
+
+下载 `wiliwili-PS4.pkg` 安装即可：[wiliwili releases](https://github.com/xfangfang/wiliwili/releases)
+
+只支持软解，对于 ps4 推荐关闭设置中的低画质解码；ps4 pro 如果想勉强播放 4k@60 需要开启低画质解码。
+
 ### PC
 
 PC客户端支持切换硬件解码、秒开流畅适合老电脑、支持鼠标操控（左键点击 右键返回）
@@ -300,8 +307,8 @@ sudo dkp-pacman -S switch-glfw switch-libwebp switch-cmake switch-curl devkitA64
 base_url="https://github.com/xfangfang/wiliwili/releases/download/v0.1.0"
 sudo dkp-pacman -U \
     $base_url/switch-libass-0.17.1-1-any.pkg.tar.zst \
-    $base_url/switch-ffmpeg-6.0-4-any.pkg.tar.zst \
-    $base_url/switch-libmpv-0.35.1-3-any.pkg.tar.zst
+    $base_url/switch-ffmpeg-6.1-1-any.pkg.tar.zst \
+    $base_url/switch-libmpv-0.35.1-4-any.pkg.tar.zst
 
 # 4. 可选：安装依赖库 nspmini：https://github.com/StarDustCFW/nspmini
 # (1). 在resources 目录下放置：nsp_forwarder.nsp (如何生成nsp见: scripts/switch-forwarder)

diff --git a/scripts/README.md b/scripts/README.md
@@ -31,8 +31,8 @@ done
 base_url="https://github.com/xfangfang/wiliwili/releases/download/v0.1.0"
 sudo dkp-pacman -U \
     $base_url/switch-libass-0.17.1-1-any.pkg.tar.zst \
-    $base_url/switch-ffmpeg-6.0-4-any.pkg.tar.zst \
-    $base_url/switch-libmpv-0.35.1-3-any.pkg.tar.zst
+    $base_url/switch-ffmpeg-6.1-1-any.pkg.tar.zst \
+    $base_url/switch-libmpv-0.35.1-4-any.pkg.tar.zst
 ```
 
 # Acknowledgement

diff --git a/scripts/build_ffmpeg.sh b/scripts/build_ffmpeg.sh
diff --git a/scripts/build_mpv.sh b/scripts/build_mpv.sh
diff --git a/scripts/build_switch.sh b/scripts/build_switch.sh
@@ -12,8 +12,8 @@ BASE_URL="https://github.com/xfangfang/wiliwili/releases/download/v0.1.0/"
 PKGS=(
     "switch-libass-0.17.1-1-any.pkg.tar.zst"
     "switch-dav1d-1.2.1-1-any.pkg.tar.zst"
-    "switch-ffmpeg-6.0-4-any.pkg.tar.zst"
-    "switch-libmpv-0.35.1-3-any.pkg.tar.zst"
+    "switch-ffmpeg-6.1-1-any.pkg.tar.zst"
+    "switch-libmpv-0.35.1-4-any.pkg.tar.zst"
     "switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
 )
 for PKG in "${PKGS[@]}"; do

diff --git a/scripts/build_switch_deko3d.sh b/scripts/build_switch_deko3d.sh
@@ -14,8 +14,8 @@ PKGS=(
     "libuam-f8c9eef01ffe06334d530393d636d69e2b52744b-1-any.pkg.tar.zst"
     "switch-dav1d-1.2.1-1-any.pkg.tar.zst"
     "switch-libass-0.17.1-1-any.pkg.tar.zst"
-    "switch-ffmpeg-6.0-4-any.pkg.tar.zst"
-    "switch-libmpv_deko3d-0.35.1-3-any.pkg.tar.zst"
+    "switch-ffmpeg-6.1-1-any.pkg.tar.zst"
+    "switch-libmpv_deko3d-0.35.1-4-any.pkg.tar.zst"
     "switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
 )
 for PKG in "${PKGS[@]}"; do

diff --git a/scripts/switch/ffmpeg/PKGBUILD b/scripts/switch/ffmpeg/PKGBUILD
@@ -5,8 +5,9 @@
 # Contributor: jakibaki <jakibaki live com>
 
 pkgname=switch-ffmpeg
-pkgver=6.0
-pkgrel=4
+pkgver=6.1
+commit=ff3429991ec1bac1d1b71215402e3d195162e125
+pkgrel=1
 pkgdesc='ffmpeg port (for Nintendo Switch homebrew development)'
 arch=('any')
 url='https://ffmpeg.org/'
@@ -15,20 +16,22 @@ options=(!strip staticlibs)
 makedepends=('switch-pkg-config' 'dkp-toolchain-vars')
 depends=('switch-zlib' 'switch-bzip2' 'switch-libass' 'switch-libfribidi'
          'switch-freetype' 'switch-harfbuzz' 'switch-mbedtls' 'switch-dav1d')
-source=("https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz" "ffmpeg.patch")
+source=("https://github.com/FFmpeg/FFmpeg/archive/${commit}.tar.gz" "ffmpeg.patch" "network.patch")
 sha256sums=(
  'SKIP'
  'SKIP'
+ 'SKIP'
 )
 groups=('switch-portlibs')
 
 prepare() {
-  cd ffmpeg-$pkgver
+  cd FFmpeg-$commit
   patch -Np1 -i "$srcdir/ffmpeg.patch"
+  patch -Np1 -i "$srcdir/network.patch"
 }
 
 build() {
-  cd ffmpeg-$pkgver
+  cd FFmpeg-$commit
 
   source /opt/devkitpro/switchvars.sh
 
@@ -51,7 +54,7 @@ build() {
 }
 
 package() {
-  cd ffmpeg-$pkgver
+  cd FFmpeg-$commit
 
   source /opt/devkitpro/switchvars.sh