Author: sparky Date: Thu Feb 4 16:26:45 2010 GMT
Module: packages Tag: HEAD
---- Log message:
- force using system zlib, libpng and libjpeg
- link with libs requires, no more missing symbols
- BR: OpenGL-devel instead of OpenGL-GLU-devel
---- Files affected:
packages/irrlicht:
irrlicht.spec (1.29 -> 1.30)
---- Diffs:
================================================================
Index: packages/irrlicht/irrlicht.spec
diff -u packages/irrlicht/irrlicht.spec:1.29
packages/irrlicht/irrlicht.spec:1.30
--- packages/irrlicht/irrlicht.spec:1.29 Thu Feb 4 10:27:18 2010
+++ packages/irrlicht/irrlicht.spec Thu Feb 4 17:26:39 2010
@@ -2,6 +2,7 @@
#
# TODO:
# - what to do with the .NET thingy?
+# - fix Makefile to accept rpm*flags as options
#
Summary: Irrlicht - high performance realtime 3D engine
Summary(pl.UTF-8): Irrlicht - wysoko wydajny silnik 3D czasu rzeczywistego
@@ -15,9 +16,9 @@
Patch0: %{name}-glXGetProcAddress.patch
Patch1: %{name}-system-libs.patch
URL: http://irrlicht.sourceforge.net/
-BuildRequires: OpenGL-GLU-devel
-BuildRequires: dos2unix
+BuildRequires: OpenGL-devel
BuildRequires: bzip2-devel
+BuildRequires: dos2unix
BuildRequires: libjpeg-devel
BuildRequires: libpng-devel
BuildRequires: libstdc++-devel
@@ -89,13 +90,17 @@
%build
%{__make} -C source/Irrlicht \
CXX="%{__cxx}" \
+ CXXINCS="-I../../include %{rpmcppflags}" \
CFLAGS="%{rpmcflags} -DGLX_GLXEXT_LEGACY" \
- CXXFLAGS="%{rpmcflags} -DGLX_GLXEXT_LEGACY \$(CXXINCS)
-DIRRLICHT_EXPORTS=1"
+ CXXFLAGS="%{rpmcflags} -DGLX_GLXEXT_LEGACY \$(CXXINCS)
-DIRRLICHT_EXPORTS=1" \
+ LDFLAGS="%{rpmldflags} -lz -lpng -ljpeg -lbz2 -lX11 -lXxf86vm -lGL"
%{__make} -C source/Irrlicht clean
%{__make} -C source/Irrlicht sharedlib \
CXX="%{__cxx}" \
+ CXXINCS="-I../../include %{rpmcppflags}" \
CFLAGS="%{rpmcflags} -fPIC -DGLX_GLXEXT_LEGACY" \
- CXXFLAGS="%{rpmcflags} -fPIC -DGLX_GLXEXT_LEGACY \$(CXXINCS)
-DIRRLICHT_EXPORTS=1"
+ CXXFLAGS="%{rpmcflags} -fPIC -DGLX_GLXEXT_LEGACY \$(CXXINCS)
-DIRRLICHT_EXPORTS=1" \
+ LDFLAGS="%{rpmldflags} -lz -lpng -ljpeg -lbz2 -lX11 -lXxf86vm -lGL"
%install
rm -rf $RPM_BUILD_ROOT
@@ -117,7 +122,7 @@
%files
%defattr(644,root,root,755)
%doc changes.txt readme.txt doc
-%attr(755,root,root) %{_libdir}/libIrrlicht.so.*.*
+%attr(755,root,root) %{_libdir}/libIrrlicht.so.*.*.*
%attr(755,root,root) %ghost %{_libdir}/libIrrlicht.so.1
%files devel
@@ -140,6 +145,11 @@
All persons listed below can be reached at <cvs_login>@pld-linux.org
$Log$
+Revision 1.30 2010/02/04 16:26:39 sparky
+- force using system zlib, libpng and libjpeg
+- link with libs requires, no more missing symbols
+- BR: OpenGL-devel instead of OpenGL-GLU-devel
+
Revision 1.29 2010/02/04 09:27:18 lisu
- BR: bzip2-devel
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/irrlicht/irrlicht.spec?r1=1.29&r2=1.30&f=u
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
