From a012b6933ab0dfec033206097f3dab9e1605337eca0978ecb42851e36d5ce7f8 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 22 Sep 2022 08:38:19 +0000 Subject: [PATCH 1/2] Accepting request 1005325 from home:iDesmI:Wayland - Update to release 0.7.0 OBS-URL: https://build.opensuse.org/request/show/1005325 OBS-URL: https://build.opensuse.org/package/show/graphics/libjxl?expand=0&rev=5 --- _service | 15 +++++------ libjxl-0.7.0.obscpio | 3 +++ libjxl-0.7~779.f5d6e29.tar.xz | 3 --- libjxl.changes | 50 +++++++++++++++++++++++++++++++++++ libjxl.obsinfo | 4 +++ libjxl.spec | 7 ++--- 6 files changed, 65 insertions(+), 17 deletions(-) create mode 100644 libjxl-0.7.0.obscpio delete mode 100644 libjxl-0.7~779.f5d6e29.tar.xz create mode 100644 libjxl.obsinfo diff --git a/_service b/_service index 645180c..58cd7da 100644 --- a/_service +++ b/_service @@ -1,16 +1,13 @@ - + git - https://github.com/libjxl/libjxl - main - 39cb6666eeb6031d8e1df05ab156c1f08099b618 - 0.7~@TAG_OFFSET@.%h + https://github.com/libjxl/libjxl.git + v0.7.0 + @PARENT_TAG@ + v(.*) third_party/brotli disable - - *.tar - xz - + diff --git a/libjxl-0.7.0.obscpio b/libjxl-0.7.0.obscpio new file mode 100644 index 0000000..c64518f --- /dev/null +++ b/libjxl-0.7.0.obscpio @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9b97c763cbcddbc8db83f476790f023353ce90611125475b944b94444a923ff7 +size 6144013 diff --git a/libjxl-0.7~779.f5d6e29.tar.xz b/libjxl-0.7~779.f5d6e29.tar.xz deleted file mode 100644 index fc90101..0000000 --- a/libjxl-0.7~779.f5d6e29.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:1964e366d8b674d0a94cbc78e9e6778d08632e01a3a88c1d23a86535c741114f -size 1116164 diff --git a/libjxl.changes b/libjxl.changes index 705c152..f66d240 100644 --- a/libjxl.changes +++ b/libjxl.changes @@ -1,3 +1,53 @@ +------------------------------------------------------------------- +Thu Sep 22 07:03:57 UTC 2022 - Enrico Belleri + +- Update to 0.7.0: + - Added: + - decoder API: + * ability to decode the content of metadata boxes: JXL_DEC_BOX, JXL_DEC_BOX_NEED_MORE_OUTPUT, JxlDecoderSetBoxBuffer, JxlDecoderGetBoxType, JxlDecoderGetBoxSizeRaw and JxlDecoderSetDecompressBoxes. + * ability to mark the input is finished: JxlDecoderCloseInput. + * ability to request updates on different progressive events using JxlDecoderSetProgressiveDetail; currently supported events are kDC, kLastPasses and kPasses. + * ability to specify desired intensity target using JxlDecoderSetDesiredIntensityTarget decoder API: new function JxlDecoderSetCoalesced to allow decoding non-coalesced (unblended) frames, e.g. + layers of a composite still image or the cropped frames of a recompressed GIF/APNG. + * new function JxlDecoderSetUnpremultiplyAlpha to set preference for getting an associated alpha channel with premultiplied or unpremultiplied colors. + * field added to JxlFrameHeader: a JxlLayerInfo struct that contains crop dimensions and offsets and blending information for the non-coalesced case. + * new function JxlDecoderGetExtraChannelBlendInfo to get the blending information for extra channels in the non-coalesced case. + * new function JxlDecoderSetMultithreadedImageOutCallback, allowing output callbacks to receive more information about the number of threads on which they are running. + * new function JxlDecoderSkipCurrentFrame to skip processing the current frame after a progressive detail is reached. + * new function JxlDecoderGetIntendedDownsamplingRatio to get the intended downsampling ratio of progressive steps, based on the information in the frame header. + * new function JxlDecoderSetRenderSpotcolors to allow disabling rendering of spot colors. + * add two fields to JXLBasicInfo: intrinsic_xsize and intrinsic_ysize to signal the intrinsic size. + - encoder API: + * ability to add metadata boxes, added new functions JxlEncoderAddBox, JxlEncoderUseBoxes, JxlEncoderCloseBoxes and JxlEncoderCloseFrames. + * added ability to set several encoder options / extra fields to frames using JxlEncoderSetFrameName, JxlEncoderFrameSettingsSetOption, JxlEncoderFrameSettingsSetFloatOption. + * added ability to check required codestream compatibility level and force specified using JxlEncoderGetRequiredCodestreamLevel and JxlEncoderSetCodestreamLevel. + * added ability to force emitting box-based container format using JxlEncoderUseContainer. + * added ability to store JPEG metadata for lossless reconstruction using JxlEncoderStoreJPEGMetadata encoder API: new functions JxlEncoderSetFrameHeader and JxlEncoderSetExtraChannelBlendInfo to set + animation and blending parameters of the frame, and JxlEncoderInitFrameHeader and JxlEncoderInitBlendInfo to initialize the structs to set. + * ability to encode arbitrary extra channels: JxlEncoderInitExtraChannelInfo, JxlEncoderSetExtraChannelInfo, JxlEncoderSetExtraChannelName and JxlEncoderSetExtraChannelBuffer. + * ability to plug custom CMS implementation using JxlEncoderSetCms(JxlEncoder* enc, JxlCmsInterface cms) encoder API: added JxlEncoderGetError to retrieve last encoder error. + * add two fields to JXLBasicInfo: intrinsic_xsize and intrinsic_ysize to signal the intrinsic size. + - Changed: + * decoder API: using JxlDecoderCloseInput at the end of all input is required when using JXL_DEC_BOX, and is now also encouraged in other cases, but not required in those other cases for backwards + compatibility. + * encoder API: JxlEncoderCloseInput now closes both frames and boxes input. + * CLI: cjxl and djxl have been reimplemented on the base of public decoder and encoder API; dropped dependency on gflags for argument parsing. + - Deprecated: + - decoder API: + * JXL_DEC_EXTENSIONS event: use JXL_DEC_BASIC_INFO + * pixel types JXL_TYPE_BOOLEAN and JXL_TYPE_UINT32: consider using JXL_TYPE_UINT8 and JXL_TYPE_FLOAT correspondingly. + * pixel format parameter for JxlDecoderGetColorAsEncodedProfile and JxlDecoderGetICCProfileSize: pass NULL. + * JxlDecoderDefaultPixelFormat + - encoder API: + * JxlEncoderOptions: use JxlEncoderFrameSettings instead. + * JxlEncoderOptionsCreate: use JxlEncoderFrameSettingsCreate instead. + * JxlEncoderOptionsSetDistance: use JxlEncoderSetFrameDistance instead. + * JxlEncoderOptionsSetLossless: use JxlEncoderSetFrameLossless instead. + * JxlEncoderOptionsSetEffort: use JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, effort) instead. + * JxlEncoderOptionsSetDecodingSpeed: use JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_DECODING_SPEED, tier) instead. + * deprecated JXL_ENC_NOT_SUPPORTED, the encoder returns JXL_ENC_ERROR instead and there is no need to handle JXL_ENC_NOT_SUPPORTED. + * pixel types JXL_TYPE_BOOLEAN and JXL_TYPE_UINT32: consider using JXL_TYPE_UINT8 and JXL_TYPE_FLOAT correspondingly. + ------------------------------------------------------------------- Sat Jul 23 14:33:36 UTC 2022 - Jan Engelhardt diff --git a/libjxl.obsinfo b/libjxl.obsinfo new file mode 100644 index 0000000..811dfd5 --- /dev/null +++ b/libjxl.obsinfo @@ -0,0 +1,4 @@ +name: libjxl +version: 0.7.0 +mtime: 1663763390 +commit: f95da131cf7c7ccd4da256356fde2fec1fa23bb5 diff --git a/libjxl.spec b/libjxl.spec index 4081a71..53ce7fe 100644 --- a/libjxl.spec +++ b/libjxl.spec @@ -18,15 +18,12 @@ Name: libjxl %define lname libjxl0_7 -Version: 0.7~779.f5d6e29 +Version: 0.7.0 Release: 0 Summary: JPEG XL reference implementation License: BSD-3-Clause URL: https://jpegxl.info/ - -#Git-Clone: https://github.com/libjxl/libjxl -#Source: https://github.com/libjxl/libjxl/archive/refs/tags/v%version.tar.gz -Source: %name-%version.tar.xz +Source: %{name}-%{version}.tar BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: pkg-config From 8c889da5f0803971c08fd26067fdea8b4c6b4e66c978be9d5b2c3cc03f3f7ab6 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Thu, 22 Sep 2022 10:03:17 +0000 Subject: [PATCH 2/2] standard tarball, trim changelog, require newer highway OBS-URL: https://build.opensuse.org/package/show/graphics/libjxl?expand=0&rev=6 --- _service | 13 ----------- libjxl-0.7.0.obscpio | 3 --- libjxl.changes | 55 ++++++++------------------------------------ libjxl.obsinfo | 4 ---- libjxl.spec | 7 +++--- v0.7.0.tar.gz | 3 +++ 6 files changed, 17 insertions(+), 68 deletions(-) delete mode 100644 _service delete mode 100644 libjxl-0.7.0.obscpio delete mode 100644 libjxl.obsinfo create mode 100644 v0.7.0.tar.gz diff --git a/_service b/_service deleted file mode 100644 index 58cd7da..0000000 --- a/_service +++ /dev/null @@ -1,13 +0,0 @@ - - - git - https://github.com/libjxl/libjxl.git - v0.7.0 - @PARENT_TAG@ - v(.*) - third_party/brotli - disable - - - - diff --git a/libjxl-0.7.0.obscpio b/libjxl-0.7.0.obscpio deleted file mode 100644 index c64518f..0000000 --- a/libjxl-0.7.0.obscpio +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:9b97c763cbcddbc8db83f476790f023353ce90611125475b944b94444a923ff7 -size 6144013 diff --git a/libjxl.changes b/libjxl.changes index f66d240..3b511f1 100644 --- a/libjxl.changes +++ b/libjxl.changes @@ -2,51 +2,16 @@ Thu Sep 22 07:03:57 UTC 2022 - Enrico Belleri - Update to 0.7.0: - - Added: - - decoder API: - * ability to decode the content of metadata boxes: JXL_DEC_BOX, JXL_DEC_BOX_NEED_MORE_OUTPUT, JxlDecoderSetBoxBuffer, JxlDecoderGetBoxType, JxlDecoderGetBoxSizeRaw and JxlDecoderSetDecompressBoxes. - * ability to mark the input is finished: JxlDecoderCloseInput. - * ability to request updates on different progressive events using JxlDecoderSetProgressiveDetail; currently supported events are kDC, kLastPasses and kPasses. - * ability to specify desired intensity target using JxlDecoderSetDesiredIntensityTarget decoder API: new function JxlDecoderSetCoalesced to allow decoding non-coalesced (unblended) frames, e.g. - layers of a composite still image or the cropped frames of a recompressed GIF/APNG. - * new function JxlDecoderSetUnpremultiplyAlpha to set preference for getting an associated alpha channel with premultiplied or unpremultiplied colors. - * field added to JxlFrameHeader: a JxlLayerInfo struct that contains crop dimensions and offsets and blending information for the non-coalesced case. - * new function JxlDecoderGetExtraChannelBlendInfo to get the blending information for extra channels in the non-coalesced case. - * new function JxlDecoderSetMultithreadedImageOutCallback, allowing output callbacks to receive more information about the number of threads on which they are running. - * new function JxlDecoderSkipCurrentFrame to skip processing the current frame after a progressive detail is reached. - * new function JxlDecoderGetIntendedDownsamplingRatio to get the intended downsampling ratio of progressive steps, based on the information in the frame header. - * new function JxlDecoderSetRenderSpotcolors to allow disabling rendering of spot colors. - * add two fields to JXLBasicInfo: intrinsic_xsize and intrinsic_ysize to signal the intrinsic size. - - encoder API: - * ability to add metadata boxes, added new functions JxlEncoderAddBox, JxlEncoderUseBoxes, JxlEncoderCloseBoxes and JxlEncoderCloseFrames. - * added ability to set several encoder options / extra fields to frames using JxlEncoderSetFrameName, JxlEncoderFrameSettingsSetOption, JxlEncoderFrameSettingsSetFloatOption. - * added ability to check required codestream compatibility level and force specified using JxlEncoderGetRequiredCodestreamLevel and JxlEncoderSetCodestreamLevel. - * added ability to force emitting box-based container format using JxlEncoderUseContainer. - * added ability to store JPEG metadata for lossless reconstruction using JxlEncoderStoreJPEGMetadata encoder API: new functions JxlEncoderSetFrameHeader and JxlEncoderSetExtraChannelBlendInfo to set - animation and blending parameters of the frame, and JxlEncoderInitFrameHeader and JxlEncoderInitBlendInfo to initialize the structs to set. - * ability to encode arbitrary extra channels: JxlEncoderInitExtraChannelInfo, JxlEncoderSetExtraChannelInfo, JxlEncoderSetExtraChannelName and JxlEncoderSetExtraChannelBuffer. - * ability to plug custom CMS implementation using JxlEncoderSetCms(JxlEncoder* enc, JxlCmsInterface cms) encoder API: added JxlEncoderGetError to retrieve last encoder error. - * add two fields to JXLBasicInfo: intrinsic_xsize and intrinsic_ysize to signal the intrinsic size. - - Changed: - * decoder API: using JxlDecoderCloseInput at the end of all input is required when using JXL_DEC_BOX, and is now also encouraged in other cases, but not required in those other cases for backwards - compatibility. - * encoder API: JxlEncoderCloseInput now closes both frames and boxes input. - * CLI: cjxl and djxl have been reimplemented on the base of public decoder and encoder API; dropped dependency on gflags for argument parsing. - - Deprecated: - - decoder API: - * JXL_DEC_EXTENSIONS event: use JXL_DEC_BASIC_INFO - * pixel types JXL_TYPE_BOOLEAN and JXL_TYPE_UINT32: consider using JXL_TYPE_UINT8 and JXL_TYPE_FLOAT correspondingly. - * pixel format parameter for JxlDecoderGetColorAsEncodedProfile and JxlDecoderGetICCProfileSize: pass NULL. - * JxlDecoderDefaultPixelFormat - - encoder API: - * JxlEncoderOptions: use JxlEncoderFrameSettings instead. - * JxlEncoderOptionsCreate: use JxlEncoderFrameSettingsCreate instead. - * JxlEncoderOptionsSetDistance: use JxlEncoderSetFrameDistance instead. - * JxlEncoderOptionsSetLossless: use JxlEncoderSetFrameLossless instead. - * JxlEncoderOptionsSetEffort: use JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_EFFORT, effort) instead. - * JxlEncoderOptionsSetDecodingSpeed: use JxlEncoderFrameSettingsSetOption(frame_settings, JXL_ENC_FRAME_SETTING_DECODING_SPEED, tier) instead. - * deprecated JXL_ENC_NOT_SUPPORTED, the encoder returns JXL_ENC_ERROR instead and there is no need to handle JXL_ENC_NOT_SUPPORTED. - * pixel types JXL_TYPE_BOOLEAN and JXL_TYPE_UINT32: consider using JXL_TYPE_UINT8 and JXL_TYPE_FLOAT correspondingly. + * new functions for retrieving associated alpha channel with + premultiplied or unpremultiplied colors, for blending + information for extra channels in the non-coalesced case, for + getting the intended downsampling ratio of progressive steps, + for disabling rendering of spot colors. + * Added ability to add metadata boxes, to set several encoder + options, to check required codestream compatibility level, + for force-emitting the box-based container format, to store + JPEG metadata for lossless reconstruction, to encode + arbitrary extra channels. ------------------------------------------------------------------- Sat Jul 23 14:33:36 UTC 2022 - Jan Engelhardt diff --git a/libjxl.obsinfo b/libjxl.obsinfo deleted file mode 100644 index 811dfd5..0000000 --- a/libjxl.obsinfo +++ /dev/null @@ -1,4 +0,0 @@ -name: libjxl -version: 0.7.0 -mtime: 1663763390 -commit: f95da131cf7c7ccd4da256356fde2fec1fa23bb5 diff --git a/libjxl.spec b/libjxl.spec index 53ce7fe..f37a70a 100644 --- a/libjxl.spec +++ b/libjxl.spec @@ -23,15 +23,16 @@ Release: 0 Summary: JPEG XL reference implementation License: BSD-3-Clause URL: https://jpegxl.info/ -Source: %{name}-%{version}.tar +#Git-Clone: https://github.com/libjxl/libjxl +Source: https://github.com/libjxl/libjxl/archive/refs/tags/v%version.tar.gz BuildRequires: c++_compiler BuildRequires: cmake BuildRequires: pkg-config -BuildRequires: pkgconfig(libhwy) +BuildRequires: pkgconfig(lcms2) BuildRequires: pkgconfig(libbrotlicommon) BuildRequires: pkgconfig(libbrotlidec) BuildRequires: pkgconfig(libbrotlienc) -BuildRequires: pkgconfig(lcms2) +BuildRequires: pkgconfig(libhwy) >= 1.0 %description JPEG XL is a raster-graphics file format that supports both lossy and diff --git a/v0.7.0.tar.gz b/v0.7.0.tar.gz new file mode 100644 index 0000000..deb01e7 --- /dev/null +++ b/v0.7.0.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:3114bba1fabb36f6f4adc2632717209aa6f84077bc4e93b420e0d63fa0455c5e +size 1505917