[gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
commit: c0b729c45e1864c6181aa3a077db47a5f68c344a Author: Brahmajit Das gmail com> AuthorDate: Sat Oct 7 19:04:26 2023 + Commit: David Seifert gentoo org> CommitDate: Sat Oct 7 19:04:26 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0b729c4 dev-games/irrlicht: Fix C++17 does not allow register storage class * also update EAPI 7 -> 8 Closes: https://github.com/gentoo/gentoo/pull/33236 Closes: https://bugs.gentoo.org/894764 Signed-off-by: Brahmajit Das gmail.com> Signed-off-by: David Seifert gentoo.org> .../files/irrlicht-1.8.4-drop-register.patch | 33 ++ ...ht-1.8.4-r1.ebuild => irrlicht-1.8.4-r2.ebuild} | 32 ++--- 2 files changed, 49 insertions(+), 16 deletions(-) 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 ..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-r2.ebuild similarity index 77% rename from dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild rename to dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild index 1cca76678df5..88d3925ec77c 100644 --- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild +++ b/dev-games/irrlicht/irrlicht-1.8.4-r2.ebuild @@ -1,24 +1,28 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +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 +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 static-libs" +IUSE="debug doc" -RDEPEND="app-arch/bzip2 +RDEPEND=" + app-arch/bzip2 ~dev-games/irrlicht-headers-${PV} - media-libs/libpng:0= - sys-libs/zlib - virtual/jpeg:0 + media-libs/libpng:= + sys-libs/zlib:= + media-libs/libjpeg-turbo:= virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm" @@ -26,14 +30,13 @@ 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" + "${FILESDIR}"/${P}-remove-sys-sysctl.h.patch + "${FILESDIR}"/${P}-drop-register.patch ) DOCS=( changes.txt readme.txt ) @@ -62,13 +65,12 @@ src_prepare() { src_compile() { tc-export CXX CC AR - emake NDEBUG=$(usex debug "" "1") sharedlib $(usex static-libs "staticlib" "") + emake NDEBUG=$(usev !debug 1) sharedlib } src_install() { cd "${WORKDIR}"/${P} || die - use static-libs && dolib.a lib/Linux/libIrrlicht.a dolib.so lib/Linux/libIrrlicht.so* # create library symlinks @@ -78,7 +80,5 @@ src_install() { einstalldocs # don't do these with einstalldocs because they shouldn't be compressed - if use doc ; then - dodoc -r examples media - fi + use doc && dodoc -r examples media }
[gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
commit: d898cc0eff0b92fb6ab034dcfc0a9b50dee2d59d Author: William Breathitt Gray gmail com> AuthorDate: Sat Sep 5 13:28:29 2020 + Commit: Joonas Niilola gentoo org> CommitDate: Sun Sep 6 05:55:17 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d898cc0e dev-games/irrlicht: Add patch to remove sys/sysctl.h include Closes: https://bugs.gentoo.org/736342 Signed-off-by: William Breathitt Gray gmail.com> Closes: https://github.com/gentoo/gentoo/pull/17426 Signed-off-by: Joonas Niilola gentoo.org> .../files/irrlicht-1.8.4-remove-sys-sysctl.h.patch | 38 ++ dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild| 1 + 2 files changed, 39 insertions(+) diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch new file mode 100644 index 000..2e5fc63e6f8 --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-remove-sys-sysctl.h.patch @@ -0,0 +1,38 @@ +From 5382142d37730f6758753b758c91e257ffd5892c Mon Sep 17 00:00:00 2001 +From: Romain Naour +Date: Sun, 9 Apr 2017 22:20:19 +0200 +Subject: [PATCH] remove sys/sysctl.h + +With musl irrlicht doesn't build due to missing sys/sysctl.h + +fatal error: sys/sysctl.h: No such file or directory + +From [1] +"sysctl does not work, and NEVER worked. using it is bogus. +it was a bogus experimental syscall that was deprecated before +it was ever used (basically, a broken binary version of +/proc/sys, without any stability between kernel versions for +what the binary constants meant)." + +[1] https://devsonacid.wordpress.com/tag/musl/ + +Signed-off-by: Romain Naour +--- + source/Irrlicht/COSOperator.cpp | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp +index 0899d1d..ccf5ef5 100644 +--- a/source/Irrlicht/COSOperator.cpp b/source/Irrlicht/COSOperator.cpp +@@ -13,7 +13,6 @@ + #include + #ifndef _IRR_SOLARIS_PLATFORM_ + #include +-#include + #endif + #endif + +-- +2.9.3 + diff --git a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild index 938b141e5e0..8a74c20ddcf 100644 --- a/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild +++ b/dev-games/irrlicht/irrlicht-1.8.4-r1.ebuild @@ -33,6 +33,7 @@ PATCHES=( "${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 )
[gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
commit: 24918749d0774c6acdfbbf5c5678bf44623a03dd Author: Michał Górny gentoo org> AuthorDate: Fri Dec 8 18:24:47 2017 + Commit: Michał Górny gentoo org> CommitDate: Fri Dec 8 18:47:11 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24918749 dev-games/irrlicht: [QA] Move patches to distfiles Closes: https://bugs.gentoo.org/620552 dev-games/irrlicht/Manifest| 6 +- .../irrlicht/files/irrlicht-1.8.1-config.patch | 29 - .../irrlicht/files/irrlicht-1.8.1-demoMake.patch | 764 - .../irrlicht/files/irrlicht-1.8.1-gentoo.patch | 46 -- .../irrlicht/files/irrlicht-1.8.1-jpeg-9a.patch| 15 - .../irrlicht/files/irrlicht-1.8.1-mesa-10.x.patch | 40 -- .../irrlicht/files/irrlicht-1.8.4-config.patch | 29 - .../irrlicht/files/irrlicht-1.8.4-demoMake.patch | 764 - .../irrlicht/files/irrlicht-1.8.4-gentoo.patch | 46 -- .../irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch| 15 - .../irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch | 40 -- dev-games/irrlicht/irrlicht-1.8.1-r1.ebuild| 15 +- dev-games/irrlicht/irrlicht-1.8.4.ebuild | 13 +- 13 files changed, 19 insertions(+), 1803 deletions(-) diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest index cfe019b0f8f..c445c75f669 100644 --- a/dev-games/irrlicht/Manifest +++ b/dev-games/irrlicht/Manifest @@ -1,2 +1,4 @@ -DIST irrlicht-1.8.1.zip 24167632 SHA256 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb WHIRLPOOL c66f0a15575327667cbe82c79919518771e55d5e919c972e64e104a6272b78a20bbb7bbba864722dead4248fb43dd77181d696eb63e82b4093aaadac132b -DIST irrlicht-1.8.4.zip 27927144 SHA256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 WHIRLPOOL a5fecbd27968fbd4a5b17b9528388ec0870d1c3ceb85e36bbab40ce30aa61c7f2f387df160808dbaafa4488abeaf238c7cf93994b380a1b2c3a8a5c421949be1 +DIST irrlicht-1.8.1-patchset.tar.bz2 4799 BLAKE2B e97d28f2d03b0a80310306bdb8dfaad08e1ded88733e9d4c8a820d9744f05d1fbfef66c08f4cf5634271cab55edaef6b5cb679c983193aea9d07c83108c1f2aa SHA512 08784867cee6cb478a47da4b69d80105fc574eb48ee159cde412e7ca163b30e46de927e1489ab7a78adbcac4b38fa57936869cd043735e5737eb8136200fd341 +DIST irrlicht-1.8.1.zip 24167632 BLAKE2B f97e863802814a8c2c87263093429c4b3939dd26ca894c22b12f610d10cbd1231eb077e798b977544e4c1d5870d176083831d862ac933b17973916aff1b2684e SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb +DIST irrlicht-1.8.4-patchset.tar.bz2 4813 BLAKE2B acad0f0dcc2ff5778608d0620063e7c70935838447f4bd1b241e08fb24f69531c29d96e95de394a3018e239fd7865bc3b50dc9ed5d54dd171b7b51df6c740b4d SHA512 5035cdf42fd26449d03e849ca248f6abcfcea1b0e9827683f00be2545ce90e3979e41c94fd487cfb1c67450e2e973f872d11d233c5a5b654700cec2ccb7f5602 +DIST irrlicht-1.8.4.zip 27927144 BLAKE2B 2c2d7e1306b169e537258152f88b11578d8a33c0ebe58e7ee48242048b70b9ba01069fcf272e44e18f7afbd1e6ec89d6bd86289d203929388e6b96871c048a98 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 diff --git a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch deleted file mode 100644 index 5cb2a75b787..000 --- a/dev-games/irrlicht/files/irrlicht-1.8.1-config.patch +++ /dev/null @@ -1,29 +0,0 @@ include/IrrCompileConfig.h -+++ include/IrrCompileConfig.h -@@ -245,7 +245,7 @@ - //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. - /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. - This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ --#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ -+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ - #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ - #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ - #endif -@@ -261,7 +261,7 @@ - //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. - /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. - This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ --#define _IRR_USE_NON_SYSTEM_LIB_PNG_ -+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ - #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ - #undef _IRR_USE_NON_SYSTEM_LIB_PNG_ - #endif -@@ -598,7 +598,7 @@ - /** If this is commented out, Irrlicht will try to compile using the zlib - installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is - defined. */ --#define _IRR_USE_NON_SYSTEM_ZLIB_ -+//#define _IRR
[gentoo-commits] repo/gentoo:master commit in: dev-games/irrlicht/files/, dev-games/irrlicht/
commit: d9c9e77a1d01ba8ef834d036f5b9e9e4110596aa Author: Christopher Head chead ca> AuthorDate: Sun Sep 4 06:01:02 2016 + Commit: Patrice Clement gentoo org> CommitDate: Fri Sep 9 13:31:48 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9c9e77a dev-games/irrlicht: version bump to 1.8.4. Also upgrade to EAPI 6. Package-Manager: portage-2.2.28 Closes: https://github.com/gentoo/gentoo/pull/2213 Signed-off-by: Patrice Clement gentoo.org> dev-games/irrlicht/Manifest| 1 + .../irrlicht/files/irrlicht-1.8.4-config.patch | 29 + .../irrlicht/files/irrlicht-1.8.4-demoMake.patch | 764 + .../irrlicht/files/irrlicht-1.8.4-gentoo.patch | 46 ++ .../irrlicht/files/irrlicht-1.8.4-jpeg-9a.patch| 15 + .../irrlicht/files/irrlicht-1.8.4-mesa-10.x.patch | 40 ++ dev-games/irrlicht/irrlicht-1.8.4.ebuild | 74 ++ 7 files changed, 969 insertions(+) diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest index 2ddd5af..cfe019b 100644 --- a/dev-games/irrlicht/Manifest +++ b/dev-games/irrlicht/Manifest @@ -1 +1,2 @@ DIST irrlicht-1.8.1.zip 24167632 SHA256 814bb90116d5429449ba1d169e2cbff881c473b7eada4c2447132bc4f4a6e97b SHA512 93390c162e5a8edb231588d47dc421c24d21a34e833df1f3b92c85a9e8ef4a96a61d854e05eedb37f88f7f02821059e78a40a52cbc8e39356c4d36b17775dfbb WHIRLPOOL c66f0a15575327667cbe82c79919518771e55d5e919c972e64e104a6272b78a20bbb7bbba864722dead4248fb43dd77181d696eb63e82b4093aaadac132b +DIST irrlicht-1.8.4.zip 27927144 SHA256 f42b280bc608e545b820206fe2a999c55f290de5c7509a02bdbeeccc1bf9e433 SHA512 de69ddd2c6bc80a1b27b9a620e3697b1baa552f24c7d624076d471f3aecd9b15f71dce3b640811e6ece20f49b57688d428e3503936a7926b3e3b0cc696af98d1 WHIRLPOOL a5fecbd27968fbd4a5b17b9528388ec0870d1c3ceb85e36bbab40ce30aa61c7f2f387df160808dbaafa4488abeaf238c7cf93994b380a1b2c3a8a5c421949be1 diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch new file mode 100644 index ..0c51ffe --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-config.patch @@ -0,0 +1,29 @@ +--- irrlicht-1.8.4/include/IrrCompileConfig.h irrlicht-1.8.4/include/IrrCompileConfig.h +@@ -245,7 +245,7 @@ + //! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht. + /** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system. + This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */ +-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ ++//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_ + #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_ + #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_ + #endif +@@ -261,7 +261,7 @@ + //! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht. + /** If this is commented out, Irrlicht will try to compile using the libpng installed in the system. + This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */ +-#define _IRR_USE_NON_SYSTEM_LIB_PNG_ ++//#define _IRR_USE_NON_SYSTEM_LIB_PNG_ + #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_ + #undef _IRR_USE_NON_SYSTEM_LIB_PNG_ + #endif +@@ -598,7 +598,7 @@ + /** If this is commented out, Irrlicht will try to compile using the zlib + installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is + defined. */ +-#define _IRR_USE_NON_SYSTEM_ZLIB_ ++//#define _IRR_USE_NON_SYSTEM_ZLIB_ + #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_ + #undef _IRR_USE_NON_SYSTEM_ZLIB_ + #endif diff --git a/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch new file mode 100644 index ..f4aa165 --- /dev/null +++ b/dev-games/irrlicht/files/irrlicht-1.8.4-demoMake.patch @@ -0,0 +1,764 @@ +--- irrlicht-1.8.4/examples/Demo/Makefile irrlicht-1.8.4/examples/Demo/Makefile +@@ -2,8 +2,9 @@ + Target = Demo + Sources = CDemo.cpp CMainMenu.cpp main.cpp + +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -Wall -O3 -ffast-math ++CXXFLAGS ?= -O3 ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS += -Wall -ffast-math + + ifeq ($(HOSTTYPE), x86_64) + LIBSELECT=64 +@@ -13,7 +14,7 @@ + + # target specific settings + all_linux: SYSTEM=Linux +-all_linux: LDFLAGS = -L/usr/X11R6/lib$(LIBSELECT) -L../../lib/$(SYSTEM) -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor ++all_linux: LDFLAGS += -lIrrlicht -lGL -lXxf86vm -lXext -lX11 -lXcursor -lpng -ljpeg + + all_win32 clean_win32: SYSTEM=Win32-gcc + all_win32: LDFLAGS = -L../../lib/$(SYSTEM) -lIrrlicht -lopengl32 -lm +--- irrlicht-1.8.4/examples/14.Win32Window/Makefile irrlicht-1.8.4/examples/14.Win32Window/Makefile +@@ -5,8 +5,9 @@ + Sources = main.cpp + + # general compiler settings +-CPPFLAGS = -I../../include -I/usr/X11R6/include +-CXXFLAGS = -O3 -ffast-math ++CPPFLAGS += -I/usr/include/irrlicht ++CXXFLAGS ?= -O3 ++CXXFLAGS += -ffast-math + #CXXFLAGS = -g -Wall + + #default target