ogre-1.10.11-2.parabola1: updating version

2 files changed, 97 insertions, 150 deletions

diff --git a/libre/ogre/PKGBUILD b/libre/ogre/PKGBUILD
index a1870a778..a662e0fc0 100644
--- a/libre/ogre/PKGBUILD
+++ b/libre/ogre/PKGBUILD
@@ -4,24 +4,24 @@
 
 pkgbase=ogre
 pkgname=('ogre')
-pkgver=1.10.5
-pkgrel=1.parabola1
+pkgver=1.10.11
+pkgrel=2.parabola1
 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files'
 arch=('i686' 'x86_64' 'armv7h')
 url='http://www.ogre3d.org'
 license=('custom:MIT')
 depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr'
          'zziplib' 'sdl2' 'glu' 'tinyxml')
-makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial' 'python' 'swig')
-mksource=(ogre::hg+http://bitbucket.org/sinbad/ogre#tag=v${pkgver//./-})
+makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial' 'python' 'swig' 'systemd')
+mksource=("https://github.com/OGRECave/ogre/archive/v${pkgver}.tar.gz")
 source=(https://repo.parabola.nu/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz
         libre.patch)
-mksha512sums=('SKIP')
-sha512sums=('c6effe71e3251617e38f6834dd6ef610b06bde037405a30640a7161748428646edba63c4861e79620cdc976b43325a9520cb3a43a0fa3f311130b9b9a0c2422d'
-            '9a09a04f2a3f7d79bf86c44cb25881a7ea2b3fc78706aeb2df293016ddbefc33414b3811502c1912d4f28f86fc52caf05537133e36f414af85b8d5b3a4916026')
+mksha512sums=('2dfedd6f0a0de1a8c687c001439138b233200ca11e5c9940debf43d8a0380ca6472e0b5f4d599f0e22ca2049d0a5d34066ef41b6bc4912130694fa5d851fc900')
+sha512sums=('fee28931a13f5058289a45d5477bd56243e9606cdda80b2a38c387d2603983c4577c1c92101690a7291a09b3753e84aca491daf3ebe1f387915d0aff48083686'
+            '81e3997c5bad64d8bae511222d8ab3766699c0923e9303640925525908ee2c19dfb37549cc02bc3e172ea248c0c01c0a58bdcc20d545980bf93b15e02ceb514c')
 
 mksource() {
-  cd ${pkgbase}
+  cd ${pkgbase}-${pkgver}
 
   # remove nonfree files
 #  rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h
@@ -31,7 +31,7 @@ mksource() {
 }
 
 prepare() {
-  cd ${pkgbase}
+  cd ${pkgbase}-${pkgver}
 
   # remove nonfree references
   rm -v CMake/Templates/quakemap.cfg.in
@@ -47,7 +47,7 @@ prepare() {
 }
 
 build() {
-  cd ${pkgbase}
+  cd ${pkgbase}-${pkgver}
 
   # get a clean build dir
   [[ -d build ]] && rm -vrf build
@@ -106,12 +106,12 @@ package_ogre() {
   conflicts=(${pkgbase}-libre)
   replaces=(${pkgbase}-libre)
 
-  cd ${pkgbase}/build
+  cd ${pkgbase}-${pkgver}/build
 
   make DESTDIR=$pkgdir install
 
   # install license
-  install -vDm644 ../COPYING ${pkgdir}/usr/share/licenses/${pkgname}/COPYING
+  install -vDm644 ../LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/ogre/libre.patch b/libre/ogre/libre.patch
index ca6226bb1..054c0f4bd 100644
--- a/libre/ogre/libre.patch
+++ b/libre/ogre/libre.patch
@@ -1,8 +1,6 @@
-diff --git a/CMake/InstallResources.cmake b/CMake/InstallResources.cmake
-index dece16d..19f5ccd 100644
---- a/CMake/InstallResources.cmake
-+++ b/CMake/InstallResources.cmake
-@@ -118,9 +118,6 @@ configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/inst/bi
+--- a/CMake/InstallResources.cmake	1989-12-31 19:00:00.000000000 -0500
++++ b/CMake/InstallResources.cmake	2018-01-17 14:20:52.618886229 -0500
+@@ -121,9 +121,6 @@
  # create plugins.cfg
  configure_file(${OGRE_TEMPLATES_DIR}/plugins_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg)
  configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg)
@@ -12,47 +10,31 @@ index dece16d..19f5ccd 100644
  # 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)
-@@ -135,7 +132,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
-     ${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 
-@@ -143,7 +139,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
-     ${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 
-@@ -151,7 +146,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
-     ${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 
-@@ -159,7 +153,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
+@@ -137,7 +134,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}" CONFIGURATIONS Debug
+ )
+ install(FILES 
+@@ -145,7 +141,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}"
+   CONFIGURATIONS Release RelWithDebInfo MinSizeRel None ""
+ )
+@@ -157,7 +152,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/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
+     DESTINATION "${OGRE_CFG_INSTALL_PATH}"
    )
- 
-@@ -170,7 +163,6 @@ if (OGRE_INSTALL_SAMPLES OR OGRE_INSTALL_SAMPLES_SOURCE)
-       ${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()
-@@ -224,11 +216,6 @@ elseif (MSVC AND NOT NMAKE)
+ endif()
+@@ -209,11 +203,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)
@@ -64,32 +46,28 @@ index dece16d..19f5ccd 100644
    # 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)
-@@ -248,8 +235,6 @@ else() # other OS only need one cfg file
-   configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/bin/resources${OGRE_CFG_SUFFIX}.cfg)
+@@ -229,8 +218,6 @@
+   configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${OGRE_BINARY_DIR}/bin/resources.cfg)
    # create plugins.cfg
-   configure_file(${OGRE_TEMPLATES_DIR}/plugins${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/plugins${OGRE_CFG_SUFFIX}.cfg)
+   configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/bin/plugins.cfg)
 -  # create quakemap.cfg
--  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap${OGRE_CFG_SUFFIX}.cfg)
+-  configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/quakemap.cfg)
    # create samples.cfg
-   configure_file(${OGRE_TEMPLATES_DIR}/samples${OGRE_CFG_SUFFIX}.cfg.in ${OGRE_BINARY_DIR}/bin/samples${OGRE_CFG_SUFFIX}.cfg)
+   configure_file(${OGRE_TEMPLATES_DIR}/samples.cfg.in ${OGRE_BINARY_DIR}/bin/samples.cfg)
    # create tests.cfg
-diff --git a/CMake/Templates/Android_resources.cfg.in b/CMake/Templates/Android_resources.cfg.in
-index 6e0e428..b87453d 100644
---- a/CMake/Templates/Android_resources.cfg.in
-+++ b/CMake/Templates/Android_resources.cfg.in
-@@ -13,7 +13,6 @@ APKFileSystem=/fonts
- APKFileSystem=/materials/programs
+--- a/CMake/Templates/Android_resources.cfg.in	1989-12-31 19:00:00.000000000 -0500
++++ b/CMake/Templates/Android_resources.cfg.in	2018-01-17 14:22:47.293842892 -0500
+@@ -14,7 +14,6 @@
  APKFileSystem=/materials/scripts
  APKFileSystem=/materials/textures
+ APKFileSystem=/materials/textures/glTF2_IBL
 -APKFileSystem=/materials/textures/nvidia
  APKFileSystem=/models
  APKFileSystem=/particle
  APKFileSystem=/materials/scripts/SSAO
-diff --git a/CMake/Templates/SDK_CMakeLists.txt.in b/CMake/Templates/SDK_CMakeLists.txt.in
-index 700ecc4..8db2327 100644
---- a/CMake/Templates/SDK_CMakeLists.txt.in
-+++ b/CMake/Templates/SDK_CMakeLists.txt.in
-@@ -244,7 +244,6 @@ if (UNIX AND NOT APPLE)
+--- a/CMake/Templates/SDK_CMakeLists.txt.in	1989-12-31 19:00:00.000000000 -0500
++++ b/CMake/Templates/SDK_CMakeLists.txt.in	2018-01-17 14:24:12.493429198 -0500
+@@ -244,7 +244,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)
@@ -97,10 +75,8 @@ index 700ecc4..8db2327 100644
  endif ()
  
  if (MINGW)
-diff --git a/CMake/Templates/demomedia.wxi.in b/CMake/Templates/demomedia.wxi.in
-index 8535c75..ee09b0c 100644
---- a/CMake/Templates/demomedia.wxi.in
-+++ b/CMake/Templates/demomedia.wxi.in
+--- a/CMake/Templates/demomedia.wxi.in	1989-12-31 19:00:00.000000000 -0500
++++ b/CMake/Templates/demomedia.wxi.in	2018-01-17 14:28:08.219728763 -0500
 @@ -295,13 +295,6 @@
              <ComponentRef Id="cmpA1FEB51B0386689568AAFC22E0D71B6B" />
              <ComponentRef Id="cmpA3F7363F0553143ABF1CA52A2FD433D6" />
@@ -167,17 +143,8 @@ index 8535c75..ee09b0c 100644
                      <Component Id="cmp532E67011B733ACE674692F6ED52775D" Guid="{9AC3FA7E-FBDC-4448-A61B-615EF43EB923}">
                          <File Id="filC6E116063CEC1DFBE1D6B452FD089931" KeyPath="yes" Source="@OGRE_MEDIA_DIR_REL@\packs\cubemap.zip" />
                      </Component>
-@@ -1794,4 +1756,4 @@
-             </Directory>
-         </DirectoryRef>
-     </Fragment>
--</Include>
-\ No newline at end of file
-+</Include>
-diff --git a/CMake/Templates/demos.wxs.in b/CMake/Templates/demos.wxs.in
-index a9eb6e3..30b9c19 100644
---- a/CMake/Templates/demos.wxs.in
-+++ b/CMake/Templates/demos.wxs.in
+--- a/CMake/Templates/demos.wxs.in	1989-12-31 19:00:00.000000000 -0500
++++ b/CMake/Templates/demos.wxs.in	2018-01-17 14:28:56.977584421 -0500
 @@ -39,7 +39,6 @@
              <File Source='..\bin\release\samples.cfg' Vital='yes' />
              <!-- Following config files are tweaked locally -->
@@ -186,11 +153,9 @@ index a9eb6e3..30b9c19 100644
  
              <File Source="..\bin\release\SampleBrowser.exe" />
              <File Source='..\bin\release\Sample_BezierPatch.dll' Vital='yes' />
-diff --git a/CMake/Templates/resources.cfg.in b/CMake/Templates/resources.cfg.in
-index 900ae05..242873c 100644
---- a/CMake/Templates/resources.cfg.in
-+++ b/CMake/Templates/resources.cfg.in
-@@ -14,7 +14,6 @@ FileSystem=@OGRE_MEDIA_DIR_REL@/fonts
+--- a/CMake/Templates/resources.cfg.in	1989-12-31 19:00:00.000000000 -0500
++++ b/CMake/Templates/resources.cfg.in	2018-01-17 14:29:44.348834395 -0500
+@@ -14,7 +14,6 @@
  FileSystem=@OGRE_MEDIA_DIR_REL@/materials/programs
  FileSystem=@OGRE_MEDIA_DIR_REL@/materials/scripts
  FileSystem=@OGRE_MEDIA_DIR_REL@/materials/textures
@@ -198,15 +163,12 @@ index 900ae05..242873c 100644
  FileSystem=@OGRE_MEDIA_DIR_REL@/models
  FileSystem=@OGRE_MEDIA_DIR_REL@/particle
  FileSystem=@OGRE_MEDIA_DIR_REL@/DeferredShadingMedia
-diff --git a/Docs/License.md b/Docs/License.md
-index 4bfddde..d62cf4d 100644
---- a/Docs/License.md
-+++ b/Docs/License.md
-@@ -298,36 +298,6 @@ included in the Docs/licenses folder.<br />
- </table>
+--- a/Docs/License.md	1989-12-31 19:00:00.000000000 -0500
++++ b/Docs/License.md	2018-01-17 14:32:09.955764022 -0500
+@@ -299,35 +299,6 @@
  
  <br />
--
+ 
 -<span style="font-weight: bold;">NVidia Cg<br />
 -
 -</span>
@@ -239,7 +201,7 @@ index 4bfddde..d62cf4d 100644
  <span style="font-weight: bold;">OpenEXR<br />
  
  </span>
-@@ -408,57 +378,4 @@ thus you do not need to use them to use OGRE,&nbsp;if you don't want to.<br />
+@@ -408,57 +379,4 @@
  
  </ul>
  
@@ -297,11 +259,9 @@ index 4bfddde..d62cf4d 100644
 -</ul>
 -
  <p>Copyright &copy; 2013 by The OGRE Team</p>
-diff --git a/Samples/BSP/include/BSP.h b/Samples/BSP/include/BSP.h
-index 856dee0..5f47011 100644
---- a/Samples/BSP/include/BSP.h
-+++ b/Samples/BSP/include/BSP.h
-@@ -19,7 +19,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample
+--- a/Samples/BSP/include/BSP.h	1989-12-31 19:00:00.000000000 -0500
++++ b/Samples/BSP/include/BSP.h	2018-01-17 14:34:43.165692607 -0500
+@@ -19,7 +19,6 @@
      {
          mInfo["Title"] = "BSP";
          mInfo["Description"] = "A demo of the indoor, or BSP (Binary Space Partition) scene manager. "
@@ -309,12 +269,15 @@ index 856dee0..5f47011 100644
          mInfo["Thumbnail"] = "thumb_bsp.png";
          mInfo["Category"] = "Geometry";
      }
-@@ -42,38 +41,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample
+@@ -42,41 +41,6 @@
  
   protected:
  
 -    void locateResources()
 -    {
+-    	// Pick a new resource group so Q3Shader parser is correctly registered
+-    	ResourceGroupManager::getSingleton().setWorldResourceGroupName("BSPWorld");
+-
 -        // load the Quake archive location and map name from a config file
 -        ConfigFile cf;
 -        cf.load(mFSLayer->getConfigFilePath("quakemap.cfg"));
@@ -348,7 +311,7 @@ index 856dee0..5f47011 100644
      void createSceneManager()
      {
          mSceneMgr = mRoot->createSceneManager("BspSceneManager");   // the BSP scene manager is required for this sample
-@@ -118,10 +85,6 @@ class _OgreSampleClassExport Sample_BSP : public SdkSample
+@@ -122,10 +86,6 @@
          // set a random player starting point
          ViewPoint vp = mSceneMgr->getSuggestedViewpoint(true);
  
@@ -359,11 +322,9 @@ index 856dee0..5f47011 100644
          mCameraNode->setPosition(vp.position);
          mCameraNode->rotate(vp.orientation);
  
-diff --git a/Samples/Browser/CMakeLists.txt b/Samples/Browser/CMakeLists.txt
-index 007de53..bb75c19 100644
---- a/Samples/Browser/CMakeLists.txt
-+++ b/Samples/Browser/CMakeLists.txt
-@@ -118,13 +118,11 @@ if (WINDOWS_STORE OR WINDOWS_PHONE)
+--- a/Samples/Browser/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
++++ b/Samples/Browser/CMakeLists.txt	2018-01-17 14:36:27.887753660 -0500
+@@ -118,13 +118,11 @@
  
          ${OGRE_BINARY_DIR}/inst/bin/debug/resources_d.cfg
          ${OGRE_BINARY_DIR}/inst/bin/debug/plugins_d.cfg
@@ -377,7 +338,7 @@ index 007de53..bb75c19 100644
          ${OGRE_BINARY_DIR}/inst/bin/release/samples.cfg
          ${OGRE_BINARY_DIR}/inst/bin/release/tests.cfg
  
-@@ -149,14 +147,12 @@ if (WINDOWS_STORE OR WINDOWS_PHONE)
+@@ -149,14 +147,12 @@
      set(DEBUG_CONTENT_FILES ${DEBUG_CONTENT_FILES}
          ${CMAKE_CURRENT_BINARY_DIR}/resources_d.cfg
          ${CMAKE_CURRENT_BINARY_DIR}/plugins_d.cfg
@@ -392,7 +353,7 @@ index 007de53..bb75c19 100644
          ${CMAKE_CURRENT_BINARY_DIR}/samples.cfg
          ${CMAKE_CURRENT_BINARY_DIR}/tests.cfg
      )
-@@ -330,7 +326,6 @@ if (APPLE)
+@@ -305,7 +301,6 @@
  		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/plugins.cfg   ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
  		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/resources.cfg ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
  		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/macosx/samples.cfg   ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
@@ -400,7 +361,7 @@ index 007de53..bb75c19 100644
  		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Media                    ${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
  		COMMAND ditto ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources
  		)
-@@ -340,7 +335,6 @@ if (APPLE)
+@@ -315,7 +310,6 @@
  		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/plugins.cfg 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
  		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg 		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
  		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg   		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
@@ -408,11 +369,9 @@ index 007de53..bb75c19 100644
  		COMMAND ln ARGS -s -f ${OGRE_SOURCE_DIR}/Samples/Media     		${OGRE_SAMPLE_CONTENTS_PATH}/Resources/
  		COMMAND ditto ${OGRE_SOURCE_DIR}/Samples/Common/misc/SampleBrowser_OSX.icns ${OGRE_SAMPLE_CONTENTS_PATH}/Resources
  		)
-diff --git a/Samples/CMakeLists.txt b/Samples/CMakeLists.txt
-index 65d6b5c..d742335 100644
---- a/Samples/CMakeLists.txt
-+++ b/Samples/CMakeLists.txt
-@@ -250,7 +250,6 @@ if (MSVC)
+--- a/Samples/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
++++ b/Samples/CMakeLists.txt	2018-01-17 14:37:21.222074714 -0500
+@@ -251,7 +251,6 @@
  	set(OGRE_MEDIA_DIR_TMP ${OGRE_MEDIA_DIR_REL})
  	set(OGRE_MEDIA_DIR_REL "Media")
      configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY)
@@ -420,11 +379,9 @@ index 65d6b5c..d742335 100644
  	# restore
  	set(OGRE_MEDIA_DIR_REL ${OGRE_MEDIA_DIR_TMP})
      add_custom_target(demo_installer 
-diff --git a/Samples/EndlessWorld/include/EndlessWorld.h b/Samples/EndlessWorld/include/EndlessWorld.h
-index 8f766ae..e7fc126 100644
---- a/Samples/EndlessWorld/include/EndlessWorld.h
-+++ b/Samples/EndlessWorld/include/EndlessWorld.h
-@@ -312,17 +312,6 @@ protected:
+--- a/Samples/EndlessWorld/include/EndlessWorld.h	1989-12-31 19:00:00.000000000 -0500
++++ b/Samples/EndlessWorld/include/EndlessWorld.h	2018-01-17 14:38:18.842873919 -0500
+@@ -312,17 +312,6 @@
  		defaultimp.inputScale = 600;
  		defaultimp.minBatchSize = 33;
  		defaultimp.maxBatchSize = 65;
@@ -442,11 +399,9 @@ index 8f766ae..e7fc126 100644
  	}
  
  	/*-----------------------------------------------------------------------------
-diff --git a/Samples/Media/volumeTerrain/triplanarReference.material b/Samples/Media/volumeTerrain/triplanarReference.material
-index 6b7c852..b5a42b6 100644
---- a/Samples/Media/volumeTerrain/triplanarReference.material
-+++ b/Samples/Media/volumeTerrain/triplanarReference.material
-@@ -9,9 +9,6 @@ material triplanarReference
+--- a/Samples/Media/volumeTerrain/triplanarReference.material	1989-12-31 19:00:00.000000000 -0500
++++ b/Samples/Media/volumeTerrain/triplanarReference.material	2018-01-17 14:39:19.330213722 -0500
+@@ -9,9 +9,6 @@
              rtshader_system
              {
                  lighting_stage ffp
@@ -456,11 +411,9 @@ index 6b7c852..b5a42b6 100644
              }
          }
      }
-diff --git a/Samples/Terrain/include/Terrain.h b/Samples/Terrain/include/Terrain.h
-index 2db87cc..af97218 100644
---- a/Samples/Terrain/include/Terrain.h
-+++ b/Samples/Terrain/include/Terrain.h
-@@ -527,17 +527,6 @@ class _OgreSampleClassExport Sample_Terrain : public SdkSample
+--- a/Samples/Terrain/include/Terrain.h	1989-12-31 19:00:00.000000000 -0500
++++ b/Samples/Terrain/include/Terrain.h	2018-01-17 14:40:31.710363819 -0500
+@@ -527,17 +527,6 @@
          defaultimp.inputScale = 600;
          defaultimp.minBatchSize = 33;
          defaultimp.maxBatchSize = 65;
@@ -477,12 +430,10 @@ index 2db87cc..af97218 100644
 -        defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds");
      }
  
-     void addTextureDebugOverlay(TrayLocation loc, TexturePtr tex, size_t i)
-diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
-index e85ec02..7c4adb5 100644
---- a/Tests/CMakeLists.txt
-+++ b/Tests/CMakeLists.txt
-@@ -198,8 +198,6 @@ if (OGRE_BUILD_TESTS)
+     void addTextureShadowDebugOverlay(TrayLocation loc, size_t num)
+--- a/Tests/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
++++ b/Tests/CMakeLists.txt	2018-01-17 14:41:36.227526393 -0500
+@@ -205,8 +205,6 @@
          ${OGRE_TEST_CONTENTS_PATH}/Resources/
          COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/samples.cfg
          ${OGRE_TEST_CONTENTS_PATH}/Resources/
@@ -491,11 +442,9 @@ index e85ec02..7c4adb5 100644
          COMMAND ditto
          ${OGRE_SOURCE_DIR}/Samples/Media/ ${OGRE_TEST_CONTENTS_PATH}/Resources/Media/
          COMMAND ditto
-diff --git a/Tests/VisualTests/Context/CMakeLists.txt b/Tests/VisualTests/Context/CMakeLists.txt
-index b5e518a..476158e 100644
---- a/Tests/VisualTests/Context/CMakeLists.txt
-+++ b/Tests/VisualTests/Context/CMakeLists.txt
-@@ -140,8 +140,6 @@ if (APPLE)
+--- a/Tests/VisualTests/Context/CMakeLists.txt	1989-12-31 19:00:00.000000000 -0500
++++ b/Tests/VisualTests/Context/CMakeLists.txt	2018-01-17 14:42:24.515402721 -0500
+@@ -140,8 +140,6 @@
  		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
  		COMMAND ln ARGS -s -f ${OGRE_BINARY_DIR}/bin/resources.cfg
  		${OGRE_TESTCONTEXT_CONTENTS_PATH}/Resources/
@@ -504,11 +453,9 @@ index b5e518a..476158e 100644
  		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 --git a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp
-index b730721..4e485bd 100644
---- a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp
-+++ b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp
-@@ -2031,47 +2031,6 @@ PlayPen_Bsp::PlayPen_Bsp()
+--- a/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp	1989-12-31 19:00:00.000000000 -0500
++++ b/Tests/VisualTests/PlayPen/src/PlayPenTests.cpp	2018-01-17 14:44:24.663452014 -0500
+@@ -2078,47 +2078,6 @@
      addScreenshotFrame(10);
  }
  //----------------------------------------------------------------------------