From 9f4ab7ac8e442537ab5b2079ae45b1985bdaa3d5d3c0ddb58eb398da8ce78f42 Mon Sep 17 00:00:00 2001
From: Sergey Matveev <stargrave@stargrave.org>
Date: Fri, 26 Dec 2025 15:18:03 +0300
Subject: [PATCH] Move to higher compression archives

---
 build/distfiles/.gitignore                    |  4 +--
 build/distfiles/libtheora-1.1.1.tar.bz2.meta4 | 18 ----------
 build/distfiles/libtheora-1.1.1.tar.xz.meta4  | 16 +++++++++
 build/distfiles/libvorbis-1.3.7.tar.gz.meta4  | 18 ----------
 build/distfiles/libvorbis-1.3.7.tar.xz.meta4  | 34 +++++++++++++++++++
 build/skel/audio/libvorbis-1.3.7.do           |  4 +--
 build/skel/multimedia/libtheora-1.1.1.do      |  4 +--
 7 files changed, 56 insertions(+), 42 deletions(-)
 delete mode 100644 build/distfiles/libtheora-1.1.1.tar.bz2.meta4
 create mode 100644 build/distfiles/libtheora-1.1.1.tar.xz.meta4
 delete mode 100644 build/distfiles/libvorbis-1.3.7.tar.gz.meta4
 create mode 100644 build/distfiles/libvorbis-1.3.7.tar.xz.meta4

diff --git a/build/distfiles/.gitignore b/build/distfiles/.gitignore
index a0ff2ec..da759ac 100644
--- a/build/distfiles/.gitignore
+++ b/build/distfiles/.gitignore
@@ -148,11 +148,11 @@
 /libtap-0.1.0-44-gb53e4ef.tar.zst
 /libtap.git/
 /libtasn1-4.19.0.tar.gz
-/libtheora-1.1.1.tar.bz2
+/libtheora-1.1.1.tar.xz
 /libtool-2.4.7.tar.xz
 /libtorrent-v2.0.10-41-g2ab8fedab.tar.zst
 /libtorrent/
-/libvorbis-1.3.7.tar.gz
+/libvorbis-1.3.7.tar.xz
 /libvpx-v1.14.1-303-gd6ae3ea465.tar.zst
 /libvpx.git/
 /libwebp-1.4.0.tar.gz
diff --git a/build/distfiles/libtheora-1.1.1.tar.bz2.meta4 b/build/distfiles/libtheora-1.1.1.tar.bz2.meta4
deleted file mode 100644
index bd619f2..0000000
--- a/build/distfiles/libtheora-1.1.1.tar.bz2.meta4
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="libtheora-1.1.1.tar.bz2">
-    <hash type="blake3-256">ee3e42f3041f2343a000d981121846e828e440a20723119e947f0688f8def963</hash>
-    <hash type="blake2b-512">261655cfdb8ba38a462e4701d69a074c6d8d81fb801359059b1c2c11592fd5ab1b724652e667aa5c1f117dbbc198b7794d22a7b1c9782e2b6dabe5fb62524be8</hash>
-    <hash type="blake2b-256">a3df5a970e707c27082fc6296e1c1a3d46a8d1be24de9683631d5cf12d84c037</hash>
-    <hash type="skein-512">882e8994d0b2b60d09905c531d68d2fd4de585381eac97429d0e298d7372a97e4d0bbe61acf543d4b0f587d04b92235e05bdcdd2084202bc62c212836c70c250</hash>
-    <hash type="shake128">0df336e1c993f04566e546bfd76b839538e821041ca6f387e6c171557362a397</hash>
-    <hash type="shake256">33b13a1da3ac3f3a087533d122ccef90749cb21c888c186e4f4f89c250be9f1452c78c18aa56b4f84614e945fb3226ae9cb54d0592ff73f17371bc37d88c1769</hash>
-    <hash type="sha-512">9ab9b3af1c35d16a7d6d84f61f59ef3180132e30c27bdd7c0fa2683e0d00e2c791accbc7fd2c90718cc947d8bd10ee4a5940fb55f90f1fd7b0ed30583a47dbbd</hash>
-    <hash type="sha-256">b6ae1ee2fa3d42ac489287d3ec34c5885730b1296f0801ae577a35193d3affbc</hash>
-    <hash type="streebog-512">51b141d4725ed9576d49549a9eee919bd811665f920721f57f2890a886b55d88f2af201ad725142f8fa61e5bb87ae7aeb7fab598914f708d6937063f092c0b5b</hash>
-    <hash type="streebog-256">3f7dae3210eb596fe99096bf98b9ec7b2b23479e034f9a58a552bd1aabfe45d7</hash>
-    <hash type="xxh3-128">0b6e23fbe8648e42d43b4d19450a976a</hash>
-    <size>1903175</size>
-    <url>http://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.bz2</url>
-  </file>
-</metalink>
diff --git a/build/distfiles/libtheora-1.1.1.tar.xz.meta4 b/build/distfiles/libtheora-1.1.1.tar.xz.meta4
new file mode 100644
index 0000000..53493ae
--- /dev/null
+++ b/build/distfiles/libtheora-1.1.1.tar.xz.meta4
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="libtheora-1.1.1.tar.xz">
+    <hash type="blake3-256">f8cbc77faab47005f0891507736aa7eb846215d8b3bcba161adad30a96228545</hash>
+    <hash type="blake2b-512">f5df62c68c31537582f8a2ea64dba6b01cc056f364aa06fe905e42cc7aa8c78d7de89419dd52d586210ea29cdfdb24c2ff01e490c9b137e5d2f1845a2aa430de</hash>
+    <hash type="blake2b-256">96326973075614e76a97a85d5d83e9fb6a5b0db93e4682f5292e20afeb4e6506</hash>
+    <hash type="skein-512">beae2ac17ed2a40299f35f6621d47f6f56de2d3d3094b226b39c3d66a97dd59b31bc77e20a03ce70e314e0e4271f2fdfe3a96b8cd44d456aad3c44117b5374c9</hash>
+    <hash type="sha-512">032fb60f10ac0074ec87d5f8c586702309edc50dc0d2842d2f9b9c46ebd1500acc399e9309f858f318fff5b8fbe953234db3afb54ed74a03d0f2c6ee8c3ed481</hash>
+    <hash type="sha-256">f36da409947aa2b3dcc6af0a8c2e3144bc19db2ed547d64e9171c59c66561c61</hash>
+    <hash type="streebog-512">a21fde0c70eb4d017d24ca2f2435473f23a6dedffcdbc242fc1f3be58cab1156b8df18b89c471fb1fe9febd17938c91f4d44b133ee04c0ccbee66877dfb31d4b</hash>
+    <hash type="streebog-256">05943c7df58690c5083d8a5a6c073a0c4374e1b17517b47f3610dc32aa99fdb0</hash>
+    <hash type="xxh3-128">b73ba7f932508fb74f28dedef38d4235</hash>
+    <size>1434496</size>
+    <url>https://downloads.xiph.org/releases/theora/libtheora-1.1.1.tar.xz</url>
+  </file>
+</metalink>
diff --git a/build/distfiles/libvorbis-1.3.7.tar.gz.meta4 b/build/distfiles/libvorbis-1.3.7.tar.gz.meta4
deleted file mode 100644
index 1454a9d..0000000
--- a/build/distfiles/libvorbis-1.3.7.tar.gz.meta4
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<metalink xmlns="urn:ietf:params:xml:ns:metalink">
-  <file name="libvorbis-1.3.7.tar.gz">
-    <hash type="blake3-256">a8e88482b8d70321c8435616b0cec1a931b11445f003649774fd6940e593a254</hash>
-    <hash type="blake2b-512">59a56bae8c3509a98a6bfdf63c3b9972be648ac4b7ee1d0979c3eb95723af2a4adea4ff94fe6f6c620a39f09e4a45dc4989cebd418b08fd9b76c9f3b9aa0b914</hash>
-    <hash type="blake2b-256">d7a443c3442da330486453d2bf8c660508d17711bca70802892f27b33b1f6fdd</hash>
-    <hash type="skein-512">4d1b0cf28b74d381f21f5997986ea9f195c5cc8068d061ffe333e7bfefb99412be72dfbbb859c58c97f14223fb8321b278008045cdab44fd3d26f391e3f98214</hash>
-    <hash type="shake128">2cbbaf1c723dd977eb76d48f08ddb0e604bd4c4f6a470757b9a6a12ac5adb652</hash>
-    <hash type="shake256">45a98d70db97c93985835d00d462fef9a94486a12a8acd3612fc0edacda542478a3ab200620da8d63d341cbd0d1eb3ac913bfeda93852f079612930347ed7c21</hash>
-    <hash type="sha-512">8a83ac9e9197f32fad4430946dba3927921320492f9e96cda546e8eb3981e2664da97f77e43cb197577ec056437785168ca7c4138f8bf7f2ba93899846932eb2</hash>
-    <hash type="sha-256">0e982409a9c3fc82ee06e08205b1355e5c6aa4c36bca58146ef399621b0ce5ab</hash>
-    <hash type="streebog-512">1d888d74fc79430f26a764f444a361e8558db59539e50dc9185bf842eb58a5bf878b2235e888000844977b6b777fe90a70200d3c2ef70834ac7ef9cb27712791</hash>
-    <hash type="streebog-256">b96267db27580eb69dce7e84b36ddeac702877377dbeb3e2c4c7f2764b2428f5</hash>
-    <hash type="xxh3-128">fc701bf4dc94d64661495f32d4fb2450</hash>
-    <size>1658963</size>
-    <url>https://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.gz</url>
-  </file>
-</metalink>
diff --git a/build/distfiles/libvorbis-1.3.7.tar.xz.meta4 b/build/distfiles/libvorbis-1.3.7.tar.xz.meta4
new file mode 100644
index 0000000..11fd380
--- /dev/null
+++ b/build/distfiles/libvorbis-1.3.7.tar.xz.meta4
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<metalink xmlns="urn:ietf:params:xml:ns:metalink">
+  <file name="libvorbis-1.3.7.tar.xz">
+    <hash type="blake3-256">c67f3f74ec26d93a5571c4404a64eb6e6587d7d77b46b552f7b410f5bc5b1f03</hash>
+    <hash type="blake2b-512">849e3f1129313646471e2bb7e9beeb3766d6a121fe09984e39a353cae7dacd0a970900b0cb6f68b1d69e759515298d901fcc0cba1edb91dbc4bae4456f4bd6ea</hash>
+    <hash type="blake2b-256">535c31dc84a7f8677b1a84b5ffba7c7a02a11a7cb0950e69a6ceea4d1c7c0d01</hash>
+    <hash type="skein-512">b1f1743d9e4bd1b1e51da5174ea33410ef08baae08303b96a70c7b3b7dc813abb329a9de17531d2ee1584c2ca73b46e771eaaf16e4dcb97a0c536014054323db</hash>
+    <hash type="sha-512">bbf5f11f623d959b3ba98d6b52806521b0b918b59b867f0658c153ea1013293364eead4987e9e71f8798021379310860a2e548fcf89d10caf23d45e41aba45cd</hash>
+    <hash type="sha-256">b33cc4934322bcbf6efcbacf49e3ca01aadbea4114ec9589d1b1e9d20f72954b</hash>
+    <hash type="streebog-512">3bc4644b034a3a8126464b1fdfe3db92855ee1474af16114b7da972493f1db65018f3941e987eb0d15be3ee5a6bee7fb6acbda4026618ba9b7f1d872d0227254</hash>
+    <hash type="streebog-256">824a538bf1a094b6a946c4c9753ac9f3b6170b1b6e2e126cb5a9e23b6f113da6</hash>
+    <hash type="xxh3-128">4b8de5d8b18822fce21edaf64158b23a</hash>
+    <signature mediatype="application/pgp-signature"><![CDATA[
+-----BEGIN PGP SIGNATURE-----
+
+iQIzBAABCgAdFiEEt7AK7h+WDuoP7Wb7klmo8tLUTIQFAl8AIpkACgkQklmo8tLU
+TIRcpBAArhcRWPNa+goaPGs0pvfgRHwxGTMNKbd8PDHhDL8yXQnYEzRktgCfwcXZ
++4yd1hoLMFOd1IyBASoCaxk05lbDhGKVHZo3jhxKztxweXvdgYl/dwmZTmN/EO1K
+e3RycUYrJ18S4ujdCBxbYTVf6+0rsGL+UYo8rtHtyrKSGuwHqUEq+gtwVPS7U836
+Pbgxpin+CwElGRrZLEfh3fUTYnIjZYmlaUcplQdkZuFgSxP1t40InjmwkP+gQfSk
+kPfxoqSDH7EgVzOOl8jFxVxyHVUKYbJ4LYnP1E6of1RxOQW7QBxaUY3/i/B6XDTD
+cME7BAdr1ogXiDnasDYZzsbK+ySvtlylK6kqdvhHHfHtC1sMj/WnUniwE+I5k7IC
+yLArvQyk9okdGCw20tH2Kp3nOVXicoqgIUVQ6LoYusSjccgFYPqAqe50i1iuohRA
+W9Nj5jDd0kyf0pngBJn8y/KXThtsbPw//CIVi7amb3kkHUb8O3CJlRfO18wsmvmK
+0iBtUUp3E0rL3I7aJnZLIZAppV+yO3hbUJCiPT0YyVdh7o+RCsTV1+XIQcaBrg0V
+ThmTUggXO5keuuvu39P3OQakLarAiQcGJqpGekzeJ/q5WTxxvegeqOC0rCgDW7tY
+9md0WZ9ATOqrrDfcwp2vCLpleiPUuvrfl8ceEts6WSibqN7Gcg4=
+=ZAOg
+-----END PGP SIGNATURE-----
+]]></signature>
+    <size>1203792</size>
+    <url>http://downloads.xiph.org/releases/vorbis/libvorbis-1.3.7.tar.xz</url>
+  </file>
+</metalink>
diff --git a/build/skel/audio/libvorbis-1.3.7.do b/build/skel/audio/libvorbis-1.3.7.do
index b0405e8..20e4df8 100644
--- a/build/skel/audio/libvorbis-1.3.7.do
+++ b/build/skel/audio/libvorbis-1.3.7.do
@@ -4,12 +4,12 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
 rdeps=audio/libogg-1.3.5
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.gz $rdeps
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
 "$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
 . ./rc
-$TAR xf "$DISTFILES"/$NAME.tar.gz
+$TAR xf "$DISTFILES"/$NAME.tar.xz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
diff --git a/build/skel/multimedia/libtheora-1.1.1.do b/build/skel/multimedia/libtheora-1.1.1.do
index 0defcdc..edfb536 100644
--- a/build/skel/multimedia/libtheora-1.1.1.do
+++ b/build/skel/multimedia/libtheora-1.1.1.do
@@ -4,12 +4,12 @@ sname=$1.do . "$BASS_ROOT"/lib/rc
 
 bdeps="rc-paths stow archivers/zstd devel/pkgconf-2.1.1"
 rdeps=audio/libogg-1.3.5
-redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.bz2 $rdeps
+redo-ifchange $bdeps "$DISTFILES"/$NAME.tar.xz $rdeps
 hsh=$("$BASS_ROOT"/build/bin/cksum $BASS_REV $SPATH)
 . "$BASS_ROOT"/build/lib/create-tmp-for-build.rc
 "$BASS_ROOT"/build/bin/pkg-inst $bdeps $rdeps
 . ./rc
-$TAR xf "$DISTFILES"/$NAME.tar.bz2
+$TAR xf "$DISTFILES"/$NAME.tar.xz
 "$BASS_ROOT"/bin/rm-r "$SKELBINS"/$ARCH/$NAME-$hsh
 
 cd $NAME
-- 
2.52.0