Jonathan Jogenfors пре 1 година
родитељ
комит
5055be1b5b
3 измењених фајлова са 9 додато и 6 уклоњено
  1. 1 1
      .github/workflows/test.yml
  2. 4 2
      server/bin/install-ffmpeg.sh
  3. 4 3
      server/build-lock.json

+ 1 - 1
.github/workflows/test.yml

@@ -35,7 +35,7 @@ jobs:
           node-version: "21.0.0-nightly20230921480ab8c3a4"
 
       - name: Install dependencies
-        run: sudo apt-get update && sudo apt-get install -yqq build-essential ninja-build meson pkg-config jq zlib1g autoconf libglib2.0-dev libexpat1-dev librsvg2-dev libexif-dev libwebp-dev liborc-0.4-dev libjpeg-turbo8-dev libgsf-1-dev libheif-dev liblcms2-2 mesa-va-drivers libmimalloc2.0 $(if [ $(arch) = "x86_64" ]; then echo "intel-media-va-driver-non-free"; fi) && sudo FFMPEG_PLATFORM=jammy ./bin/install-ffmpeg.sh && sudo apt-get autoremove && sudo apt-get clean && rm -rf /var/lib/apt/lists/*
+        run: sudo apt-get update && sudo apt-get install -yqq build-essential ninja-build meson pkg-config jq zlib1g autoconf libglib2.0-dev libexpat1-dev librsvg2-dev libexif-dev libwebp-dev liborc-0.4-dev libjpeg-turbo8-dev libgsf-1-dev libheif-dev liblcms2-2 mesa-va-drivers libmimalloc2.0 $(if [ $(arch) = "x86_64" ]; then echo "intel-media-va-driver-non-free"; fi) && sudo FFMPEG_PLATFORM=jammy ./bin/install-ffmpeg.sh && sudo apt-get autoremove && sudo apt-get clean && sudo rm -rf /var/lib/apt/lists/*
 
       - name: Install libraw, imagemagick, libvips
         run: sudo ./bin/build-libraw.sh && sudo ./bin/build-imagemagick.sh && sudo ./bin/build-libvips.sh

+ 4 - 2
server/bin/install-ffmpeg.sh

@@ -8,13 +8,15 @@ echo Using platform $FFMPEG_PLATFORM
 
 LOCK=$(jq -c '.packages[] | select(.name == "ffmpeg")' build-lock.json)
 export TARGETARCH=${TARGETARCH:=$(dpkg --print-architecture)}
+export TARGETARCH=${TARGETARCH:=$(dpkg --print-architecture)}
+export PLATFORM=${FFMPEG_PLATFORM}
 FFMPEG_VERSION=${FFMPEG_VERSION:=$(echo $LOCK | jq -r '.version')}
-FFMPEG_SHA256=${FFMPEG_SHA256:=$(echo $LOCK | jq -r '.sha256[$ENV.TARGETARCH]')}
+FFMPEG_SHA256=${FFMPEG_SHA256:=$(echo $LOCK | jq -r '.sha256[$ENV.PLATFORM-$ENV.TARGETARCH]')}
 
 echo "$FFMPEG_SHA256  jellyfin-ffmpeg6_${FFMPEG_VERSION}-${FFMPEG_PLATFORM}_${TARGETARCH}.deb" > ffmpeg.sha256
 
 wget -nv https://github.com/jellyfin/jellyfin-ffmpeg/releases/download/v${FFMPEG_VERSION}/jellyfin-ffmpeg6_${FFMPEG_VERSION}-${FFMPEG_PLATFORM}_${TARGETARCH}.deb
-# sha256sum -c ffmpeg.sha256
+sha256sum -c ffmpeg.sha256
 apt-get -y -f install ./jellyfin-ffmpeg6_${FFMPEG_VERSION}-${FFMPEG_PLATFORM}_${TARGETARCH}.deb
 rm jellyfin-ffmpeg6_${FFMPEG_VERSION}-${FFMPEG_PLATFORM}_${TARGETARCH}.deb
 rm ffmpeg.sha256

+ 4 - 3
server/build-lock.json

@@ -19,9 +19,10 @@
       "name": "ffmpeg",
       "version": "6.0-4",
       "sha256": {
-        "amd64": "18d98b292b891cde86c2a08e5e989c3430e51a136cdc232bc4162fef3b4f0f44",
-        "arm64": "67eb1e5a38ac695dd253d9ac290ad0e9fb709e8260449a7445e8460b7db3c516",
-        "armhf": "a29605ab0eced3511c8a6623504fab5b8bb174a486d87f94bf5522ed9a5970e6"
+        "bookworm-amd64": "18d98b292b891cde86c2a08e5e989c3430e51a136cdc232bc4162fef3b4f0f44",
+        "bookworm-arm64": "67eb1e5a38ac695dd253d9ac290ad0e9fb709e8260449a7445e8460b7db3c516",
+        "bookworm-armhf": "a29605ab0eced3511c8a6623504fab5b8bb174a486d87f94bf5522ed9a5970e6",
+        "jammy-amd64": "06c4f0a67484d4072a3c0972998253df5f2fe5b7efdc6143ac11fc8055f633d2"
       }
     }
   ]