Release version v1.3.0

CMakeLists.txt

@@ -81,14 +81,14 @@ add_definitions(-DFONS_HASH_LUT_SIZE=4096)
 # Project Info
 project(wiliwili)
 set(VERSION_MAJOR "1")
-set(VERSION_MINOR "2")
-set(VERSION_REVISION "2")
+set(VERSION_MINOR "3")
+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.22")
+set(VITA_VERSION "01.30")
 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}")
@@ -102,7 +102,9 @@ if (PLATFORM_DESKTOP)
     find_package(MPV REQUIRED)
     message(STATUS "Found libmpv: ${MPV_VERSION} ${MPV_INCLUDE_DIR} ${MPV_LIBRARY}")
     list(APPEND APP_PLATFORM_INCLUDE ${MPV_INCLUDE_DIR})
-    list(APPEND APP_PLATFORM_LIB ${MPV_LIBRARY})
+    if (NOT MPV_BUNDLE_DLL)
+        list(APPEND APP_PLATFORM_LIB ${MPV_LIBRARY})
+    endif ()
 
     find_package(WebP)
     if (WebP_FOUND AND NOT DISABLE_WEBP)

README.md

@@ -309,8 +309,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.1-4-any.pkg.tar.zst \
-    $base_url/switch-libmpv-0.36.0-1-any.pkg.tar.zst
+    $base_url/switch-ffmpeg-6.1-5-any.pkg.tar.zst \
+    $base_url/switch-libmpv-0.36.0-2-any.pkg.tar.zst
 
 # 4. build
 cmake -B cmake-build-switch -DPLATFORM_SWITCH=ON
@@ -322,7 +322,7 @@ make -C cmake-build-switch wiliwili.nro -j$(nproc)
 ### 交叉编译 PSV 可执行文件
 
 参考 `.github/workflows/build.yaml` 使用 docker 来编译。  
-本地安装 [vitasdk](https://vitasdk.org/) 环境编译时，请不要忘记将需要的四个 suprx 文件放入 `scripts/psv/module` 目录下。 详情请参考：[borealis 示例](https://github.com/xfangfang/borealis#building-the-demo-for-psv) 和 [wiliwili_vita 编译指南](https://gist.github.com/xfangfang/305da139721ad4e96d7a9d9a1a550a9d)
+编译时，请不要忘记将需要的四个 suprx 文件放入 `scripts/psv/module` 目录下。 详情请参考：[borealis 示例](https://github.com/xfangfang/borealis#building-the-demo-for-psv) 和 [wiliwili_vita 编译指南](https://gist.github.com/xfangfang/305da139721ad4e96d7a9d9a1a550a9d)
 
 <details>
 
@@ -394,6 +394,7 @@ The development of wiliwili cannot do without the support of the following open
   - https://github.com/sammycage/lunasvg
   - https://github.com/cesanta/mongoose
   - https://chromium.googlesource.com/webm/libwebp
+  - https://github.com/fancycode/MemoryModule
 
 # Special thanks
 

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.1-4-any.pkg.tar.zst \
-    $base_url/switch-libmpv-0.36.0-1-any.pkg.tar.zst
+    $base_url/switch-ffmpeg-6.1-5-any.pkg.tar.zst \
+    $base_url/switch-libmpv-0.36.0-2-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.1-4-any.pkg.tar.zst"
-    "switch-libmpv-0.36.0-1-any.pkg.tar.zst"
+    "switch-ffmpeg-6.1-5-any.pkg.tar.zst"
+    "switch-libmpv-0.36.0-2-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.1-4-any.pkg.tar.zst"
-    "switch-libmpv_deko3d-0.35.1-4-any.pkg.tar.zst"
+    "switch-ffmpeg-6.1-5-any.pkg.tar.zst"
+    "switch-libmpv_deko3d-0.36.0-1-any.pkg.tar.zst"
     "switch-nspmini-48d4fc2-1-any.pkg.tar.xz"
 )
 for PKG in "${PKGS[@]}"; do

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

@@ -46,7 +46,7 @@
         </ul>
     </description>
     <releases>
-        <release date="2023-11-15" version="1.2.2">
+        <release date="2024-01-12" version="1.3.0">
             <description>
                 <p>
                     Please See Official Changelog at github.com/xfangfang/wiliwili/releases

scripts/switch/ffmpeg/PKGBUILD

@@ -7,7 +7,7 @@
 pkgname=switch-ffmpeg
 pkgver=6.1
 commit=ff3429991ec1bac1d1b71215402e3d195162e125
-pkgrel=4
+pkgrel=5
 pkgdesc='ffmpeg port (for Nintendo Switch homebrew development)'
 arch=('any')
 url='https://ffmpeg.org/'
@@ -27,20 +27,20 @@ groups=('switch-portlibs')
 prepare() {
   cd FFmpeg-$commit
 
-  rm -rf libavutil/hwcontext_tx1.c
-  rm -rf libavutil/hwcontext_tx1.h
+  rm -rf libavutil/hwcontext_nvtegra.c
+  rm -rf libavutil/hwcontext_nvtegra.h
   rm -rf libavutil/nvdec_drv.h
   rm -rf libavutil/nvhost_ioctl.h
   rm -rf libavutil/nvjpg_drv.h
   rm -rf libavutil/nvmap_ioctl.h
-  rm -rf libavutil/tx1.c
-  rm -rf libavutil/tx1.h
-  rm -rf libavutil/tx1_host1x.h
+  rm -rf libavutil/nvtegra.c
+  rm -rf libavutil/nvtegra.h
+  rm -rf libavutil/nvtegra_host1x.h
   rm -rf libavutil/vic_drv.h
   rm -rf libavutil/clb0b6.h
   rm -rf libavutil/clc5b0.h
   rm -rf libavutil/cle7d0.h
-  rm -rf libavcodec/tx1_*
+  rm -rf libavcodec/nvtegra_*
 
   patch -Np1 -i "$srcdir/ffmpeg.patch"
   patch -Np1 -i "$srcdir/network.patch"
@@ -63,7 +63,7 @@ build() {
     --enable-swscale --enable-swresample --enable-network  \
     --disable-protocols --enable-protocol=file,http,tcp,udp,rtmp,hls,https,tls,ftp,rtp,crypto,httpproxy \
     --enable-zlib --enable-bzlib --enable-libass --enable-libfreetype --enable-libfribidi --enable-libdav1d \
-    --enable-gpl --enable-tx1 \
+    --enable-gpl --enable-nvtegra \
     --enable-version3 --enable-mbedtls
 
   make -j$(nproc)