summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO14
-rw-r--r--010-libjpeg-xl-fix-highway-build.patch12
-rw-r--r--PKGBUILD30
3 files changed, 17 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 155426ed4e5..5169de17c57 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = libjpeg-xl
pkgdesc = JPEG XL image format reference implementation
- pkgver = 0.1.1
+ pkgver = 0.2
pkgrel = 1
url = https://jpeg.org/jpegxl/
arch = x86_64
@@ -8,10 +8,10 @@ pkgbase = libjpeg-xl
makedepends = git
makedepends = cmake
makedepends = clang
+ makedepends = brotli
makedepends = gdk-pixbuf2
makedepends = giflib
makedepends = gimp
- makedepends = gperftools
makedepends = libjpeg-turbo
makedepends = libpng
makedepends = openexr
@@ -19,22 +19,21 @@ pkgbase = libjpeg-xl
makedepends = libgl
makedepends = freeglut
makedepends = gtest
+ makedepends = gmock
makedepends = python
makedepends = doxygen
makedepends = graphviz
- source = git+https://gitlab.com/wg1/jpeg-xl.git#tag=v0.1.1
+ source = git+https://gitlab.com/wg1/jpeg-xl.git#tag=v0.2
source = git+https://github.com/google/brotli.git
source = git+https://github.com/lvandeve/lodepng.git
source = git+https://github.com/mm2/Little-CMS.git
source = git+https://github.com/google/googletest
- source = git+https://github.com/google/brunsli.git
source = git+https://github.com/webmproject/sjpeg.git
source = git+https://skia.googlesource.com/skcms.git
source = git+https://github.com/veluca93/IQA-optimization.git
source = git+https://github.com/Netflix/vmaf.git
source = git+https://github.com/thorfdbg/difftest_ng.git
source = git+https://github.com/google/highway.git
- source = 010-libjpeg-xl-fix-highway-build.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
@@ -46,15 +45,12 @@ pkgbase = libjpeg-xl
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
- sha256sums = SKIP
- sha256sums = f783be03afe7094e21281097da0c727a83317dad118f15d36691f7f14163efa5
pkgname = libjpeg-xl
- depends = gcc-libs
+ depends = brotli
optdepends = gdk-pixbuf2: for gdk-pixbuf plugin
optdepends = giflib: for CLI tools
optdepends = gimp: for gimp plugin
- optdepends = gperftools: for CLI tools and gdk-pixbuf/gimp plugins
optdepends = libjpeg-turbo: for CLI tools
optdepends = libpng: for CLI tools
optdepends = openexr: for CLI tools
diff --git a/010-libjpeg-xl-fix-highway-build.patch b/010-libjpeg-xl-fix-highway-build.patch
deleted file mode 100644
index 7cccbd7071a..00000000000
--- a/010-libjpeg-xl-fix-highway-build.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/third_party/highway/CMakeLists.txt
-+++ b/third_party/highway/CMakeLists.txt
-@@ -90,6 +90,9 @@ set(HWY_FLAGS
- -Wnon-virtual-dtor
- -Woverloaded-virtual
- -Wvla
-+
-+ # Build fixes
-+ -fPIC
- )
-
- if(${CMAKE_CXX_COMPILER_ID} MATCHES "Clang")
diff --git a/PKGBUILD b/PKGBUILD
index eba235859f3..d0b4772799f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,26 @@
pkgbase=libjpeg-xl
pkgname=('libjpeg-xl' 'libjpeg-xl-doc')
-pkgver=0.1.1
+pkgver=0.2
pkgrel=1
pkgdesc='JPEG XL image format reference implementation'
arch=('x86_64')
url='https://jpeg.org/jpegxl/'
license=('Apache')
-makedepends=('git' 'cmake' 'clang' 'gdk-pixbuf2' 'giflib' 'gimp' 'gperftools'
+makedepends=('git' 'cmake' 'clang' 'brotli' 'gdk-pixbuf2' 'giflib' 'gimp'
'libjpeg-turbo' 'libpng' 'openexr' 'zlib' 'libgl' 'freeglut'
- 'gtest' 'python' 'doxygen' 'graphviz')
+ 'gtest' 'gmock' 'python' 'doxygen' 'graphviz')
source=("git+https://gitlab.com/wg1/jpeg-xl.git#tag=v${pkgver}"
'git+https://github.com/google/brotli.git'
'git+https://github.com/lvandeve/lodepng.git'
'git+https://github.com/mm2/Little-CMS.git'
'git+https://github.com/google/googletest'
- 'git+https://github.com/google/brunsli.git'
'git+https://github.com/webmproject/sjpeg.git'
'git+https://skia.googlesource.com/skcms.git'
'git+https://github.com/veluca93/IQA-optimization.git'
'git+https://github.com/Netflix/vmaf.git'
'git+https://github.com/thorfdbg/difftest_ng.git'
- 'git+https://github.com/google/highway.git'
- '010-libjpeg-xl-fix-highway-build.patch')
+ 'git+https://github.com/google/highway.git')
sha256sums=('SKIP'
'SKIP'
'SKIP'
@@ -34,9 +32,7 @@ sha256sums=('SKIP'
'SKIP'
'SKIP'
'SKIP'
- 'SKIP'
- 'SKIP'
- 'f783be03afe7094e21281097da0c727a83317dad118f15d36691f7f14163efa5')
+ 'SKIP')
prepare() {
git -C jpeg-xl submodule init
@@ -44,7 +40,6 @@ prepare() {
git -C jpeg-xl config --local submodule.third_party/lodepng.url "${srcdir}/lodepng"
git -C jpeg-xl config --local submodule.third_party/lcms.url "${srcdir}/Little-CMS"
git -C jpeg-xl config --local submodule.third_party/googletest.url "${srcdir}/googletest"
- git -C jpeg-xl config --local submodule.third_party/brunsli.url "${srcdir}/brunsli"
git -C jpeg-xl config --local submodule.third_party/sjpeg.url "${srcdir}/sjpeg"
git -C jpeg-xl config --local submodule.third_party/skcms.url "${srcdir}/skcms"
git -C jpeg-xl config --local submodule.third_party/mingw-std-threads.url "${srcdir}/mingw-std-threads"
@@ -53,7 +48,6 @@ prepare() {
git -C jpeg-xl config --local submodule.third_party/difftest_ng.url "${srcdir}/difftest_ng"
git -C jpeg-xl config --local submodule.third_party/highway.url "${srcdir}/highway"
git -C jpeg-xl submodule update
- patch -d jpeg-xl -Np1 -i "${srcdir}/010-libjpeg-xl-fix-highway-build.patch"
}
build() {
@@ -66,9 +60,10 @@ build() {
-DJPEGXL_ENABLE_FUZZERS:BOOL='false' \
-DJPEGXL_ENABLE_PLUGINS:BOOL='true' \
-DJPEGXL_ENABLE_VIEWERS:BOOL='false' \
+ -DJPEGXL_FORCE_SYSTEM_BROTLI:BOOL='true' \
+ -DJPEGXL_FORCE_SYSTEM_GTEST:BOOL='true' \
+ -DJPEGXL_FORCE_SYSTEM_HWY:BOOL='false' \
-DJPEGXL_WARNINGS_AS_ERRORS:BOOL='false' \
- -DGTEST_LIBRARY:FILEPATH='/usr/lib/libgtest.so' \
- -DGTEST_MAIN_LIBRARY:FILEPATH='/usr/lib/libgtest_main.so' \
-Wno-dev
make -C build all doc
}
@@ -78,19 +73,18 @@ check() {
}
package_libjpeg-xl() {
- depends=('gcc-libs')
+ depends=('brotli')
optdepends=('gdk-pixbuf2: for gdk-pixbuf plugin'
'giflib: for CLI tools'
'gimp: for gimp plugin'
- 'gperftools: for CLI tools and gdk-pixbuf/gimp plugins'
'libjpeg-turbo: for CLI tools'
'libpng: for CLI tools'
'openexr: for CLI tools')
make -C build DESTDIR="$pkgdir" install
install -D -m644 jpeg-xl/plugins/mime/image-jxl.xml -t "${pkgdir}/usr/share/mime/packages"
- rm "${pkgdir}/usr/lib/"{libhwy.a,pkgconfig/libhwy{,-test}.pc}
- rm -r "${pkgdir}/usr/include/hwy"
+ rm "${pkgdir}/usr/lib"/{libhwy.a,pkgconfig/libhwy{,-test}.pc}
+ rm -r "${pkgdir}/usr/include"/{contrib,hwy}
}
package_libjpeg-xl-doc() {
@@ -98,5 +92,5 @@ package_libjpeg-xl-doc() {
arch=('any')
mkdir -p "${pkgdir}/usr/share/doc"
- cp -a build/html "${pkgdir}/usr/share/doc/libjpeg-xl"
+ cp -dr --no-preserve='ownership' build/html "${pkgdir}/usr/share/doc/libjpeg-xl"
}