light cleanup

scripts/build.sh

@@ -130,7 +130,7 @@ fi
 echo "COMP_FLAGS: $COMP_FLAGS"
 
 # for ccache
-export PATH="/usr/lib/ccache/:$PATH"
+export PATH="/usr/lib/ccache:$PATH"
 
 # options for ffmpeg configure
 FFMPEG_CONFIGURE_OPT=""
@@ -207,6 +207,7 @@ then
           --libdir="$DOVI_DIR/ffmpeg_build.user"/lib \
           --includedir="$DOVI_DIR/ffmpeg_build.user"/include
      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 ./include/* /usr/local/include/ -r
 
@@ -226,6 +227,7 @@ then
           --libdir="$HDR10_DIR/ffmpeg_build.user"/lib \
           --includedir="$HDR10_DIR/ffmpeg_build.user"/include
      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 ./include/* /usr/local/include/ -r
 
@@ -275,6 +277,7 @@ if [[ "$BUILD_ALL_AV1" == "true" ]]; then
           --libdir="$(pwd)"/ffmpeg_build.user/lib \
           --includedir="$(pwd)"/ffmpeg_build.user/include || 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 ./include/* /usr/local/include/ -r || exit
 

scripts/install_deps.sh

@@ -5,7 +5,7 @@ COMMON_DEP_NAMES="autoconf automake cmake libtool pkg-config bc texinfo \
   clang valgrind ccache gawk"
 
 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 \
   gobjc++ python3-pip mawk libnuma-dev mediainfo mkvtoolnix libgtest-dev"
 

scripts/refresh_build.sh

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