From 96807d36b5cef22100ce85381f4a2ac351ecb336 Mon Sep 17 00:00:00 2001 From: Pablo Escobar Date: Thu, 12 Sep 2024 20:53:30 +0200 Subject: [PATCH] package/ci: Build with Basis Universal 1.50 --- package/archlinux/magnum-plugins-git/PKGBUILD | 4 ++-- package/ci/appveyor.yml | 2 +- package/ci/circleci.yml | 2 +- package/homebrew/magnum-plugins.rb | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package/archlinux/magnum-plugins-git/PKGBUILD b/package/archlinux/magnum-plugins-git/PKGBUILD index 8958b8bc8..f3ced37dc 100644 --- a/package/archlinux/magnum-plugins-git/PKGBUILD +++ b/package/archlinux/magnum-plugins-git/PKGBUILD @@ -1,7 +1,7 @@ # Author: mosra pkgname=magnum-plugins-git pkgver=2020.06.r1061.g24295477 -_basis_pkgver=1_15_update2 +_basis_pkgver=1_50_0_2 pkgrel=1 pkgdesc="Plugins for the Magnum C++11/C++14 graphics engine (Git version)" arch=('i686' 'x86_64') @@ -14,7 +14,7 @@ conflicts=('magnum-plugins') source=("git+https://github.com/mosra/magnum-plugins.git" "https://github.com/BinomialLLC/basis_universal/archive/v${_basis_pkgver}.tar.gz") sha1sums=('SKIP' - 'b9615d48ebfc62a53f333ebf8a582558a058b0e9') + '4946d685424556efb07376b97e95a4cbb3245e40') pkgver() { cd "$srcdir/${pkgname%-git}" diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index f9bf2aa1d..5a2d862ec 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -122,7 +122,7 @@ install: - IF "%TARGET%" == "desktop" IF "%APPVEYOR_BUILD_WORKER_IMAGE%" == "Visual Studio 2017" IF "%COMPILER:~0,4%" == "msvc" appveyor DownloadFile https://ci.magnum.graphics/freetype-2.10.4-windows-2016.zip && 7z x freetype-2.10.4-windows-2016.zip -o%APPVEYOR_BUILD_FOLDER%\deps # Basis Universal -- set BASIS_VERSION=1_15_update2 +- set BASIS_VERSION=1_50_0_2 - IF NOT EXIST %APPVEYOR_BUILD_FOLDER%\v%BASIS_VERSION%.zip appveyor DownloadFile https://github.com/BinomialLLC/basis_universal/archive/v%BASIS_VERSION%.zip - 7z x v%BASIS_VERSION%.zip && ren basis_universal-%BASIS_VERSION% basis_universal # We want to use the external Zstd instead of this diff --git a/package/ci/circleci.yml b/package/ci/circleci.yml index 644c94459..711128b02 100644 --- a/package/ci/circleci.yml +++ b/package/ci/circleci.yml @@ -228,7 +228,7 @@ commands: - run: name: Install Basis Universal command: | - export BASIS_VERSION=v1_15_update2 + export BASIS_VERSION=v1_50_0_2 mkdir -p $HOME/basis_universal && cd $HOME/basis_universal wget -nc https://github.com/BinomialLLC/basis_universal/archive/$BASIS_VERSION.tar.gz tar --strip-components 1 -xzf $BASIS_VERSION.tar.gz diff --git a/package/homebrew/magnum-plugins.rb b/package/homebrew/magnum-plugins.rb index e728ab316..55020596b 100644 --- a/package/homebrew/magnum-plugins.rb +++ b/package/homebrew/magnum-plugins.rb @@ -30,13 +30,13 @@ class MagnumPlugins < Formula depends_on "webp" => :recommended def install - # Bundle Basis Universal, v1_15_update2 for HEAD builds, a commit that's + # Bundle Basis Universal, v1_50_0_2 for HEAD builds, a commit that's # before the UASTC support (which was not implemented yet) on 2020.06. # The repo has massive useless files in its history, so we're downloading # just a snapshot instead of a git clone. Also, WHY THE FUCK curl needs -L # and -o?! why can't it just work?! if build.head? - system "curl", "-L", "https://github.com/BinomialLLC/basis_universal/archive/v1_15_update2.tar.gz", "-o", "src/external/basis-universal.tar.gz" + system "curl", "-L", "https://github.com/BinomialLLC/basis_universal/archive/v1_50_0_2.tar.gz", "-o", "src/external/basis-universal.tar.gz" else system "curl", "-L", "https://github.com/BinomialLLC/basis_universal/archive/2f43afcc97d0a5dafdb73b4e24e123cf9687a418.tar.gz", "-o", "src/external/basis-universal.tar.gz" end