From 8c47a7c9582596939e49223efddc39284ec71e84 Mon Sep 17 00:00:00 2001
From: Ikey Doherty <ikey@serpentos.com>
Date: Thu, 21 Nov 2024 11:03:20 +0000
Subject: [PATCH] lz4: Enable 32-bit using clean meson, nuking old static cruft

Signed-off-by: Ikey Doherty <ikey@serpentos.com>
---
 l/lz4/manifest.x86_64.bin   | Bin 743 -> 1350 bytes
 l/lz4/manifest.x86_64.jsonc |  33 ++++++++++++++++++++++++++++++---
 l/lz4/stone.yaml            |  16 +++++++++++-----
 3 files changed, 41 insertions(+), 8 deletions(-)

diff --git a/l/lz4/manifest.x86_64.bin b/l/lz4/manifest.x86_64.bin
index 1d81441324bb47ad69d9539262e4e8727f15f8bd..e03923599a6f208f6744c0cf6da16263868095a9 100644
GIT binary patch
delta 880
zcmV-$1CRXY1;z>n0Bvt`00fZ+DhTAHI}YKeRM(L>Z2=ImraJ+D0So{D000000g?;%
z{9m5#?L7bh01p5G0RkwsFa2PW02K%T@=q}y0NYjrOHh+$A|KXC0U`uP_{P?`AIqbD
zRoA$tlT$}DOskTBJN_dY#sbk~y^;iAj5tjAx6|7=%vOvdGwcKEH2&xPHg1Du7$>9|
zDqc(~m7@>k(UY8iOfq-nd8lFG$I$TLUm{F3-mcPXCu^4G?BZ8l(M01sZ7I^WikG6i
z$Z?x@JI|1C=s((OqIR<*%EhUoUiaCEWtMnniL$B%4F^m9FPcchw1$C&;6viWKSfe1
zvN9BG`1j~2vtXAOHw29M0~jbkNW{zs(2T@r*uMiJeXtsTTxbAPpuB-Hpb^EJ$5+u<
zBCvwRUv(Zq7Sy>imSu+Gatz#?%<`Qc000000003K000000004kijZ-8uDYKE0000E
z00994D77#BV1fWm2mr<qH6H+(s{vP7FeePjt9HDq7M;WRZf2-7z4iLP=~aqq3Ml|B
z04xAsgB|~WlnSU~Nqq$rf-S_>e<X`YGRc=<!+)Kp$zhjn+61Gl>KEX}ANEFW&M%s*
zDt0tZksO6&DTdU$u~vD*kMl)X{zuSum3HxdlT@-XoE$w_&=aBz0=a~xd%ds1jeo;~
z|LoD(_*oi)^As^{5~p_$RElJrphVryhLNk(w8c|@R&}HG+WLbv;vbw>Rt&UQB-5~t
zXT$iPp-I*ZreT^7<}0xRVrjOSyh{TUAW*_&ya5?ty4t`T;Cv0(APU)h17QA*D=W;F
zj|wo5gM(k>3eZ^ZNDZUd<cepY3;+NC00000>;M1&00001L5Kf#Xz@SYXaE2J4FCZF
z0w}eAFa2Oa02K!S@=q`yAa|<)tM)2R!n}kOiv<uQSV?g4ssT{Vgn=1_)iDKMsp_FM
zFarKQyb1r?ys}oCtsEAl%4{x+|H*Z-Rw_tk;ZTN&6%9)*PnTU9vKoyEN4hr~7G?|$
z5B{y0-2;^&8RsTV7qeUhRoZ!?y%D6%tI^m?SyaSmoFOUtNK)izc4MvbavEkxSo43S
zYTPUqxmhU|uQo>{YZ(q^{9lnyL~<GiHvAO7U+_cx{vDR%VLgU|4gYnPCaAhnbqM&A
G#{wWm`G08u

delta 292
zcmV+<0o(q@3g-m|0Bvt`00NN)DhM(eSI|cWiv*E4Z2<_eraJ+D0PFw&000000YMc)
zO=VWvBR2p501W^E0RkwsFa2Oa02K!S@=q`y5SOa~t8!bHFe5QzLqr6L#!v#V0Iov6
z?rh2xzJ^j~r^=y~+5opMSP%ZYd1bvidoeJ_b;(o`|I_<qom`HKqLB;_BNmoooNv4I
zgDn;jPjv4#B&-;JRtx^Ix!nSl9~oySNmsL8^i=wBqP@|>&CAjFSyR+#oF575NKy3Y
zc4MvbdYolA81tW<YV52Qy;-RiFE>LXOBo7Q{AZ8N15z4NS6hg!pV~5P{WCB|18WQe
qSO0a6rsv8|bqKid2MYj!fd-sG6qU_4;FmZf5P(8J)>bf+J_QIZuXHQ`

diff --git a/l/lz4/manifest.x86_64.jsonc b/l/lz4/manifest.x86_64.jsonc
index e6009fd0..efbe55b9 100644
--- a/l/lz4/manifest.x86_64.jsonc
+++ b/l/lz4/manifest.x86_64.jsonc
@@ -28,15 +28,42 @@
 				"soname(liblz4.so.1(x86_64))"
 			]
 		},
+		"lz4-32bit": {
+			"depends": [
+				"lz4",
+				"soname(libc.so.6(386))"
+			],
+			"files": [
+				"/usr/lib32/liblz4.so.1",
+				"/usr/lib32/liblz4.so.1.10.0"
+			],
+			"name": "lz4-32bit",
+			"provides": [
+				"soname(liblz4.so.1(386))",
+				"soname(liblz4.so.1(x86))"
+			]
+		},
+		"lz4-32bit-devel": {
+			"depends": [
+				"lz4-32bit",
+				"lz4-devel"
+			],
+			"files": [
+				"/usr/lib32/liblz4.so",
+				"/usr/lib32/pkgconfig/liblz4.pc"
+			],
+			"name": "lz4-32bit-devel",
+			"provides": [
+				"pkgconfig32(liblz4)"
+			]
+		},
 		"lz4-devel": {
 			"depends": [
 				"lz4"
 			],
 			"files": [
 				"/usr/include/lz4.h",
-				"/usr/include/lz4file.h",
 				"/usr/include/lz4frame.h",
-				"/usr/include/lz4frame_static.h",
 				"/usr/include/lz4hc.h",
 				"/usr/lib/liblz4.so",
 				"/usr/lib/pkgconfig/liblz4.pc"
@@ -48,6 +75,6 @@
 		}
 	},
 	"source-name": "lz4",
-	"source-release": "2",
+	"source-release": "3",
 	"source-version": "1.10.0"
 }
diff --git a/l/lz4/stone.yaml b/l/lz4/stone.yaml
index 53d450e7..3daa3e59 100644
--- a/l/lz4/stone.yaml
+++ b/l/lz4/stone.yaml
@@ -5,7 +5,7 @@
 #
 name        : lz4
 version     : 1.10.0
-release     : 2
+release     : 3
 homepage    : https://lz4.github.io/lz4
 upstreams   :
     - https://github.com/lz4/lz4/releases/download/v1.10.0/lz4-1.10.0.tar.gz : 537512904744b35e232912055ccf8ec66d768639ff3abe5788d90d792ec5f48b
@@ -15,10 +15,16 @@ description : |
 license     :
     - BSD-2-Clause
     - GPL-2.0-or-later
+emul32      : true
+setup       : |
+    pushd build/meson
+    %meson -Dprograms=true
 build       : |
-    %make
+    pushd build/meson
+    %meson_build
 install     : |
-    %make_install PREFIX=%(prefix)
-    rm %(installroot)/%(libdir)/*.a
+    pushd build/meson
+    %meson_install
 check       : |
-    %make check
+    pushd build/meson
+    %meson_test