Skip to content

Commit 8080f72

Browse files
committed
fix(player-ci): expose staged runtime libraries to mpv build
1 parent 34fcfba commit 8080f72

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

‎scripts/build-openjoc-player-windows.sh‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -147,8 +147,10 @@ mpv_prefix="$work/prefix/mpv"
147147
meson setup "$work/build/mpv" "$mpv_source" --prefix=/usr --buildtype=release \
148148
-Dtests=false -Dmanpage-build=disabled -Dhtml-build=disabled -Dpdf-build=disabled
149149
)
150-
meson compile -C "$work/build/mpv" -j "${CARGO_BUILD_JOBS:-2}"
151-
DESTDIR="$mpv_prefix" meson install -C "$work/build/mpv"
150+
PATH="$openjoc_prefix/bin:$ffmpeg_prefix/bin:/mingw64/bin:$PATH" \
151+
meson compile -C "$work/build/mpv" -j "${CARGO_BUILD_JOBS:-2}"
152+
PATH="$openjoc_prefix/bin:$ffmpeg_prefix/bin:/mingw64/bin:$PATH" \
153+
DESTDIR="$mpv_prefix" meson install -C "$work/build/mpv"
152154
cp "$mpv_prefix/usr/bin/mpv.exe" "$work/stage/bin/mpv.exe"
153155
echo '::endgroup::'
154156

‎scripts/build-openjoc-player.sh‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -192,8 +192,10 @@ case "$platform" in
192192
meson setup "$work/build/mpv" "$mpv_source" \
193193
--prefix=/usr --buildtype=release -Dtests=false \
194194
-Dmanpage-build=disabled -Dhtml-build=disabled -Dpdf-build=disabled)
195-
meson compile -C "$work/build/mpv" -j "${CARGO_BUILD_JOBS:-2}"
196-
DESTDIR="$mpv_prefix" meson install -C "$work/build/mpv"
195+
LD_LIBRARY_PATH="$openjoc_prefix/lib:$ffmpeg_prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
196+
meson compile -C "$work/build/mpv" -j "${CARGO_BUILD_JOBS:-2}"
197+
LD_LIBRARY_PATH="$openjoc_prefix/lib:$ffmpeg_prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
198+
DESTDIR="$mpv_prefix" meson install -C "$work/build/mpv"
197199
cp "$mpv_prefix/usr/bin/mpv" "$work/stage/bin/mpv"
198200
echo '::endgroup::'
199201
echo '::group::macOS package assembly and dependency audit'
@@ -252,8 +254,10 @@ case "$platform" in
252254
meson setup "$work/build/mpv" "$mpv_source" \
253255
--prefix=/usr --buildtype=release -Dtests=false \
254256
-Dmanpage-build=disabled -Dhtml-build=disabled -Dpdf-build=disabled)
255-
meson compile -C "$work/build/mpv" -j "${CARGO_BUILD_JOBS:-2}"
256-
DESTDIR="$mpv_prefix" meson install -C "$work/build/mpv"
257+
LD_LIBRARY_PATH="$openjoc_prefix/lib:$ffmpeg_prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
258+
meson compile -C "$work/build/mpv" -j "${CARGO_BUILD_JOBS:-2}"
259+
LD_LIBRARY_PATH="$openjoc_prefix/lib:$ffmpeg_prefix/lib${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}" \
260+
DESTDIR="$mpv_prefix" meson install -C "$work/build/mpv"
257261
cp "$mpv_prefix/usr/bin/mpv" "$work/stage/bin/mpv"
258262
echo '::endgroup::'
259263
echo '::group::Linux package assembly and dependency audit'

0 commit comments

Comments
 (0)