orion pushed to irrlicht (epel7). "initial cvs import"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Mar 28 03:53:16 UTC 2015
>From 7d5e1a1826a0e312f742b49c163b4efd02b13a27 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 12 Jan 2009 16:31:56 +0000
Subject: initial cvs import
diff --git a/.cvsignore b/.cvsignore
index e69de29..5b79e6d 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -0,0 +1 @@
+irrlicht-1.5.zip
diff --git a/import.log b/import.log
new file mode 100644
index 0000000..e783a5e
--- /dev/null
+++ b/import.log
@@ -0,0 +1 @@
+irrlicht-1_5-2_fc11:HEAD:irrlicht-1.5-2.fc11.src.rpm:1231777501
diff --git a/irrlicht-1.5-optflags.patch b/irrlicht-1.5-optflags.patch
new file mode 100644
index 0000000..7f334e7
--- /dev/null
+++ b/irrlicht-1.5-optflags.patch
@@ -0,0 +1,80 @@
+diff -up irrlicht-1.5/include/IrrCompileConfig.h.optflags irrlicht-1.5/include/IrrCompileConfig.h
+--- irrlicht-1.5/include/IrrCompileConfig.h.optflags 2009-01-08 18:47:11.000000000 -0500
++++ irrlicht-1.5/include/IrrCompileConfig.h 2009-01-08 18:47:41.000000000 -0500
+@@ -138,7 +138,7 @@ ones. */
+ //! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
+ /** If this is commented out, Irrlicht will try to compile using the zlib installed in 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_
+
+
+ //! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
+@@ -149,7 +149,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_
+
+
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+@@ -160,7 +160,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_
+
+
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
+diff -up irrlicht-1.5/source/Irrlicht/Makefile.optflags irrlicht-1.5/source/Irrlicht/Makefile
+--- irrlicht-1.5/source/Irrlicht/Makefile.optflags 2009-01-08 18:48:16.000000000 -0500
++++ irrlicht-1.5/source/Irrlicht/Makefile 2009-01-08 18:51:11.000000000 -0500
+@@ -43,13 +43,13 @@ LIBPNGOBJ = libpng/png.o libpng/pngerror
+ EXTRAOBJ =
+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(EXTRAOBJ)
++ $(IRRGUIOBJ) $(EXTRAOBJ)
+
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
+-CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
+-CXXFLAGS = -Wall -pipe
++CXXINCS = -I../../include
++CPPFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
++CXXFLAGS = -Wall -pipe $(RPM_OPT_FLAGS)
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+ else
+@@ -58,7 +58,7 @@ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
+ endif
+-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
++CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES $(RPM_OPT_FLAGS)
+
+ sharedlib sharedlib_osx: CXXFLAGS += -fpic
+ sharedlib sharedlib_osx: CFLAGS += -fpic
+@@ -74,9 +74,9 @@ STATIC_LIB = libIrrlicht.a
+ IRRLICHT_DLL := ../../bin/Win32-gcc/Irrlicht.dll
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+-sharedlib: SHARED_LIB = libIrrlicht.so
++sharedlib install: SHARED_LIB = libIrrlicht.so
+ staticlib sharedlib: LDFLAGS = --no-export-all-symbols --add-stdcall-alias
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+
+ #OSX specific options
+@@ -128,7 +128,6 @@ sharedlib_osx: $(LINKOBJ)
+ install:
+ cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
+ cd $(INSTALL_DIR) && ln -s libIrrlicht.so.$(VERSION) $(SHARED_LIB)
+- ldconfig -n $(INSTALL_DIR)
+
+ install_osx:
+ cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR)
diff --git a/irrlicht-1.5-pngfix.patch b/irrlicht-1.5-pngfix.patch
new file mode 100644
index 0000000..2ff2f57
--- /dev/null
+++ b/irrlicht-1.5-pngfix.patch
@@ -0,0 +1,39 @@
+diff -up irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp
+--- irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp.pngfix 2009-01-10 12:46:59.000000000 -0500
++++ irrlicht-1.5/source/Irrlicht/CImageLoaderPNG.cpp 2009-01-10 12:52:19.000000000 -0500
+@@ -184,9 +184,14 @@ IImage* CImageLoaderPng::loadImage(io::I
+
+ // Update the changes
+ png_read_update_info(png_ptr, info_ptr);
+- png_get_IHDR(png_ptr, info_ptr,
+- (png_uint_32*)&Width, (png_uint_32*)&Height,
+- &BitDepth, &ColorType, NULL, NULL, NULL);
++ {
++ png_uint_32 w,h;
++ png_get_IHDR(png_ptr, info_ptr,
++ &w, &h,
++ &BitDepth, &ColorType, NULL, NULL, NULL);
++ Width=w;
++ Height=h;
++ }
+
+ // Convert RGBA to BGRA
+ if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)
+@@ -199,9 +204,14 @@ IImage* CImageLoaderPng::loadImage(io::I
+ }
+
+ // Update the changes
+- png_get_IHDR(png_ptr, info_ptr,
+- (png_uint_32*)&Width, (png_uint_32*)&Height,
+- &BitDepth, &ColorType, NULL, NULL, NULL);
++ {
++ png_uint_32 w,h;
++ png_get_IHDR(png_ptr, info_ptr,
++ &w, &h,
++ &BitDepth, &ColorType, NULL, NULL, NULL);
++ Width=w;
++ Height=h;
++ }
+
+ // Create the image structure to be filled by png data
+ if (ColorType==PNG_COLOR_TYPE_RGB_ALPHA)
diff --git a/irrlicht.spec b/irrlicht.spec
new file mode 100644
index 0000000..354d80c
--- /dev/null
+++ b/irrlicht.spec
@@ -0,0 +1,98 @@
+Name: irrlicht
+Summary: A high performance realtime 3D engine
+Version: 1.5
+Release: 2%{?dist}
+License: zlib
+Group: System Environment/Libraries
+Source0: http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
+# Various fixes, optflags, system libraries/headers
+# Don't call ldconfig during make install.
+# http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
+Patch0: irrlicht-1.5-optflags.patch
+# Fix how we call libpng so we can use system libpng
+Patch1: irrlicht-1.5-pngfix.patch
+URL: http://irrlicht.sourceforge.net/
+BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+BuildRequires: libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
+BuildRequires: libjpeg-devel, zlib-devel
+# XXX: is libpng broken?
+BuildRequires: libpng-devel
+
+%description
+The Irrlicht Engine is an open source high performance realtime 3D engine
+written and usable in C++ and also available for .NET languages. It is
+completely cross-platform, using D3D, OpenGL and its own software renderer,
+and has all of the state-of-the-art features which can be found in
+commercial 3d engines.
+
+%package devel
+Summary: Development headers and libraries for irrlicht
+Requires: %{name} = %{version}-%{release}
+Requires: mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
+Requires: libjpeg-devel, zlib-devel, libpng-devel
+Group: Development/Libraries
+
+%description devel
+Development headers and libraries for irrlicht.
+
+%prep
+%setup -q
+%patch0 -p1
+%patch1 -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 so the debuginfo doesn't pick it up.
+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} sharedlib
+
+%install
+rm -rf %{buildroot}
+mkdir -p %{buildroot}%{_libdir}
+mkdir -p %{buildroot}%{_includedir}/%{name}
+make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install
+cp -a include/* %{buildroot}%{_includedir}/%{name}/
+cd %{buildroot}%{_libdir}
+ln -s libIrrlicht.so.%{version} libIrrlicht.so.1
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-,root,root,-)
+%doc readme.txt
+%{_libdir}/libIrrlicht*.so.*
+
+%files devel
+%defattr(-,root,root,-)
+%doc doc/upgrade-guide.txt
+%{_includedir}/%{name}/
+%{_libdir}/libIrrlicht*.so
+
+%changelog
+* Sat Jan 10 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-2
+- fix libpng calls so we can use system libpng (thanks to tom lane)
+- fix license tag
+
+* Thu Jan 8 2009 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-1
+- build against system libpng
+- update to 1.5 final
+
+* Thu Dec 4 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.2.beta
+- fix optflags patch so that ldconfig isn't called during make install
+
+* Wed Dec 3 2008 Tom "spot" Callaway <tcallawa at redhat.com> 1.5-0.1.beta
+- Initial package for Fedora
diff --git a/sources b/sources
index e69de29..583d464 100644
--- a/sources
+++ b/sources
@@ -0,0 +1 @@
+e3bc8c1074fc0ec2810dc48f94c05d5a irrlicht-1.5.zip
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/irrlicht.git/commit/?h=epel7&id=7d5e1a1826a0e312f742b49c163b4efd02b13a27
More information about the scm-commits
mailing list