diff options
| -rw-r--r-- | libre/ogre-libre/PKGBUILD | 22 | ||||
| -rw-r--r-- | libre/ogre-libre/freetype.patch | 21 |
2 files changed, 36 insertions, 7 deletions
diff --git a/libre/ogre-libre/PKGBUILD b/libre/ogre-libre/PKGBUILD index f0ff93a83..beb82710d 100644 --- a/libre/ogre-libre/PKGBUILD +++ b/libre/ogre-libre/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _bldname=blender -_bldver=2.68 +_bldver=2.69 _bldep=10 # ($srcdir/Tools/${_bldname^}2.5Export/__init__.py:bl_info>version) @@ -13,8 +13,8 @@ pkgname=( $pkgbase-libre #$_bldname-addon-$pkgbase # package unstable ) -pkgver=1.8.1 -pkgrel=5 +pkgver=1.9.0 +pkgrel=1 pkgdesc='Scene-oriented, flexible 3D engine written in C++, without nonfree software support and files' arch=( mips64el @@ -27,10 +27,12 @@ depends=( boost-libs freeimage freetype2 + gcc-go glu libxaw libxrandr ois + tinyxml zziplib ) makedepends=( @@ -39,13 +41,19 @@ makedepends=( doxygen graphviz mesa + mercurial ttf-dejavu ) -source=https://downloads.sourceforge.net/$pkgbase/${pkgbase}_src_v${pkgver//./-}.tar.bz2 +source=( + hg+ssh://hg@bitbucket.org/sinbad/ogre#tag=v${pkgver//./-} + freetype.patch +) sha512sums=0bbce593e5a9ebf51e3cb53661f6447d99ae28a53365d7f518c6d408216690527ef7552385160cff8d5c3ef15d3ab5c2520ef2c1f51fda5541d5d4dca4663ae2 build() { - cd $srcdir/${pkgbase}_src_v${pkgver//./-} + cd ${pkgbase} + + patch -Np1 < $srcdir/freetype.patch # get a clean build dir [[ -d build ]] && rm -vrf build @@ -100,7 +108,7 @@ package_ogre-libre() { conflicts=$pkgbase replaces=$pkgbase - cd $srcdir/${pkgbase}_src_v${pkgver//./-}/build + cd ${pkgbase}/build make DESTDIR=$pkgdir install @@ -123,7 +131,7 @@ package_blender-addon-ogre() { pkgver=$_addver.v$_bldver pkgrel=$_addrel - cd $srcdir/${pkgbase}_src_v${_pkgver//./-} + cd ${pkgbase} a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons install -vd $a && cp -va Tools/${_bldname^}2.5Export $a/$pkgbase } diff --git a/libre/ogre-libre/freetype.patch b/libre/ogre-libre/freetype.patch new file mode 100644 index 000000000..d98dc9f1b --- /dev/null +++ b/libre/ogre-libre/freetype.patch @@ -0,0 +1,21 @@ +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) |