diff options
| -rw-r--r-- | .SRCINFO | 16 | ||||
| -rw-r--r-- | PKGBUILD | 26 |
2 files changed, 17 insertions, 25 deletions
@@ -1,6 +1,6 @@ pkgbase = libjxl-metrics-git pkgdesc = JPEG XL image format reference implementation with butteraugli, ssimulacra, and ssimulacra2 (git version) - pkgver = 0.8.2.r404.g4e4f49c5 + pkgver = 0.10.2.r81.g680d0e38 pkgrel = 1 url = https://jpeg.org/jpegxl/ arch = x86_64 @@ -10,7 +10,6 @@ pkgbase = libjxl-metrics-git makedepends = clang makedepends = lld makedepends = giflib - makedepends = gperftools makedepends = openexr makedepends = libjpeg-turbo makedepends = python @@ -25,6 +24,7 @@ pkgbase = libjxl-metrics-git depends = gtest depends = libpng depends = lcms2 + depends = gperftools optdepends = gdk-pixbuf2: for gdk-pixbuf loader optdepends = gimp: for building gimp jxl plugin optdepends = java-environment: for building FNI Java wrapper @@ -32,13 +32,12 @@ pkgbase = libjxl-metrics-git optdepends = libavif: for avif benchmarking provides = libjxl provides = libjxl-git + provides = libjpeg-xl-git provides = libjxl.so provides = libjxl_threads.so provides = libjxl-doc - provides = libjxl.so=0.8-64 - provides = libjxl_threads.so=0.8-64 - provides = libjxl.so=0.7-64 - provides = libjxl_threads.so=0.7-64 + provides = libjxl.so=0.10-64 + provides = libjxl_threads.so=0.10-64 provides = libjxl-doc-git provides = butteraugli provides = butteraugli-git @@ -48,6 +47,7 @@ pkgbase = libjxl-metrics-git provides = ssimulacra2-git conflicts = libjxl conflicts = libjxl-git + conflicts = libjpeg-xl-git conflicts = libjxl-doc conflicts = libjxl-doc-git conflicts = butteraugli @@ -56,8 +56,10 @@ pkgbase = libjxl-metrics-git conflicts = ssimulacra-git conflicts = ssimulacra2 conflicts = ssimulacra2-git + replaces = libjxl-git + replaces = libjpeg-xl-git options = !lto - source = libjxl::git+https://github.com/libjxl/libjxl.git#commit=4e4f49c + source = libjxl::git+https://github.com/libjxl/libjxl.git source = brotli::git+https://github.com/google/brotli.git source = Little-CMS::git+https://github.com/mm2/Little-CMS.git source = googletest::git+https://github.com/google/googletest.git @@ -1,28 +1,29 @@ # Maintainer: Joshua Holmer <jholmer.in@gmail.com> pkgname=libjxl-metrics-git -pkgver=0.8.2.r404.g4e4f49c5 +pkgver=0.10.2.r81.g680d0e38 pkgrel=1 pkgdesc="JPEG XL image format reference implementation with butteraugli, ssimulacra, and ssimulacra2 (git version)" arch=('x86_64') url='https://jpeg.org/jpegxl/' license=('BSD') -depends=('brotli' 'highway-git' 'gtest' 'libpng' 'lcms2') +depends=('brotli' 'highway-git' 'gtest' 'libpng' 'lcms2' 'gperftools') makedepends=( - 'git' 'cmake' 'clang' 'lld' 'giflib' 'gperftools' 'openexr' 'libjpeg-turbo' + 'git' 'cmake' 'clang' 'lld' 'giflib' 'openexr' 'libjpeg-turbo' 'python' 'asciidoc' 'graphviz' 'xdg-utils' 'gflags' 'zlib' 'doxygen' ) provides=( - 'libjxl' 'libjxl-git' 'libjxl.so' 'libjxl_threads.so' 'libjxl-doc' - 'libjxl.so=0.8-64' 'libjxl_threads.so=0.8-64' 'libjxl.so=0.7-64' 'libjxl_threads.so=0.7-64' + 'libjxl' 'libjxl-git' 'libjpeg-xl-git' 'libjxl.so' 'libjxl_threads.so' 'libjxl-doc' + 'libjxl.so=0.10-64' 'libjxl_threads.so=0.10-64' 'libjxl-doc-git' 'butteraugli' 'butteraugli-git' 'ssimulacra' 'ssimulacra-git' 'ssimulacra2' 'ssimulacra2-git' ) conflicts=( - 'libjxl' 'libjxl-git' 'libjxl-doc' 'libjxl-doc-git' 'butteraugli' + 'libjxl' 'libjxl-git' 'libjpeg-xl-git' 'libjxl-doc' 'libjxl-doc-git' 'butteraugli' 'butteraugli-git' 'ssimulacra' 'ssimulacra-git' 'ssimulacra2' 'ssimulacra2-git' ) +replaces=('libjxl-git' 'libjpeg-xl-git') optdepends=( 'gdk-pixbuf2: for gdk-pixbuf loader' 'gimp: for building gimp jxl plugin' @@ -31,7 +32,7 @@ optdepends=( 'libavif: for avif benchmarking' ) source=( - 'libjxl::git+https://github.com/libjxl/libjxl.git#commit=4e4f49c' + 'libjxl::git+https://github.com/libjxl/libjxl.git' 'brotli::git+https://github.com/google/brotli.git' 'Little-CMS::git+https://github.com/mm2/Little-CMS.git' 'googletest::git+https://github.com/google/googletest.git' @@ -118,15 +119,4 @@ package() { # Metrics ln -s "/usr/bin/butteraugli_main" "$pkgdir/usr/bin/butteraugli" ln -s "/usr/bin/ssimulacra_main" "$pkgdir/usr/bin/ssimulacra" - - # Work around for outdated tools - # This will break in the future and needs to be kept track of - ln -s "/usr/lib/libjxl.so.0.9.0" "$pkgdir/usr/lib/libjxl.so.0.8" - ln -s "/usr/lib/libjxl.so.0.9.0" "$pkgdir/usr/lib/libjxl.so.0.8.0" - ln -s "/usr/lib/libjxl_threads.so.0.9.0" "$pkgdir/usr/lib/libjxl_threads.so.0.8" - ln -s "/usr/lib/libjxl_threads.so.0.9.0" "$pkgdir/usr/lib/libjxl_threads.so.0.8.0" - ln -s "/usr/lib/libjxl.so.0.8.0" "$pkgdir/usr/lib/libjxl.so.0.7" - ln -s "/usr/lib/libjxl.so.0.8.0" "$pkgdir/usr/lib/libjxl.so.0.7.0" - ln -s "/usr/lib/libjxl_threads.so.0.8.0" "$pkgdir/usr/lib/libjxl_threads.so.0.7" - ln -s "/usr/lib/libjxl_threads.so.0.8.0" "$pkgdir/usr/lib/libjxl_threads.so.0.7.0" } |