From c8215dd8985743fad2364f4748f8366edfc04c5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 8 Jan 2024 19:57:58 +0100 Subject: [PATCH 1/6] upgpkg: ect 0.9.5-1 upstream release --- .SRCINFO | 15 +++++++++------ PKGBUILD | 47 +++++++++++++++++++++++++---------------------- 2 files changed, 34 insertions(+), 28 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 6233901..7ddd757 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,16 +1,19 @@ pkgbase = ect - pkgdesc = file compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files. - pkgver = 0.9.4 + pkgdesc = File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files + pkgver = 0.9.5 pkgrel = 1 - url = https://github.com/fhanau/Efficient-Compression-Tool - arch = i686 + url = https://github.com/fhanau/efficient-compression-tool arch = x86_64 license = Apache makedepends = nasm makedepends = git makedepends = cmake depends = gcc-libs - source = git+https://github.com/fhanau/Efficient-Compression-Tool.git#commit=503409a4de166ad1544adcb5d4e48fef308a2727 - md5sums = SKIP + source = git+https://github.com/fhanau/efficient-compression-tool.git#tag=v0.9.5 + source = git+https://github.com/glennrp/libpng.git#commit=f135775ad4e5d4408d2e12ffcc71bb36e6b48551 + source = git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49 + sha512sums = SKIP + sha512sums = SKIP + sha512sums = SKIP pkgname = ect diff --git a/PKGBUILD b/PKGBUILD index 9b16335..2a91697 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,38 +1,41 @@ +# Maintainer: Manuel Hüsers +# Contributor: Stefan Husmann # Contributor: William J. Bowman -# Maintainer: Stefan Husmann pkgname=ect -_pkgname=Efficient-Compression-Tool -pkgver=0.9.4 +_pkgname=efficient-compression-tool +pkgver=0.9.5 pkgrel=1 -pkgdesc='file compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files.' -url='https://github.com/fhanau/Efficient-Compression-Tool' -arch=('i686' 'x86_64') +pkgdesc='File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files' +url="https://github.com/fhanau/$_pkgname" +arch=('x86_64') license=('Apache') -source=("git+$url.git#commit=503409a4de166ad1544adcb5d4e48fef308a2727") -md5sums=('SKIP') depends=('gcc-libs') makedepends=('nasm' 'git' 'cmake') +source=("git+$url.git#tag=v$pkgver" + 'git+https://github.com/glennrp/libpng.git#commit=f135775ad4e5d4408d2e12ffcc71bb36e6b48551' + 'git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49') +sha512sums=('SKIP' + 'SKIP' + 'SKIP') prepare() { - cd ${_pkgname} - git submodule init - git submodule update --init --recursive --recommend-shallow + cd "$_pkgname" + git submodule init + git config submodule.lib/libpng.url "$srcdir"/src/libpng + git config submodule.lib/mozjpeg.url "$srcdir"/src/mozjpeg + git -c protocol.file.allow=always submodule update } build() { - cd ${_pkgname} - [ -d build ] || mkdir build - cd build - cmake -DECT_FOLDER_SUPPORT=off ../src - make + cmake -B build -S "$_pkgname"/src \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DCMAKE_BUILD_TYPE=Release + cmake --build build } package() { - cd ${_pkgname}/build - install -Dm755 ect "$pkgdir"/usr/bin/ect - cd "${pkgdir}"/usr/bin - - # Some things expect this to be an all-caps name - ln -s ect ECT + DESTDIR="$pkgdir" cmake --install build + # Some things expect this to be an all-caps name + ln -s ect "$pkgdir"/usr/bin/ECT } From a7f4f99432a6f2892f6b8eb9856ad64a555f6d7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 8 Jan 2024 20:54:10 +0100 Subject: [PATCH 2/6] ect: Fix submodule path --- PKGBUILD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 2a91697..9acc7cd 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -22,8 +22,8 @@ sha512sums=('SKIP' prepare() { cd "$_pkgname" git submodule init - git config submodule.lib/libpng.url "$srcdir"/src/libpng - git config submodule.lib/mozjpeg.url "$srcdir"/src/mozjpeg + git config submodule.src/libpng.url "$srcdir"/libpng + git config submodule.src/mozjpeg.url "$srcdir"/mozjpeg git -c protocol.file.allow=always submodule update } From e073d7a6eda73b2ea76dcc87da86db983985e37c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 8 Apr 2024 22:58:27 +0200 Subject: [PATCH 3/6] ect: Add sha512 checksums --- .SRCINFO | 6 +++--- PKGBUILD | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 7ddd757..eda3aaf 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -12,8 +12,8 @@ pkgbase = ect source = git+https://github.com/fhanau/efficient-compression-tool.git#tag=v0.9.5 source = git+https://github.com/glennrp/libpng.git#commit=f135775ad4e5d4408d2e12ffcc71bb36e6b48551 source = git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49 - sha512sums = SKIP - sha512sums = SKIP - sha512sums = SKIP + sha512sums = a1d0ad86aa8e6d720575daf7e833c3b787ac51595774b99b6fd4a8ece616150c2e2c174aa97a2bc0b89e16d6cd93ec0c0d657430c1a41bf08b121368af0a4abc + sha512sums = 13e286cf091b284d15888a959a8be5a90977bed92d861fd72d465199bd6112641b47d74a525d4100868d528a25921958e9ab579643b705befe48e5756ffa301f + sha512sums = 2d3f96c90cfa355797c4ebed9e5568d53f7fe7a1a225007908ea356c0a808cef856004b411b91beb2311102c3c77ea2eed37f3b8b2a9c057b8905c1d21d06383 pkgname = ect diff --git a/PKGBUILD b/PKGBUILD index 9acc7cd..9984843 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -15,9 +15,9 @@ makedepends=('nasm' 'git' 'cmake') source=("git+$url.git#tag=v$pkgver" 'git+https://github.com/glennrp/libpng.git#commit=f135775ad4e5d4408d2e12ffcc71bb36e6b48551' 'git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49') -sha512sums=('SKIP' - 'SKIP' - 'SKIP') +sha512sums=('a1d0ad86aa8e6d720575daf7e833c3b787ac51595774b99b6fd4a8ece616150c2e2c174aa97a2bc0b89e16d6cd93ec0c0d657430c1a41bf08b121368af0a4abc' + '13e286cf091b284d15888a959a8be5a90977bed92d861fd72d465199bd6112641b47d74a525d4100868d528a25921958e9ab579643b705befe48e5756ffa301f' + '2d3f96c90cfa355797c4ebed9e5568d53f7fe7a1a225007908ea356c0a808cef856004b411b91beb2311102c3c77ea2eed37f3b8b2a9c057b8905c1d21d06383') prepare() { cd "$_pkgname" From 17a645288e2f82658b8e3de1e8a940024299ac45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Sun, 21 Jul 2024 07:32:40 +0200 Subject: [PATCH 4/6] Adopt SPDX identifiers for license fields --- .SRCINFO | 2 +- PKGBUILD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index eda3aaf..e05ad1e 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -4,7 +4,7 @@ pkgbase = ect pkgrel = 1 url = https://github.com/fhanau/efficient-compression-tool arch = x86_64 - license = Apache + license = Apache-2.0 makedepends = nasm makedepends = git makedepends = cmake diff --git a/PKGBUILD b/PKGBUILD index 9984843..04fc7f9 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -9,7 +9,7 @@ pkgrel=1 pkgdesc='File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files' url="https://github.com/fhanau/$_pkgname" arch=('x86_64') -license=('Apache') +license=('Apache-2.0') depends=('gcc-libs') makedepends=('nasm' 'git' 'cmake') source=("git+$url.git#tag=v$pkgver" From 954db90b45d1b45154a0a412649d272ffdc46bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 23 Sep 2024 20:06:44 +0200 Subject: [PATCH 5/6] upgpkg: ect 0.9.5-2: fix checksum --- .SRCINFO | 4 ++-- PKGBUILD | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index e05ad1e..84109a8 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ect pkgdesc = File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files pkgver = 0.9.5 - pkgrel = 1 + pkgrel = 2 url = https://github.com/fhanau/efficient-compression-tool arch = x86_64 license = Apache-2.0 @@ -14,6 +14,6 @@ pkgbase = ect source = git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49 sha512sums = a1d0ad86aa8e6d720575daf7e833c3b787ac51595774b99b6fd4a8ece616150c2e2c174aa97a2bc0b89e16d6cd93ec0c0d657430c1a41bf08b121368af0a4abc sha512sums = 13e286cf091b284d15888a959a8be5a90977bed92d861fd72d465199bd6112641b47d74a525d4100868d528a25921958e9ab579643b705befe48e5756ffa301f - sha512sums = 2d3f96c90cfa355797c4ebed9e5568d53f7fe7a1a225007908ea356c0a808cef856004b411b91beb2311102c3c77ea2eed37f3b8b2a9c057b8905c1d21d06383 + sha512sums = 1bdd9efa8d9c49a16cf5f2135ed29dc120bc1b31eec7130802d22b3d09bf10fe337f734b39b38e422bbe6e1719aca6744d49e2b435c2cb94cbf401d89086947a pkgname = ect diff --git a/PKGBUILD b/PKGBUILD index 04fc7f9..35918cf 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ect _pkgname=efficient-compression-tool pkgver=0.9.5 -pkgrel=1 +pkgrel=2 pkgdesc='File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files' url="https://github.com/fhanau/$_pkgname" arch=('x86_64') @@ -17,7 +17,7 @@ source=("git+$url.git#tag=v$pkgver" 'git+https://github.com/fhanau/mozjpeg.git#commit=182457e3e26e1e078d5dbd09137cf04865be2e49') sha512sums=('a1d0ad86aa8e6d720575daf7e833c3b787ac51595774b99b6fd4a8ece616150c2e2c174aa97a2bc0b89e16d6cd93ec0c0d657430c1a41bf08b121368af0a4abc' '13e286cf091b284d15888a959a8be5a90977bed92d861fd72d465199bd6112641b47d74a525d4100868d528a25921958e9ab579643b705befe48e5756ffa301f' - '2d3f96c90cfa355797c4ebed9e5568d53f7fe7a1a225007908ea356c0a808cef856004b411b91beb2311102c3c77ea2eed37f3b8b2a9c057b8905c1d21d06383') + '1bdd9efa8d9c49a16cf5f2135ed29dc120bc1b31eec7130802d22b3d09bf10fe337f734b39b38e422bbe6e1719aca6744d49e2b435c2cb94cbf401d89086947a') prepare() { cd "$_pkgname" From 7ff47d01a306b0fd072ccd7573a8d1302d544cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Manuel=20H=C3=BCsers?= Date: Mon, 5 May 2025 20:22:14 +0200 Subject: [PATCH 6/6] upgpkg: ect 0.9.5-3: CMake 4 compatibility --- .SRCINFO | 2 +- PKGBUILD | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.SRCINFO b/.SRCINFO index 84109a8..9b53bc0 100644 --- a/.SRCINFO +++ b/.SRCINFO @@ -1,7 +1,7 @@ pkgbase = ect pkgdesc = File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files pkgver = 0.9.5 - pkgrel = 2 + pkgrel = 3 url = https://github.com/fhanau/efficient-compression-tool arch = x86_64 license = Apache-2.0 diff --git a/PKGBUILD b/PKGBUILD index 35918cf..adb0d79 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -5,7 +5,7 @@ pkgname=ect _pkgname=efficient-compression-tool pkgver=0.9.5 -pkgrel=2 +pkgrel=3 pkgdesc='File compressor, supports postcompression of PNG, JPEG, GZIP and ZIP files' url="https://github.com/fhanau/$_pkgname" arch=('x86_64') @@ -30,7 +30,8 @@ prepare() { build() { cmake -B build -S "$_pkgname"/src \ -DCMAKE_INSTALL_PREFIX=/usr \ - -DCMAKE_BUILD_TYPE=Release + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_POLICY_VERSION_MINIMUM=3.5 cmake --build build }