# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1705831327 0
# Node ID eaa4b9eff9433615a41ed3f15dfd54794969d671
# Parent  ab858238497cc983cba7c70ab861533fca58021e
salvador: 10% speedup for shrink

diff -r ab858238497c -r eaa4b9eff943 hubbub-dev/receipt
--- a/hubbub-dev/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/hubbub-dev/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 WANTED="hubbub"
-WEB_SITE="http://www.netsurf-browser.org/projects/hubbub/"
+WEB_SITE="https://www.netsurf-browser.org/projects/hubbub/"
 HOST_ARCH="i486 arm"
 
 DEPENDS="pkg-config"
diff -r ab858238497c -r eaa4b9eff943 hubbub/receipt
--- a/hubbub/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/hubbub/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -7,9 +7,9 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="MIT"
 TARBALL="$PACKAGE-$VERSION.tar.bz2"
-WEB_SITE="http://www.netsurf-browser.org/projects/hubbub/"
+WEB_SITE="https://www.netsurf-browser.org/projects/hubbub/"
 TARBALL="lib$PACKAGE-$VERSION-src.tar.gz"
-WGET_URL="http://download.netsurf-browser.org/libs/releases/$TARBALL"
+WGET_URL="https://download.netsurf-browser.org/libs/releases/$TARBALL"
 HOST_ARCH="i486 arm"
 
 DEPENDS="libparserutils"
diff -r ab858238497c -r eaa4b9eff943 icon-naming-utils/receipt
--- a/icon-naming-utils/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/icon-naming-utils/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -7,7 +7,7 @@
 MAINTAINER="pankso@slitaz.org"
 LICENSE="GPL2"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WEB_SITE="https://tango.freedesktop.org/Tango_Icon_Library"
+WEB_SITE="https://en.wikipedia.org/wiki/Tango_Desktop_Project"
 WGET_URL="https://tango.freedesktop.org/releases/$TARBALL"
 
 DEPENDS="perl perl-xml-simple"
diff -r ab858238497c -r eaa4b9eff943 libnsgif/receipt
--- a/libnsgif/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/libnsgif/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -8,7 +8,7 @@
 LICENSE="MIT"
 TARBALL="$PACKAGE-$VERSION-src.tar.gz"
 WEB_SITE="https://www.netsurf-browser.org/projects/libnsgif/"
-WGET_URL="http://download.netsurf-browser.org/libs/releases/$TARBALL"
+WGET_URL="https://download.netsurf-browser.org/libs/releases/$TARBALL"
 HOST_ARCH="i486 arm"
 
 # What is the latest version available today?
diff -r ab858238497c -r eaa4b9eff943 netsurf-sdl/receipt
--- a/netsurf-sdl/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/netsurf-sdl/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -11,7 +11,7 @@
 WEB_SITE="https://www.netsurf-browser.org/"
 
 TARBALL="${PACKAGE/-sdl/}-all-$VERSION.tar.gz"
-WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
+WGET_URL="https://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
 
 DEPENDS="expat libcrypto libcurl libidn libjpeg libpng libsdl libssl zlib"
 BUILD_DEPENDS="$DEPENDS bison coreutils-multicall curl-dev expat-dev flex 
diff -r ab858238497c -r eaa4b9eff943 netsurf/receipt
--- a/netsurf/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/netsurf/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -10,7 +10,7 @@
 WEB_SITE="https://www.netsurf-browser.org/"
 
 TARBALL="$PACKAGE-all-$VERSION.tar.gz"
-WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
+WGET_URL="https://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL"
 
 DEPENDS="gtk+ hubbub jpeg lcms libcss libcurl libglade libgsf libmng libnsgif 
 	libparserutils libpng librsvg libssl libxml2 zlib"
diff -r ab858238497c -r eaa4b9eff943 salvador/receipt
--- a/salvador/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/salvador/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -23,6 +23,7 @@
 {
 	sed -i 's|^CC=.*$|CC=gcc|;s|^CFLAGS=|&-std=gnu99 |' \
 		Makefile
+	patch -p0 < $stuff/shrink.u
 	make
 }
 
diff -r ab858238497c -r eaa4b9eff943 salvador/stuff/shrink.u
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/salvador/stuff/shrink.u	Sun Jan 21 10:02:07 2024 +0000
@@ -0,0 +1,102 @@
+--- src/shrink.c
++++ src/shrink.c
+@@ -41,7 +41,9 @@
+ #define OFFSET_COST(__offset)    (((__offset) <= 128) ? 8 : (7 + salvador_get_elias_size((((__offset) - 1) >> 7) + 1)))
+ 
+ /** Costs, per length */
+-static const char salvador_cost_for_len[8192] = {
++static char salvador_cost_for_len[MAX_OFFSET];
++
++/**
+    0, 2, 4, 4, 6, 6, 6, 6, 8, 8, 8, 8, 8, 8, 8, 8, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 10, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16, 16,
+    18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18, 18,
+    20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20,
+@@ -74,7 +76,8 @@
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+    26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26,
+-};
++   ...
++ */
+ 
+ /**
+  * Get the number of bits required to encode a gamma value
+@@ -84,29 +87,7 @@
+  * @return number of bits required for encoding
+  */
+ static int salvador_get_elias_size(const int nValue) {
+-   if (nValue >= 0 && nValue < 8192) {
+-      return salvador_cost_for_len[nValue] - TOKEN_SIZE;
+-   }
+-   else {
+-      int i = nValue;
+-      int nBits = 0;
+-
+-      i |= (i >> 1);
+-      i |= (i >> 2);
+-      i |= (i >> 4);
+-      i |= (i >> 8);
+-      i |= (i >> 16);
+-      i = (i - (i >> 1));
+-
+-      while ((i >>= 1) > 0) {
+-         nBits++;
+-         nBits++;
+-      }
+-
+-      nBits++;
+-
+-      return nBits;
+-   }
++   return salvador_cost_for_len[nValue] - TOKEN_SIZE;
+ }
+ 
+ /**
+@@ -317,10 +298,7 @@
+  * @return number of extra bits required
+  */
+ static inline int salvador_get_literals_varlen_size(const int nLength) {
+-   if (nLength >= 0 && nLength < 8192)
+-      return salvador_cost_for_len[nLength];
+-   else
+-      return TOKEN_SIZE + salvador_get_elias_size(nLength);
++   return salvador_cost_for_len[nLength];
+ }
+ 
+ /**
+@@ -642,7 +620,7 @@
+ 
+                for (k = nStartingMatchLen; k <= nMatchLen; k++) {
+                   salvador_arrival* pDestSlots = &cur_arrival[k * nMaxArrivalsPerPosition];
+-                  const int nMatchLenCost = (k < 8192) ? salvador_cost_for_len[k - 1] : (salvador_get_match_varlen_size_norep(k) + TOKEN_SIZE /* token */);
++                  const int nMatchLenCost = salvador_cost_for_len[k - 1];
+                   const int nCodingChoiceCost = nMatchLenCost + nNoRepmatchOffsetCost;
+ 
+                   if (nCodingChoiceCost < pDestSlots[nArrivalsPerPosition - 2].cost ||
+@@ -716,7 +694,7 @@
+             }
+ 
+             for (k = nStartingMatchLen; k <= (nOverallMaxRepLen < nMatchLen ? nOverallMaxRepLen : nMatchLen); k++) {
+-               const int nMatchLenCost = (k < 8192) ? salvador_cost_for_len[k] : (salvador_get_match_varlen_size_rep(k) + TOKEN_SIZE /* token */);
++               const int nMatchLenCost = salvador_cost_for_len[k];
+                salvador_arrival* pDestSlots = &cur_arrival[k * nMaxArrivalsPerPosition];
+                int nCurRepMatchArrival;
+ 
+@@ -1789,6 +1767,17 @@
+ static int salvador_compressor_init(salvador_compressor *pCompressor, const int nBlockSize, const int nMaxWindowSize, const size_t nMaxOffset, const int nMaxArrivals, const int nFlags) {
+    int nResult;
+ 
++   if (salvador_cost_for_len[1] == 0) {
++      int i, j, k;
++
++      for (i = 0, j = 0, k = 1; i < MAX_OFFSET; i++) {
++         if (k <= i) {
++            j = j + 2;
++            k = k + k;
++         }
++         salvador_cost_for_len[i] = j;
++      }
++   }
+    nResult = divsufsort_init(&pCompressor->divsufsort_context);
+    pCompressor->intervals = NULL;
+    pCompressor->pos_data = NULL;
diff -r ab858238497c -r eaa4b9eff943 tango-icon-theme/receipt
--- a/tango-icon-theme/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/tango-icon-theme/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -6,7 +6,7 @@
 SHORT_DESC="Tango Icon Theme"
 MAINTAINER="al.bobylev@gmail.com"
 LICENSE="PublicDomain"
-WEB_SITE="https://tango.freedesktop.org/Tango_Icon_Library"
+WEB_SITE="https://en.wikipedia.org/wiki/Tango_Desktop_Project"
 TARBALL="$PACKAGE-$VERSION.tar.gz"
 #WGET_URL="${WEB_SITE}releases/$TARBALL" # unavailable now
 WGET_URL="http://http.debian.net/debian/pool/main/${PACKAGE:0:1}/$PACKAGE/${PACKAGE}_$VERSION.orig.tar.gz"
diff -r ab858238497c -r eaa4b9eff943 volumeicon/receipt
--- a/volumeicon/receipt	Wed Jan 17 10:58:45 2024 +0000
+++ b/volumeicon/receipt	Sun Jan 21 10:02:07 2024 +0000
@@ -6,10 +6,10 @@
 SHORT_DESC="A lightweight volume control for the system tray."
 MAINTAINER="claudinei@slitaz.org"
 LICENSE="GPL3"
-WEB_SITE="https://nullwise.com/volumeicon.html"
+WEB_SITE="https://github.com/Maato/volumeicon"
 
 TARBALL="$PACKAGE-$VERSION.tar.gz"
-WGET_URL="https://nullwise.com/files/$PACKAGE/$TARBALL"
+WGET_URL="https://github.com/Maato/volumeicon/archive/refs/tags/$VERSION.tar.gz"
 
 DEPENDS="alsa-lib gtk+3 libnotify"
 BUILD_DEPENDS="alsa-lib-dev gtk+3-dev libnotify-dev"
@@ -19,8 +19,8 @@
 # What is the latest version available today?
 current_version()
 {
-	wget -O - $WEB_SITE 2>/dev/null | \
-	sed "/$PACKAGE-/!d;s|.*$PACKAGE-||;s|.tar.*||;q"
+	wget -O - ${WGET_URL%/arch*}/tags 2>/dev/null | \
+	sed '/tag\//!d;s|.*tag/v*||;s|".*||;q'
 }
 
 # Rules to configure and make the package.