Skip to content

Commit

Permalink
Bug 1877328 - Update libjxl to 07203da045f6b41f9b3b5b86023fd70b075137…
Browse files Browse the repository at this point in the history
…f6 r=saschanaz

Differential Revision: https://phabricator.services.mozilla.com/D199944

UltraBlame original commit: 368e382154ba1fb46b60cf04d1b6b2c8c021b057
  • Loading branch information
marco-c committed Feb 1, 2024
1 parent be8e60e commit 89c1119
Show file tree
Hide file tree
Showing 116 changed files with 6,497 additions and 19,430 deletions.
32 changes: 0 additions & 32 deletions media/libjxl/moz.build
Original file line number Diff line number Diff line change
Expand Up @@ -207,22 +207,6 @@ lib
/
jxl
/
convolve_separable7
.
cc
"
"
/
third_party
/
jpeg
-
xl
/
lib
/
jxl
/
convolve_slow
.
cc
Expand Down Expand Up @@ -575,22 +559,6 @@ lib
/
jxl
/
gauss_blur
.
cc
"
"
/
third_party
/
jpeg
-
xl
/
lib
/
jxl
/
headers
.
cc
Expand Down
10 changes: 5 additions & 5 deletions media/libjxl/moz.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -41,22 +41,22 @@ libjxl
libjxl
release
:
b26041c708d523ac53bb7d95d4f5c4a5d3b1ce30
07203da045f6b41f9b3b5b86023fd70b075137f6
(
2024
-
01
-
08T13
29T17
:
55
41
:
50Z
05Z
)
.
revision
:
b26041c708d523ac53bb7d95d4f5c4a5d3b1ce30
07203da045f6b41f9b3b5b86023fd70b075137f6
license
:
Apache
Expand Down
16 changes: 16 additions & 0 deletions third_party/jpeg-xl/AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -587,6 +587,7 @@ gmail
.
com
>
sandstrom
Sergey
Fedorov
<
Expand Down Expand Up @@ -658,6 +659,14 @@ gmail
.
com
>
Wonwoo
Choi
<
chwo9843
gmail
.
com
>
xiota
Yonatan
Nebenzhal
Expand Down Expand Up @@ -691,3 +700,10 @@ github
.
com
>
oupson
<
oupson1er
gmail
.
com
>
17 changes: 17 additions & 0 deletions third_party/jpeg-xl/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,21 @@ size
.
"
)
set
(
JPEGXL_ENABLE_WASM_TRHEADS
true
CACHE
BOOL
"
Builds
WASM
modules
with
threads
suppurt
"
)
#
Force
system
Expand Down Expand Up @@ -2126,6 +2141,8 @@ JPEGXL_STATIC
if
(
EMSCRIPTEN
AND
JPEGXL_ENABLE_WASM_TRHEADS
)
set
(
Expand Down
8 changes: 7 additions & 1 deletion third_party/jpeg-xl/deps.sh
Original file line number Diff line number Diff line change
Expand Up @@ -132,8 +132,14 @@ e5ab13008bb214deb66d5f3e17ca2f8dbff150bf
THIRD_PARTY_ZLIB
=
"
cacf7f1d4e3d44d871b605da3b647f07d718623f
51b7f2abdade71cd9bb0e7a373ef2610ec6f9daf
"
#
v1
.
3
.
1
THIRD_PARTY_LIBPNG
=
"
Expand Down
18 changes: 18 additions & 0 deletions third_party/jpeg-xl/examples/decode_oneshot.cc
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,15 @@ include
<
jxl
/
codestream_header
.
h
>
#
include
<
jxl
/
decode
.
h
Expand Down Expand Up @@ -52,6 +61,15 @@ h
#
include
<
jxl
/
types
.
h
>
#
include
<
limits
.
h
Expand Down
37 changes: 37 additions & 0 deletions third_party/jpeg-xl/examples/encode_oneshot.cc
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,24 @@ include
<
jxl
/
codestream_header
.
h
>
#
include
<
jxl
/
color_encoding
.
h
>
#
include
<
jxl
/
encode
.
h
Expand Down Expand Up @@ -37,6 +55,15 @@ h
#
include
<
jxl
/
types
.
h
>
#
include
<
limits
.
h
Expand All @@ -51,6 +78,16 @@ h
#
include
<
cstdint
>
#
include
<
cstdio
>
#
include
<
sstream
>
#
Expand Down
27 changes: 0 additions & 27 deletions third_party/jpeg-xl/lib/BUILD
Original file line number Diff line number Diff line change
Expand Up @@ -807,33 +807,6 @@ JPEGXL_ENABLE_SKCMS
=
1
"
"
JPEGXL_MAJOR_VERSION
=
"
+
str
(
libjxl_major_version
)
"
JPEGXL_MINOR_VERSION
=
"
+
str
(
libjxl_minor_version
)
"
JPEGXL_PATCH_VERSION
=
"
+
str
(
libjxl_patch_version
)
]
deps
=
Expand Down
35 changes: 12 additions & 23 deletions third_party/jpeg-xl/lib/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -936,41 +936,47 @@ endif
(
)
#
Install
For
simplicity
all
the
library
headers
from
the
both
source
and
the
generated
ones
are
#
gathered
in
the
binary
folder
.
There
#
is
no
distinction
on
which
libraries
use
#
which
header
since
it
is
expected
#
that
all
developer
libraries
are
available
#
together
at
build
Expand All @@ -980,23 +986,6 @@ install
(
DIRECTORY
{
CMAKE_CURRENT_SOURCE_DIR
}
/
include
/
jxl
DESTINATION
"
{
CMAKE_INSTALL_INCLUDEDIR
}
"
)
install
(
DIRECTORY
{
CMAKE_CURRENT_BINARY_DIR
}
/
Expand Down
Loading

0 comments on commit 89c1119

Please sign in to comment.