diff options
| author | Daniel Bermond | 2021-09-04 13:20:28 -0300 |
|---|---|---|
| committer | Daniel Bermond | 2021-09-04 13:20:28 -0300 |
| commit | 811c9d24d637e482327ff0d475c8226e9671ac8a (patch) | |
| tree | db2eaa3c16f3ad8e662021302e34044239143017 | |
| parent | e5c7dd6467a0045e3cd59a9e9757dd88580bf1d8 (diff) | |
| download | aur-811c9d24d637e482327ff0d475c8226e9671ac8a.tar.gz | |
Change source of jdk7 patch
| -rw-r--r-- | .SRCINFO | 6 | ||||
| -rw-r--r-- | 010-libjxl-jdk7-fix.patch | 30 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
3 files changed, 36 insertions, 6 deletions
@@ -1,7 +1,7 @@ pkgbase = libjxl pkgdesc = JPEG XL image format reference implementation pkgver = 0.5 - pkgrel = 4 + pkgrel = 5 url = https://jpeg.org/jpegxl/ arch = x86_64 license = BSD @@ -38,7 +38,7 @@ pkgbase = libjxl 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-libjxl-jdk7-fix.patch::https://github.com/libjxl/libjxl/commit/76df97ea2d7e91ceecc778d7c098dc376209ee73.patch + source = 010-libjxl-jdk7-fix.patch sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP @@ -50,7 +50,7 @@ pkgbase = libjxl sha256sums = SKIP sha256sums = SKIP sha256sums = SKIP - sha256sums = 40e22d47f073b8ccc9382451449360e01afed96ce5d80c89ff82ae8babb96303 + sha256sums = 6f912699dc070d5d2353fdc7772222929f5f8c500094b414081a186302db2a28 pkgname = libjxl depends = brotli diff --git a/010-libjxl-jdk7-fix.patch b/010-libjxl-jdk7-fix.patch new file mode 100644 index 000000000000..9bfe4148ac22 --- /dev/null +++ b/010-libjxl-jdk7-fix.patch @@ -0,0 +1,30 @@ +--- a/tools/jni/org/jpeg/jpegxl/wrapper/DecoderTest.java ++++ b/tools/jni/org/jpeg/jpegxl/wrapper/DecoderTest.java +@@ -6,7 +6,6 @@ + package org.jpeg.jpegxl.wrapper; + + import java.nio.ByteBuffer; +-import java.util.Base64; + + public class DecoderTest { + static { +@@ -25,12 +24,15 @@ + } + + private static final int SIMPLE_IMAGE_DIM = 1024; +- private static final byte[] SIMPLE_IMAGE_BYTES = +- Base64.getDecoder().decode("/wr6H0GRCAYBAGAASzgkunkeVbaSBu95EXDn0e7ABz2ShAMA"); ++ // Base64: "/wr6H0GRCAYBAGAASzgkunkeVbaSBu95EXDn0e7ABz2ShAMA" ++ private static final byte[] SIMPLE_IMAGE_BYTES = {-1, 10, -6, 31, 65, -111, 8, 6, 1, 0, 96, 0, 75, ++ 56, 36, -70, 121, 30, 85, -74, -110, 6, -17, 121, 17, 112, -25, -47, -18, -64, 7, 61, -110, ++ -124, 3, 0}; + + private static final int PIXEL_IMAGE_DIM = 1; +- private static final byte[] PIXEL_IMAGE_BYTES = +- Base64.getDecoder().decode("/woAELASCBAQABwASxLFgoUkDA=="); ++ // Base64: "/woAELASCBAQABwASxLFgoUkDA==" ++ private static final byte[] PIXEL_IMAGE_BYTES = { ++ -1, 10, 0, 16, -80, 18, 8, 16, 16, 0, 28, 0, 75, 18, -59, -126, -123, 36, 12}; + + static ByteBuffer makeByteBuffer(byte[] src, int length) { + ByteBuffer buffer = ByteBuffer.allocateDirect(length); @@ -3,7 +3,7 @@ pkgbase=libjxl pkgname=('libjxl' 'libjxl-doc') pkgver=0.5 -pkgrel=4 +pkgrel=5 pkgdesc='JPEG XL image format reference implementation' arch=('x86_64') url='https://jpeg.org/jpegxl/' @@ -23,7 +23,7 @@ source=("git+https://github.com/libjxl/libjxl.git#tag=v${pkgver}" 'git+https://github.com/Netflix/vmaf.git' 'git+https://github.com/thorfdbg/difftest_ng.git' 'git+https://github.com/google/highway.git' - '010-libjxl-jdk7-fix.patch'::'https://github.com/libjxl/libjxl/commit/76df97ea2d7e91ceecc778d7c098dc376209ee73.patch') + '010-libjxl-jdk7-fix.patch') sha256sums=('SKIP' 'SKIP' 'SKIP' @@ -35,7 +35,7 @@ sha256sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' - '40e22d47f073b8ccc9382451449360e01afed96ce5d80c89ff82ae8babb96303') + '6f912699dc070d5d2353fdc7772222929f5f8c500094b414081a186302db2a28') prepare() { git -C libjxl submodule init |