r4047 - in packages/trunk/ogre/debian: . patches
Andres Mejia
ceros-guest at alioth.debian.org
Mon Sep 3 16:21:30 UTC 2007
Author: ceros-guest
Date: 2007-09-03 16:21:30 +0000 (Mon, 03 Sep 2007)
New Revision: 4047
Added:
packages/trunk/ogre/debian/patches/
packages/trunk/ogre/debian/patches/disable_samples.diff
packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff
packages/trunk/ogre/debian/patches/makefile_modifications.diff
packages/trunk/ogre/debian/patches/series
Log:
Checking in patches for ogre
Added: packages/trunk/ogre/debian/patches/disable_samples.diff
===================================================================
--- packages/trunk/ogre/debian/patches/disable_samples.diff (rev 0)
+++ packages/trunk/ogre/debian/patches/disable_samples.diff 2007-09-03 16:21:30 UTC (rev 4047)
@@ -0,0 +1,180 @@
+--- ./acinclude.m4.bak 2007-08-28 22:44:31.000000000 -0400
++++ ./acinclude.m4 2007-08-28 22:53:48.000000000 -0400
+@@ -450,14 +450,12 @@
+ 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])
++ Samples/Common/CEGUIRenderer/include/Makefile])
+ AC_SUBST(CEGUI_CFLAGS)
+ AC_SUBST(CEGUI_LIBS)
+- AC_MSG_RESULT([CEGUI available, Gui and FacialAnimation samples will be built])
++ AC_MSG_RESULT([CEGUI available, Renderer will be built])
+ else
+- AC_MSG_RESULT([CEGUI not available, Gui and FacialAnimation samples will not be built])
++ AC_MSG_RESULT([CEGUI not available, Renderer will not be built])
+ fi
+ AM_CONDITIONAL([HAVE_CEGUI], [test x$build_cegui_sample = xtrue])
+ ])
+@@ -588,6 +586,12 @@
+ AC_SUBST(GTK_LIBS)
+ ])
+
++dnl Check whether Ogre platform and GUI to be built are the same
++dnl Fixes problem with running make distclean
++AC_DEFUN([OGRE_PLATFORM_AND_GUI],
++[AM_CONDITIONAL(SAME_PLATFORM_AND_GUI, test "x$OGRE_PLATFORM" = "x$OGRE_GUI")
++])
++
+ dnl SSE support
+ AC_DEFUN([OGRE_CHECK_SSE],
+ [
+--- ./configure.in.bak 2007-08-29 00:09:01.000000000 -0400
++++ ./configure.in 2007-08-29 00:09:15.000000000 -0400
+@@ -93,6 +93,10 @@
+ OGRE_CHECK_DX9
+ OGRE_CHECK_SSE
+
++dnl Check to see if Ogre platform and GUI are the same
++dnl Fixes problem running make distclean when both are set to GLX
++OGRE_PLATFORM_AND_GUI
++
+ dnl Check to see if user wants to disable building of demos (defaults is to build) - also checks for OIS
+ OGRE_BUILD_DEMOS
+
+@@ -109,6 +113,14 @@
+ CXXFLAGS="$CXXFLAGS"
+ LIBS="$LIBS"
+
++dnl Added versioning info. Versioning info doesn't exist upstream.
++dnl This should end with a versuffix of 14.0.4
++OGREMAIN_CURRENT=14
++OGREMAIN_REVISION=4
++OGREMAIN_AGE=0
++OGREMAIN_VERSION_INFO=$OGREMAIN_CURRENT:$OGREMAIN_REVISION:$OGREMAIN_AGE
++AC_SUBST(OGREMAIN_VERSION_INFO)
++
+ dnl Define samples absolute install path
+ ogreexecdir='${abs_top_builddir}/Samples/Common/bin'
+ AC_SUBST(abs_top_builddir)
+@@ -150,86 +162,6 @@
+ 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 \
+ Tests/Makefile \
+ Tests/src/Makefile \
+ Tools/Makefile \
+@@ -265,7 +197,6 @@
+ echo " Use FreeImage : $build_freeimage"
+ echo " Use DevIL : $build_il"
+ echo " Build OGRE demos : $build_ogre_demos"
+-test "x$build_ogre_demos" == "xyes" && \
+ echo " Build CEGUI demos : $build_cegui_sample"
+ echo " Build the OpenEXR plugin : $build_exr"
+ echo " Build the Cg plugin : $build_cg"
+--- ./Samples/Common/Makefile.am.bak 2007-08-28 16:27:47.000000000 -0400
++++ ./Samples/Common/Makefile.am 2007-08-28 17:04:04.000000000 -0400
+@@ -1,5 +1 @@
+-SUBDIRS = include bin
+-
+-if HAVE_CEGUI
+-SUBDIRS += CEGUIRenderer
++SUBDIRS = CEGUIRenderer
+-endif
+--- ./Samples/Makefile.am.bak 2007-08-28 16:31:00.000000000 -0400
++++ ./Samples/Makefile.am 2007-08-28 17:05:34.000000000 -0400
+@@ -1,12 +1 @@
+ SUBDIRS = Common
+-
+-if OGRE_BUILDING_DEMOS
+- SUBDIRS += SkeletalAnimation BezierPatch EnvMapping Transpacency Lighting \
+- ParticleFX TextureFX SkyDome BSP SkyPlane SkyBox CameraTrack Terrain \
+- RenderToTexture Water CubeMapping Dot3Bump Smoke CelShading Fresnel \
+- DynTex VolumeTex Grass DeferredShading
+-
+-if HAVE_CEGUI
+- SUBDIRS += Gui FacialAnimation OceanDemo Compositor Shadows Instancing
+-endif
+-endif
Added: packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff
===================================================================
--- packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff (rev 0)
+++ packages/trunk/ogre/debian/patches/fix_soname_and_rpath.diff 2007-09-03 16:21:30 UTC (rev 4047)
@@ -0,0 +1,20 @@
+--- ./OgreMain/src/Makefile.am.bak 2007-08-28 16:53:42.000000000 -0400
++++ ./OgreMain/src/Makefile.am 2007-08-28 17:07:13.000000000 -0400
+@@ -185,7 +185,7 @@
+
+ platformdir = $(libdir)
+ libOgreMain_la_LIBADD= $(STLPORT_LIBS) $(FT2_LIBS) $(ZZIPLIB_LIBS) $(GTK_LIBS) $(OGRE_THREAD_LIBS) $(PLATFORM_LIBS)
+-libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -release @PACKAGE_VERSION@ -Wl,-rpath,$(platformdir)
++libOgreMain_la_LDFLAGS = $(SHARED_FLAGS) -version-info @OGREMAIN_VERSION_INFO@
+ #-version-info @OGREMAIN_VERSION_INFO@ -Wl,-rpath,$(platformdir)
+ #-Wl,--version-script=$(top_srcdir)/OgreMain/src/ogremain.map
+
+--- ./Samples/Common/CEGUIRenderer/src/Makefile.am.bak 2007-08-28 16:54:12.000000000 -0400
++++ ./Samples/Common/CEGUIRenderer/src/Makefile.am 2007-08-28 17:07:37.000000000 -0400
+@@ -4,5 +4,5 @@
+
+ libCEGUIOgreRenderer_la_SOURCES = OgreCEGUIRenderer.cpp OgreCEGUITexture.cpp OgreCEGUIResourceProvider.cpp
+ libCEGUIOgreRenderer_la_LIBADD = $(STLPORT_LIBS)
+-libCEGUIOgreRenderer_la_LDFLAGS = -release @PACKAGE_VERSION@
++libCEGUIOgreRenderer_la_LDFLAGS = -version-info @OGREMAIN_VERSION_INFO@
+
Added: packages/trunk/ogre/debian/patches/makefile_modifications.diff
===================================================================
--- packages/trunk/ogre/debian/patches/makefile_modifications.diff (rev 0)
+++ packages/trunk/ogre/debian/patches/makefile_modifications.diff 2007-09-03 16:21:30 UTC (rev 4047)
@@ -0,0 +1,11 @@
+--- ./OgreMain/include/Makefile.am.bak 2007-08-28 22:21:38.000000000 -0400
++++ ./OgreMain/include/Makefile.am 2007-08-28 22:23:44.000000000 -0400
+@@ -1,4 +1,7 @@
+-SUBDIRS = $(OGRE_PLATFORM) $(OGRE_GUI)
++if !SAME_PLATFORM_AND_GUI
++ INCLUDE_SUBDIRS = $(OGRE_GUI)
++endif
++SUBDIRS = $(OGRE_PLATFORM) $(INCLUDE_SUBDIRS)
+
+ pkginclude_HEADERS = Ogre.h \
+ OgreAlignedAllocator.h \
Added: packages/trunk/ogre/debian/patches/series
===================================================================
--- packages/trunk/ogre/debian/patches/series (rev 0)
+++ packages/trunk/ogre/debian/patches/series 2007-09-03 16:21:30 UTC (rev 4047)
@@ -0,0 +1,3 @@
+disable_samples.diff
+fix_soname_and_rpath.diff
+makefile_modifications.diff
More information about the Pkg-games-commits
mailing list