From 828815c700f7c6e73794fa2aeca4e4e1c0f1d2fc Mon Sep 17 00:00:00 2001 From: André Fabian Silva Delgado Date: Thu, 4 Sep 2014 23:18:43 -0300 Subject: ogre: remove libre suffix and add complex pkgrel --- libre/ogre-libre/PKGBUILD | 172 -------- libre/ogre-libre/libre.patch | 966 ------------------------------------------- libre/ogre/PKGBUILD | 171 ++++++++ libre/ogre/libre.patch | 966 +++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 1137 insertions(+), 1138 deletions(-) delete mode 100644 libre/ogre-libre/PKGBUILD delete mode 100644 libre/ogre-libre/libre.patch create mode 100644 libre/ogre/PKGBUILD create mode 100644 libre/ogre/libre.patch (limited to 'libre') diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD deleted file mode 100644 index 890b46163..000000000 --- a/libre/ogre-libre/PKGBUILD +++ /dev/null @@ -1,172 +0,0 @@ -# Maintainer: Márcio Silva - -_bldname=blender -_bldver=2.69 -_bldep=10 - -# ($srcdir/Tools/${_bldname^}2.6Export/__init__.py:bl_info>version) -_addver=2.0.3 -_addrel=1 - -pkgbase=ogre -pkgname=( - $pkgbase-libre - #$_bldname-addon-$pkgbase # package unstable -) -pkgver=1.9.0 -pkgrel=6 -pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' -arch=( - mips64el - x86_64 - i686 -) -url=http://www.${pkgbase}3d.org -license=MIT -depends=( - boost-libs - freeimage - freetype2 - glu - libxaw - libxrandr - ois - tinyxml - zziplib -) -makedepends=( - boost - cmake - doxygen - graphviz - mesa - mercurial - ttf-dejavu -) -mksource=( - ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} -) -source=( - https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz - libre.patch -) -mksha512sums=( - SKIP -) -sha512sums=( - 13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412 - 5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316 -) - -mksource() { - cd ${pkgbase} - - # remove nonfree files - rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h - rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h - rm -rv Samples/Media/materials/textures/nvidia - rm -v Samples/Media/packs/chiropteraDM.{pk3,txt} - rm -v CMake/Templates/quakemap{,_d}.cfg.in -} - -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 - ln -sv /usr/include/GL/glext.h glext.h - ln -sv /usr/include/GL/wglext.h wglext.h - ln -sv /usr/include/GL/glxtokens.h glxtokens.h - ln -sv /usr/include/GL/glxext.h glxext.h -} - -build() { - cd ${pkgbase} - - # get a clean build dir - [[ -d build ]] && rm -vrf build - mkdir -v build && cd build - - # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree - cmake .. \ - -DCMAKE_BUILD_TYPE=Release\ - -DCMAKE_INSTALL_PREFIX=/usr\ - -DCPACK_PACKAGE_DESCRIPTION_SUMMARY='Libre 3D Graphics Engine'\ - -D${pkgbase^^}_BUILD_COMPONENT_PAGING=TRUE\ - -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\ - -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\ - -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\ - -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\ - -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\ - -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\ - -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\ - -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\ - -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\ - -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\ - -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\ - -D${pkgbase^^}_BUILD_SAMPLES=FALSE\ - -D${pkgbase^^}_BUILD_TESTS=FALSE\ - -D${pkgbase^^}_BUILD_TOOLS=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\ - -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\ - -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\ - -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\ - -D${pkgbase^^}_INSTALL_DOCS=FALSE\ - -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\ - -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\ - -D${pkgbase^^}_INSTALL_TOOLS=TRUE\ - -D${pkgbase^^}_LIB_DIRECTORY=lib\ - -D${pkgbase^^}_PROFILING=TRUE\ - -D${pkgbase^^}_USE_BOOST=TRUE -# make V=0 - make -} - -package_ogre-libre() { - optdepends=( - "boost: for developing using $pkgbase" - "$pkgbase-docs: documentation" - ) - provides=($pkgbase=$pkgver) - conflicts=$pkgbase - replaces=$pkgbase - - cd ${pkgbase}/build - - make DESTDIR=$pkgdir install - - # install license - install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html - - # remove files only useful for nonfree software - rm -vr $pkgdir/usr/lib/OGRE/cmake - rm -v $pkgdir/usr/include/OGRE/Example*.h -} - -package_blender-addon-ogre() { - pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname-libre package)" - arch=any - depends=( - "$_bldname-libre>=$(($_bldep-1)):$_bldver" - "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" - ) - _pkgver=$pkgver - pkgver=$_addver.v$_bldver - pkgrel=$_addrel - - cd ${pkgbase} - a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons - install -vd $a && cp -va Tools/${_bldname^}2.6Export $a/$pkgbase -} - -# vim:set ts=2 sw=2 et: diff --git a/libre/ogre-libre/libre.patch b/libre/ogre-libre/libre.patch deleted file mode 100644 index e9a1846b1..000000000 --- a/libre/ogre-libre/libre.patch +++ /dev/null @@ -1,966 +0,0 @@ -diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake ---- 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) - configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg) --# create quakemap.cfg --configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg) --configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg) - # 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) -@@ -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) -- # create quakemap.cfg -- configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg) -- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg) -- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg) -- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg) - # 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-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 @@ - - - -- -- -- -- -- -- -- - - - -@@ -328,8 +321,6 @@ - - - -- -- - - - -@@ -1338,29 +1329,6 @@ - - - -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- -- - - - -@@ -1444,12 +1412,6 @@ - - - -- -- -- -- -- -- - - - -@@ -1794,4 +1756,4 @@ - - - -- -\ No newline at end of file -+ -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 @@ - - - -- - - - -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-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 @@ - false - false - -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- - - false - false -@@ -3671,15 +3629,6 @@ - false - false - -- -- false -- true -- false -- true -- true -- false -- false -- - - false - true -@@ -4867,20 +4816,6 @@ - false - false - -- -- false -- false -- true -- false -- false -- -- -- false -- false -- true -- false -- false -- - - false - false -@@ -4893,4 +4828,4 @@ - - - -- -\ No newline at end of file -+ -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-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 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1075,9 +1072,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1105,12 +1099,6 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1168,24 +1156,12 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1492,9 +1468,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1658,4 +1631,4 @@ - Assets\media - - -- -\ No newline at end of file -+ -diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ---- 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 @@ - false - false - -- -- true -- false -- false -- false -- false -- false -- false -- false -- false -- false -- false -- false -- false -- - - true - false -@@ -6443,96 +6428,6 @@ - false - false - -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- - - false - false -@@ -9014,36 +8909,6 @@ - false - false - -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- -- -- false -- false -- false -- false -- false -- false -- false -- false -- true -- false -- false -- false -- false -- - - false - false -@@ -9264,4 +9129,4 @@ - - - -- -\ No newline at end of file -+ -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-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 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1154,9 +1151,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1184,12 +1178,6 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1247,24 +1235,12 @@ - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - - - Assets\media - -- -- Assets\media -- -- -- Assets\media -- - - Assets\media - -@@ -1571,9 +1547,6 @@ - - Assets\media - -- -- Assets\media -- - - Assets\media - -@@ -1775,4 +1748,4 @@ - Assets\for WMAppManifest - - -- -\ No newline at end of file -+ -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-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") - configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY) -- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY) - # restore - 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-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; -- // textures -- defaultimp.layerList.resize(3); -- defaultimp.layerList[0].worldSize = 100; -- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); -- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); -- defaultimp.layerList[1].worldSize = 30; -- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); -- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); -- defaultimp.layerList[2].worldSize = 200; -- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); -- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); - } - - /*----------------------------------------------------------------------------- -diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material ---- 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 - { - } -- texture_unit -- { -- texture_alias fromX -- texture dirt_grayrocky_diffusespecular.dds -- } -- texture_unit -- { -- texture_alias fromXNormal -- texture dirt_grayrocky_normalheight.dds -- } -- texture_unit -- { -- texture_alias fromY -- texture grass_green-01_diffusespecular.dds -- } -- texture_unit -- { -- texture_alias fromYNormal -- texture grass_green-01_normalheight.dds -- } -- texture_unit -- { -- texture_alias fromZ -- texture growth_weirdfungus-03_diffusespecular.dds -- } -- texture_unit -- { -- texture_alias fromZNormal -- texture growth_weirdfungus-03_normalheight.dds -- } - } - } - } -@@ -57,36 +27,6 @@ - fragment_program_ref TriplanarReferenceLow_PS - { - } -- texture_unit -- { -- texture_alias fromX -- texture dirt_grayrocky_diffusespecular.dds -- } -- texture_unit -- { -- texture_alias fromXNormal -- texture dirt_grayrocky_normalheight.dds -- } -- texture_unit -- { -- texture_alias fromY -- texture grass_green-01_diffusespecular.dds -- } -- texture_unit -- { -- texture_alias fromYNormal -- texture grass_green-01_normalheight.dds -- } -- texture_unit -- { -- texture_alias fromZ -- texture growth_weirdfungus-03_diffusespecular.dds -- } -- texture_unit -- { -- texture_alias fromZNormal -- texture growth_weirdfungus-03_normalheight.dds -- } - } - } - } -@@ -101,4 +41,4 @@ - diffuse 1.0 1.0 1.0 - } - } --} -\ 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-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; -- // textures -- defaultimp.layerList.resize(3); -- defaultimp.layerList[0].worldSize = 100; -- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); -- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); -- defaultimp.layerList[1].worldSize = 30; -- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); -- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); -- defaultimp.layerList[2].worldSize = 200; -- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); -- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); - - - } -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-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; - // } --// /* --// if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0) --// { --// StringVector texNames; --// texNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); --// texNames.push_back("growth_weirdfungus-03_normalheight.dds"); --// mTerrain->addLayer(500, &texNames); --// updateDelay = 0.3; --// } --// */ - // updateDelay -= evt.timeSinceLastFrame; - // } - //#endif -@@ -8185,17 +8175,6 @@ - // imp.inputScale = 600; - // imp.minBatchSize = 33; - // imp.maxBatchSize = 65; --// // textures --// imp.layerList.resize(3); --// imp.layerList[0].worldSize = 100; --// imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); --// imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); --// imp.layerList[1].worldSize = 30; --// imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); --// imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); --// imp.layerList[2].worldSize = 200; --// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); --// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); - // 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() diff --git a/libre/ogre/PKGBUILD b/libre/ogre/PKGBUILD new file mode 100644 index 000000000..99804ea63 --- /dev/null +++ b/libre/ogre/PKGBUILD @@ -0,0 +1,171 @@ +# Maintainer: Márcio Silva + +_bldname=blender +_bldver=2.69 +_bldep=10 + +# ($srcdir/Tools/${_bldname^}2.6Export/__init__.py:bl_info>version) +_addver=2.0.3 +_addrel=1 + +pkgbase=ogre +pkgname=( + $pkgbase + #$_bldname-addon-$pkgbase # package unstable +) +pkgver=1.9.0 +pkgrel=6.parabola1 +pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' +arch=( + mips64el + x86_64 + i686 +) +url=http://www.${pkgbase}3d.org +license=MIT +depends=( + boost-libs + freeimage + freetype2 + glu + libxaw + libxrandr + ois + tinyxml + zziplib +) +makedepends=( + boost + cmake + doxygen + graphviz + mesa + mercurial + ttf-dejavu +) +mksource=( + ogre::hg+https://bitbucket.org/sinbad/ogre/src#tag=v${pkgver//./-} +) +source=( + https://repo.parabolagnulinux.org/other/$pkgbase-libre/$pkgbase-libre-$pkgver.tar.xz + libre.patch +) +mksha512sums=( + SKIP +) +sha512sums=( + 13e743d65affd6813f6e3c6064d543bfe2d013a8d44bec203dc819859618114f0e5c7f5e67a98250d0174497dd58a9238956e04ac9f7925695ab6ebda555c412 + 5480c08c6faf48c1aabde1efd9508165c2fbea78f19d58c6360ea310c223d1979a7d7eaa15c9a70c8c3b3e7f89877c6f47e7fe16638ae77c463d55e87a5a3316 +) + +mksource() { + cd ${pkgbase} + + # remove nonfree files + rm -v RenderSystems/GL/include/GL/{gl{,ext},wglext,glx{tokens,ext}}.h + rm -v RenderSystems/GL3Plus/include/GL/glxtokens-backup.h + rm -rv Samples/Media/materials/textures/nvidia + rm -v Samples/Media/packs/chiropteraDM.{pk3,txt} + rm -v CMake/Templates/quakemap{,_d}.cfg.in +} + +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 + ln -sv /usr/include/GL/glext.h glext.h + ln -sv /usr/include/GL/wglext.h wglext.h + ln -sv /usr/include/GL/glxtokens.h glxtokens.h + ln -sv /usr/include/GL/glxext.h glxext.h +} + +build() { + cd ${pkgbase} + + # get a clean build dir + [[ -d build ]] && rm -vrf build + mkdir -v build && cd build + + # SAMPLES, SAMPLES_SOURCE and TESTS are nonfree + cmake .. \ + -DCMAKE_BUILD_TYPE=Release\ + -DCMAKE_INSTALL_PREFIX=/usr\ + -DCPACK_PACKAGE_DESCRIPTION_SUMMARY='Libre 3D Graphics Engine'\ + -D${pkgbase^^}_BUILD_COMPONENT_PAGING=TRUE\ + -D${pkgbase^^}_BUILD_COMPONENT_PROPERTY=TRUE\ + -D${pkgbase^^}_BUILD_COMPONENT_RTSHADERSYSTEM=TRUE\ + -D${pkgbase^^}_BUILD_COMPONENT_TERRAIN=TRUE\ + -D${pkgbase^^}_BUILD_PLATFORM_NACL=FALSE\ + -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\ + -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\ + -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\ + -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\ + -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\ + -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\ + -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\ + -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_CORE_SHADERS=TRUE\ + -D${pkgbase^^}_BUILD_RTSHADERSYSTEM_EXT_SHADERS=TRUE\ + -D${pkgbase^^}_BUILD_SAMPLES=FALSE\ + -D${pkgbase^^}_BUILD_TESTS=FALSE\ + -D${pkgbase^^}_BUILD_TOOLS=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_DDS=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_FREEIMAGE=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_PVRTC=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_VIEWPORT_ORIENTATIONMODE=TRUE\ + -D${pkgbase^^}_CONFIG_ENABLE_ZIP=TRUE\ + -D${pkgbase^^}_CONFIG_NEW_COMPILERS=TRUE\ + -D${pkgbase^^}_CONFIG_THREAD_PROVIDER=boost\ + -D${pkgbase^^}_INSTALL_DOCS=FALSE\ + -D${pkgbase^^}_INSTALL_SAMPLES=FALSE\ + -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=FALSE\ + -D${pkgbase^^}_INSTALL_TOOLS=TRUE\ + -D${pkgbase^^}_LIB_DIRECTORY=lib\ + -D${pkgbase^^}_PROFILING=TRUE\ + -D${pkgbase^^}_USE_BOOST=TRUE +# make V=0 + make +} + +package_ogre() { + optdepends=( + "boost: for developing using $pkgbase" + "$pkgbase-docs: documentation" + ) + conflicts=(${pkgbase}-libre) + replaces=(${pkgbase}-libre) + + cd ${pkgbase}/build + + make DESTDIR=$pkgdir install + + # install license + install -vDm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html + + # remove files only useful for nonfree software + rm -vr $pkgdir/usr/lib/OGRE/cmake + rm -v $pkgdir/usr/include/OGRE/Example*.h +} + +package_blender-addon-ogre() { + pkgdesc="${pkgbase^} Mesh Exporter: A addon for the ${_bldname^} which allows export mesh and (skeletal/morph/pose) animations to ${pkgbase^}3D format (built for the $_bldname package)" + arch=any + depends=( + "$_bldname>=$(($_bldep-1)):$_bldver" + "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + ) + _pkgver=$pkgver + pkgver=$_addver.v$_bldver + pkgrel=$_addrel + + cd ${pkgbase} + a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons + install -vd $a && cp -va Tools/${_bldname^}2.6Export $a/$pkgbase +} + +# vim:set ts=2 sw=2 et: diff --git a/libre/ogre/libre.patch b/libre/ogre/libre.patch new file mode 100644 index 000000000..e9a1846b1 --- /dev/null +++ b/libre/ogre/libre.patch @@ -0,0 +1,966 @@ +diff -Nur ogre.orig/CMake/InstallResources.cmake ogre/CMake/InstallResources.cmake +--- 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) + configure_file(${OGRE_TEMPLATES_DIR}/plugins.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/plugins.cfg) +-# create quakemap.cfg +-configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/inst/bin/debug/quakemap_d.cfg) +-configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/inst/bin/release/quakemap.cfg) + # 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) +@@ -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) +- # create quakemap.cfg +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap_d.cfg.in ${OGRE_BINARY_DIR}/bin/debug/quakemap_d.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/release/quakemap.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/relwithdebinfo/quakemap.cfg) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${OGRE_BINARY_DIR}/bin/minsizerel/quakemap.cfg) + # 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-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 @@ + + + +- +- +- +- +- +- +- + + + +@@ -328,8 +321,6 @@ + + + +- +- + + + +@@ -1338,29 +1329,6 @@ + + + +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- +- + + + +@@ -1444,12 +1412,6 @@ + + + +- +- +- +- +- +- + + + +@@ -1794,4 +1756,4 @@ + + + +- +\ No newline at end of file ++ +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 @@ + + + +- + + + +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-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 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -3671,15 +3629,6 @@ + false + false + +- +- false +- true +- false +- true +- true +- false +- false +- + + false + true +@@ -4867,20 +4816,6 @@ + false + false + +- +- false +- false +- true +- false +- false +- +- +- false +- false +- true +- false +- false +- + + false + false +@@ -4893,4 +4828,4 @@ + + + +- +\ No newline at end of file ++ +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-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 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1075,9 +1072,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1105,12 +1099,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1168,24 +1156,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1492,9 +1468,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1658,4 +1631,4 @@ + Assets\media + + +- +\ No newline at end of file ++ +diff -Nur ogre.orig/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj ogre/Samples/Browser/WinRT/SampleBrowserWinRT.vcxproj +--- 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 @@ + false + false + +- +- true +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- false +- + + true + false +@@ -6443,96 +6428,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9014,36 +8909,6 @@ + false + false + +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- +- +- false +- false +- false +- false +- false +- false +- false +- false +- true +- false +- false +- false +- false +- + + false + false +@@ -9264,4 +9129,4 @@ + + + +- +\ No newline at end of file ++ +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-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 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1154,9 +1151,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1184,12 +1178,6 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1247,24 +1235,12 @@ + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + + + Assets\media + +- +- Assets\media +- +- +- Assets\media +- + + Assets\media + +@@ -1571,9 +1547,6 @@ + + Assets\media + +- +- Assets\media +- + + Assets\media + +@@ -1775,4 +1748,4 @@ + Assets\for WMAppManifest + + +- +\ No newline at end of file ++ +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-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") + configure_file(${OGRE_TEMPLATES_DIR}/resources.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/resources.cfg @ONLY) +- configure_file(${OGRE_TEMPLATES_DIR}/quakemap.cfg.in ${CMAKE_CURRENT_BINARY_DIR}/quakemap.cfg @ONLY) + # restore + 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-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; +- // textures +- defaultimp.layerList.resize(3); +- defaultimp.layerList[0].worldSize = 100; +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +- defaultimp.layerList[1].worldSize = 30; +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +- defaultimp.layerList[2].worldSize = 200; +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + } + + /*----------------------------------------------------------------------------- +diff -Nur ogre.orig/Samples/Media/volumeTerrain/triplanarReference.material ogre/Samples/Media/volumeTerrain/triplanarReference.material +--- 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 + { + } +- texture_unit +- { +- texture_alias fromX +- texture dirt_grayrocky_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromXNormal +- texture dirt_grayrocky_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromY +- texture grass_green-01_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromYNormal +- texture grass_green-01_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromZ +- texture growth_weirdfungus-03_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromZNormal +- texture growth_weirdfungus-03_normalheight.dds +- } + } + } + } +@@ -57,36 +27,6 @@ + fragment_program_ref TriplanarReferenceLow_PS + { + } +- texture_unit +- { +- texture_alias fromX +- texture dirt_grayrocky_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromXNormal +- texture dirt_grayrocky_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromY +- texture grass_green-01_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromYNormal +- texture grass_green-01_normalheight.dds +- } +- texture_unit +- { +- texture_alias fromZ +- texture growth_weirdfungus-03_diffusespecular.dds +- } +- texture_unit +- { +- texture_alias fromZNormal +- texture growth_weirdfungus-03_normalheight.dds +- } + } + } + } +@@ -101,4 +41,4 @@ + diffuse 1.0 1.0 1.0 + } + } +-} +\ 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-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; +- // textures +- defaultimp.layerList.resize(3); +- defaultimp.layerList[0].worldSize = 100; +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +- defaultimp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +- defaultimp.layerList[1].worldSize = 30; +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +- defaultimp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +- defaultimp.layerList[2].worldSize = 200; +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +- defaultimp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + + + } +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-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; + // } +-// /* +-// if (mKeyboard->isKeyDown(OIS::KC_M) && updateDelay <= 0) +-// { +-// StringVector texNames; +-// texNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +-// texNames.push_back("growth_weirdfungus-03_normalheight.dds"); +-// mTerrain->addLayer(500, &texNames); +-// updateDelay = 0.3; +-// } +-// */ + // updateDelay -= evt.timeSinceLastFrame; + // } + //#endif +@@ -8185,17 +8175,6 @@ + // imp.inputScale = 600; + // imp.minBatchSize = 33; + // imp.maxBatchSize = 65; +-// // textures +-// imp.layerList.resize(3); +-// imp.layerList[0].worldSize = 100; +-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_diffusespecular.dds"); +-// imp.layerList[0].textureNames.push_back("dirt_grayrocky_normalheight.dds"); +-// imp.layerList[1].worldSize = 30; +-// imp.layerList[1].textureNames.push_back("grass_green-01_diffusespecular.dds"); +-// imp.layerList[1].textureNames.push_back("grass_green-01_normalheight.dds"); +-// imp.layerList[2].worldSize = 200; +-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_diffusespecular.dds"); +-// imp.layerList[2].textureNames.push_back("growth_weirdfungus-03_normalheight.dds"); + // 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() -- cgit v1.2.3-54-g00ecf