Merge branch 'spacedriveapp:main' into main

noor-to · Feb 16, 2024 · 35f01f4 · 35f01f4
2 parents f18d0fb + f436da8
commit 35f01f4
Show file tree

Hide file tree

Showing 23 changed files with 192 additions and 33 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -5,19 +5,19 @@ ARG TARGET="x86_64-linux-gnu"
 ARG VERSION="0.0.0"
 
 # renovate: datasource=github-releases depName=ziglang/zig
-ARG ZIG_VERSION="0.11.0"
+ARG ZIG_VERSION='0.11.0'
 # renovate: datasource=github-releases depName=mesonbuild/meson
-ARG MESON_VERSION="1.3.1"
+ARG MESON_VERSION='1.3.2'
 # renovate: datasource=github-releases depName=Kitware/CMake
-ARG CMAKE_VERSION="3.28.3"
+ARG CMAKE_VERSION='3.28.3'
 # renovate: datasource=github-releases depName=NixOS/patchelf
-ARG PATCHELF_VERSION="0.18.0"
+ARG PATCHELF_VERSION='0.18.0'
 # renovate: datasource=github-releases depName=joseluisq/macosx-sdks
-ARG MACOS_SDK_VERSION="14.2"
+ARG MACOS_SDK_VERSION='14.2'
 
 #--
 
-FROM debian:bookworm as build-base
+FROM debian:bookworm@sha256:4482958b4461ff7d9fabc24b3a9ab1e9a2c85ece07b2db1840c7cbc01d053e90 as build-base
 
 SHELL ["bash", "-euxo", "pipefail", "-c"]
 

diff --git a/renovate.json b/renovate.json
@@ -0,0 +1,96 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:base",
+
+    ":label(type/renovate)",
+
+    ":docker",
+    "docker:enableMajor",
+    "docker:pinDigests",
+
+    ":disableRateLimiting",
+    ":ignoreUnstable",
+    ":pinVersions",
+    ":separateMajorReleases",
+    ":automergePr",
+    ":automergeRequireAllStatusChecks",
+    ":automergeAll",
+    ":semanticCommits",
+
+    ":enableVulnerabilityAlerts",
+    ":enableVulnerabilityAlertsWithLabel(security)"
+  ],
+
+  "rebaseWhen": "conflicted",
+  "platformAutomerge": true,
+  "rebaseLabel": "renovate/rebase",
+  "stopUpdatingLabel": "renovate/stop-updating",
+
+  "major": { "labels": ["bump/major"] },
+  "minor": { "labels": ["bump/minor"] },
+  "patch": { "labels": ["bump/patch"] },
+  "pin": { "labels": ["bump/pin"] },
+  "digest": { "labels": ["bump/digest"] },
+
+  "regexManagers": [
+    {
+      "fileMatch": ["^stages/.*\\.sh$"],
+      "matchStrings": [
+        "#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( registryUrl=(?<registryUrl>.*?))?\\n_tag='(?<currentValue>.*)'\\s"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
+    },
+    {
+      "fileMatch": ["^stages/.*\\.sh$"],
+      "matchStrings": [
+        "#\\s*renovate:\\s*depName=(?<depName>.*?)\\n_commit='(?<currentValue>)(?<currentDigest>.*?)'"
+      ],
+      "versioningTemplate": "git",
+      "datasourceTemplate": "git-refs"
+    },
+    {
+      "fileMatch": ["^Dockerfile$"],
+      "matchStrings": [
+        "#\\s*renovate:\\s*datasource=(?<datasource>.*?) depName=(?<depName>.*?)( versioning=(?<versioning>.*?))?( registryUrl=(?<registryUrl>.*?))?\\n(ENV|ARG) .*?_VERSION='(?<currentValue>.*)'\\s"
+      ],
+      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver{{/if}}"
+    }
+  ],
+
+  "packageRules": [
+    {
+      "packageNames": [
+        "Kitware/CMake",
+        "DLTcollab/sse2neon",
+        "tukaani-project/xz",
+        "xiph/ogg",
+        "strukturag/libde265",
+        "xiph/vorbis",
+        "Fintel/libvpl",
+        "xiph/opus",
+        "AOMediaCodec/SVT-AV1",
+        "strukturag/libheif",
+        "protocolbuffers/protobuf",
+        "microsoft/onnxruntime"
+      ],
+      "extractVersion": "^v(?<version>.+)$"
+    },
+    {
+      "packageNames": ["mm2/Little-CMS"],
+      "extractVersion": "^lcms(?<version>.+)$"
+    },
+    {
+      "packageNames": ["FFmpeg/nv-codec-headers"],
+      "extractVersion": "^n(?<version>.+)$"
+    },
+    {
+      "packageNames": ["sekrit-twc/zimg"],
+      "extractVersion": "^release-(?<version>.+)$"
+    },
+    {
+      "packageNames": ["bblanchon/pdfium-binaries"],
+      "extractVersion": "^chromium/(?<version>.+)$"
+    }
+  ]
+}
diff --git a/stages/00-apple/01-xar.sh b/stages/00-apple/01-xar.sh
@@ -23,7 +23,10 @@ echo "Download xar ..."
 
 mkdir -p "xar/build"
 
-curl_tar 'https://github.com/tpoechtrager/xar/archive/5fa4675.tar.gz' 'xar' 1
+# renovate: depName=git@github.com:tpoechtrager/xar.git
+_commit='5fa4675419cfec60ac19a9c7f7c2d0e7c831a497'
+
+curl_tar "https://github.com/tpoechtrager/xar/archive/${_commit}.tar.gz" 'xar' 1
 
 cd xar/xar
 

diff --git a/stages/00-apple/02-tapi.sh b/stages/00-apple/02-tapi.sh
@@ -24,7 +24,10 @@ echo "Download tapi ..."
 
 mkdir -p "tapi"
 
-curl_tar 'https://github.com/tpoechtrager/apple-libtapi/archive/b8c5ac4.tar.gz' 'tapi' 1
+# renovate: depName=git@github.com:tpoechtrager/apple-libtapi.git
+_commit='b8c5ac40267aa5f6004dd38cc2b2cd84f2d9d555'
+
+curl_tar "https://github.com/tpoechtrager/apple-libtapi/archive/${_commit}.tar.gz" 'tapi' 1
 
 cd tapi
 

diff --git a/stages/00-apple/03-dispatch.sh b/stages/00-apple/03-dispatch.sh
@@ -23,7 +23,10 @@ echo "Download dispatch ..."
 
 mkdir -p 'dispatch/build'
 
-curl_tar 'https://github.com/tpoechtrager/apple-libdispatch/archive/ee39300.tar.gz' 'dispatch' 1
+# renovate: depName=git@github.com:tpoechtrager/apple-libdispatch.git
+_commit='ee39300b12a77efd3f2f020e009e42d557adbb29'
+
+curl_tar "https://github.com/tpoechtrager/apple-libdispatch/archive/${_commit}.tar.gz" 'dispatch' 1
 
 cd dispatch/build
 

diff --git a/stages/00-apple/04-cctools.sh b/stages/00-apple/04-cctools.sh
@@ -30,7 +30,10 @@ echo "Download cctools ..."
 
 mkdir -p "cctools"
 
-curl_tar 'https://github.com/tpoechtrager/cctools-port/archive/a98286d.tar.gz' 'cctools' 1
+# renovate: depName=git@github.com:tpoechtrager/cctools-port.git
+_commit='a98286d858210b209395624477533c0bde05556a'
+
+curl_tar "https://github.com/tpoechtrager/cctools-port/archive/${_commit}.tar.gz" 'cctools' 1
 
 cd cctools/cctools
 

diff --git a/stages/10-sse2neon.sh b/stages/10-sse2neon.sh
@@ -12,7 +12,10 @@ echo "Download sse2neon..."
 
 mkdir -p sse2neon
 
-curl_tar 'https://github.com/DLTcollab/sse2neon/archive/refs/tags/v1.7.0.tar.gz' 'sse2neon' 1
+# renovate: datasource=github-releases depName=DLTcollab/sse2neon
+_tag='1.7.0'
+
+curl_tar "https://github.com/DLTcollab/sse2neon/archive/refs/tags/v${_tag}.tar.gz" 'sse2neon' 1
 
 # Remove unused components
 rm -r sse2neon/{.ci,.github,tests}

diff --git a/stages/20-bzip2.sh b/stages/20-bzip2.sh
@@ -2,7 +2,7 @@
 
 case "$TARGET" in
   *darwin*)
-    # MacOS ships bzip2
+    # MacOS SDK ships bzip2
     export UNSUPPORTED=1
     exit 1
     ;;
@@ -11,7 +11,10 @@ esac
 echo "Download bzip2..."
 mkdir -p bzip2
 
-curl_tar 'https://gitlab.com/bzip2/bzip2/-/archive/66c46b8/bzip2.tar.gz' bzip2 1
+# renovate: depName=https://gitlab.com/bzip2/bzip2.git
+_commit='66c46b8c9436613fd81bc5d03f63a61933a4dcc3'
+
+curl_tar "https://gitlab.com/bzip2/bzip2/-/archive/${_commit}/bzip2.tar.gz" bzip2 1
 
 sed -i '/add_subdirectory(man)/d' bzip2/CMakeLists.txt
 

diff --git a/stages/20-zlib.sh b/stages/20-zlib.sh
@@ -2,7 +2,7 @@
 
 case "$TARGET" in
   *darwin*)
-    # MacOS ships zlib
+    # MacOS SDK ships zlib
     export UNSUPPORTED=1
     exit 1
     ;;
@@ -11,7 +11,10 @@ esac
 echo "Download zlib..."
 mkdir -p zlib
 
-curl_tar 'https://github.com/zlib-ng/zlib-ng/archive/refs/tags/2.1.6.tar.gz' zlib 1
+# renovate: datasource=github-releases depName=zlib-ng/zlib-ng
+_tag='2.1.6'
+
+curl_tar "https://github.com/zlib-ng/zlib-ng/archive/refs/tags/${_tag}.tar.gz" zlib 1
 
 # Patch cmake to disable armv6 assembly, it thinks we support it, but we don't
 sed -i 's/HAVE_ARMV6_INLINE_ASM OR HAVE_ARMV6_INTRIN/HAVE_ARMV6_INLINE_ASM AND HAVE_ARMV6_INTRIN/' zlib/CMakeLists.txt

diff --git a/stages/25-lcms.sh b/stages/25-lcms.sh
@@ -3,7 +3,10 @@
 echo "Download lcms..."
 mkdir -p lcms
 
-curl_tar 'https://github.com/mm2/Little-CMS/releases/download/lcms2.16/lcms2-2.16.tar.gz' lcms 1
+# renovate: datasource=github-releases depName=mm2/Little-CMS versioning=semver-coerced
+_tag='2.16'
+
+curl_tar "https://github.com/mm2/Little-CMS/releases/download/lcms${_tag}/lcms2-${_tag}.tar.gz" lcms 1
 
 case "$TARGET" in
   aarch64*)

diff --git a/stages/25-lzma.sh b/stages/25-lzma.sh
@@ -3,7 +3,10 @@
 echo "Download lzma..."
 mkdir -p lzma
 
-curl_tar 'https://github.com/tukaani-project/xz/releases/download/v5.4.6/xz-5.4.6.tar.xz' lzma 1
+# renovate: datasource=github-releases depName=tukaani-project/xz
+_tag='5.4.6'
+
+curl_tar "https://github.com/tukaani-project/xz/releases/download/v${_tag}/xz-${_tag}.tar.xz" lzma 1
 
 case "$TARGET" in
   *darwin*)

diff --git a/stages/25-ogg.sh b/stages/25-ogg.sh
@@ -3,7 +3,10 @@
 echo "Download ogg..."
 mkdir -p ogg
 
-curl_tar 'https://github.com/xiph/ogg/releases/download/v1.3.5/libogg-1.3.5.tar.gz' ogg 1
+# renovate: datasource=github-releases depName=xiph/ogg versioning=semver-coerced
+_tag='1.3.5'
+
+curl_tar "https://github.com/xiph/ogg/releases/download/v${_tag}/libogg-${_tag}.tar.gz" ogg 1
 
 # Remove some superfluous files
 rm -rf ogg/{.github,install-sh,depcomp,Makefile.in,config.sub,aclocal.m4,config.guess,ltmain.sh,m4,configure,doc}

diff --git a/stages/45-dav1d.sh b/stages/45-dav1d.sh
@@ -3,7 +3,10 @@
 echo "Download dav1d..."
 mkdir -p dav1d
 
-curl_tar 'https://github.com/videolan/dav1d/archive/refs/tags/1.3.0.tar.gz' dav1d 1
+# renovate: datasource=gitlab-releases depName=videolan/dav1d registryUrl=https://code.videolan.org
+_tag='1.4.0'
+
+curl_tar "https://code.videolan.org/videolan/dav1d/-/archive/${_tag}/dav1d-${_tag}.tar.bz2" dav1d 1
 
 sed -i "/subdir('doc')/d" dav1d/meson.build
 sed -i "/subdir('tools')/d" dav1d/meson.build

diff --git a/stages/45-vorbis.sh b/stages/45-vorbis.sh
@@ -3,7 +3,10 @@
 echo "Download vorbis..."
 mkdir -p vorbis
 
-curl_tar 'https://github.com/xiph/vorbis/releases/download/v1.3.7/libvorbis-1.3.7.tar.gz' vorbis 1
+# renovate: datasource=github-releases depName=xiph/vorbis versioning=semver-coerced
+_tag='1.3.7'
+
+curl_tar "https://github.com/xiph/vorbis/releases/download/v${_tag}/libvorbis-${_tag}.tar.gz" vorbis 1
 
 # Remove some superfluous files
 rm -rf vorbis/{.github,symbian,install-sh,depcomp,macosx,Makefile.in,config.sub,aclocal.m4,config.guess,test,examples,vq,ltmain.sh,m4,configure,doc}

diff --git a/stages/50-nvenc.sh b/stages/50-nvenc.sh
@@ -10,7 +10,10 @@ fi
 echo "Download nvenv..."
 mkdir -p nvenv
 
-curl_tar 'https://github.com/FFmpeg/nv-codec-headers/releases/download/n12.1.14.0/nv-codec-headers-12.1.14.0.tar.gz' nvenv 1
+# renovate: datasource=github-releases depName=FFmpeg/nv-codec-headers versioning=semver-coerced
+_tag='12.1.14.0'
+
+curl_tar "https://github.com/FFmpeg/nv-codec-headers/releases/download/n${_tag}/nv-codec-headers-${_tag}.tar.gz" nvenv 1
 
 # Backup source
 bak_src 'nvenv'

diff --git a/stages/50-onevpl.sh b/stages/50-onevpl.sh
@@ -10,7 +10,9 @@ esac
 echo "Download oneVPL..."
 mkdir -p oneVPL
 
-curl_tar 'https://github.com/intel/libvpl/archive/refs/tags/v2.10.1.tar.gz' oneVPL 1
+_tag='2.10.1'
+
+curl_tar "https://github.com/intel/libvpl/archive/refs/tags/v${_tag}.tar.gz" oneVPL 1
 
 sed -i '/add_subdirectory(examples)/d' oneVPL/CMakeLists.txt
 

diff --git a/stages/50-opus.sh b/stages/50-opus.sh
@@ -3,7 +3,10 @@
 echo "Download opus..."
 mkdir -p opus
 
-curl_tar 'https://github.com/xiph/opus/releases/download/v1.4/opus-1.4.tar.gz' opus 1
+# renovate: datasource=github-releases depName=xiph/opus versioning=semver-coerced
+_tag='1.4'
+
+curl_tar "https://github.com/xiph/opus/releases/download/v${_tag}/opus-${_tag}.tar.gz" opus 1
 
 # Required patch to fix meson for arm builds
 curl 'https://github.com/xiph/opus/commit/20c032d.patch' \

diff --git a/stages/50-svt-av1.sh b/stages/50-svt-av1.sh
@@ -3,7 +3,10 @@
 echo "Download svt-av1..."
 mkdir -p svt-av1
 
-curl_tar 'https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v1.8.0/SVT-AV1-v1.8.0.tar.gz' svt-av1 1
+# renovate: datasource=gitlab-releases depName=AOMediaCodec/SVT-AV1
+_tag='1.8.0'
+
+curl_tar "https://gitlab.com/AOMediaCodec/SVT-AV1/-/archive/v${_tag}/SVT-AV1-v${_tag}.tar.gz" svt-av1 1
 
 case "$TARGET" in
   x86_64*)

diff --git a/stages/50-x264.sh b/stages/50-x264.sh
@@ -3,8 +3,11 @@
 echo "Download x264..."
 mkdir -p x264
 
+# renovate: depName=https://code.videolan.org/videolan/x264.git
+_commit='4815ccadb1890572f2bf8b9d9553d56f6c9122ad'
+
 # Using master due to aarch64 improvements
-curl_tar 'https://code.videolan.org/videolan/x264/-/archive/c1962404/x264.tar.bz2' x264 1
+curl_tar "https://code.videolan.org/videolan/x264/-/archive/${_commit}/x264.tar.bz2" x264 1
 
 # Some minor fixes to x264's pkg-config
 for patch in \
@@ -56,6 +59,13 @@ env RC="$WINDRES" ./configure \
         echo '--disable-win32thread'
         ;;
     esac
+
+    case "$TARGET" in
+      aarch64-*)
+        # Required for the aarch64 assembly to be compiled correctly
+        echo '--extra-asflags=-march=armv8.2-a+sve+sve2'
+        ;;
+    esac
   ) \
   --enable-pic \
   --enable-static \

diff --git a/stages/50-x265.sh b/stages/50-x265.sh
@@ -3,8 +3,11 @@
 echo "Download x265..."
 mkdir -p x265
 
+# renovate: depName=https://bitbucket.org/multicoreware/x265_git.git
+_commit='74abf80c70a3969fca2e112691cecfb50c0c2259'
+
 # Need to use master, because the latest release doesn't support optmized aarch64 and it is from 2021
-curl_tar 'https://bitbucket.org/multicoreware/x265_git/get/ce8642f.tar.bz2' x265 1
+curl_tar "https://bitbucket.org/multicoreware/x265_git/get/${_commit}.tar.bz2" x265 1
 
 # Remove some superfluous files
 rm -rf x265/{doc,build}

diff --git a/stages/50-zimg.sh b/stages/50-zimg.sh
@@ -3,7 +3,10 @@
 echo "Download zimg..."
 mkdir -p zimg
 
-curl_tar 'https://github.com/sekrit-twc/zimg/archive/refs/tags/release-3.0.5.tar.gz' zimg 1
+# renovate: datasource=github-releases depName=sekrit-twc/zimg
+_tag='3.0.5'
+
+curl_tar "https://github.com/sekrit-twc/zimg/archive/refs/tags/release-${_tag}.tar.gz" zimg 1
 
 case "$TARGET" in
   *windows*)