!1 Package init

Merge pull request !1 from hdxxjhuahuo/master
This commit is contained in:
openeuler-ci-bot 2020-02-25 14:53:36 +08:00 committed by Gitee
commit c6b3338b05
7 changed files with 228 additions and 75 deletions

View File

@ -1,36 +0,0 @@
# irrlicht
#### Description
{**When you're done, you can delete the content in this README and update the file with details for others getting started with your repository**}
#### Software Architecture
Software architecture description
#### Installation
1. xxxx
2. xxxx
3. xxxx
#### Instructions
1. xxxx
2. xxxx
3. xxxx
#### Contribution
1. Fork the repository
2. Create Feat_xxx branch
3. Commit your code
4. Create Pull Request
#### Gitee Feature
1. You can use Readme\_XXX.md to support different languages, such as Readme\_en.md, Readme\_zh.md
2. Gitee blog [blog.gitee.com](https://blog.gitee.com)
3. Explore open source project [https://gitee.com/explore](https://gitee.com/explore)
4. The most valuable open source project [GVP](https://gitee.com/gvp)
5. The manual of Gitee [https://gitee.com/help](https://gitee.com/help)
6. The most popular members [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

View File

@ -1,39 +0,0 @@
# irrlicht
#### 介绍
{**以下是码云平台说明,您可以替换此简介**
码云是 OSCHINA 推出的基于 Git 的代码托管平台(同时支持 SVN。专为开发者提供稳定、高效、安全的云端软件开发协作平台
无论是个人、团队、或是企业,都能够用码云实现代码托管、项目管理、协作开发。企业项目请看 [https://gitee.com/enterprises](https://gitee.com/enterprises)}
#### 软件架构
软件架构说明
#### 安装教程
1. xxxx
2. xxxx
3. xxxx
#### 使用说明
1. xxxx
2. xxxx
3. xxxx
#### 参与贡献
1. Fork 本仓库
2. 新建 Feat_xxx 分支
3. 提交代码
4. 新建 Pull Request
#### 码云特技
1. 使用 Readme\_XXX.md 来支持不同的语言,例如 Readme\_en.md, Readme\_zh.md
2. 码云官方博客 [blog.gitee.com](https://blog.gitee.com)
3. 你可以 [https://gitee.com/explore](https://gitee.com/explore) 这个地址来了解码云上的优秀开源项目
4. [GVP](https://gitee.com/gvp) 全称是码云最有价值开源项目,是码云综合评定出的优秀开源项目
5. 码云官方提供的使用手册 [https://gitee.com/help](https://gitee.com/help)
6. 码云封面人物是一档用来展示码云会员风采的栏目 [https://gitee.com/gitee-stars/](https://gitee.com/gitee-stars/)

25
irrlicht-1.8-glext.patch Normal file
View File

@ -0,0 +1,25 @@
diff -up irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h.glext irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h
--- irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h.glext 2012-11-03 18:07:56.000000000 -0400
+++ irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h 2012-11-13 12:48:52.120896690 -0500
@@ -49,7 +49,7 @@
#define NO_SDL_GLEXT
#include <SDL/SDL_video.h>
#include <SDL/SDL_opengl.h>
- #include "glext.h"
+ #include <GL/glext.h>
#else
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
#define GL_GLEXT_LEGACY 1
@@ -61,9 +61,10 @@
#include <GL/gl.h>
#include <GL/glx.h>
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
- #include "glext.h"
+ #include <GL/glext.h>
+ typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
- #include "glxext.h"
+ #include <GL/glxext.h>
#endif
#endif

View File

@ -0,0 +1,75 @@
diff -up irrlicht-1.8/include/IrrCompileConfig.h.optflags irrlicht-1.8/include/IrrCompileConfig.h
--- irrlicht-1.8/include/IrrCompileConfig.h.optflags 2012-11-05 15:14:14.000000000 -0500
+++ irrlicht-1.8/include/IrrCompileConfig.h 2012-11-13 12:45:47.316780394 -0500
@@ -245,7 +245,7 @@ the engine will no longer read .jpeg ima
//! 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 @@ the engine will no longer read .png imag
//! 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 @@ ones. */
/** 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
@@ -619,7 +619,7 @@ library. */
/** If this is commented out, Irrlicht will try to compile using the bzlib
installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
defined. */
-#define _IRR_USE_NON_SYSTEM_BZLIB_
+// #define _IRR_USE_NON_SYSTEM_BZLIB_
#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
#undef _IRR_USE_NON_SYSTEM_BZLIB_
#endif
diff -up irrlicht-1.8/source/Irrlicht/Makefile.optflags irrlicht-1.8/source/Irrlicht/Makefile
--- irrlicht-1.8/source/Irrlicht/Makefile.optflags 2012-11-05 15:14:12.000000000 -0500
+++ irrlicht-1.8/source/Irrlicht/Makefile 2012-11-13 12:46:35.660811963 -0500
@@ -56,18 +56,17 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffm
EXTRAOBJ =
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
- $(BZIP2OBJ) $(EXTRAOBJ)
+ $(IRRGUIOBJ) $(EXTRAOBJ)
###############
#Compiler flags
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
+CXXINCS = -I../../include `libpng-config --cflags`
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
+CXXFLAGS += $(RPM_OPT_FLAGS) -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
ifndef NDEBUG
CXXFLAGS += -g -D_DEBUG
else
-CXXFLAGS += -fexpensive-optimizations -O3
+CXXFLAGS += -fexpensive-optimizations -O3 $(RPM_OPT_FLAGS)
endif
ifdef PROFILE
CXXFLAGS += -pg
@@ -88,7 +87,7 @@ STATIC_LIB = libIrrlicht.a
LIB_PATH = ../../lib/$(SYSTEM)
INSTALL_DIR = /usr/local/lib
sharedlib install: SHARED_LIB = libIrrlicht.so
-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
+sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
#OSX specific options

BIN
irrlicht-1.8.4.zip Normal file

Binary file not shown.

104
irrlicht.spec Normal file
View File

@ -0,0 +1,104 @@
Name: irrlicht
Summary: A high performance and free realtime 3D engine
Version: 1.8.4
Release: 10
License: zlib
URL: http://irrlicht.sourceforge.net/
Source0: http://downloads.sourceforge.net/irrlicht/irrlicht-1.8.4.zip
Patch0001: irrlicht-1.8-optflags.patch
Patch0002: irrlicht-1.8-glext.patch
Patch0003: irrlicht18-libaesgm.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}
Obsoletes: irrlicht18 <= 1.8-0.4.svn3629
%description
The Irrlicht Engine is an open source high performance realtime 3D engine
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
Provides: irrlicht18-devel = %{version}-%{release}
Obsoletes: irrlicht18-devel <= 1.8-0.4.svn3629
%description devel
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}
Obsoletes: irrXML18 <= 1.8-0.4.svn3629
%description -n irrXML
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}
Obsoletes: irrXML18-devel <= 1.8-0.4.svn3629
%description -n irrXML-devel
Development header files and libraries for irrXML.
%prep
%autosetup -n %{name}-%{version} -p1
sed -i 's|VERSION_RELEASE = 0|VERSION_RELEASE = 1|g' source/Irrlicht/Makefile
rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng source/Irrlicht/aesGladman
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
sed -i -e '/_IRR_MATERIAL_MAX_TEXTURES_/s/4/8/' include/IrrCompileConfig.h
%build
cd source/Irrlicht
%make_build sharedlib
%install
install -d %{buildroot}%{_libdir}
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
popd
%post
/sbin/ldconfig
%postun
/sbin/ldconfig
%post -n irrXML -p /sbin/ldconfig
%postun -n irrXML -p /sbin/ldconfig
%files
%doc readme.txt
%{_libdir}/libIrrlicht.so.*
%files devel
%doc doc/upgrade-guide.txt
%{_includedir}/irrlicht/
%exclude %{_includedir}/irrlicht/{fast_atof.h,heapsort.h,irrArray.h}
%exclude %{_includedir}/irrlicht/{irrString.h,irrTypes.h,irrXML.h}
%{_libdir}/libIrrlicht.so
%files -n irrXML
%doc readme.txt
%files -n irrXML-devel
%dir %{_includedir}/irrlicht/
%{_includedir}/irrlicht/{fast_atof.h,heapsort.h,irrArray.h,irrString.h,irrTypes.h,irrXML.h}
%changelog
* Tue Feb 25 2020 xuxijian<xuxijian@huawei.com> - 1.8.4-10
- Package init

24
irrlicht18-libaesgm.patch Normal file
View File

@ -0,0 +1,24 @@
diff -up irrlicht18-svn3629/source/Irrlicht/CZipReader.cpp.libaesgm irrlicht18-svn3629/source/Irrlicht/CZipReader.cpp
--- irrlicht18-svn3629/source/Irrlicht/CZipReader.cpp.libaesgm 2012-08-23 13:56:12.824576588 -0500
+++ irrlicht18-svn3629/source/Irrlicht/CZipReader.cpp 2012-08-23 13:56:31.497576866 -0500
@@ -27,7 +27,7 @@ extern "C" void bz_internal_error(int er
#endif
#ifdef _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
- #include "aesGladman/fileenc.h"
+ #include <aes/fileenc.h>
#endif
#ifdef _IRR_COMPILE_WITH_BZIP2_
#ifndef _IRR_USE_NON_SYSTEM_BZLIB_
diff -up irrlicht18-svn3629/source/Irrlicht/Makefile.libaesgm irrlicht18-svn3629/source/Irrlicht/Makefile
--- irrlicht18-svn3629/source/Irrlicht/Makefile.libaesgm 2012-08-23 13:56:41.010577010 -0500
+++ irrlicht18-svn3629/source/Irrlicht/Makefile 2012-08-23 13:57:08.195577417 -0500
@@ -55,7 +55,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRP
###############
#Compiler flags
CXXINCS = -I../../include `libpng-config --cflags`
-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 -DUSE_SHA1 $(RPM_OPT_FLAGS)
CXXFLAGS += $(RPM_OPT_FLAGS) -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
ifndef NDEBUG
CXXFLAGS += -g -D_DEBUG