Skip to content

Commit df528cb

Browse files
committed
switch: Update ffmpeg to 6.1
1 parent 44ae11c commit df528cb

File tree

11 files changed

+301
-1121
lines changed

11 files changed

+301
-1121
lines changed

README.md

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
[![aur](https://img.shields.io/aur/version/wiliwili-git?color=blue&logo=archlinux)](https://aur.archlinux.org/packages/wiliwili-git/)
3232
[![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)
3333
[![layout](https://img.shields.io/badge/wiliwili-自定义布局-yellow)](https://github.com/xfangfang/wiliwili_theme)
34-
[![QQ](https://img.shields.io/badge/QQ频道-wiliwili-red)](https://pd.qq.com/s/1gqqxfogy)
3534

3635
<br>
3736

@@ -67,6 +66,8 @@ wiliwili 拥有非常接近官方PC客户端的B站浏览体验
6766

6867
桌面图标会优先尝试打开 `switch/wiliwili.nro`,如果其不存在,则尝试打开 `switch/wiliwili/wiliwili.nro`,如果这两个路径都不存在,则打开 hbmenu 自行选择路径。
6968

69+
默认提供的为 OpenGL 版本,最高只能播放 4k@30,你也可以下载到支持原生图形 api 的 [deko3d 版本](https://nightly.link/xfangfang/wiliwili/workflows/build.yaml/dev),可以流畅播放 4k@60,不过可能会偶尔崩溃。
70+
7071
</details>
7172

7273
### PSVita
@@ -75,6 +76,12 @@ wiliwili 拥有非常接近官方PC客户端的B站浏览体验
7576

7677
拥有不是很稳定的硬解支持,目前推荐使用软解搭配 360P 分辨率使用。
7778

79+
### PS4
80+
81+
下载 `wiliwili-PS4.pkg` 安装即可:[wiliwili releases](https://github.com/xfangfang/wiliwili/releases)
82+
83+
只支持软解,对于 ps4 推荐关闭设置中的低画质解码;ps4 pro 如果想勉强播放 4k@60 需要开启低画质解码。
84+
7885
### PC
7986

8087
PC客户端支持切换硬件解码、秒开流畅适合老电脑、支持鼠标操控(左键点击 右键返回)
@@ -300,8 +307,8 @@ sudo dkp-pacman -S switch-glfw switch-libwebp switch-cmake switch-curl devkitA64
300307
base_url="https://github.com/xfangfang/wiliwili/releases/download/v0.1.0"
301308
sudo dkp-pacman -U \
302309
$base_url/switch-libass-0.17.1-1-any.pkg.tar.zst \
303-
$base_url/switch-ffmpeg-6.0-4-any.pkg.tar.zst \
304-
$base_url/switch-libmpv-0.35.1-3-any.pkg.tar.zst
310+
$base_url/switch-ffmpeg-6.1-1-any.pkg.tar.zst \
311+
$base_url/switch-libmpv-0.35.1-4-any.pkg.tar.zst
305312

306313
# 4. 可选:安装依赖库 nspmini:https://github.com/StarDustCFW/nspmini
307314
# (1). 在resources 目录下放置:nsp_forwarder.nsp (如何生成nsp见: scripts/switch-forwarder)

scripts/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@ done
3131
base_url="https://github.com/xfangfang/wiliwili/releases/download/v0.1.0"
3232
sudo dkp-pacman -U \
3333
$base_url/switch-libass-0.17.1-1-any.pkg.tar.zst \
34-
$base_url/switch-ffmpeg-6.0-4-any.pkg.tar.zst \
35-
$base_url/switch-libmpv-0.35.1-3-any.pkg.tar.zst
34+
$base_url/switch-ffmpeg-6.1-1-any.pkg.tar.zst \
35+
$base_url/switch-libmpv-0.35.1-4-any.pkg.tar.zst
3636
```
3737

3838
# Acknowledgement

scripts/build_ffmpeg.sh

Lines changed: 0 additions & 63 deletions
This file was deleted.

scripts/build_mpv.sh

Lines changed: 0 additions & 42 deletions
This file was deleted.

scripts/build_switch.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ BASE_URL="https://github.com/xfangfang/wiliwili/releases/download/v0.1.0/"
1212
PKGS=(
1313
"switch-libass-0.17.1-1-any.pkg.tar.zst"
1414
"switch-dav1d-1.2.1-1-any.pkg.tar.zst"
15-
"switch-ffmpeg-6.0-4-any.pkg.tar.zst"
16-
"switch-libmpv-0.35.1-3-any.pkg.tar.zst"
15+
"switch-ffmpeg-6.1-1-any.pkg.tar.zst"
16+
"switch-libmpv-0.35.1-4-any.pkg.tar.zst"
1717
"switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
1818
)
1919
for PKG in "${PKGS[@]}"; do

scripts/build_switch_deko3d.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ PKGS=(
1414
"libuam-f8c9eef01ffe06334d530393d636d69e2b52744b-1-any.pkg.tar.zst"
1515
"switch-dav1d-1.2.1-1-any.pkg.tar.zst"
1616
"switch-libass-0.17.1-1-any.pkg.tar.zst"
17-
"switch-ffmpeg-6.0-4-any.pkg.tar.zst"
18-
"switch-libmpv_deko3d-0.35.1-3-any.pkg.tar.zst"
17+
"switch-ffmpeg-6.1-1-any.pkg.tar.zst"
18+
"switch-libmpv_deko3d-0.35.1-4-any.pkg.tar.zst"
1919
"switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
2020
)
2121
for PKG in "${PKGS[@]}"; do

scripts/switch/ffmpeg/PKGBUILD

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@
55
# Contributor: jakibaki <jakibaki live com>
66

77
pkgname=switch-ffmpeg
8-
pkgver=6.0
9-
pkgrel=4
8+
pkgver=6.1
9+
commit=ff3429991ec1bac1d1b71215402e3d195162e125
10+
pkgrel=1
1011
pkgdesc='ffmpeg port (for Nintendo Switch homebrew development)'
1112
arch=('any')
1213
url='https://ffmpeg.org/'
@@ -15,20 +16,22 @@ options=(!strip staticlibs)
1516
makedepends=('switch-pkg-config' 'dkp-toolchain-vars')
1617
depends=('switch-zlib' 'switch-bzip2' 'switch-libass' 'switch-libfribidi'
1718
'switch-freetype' 'switch-harfbuzz' 'switch-mbedtls' 'switch-dav1d')
18-
source=("https://ffmpeg.org/releases/ffmpeg-$pkgver.tar.xz" "ffmpeg.patch")
19+
source=("https://github.com/FFmpeg/FFmpeg/archive/${commit}.tar.gz" "ffmpeg.patch" "network.patch")
1920
sha256sums=(
2021
'SKIP'
2122
'SKIP'
23+
'SKIP'
2224
)
2325
groups=('switch-portlibs')
2426

2527
prepare() {
26-
cd ffmpeg-$pkgver
28+
cd FFmpeg-$commit
2729
patch -Np1 -i "$srcdir/ffmpeg.patch"
30+
patch -Np1 -i "$srcdir/network.patch"
2831
}
2932

3033
build() {
31-
cd ffmpeg-$pkgver
34+
cd FFmpeg-$commit
3235

3336
source /opt/devkitpro/switchvars.sh
3437

@@ -51,7 +54,7 @@ build() {
5154
}
5255

5356
package() {
54-
cd ffmpeg-$pkgver
57+
cd FFmpeg-$commit
5558

5659
source /opt/devkitpro/switchvars.sh
5760

0 commit comments

Comments
 (0)