diff --git a/irrlicht-1.8.4.zip b/irrlicht-1.8.5.zip similarity index 61% rename from irrlicht-1.8.4.zip rename to irrlicht-1.8.5.zip index d1e4deb..b5eba40 100644 Binary files a/irrlicht-1.8.4.zip and b/irrlicht-1.8.5.zip differ diff --git a/irrlicht.spec b/irrlicht.spec index 376a9bb..03d97b0 100644 --- a/irrlicht.spec +++ b/irrlicht.spec @@ -1,16 +1,15 @@ Name: irrlicht Summary: A high performance and free realtime 3D engine -Version: 1.8.4 -Release: 12 +Version: 1.8.5 +Release: 1 License: zlib URL: http://irrlicht.sourceforge.net/ -Source0: http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip +Source0: http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.5.zip Patch0001: irrlicht-1.8-optflags.patch Patch0002: irrlicht-1.8-glext.patch Patch0003: irrlicht18-libaesgm.patch Patch0004: irrlicht-1.8-irrXML-shared-library.patch Patch0005: irrlicht-1.8-fix-locale-decimal-points.patch -Patch0006: remove-sysctl.h.patch BuildRequires: gcc-c++ libXxf86vm-devel mesa-libGL-devel mesa-libGLU-devel BuildRequires: libjpeg-devel zlib-devel libaesgm-devel libpng-devel bzip2-devel Provides: irrlicht18 = %{version}-%{release} @@ -23,7 +22,7 @@ written and usable in C++ and also available for .NET languages. %package devel Summary: Development header files and libraries for irrlicht Requires: irrlicht = %{version}-%{release} mesa-libGL-devel mesa-libGLU-devel -Requires: libjpeg-devel zlib-devel libpng-devel libXxf86vm-devel irrXML-devel = 1.8.4 +Requires: libjpeg-devel zlib-devel libpng-devel libXxf86vm-devel irrXML-devel = 1.8.5 Provides: irrlicht18-devel = %{version}-%{release} Obsoletes: irrlicht18-devel <= 1.8-0.4.svn3629 @@ -32,8 +31,8 @@ Development header files and libraries for irrlicht. %package -n irrXML Summary: Simple and fast XML parser for C++ -Version: 1.8.4 -Provides: irrXML18 = 1.8.4-%{release} +Version: 1.8.5 +Provides: irrXML18 = 1.8.5-%{release} Obsoletes: irrXML18 <= 1.8-0.4.svn3629 %description -n irrXML @@ -41,9 +40,9 @@ This package provides a simple and fast open source xml parser for C++. %package -n irrXML-devel Summary: Development header files and libraries for irrXML -Version: 1.8.4 -Requires: irrXML = 1.8.4-%{release} -Provides: irrXML18-devel = 1.8.4-%{release} +Version: 1.8.5 +Requires: irrXML = 1.8.5-%{release} +Provides: irrXML18-devel = 1.8.5-%{release} Obsoletes: irrXML18-devel <= 1.8-0.4.svn3629 %description -n irrXML-devel @@ -71,8 +70,8 @@ install -d %{buildroot}%{_includedir}/irrlicht make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install cp -a include/*.h %{buildroot}%{_includedir}/irrlicht/ pushd %{buildroot}%{_libdir} -ln -s libIrrlicht.so.1.8.4 libIrrlicht.so.1 -ln -s libIrrXML.so.1.8.4 libIrrXML.so.1 +ln -s libIrrlicht.so.1.8.5 libIrrlicht.so.1 +ln -s libIrrXML.so.1.8.5 libIrrXML.so.1 popd %post @@ -104,6 +103,9 @@ popd %{_includedir}/irrlicht/{fast_atof.h,heapsort.h,irrArray.h,irrString.h,irrTypes.h,irrXML.h} %changelog +* Tue Oct 17 2023 wulei - 1.8.5-1 +- Update to 1.8.5 + * Sat Jun 26 2021 wangyue - 1.8.4-12 - Remove sysctl.h to fix build error diff --git a/remove-sysctl.h.patch b/remove-sysctl.h.patch deleted file mode 100644 index 5094d8a..0000000 --- a/remove-sysctl.h.patch +++ /dev/null @@ -1,31 +0,0 @@ -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 - -diff -ruN irrlicht-1.8.4-bak/source/Irrlicht/COSOperator.cpp irrlicht-1.8.4/source/Irrlicht/COSOperator.cpp ---- irrlicht-1.8.4-bak/source/Irrlicht/COSOperator.cpp 2012-11-04 02:07:52.000000000 +0800 -+++ irrlicht-1.8.4/source/Irrlicht/COSOperator.cpp 2021-06-26 15:26:03.935312943 +0800 -@@ -13,7 +13,6 @@ - #include - #ifndef _IRR_SOLARIS_PLATFORM_ - #include --#include - #endif - #endif -