Merge branch 'xfangfang:dev' into dev

.flatpak-manifest.yml

@@ -36,19 +36,19 @@ modules:
           - /include
           - /lib/pkgconfig
           - /share/man
-        buildsystem: simple
-        build-commands:
-          - python3 waf configure --prefix=/app --enable-libmpv-shared --disable-cplayer --disable-build-date --disable-alsa
-          - python3 waf build
-          - python3 waf install
+        buildsystem: meson
+        config-opts:
+          - -Dlibmpv=true
+          - -Dlua=disabled
+          - -Ddebug=false
+          - -Dbuild-date=false
+          - -Dalsa=disabled
+          - -Dcplayer=false
+          - -Dmanpage-build=disabled
         sources:
           - type: archive
-            url: https://github.com/mpv-player/mpv/archive/v0.35.1.tar.gz
-            sha256: 41df981b7b84e33a2ef4478aaf81d6f4f5c8b9cd2c0d337ac142fc20b387d1a9
-          - type: file
-            url: 'https://waf.io/waf-2.0.24'
-            sha256: '93909bca823a675f9f40af7c65b24887c3a3c0efdf411ff1978ba827194bdeb0'
-            dest-filename: waf
+            url: https://github.com/mpv-player/mpv/archive/refs/tags/v0.36.0.tar.gz
+            sha256: 29abc44f8ebee013bb2f9fe14d80b30db19b534c679056e4851ceadf5a5e8bf6
         modules:
           - name: libv4l2
             cleanup:
@@ -66,8 +66,8 @@ modules:
               - '--with-udevdir=/app/lib/udev'
             sources:
               - type: archive
-                url: 'https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.22.1.tar.bz2'
-                sha256: '65c6fbe830a44ca105c443b027182c1b2c9053a91d1e72ad849dfab388b94e31'
+                url: 'https://linuxtv.org/downloads/v4l-utils/v4l-utils-1.24.1.tar.bz2'
+                sha256: 'cbb7fe8a6307f5ce533a05cded70bb93c3ba06395ab9b6d007eb53b75d805f5b'
 
           - name: nv-codec-headers
             cleanup:
@@ -77,8 +77,8 @@ modules:
               - PREFIX=/app
             sources:
               - type: archive
-                url: 'https://github.com/FFmpeg/nv-codec-headers/releases/download/n11.1.5.2/nv-codec-headers-11.1.5.2.tar.gz'
-                sha256: '1442e3159e7311dd71f8fca86e615f51609998939b6a6d405d6683d8eb3af6ee'
+                url: 'https://github.com/FFmpeg/nv-codec-headers/archive/refs/tags/n12.1.14.0.tar.gz'
+                sha256: '2fefaa227d2a3b4170797796425a59d1dd2ed5fd231db9b4244468ba327acd0b'
 
           - name: ffmpeg
             cleanup:
@@ -106,8 +106,8 @@ modules:
               - '--enable-libwebp'
             sources:
               - type: archive
-                url: 'https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.gz'
-                sha256: '87fe8defa37ce5f7449e36047171fed5e4c3f4bb73eaccea8c954ee81393581c'
+                url: 'https://ffmpeg.org/releases/ffmpeg-6.0.tar.gz'
+                sha256: 'f4ccf961403752c93961927715f524576d1f4dd02cd76d8c76aed3bbe6686656'
 
           - name: libass
             cleanup:
@@ -118,8 +118,8 @@ modules:
               - '--disable-static'
             sources:
               - type: archive
-                url: 'https://github.com/libass/libass/releases/download/0.17.0/libass-0.17.0.tar.gz'
-                sha256: '72b9ba5d9dd1ac6d30b5962f38cbe7aefb180174f71d8b65c5e3c3060dbc403f'
+                url: 'https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.gz'
+                sha256: 'd653be97198a0543c69111122173c41a99e0b91426f9e17f06a858982c2fb03d'
 
           - name: uchardet
             buildsystem: cmake-ninja

.github/workflows/build.yaml

@@ -442,7 +442,7 @@ jobs:
 
   build-vita:
     needs: [ version ]
-    name: psv
+    name: build-psv
     runs-on: ubuntu-latest
     container:
       image: vitasdk/vitasdk:latest

CMakeLists.txt

@@ -74,14 +74,14 @@ list(APPEND APP_PLATFORM_OPTION -DBUILD_TAG_VERSION=${GIT_TAG_VERSION} -DBUILD_T
 # Project Info
 project(wiliwili)
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "1")
-set(VERSION_REVISION "1")
+set(VERSION_MINOR "2")
+set(VERSION_REVISION "0")
 set(VERSION_BUILD "0")
 set(PROJECT_AUTHOR "xfangfang")
 set(PACKAGE_NAME cn.xfangfang.wiliwili)
 set(VITA_TITLEID "WILIWILI0")
 set(PSN_TITLE_ID "WILI00000")
-set(VITA_VERSION "01.11")
+set(VITA_VERSION "01.20")
 set(PROJECT_ICON ${CMAKE_CURRENT_SOURCE_DIR}/resources/icon/icon.jpg)
 set(PROJECT_RESOURCES ${CMAKE_CURRENT_SOURCE_DIR}/resources)
 set(APP_VERSION "${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_REVISION}")

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)
@@ -324,7 +331,7 @@ make -C cmake-build-switch wiliwili.nro -j$(nproc)
 ### 交叉编译 PS4 可执行文件
 
 参考 `.github/workflows/build.yaml` 使用 docker 来编译。  
-或本地安装 [PacBrew](https://github.com/PacBrew/pacbrew-packages) 环境（只支持 Linux），并手动添加依赖库，请参考：[scripts/ps4/Dockerfile](https://github.com/xfangfang/wiliwili/blob/ps4/scripts/ps4/Dockerfile)
+或本地安装 [PacBrew](https://github.com/PacBrew/pacbrew-packages) 环境（只支持 Linux），并手动添加依赖库，请参考：[scripts/ps4/Dockerfile](https://github.com/xfangfang/wiliwili/blob/dev/scripts/ps4/Dockerfile)
 
 ```shell
 docker run --rm -v $(pwd):/src/ xfangfang/wiliwili_ps4_builder:latest \

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

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

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

scripts/linux/cn.xfangfang.wiliwili.appdata.xml

@@ -29,7 +29,7 @@
         </ul>
     </description>
     <releases>
-        <release date="2023-07-26" version="1.1.1">
+        <release date="2023-10-31" version="1.2.0">
             <description>
                 <p>
                     Please See Official Changelog at github.com/xfangfang/wiliwili/releases

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