light cleanup

This commit is contained in:
2024-07-10 17:16:44 -05:00
parent 7f856415b8
commit 17ac1e43b9
3 changed files with 7 additions and 2 deletions

View File

@@ -130,7 +130,7 @@ fi
echo "COMP_FLAGS: $COMP_FLAGS" echo "COMP_FLAGS: $COMP_FLAGS"
# for ccache # for ccache
export PATH="/usr/lib/ccache/:$PATH" export PATH="/usr/lib/ccache:$PATH"
# options for ffmpeg configure # options for ffmpeg configure
FFMPEG_CONFIGURE_OPT="" FFMPEG_CONFIGURE_OPT=""
@@ -207,6 +207,7 @@ then
--libdir="$DOVI_DIR/ffmpeg_build.user"/lib \ --libdir="$DOVI_DIR/ffmpeg_build.user"/lib \
--includedir="$DOVI_DIR/ffmpeg_build.user"/include --includedir="$DOVI_DIR/ffmpeg_build.user"/include
cd "$DOVI_DIR"/ffmpeg_build.user || exit cd "$DOVI_DIR"/ffmpeg_build.user || exit
sudo rm /usr/local/include/libdovi /usr/local/lib/libdovi.*
sudo cp ./lib/* /usr/local/lib/ -r || exit sudo cp ./lib/* /usr/local/lib/ -r || exit
sudo cp ./include/* /usr/local/include/ -r sudo cp ./include/* /usr/local/include/ -r
@@ -226,6 +227,7 @@ then
--libdir="$HDR10_DIR/ffmpeg_build.user"/lib \ --libdir="$HDR10_DIR/ffmpeg_build.user"/lib \
--includedir="$HDR10_DIR/ffmpeg_build.user"/include --includedir="$HDR10_DIR/ffmpeg_build.user"/include
cd "$HDR10_DIR"/ffmpeg_build.user || exit cd "$HDR10_DIR"/ffmpeg_build.user || exit
sudo rm /usr/local/include/libhdr10plus-rs /usr/local/lib/libhdr10plus-rs.*
sudo cp ./lib/* /usr/local/lib/ -r || exit sudo cp ./lib/* /usr/local/lib/ -r || exit
sudo cp ./include/* /usr/local/include/ -r sudo cp ./include/* /usr/local/include/ -r
@@ -275,6 +277,7 @@ if [[ "$BUILD_ALL_AV1" == "true" ]]; then
--libdir="$(pwd)"/ffmpeg_build.user/lib \ --libdir="$(pwd)"/ffmpeg_build.user/lib \
--includedir="$(pwd)"/ffmpeg_build.user/include || exit --includedir="$(pwd)"/ffmpeg_build.user/include || exit
cd ffmpeg_build.user || exit cd ffmpeg_build.user || exit
sudo rm /usr/local/include/rav1e /usr/local/lib/librav1e.*
sudo cp ./lib/* /usr/local/lib/ -r || exit sudo cp ./lib/* /usr/local/lib/ -r || exit
sudo cp ./include/* /usr/local/include/ -r || exit sudo cp ./include/* /usr/local/include/ -r || exit

View File

@@ -5,7 +5,7 @@ COMMON_DEP_NAMES="autoconf automake cmake libtool pkg-config bc texinfo \
clang valgrind ccache gawk" clang valgrind ccache gawk"
APT_DEP_NAMES="build-essential git-core libass-dev libfreetype6-dev \ APT_DEP_NAMES="build-essential git-core libass-dev libfreetype6-dev \
libsdl2-dev libva-dev libvdpau-dev libvorbis-dev libxcb1-dev \ libsdl2-dev libva-dev libvdpau-dev libvorbis-dev libxcb1-dev mold \
libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev ninja-build \ libxcb-shm0-dev libxcb-xfixes0-dev zlib1g-dev libssl-dev ninja-build \
gobjc++ python3-pip mawk libnuma-dev mediainfo mkvtoolnix libgtest-dev" gobjc++ python3-pip mawk libnuma-dev mediainfo mkvtoolnix libgtest-dev"

View File

@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash
git stash
git stash drop
git pull git pull
bash ./scripts/install_deps.sh || exit 1 bash ./scripts/install_deps.sh || exit 1
bash ./scripts/build.sh $(cat .last_opts) || exit 1 bash ./scripts/build.sh $(cat .last_opts) || exit 1