diff options
| author | Daniel Bermond | 2025-04-04 07:49:42 -0300 |
|---|---|---|
| committer | Daniel Bermond | 2025-04-04 07:49:42 -0300 |
| commit | 72d2f1aef7f1e181c8a84b6119a7c6a677f412eb (patch) | |
| tree | 27e9a6d3ae36d0ee5c19918f57f13b215d2f0047 | |
| parent | 3d2d32e775be9d7a84e6c57790cabe0849b3afea (diff) | |
| download | aur-uavs3e.tar.gz | |
Update the cmake 4.0 fix and the cmake commands
Patching all occurrences of unsupported 'cmake_minimum_required()'
is not needed. Starting at CMake 4.0, there is a new variable[1]
named 'CMAKE_POLICY_VERSION_MINIMUM' that can be externally set
exactly for the purpose of setting the policy version of projects
that are not yet updated.
[1] https://cmake.org/cmake/help/v4.0/variable/CMAKE_POLICY_VERSION_MINIMUM.html
| -rw-r--r-- | .SRCINFO | 4 | ||||
| -rw-r--r-- | 020-uavs3e-cmake4-fix.patch | 8 | ||||
| -rw-r--r-- | PKGBUILD | 49 |
3 files changed, 21 insertions, 40 deletions
@@ -1,7 +1,7 @@ pkgbase = uavs3e pkgdesc = An AVS3 encoder supporting AVS3-P2 baseline profile pkgver = 1.3 - pkgrel = 1 + pkgrel = 2 url = https://github.com/uavs3/uavs3e/ arch = x86_64 license = BSD-3-Clause @@ -10,9 +10,7 @@ pkgbase = uavs3e depends = glibc source = git+https://github.com/uavs3/uavs3e.git#tag=v1.3 source = 010-uavs3e-10bit.patch - source = 020-uavs3e-cmake4-fix.patch sha256sums = 8f0c7391751dd1b99d535e02128af545ea1f0e0d9177149615cd20741eaa8741 sha256sums = 644fc12d9f03f69c02034b06994c87fff4ebb2bdac02f98f3900ed390b95539c - sha256sums = e480b19092673839a9382ecfe6dc4d936f79dbb1a95951d8fa392f7fc3050ea9 pkgname = uavs3e diff --git a/020-uavs3e-cmake4-fix.patch b/020-uavs3e-cmake4-fix.patch deleted file mode 100644 index 08a257ecab40..000000000000 --- a/020-uavs3e-cmake4-fix.patch +++ /dev/null @@ -1,8 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -1,4 +1,4 @@ --cmake_minimum_required(VERSION 2.8) -+cmake_minimum_required(VERSION 3.5) - - project(uavs3e) - @@ -2,7 +2,7 @@ pkgname=uavs3e pkgver=1.3 -pkgrel=1 +pkgrel=2 pkgdesc='An AVS3 encoder supporting AVS3-P2 baseline profile' arch=('x86_64') url='https://github.com/uavs3/uavs3e/' @@ -10,48 +10,39 @@ license=('BSD-3-Clause') depends=('glibc') makedepends=('cmake' 'git') source=("git+https://github.com/uavs3/uavs3e.git#tag=v${pkgver}" - '010-uavs3e-10bit.patch' - '020-uavs3e-cmake4-fix.patch') + '010-uavs3e-10bit.patch') sha256sums=('8f0c7391751dd1b99d535e02128af545ea1f0e0d9177149615cd20741eaa8741' - '644fc12d9f03f69c02034b06994c87fff4ebb2bdac02f98f3900ed390b95539c' - 'e480b19092673839a9382ecfe6dc4d936f79dbb1a95951d8fa392f7fc3050ea9') + '644fc12d9f03f69c02034b06994c87fff4ebb2bdac02f98f3900ed390b95539c') prepare() { cp -a uavs3e uavs3e-10bit patch -d uavs3e-10bit -Np1 -i "${srcdir}/010-uavs3e-10bit.patch" - patch -d uavs3e-10bit -Np1 -i "${srcdir}/020-uavs3e-cmake4-fix.patch" - patch -d uavs3e -Np1 -i "${srcdir}/020-uavs3e-cmake4-fix.patch" } build() { # gcc 14 fix export CFLAGS+=' -Wno-incompatible-pointer-types -Wno-implicit-function-declaration' - cd uavs3e - cmake -B build/linux -S . \ - -DCMAKE_BUILD_TYPE:STRING='None' \ - -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ - -DCMAKE_SKIP_RPATH:BOOL='YES' \ - -DBUILD_SHARED_LIBS:BOOL='ON' \ - -DCOMPILE_10BIT='0' \ - -Wno-dev - make -C build/linux + local -a _cmake_opts=( + '-GUnix Makefiles' + '-DCMAKE_BUILD_TYPE:STRING=None' + '-DCMAKE_INSTALL_PREFIX:PATH=/usr' + '-DCMAKE_POLICY_VERSION_MINIMUM:STRING=3.5.0' + '-DCMAKE_SKIP_RPATH:BOOL=YES' + '-DBUILD_SHARED_LIBS:BOOL=ON' + '-Wno-dev') - cd "${srcdir}/uavs3e-10bit" - cmake -B build/linux -S . \ - -DCMAKE_BUILD_TYPE:STRING='None' \ - -DCMAKE_INSTALL_PREFIX:PATH='/usr' \ - -DCMAKE_SKIP_RPATH:BOOL='YES' \ - -DBUILD_SHARED_LIBS:BOOL='ON' \ - -DCOMPILE_10BIT='1' \ - -Wno-dev - make -C build/linux + cmake -B build -S uavs3e "${_cmake_opts[@]}" -DCOMPILE_10BIT='0' + cmake --build build + + cmake -B build-10bit -S uavs3e-10bit "${_cmake_opts[@]}" -DCOMPILE_10BIT='1' + cmake --build build-10bit } package() { - make -C uavs3e/build/linux DESTDIR="$pkgdir" install - make -C uavs3e-10bit/build/linux DESTDIR="$pkgdir" install - install -D -m755 uavs3e/build/linux/uavs3enc -t "${pkgdir}/usr/bin" - install -D -m755 uavs3e-10bit/build/linux/uavs3enc "${pkgdir}/usr/bin/uavs3enc-10bit" + DESTDIR="$pkgdir" cmake --install build + DESTDIR="$pkgdir" cmake --install build-10bit + install -D -m755 build/uavs3enc -t "${pkgdir}/usr/bin" + install -D -m755 build-10bit/uavs3enc "${pkgdir}/usr/bin/uavs3enc-10bit" install -D -m644 uavs3e/COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" } |