Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

1 files changed, 88 insertions, 33 deletions

diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD
index 673ee8435..cef33ae90 100644
--- a/libre/ogre-libre/PKGBUILD
+++ b/libre/ogre-libre/PKGBUILD
@@ -7,9 +7,13 @@ pkgname=(
   ogre-libre
   #ogre-docs
 )
+pkgflag=(
+  -libre
+  -docs
+)
 pkgver=1.8.1
-pkgrel=2
-pkgdesc='A scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support'
+pkgrel=3
+pkgdesc='A scene-oriented, flexible 3D engine written in C++, without nonfree nvidia-cg-toolkit support, nonfree fonts and arts'
 arch=(
   i686
   x86_64
@@ -17,25 +21,28 @@ arch=(
 )
 url="http://www.${pkgbase}3d.org"
 license=(
-  'custom:MIT'
+  'MIT:(software)'
+  'cc by-sa:(sinbad character)'
 )
 depends=(
   boost-libs
   freeimage
   freetype2
+  glu
   libxaw
   libxrandr
-  zziplib
   ois
-  glu
+  zziplib
 )
 makedepends=(
   boost
   cmake
   doxygen
   graphviz
-  ttf-dejavu
+  intel-tbb
   mesa
+  #poco
+  ttf-dejavu
 )
 install=$pkgbase.install
 source=(
@@ -52,58 +59,106 @@ build() {
   [[ -d build ]] && rm -rf build
   mkdir build    && cd build
 
-  # generate CMake Makefile
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -D${pkgbase^^}_INSTALL_PLUGINS_HEADERS=TRUE \
-    -D${pkgbase^^}_INSTALL_SAMPLES=TRUE \
-    -D${pkgbase^^}_INSTALL_DOCS=TRUE \
-    -D${pkgbase^^}_INSTALL_MEDIA=TRUE \
-    -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=TRUE \
-    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
-
-  # compile
-  make
+    -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_APPLE_IOS=FALSE\
+    -D${pkgbase^^}_BUILD_PLUGIN_BSP=TRUE\
+    -D${pkgbase^^}_BUILD_PLUGIN_CG=FALSE\
+    -D${pkgbase^^}_BUILD_PLUGIN_OCTREE=TRUE\
+    -D${pkgbase^^}_BUILD_PLUGIN_PCZ=TRUE\
+    -D${pkgbase^^}_BUILD_PLUGIN_PFX=TRUE\
+    -D${pkgbase^^}_BUILD_RENDERSYSTEM_D3D9=FALSE\
+    -D${pkgbase^^}_BUILD_RENDERSYSTEM_D3D11=FALSE\
+    -D${pkgbase^^}_BUILD_RENDERSYSTEM_GL=TRUE\
+    -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES=FALSE\
+    -D${pkgbase^^}_BUILD_RENDERSYSTEM_GLES2=FALSE\
+    -D${pkgbase^^}_BUILD_SAMPLES=TRUE\
+    -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_CG_SUPPORT=FALSE\
+    -D${pkgbase^^}_CONFIG_ENABLE_GLES2_GLSL_OPTIMISER=FALSE\
+    -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^^}_INSTALL_DOCS=TRUE\
+    -D${pkgbase^^}_INSTALL_SAMPLES=TRUE\
+    -D${pkgbase^^}_INSTALL_SAMPLES_SOURCE=TRUE\
+    -D${pkgbase^^}_INSTALL_TOOLS=TRUE\
+    -D${pkgbase^^}_LIB_DIRECTORY=lib\
+    -D${pkgbase^^}_PROFILING=TRUE\
+    -D${pkgbase^^}_USE_BOOST=TRUE
+  make V=0
 
   # generate docs
   if [[ $(which dot) && $(which doxygen) ]]; then
-    make doc
+    make V=0 doc
   fi
 }
 
 package_ogre-libre() {
   optdepends=(
-    'cppunit: unit testing'
     'intel-tbb: better threading support'
-    'poco: portability'
+    #'poco: portability'
     "boost: for developing using $pkgbase"
-    "$pkgbase-docs: documentation"
+    "$pkgbase${pkgflag[1]}: documentation"
   )
   provides=(
     $pkgbase=$pkgver
   )
   conflicts=(
-    $pkgbase 
+    $pkgbase
   )
   replaces=(
-    $pkgbase 
+    $pkgbase
   )
 
   cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build
 
-  # install the bugger
   make DESTDIR=$pkgdir install
 
-  # fix up samples
-  install -dm775 -o root -g users          $pkgdir/opt/${pkgbase^^}/samples
-  mv $pkgdir/usr/share/${pkgbase^^}/*.cfg  $pkgdir/opt/${pkgbase^^}/samples
-  mv $pkgdir/usr/bin/SampleBrowser         $pkgdir/opt/${pkgbase^^}/samples
+  # fix samplebrowser name
+  mv $pkgdir/usr/bin/SampleBrowser $pkgdir/usr/bin/${pkgbase^}SampleBrowser
+
+  ## LIBRE PATCH ##
+  # drop cg shaders, hlsl shaders, unusable headers, unusable samples, nonfree fonts and nonfree arts
+  rm -fv  $pkgdir/usr/include/${pkgbase^^}/RTShaderSystem/${pkgbase^}Shader{CG,HLSL}Program{Processor,Writer}.h
+  rm -fv  $pkgdir/usr/lib/${pkgbase^^}/Samples/Sample_{BSP,CelShading,Dot3Bump,Fresnel,SSAO}.so
+  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/{BSP,CelShading,Dot3Bump,Fresnel,SSAO}
+  rm -fvr $pkgdir/usr/share/${pkgbase^^}/media/materials/textures/nvidia
+  rm -fv  $pkgdir/usr/share/${pkgbase^^}/media/packs/{chiropteraDM.{pk3,txt},cubemapsJS.zip}
+  rm -fvr $pkgdir/usr/share/${pkgbase^^}/media/fonts
+  sed -i -e '
+  /BSP/d
+  /CelShading/d
+  /Dot3Bump/d
+  /Fresnel/d
+  /SSAO/d
+  ' $pkgdir/usr/share/${pkgbase^^}/samples.cfg
+  sed -i -e '
+  /Direct3D9/d
+  /Direct3D11/d
+  /CgProgramManager/d
+  ' $pkgdir/usr/share/${pkgbase^^}/plugins.cfg
+  sed -i -e '
+  /cubemapsJS/d
+  /fonts/d
+  /nvidia/d
+  ' $pkgdir/usr/share/${pkgbase^^}/resources.cfg
+  find $pkgdir -type f -name *.cg   -delete
+  find $pkgdir -type f -name *.hlsl -delete
+  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/Android
+  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/include/SampleBrowser_{NaCl,OSX,iOS}.h
+  rm -fvr $pkgdir/usr/share/${pkgbase^^}/Samples/Browser/src/FileSystemLayerImpl_{{Android,NaCl,OSX,WIN32}.cpp,iOS.mm}
 
-  # make sample launcher
-  echo '#!/bin/bash'                                      > $pkgdir/usr/bin/${pkgbase^}SampleBrowser
-  echo 'cd /opt/${pkgbase^^}/samples && ./SampleBrowser' >> $pkgdir/usr/bin/${pkgbase^}SampleBrowser
-  chmod +x $pkgdir/usr/bin/${pkgbase^}SampleBrowser
-  
   # install license
   install -Dm644 ../Docs/License.html $pkgdir/usr/share/licenses/$pkgbase/license.html