gentoo auto-resync : 13:03:2024 - 06:46:47

3 files changed, 59 insertions, 0 deletions

diff --git a/dev-libs/libx86/Manifest b/dev-libs/libx86/Manifest
index 502c0fdbf232..a1d7f2fca289 100644
--- a/dev-libs/libx86/Manifest
+++ b/dev-libs/libx86/Manifest
@@ -1,6 +1,8 @@
 AUX libx86-0.99-ifmask.patch 511 BLAKE2B 3045d7a7bf7120e3fb3f560a33723a924eed9f6fad66fd8881540d6c5f2b3234f7440338c857244af4316594a0619e6749e0895e09a849f20c188e1b7e71a099 SHA512 f716f9f24deeb3e3361c55055d15b179a0bc03983619f5eddea3a12e5c0b0a0dcb545a8f8671d8998405410f59220e1dbb1160ae00d75579da4f4182c769986b
+AUX libx86-1.1-c99.patch 426 BLAKE2B 903be70ac3c548cb7f250a35a6031dede8a1816d3d1f66539a3d830518582a2a1c981c9418ccef472c98d349a0e3a565374541cd775baf15af820386b21b48e9 SHA512 982f89166a71141106fa298e8d102dc3232c43f115da9511b30db267af95a906d878b5d45f66b3131f958d1c4f67fab34916f9928cce5659dc7e677861e2c571
 AUX libx86-1.1-makefile.patch 780 BLAKE2B 76700465271145a274232c7c8108a29bf0f1084209444017a0cab101cf6b8b9132c84505338d4ddd1acd252dc44464d551b1843d85bf537e1d46d459a090870d SHA512 2f3a9af34fd85af463a493f49b10cc1d943685601ef09088448a64d3a0d6fa1073b45ff4694ff6cf1f6f9664d299b8592000de120aed94bd53557b7e316e1645
 AUX libx86-1.1-x86emu.patch 871 BLAKE2B dbe290cb89f5dd6607c8aa0c39fa41a3f6f3abef058f7c2f18c6221ba5d3af15f68e3123ca1ea141fe89733599fc519fd1710cb335e6b0778ff27201da631eb7 SHA512 80a68aba6d4dec84ee5a39eec97916ac7e13fb5f4ab1c65bf93f8292ec94bbd33d226b8cab56cbf258ce3cce72346c843c8c8c9937a39cd2d69d03e466e7f793
 DIST libx86-1.1.tar.gz 87428 BLAKE2B cee90a446994816ce925a5b9edb3de5256f404bcadd9853ad197f13bdf4c86bf4c2def6d38e342ed9af5eba9e87400bfb76cad56852d44583b183853b65dcfff SHA512 b946555a45405a06fdf00b3e2522fc99dd7c61349c32726221aa60117a8d3da6da4b44188b1ebb208368e12b396f26055437cebcc8a0e6df10c7a006182c9280
 EBUILD libx86-1.1-r5.ebuild 958 BLAKE2B 9bc1b3ec2dfb6743af01386b1c6676b7b75e2d95787a12d1d505824859979452eac5b90049c6262e37009fc2c4c0073e3887da8b8000493748e0aeb75da3bfec SHA512 aac69bf341e4b01cf959ccb2f61feaf1f75a730cb28337c0b939447dc52f38ffad39255d86e0acfc37b5b71754d829916473ffdb4b2069b7366c1c26a56ee41f
+EBUILD libx86-1.1-r6.ebuild 990 BLAKE2B cc866396c1a085763a8f8f7ff4d4ec0a3bfb60facfe20cf3bcc0838ea95fac9ba1d5d8ce986f305af6b8a368d228618ce9e7b81f3d98e18bbc591f84d66e33fb SHA512 b1b82287053b6dccfec7c43ee834cd2b5dab7d3a400da3d4bbee676ddb24992addbf96e488072239dd14283568ce1770753d6c4d51e50cc2a5a5e8f8a3ccf9fe
 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3
diff --git a/dev-libs/libx86/files/libx86-1.1-c99.patch b/dev-libs/libx86/files/libx86-1.1-c99.patch
new file mode 100644
index 000000000000..619ecfefeb03
--- /dev/null
+++ b/dev-libs/libx86/files/libx86-1.1-c99.patch
@@ -0,0 +1,17 @@
+https://bugs.gentoo.org/880429
+https://src.fedoraproject.org/rpms/libx86/blob/rawhide/f/libx86-c99-2.patch
+--- a/thunk.c
++++ b/thunk.c
+@@ -157,10 +157,10 @@ int LRMI_init() {
+ 	X86EMU_pioFuncs pioFuncs = {
+ 		(&x_inb),
+ 		(&x_inw),
+-		(&x_inl),
++		((x86emuu32 (*)(X86EMU_pioAddr)) &x_inl),
+ 		(&x_outb),
+ 		(&x_outw),
+-		(&x_outl)
++		((void (*)(X86EMU_pioAddr,  x86emuu32)) &x_outl)
+ 	};
+ 	
+ 	X86EMU_setupPioFuncs(&pioFuncs);
diff --git a/dev-libs/libx86/libx86-1.1-r6.ebuild b/dev-libs/libx86/libx86-1.1-r6.ebuild
new file mode 100644
index 000000000000..924c7e02a2ab
--- /dev/null
+++ b/dev-libs/libx86/libx86-1.1-r6.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="A hardware-independent library for executing real-mode x86 code"
+HOMEPAGE="https://www.codon.org.uk/~mjg59/libx86/"
+SRC_URI="https://www.codon.org.uk/~mjg59/${PN}/downloads/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm -ppc -riscv -sparc ~x86"
+
+PATCHES=(
+	# fix compile failure with linux-headers-2.6.26, bug 235599
+	"${FILESDIR}"/${PN}-0.99-ifmask.patch
+	# Patch for bugs #236888 and #456648
+	"${FILESDIR}"/${P}-makefile.patch
+	# Wider arch compatibility, bug #579682
+	"${FILESDIR}"/${P}-x86emu.patch
+	"${FILESDIR}"/${P}-c99.patch
+)
+
+src_configure() {
+	tc-export AR CC
+	append-cflags -fno-delete-null-pointer-checks #523276
+}
+
+src_compile() {
+	emake $(usev !x86 BACKEND=x86emu) LIBRARY=shared shared
+}
+
+src_install() {
+	emake \
+		LIBDIR=/usr/$(get_libdir) \
+		DESTDIR="${ED}" \
+		install-header install-shared
+}