From 607c0755d4f6476e326fb33795df7216a7bcff18 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Sun, 8 Oct 2023 00:01:40 +0100
Subject: gentoo auto-resync : 08:10:2023 - 00:01:40

---
 dev-games/irrlicht/Manifest                        |  3 +-
 .../files/irrlicht-1.8.4-drop-register.patch       | 33 +++++++++
 dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild        | 84 ----------------------
 dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild        | 84 ++++++++++++++++++++++
 4 files changed, 119 insertions(+), 85 deletions(-)
 create mode 100644 dev-games/irrlicht/files/irrlicht-1.8.4-drop-register.patch
 delete mode 100644 dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
 create mode 100644 dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild

(limited to 'dev-games/irrlicht')

diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 8d85fa056c5a..ef986922a033 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -1,5 +1,6 @@
+AUX irrlicht-1.8.4-drop-register.patch 805 BLAKE2B d44a7fb189bbc28b87606bbca95870a2d7d81da29b6d5830eb12fd03a0e21193b4cd833b6a679991fc730b38628df4c61dda9c156b10acb4d5f7068b453630a5 SHA512 67fd5e8b16f4ffcbe42246f5e65e88fe26304b19bc9ea322684b91182d5632d335906df176d6c51281be6bb7d01d7b76fdedcb6c443e47645967aa08fd87fa3a
 AUX irrlicht-1.8.4-remove-sys-sysctl.h.patch 1101 BLAKE2B 186373a614e3e15330559784eba9d56f19d915d3db7d29db1f919c10b17ef4c2242cfc0acfb6e5b3e56599a64e77171721ef4b4d5e1fe5ff1ddcc94ccf58e23a SHA512 a1a7bbc1c25ce8ddb4aefd323c420085d99463600cda2f633279cf16f97fb38094841b6b6d2f434710e16eb5b25374f51c420518567b1f855e4da37c02f85f08
 DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602
 DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1
-EBUILD irrlicht-1.8.4-r1.ebuild 2028 BLAKE2B 9f2a98f66f1691de126201e0d0a9428ba3cbdf8e18b338e1b237bb144fd03b5f2bd6e0fc5343d417bdd53eb567651e4e0d0930ae3dba9133e59a5b665898d9de SHA512 92622539cfe4b6ab85c04ea3660969553eec1f5168c2af3f668734f534b86cccd30281b62f642ebe0e711a70c8fea787fb1f5349fafa2d562f2d8deb329dd367
+EBUILD irrlicht-1.8.4-r2.ebuild 1971 BLAKE2B 10e51f96aa2e1f919d547fce46f0b3524e9a1d1bc632b85e1d20ca23a92ee7694ed4a7c8e8912bad67284de802991225d6640543f895c4c02f9fa820045717fb SHA512 71ae500554f3bf2b99438c48e9cbcae12e86f666eb547b884b5ad60976d7f4af892a0f763503e1e0e4a104d8a7f63ecac75cd92d221fc9f138635517cdd3bec9
 MISC metadata.xml 968 BLAKE2B 04b8c50136a2ec3df50c84237f890fb0863343fa6a1956f8c519e5c372b7bbe303fa0bfbe6ee87bc763af405f0eaf3baddf8f90d5d71d116aa223ab44d97c229 SHA512 cf5cc11f226ba021756e85378916a47a33f1979d76d004132fb90e3c235391542adb814ff03b9977a36a397c0b498b1a20981a70ac4fa51994304f76cc152f9e
diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-drop-register.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-drop-register.patch
new file mode 100644
index 000000000000..532b14f2503e
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.8.4-drop-register.patch
@@ -0,0 +1,33 @@
+Bug: https://bugs.gentoo.org/894764
+
+--- a/source/Irrlicht/CColorConverter.cpp
++++ b/source/Irrlicht/CColorConverter.cpp
+@@ -165,7 +165,7 @@
+ 		out += lineWidth * height;
+ 
+ 	u32 x;
+-	register u32 c;
++	u32 c;
+ 	for (u32 y=0; y < (u32) height; ++y)
+ 	{
+ 		if (flip)
+--- a/source/Irrlicht/CMY3DHelper.h
++++ b/source/Irrlicht/CMY3DHelper.h
+@@ -269,7 +269,7 @@
+     unsigned char *out_buf, int out_buf_size)
+ {
+      // we start out with 3 repeating bytes
+-     register int len = 3;
++     int len = 3;
+ 
+      unsigned char ch;
+ 
+@@ -328,7 +328,7 @@
+ //-----------------------------------------------------------
+ void flush_outbuf(unsigned char *out_buf, int out_buf_size)
+ {
+-    register int pos=0;
++    int pos=0;
+ 
+     if(!outbuf_cnt)
+        return;        // nothing to do */
diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
deleted file mode 100644
index 1cca76678df5..000000000000
--- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit toolchain-funcs
-
-DESCRIPTION="open source high performance realtime 3D engine written in C++"
-HOMEPAGE="https://irrlicht.sourceforge.io/"
-SRC_URI="mirror://sourceforge/irrlicht/${P}.zip
-	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
-
-LICENSE="ZLIB"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-IUSE="debug doc static-libs"
-
-RDEPEND="app-arch/bzip2
-	~dev-games/irrlicht-headers-${PV}
-	media-libs/libpng:0=
-	sys-libs/zlib
-	virtual/jpeg:0
-	virtual/opengl
-	x11-libs/libX11
-	x11-libs/libXxf86vm"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}/${P}/source/${PN^}
-
-PATCHES=(
-	"${WORKDIR}"/${P}-patchset/${P}-gentoo.patch
-	"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
-	"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
-	"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
-	"${FILESDIR}/${P}-remove-sys-sysctl.h.patch"
-)
-
-DOCS=( changes.txt readme.txt )
-
-src_prepare() {
-	cd "${WORKDIR}"/${P} || die
-
-	# Use system-provided Irrlicht headers
-	rm -r include || die
-	ln -s "${ESYSROOT}/usr/include/irrlicht" include || die
-
-	# Fix relative path to media directory
-	sed -i \
-		-e 's:\.\./\.\./media:../media:g' \
-		$(grep -rl '\.\./\.\./media' examples) \
-		|| die 'sed failed'
-
-	# Fix line endings so ${P}-remove-sys-sysctl.h.patch applies
-	sed -i \
-		-e 's/\r$//' \
-		source/Irrlicht/COSOperator.cpp \
-		|| die 'sed failed'
-
-	default
-}
-
-src_compile() {
-	tc-export CXX CC AR
-	emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "")
-}
-
-src_install() {
-	cd "${WORKDIR}"/${P} || die
-
-	use static-libs && dolib.a lib/Linux/libIrrlicht.a
-	dolib.so lib/Linux/libIrrlicht.so*
-
-	# create library symlinks
-	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8
-	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so
-
-	einstalldocs
-
-	# don't do these with einstalldocs because they shouldn't be compressed
-	if use doc ; then
-		dodoc -r examples media
-	fi
-}
diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild
new file mode 100644
index 000000000000..88d3925ec77c
--- /dev/null
+++ b/dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="open source high performance realtime 3D engine written in C++"
+HOMEPAGE="https://irrlicht.sourceforge.io/"
+SRC_URI="
+	mirror://sourceforge/irrlicht/${P}.zip
+	https://dev.gentoo.org/~mgorny/dist/${P}-patchset.tar.bz2"
+S="${WORKDIR}/${P}/source/${PN^}"
+
+LICENSE="ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~riscv x86"
+IUSE="debug doc"
+
+RDEPEND="
+	app-arch/bzip2
+	~dev-games/irrlicht-headers-${PV}
+	media-libs/libpng:=
+	sys-libs/zlib:=
+	media-libs/libjpeg-turbo:=
+	virtual/opengl
+	x11-libs/libX11
+	x11-libs/libXxf86vm"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto"
+BDEPEND="app-arch/unzip"
+
+PATCHES=(
+	"${WORKDIR}"/${P}-patchset/${P}-gentoo.patch
+	"${WORKDIR}"/${P}-patchset/${P}-demoMake.patch
+	"${WORKDIR}"/${P}-patchset/${P}-mesa-10.x.patch
+	"${WORKDIR}"/${P}-patchset/${P}-jpeg-9a.patch
+	"${FILESDIR}"/${P}-remove-sys-sysctl.h.patch
+	"${FILESDIR}"/${P}-drop-register.patch
+)
+
+DOCS=( changes.txt readme.txt )
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+
+	# Use system-provided Irrlicht headers
+	rm -r include || die
+	ln -s "${ESYSROOT}/usr/include/irrlicht" include || die
+
+	# Fix relative path to media directory
+	sed -i \
+		-e 's:\.\./\.\./media:../media:g' \
+		$(grep -rl '\.\./\.\./media' examples) \
+		|| die 'sed failed'
+
+	# Fix line endings so ${P}-remove-sys-sysctl.h.patch applies
+	sed -i \
+		-e 's/\r$//' \
+		source/Irrlicht/COSOperator.cpp \
+		|| die 'sed failed'
+
+	default
+}
+
+src_compile() {
+	tc-export CXX CC AR
+	emake NDEBUG=$(usev !debug 1) sharedlib
+}
+
+src_install() {
+	cd "${WORKDIR}"/${P} || die
+
+	dolib.so lib/Linux/libIrrlicht.so*
+
+	# create library symlinks
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so.1.8
+	dosym libIrrlicht.so.${PV} /usr/$(get_libdir)/libIrrlicht.so
+
+	einstalldocs
+
+	# don't do these with einstalldocs because they shouldn't be compressed
+	use doc && dodoc -r examples media
+}
-- 
cgit v1.2.3