Skip to content

Commit

Permalink
fix: remove unused setting entry
Browse files Browse the repository at this point in the history
  • Loading branch information
dragonflylee committed Jan 20, 2025
1 parent d175216 commit d0e9129
Show file tree
Hide file tree
Showing 13 changed files with 35 additions and 29 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ jobs:
- name: Update dependencies
run: |
dkp-pacman --noconfirm -U $BASE_URL/hacBrewPack-3.05-1-x86_64.pkg.tar.zst
for pkg in mbedtls-2.28.9-3 curl-8.7.1-1 harfbuzz-10.1.0-1 ffmpeg-7.1-6 libmpv${{ matrix.shuffix }}-0.36.0-5 nspmini-main-1; do
for pkg in mbedtls-2.28.9-3 curl-8.7.1-1 harfbuzz-10.2.0-1 ffmpeg-7.1-6 libmpv${{ matrix.shuffix }}-0.36.0-5 nspmini-main-1; do
dkp-pacman --noconfirm -U $BASE_URL/switch-${pkg}-any.pkg.tar.zst
done
git config --system --add safe.directory $GITHUB_WORKSPACE
Expand Down Expand Up @@ -340,7 +340,7 @@ jobs:
submodules: recursive
- name: Install dependency
run: |
for pkg in glfw-3.5.0-1 curl-8.11.1-1 mpv-0.39.0-4 libwebp-1.4.0-1; do
for pkg in glfw-3.5.0-1 curl-8.11.1-1 mpv-0.39.0-4 libwebp-1.5.0-1; do
curl -sLO https://github.com/dragonflylee/switchfin/releases/download/mingw-packages/${MINGW_PACKAGE_PREFIX}-${pkg}-any.pkg.tar.zst
done
pacman -U --noconfirm *.pkg.tar.zst
Expand Down
15 changes: 8 additions & 7 deletions .github/workflows/macos-dylib.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
cmake --build build-libssh2
cmake --install build-libssh2
- name: Build libcurl
if: ${{ matrix.tag == 'Intel_Old' }}
run: |
curl --retry 5 -sSL https://curl.se/download/curl-8.11.1.tar.xz | tar Jxf - -C ${{ runner.temp }}
cmake -B build-curl -G Ninja -S ${{ runner.temp }}/curl-8.11.1 \
Expand All @@ -103,7 +104,7 @@ jobs:
-DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
-DCMAKE_OSX_DEPLOYMENT_TARGET=${{ matrix.target }} \
-DCMAKE_BUILD_TYPE=Release -DBUILD_SHARED_LIBS=ON \
-DHTTP_ONLY=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_USE_SECTRANSP=ON \
-DHTTP_ONLY=ON -DCURL_DISABLE_PROGRESS_METER=ON -DCURL_USE_MBEDTLS=ON \
-DBUILD_CURL_EXE=OFF -DUSE_NGHTTP2=OFF -DBUILD_TESTING=OFF -DBUILD_LIBCURL_DOCS=OFF \
-DUSE_LIBIDN2=OFF -DCURL_USE_LIBSSH2=OFF -DCURL_USE_LIBPSL=OFF
cmake --build build-curl
Expand All @@ -130,8 +131,8 @@ jobs:
meson install -C build-freetype
- name: Build harfbuzz
run: |
curl --retry 5 -sSL https://github.com/harfbuzz/harfbuzz/releases/download/10.1.0/harfbuzz-10.1.0.tar.xz | tar Jxf - -C ${{ runner.temp }}
meson setup build-harfbuzz ${{ runner.temp }}/harfbuzz-10.1.0 ${{ matrix.meson }} \
curl --retry 5 -sSL https://github.com/harfbuzz/harfbuzz/releases/download/10.2.0/harfbuzz-10.2.0.tar.xz | tar Jxf - -C ${{ runner.temp }}
meson setup build-harfbuzz ${{ runner.temp }}/harfbuzz-10.2.0 ${{ matrix.meson }} \
--prefix=$CMAKE_PREFIX_PATH --buildtype=release --default-library=shared \
-Dtests=disabled -Ddocs=disabled -Dicu=disabled -Dcairo=disabled \
-Dglib=disabled -Dgobject=disabled -Dbenchmark=disabled
Expand All @@ -154,16 +155,16 @@ jobs:
meson install -C build-libass
- name: Build dav1d
run: |
curl --retry 5 -sSL https://downloads.videolan.org/pub/videolan/dav1d/1.5.0/dav1d-1.5.0.tar.xz | tar Jxf - -C ${{ runner.temp }}
meson setup build-dav1d ${{ runner.temp }}/dav1d-1.5.0 ${{ matrix.meson }} \
curl --retry 5 -sSL https://downloads.videolan.org/pub/videolan/dav1d/1.5.1/dav1d-1.5.1.tar.xz | tar Jxf - -C ${{ runner.temp }}
meson setup build-dav1d ${{ runner.temp }}/dav1d-1.5.1 ${{ matrix.meson }} \
--prefix=$CMAKE_PREFIX_PATH --buildtype=release --default-library=shared \
-Denable_tools=false -Denable_examples=false -Denable_tests=false -Denable_docs=false
meson compile -C build-dav1d
meson install -C build-dav1d
- name: Build libwebp
run: |
curl --retry 5 -sSL https://github.com/webmproject/libwebp/archive/v1.4.0.tar.gz | tar zxf - -C ${{ runner.temp }}
cmake -B build-libwebp -G Ninja -S ${{ runner.temp }}/libwebp-1.4.0 \
curl --retry 5 -sSL https://github.com/webmproject/libwebp/archive/v1.5.0.tar.gz | tar zxf - -C ${{ runner.temp }}
cmake -B build-libwebp -G Ninja -S ${{ runner.temp }}/libwebp-1.5.0 \
-DCMAKE_INSTALL_PREFIX=$CMAKE_PREFIX_PATH \
-DCMAKE_INSTALL_NAME_DIR=$CMAKE_PREFIX_PATH/lib \
-DCMAKE_OSX_ARCHITECTURES=${{ matrix.arch }} \
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/mingw-packages.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ jobs:
sparse-checkout: scripts/mingw64
- name: Install dependency
run: |
pacman -S --needed --noconfirm \
pacman -Sy --needed --noconfirm \
${MINGW_PACKAGE_PREFIX}-make \
${MINGW_PACKAGE_PREFIX}-autotools \
${MINGW_PACKAGE_PREFIX}-cmake \
Expand Down
9 changes: 8 additions & 1 deletion app/include/view/mpv_core.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,14 @@ class MPVCore : public brls::Singleton<MPVCore> {
#elif defined(BOREALIS_USE_DEKO3D)
DkFence doneFence;
DkFence readyFence;
mpv_deko3d_fbo mpv_fbo{nullptr, &readyFence, &doneFence, 1280, 720, DkImageFormat_RGBA8_Unorm};
mpv_deko3d_fbo mpv_fbo{
.tex = nullptr,
.ready_fence = &readyFence,
.done_fence = &doneFence,
.w = 1280,
.h = 720,
.format = DkImageFormat_RGBA8_Unorm,
};
mpv_render_param mpv_params[3] = {
{MPV_RENDER_PARAM_DEKO3D_FBO, &mpv_fbo},
{MPV_RENDER_PARAM_INVALID, nullptr},
Expand Down
4 changes: 2 additions & 2 deletions debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,8 @@ libssh2:
cmake --install build/libssh2

dav1d:
wget -qO- https://downloads.videolan.org/pub/videolan/dav1d/1.5.0/dav1d-1.5.0.tar.xz | tar Jxf - -C /tmp
meson setup build/dav1d /tmp/dav1d-1.5.0 --prefix=$(PREFIX) --libdir=lib \
wget -qO- https://downloads.videolan.org/pub/videolan/dav1d/1.5.1/dav1d-1.5.1.tar.xz | tar Jxf - -C /tmp
meson setup build/dav1d /tmp/dav1d-1.5.1 --prefix=$(PREFIX) --libdir=lib \
--buildtype=release --default-library=shared \
-Denable_tools=false -Denable_examples=false -Denable_tests=false -Denable_docs=false
meson compile -C build/dav1d
Expand Down
2 changes: 0 additions & 2 deletions resources/xml/tabs/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,6 @@
id="setting/video/directplay" />
<brls:SelectorCell
id="setting/transcode/codec" />
<brls:SelectorCell
id="setting/transcode/width" />
</brls:Box>

<brls:Header
Expand Down
4 changes: 2 additions & 2 deletions scripts/mingw64/dav1d/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=dav1d
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.5.0
pkgver=1.5.1
pkgrel=1
pkgdesc="AV1 cross-platform decoder focused on speed and correctness (mingw-w64)"
arch=('any')
Expand All @@ -19,7 +19,7 @@ makedepends=(
$([[ ${MINGW_PACKAGE_PREFIX} == *-clang-aarch64* ]] || echo "${MINGW_PACKAGE_PREFIX}-nasm")
)
source=("https://downloads.videolan.org/pub/videolan/dav1d/${pkgver}/dav1d-${pkgver}.tar.xz")
sha256sums=('14bd6f5157808ed9aedcafbe50df689d304fd4810ac20be6eec1ab037436afd6')
sha256sums=('401813f1f89fa8fd4295805aa5284d9aed9bc7fc1fdbe554af4292f64cbabe21')

build() {
MSYS2_ARG_CONV_EXCL="--prefix=" \
Expand Down
4 changes: 2 additions & 2 deletions scripts/mingw64/harfbuzz/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
_realname=harfbuzz
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=10.1.0
pkgver=10.2.0
pkgrel=1
pkgdesc="OpenType text shaping engine (mingw-w64)"
arch=('any')
Expand All @@ -22,7 +22,7 @@ depends=(
)
options=('staticlibs' '!strip')
source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.xz")
sha256sums=('6ce3520f2d089a33cef0fc48321334b8e0b72141f6a763719aaaecd2779ecb82')
sha256sums=('620e3468faec2ea8685d32c46a58469b850ef63040b3565cde05959825b48227')
noextract=("harfbuzz-${pkgver}.tar.xz")

prepare() {
Expand Down
4 changes: 2 additions & 2 deletions scripts/mingw64/libwebp/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
_realname=libwebp
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=1.4.0
pkgver=1.5.0
pkgrel=1
pkgdesc="A library to encode and decode images in WebP format (mingw-w64)"
arch=('any')
Expand All @@ -21,7 +21,7 @@ source=(
${_realname}-${pkgver}.tar.gz::https://github.com/webmproject/libwebp/archive/v${pkgver}.tar.gz
0001-mingw-cmake-output.patch
)
sha256sums=('12af50c45530f0a292d39a88d952637e43fb2d4ab1883c44ae729840f7273381' 'SKIP')
sha256sums=('668c9aba45565e24c27e17f7aaf7060a399f7f31dba6c97a044e1feacb930f37' 'SKIP')

prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
Expand Down
4 changes: 2 additions & 2 deletions scripts/mingw64/shaderc/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
_realname=shaderc
pkgbase=mingw-w64-${_realname}
pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}")
pkgver=2024.3
pkgver=2024.4
pkgrel=1
pkgdesc="Collection of tools, libraries and tests for shader compilation (mingw-w64)"
url="https://github.com/google/shaderc"
Expand All @@ -26,7 +26,7 @@ source=(
"${_realname}-${pkgver}.tar.gz"::"https://github.com/google/shaderc/archive/v${pkgver}.tar.gz"
"0001-fix-glslang-hlsl-linking-order.patch"
)
sha256sums=('d5c68b5de5d4c7859d9699054493e0a42a2a5eb21b425d63f7b7dd543db0d708' 'SKIP')
sha256sums=('989a46c0bc0e58ab8ac9ef9c1fb8000e0209d482b242a514b385d8f8c4cbfa06' 'SKIP')

prepare() {
cd "${srcdir}/${_realname}-${pkgver}"
Expand Down
6 changes: 3 additions & 3 deletions scripts/mingw64/spirv-cross/PKGBUILD
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ _realname=spirv-cross
pkgbase=mingw-w64-${_realname}
pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
epoch=1
pkgver=1.3.296.0
pkgrel=1
pkgver=1.4.304.0
pkgrel=2
pkgdesc="A tool and library for parsing and converting SPIR-V to other shader languages (mingw-w64)"
arch=('any')
mingw_arch=('mingw32' 'mingw64' 'clangarm64')
Expand All @@ -27,7 +27,7 @@ source=(
"${_realname}-${pkgver}.tar.gz::https://github.com/KhronosGroup/SPIRV-Cross/archive/vulkan-sdk-${pkgver}.tar.gz"
"0001-static-linking-hacks.patch"
)
sha256sums=('4f7f9a8a643e6694f155712016b9b572c13a9444e65b3f43b27bb464c0ab76e0' 'SKIP')
sha256sums=('635b9b9ed2318df5ac65a0e1db1f92deb1e9c29e9dac30cd4b14eb3d72be5cf3' 'SKIP')

prepare() {
cd "${srcdir}/SPIRV-Cross-vulkan-sdk-${pkgver}"
Expand Down
2 changes: 1 addition & 1 deletion scripts/snap/snapcraft.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ parts:

dav1d:
plugin: meson
source: https://downloads.videolan.org/pub/videolan/dav1d/1.5.0/dav1d-1.5.0.tar.xz
source: https://downloads.videolan.org/pub/videolan/dav1d/1.5.1/dav1d-1.5.1.tar.xz
source-type: tar
meson-parameters:
- --prefix=/usr
Expand Down
4 changes: 2 additions & 2 deletions scripts/switch/harfbuzz/PKGBUILD
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
# Maintainer: Mary Strodl <ipadlover8322@gmail.com>

pkgname=switch-harfbuzz
pkgver=10.1.0
pkgver=10.2.0
pkgrel=1
pkgdesc='HarfBuzz is a text shaping library. Using the HarfBuzz library allows programs to convert a sequence of Unicode input into properly formatted and positioned glyph output—for any writing system and language.'
arch=('any')
url='https://harfbuzz.github.io/'
license=(LGPL)
options=(!strip libtool staticlibs)
source=("https://github.com/harfbuzz/harfbuzz/releases/download/${pkgver}/harfbuzz-${pkgver}.tar.xz")
sha256sums=('6ce3520f2d089a33cef0fc48321334b8e0b72141f6a763719aaaecd2779ecb82')
sha256sums=('620e3468faec2ea8685d32c46a58469b850ef63040b3565cde05959825b48227')
makedepends=('dkp-toolchain-vars' 'dkp-meson-scripts')
depends=('switch-freetype')

Expand Down

0 comments on commit d0e9129

Please sign in to comment.