[arch-commits] Commit in ogre/trunk (PKGBUILD freetype.patch)

[Sven-Hendrik Haase]

    Date: Monday, December 2, 2013 @ 02:09:04
  Author: svenstaro
Revision: 101825

upgpkg: ogre 1.9.0-2

boost 1.55.0 rebuild

Modified:
  ogre/trunk/PKGBUILD
Deleted:
  ogre/trunk/freetype.patch

----------------+
 PKGBUILD       |   26 ++++++++------------------
 freetype.patch |   21 ---------------------
 2 files changed, 8 insertions(+), 39 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2013-12-02 01:03:13 UTC (rev 101824)
+++ PKGBUILD	2013-12-02 01:09:04 UTC (rev 101825)
@@ -3,41 +3,33 @@
 pkgbase=ogre
 pkgname=('ogre' 'ogre-docs')
 pkgver=1.9.0
-pkgrel=1
+pkgrel=2
 pkgdesc='Scene-oriented, flexible 3D engine written in C++'
 arch=('i686' 'x86_64')
 url='http://www.ogre3d.org'
 license=('custom:MIT')
 depends=('boost-libs' 'freeimage' 'freetype2' 'libxaw' 'libxrandr' 
-         'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu' 'gcc-go' 'tinyxml')
+         'nvidia-cg-toolkit' 'zziplib' 'ois' 'glu' 'tinyxml')
 makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial')
 install=ogre.install
-source=("hg+ssh://hg@bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}"
-        freetype.patch)
-md5sums=('SKIP'
-         '73af39f59c302b76bee600fc5127af9a')
+source=("hg+ssh://hg@bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}")
+md5sums=('SKIP')
 
 build() {
   cd ogre
 
-  patch -Np1 < $srcdir/freetype.patch
-
-  # get a clean build dir
   [[ -d build ]] && rm -rf build
   mkdir build && cd build
 
-  # generate CMake Makefile
   cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DOGRE_INSTALL_SAMPLES=TRUE \
     -DOGRE_INSTALL_DOCS=TRUE \
     -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
-    -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
+    -DCMAKE_BUILD_TYPE=Release
 
-  # compile
   make
 
-  # generate docs
   make OgreDoc
 }
 
@@ -50,13 +42,12 @@
 
   cd ogre/build
 
-  # install the bugger
   make DESTDIR=${pkgdir} install
 
   # fix up samples
-  install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/
-  mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/
+  #install -dm775 -o root -g users ${pkgdir}/opt/OGRE/samples/
+  #mv ${pkgdir}/usr/share/OGRE/*.cfg ${pkgdir}/opt/OGRE/samples/
+  #mv ${pkgdir}/usr/bin/SampleBrowser ${pkgdir}/opt/OGRE/samples/
 
   # make sample launcher
   echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
@@ -63,7 +54,6 @@
   echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser
   chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
   
-  # install license
   install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
 
   # move docs out of this package

Deleted: freetype.patch
===================================================================
--- freetype.patch	2013-12-02 01:03:13 UTC (rev 101824)
+++ freetype.patch	2013-12-02 01:09:04 UTC (rev 101825)
@@ -1,21 +0,0 @@
-diff -r 538b33f531b5 CMake/Packages/FindFreetype.cmake
---- a/CMake/Packages/FindFreetype.cmake	Sun Nov 24 00:46:46 2013 -0600
-+++ b/CMake/Packages/FindFreetype.cmake	Tue Nov 26 12:56:17 2013 +0100
-@@ -31,7 +31,7 @@
-   FREETYPE_INCLUDE_DIR
- )
- 
--set(FREETYPE_LIBRARY_NAMES freetype2501 freetype250 freetype2412 freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
-+set(FREETYPE_LIBRARY_NAMES freetype251 freetype2501 freetype250 freetype2412 freetype2411 freetype2410 freetype249 freetype248 freetype246 freetype2311 freetype239 freetype238 freetype235 freetype219 freetype)
- get_debug_names(FREETYPE_LIBRARY_NAMES)
- 
- use_pkgconfig(FREETYPE_PKGC freetype2)
-@@ -43,7 +43,7 @@
- findpkg_framework(FREETYPE)
- message(STATUS "CMAKE_PREFIX_PATH: ${CMAKE_PREFIX_PATH}")
- 
--find_path(FREETYPE_INCLUDE_DIR NAMES freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
-+find_path(FREETYPE_INCLUDE_DIR NAMES freetype.h freetype/freetype.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS} PATH_SUFFIXES freetype2)
- find_path(FREETYPE_FT2BUILD_INCLUDE_DIR NAMES ft2build.h HINTS ${FREETYPE_INC_SEARCH_PATH} ${FREETYPE_PKGC_INCLUDE_DIRS})
- 
- find_library(FREETYPE_LIBRARY_REL NAMES ${FREETYPE_LIBRARY_NAMES} HINTS ${FREETYPE_LIB_SEARCH_PATH} ${FREETYPE_PKGC_LIBRARY_DIRS} PATH_SUFFIXES "" Release RelWithDebInfo MinSizeRel)