[arch-commits] Commit in ogre/repos (10 files)

Sven-Hendrik Haase svenstaro at nymeria.archlinux.org
Thu Dec 5 09:39:25 UTC 2013


    Date: Thursday, December 5, 2013 @ 10:39:24
  Author: svenstaro
Revision: 102103

archrelease: copy trunk to community-i686, community-x86_64

Added:
  ogre/repos/community-i686/PKGBUILD
    (from rev 102102, ogre/trunk/PKGBUILD)
  ogre/repos/community-i686/ogre.install
    (from rev 102102, ogre/trunk/ogre.install)
  ogre/repos/community-x86_64/PKGBUILD
    (from rev 102102, ogre/trunk/PKGBUILD)
  ogre/repos/community-x86_64/ogre.install
    (from rev 102102, ogre/trunk/ogre.install)
Deleted:
  ogre/repos/community-i686/PKGBUILD
  ogre/repos/community-i686/freetype.patch
  ogre/repos/community-i686/ogre.install
  ogre/repos/community-x86_64/PKGBUILD
  ogre/repos/community-x86_64/freetype.patch
  ogre/repos/community-x86_64/ogre.install

---------------------------------+
 /PKGBUILD                       |  158 ++++++++++++++++++++++++++++++++++++++
 /ogre.install                   |    8 +
 community-i686/PKGBUILD         |   89 ---------------------
 community-i686/freetype.patch   |   21 -----
 community-i686/ogre.install     |    4 
 community-x86_64/PKGBUILD       |   89 ---------------------
 community-x86_64/freetype.patch |   21 -----
 community-x86_64/ogre.install   |    4 
 8 files changed, 166 insertions(+), 228 deletions(-)

Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD	2013-12-05 09:38:53 UTC (rev 102102)
+++ community-i686/PKGBUILD	2013-12-05 09:39:24 UTC (rev 102103)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgbase=ogre
-pkgname=('ogre' 'ogre-docs')
-pkgver=1.9.0
-pkgrel=1
-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')
-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')
-
-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
-
-  # compile
-  make
-
-  # generate docs
-  make OgreDoc
-}
-
-package_ogre() {
-  optdepends=('cppunit: unit testing'
-              'intel-tbb: better threading support'
-              'poco: portability'
-              'boost: for developing using ogre'
-              'ogre-docs: documentation')
-
-  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/
-
-  # make sample launcher
-  echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
-  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
-  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
-}
-
-package_ogre-docs() {
-  pkgdesc="Documentation for ogre"
-  depends=()
-
-  cd ogre/build
-
-  # move docs into this package
-  install -dm755 ${pkgdir}/usr/share/doc
-  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
-
-  # symlink for docs
-  install -dm755 ${pkgdir}/usr/share/OGRE/
-  cd ${pkgdir}/usr/share
-  ln -s doc/OGRE/ OGRE/docs
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ogre/repos/community-i686/PKGBUILD (from rev 102102, ogre/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD	                        (rev 0)
+++ community-i686/PKGBUILD	2013-12-05 09:39:24 UTC (rev 102103)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgbase=ogre
+pkgname=('ogre' 'ogre-docs')
+pkgver=1.9.0
+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' 'tinyxml')
+makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial')
+install=ogre.install
+source=("hg+ssh://hg@bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}")
+md5sums=('SKIP')
+
+build() {
+  cd ogre
+
+  [[ -d build ]] && rm -rf build
+  mkdir build && cd build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOGRE_INSTALL_SAMPLES=TRUE \
+    -DOGRE_INSTALL_DOCS=TRUE \
+    -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
+    -DCMAKE_BUILD_TYPE=Release
+
+  make
+
+  make OgreDoc
+}
+
+package_ogre() {
+  optdepends=('cppunit: unit testing'
+              'intel-tbb: better threading support'
+              'poco: portability'
+              'boost: for developing using ogre'
+              'ogre-docs: documentation')
+
+  cd ogre/build
+
+  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/
+
+  # make sample launcher
+  echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
+  echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser
+  chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
+  
+  install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
+
+  # move docs out of this package
+  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
+}
+
+package_ogre-docs() {
+  pkgdesc="Documentation for ogre"
+  depends=()
+
+  cd ogre/build
+
+  # move docs into this package
+  install -dm755 ${pkgdir}/usr/share/doc
+  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
+
+  # symlink for docs
+  install -dm755 ${pkgdir}/usr/share/OGRE/
+  cd ${pkgdir}/usr/share
+  ln -s doc/OGRE/ OGRE/docs
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-i686/freetype.patch
===================================================================
--- community-i686/freetype.patch	2013-12-05 09:38:53 UTC (rev 102102)
+++ community-i686/freetype.patch	2013-12-05 09:39:24 UTC (rev 102103)
@@ -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)

Deleted: community-i686/ogre.install
===================================================================
--- community-i686/ogre.install	2013-12-05 09:38:53 UTC (rev 102102)
+++ community-i686/ogre.install	2013-12-05 09:39:24 UTC (rev 102103)
@@ -1,4 +0,0 @@
-post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
-    echo "it directly in /opt/OGRE/samples/"
-}

Copied: ogre/repos/community-i686/ogre.install (from rev 102102, ogre/trunk/ogre.install)
===================================================================
--- community-i686/ogre.install	                        (rev 0)
+++ community-i686/ogre.install	2013-12-05 09:39:24 UTC (rev 102103)
@@ -0,0 +1,4 @@
+post_install() {
+    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
+    echo "it directly in /opt/OGRE/samples/"
+}

Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD	2013-12-05 09:38:53 UTC (rev 102102)
+++ community-x86_64/PKGBUILD	2013-12-05 09:39:24 UTC (rev 102103)
@@ -1,89 +0,0 @@
-# $Id$
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-pkgbase=ogre
-pkgname=('ogre' 'ogre-docs')
-pkgver=1.9.0
-pkgrel=1
-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')
-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')
-
-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
-
-  # compile
-  make
-
-  # generate docs
-  make OgreDoc
-}
-
-package_ogre() {
-  optdepends=('cppunit: unit testing'
-              'intel-tbb: better threading support'
-              'poco: portability'
-              'boost: for developing using ogre'
-              'ogre-docs: documentation')
-
-  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/
-
-  # make sample launcher
-  echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
-  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
-  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
-}
-
-package_ogre-docs() {
-  pkgdesc="Documentation for ogre"
-  depends=()
-
-  cd ogre/build
-
-  # move docs into this package
-  install -dm755 ${pkgdir}/usr/share/doc
-  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
-
-  # symlink for docs
-  install -dm755 ${pkgdir}/usr/share/OGRE/
-  cd ${pkgdir}/usr/share
-  ln -s doc/OGRE/ OGRE/docs
-}
-
-# vim:set ts=2 sw=2 et:

Copied: ogre/repos/community-x86_64/PKGBUILD (from rev 102102, ogre/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD	                        (rev 0)
+++ community-x86_64/PKGBUILD	2013-12-05 09:39:24 UTC (rev 102103)
@@ -0,0 +1,79 @@
+# $Id$
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+pkgbase=ogre
+pkgname=('ogre' 'ogre-docs')
+pkgver=1.9.0
+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' 'tinyxml')
+makedepends=('boost' 'cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'mercurial')
+install=ogre.install
+source=("hg+ssh://hg@bitbucket.org/sinbad/ogre#tag=v${pkgver//./-}")
+md5sums=('SKIP')
+
+build() {
+  cd ogre
+
+  [[ -d build ]] && rm -rf build
+  mkdir build && cd build
+
+  cmake .. \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DOGRE_INSTALL_SAMPLES=TRUE \
+    -DOGRE_INSTALL_DOCS=TRUE \
+    -DOGRE_INSTALL_SAMPLES_SOURCE=TRUE \
+    -DCMAKE_BUILD_TYPE=Release
+
+  make
+
+  make OgreDoc
+}
+
+package_ogre() {
+  optdepends=('cppunit: unit testing'
+              'intel-tbb: better threading support'
+              'poco: portability'
+              'boost: for developing using ogre'
+              'ogre-docs: documentation')
+
+  cd ogre/build
+
+  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/
+
+  # make sample launcher
+  echo "#!/bin/bash" > ${pkgdir}/usr/bin/OgreSampleBrowser
+  echo "cd /opt/OGRE/samples && ./SampleBrowser" >> ${pkgdir}/usr/bin/OgreSampleBrowser
+  chmod +x ${pkgdir}/usr/bin/OgreSampleBrowser
+  
+  install -Dm644 ../Docs/License.html ${pkgdir}/usr/share/licenses/${pkgname}/license.html
+
+  # move docs out of this package
+  mv ${pkgdir}/usr/share/OGRE/docs ${srcdir}/docs
+}
+
+package_ogre-docs() {
+  pkgdesc="Documentation for ogre"
+  depends=()
+
+  cd ogre/build
+
+  # move docs into this package
+  install -dm755 ${pkgdir}/usr/share/doc
+  mv ${srcdir}/docs ${pkgdir}/usr/share/doc/OGRE/
+
+  # symlink for docs
+  install -dm755 ${pkgdir}/usr/share/OGRE/
+  cd ${pkgdir}/usr/share
+  ln -s doc/OGRE/ OGRE/docs
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: community-x86_64/freetype.patch
===================================================================
--- community-x86_64/freetype.patch	2013-12-05 09:38:53 UTC (rev 102102)
+++ community-x86_64/freetype.patch	2013-12-05 09:39:24 UTC (rev 102103)
@@ -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)

Deleted: community-x86_64/ogre.install
===================================================================
--- community-x86_64/ogre.install	2013-12-05 09:38:53 UTC (rev 102102)
+++ community-x86_64/ogre.install	2013-12-05 09:39:24 UTC (rev 102103)
@@ -1,4 +0,0 @@
-post_install() {
-    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
-    echo "it directly in /opt/OGRE/samples/"
-}

Copied: ogre/repos/community-x86_64/ogre.install (from rev 102102, ogre/trunk/ogre.install)
===================================================================
--- community-x86_64/ogre.install	                        (rev 0)
+++ community-x86_64/ogre.install	2013-12-05 09:39:24 UTC (rev 102103)
@@ -0,0 +1,4 @@
+post_install() {
+    echo "To view the OGRE samples just run OgreSampleBrowser or launch"
+    echo "it directly in /opt/OGRE/samples/"
+}




More information about the arch-commits mailing list