Author: atorkhov Update of /cvs/nonfree/rpms/ogre-cg/devel In directory se02.es.rpmfusion.net:/tmp/cvs-serv17566 Modified Files: .cvsignore ogre-cg.spec sources Added Files: ogre-1.6.1-cg.patch Removed Files: ogre-1.6.0-cg.patch Log Message: * Mon Mar 02 2009 Alexey Torkhov <atorkhov(a)gmail.com&gt; - 1.6.1-1 - New OGRE release 1.6.1 ogre-1.6.1-cg.patch: --- NEW FILE ogre-1.6.1-cg.patch --- diff -ur ogre.orig/acinclude.m4 ogre/acinclude.m4 --- ogre.orig/acinclude.m4 2008-12-30 20:00:47.000000000 +0300 +++ ogre/acinclude.m4 2009-03-02 11:15:13.000000000 +0300 @@ -305,19 +305,7 @@ [build_exr=$enableval], [build_exr=no]) -if test "x$build_exr" = "xyes" ; then - PKG_CHECK_MODULES(OPENEXR, OpenEXR, [build_exr=yes], [build_exr=no]) - - if test "x$build_exr" = "xyes" ; then - AC_CONFIG_FILES([ PlugIns/EXRCodec/Makefile \ - PlugIns/EXRCodec/src/Makefile \ - PlugIns/EXRCodec/include/Makefile]) - AC_SUBST(OPENEXR_CFLAGS) - AC_SUBST(OPENEXR_LIBS) - - fi - -fi +build_exr="no" AM_CONDITIONAL(BUILD_EXRPLUGIN, test x$build_exr = xyes) @@ -446,19 +434,7 @@ AC_DEFUN([OGRE_CHECK_CEGUI], [ PKG_CHECK_MODULES(CEGUI, CEGUI >= 0.5.0, [build_cegui_sample=true], [build_cegui_sample=false]) - if test x$build_cegui_sample = xtrue; then - AC_CONFIG_FILES([Samples/Common/CEGUIRenderer/Makefile \ - Samples/Common/CEGUIRenderer/CEGUI-OGRE.pc - Samples/Common/CEGUIRenderer/src/Makefile \ - Samples/Common/CEGUIRenderer/include/Makefile \ - Samples/Gui/Makefile \ - Samples/Gui/src/Makefile]) - AC_SUBST(CEGUI_CFLAGS) - AC_SUBST(CEGUI_LIBS) - AC_MSG_RESULT([CEGUI available, Gui and FacialAnimation samples will be built]) - else - AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built]) - fi + build_cegui_sample="false" AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue]) ]) diff -ur ogre.orig/configure.in ogre/configure.in --- ogre.orig/configure.in 2009-01-22 16:37:31.000000000 +0300 +++ ogre/configure.in 2009-03-02 11:17:21.000000000 +0300 @@ -77,9 +77,13 @@ AC_SUBST(ZZIPLIB_CFLAGS) AC_SUBST(ZZIPLIB_LIBS) +PKG_CHECK_MODULES(OGRE, OGRE) +CXXFLAGS="$CXXFLAGS $OGRE_CFLAGS" +LDFLAGS="$LDFLAGS $OGRE_LIBS" + dnl Get the GL and Platform libs for target build OGRE_GET_PLATFORM -OGRE_GET_GLSUPPORT +dnl OGRE_GET_GLSUPPORT dnl Find the optional components we should build OGRE_CHECK_GUI @@ -122,150 +126,10 @@ dnl Create the makefiles AC_CONFIG_FILES([Makefile \ - OgreMain/Makefile \ - OgreMain/src/Makefile \ - OgreMain/include/Makefile \ - OgreMain/include/GLX/Makefile \ - OgreMain/include/gtk/Makefile \ PlugIns/Makefile \ - PlugIns/BSPSceneManager/Makefile \ - PlugIns/BSPSceneManager/src/Makefile \ - PlugIns/BSPSceneManager/include/Makefile \ PlugIns/CgProgramManager/Makefile \ PlugIns/CgProgramManager/src/Makefile \ - PlugIns/CgProgramManager/include/Makefile \ - PlugIns/OctreeSceneManager/Makefile \ - PlugIns/OctreeSceneManager/src/Makefile \ - PlugIns/OctreeSceneManager/include/Makefile \ - PlugIns/OctreeZone/Makefile \ - PlugIns/OctreeZone/src/Makefile \ - PlugIns/OctreeZone/include/Makefile \ - PlugIns/ParticleFX/Makefile \ - PlugIns/ParticleFX/src/Makefile \ - PlugIns/ParticleFX/include/Makefile \ - PlugIns/PCZSceneManager/Makefile \ - PlugIns/PCZSceneManager/src/Makefile \ - PlugIns/PCZSceneManager/include/Makefile \ - RenderSystems/Makefile \ - RenderSystems/GL/Makefile \ - RenderSystems/GL/src/Makefile \ - RenderSystems/GL/include/Makefile \ - RenderSystems/GL/src/atifs/Makefile \ - RenderSystems/GL/src/atifs/include/Makefile \ - RenderSystems/GL/src/atifs/src/Makefile \ - RenderSystems/GL/src/GLSL/Makefile \ - RenderSystems/GL/src/GLSL/include/Makefile \ - RenderSystems/GL/src/GLSL/src/Makefile \ - RenderSystems/GL/src/nvparse/Makefile \ - RenderSystems/Direct3D9/Makefile \ - RenderSystems/Direct3D9/src/Makefile \ - RenderSystems/Direct3D9/include/Makefile \ - Samples/Makefile \ - Samples/Common/Makefile \ - Samples/Common/include/Makefile \ - Samples/Common/bin/Makefile \ - Samples/BezierPatch/Makefile \ - Samples/BezierPatch/src/Makefile \ - Samples/BezierPatch/include/Makefile \ - Samples/CameraTrack/Makefile \ - Samples/CameraTrack/src/Makefile \ - Samples/CelShading/Makefile \ - Samples/CelShading/src/Makefile \ - Samples/Compositor/Makefile \ - Samples/Compositor/src/Makefile \ - Samples/Compositor/include/Makefile \ - Samples/CubeMapping/Makefile \ - Samples/CubeMapping/src/Makefile \ - Samples/CubeMapping/include/Makefile \ - Samples/DeferredShading/Makefile \ - Samples/DeferredShading/src/Makefile \ - Samples/DeferredShading/include/Makefile \ - Samples/Dot3Bump/Makefile \ - Samples/Dot3Bump/src/Makefile \ - Samples/EnvMapping/Makefile \ - Samples/EnvMapping/src/Makefile \ - Samples/EnvMapping/include/Makefile \ - Samples/FacialAnimation/Makefile \ - Samples/FacialAnimation/src/Makefile \ - Samples/Fresnel/Makefile \ - Samples/Fresnel/src/Makefile \ - Samples/Grass/Makefile \ - Samples/Grass/src/Makefile \ - Samples/Transpacency/Makefile \ - Samples/Transpacency/src/Makefile \ - Samples/Transpacency/include/Makefile \ - Samples/Lighting/Makefile \ - Samples/Lighting/src/Makefile \ - Samples/Lighting/include/Makefile \ - Samples/OceanDemo/Makefile \ - Samples/OceanDemo/src/Makefile \ - Samples/OceanDemo/include/Makefile \ - Samples/ParticleFX/Makefile \ - Samples/ParticleFX/src/Makefile \ - Samples/ParticleFX/include/Makefile \ - Samples/RenderToTexture/Makefile \ - Samples/RenderToTexture/src/Makefile \ - Samples/TextureFX/Makefile \ - Samples/TextureFX/src/Makefile \ - Samples/TextureFX/include/Makefile \ - Samples/Shadows/Makefile \ - Samples/Shadows/src/Makefile \ - Samples/SkyBox/Makefile \ - Samples/SkyBox/src/Makefile \ - Samples/SkyBox/include/Makefile \ - Samples/SkyDome/Makefile \ - Samples/SkyDome/src/Makefile \ - Samples/SkyDome/include/Makefile \ - Samples/SkyPlane/Makefile \ - Samples/SkyPlane/src/Makefile \ - Samples/SkyPlane/include/Makefile \ - Samples/Smoke/Makefile \ - Samples/Smoke/src/Makefile \ - Samples/Smoke/include/Makefile \ - Samples/BSP/Makefile \ - Samples/BSP/src/Makefile \ - Samples/SkeletalAnimation/Makefile \ - Samples/SkeletalAnimation/src/Makefile \ - Samples/SkeletalAnimation/include/Makefile \ - Samples/Terrain/Makefile \ - Samples/Terrain/src/Makefile \ - Samples/Terrain/include/Makefile \ - Samples/Water/Makefile \ - Samples/Water/src/Makefile \ - Samples/Water/include/Makefile \ - Samples/DynTex/Makefile \ - Samples/DynTex/src/Makefile \ - Samples/DynTex/include/Makefile \ - Samples/VolumeTex/Makefile \ - Samples/VolumeTex/src/Makefile \ - Samples/VolumeTex/include/Makefile \ - Samples/Instancing/Makefile \ - Samples/Instancing/src/Makefile \ - Samples/Instancing/include/Makefile \ - Samples/Isosurf/Makefile \ - Samples/Isosurf/src/Makefile \ - Samples/ParticleGS/Makefile \ - Samples/ParticleGS/src/Makefile \ - Samples/PCZTestApp/Makefile \ - Samples/PCZTestApp/src/Makefile \ - Samples/PCZTestApp/include/Makefile \ - Tests/Makefile \ - Tests/src/Makefile \ - Tools/Makefile \ - Tools/MaterialUpgrader/Makefile \ - Tools/MaterialUpgrader/src/Makefile \ - Tools/MaterialUpgrader/include/Makefile \ - Tools/MeshUpgrader/Makefile \ - Tools/MeshUpgrader/src/Makefile \ - Tools/XMLConverter/Makefile \ - Tools/XMLConverter/src/Makefile \ - Tools/XMLConverter/include/Makefile \ - Tools/rcapsdump/Makefile \ - Tools/rcapsdump/src/Makefile \ - Tools/LightwaveConverter/Makefile \ - Tools/LightwaveConverter/src/Makefile \ - Tools/LightwaveConverter/include/Makefile \ - OGRE.pc + PlugIns/CgProgramManager/include/Makefile ]) AC_OUTPUT diff -ur ogre.orig/Makefile.am ogre/Makefile.am --- ogre.orig/Makefile.am 2008-06-12 18:10:57.000000000 +0400 +++ ogre/Makefile.am 2009-03-02 11:15:13.000000000 +0300 @@ -1,6 +1,3 @@ -SUBDIRS = OgreMain PlugIns RenderSystems Samples Tools Tests +SUBDIRS = PlugIns ACLOCAL_AMFLAGS = -I Scripts/m4 AUTOMAKE_OPTIONS = foreign - -pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = OGRE.pc diff -ur ogre.orig/PlugIns/Makefile.am ogre/PlugIns/Makefile.am --- ogre.orig/PlugIns/Makefile.am 2008-10-11 18:51:18.000000000 +0400 +++ ogre/PlugIns/Makefile.am 2009-03-02 11:18:51.000000000 +0300 @@ -1,9 +1,5 @@ -SUBDIRS = BSPSceneManager ParticleFX OctreeSceneManager PCZSceneManager OctreeZone +SUBDIRS = if BUILD_CGPLUGIN SUBDIRS += CgProgramManager endif - -if BUILD_EXRPLUGIN -SUBDIRS += EXRCodec -endif Index: .cvsignore =================================================================== RCS file: /cvs/nonfree/rpms/ogre-cg/devel/.cvsignore,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- .cvsignore 2 Oct 2008 19:36:11 -0000 1.3 +++ .cvsignore 2 Mar 2009 08:41:59 -0000 1.4 @@ -1 +1 @@ -ogre-1.6.0-cg.tar.bz2 +ogre-1.6.1-cg.tar.bz2 Index: ogre-cg.spec =================================================================== RCS file: /cvs/nonfree/rpms/ogre-cg/devel/ogre-cg.spec,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- ogre-cg.spec 2 Oct 2008 19:36:11 -0000 1.2 +++ ogre-cg.spec 2 Mar 2009 08:42:01 -0000 1.3 @@ -1,6 +1,6 @@ Name: ogre-cg -Version: 1.6.0 -Release: 0.1.rc1%{?dist} +Version: 1.6.1 +Release: 1%{?dist} Summary: Object-Oriented Graphics Rendering Engine License: LGPLv2+ Group: System Environment/Libraries @@ -9,16 +9,16 @@ # stripped all except CgProgramManager plugin and core files needed to build it Source0: ogre-%{version}-cg.tar.bz2 # Patch striping everything except CgProgramManager from compilation -Patch0: ogre-1.6.0-cg.patch +Patch0: ogre-1.6.1-cg.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildRequires: zziplib-devel libXaw-devel libXrandr-devel libXxf86vm-devel BuildRequires: autoconf automake libtool # We are building only plugin, so we need main lib -BuildRequires: ogre-devel +BuildRequires: ogre-devel = %{version} # Cg package BuildRequires: Cg -ExclusiveArch: i386 x86_64 +ExclusiveArch: %{ix86} x86_64 Requires: ogre = %{version} @@ -64,6 +64,9 @@ %changelog +* Mon Mar 02 2009 Alexey Torkhov <atorkhov(a)gmail.com&gt; - 1.6.1-1 +- New OGRE release 1.6.1 + * Thu Oct 2 2008 Alexey Torkhov <atorkhov(a)gmail.com&gt; 1.6.0-0.1.rc1 - New upstream release 1.6.0rc1 Index: sources =================================================================== RCS file: /cvs/nonfree/rpms/ogre-cg/devel/sources,v retrieving revision 1.3 retrieving revision 1.4 diff -u -r1.3 -r1.4 --- sources 2 Oct 2008 19:36:11 -0000 1.3 +++ sources 2 Mar 2009 08:42:01 -0000 1.4 @@ -1 +1 @@ -88395dfbf21d386d5387107cd0779038 ogre-1.6.0-cg.tar.bz2 +dbb7d3af4308af5749007af4cacec696 ogre-1.6.1-cg.tar.bz2 --- ogre-1.6.0-cg.patch DELETED ---