OpenSceneGraph: Update to 3.2.1

mingw-w64-openscenegraph/PKGBUILD

@@ -3,21 +3,20 @@
 _realname=OpenSceneGraph
 
 pkgname=("${MINGW_PACKAGE_PREFIX}-${_realname}" "${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-_pkgver=3.2.1-rc3
+_pkgver=3.2.1
 pkgver=${_pkgver//-/}
-pkgrel=3
+pkgrel=1
 pkgdesc="Open source high performance 3D graphics toolkit (mingw-w64)"
 arch=('any')
 url="http://www.openscenegraph.org/"
 license=("LGPL")
-makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-cmake" "subversion")
+makedepends=("${MINGW_PACKAGE_PREFIX}-gcc" "${MINGW_PACKAGE_PREFIX}-pkg-config" "${MINGW_PACKAGE_PREFIX}-cmake")
 depends=("${MINGW_PACKAGE_PREFIX}-gcc-libs"
         "${MINGW_PACKAGE_PREFIX}-collada-dom-svn"
         "${MINGW_PACKAGE_PREFIX}-zlib"
         "${MINGW_PACKAGE_PREFIX}-boost"
         "${MINGW_PACKAGE_PREFIX}-curl"
         "${MINGW_PACKAGE_PREFIX}-lua"
-        "${MINGW_PACKAGE_PREFIX}-freeglut"
         "${MINGW_PACKAGE_PREFIX}-libjpeg"
         "${MINGW_PACKAGE_PREFIX}-libpng"
         "${MINGW_PACKAGE_PREFIX}-libtiff"
@@ -38,7 +37,7 @@ source=(http://www.openscenegraph.org/downloads/developer_releases/${_realname}-
         find-collada.patch
         find-freetype.patch
         giflib.patch)
-md5sums=('4ae56a16e5f03327792d156136730c34'
+md5sums=('4f95206a1eef218bd007c3b43e1334f5'
          '45d0668f56c5e4ca58002f38fd3eb4a0'
          '668def9c99f044db9a8215fa927d6ac2'
          '9ab69e1cd26826196fac5b3f01e6cb95'
@@ -53,34 +52,43 @@ prepare() {
 }
 
 build() {
-  plain "No build step"
+  export FREETYPE_DIR=${MINGW_PREFIX}
+  
+  for builddir in {Release,Debug}-${MINGW_CHOST}; do
+    [[ -d $builddir ]] && rm -rf $builddir
+    mkdir -p $builddir
+    pushd $builddir
+    [[ "${builddir%-${MINGW_CHOST}}" == "Release" ]] && {
+      local _opts="-DBUILD_OSG_EXAMPLES:BOOL=ON"
+      local _postfix=
+    } || {
+      local _opts="-DBUILD_OSG_EXAMPLES:BOOL=OFF -DBUILD_OSG_APPLICATIONS=OFF"
+      local _postfix="-debug"
+    }
+    
+    msg "Building ${builddir%-${MINGW_CHOST}} version..."
+    
+    ${MINGW_PREFIX}/bin/cmake.exe \
+      -G"MSYS Makefiles" \
+      -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${_postfix}${MINGW_PREFIX} \
+      -DCMAKE_BUILD_TYPE=${builddir%-${MINGW_CHOST}} \
+      -DACTUAL_3DPARTY_DIR=${MINGW_PREFIX} \
+      ${_opts} \
+      ../${_realname}-${_pkgver}
+
+    make
+    popd
+  done
 }
 
 package_release() {
-  provides=("${MINGW_PACKAGE_PREFIX}-${_realname}")
-  conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}")
   
   mkdir -p ${pkgdir}${MINGW_PREFIX}
   pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
   export PREFIX_WIN=`pwd -W`
   popd > /dev/null
-
-  pushd ${MINGW_PREFIX} > /dev/null
-  export PREFIX_DEPS=`pwd -W`
-  popd > /dev/null
   
-  [[ -d ${srcdir}/build-release ]] && rm -rf ${srcdir}/build-release
-  mkdir -p ${srcdir}/build-release && cd ${srcdir}/build-release
-  export FREETYPE_DIR=${PREFIX_DEPS}
-  ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DBUILD_OSG_EXAMPLES:BOOL=ON \
-    -DACTUAL_3DPARTY_DIR=${MINGW_PREFIX} \
-    ../${_realname}-${_pkgver}
-  
-  make
+  cd Release-${MINGW_CHOST}
   make -j1 install
   
   for ff in ${pkgdir}${MINGW_PREFIX}/lib/pkgconfig/*.pc; do
@@ -92,31 +100,8 @@ package_debug() {
   depends=("${MINGW_PACKAGE_PREFIX}-${_realname}=$pkgver")
   options=('staticlibs' '!strip')
   pkgdesc="Open source high performance 3D graphics toolkit (debug) (mingw-w64)"
-  provides=("${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
-  conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-debug")
   
-  mkdir -p ${pkgdir}${MINGW_PREFIX}
-  pushd ${pkgdir}${MINGW_PREFIX} > /dev/null
-  export PREFIX_WIN=`pwd -W`
-  popd > /dev/null
-
-  pushd ${MINGW_PREFIX} > /dev/null
-  export PREFIX_DEPS=`pwd -W`
-  popd > /dev/null
-  
-  [[ -d ${srcdir}/build-debug ]] && rm -rf ${srcdir}/build-debug
-  mkdir -p ${srcdir}/build-debug && cd ${srcdir}/build-debug
-  export FREETYPE_DIR=${PREFIX_DEPS}
-  ${MINGW_PREFIX}/bin/cmake.exe \
-    -G"MSYS Makefiles" \
-    -DCMAKE_INSTALL_PREFIX:PATH=${pkgdir}${MINGW_PREFIX} \
-    -DCMAKE_BUILD_TYPE=Debug \
-    -DBUILD_OSG_EXAMPLES:BOOL=OFF \
-    -DBUILD_OSG_APPLICATIONS=OFF \
-    -DACTUAL_3DPARTY_DIR=${MINGW_PREFIX} \
-    ../${_realname}-${_pkgver}
-  
-  make
+  cd Debug-${MINGW_CHOST}
   make -j1 install
 
   rm -rf ${pkgdir}${MINGW_PREFIX}/include