wok rev 25646
salvador: 10% speedup for shrink
author | Pascal Bellard <pascal.bellard@slitaz.org> |
---|---|
date | Sun Jan 21 10:02:07 2024 +0000 (10 months ago) |
parents | ab858238497c |
children | 70750875bc0b |
files | hubbub-dev/receipt hubbub/receipt icon-naming-utils/receipt libnsgif/receipt netsurf-sdl/receipt netsurf/receipt salvador/receipt salvador/stuff/shrink.u tango-icon-theme/receipt volumeicon/receipt |
line diff
1.1 --- a/hubbub-dev/receipt Wed Jan 17 10:58:45 2024 +0000 1.2 +++ b/hubbub-dev/receipt Sun Jan 21 10:02:07 2024 +0000 1.3 @@ -7,7 +7,7 @@ 1.4 MAINTAINER="pankso@slitaz.org" 1.5 LICENSE="MIT" 1.6 WANTED="hubbub" 1.7 -WEB_SITE="http://www.netsurf-browser.org/projects/hubbub/" 1.8 +WEB_SITE="https://www.netsurf-browser.org/projects/hubbub/" 1.9 HOST_ARCH="i486 arm" 1.10 1.11 DEPENDS="pkg-config"
2.1 --- a/hubbub/receipt Wed Jan 17 10:58:45 2024 +0000 2.2 +++ b/hubbub/receipt Sun Jan 21 10:02:07 2024 +0000 2.3 @@ -7,9 +7,9 @@ 2.4 MAINTAINER="pankso@slitaz.org" 2.5 LICENSE="MIT" 2.6 TARBALL="$PACKAGE-$VERSION.tar.bz2" 2.7 -WEB_SITE="http://www.netsurf-browser.org/projects/hubbub/" 2.8 +WEB_SITE="https://www.netsurf-browser.org/projects/hubbub/" 2.9 TARBALL="lib$PACKAGE-$VERSION-src.tar.gz" 2.10 -WGET_URL="http://download.netsurf-browser.org/libs/releases/$TARBALL" 2.11 +WGET_URL="https://download.netsurf-browser.org/libs/releases/$TARBALL" 2.12 HOST_ARCH="i486 arm" 2.13 2.14 DEPENDS="libparserutils"
3.1 --- a/icon-naming-utils/receipt Wed Jan 17 10:58:45 2024 +0000 3.2 +++ b/icon-naming-utils/receipt Sun Jan 21 10:02:07 2024 +0000 3.3 @@ -7,7 +7,7 @@ 3.4 MAINTAINER="pankso@slitaz.org" 3.5 LICENSE="GPL2" 3.6 TARBALL="$PACKAGE-$VERSION.tar.gz" 3.7 -WEB_SITE="https://tango.freedesktop.org/Tango_Icon_Library" 3.8 +WEB_SITE="https://en.wikipedia.org/wiki/Tango_Desktop_Project" 3.9 WGET_URL="https://tango.freedesktop.org/releases/$TARBALL" 3.10 3.11 DEPENDS="perl perl-xml-simple"
4.1 --- a/libnsgif/receipt Wed Jan 17 10:58:45 2024 +0000 4.2 +++ b/libnsgif/receipt Sun Jan 21 10:02:07 2024 +0000 4.3 @@ -8,7 +8,7 @@ 4.4 LICENSE="MIT" 4.5 TARBALL="$PACKAGE-$VERSION-src.tar.gz" 4.6 WEB_SITE="https://www.netsurf-browser.org/projects/libnsgif/" 4.7 -WGET_URL="http://download.netsurf-browser.org/libs/releases/$TARBALL" 4.8 +WGET_URL="https://download.netsurf-browser.org/libs/releases/$TARBALL" 4.9 HOST_ARCH="i486 arm" 4.10 4.11 # What is the latest version available today?
5.1 --- a/netsurf-sdl/receipt Wed Jan 17 10:58:45 2024 +0000 5.2 +++ b/netsurf-sdl/receipt Sun Jan 21 10:02:07 2024 +0000 5.3 @@ -11,7 +11,7 @@ 5.4 WEB_SITE="https://www.netsurf-browser.org/" 5.5 5.6 TARBALL="${PACKAGE/-sdl/}-all-$VERSION.tar.gz" 5.7 -WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL" 5.8 +WGET_URL="https://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL" 5.9 5.10 DEPENDS="expat libcrypto libcurl libidn libjpeg libpng libsdl libssl zlib" 5.11 BUILD_DEPENDS="$DEPENDS bison coreutils-multicall curl-dev expat-dev flex
6.1 --- a/netsurf/receipt Wed Jan 17 10:58:45 2024 +0000 6.2 +++ b/netsurf/receipt Sun Jan 21 10:02:07 2024 +0000 6.3 @@ -10,7 +10,7 @@ 6.4 WEB_SITE="https://www.netsurf-browser.org/" 6.5 6.6 TARBALL="$PACKAGE-all-$VERSION.tar.gz" 6.7 -WGET_URL="http://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL" 6.8 +WGET_URL="https://download.netsurf-browser.org/netsurf/releases/source-full/$TARBALL" 6.9 6.10 DEPENDS="gtk+ hubbub jpeg lcms libcss libcurl libglade libgsf libmng libnsgif 6.11 libparserutils libpng librsvg libssl libxml2 zlib"
7.1 --- a/salvador/receipt Wed Jan 17 10:58:45 2024 +0000 7.2 +++ b/salvador/receipt Sun Jan 21 10:02:07 2024 +0000 7.3 @@ -23,6 +23,7 @@ 7.4 { 7.5 sed -i 's|^CC=.*$|CC=gcc|;s|^CFLAGS=|&-std=gnu99 |' \ 7.6 Makefile 7.7 + patch -p0 < $stuff/shrink.u 7.8 make 7.9 } 7.10
8.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 8.2 +++ b/salvador/stuff/shrink.u Sun Jan 21 10:02:07 2024 +0000 8.3 @@ -0,0 +1,102 @@ 8.4 +--- src/shrink.c 8.5 ++++ src/shrink.c 8.6 +@@ -41,7 +41,9 @@ 8.7 + #define OFFSET_COST(__offset) (((__offset) <= 128) ? 8 : (7 + salvador_get_elias_size((((__offset) - 1) >> 7) + 1))) 8.8 + 8.9 + /** Costs, per length */ 8.10 +-static const char salvador_cost_for_len[8192] = { 8.11 ++static char salvador_cost_for_len[MAX_OFFSET]; 8.12 ++ 8.13 ++/** 8.14 + 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, 8.15 + 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, 8.16 + 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, 8.17 +@@ -74,7 +76,8 @@ 8.18 + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 8.19 + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 8.20 + 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 8.21 +-}; 8.22 ++ ... 8.23 ++ */ 8.24 + 8.25 + /** 8.26 + * Get the number of bits required to encode a gamma value 8.27 +@@ -84,29 +87,7 @@ 8.28 + * @return number of bits required for encoding 8.29 + */ 8.30 + static int salvador_get_elias_size(const int nValue) { 8.31 +- if (nValue >= 0 && nValue < 8192) { 8.32 +- return salvador_cost_for_len[nValue] - TOKEN_SIZE; 8.33 +- } 8.34 +- else { 8.35 +- int i = nValue; 8.36 +- int nBits = 0; 8.37 +- 8.38 +- i |= (i >> 1); 8.39 +- i |= (i >> 2); 8.40 +- i |= (i >> 4); 8.41 +- i |= (i >> 8); 8.42 +- i |= (i >> 16); 8.43 +- i = (i - (i >> 1)); 8.44 +- 8.45 +- while ((i >>= 1) > 0) { 8.46 +- nBits++; 8.47 +- nBits++; 8.48 +- } 8.49 +- 8.50 +- nBits++; 8.51 +- 8.52 +- return nBits; 8.53 +- } 8.54 ++ return salvador_cost_for_len[nValue] - TOKEN_SIZE; 8.55 + } 8.56 + 8.57 + /** 8.58 +@@ -317,10 +298,7 @@ 8.59 + * @return number of extra bits required 8.60 + */ 8.61 + static inline int salvador_get_literals_varlen_size(const int nLength) { 8.62 +- if (nLength >= 0 && nLength < 8192) 8.63 +- return salvador_cost_for_len[nLength]; 8.64 +- else 8.65 +- return TOKEN_SIZE + salvador_get_elias_size(nLength); 8.66 ++ return salvador_cost_for_len[nLength]; 8.67 + } 8.68 + 8.69 + /** 8.70 +@@ -642,7 +620,7 @@ 8.71 + 8.72 + for (k = nStartingMatchLen; k <= nMatchLen; k++) { 8.73 + salvador_arrival* pDestSlots = &cur_arrival[k * nMaxArrivalsPerPosition]; 8.74 +- const int nMatchLenCost = (k < 8192) ? salvador_cost_for_len[k - 1] : (salvador_get_match_varlen_size_norep(k) + TOKEN_SIZE /* token */); 8.75 ++ const int nMatchLenCost = salvador_cost_for_len[k - 1]; 8.76 + const int nCodingChoiceCost = nMatchLenCost + nNoRepmatchOffsetCost; 8.77 + 8.78 + if (nCodingChoiceCost < pDestSlots[nArrivalsPerPosition - 2].cost || 8.79 +@@ -716,7 +694,7 @@ 8.80 + } 8.81 + 8.82 + for (k = nStartingMatchLen; k <= (nOverallMaxRepLen < nMatchLen ? nOverallMaxRepLen : nMatchLen); k++) { 8.83 +- const int nMatchLenCost = (k < 8192) ? salvador_cost_for_len[k] : (salvador_get_match_varlen_size_rep(k) + TOKEN_SIZE /* token */); 8.84 ++ const int nMatchLenCost = salvador_cost_for_len[k]; 8.85 + salvador_arrival* pDestSlots = &cur_arrival[k * nMaxArrivalsPerPosition]; 8.86 + int nCurRepMatchArrival; 8.87 + 8.88 +@@ -1789,6 +1767,17 @@ 8.89 + static int salvador_compressor_init(salvador_compressor *pCompressor, const int nBlockSize, const int nMaxWindowSize, const size_t nMaxOffset, const int nMaxArrivals, const int nFlags) { 8.90 + int nResult; 8.91 + 8.92 ++ if (salvador_cost_for_len[1] == 0) { 8.93 ++ int i, j, k; 8.94 ++ 8.95 ++ for (i = 0, j = 0, k = 1; i < MAX_OFFSET; i++) { 8.96 ++ if (k <= i) { 8.97 ++ j = j + 2; 8.98 ++ k = k + k; 8.99 ++ } 8.100 ++ salvador_cost_for_len[i] = j; 8.101 ++ } 8.102 ++ } 8.103 + nResult = divsufsort_init(&pCompressor->divsufsort_context); 8.104 + pCompressor->intervals = NULL; 8.105 + pCompressor->pos_data = NULL;
9.1 --- a/tango-icon-theme/receipt Wed Jan 17 10:58:45 2024 +0000 9.2 +++ b/tango-icon-theme/receipt Sun Jan 21 10:02:07 2024 +0000 9.3 @@ -6,7 +6,7 @@ 9.4 SHORT_DESC="Tango Icon Theme" 9.5 MAINTAINER="al.bobylev@gmail.com" 9.6 LICENSE="PublicDomain" 9.7 -WEB_SITE="https://tango.freedesktop.org/Tango_Icon_Library" 9.8 +WEB_SITE="https://en.wikipedia.org/wiki/Tango_Desktop_Project" 9.9 TARBALL="$PACKAGE-$VERSION.tar.gz" 9.10 #WGET_URL="${WEB_SITE}releases/$TARBALL" # unavailable now 9.11 WGET_URL="http://http.debian.net/debian/pool/main/${PACKAGE:0:1}/$PACKAGE/${PACKAGE}_$VERSION.orig.tar.gz"
10.1 --- a/volumeicon/receipt Wed Jan 17 10:58:45 2024 +0000 10.2 +++ b/volumeicon/receipt Sun Jan 21 10:02:07 2024 +0000 10.3 @@ -6,10 +6,10 @@ 10.4 SHORT_DESC="A lightweight volume control for the system tray." 10.5 MAINTAINER="claudinei@slitaz.org" 10.6 LICENSE="GPL3" 10.7 -WEB_SITE="https://nullwise.com/volumeicon.html" 10.8 +WEB_SITE="https://github.com/Maato/volumeicon" 10.9 10.10 TARBALL="$PACKAGE-$VERSION.tar.gz" 10.11 -WGET_URL="https://nullwise.com/files/$PACKAGE/$TARBALL" 10.12 +WGET_URL="https://github.com/Maato/volumeicon/archive/refs/tags/$VERSION.tar.gz" 10.13 10.14 DEPENDS="alsa-lib gtk+3 libnotify" 10.15 BUILD_DEPENDS="alsa-lib-dev gtk+3-dev libnotify-dev" 10.16 @@ -19,8 +19,8 @@ 10.17 # What is the latest version available today? 10.18 current_version() 10.19 { 10.20 - wget -O - $WEB_SITE 2>/dev/null | \ 10.21 - sed "/$PACKAGE-/!d;s|.*$PACKAGE-||;s|.tar.*||;q" 10.22 + wget -O - ${WGET_URL%/arch*}/tags 2>/dev/null | \ 10.23 + sed '/tag\//!d;s|.*tag/v*||;s|".*||;q' 10.24 } 10.25 10.26 # Rules to configure and make the package.