Github workflow: Fix linking error on macOS

 Homebrew has multiple versions of python which occasionally step on
 each other. Add the overwrite flag in the install process to
 explicity oveverwrite old links.

 Additionally add a call to brew upgrade to handle issues where
 new packages require updating already installed ones.

Author: jhoyt4

.github/workflows/buildmaster.yml

@@ -100,13 +100,22 @@ jobs:
         env:
           OS_VERS: ${{ matrix.os }}
         run: |
-          brew update
-          ${PKGMGR_CMD} install pkg-config ccache qt5 nasm libsamplerate taglib\
-            lzo libcec libbluray libass libhdhomerun dav1d x264 x265 libvpx \
-            openssl sound-touch lame freetype libass libiconv libxml2 libzip \
-            XviD zlib pyenv-virtualenv python-lxml  python-requests \
-            python-setuptools
-          ${PKGMGR_CMD} link qt5 --force
+          HB_PREFIX=$(${PKGMGR_CMD} --prefix)
+          ${PKGMGR_CMD} unlink python --force
+          ${PKGMGR_CMD} update
+          # remove the link to python-2to3 in case python gets upgraded or a
+          # new version is required
+          if [ -L $HB_PREFIX/2to3 ]; then
+            rm '$HB_PREFIX/bin/2to3'
+          fi
+          ${PKGMGR_CMD} upgrade
+          ${PKGMGR_CMD} install pkg-config ccache qt@5 nasm libsamplerate \
+            taglib lzo libcec libbluray libass libhdhomerun dav1d x264 x265 \
+            libvpx openssl sound-touch lame freetype libass libiconv libxml2 \
+            libzip XviD zlib pyenv-virtualenv python-lxml python-requests \
+            python-setuptools --force --overwrite
+          ${PKGMGR_CMD} link qt@5 --force
+          ${PKGMGR_CMD} link python --force
           # macos-14 updated the linker and needs to be run in "classic" mode
           case $OS_VERS in
             macos-14)
@@ -115,7 +124,6 @@ jobs:
           esac
           # homebrew uses different prefixes on x86_64 and arm64, find the
           #  correct one and setup the correct build variables
-          HB_PREFIX=$(${PKGMGR_CMD} --prefix)
           C_INCLUDE_PATH=$HB_PREFIX/include:$C_INCLUDE_PATH
           echo "C_INCLUDE_PATH=$C_INCLUDE_PATH" >> $GITHUB_ENV
           CPLUS_INCLUDE_PATH=$HB_PREFIX/include:$CPLUS_INCLUDE_PATH
@@ -169,7 +177,7 @@ jobs:
 
       - name: Install plugin dependencies (macOS)
         run: ${PKGMGR_CMD} install minizip flac libvorbis libcdio python-pycurl
-             python-oauthlib
+          python-oauthlib --force --overwrite
         if: runner.os == 'macOS'
 
       - name: Configure plugins