ogre-libre: remove more nonfree references from libre.patch

2 files changed, 304 insertions, 30 deletions

diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index f91855322..e7bf84fcf 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -45,17 +45,17 @@ makedepends=(
 )
 mksource=(
   ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-}
-  libre.patch
 )
 source=(
   https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz
+  libre.patch
 )
 mksha512sums=(
   SKIP
-  e668b39e4784e4b1b17ec6e21b5cef45f29a8d8e73288817ce7832d1fe24527d5e0d4fd67b8f756db301e4211ceac2d5c387c1599e799ca41de0593457204767
 )
 sha512sums=(
-  9be9dbd78e09c8c50cf833004bfa3fbb7b3cd2a0f52a4e8c4beb1eb30357625455d65906bd007be6c2be9cf90a0e335d5ad7c5011e038c3d0754d5b3b18c4a2a
+  13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412
+  5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316
 )
 
 mksource() {
@@ -67,12 +67,14 @@ mksource() {
   rm -rv Samples/Media/materials/textures/nvidia
   rm -v Samples/Media/packs/chiropteraDM.{pk3,txt}
   rm -v CMake/Templates/quakemap{,_d}.cfg.in
-  patch -Np1 -i $srcdir/libre.patch
 }
 
 prepare() {
   cd ${pkgbase}
 
+  # remove nonfree references
+  patch -Np1 -i $srcdir/libre.patch
+
   # add symlinks to point to mesa header files
   cd RenderSystems/GL/include/GL
   ln -sv /usr/include/GL/gl.h gl.h
@@ -146,7 +148,7 @@ package_ogre-libre() {
   # install license
   install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html
 
-  # remove nonfree files
+  # remove files only useful for nonfree software
   rm -vr $pkgdir/usr/lib/OGRE/cmake
   rm -v $pkgdir/usr/include/OGRE/Example*.h
 }
diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch
index 77c32c8d4..e9a1846b1 100644
--- a/libre/ogre-libre/libre.patch
+++ b/libre/ogre-libre/libre.patch
@@ -1,6 +1,6 @@
 diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake
---- ogre.orig/CMake/InstallResources.cmake	2014-01-15 01:56:25.549401653 -0200
-+++ ogre/CMake/InstallResources.cmake	2014-01-21 21:24:52.510763877 -0200
+--- ogre.orig/CMake/InstallResources.cmake	2014-03-31 16:44:40.544894640 -0300
++++ ogre/CMake/InstallResources.cmake	2014-03-31 16:59:12.012359302 -0300
 @@ -116,9 +116,6 @@
  # create plugins.cfg
  configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
@@ -11,7 +11,47 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma
  # create samples.cfg
  configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg)
  configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg)
-@@ -219,11 +216,6 @@
+@@ -133,7 +130,6 @@
+     ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/debug/samples_d.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/debug/tests_d.cfg
+-    ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg
+     DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_DEBUG_PATH}" CONFIGURATIONS Debug
+   )
+   install(FILES 
+@@ -141,7 +137,6 @@
+     ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+-    ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
+     DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}" CONFIGURATIONS Release None ""
+   )
+   install(FILES 
+@@ -149,7 +144,6 @@
+     ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+-    ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
+ 	DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELWDBG_PATH}" CONFIGURATIONS RelWithDebInfo
+   )
+   install(FILES 
+@@ -157,7 +151,6 @@
+     ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
+ 	${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+-    ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
+ 	DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_MINSIZE_PATH}" CONFIGURATIONS MinSizeRel
+   )
+ 
+@@ -168,7 +161,6 @@
+       ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg
+       ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
+       ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
+-      ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg
+       DESTINATION "${OGRE_CFG_INSTALL_PATH}${OGRE_RELEASE_PATH}"
+     )
+   endif()
+@@ -219,11 +211,6 @@
    configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/release/plugins.cfg)
    configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/plugins.cfg)
    configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/plugins.cfg)
@@ -23,9 +63,40 @@ diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cma
    # create samples.cfg
    configure_file(${OGRE_TEMPLATES_DIR}/samples_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/samples_d.cfg)
    configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/release/samples.cfg)
+@@ -243,8 +230,6 @@
+   configure_file(${OGRE_TEMPLATES_DIR}/resources${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg)
+   # create plugins.cfg
+   configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg)
+-  # create quakemap.cfg
+-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg)
+   # create samples.cfg
+   configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg)
+   # create tests.cfg
+diff -Nur ogre.orig/CMake/Templates/Android_resources.cfg.in ogre/CMake/Templates/Android_resources.cfg.in
+--- ogre.orig/CMake/Templates/Android_resources.cfg.in	2014-03-31 16:44:40.591560636 -0300
++++ ogre/CMake/Templates/Android_resources.cfg.in	2014-03-31 17:02:01.633252779 -0300
+@@ -12,7 +12,6 @@
+ APKFileSystem=/materials/programs/GLSLES
+ APKFileSystem=/materials/scripts
+ APKFileSystem=/materials/textures
+-APKFileSystem=/materials/textures/nvidia
+ APKFileSystem=/models
+ APKFileSystem=/particle
+ APKFileSystem=/RTShaderLib
+diff -Nur ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in ogre/CMake/Templates/SDK_CMakeLists.txt.in
+--- ogre.orig/CMake/Templates/SDK_CMakeLists.txt.in	2014-03-31 16:44:40.618226919 -0300
++++ ogre/CMake/Templates/SDK_CMakeLists.txt.in	2014-03-31 16:59:35.715351689 -0300
+@@ -245,7 +245,6 @@
+   configure_file(${OGRE_SOURCE_DIR}/plugins.cfg ${OGRE_BINARY_DIR}/bin/plugins.cfg COPYONLY)
+   configure_file(${OGRE_SOURCE_DIR}/resources.cfg ${OGRE_BINARY_DIR}/bin/resources.cfg COPYONLY)
+   configure_file(${OGRE_SOURCE_DIR}/samples.cfg ${OGRE_BINARY_DIR}/bin/samples.cfg COPYONLY)
+-  configure_file(${OGRE_SOURCE_DIR}/quakemap.cfg ${OGRE_BINARY_DIR}/bin/quakemap.cfg COPYONLY)
+ endif ()
+ 
+ if (MINGW)
 diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demomedia.wxi.in
---- ogre.orig/CMake/Templates/demomedia.wxi.in	2014-01-15 01:56:25.652728172 -0200
-+++ ogre/CMake/Templates/demomedia.wxi.in	2014-01-21 21:49:24.962291640 -0200
+--- ogre.orig/CMake/Templates/demomedia.wxi.in	2014-03-31 16:44:40.628226774 -0300
++++ ogre/CMake/Templates/demomedia.wxi.in	2014-03-31 16:51:57.408610715 -0300
 @@ -295,13 +295,6 @@
              <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" />
              <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" />
@@ -99,9 +170,113 @@ diff -Nur ogre.orig/CMake/Templates/demomedia.wxi.in ogre/CMake/Templates/demome
 -</Include>
 \ No newline at end of file
 +</Include>
+diff -Nur ogre.orig/CMake/Templates/demos.wxs.in ogre/CMake/Templates/demos.wxs.in
+--- ogre.orig/CMake/Templates/demos.wxs.in	2014-03-31 16:44:40.631560060 -0300
++++ ogre/CMake/Templates/demos.wxs.in	2014-03-31 16:59:50.921799622 -0300
+@@ -39,7 +39,6 @@
+             <File Source='..\bin\release\samples.cfg' Vital='yes' />
+             <!-- Following config files are tweaked locally -->
+             <File Source='.\resources.cfg' Vital='yes' />
+-            <File Source='.\quakemap.cfg' Vital='yes' />
+ 
+             <File Source="..\bin\release\SampleBrowser.exe" />
+             <File Source='..\bin\release\Sample_BezierPatch.dll' Vital='yes' />
+diff -Nur ogre.orig/CMake/Templates/resources.cfg.in ogre/CMake/Templates/resources.cfg.in
+--- ogre.orig/CMake/Templates/resources.cfg.in	2014-03-31 16:44:40.641559915 -0300
++++ ogre/CMake/Templates/resources.cfg.in	2014-03-31 17:02:35.802761281 -0300
+@@ -12,7 +12,6 @@
+ FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs
+ FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts
+ FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures
+-FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures/nvidia
+ FileSystem=@OGRE_MEDIA_DIR_REL@/models
+ FileSystem=@OGRE_MEDIA_DIR_REL@/particle
+ FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia
+diff -Nur ogre.orig/CMake/Templates/resources_d.cfg.in ogre/CMake/Templates/resources_d.cfg.in
+--- ogre.orig/CMake/Templates/resources_d.cfg.in	2014-03-31 16:44:40.644893200 -0300
++++ ogre/CMake/Templates/resources_d.cfg.in	2014-03-31 17:02:14.183072260 -0300
+@@ -12,7 +12,6 @@
+ FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/programs
+ FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/scripts
+ FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures
+-FileSystem=@OGRE_MEDIA_DIR_DBG@/materials/textures/nvidia
+ FileSystem=@OGRE_MEDIA_DIR_DBG@/models
+ FileSystem=@OGRE_MEDIA_DIR_DBG@/particle
+ FileSystem=@OGRE_MEDIA_DIR_DBG@/DeferredShadingMedia
+diff -Nur ogre.orig/Samples/BSP/include/BSP.h ogre/Samples/BSP/include/BSP.h
+--- ogre.orig/Samples/BSP/include/BSP.h	2014-03-31 16:44:40.718225480 -0300
++++ ogre/Samples/BSP/include/BSP.h	2014-03-31 16:58:16.993150707 -0300
+@@ -19,7 +19,6 @@
+ 	{
+ 		mInfo["Title"] = "BSP";
+ 		mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. "
+-			"Also demonstrates how to load BSP maps from Quake 3.";
+ 		mInfo["Thumbnail"] = "thumb_bsp.png";
+ 		mInfo["Category"] = "Geometry";
+ 	}
+@@ -43,27 +42,6 @@
+ 
+ protected:
+ 
+-	void locateResources()
+-	{
+-		// load the Quake archive location and map name from a config file
+-		ConfigFile cf;
+-		cf.load(mFSLayer->getConfigFilePath("quakemap.cfg"));
+-		mArchive = cf.getSetting("Archive");
+-		mMap = cf.getSetting("Map");
+-
+-#if OGRE_PLATFORM == OGRE_PLATFORM_APPLE || OGRE_PLATFORM == OGRE_PLATFORM_APPLE_IOS
+-        // OS X does not set the working directory relative to the app,
+-        // In order to make things portable on OS X we need to provide
+-        // the loading with it's own bundle path location
+-        if (!Ogre::StringUtil::startsWith(mArchive, "/", false)) // only adjust relative dirs
+-            mArchive = Ogre::String(Ogre::macBundlePath() + "/" + mArchive);
+-#endif
+-        
+-		// add the Quake archive to the world resource group
+-		ResourceGroupManager::getSingleton().addResourceLocation(mArchive, "Zip",
+-			ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true);
+-	}
+-
+ 	void createSceneManager()
+ 	{
+ 		mSceneMgr = mRoot->createSceneManager("BspSceneManager");   // the BSP scene manager is required for this sample
+@@ -108,10 +86,6 @@
+ 		// set a random player starting point
+ 		ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true);
+ 
+-		// Quake uses the Z axis as the up axis, so make necessary adjustments
+-		mCamera->setFixedYawAxis(true, Vector3::UNIT_Z);
+-		mCamera->pitch(Degree(90));
+-
+ 		mCamera->setPosition(vp.position);
+ 		mCamera->rotate(vp.orientation);
+ 
+diff -Nur ogre.orig/Samples/Browser/CMakeLists.txt ogre/Samples/Browser/CMakeLists.txt
+--- ogre.orig/Samples/Browser/CMakeLists.txt	2014-03-31 16:44:40.734891905 -0300
++++ ogre/Samples/Browser/CMakeLists.txt	2014-03-31 16:54:51.716103447 -0300
+@@ -307,8 +307,6 @@
+ 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+ 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg 
+ 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+-		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/quakemap.cfg 
+-		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+ 		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media
+ 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+         COMMAND ditto 
+@@ -323,8 +321,6 @@
+ 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+ 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg 
+ 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+-		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg 
+-		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+ 		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media
+ 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
+         COMMAND ditto 
 diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj	2014-01-15 01:56:25.872713663 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj	2014-01-21 22:20:00.343185180 -0200
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj	2014-03-31 16:44:40.791557758 -0300
++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj	2014-03-31 16:51:57.408610715 -0300
 @@ -555,48 +555,6 @@
        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">false</ExcludedFromBuild>
        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
@@ -196,8 +371,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj ogre/Samples/
 \ No newline at end of file
 +</Project>
 diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters	2014-01-15 01:56:25.872713663 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters	2014-01-21 22:20:41.517291770 -0200
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters	2014-03-31 16:44:40.808224186 -0300
++++ ogre/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters	2014-03-31 16:51:57.411944001 -0300
 @@ -628,9 +628,6 @@
      <None Include="..\..\Media\models\Barrel.mesh">
        <Filter>Assets\media</Filter>
@@ -274,8 +449,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWP8.vcxproj.filters ogre/
 \ No newline at end of file
 +</Project>
 diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj	2014-01-15 01:56:25.896045457 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj	2014-01-21 21:53:56.997551091 -0200
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj	2014-03-31 16:44:40.821557325 -0300
++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj	2014-03-31 16:51:57.415277288 -0300
 @@ -4356,21 +4356,6 @@
        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">false</ExcludedFromBuild>
        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release with shader compiler|ARM'">false</ExcludedFromBuild>
@@ -440,8 +615,8 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Sample
 \ No newline at end of file
 +</Project>
 diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters
---- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters	2014-01-15 01:56:25.899378571 -0200
-+++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters	2014-01-21 21:54:56.166945128 -0200
+--- ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters	2014-03-31 16:44:40.918222604 -0300
++++ ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters	2014-03-31 16:51:57.415277288 -0300
 @@ -731,9 +731,6 @@
      <None Include="..\..\Media\models\Barrel.mesh">
        <Filter>Assets\media</Filter>
@@ -517,9 +692,31 @@ diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj.filters ogr
 -</Project>
 \ No newline at end of file
 +</Project>
+diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg ogre/Samples/Browser/WinRT.Xaml/resources.cfg
+--- ogre.orig/Samples/Browser/WinRT.Xaml/resources.cfg	2014-03-31 16:44:40.771558046 -0300
++++ ogre/Samples/Browser/WinRT.Xaml/resources.cfg	2014-03-31 17:00:55.510870562 -0300
+@@ -11,7 +11,6 @@
+ FileSystem=media/materials/programs
+ FileSystem=media/materials/scripts
+ FileSystem=media/materials/textures
+-FileSystem=media/materials/textures/nvidia
+ FileSystem=media/models
+ FileSystem=media/particle
+ FileSystem=media/DeferredShadingMedia
+diff -Nur ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg
+--- ogre.orig/Samples/Browser/WinRT.Xaml/resources_d.cfg	2014-03-31 16:44:40.771558046 -0300
++++ ogre/Samples/Browser/WinRT.Xaml/resources_d.cfg	2014-03-31 17:01:16.207239528 -0300
+@@ -11,7 +11,6 @@
+ FileSystem=media/materials/programs
+ FileSystem=media/materials/scripts
+ FileSystem=media/materials/textures
+-FileSystem=media/materials/textures/nvidia
+ FileSystem=media/models
+ FileSystem=media/particle
+ FileSystem=media/DeferredShadingMedia
 diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt
---- ogre.orig/Samples/CMakeLists.txt	2014-01-15 01:56:25.932709706 -0200
-+++ ogre/Samples/CMakeLists.txt	2014-01-21 21:23:53.145016405 -0200
+--- ogre.orig/Samples/CMakeLists.txt	2014-03-31 16:44:40.941555601 -0300
++++ ogre/Samples/CMakeLists.txt	2014-03-31 16:51:57.415277288 -0300
 @@ -238,7 +238,6 @@
  	set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL})
  	set(OGRE_MEDIA_DIR_REL "Media")
@@ -529,9 +726,9 @@ diff -Nur ogre.orig/Samples/CMakeLists.txt ogre/Samples/CMakeLists.txt
  	set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP})
      add_custom_target(demo_installer 
 diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/EndlessWorld/include/EndlessWorld.h
---- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h	2014-01-15 01:56:26.186026332 -0200
-+++ ogre/Samples/EndlessWorld/include/EndlessWorld.h	2014-01-21 21:51:44.043058960 -0200
-@@ -304,17 +304,6 @@
+--- ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h	2014-03-31 16:44:41.174885577 -0300
++++ ogre/Samples/EndlessWorld/include/EndlessWorld.h	2014-03-31 16:51:57.415277288 -0300
+@@ -307,17 +307,6 @@
  		defaultimp.inputScale = 600;
  		defaultimp.minBatchSize = 33;
  		defaultimp.maxBatchSize = 65;
@@ -550,8 +747,8 @@ diff -Nur ogre.orig/Samples/EndlessWorld/include/EndlessWorld.h ogre/Samples/End
  
  	/*-----------------------------------------------------------------------------
 diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material
---- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material	2014-01-15 01:56:27.849249967 -0200
-+++ ogre/Samples/Media/volumeTerrain/triplanarReference.material	2014-01-21 22:24:19.433708607 -0200
+--- ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material	2014-03-31 16:44:41.678211671 -0300
++++ ogre/Samples/Media/volumeTerrain/triplanarReference.material	2014-03-31 16:51:57.415277288 -0300
 @@ -11,36 +11,6 @@
              fragment_program_ref TriplanarReferenceHigh_PS    
              {
@@ -634,9 +831,9 @@ diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre
 \ No newline at end of file
 +}
 diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/include/Terrain.h
---- ogre.orig/Samples/Terrain/include/Terrain.h	2014-01-15 01:56:28.209226225 -0200
-+++ ogre/Samples/Terrain/include/Terrain.h	2014-01-21 21:55:51.099952029 -0200
-@@ -533,17 +533,6 @@
+--- ogre.orig/Samples/Terrain/include/Terrain.h	2014-03-31 16:44:42.381534889 -0300
++++ ogre/Samples/Terrain/include/Terrain.h	2014-03-31 16:51:57.415277288 -0300
+@@ -534,17 +534,6 @@
  		defaultimp.inputScale = 600;
  		defaultimp.minBatchSize = 33;
  		defaultimp.maxBatchSize = 65;
@@ -654,9 +851,21 @@ diff -Nur ogre.orig/Samples/Terrain/include/Terrain.h ogre/Samples/Terrain/inclu
  
  
  	}
+diff -Nur ogre.orig/Tests/CMakeLists.txt ogre/Tests/CMakeLists.txt
+--- ogre.orig/Tests/CMakeLists.txt	2014-03-31 16:44:42.431534168 -0300
++++ ogre/Tests/CMakeLists.txt	2014-03-31 16:55:11.432486511 -0300
+@@ -78,8 +78,6 @@
+             ${OGRE_TEST_CONTENTS_PATH}/Resources/
+             COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg 
+             ${OGRE_TEST_CONTENTS_PATH}/Resources/
+-            COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg 
+-            ${OGRE_TEST_CONTENTS_PATH}/Resources/
+             COMMAND ditto 
+             ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/
+             COMMAND ditto 
 diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen.cpp
---- ogre.orig/Tests/PlayPen/src/PlayPen.cpp	2014-01-15 01:56:28.309219629 -0200
-+++ ogre/Tests/PlayPen/src/PlayPen.cpp	2014-01-21 22:31:02.415114645 -0200
+--- ogre.orig/Tests/PlayPen/src/PlayPen.cpp	2014-03-31 16:44:42.661530860 -0300
++++ ogre/Tests/PlayPen/src/PlayPen.cpp	2014-03-31 16:51:57.418610574 -0300
 @@ -411,16 +411,6 @@
  //				mTerrain->update();
  //				updateDelay = 0.3;
@@ -692,3 +901,66 @@ diff -Nur ogre.orig/Tests/PlayPen/src/PlayPen.cpp ogre/Tests/PlayPen/src/PlayPen
  //		terrain->prepare(imp);
  //		terrain->load();
  //
+diff -Nur ogre.orig/Tests/VisualTests/Context/CMakeLists.txt ogre/Tests/VisualTests/Context/CMakeLists.txt
+--- ogre.orig/Tests/VisualTests/Context/CMakeLists.txt	2014-03-31 16:44:42.681530572 -0300
++++ ogre/Tests/VisualTests/Context/CMakeLists.txt	2014-03-31 16:55:35.265477026 -0300
+@@ -137,8 +137,6 @@
+ 		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
+ 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg
+ 		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
+-		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/quakemap.cfg
+-		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
+ 		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/tests.cfg
+ 		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
+ 		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media
+diff -Nur ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp
+--- ogre.orig/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp	2014-03-31 16:44:42.711530141 -0300
++++ ogre/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp	2014-03-31 16:56:35.361279265 -0300
+@@ -2018,47 +2018,6 @@
+     addScreenshotFrame(10);
+ }
+ //----------------------------------------------------------------------------
+-
+-void PlayPen_Bsp::setupContent()
+-{
+-    // Load Quake3 locations from a file
+-    ConfigFile cf;
+-    
+-    cf.load(mFSLayer->getConfigFilePath("quakemap.cfg"));
+-    
+-    String quakePk3 = cf.getSetting("Archive");
+-    String quakeLevel = cf.getSetting("Map");
+-    
+-    //ResourceGroupManager::getSingleton().addResourceLocation(quakePk3, "Zip");
+-
+-    ResourceGroupManager::getSingleton().addResourceLocation(
+-        quakePk3, "Zip",
+-        ResourceGroupManager::getSingleton().getWorldResourceGroupName(), true);
+-    
+-    // Load world geometry
+-    //mSceneMgr->setWorldGeometry(quakeLevel);
+-
+-    ResourceGroupManager& rgm = ResourceGroupManager::getSingleton();
+-    rgm.linkWorldGeometryToResourceGroup(rgm.getWorldResourceGroupName(), quakeLevel, mSceneMgr);
+-    rgm.initialiseResourceGroup(rgm.getWorldResourceGroupName());
+-    rgm.loadResourceGroup(rgm.getWorldResourceGroupName(), false);
+-    
+-    // modify camera for close work
+-    mCamera->setNearClipDistance(4);
+-    mCamera->setFarClipDistance(4000);
+-    
+-    // Also change position, and set Quake-type orientation
+-    // Get random player start point
+-    ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true);
+-    mCamera->setPosition(vp.position);
+-    mCamera->pitch(Degree(90)); // Quake uses X/Y horizon, Z up
+-    mCamera->rotate(vp.orientation);
+-    // Don't yaw along variable axis, causes leaning
+-    mCamera->setFixedYawAxis(true, Vector3::UNIT_Z);
+-
+-    mCamera->yaw(Ogre::Degree(-90.f));
+-}
+-//----------------------------------------------------------------------------
+ //----------------------------------------------------------------------------
+ 
+ PlayPen_BuildTangentOnAnimatedMesh::PlayPen_BuildTangentOnAnimatedMesh()