Hello community, here is the log from the commit of package irrlicht for openSUSE:Factory checked in at 2016-11-14 20:11:18 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/irrlicht (Old) and /work/SRC/openSUSE:Factory/.irrlicht.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "irrlicht" Changes: -------- New Changes file: --- /dev/null 2016-10-27 01:54:32.792041256 +0200 +++ /work/SRC/openSUSE:Factory/.irrlicht.new/irrlicht.changes 2016-11-14 20:11:19.000000000 +0100 @@ -0,0 +1,67 @@ +------------------------------------------------------------------- +Wed Jul 27 08:15:10 UTC 2016 - [email protected] + +- Update description + +------------------------------------------------------------------- +Thu Jun 30 20:10:24 UTC 2016 - [email protected] + +- Added fix-sha2-gcc6.patch for fixing build with gcc6 + on Tumbleweed + +------------------------------------------------------------------- +Tue Dec 1 19:35:20 UTC 2015 - [email protected] + +- Build version 1.8.3 + +------------------------------------------------------------------- +Thu Sep 3 20:28:00 UTC 2015 - [email protected] + +- Build version 1.8.2 +- Removed irrlicht-replace-glext-header-file.patch fixed in this release. + +------------------------------------------------------------------- +Mon Dec 8 18:55:08 UTC 2014 - [email protected] + +- Add irrlicht-replace-glext-header-file.patch -- Incorrect glext.h + shipped in release, see <http://irrlicht.sourceforge.net/forum/ + viewtopic.php?f=7&t=49811>. + +------------------------------------------------------------------- +Wed Feb 5 23:01:38 UTC 2014 - [email protected] + +- Removed irrlicht-1.8-glviewport.patch + fixes https://github.com/minetest/minetest/issues/474 + +------------------------------------------------------------------- +Sat Nov 23 22:40:22 UTC 2013 - [email protected] + +- Build version 1.8.1 + +------------------------------------------------------------------- +Wed Dec 12 11:43:31 UTC 2012 - [email protected] + +- added directionlight and glviewport patches. Based on work by + Herman Damveld <[email protected]> + +------------------------------------------------------------------- +Tue Dec 11 23:01:03 UTC 2012 - [email protected] + +- Build version 1.8 + +------------------------------------------------------------------- +Sun Jul 29 12:05:49 UTC 2012 - [email protected] + +- use fallback values to prevent segfaults + https://sourceforge.net/tracker/?func=detail&aid=3551476&group_id=74339&atid=540678 + +------------------------------------------------------------------- +Thu Dec 16 10:54:16 UTC 2010 - [email protected] + +- Packaged irrlicht 1.7.2 +- Restructured the .spec file, having the package called irrlicht. +- Link GL, zlib, libpng and libjpeg; otherwise apps linking + irrlicht would need to take care of this, which is wrong. +- Spec file is based on Fedora's work. + + New: ---- aes.patch fix-sha2-gcc6.patch irrlicht-1.7.9.3629-config.patch irrlicht-1.8-directionlight.patch irrlicht-1.8.3.zip irrlicht.changes irrlicht.spec ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ irrlicht.spec ++++++ # # spec file for package irrlicht # # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed # upon. The license for this file, and modifications and additions to the # file, is the same license as for the pristine package itself (unless the # license for the pristine package is not an Open Source License, in which # case the license is the MIT License). An "Open Source License" is a # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # %define sover 1_8 Name: irrlicht Version: 1.8.3 Release: 0 Summary: A realtime 3D engine License: Zlib Group: Development/Libraries/C and C++ Url: http://irrlicht.sourceforge.net/ Source0: http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip # PATCH-FIX-OPENSUSE irrlicht-1.7.9.3629-config.patch -- use system libraries http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076 Patch0: irrlicht-1.7.9.3629-config.patch # PATCH-MISSING-TAG -- See http://wiki.opensuse.org/Packaging/Patches Patch1: aes.patch # PATCH-FIX-UPSTREAM irrlicht-1.8-directionlight.patch Patch3: irrlicht-1.8-directionlight.patch # PATCH-FIX-UPSTREAM fix-sha2-gcc6.patch -- Fix build of sha2 code with gcc6 https://sourceforge.net/p/irrlicht/patches/314/ Patch4: fix-sha2-gcc6.patch BuildRequires: Mesa-devel BuildRequires: fdupes BuildRequires: gcc-c++ BuildRequires: libjpeg-devel BuildRequires: libpng-devel BuildRequires: unzip BuildRequires: xorg-x11-devel BuildRequires: zlib-devel BuildRoot: %{_tmppath}/%{name}-%{version}-build %description The Irrlicht Engine is a realtime 3D engine written and usable in C++ and also available for .NET languages. It is using Direct3D, OpenGL and its own software renderer, and has features which can be found in commercial 3D engines, some of which are: * Built-in and extensible material library with vertex, pixel, and geometry shader support * Character animation system with skeletal and morph target animation. * Particle effects, billboards, light maps, environment mapping, stencil buffer shadows, and lots of other special effects. * Direct import of common mesh file formats: Maya (.obj), 3DStudio (.3ds), COLLADA (.dae), Blitz3D (.b3d), Milkshape (.ms3d), Quake 3 levels (.bsp), Quake2 models (.md2), Microsoft DirectX (.X)… %package devel Summary: Development headers and libraries for irrlicht Group: Development/Libraries/C and C++ Requires: Mesa-devel Requires: libIrrlicht%{sover} = %{version} Requires: libjpeg-devel Requires: libpng-devel Requires: xorg-x11-devel Requires: xorg-x11-libX11-devel Requires: zlib-devel %description devel Development headers and libraries for irrlicht. The Irrlicht Engine is a realtime 3D engine written and usable in C++ and also available for .NET languages. It is using Direct3D, OpenGL and its own software renderer, and has features which can be found in commercial 3D engines. %package data Summary: Assorted data for irrlicht Group: Development/Libraries/C and C++ %description data Data files for irrlicht applications The Irrlicht Engine is a realtime 3D engine written and usable in C++ and also available for .NET languages. It is using Direct3D, OpenGL and its own software renderer, and has features which can be found in commercial 3D engines. %package -n libIrrlicht%{sover} Summary: A high performance realtime 3D engine Group: System/Libraries %description -n libIrrlicht%{sover} The Irrlicht Engine is a realtime 3D engine written and usable in C++ and also available for .NET languages. It is using Direct3D, OpenGL and its own software renderer, and has features which can be found in commercial 3D engines. %prep %setup -q %patch0 %patch1 -p1 %patch3 -p1 %patch4 -p1 sed -i 's/\r//' readme.txt iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt mv readme.txt.iso88591 readme.txt # We don't use any of this. Deleting it to be sure we are using system headers rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng for i in include/*.h doc/upgrade-guide.txt source/Irrlicht/*.cpp source/Irrlicht/*.h; do sed -i 's/\r//' $i chmod -x $i touch -r changes.txt $i done %build cd source/Irrlicht make %{?_smp_mflags} CFLAGS="%{optflags} -fno-strict-aliasing -fPIC" \ ZLIBOBJ= JPEGLIBOBJ= LIBPNGOBJ= \ CIrrDeviceLinux.cpp make %{?_smp_mflags} \ CFLAGS="%{optflags} -fstrict-aliasing -fPIC" \ CXXFLAGS="%{optflags} -fstrict-aliasing -fno-exceptions -fno-rtti -fPIC" \ ZLIBOBJ= JPEGLIBOBJ= LIBPNGOBJ= \ LDFLAGS="-lz -ljpeg -lpng $(pkg-config --libs gl xxf86vm xext x11)" \ sharedlib %install mkdir -p %{buildroot}%{_libdir} mkdir -p %{buildroot}%{_includedir}/irrlicht make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install \ ZLIBOBJ= JPEGLIBOBJ= LIBPNGOBJ= # Cleaning up after the really bad installer... pushd %{buildroot}%{_libdir} ln -s -f libIrrlicht.so.1.8.0 libIrrlicht.so.1.8 ln -s -f libIrrlicht.so.1.8 libIrrlicht.so popd # End Makefile mess cleanup install -d %{buildroot}%{_datadir}/irrlicht cp -r media %{buildroot}%{_datadir}/irrlicht %fdupes %{buildroot}%{_includedir} %post -n libIrrlicht%{sover} -p /sbin/ldconfig %postun -n libIrrlicht%{sover} -p /sbin/ldconfig %files -n libIrrlicht%{sover} %defattr(-,root,root,-) %doc readme.txt %{_libdir}/libIrrlicht.so.* %files devel %defattr(-,root,root,-) %doc doc/upgrade-guide.txt %{_includedir}/irrlicht/ %{_libdir}/libIrrlicht.so %files data %defattr(-,root,root,-) %{_datadir}/irrlicht %changelog ++++++ aes.patch ++++++ Index: irrlicht-1.7.1/source/Irrlicht/aesGladman/aeskey.cpp =================================================================== --- irrlicht-1.7.1.orig/source/Irrlicht/aesGladman/aeskey.cpp +++ irrlicht-1.7.1/source/Irrlicht/aesGladman/aeskey.cpp @@ -368,8 +368,8 @@ aes_rval aes_decrypt_key192(const void * #endif } #else - cx->ks[4] = ff(ss[4] = word_in(in_key, 4)); - cx->ks[5] = ff(ss[5] = word_in(in_key, 5)); + ss[4] = word_in(in_key, 4); cx->ks[4] = ff(ss[4]); + ss[5] = word_in(in_key, 5); cx->ks[5] = ff(ss[5]); kdf6(cx->ks, 0); kd6(cx->ks, 1); kd6(cx->ks, 2); kd6(cx->ks, 3); kd6(cx->ks, 4); kd6(cx->ks, 5); @@ -414,10 +414,10 @@ aes_rval aes_decrypt_key256(const void * #endif } #else - cx->ks[4] = ff(ss[4] = word_in(in_key, 4)); - cx->ks[5] = ff(ss[5] = word_in(in_key, 5)); - cx->ks[6] = ff(ss[6] = word_in(in_key, 6)); - cx->ks[7] = ff(ss[7] = word_in(in_key, 7)); + ss[4] = word_in(in_key, 4);cx->ks[4] = ff(ss[4]); + ss[5] = word_in(in_key, 5);cx->ks[5] = ff(ss[5]); + ss[6] = word_in(in_key, 6);cx->ks[6] = ff(ss[6]); + ss[7] = word_in(in_key, 7);cx->ks[7] = ff(ss[7]); kdf8(cx->ks, 0); kd8(cx->ks, 1); kd8(cx->ks, 2); kd8(cx->ks, 3); kd8(cx->ks, 4); kd8(cx->ks, 5); ++++++ fix-sha2-gcc6.patch ++++++ diff -Nur irrlicht-1.8.3/source/Irrlicht/aesGladman/sha2.h new/source/Irrlicht/aesGladman/sha2.h --- irrlicht-1.8.3/source/Irrlicht/aesGladman/sha2.h 2013-01-29 13:28:40.000000000 +0100 +++ new/source/Irrlicht/aesGladman/sha2.h 2016-06-30 22:26:23.181868504 +0200 @@ -76,7 +76,7 @@ #else #include <stdint.h> #endif - typedef int64_t sha2_64t; + typedef uint64_t sha2_64t; #if __WORDSIZE==64 #define s_u64 ul #else ++++++ irrlicht-1.7.9.3629-config.patch ++++++ Index: include/IrrCompileConfig.h =================================================================== --- include/IrrCompileConfig.h (revision 3629) +++ include/IrrCompileConfig.h (working copy) @@ -236,7 +236,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 @@ -252,7 +252,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 @@ -580,7 +580,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 ++++++ irrlicht-1.8-directionlight.patch ++++++ Index: irrlicht-1.8/source/Irrlicht/CLightSceneNode.cpp =================================================================== --- irrlicht-1.8.orig/source/Irrlicht/CLightSceneNode.cpp +++ irrlicht-1.8/source/Irrlicht/CLightSceneNode.cpp @@ -66,7 +66,8 @@ void CLightSceneNode::render() case video::ELT_DIRECTIONAL: driver->draw3DLine(core::vector3df(0.f, 0.f, 0.f), - LightData.Direction * LightData.Radius, + //LightData.Direction * LightData.Radius, + core::vector3df(0.f, 0.f, LightData.Radius), LightData.DiffuseColor.toSColor()); break; default:
