From 2adbc508385b6e564a3048f7dfbdebf167c0bbdc Mon Sep 17 00:00:00 2001 From: MSVSphere Packaging Team Date: Wed, 14 Feb 2024 01:49:52 +0300 Subject: [PATCH] import stb-0^20240213gitae721c5-1.el9 --- .gitignore | 2 +- .stb.metadata | 2 +- SOURCES/1561.patch | 28 ---------------------------- SPECS/stb.spec | 32 +++++++++++++++++--------------- 4 files changed, 19 insertions(+), 45 deletions(-) delete mode 100644 SOURCES/1561.patch diff --git a/.gitignore b/.gitignore index 6b205e5..f6679f9 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/stb-beebb24b945efdea3b9bba23affb8eb3ba8982e7.tar.gz +SOURCES/stb-ae721c50eaf761660b4f90cc590453cdb0c2acd0.tar.gz diff --git a/.stb.metadata b/.stb.metadata index 92ecbf7..fe426c6 100644 --- a/.stb.metadata +++ b/.stb.metadata @@ -1 +1 @@ -d0196e6258e2a58d18e06f1482743c9ddb5d3cad SOURCES/stb-beebb24b945efdea3b9bba23affb8eb3ba8982e7.tar.gz +18ae1a0bda4c97a38795672537b1e585b0c18aa4 SOURCES/stb-ae721c50eaf761660b4f90cc590453cdb0c2acd0.tar.gz diff --git a/SOURCES/1561.patch b/SOURCES/1561.patch deleted file mode 100644 index 9d9e4a7..0000000 --- a/SOURCES/1561.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 6e715778416b229799f85b49fa3ffc0400428f89 Mon Sep 17 00:00:00 2001 -From: "Jeff Roberts (LA)" -Date: Thu, 19 Oct 2023 17:42:58 -0700 -Subject: [PATCH] Fixed asan error on tiny input images - ---- - stb_image_resize2.h | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/stb_image_resize2.h b/stb_image_resize2.h -index e0c428246..1d7bed5bd 100644 ---- a/stb_image_resize2.h -+++ b/stb_image_resize2.h -@@ -1,4 +1,4 @@ --/* stb_image_resize2 - v2.01 - public domain image resizing -+/* stb_image_resize2 - v2.02 - public domain image resizing - - by Jeff Roberts (v2) and Jorge L Rodriguez - http://github.com/nothings/stb -@@ -3697,7 +3697,7 @@ static int stbir__pack_coefficients( int num_contributors, stbir__contributors* - float * coeffs = coefficents + widest * ( num_contributors - 1 ); - - // go until no chance of clipping (this is usually less than 8 lops) -- while ( ( ( contribs->n0 + widest*2 ) >= row_width ) && ( contribs >= contributors ) ) -+ while ( ( contribs >= contributors ) && ( ( contribs->n0 + widest*2 ) >= row_width ) ) - { - // might we clip?? - if ( ( contribs->n0 + widest ) > row_width ) diff --git a/SPECS/stb.spec b/SPECS/stb.spec index 879f453..4066168 100644 --- a/SPECS/stb.spec +++ b/SPECS/stb.spec @@ -1,15 +1,15 @@ ## START: Set by rpmautospec -## (rpmautospec version 0.3.5) +## (rpmautospec version 0.6.1) ## RPMAUTOSPEC: autorelease, autochangelog %define autorelease(e:s:pb:n) %{?-p:0.}%{lua: - release_number = 12; + release_number = 1; base_release_number = tonumber(rpm.expand("%{?-b*}%{!?-b:1}")); print(release_number + base_release_number - 1); }%{?-e:.%{-e*}}%{?-s:.%{-s*}}%{!?-n:%{?dist}} ## END: Set by rpmautospec -%global commit beebb24b945efdea3b9bba23affb8eb3ba8982e7 -%global snapdate 20231011 +%global commit ae721c50eaf761660b4f90cc590453cdb0c2acd0 +%global snapdate 20240213 # We choose not to package the “stb_include” library (stb_include.h) because, # during the package review, it was observed that it follows coding practices @@ -91,15 +91,6 @@ Patch: %{url}/pull/1236.patch # https://github.com/nothings/stb/pull/1547 Patch: %{url}/pull/1454.patch -# Fixed asan error on tiny input images -# https://github.com/nothings/stb/pull/1561 -# -# Fixes: -# -# stb_image_resize2.h: Address Sanitizer error -# https://github.com/nothings/stb/issues/1526 -Patch: %{url}/pull/1561.patch - # Fix integer overflow # https://github.com/nothings/stb/pull/1530 # @@ -210,9 +201,9 @@ Patch: %{url}/pull/1553.patch %global stb_easy_font_version 1.1 %global stb_herringbone_wang_tile_version 0.7 %global stb_hexwave_version 0.5 -%global stb_image_version 2.28 +%global stb_image_version 2.29 %global stb_image_resize_version 0.97 -%global stb_image_resize2_version 2.02 +%global stb_image_resize2_version 2.06 %global stb_image_write_version 1.16 %global stb_include_version 0.2 %global stb_leakcheck_version 0.6 @@ -999,6 +990,16 @@ EOF %changelog +## START: Generated by rpmautospec +* Tue Feb 13 2024 Benjamin A. Beasley - 0^20240213gitae721c5-1 +- Update to 0^20240213gitae721c5 +- stb_image_resize2-devel is updated to 2.06 + +* Tue Feb 13 2024 Benjamin A. Beasley - 0^20240208gitb7cf124-1 +- Update to 0^20240208gitb7cf124 +- stb_image-devel is updated to 2.29 +- stb_image_resize2-devel is updated to 2.05 + * Sun Jan 14 2024 Arkady L. Shane - 0^20231011gitbeebb24-12 - Rebuilt for MSVSphere 9.3 @@ -1116,3 +1117,4 @@ EOF * Mon Aug 23 2021 Benjamin A. Beasley - 0-0.1 - Initial package +## END: Generated by rpmautospec