[arch-commits] Commit in bullet/trunk (PKGBUILD bullet.pc)

[Sven-Hendrik Haase]

    Date: Thursday, May 7, 2015 @ 20:54:12
  Author: svenstaro
Revision: 238601

upgpkg: bullet 2.83.2-1

upstream release 2.83.2

Modified:
  bullet/trunk/PKGBUILD
Deleted:
  bullet/trunk/bullet.pc

-----------+
 PKGBUILD  |   40 ++++++++++++++--------------------------
 bullet.pc |   11 -----------
 2 files changed, 14 insertions(+), 37 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2015-05-07 18:29:40 UTC (rev 238600)
+++ PKGBUILD	2015-05-07 18:54:12 UTC (rev 238601)
@@ -4,44 +4,34 @@
 
 pkgbase=bullet
 pkgname=('bullet' 'bullet-docs')
-_rev=2704
-pkgver=2.82
+pkgver=2.83.2
 pkgrel=1
 pkgdesc="A 3D Collision Detection and Rigid Body Dynamics Library for games and animation"
 arch=('i686' 'x86_64')
 url="http://www.bulletphysics.com/Bullet/"
 license=('custom:zlib')
-depends=()
-makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa')
-source=(http://bullet.googlecode.com/files/${pkgbase}-${pkgver}-r${_rev}.tgz
-        ${pkgbase}.pc)
-md5sums=('70b3c8d202dee91a0854b4cbc88173e8'
-         'd1da06deba3b08b884d2212f6838905c')
+makedepends=('cmake' 'doxygen' 'graphviz' 'ttf-dejavu' 'mesa' 'glu')
+optdepends=('glu: for the example browser')
+source=("https://github.com/bulletphysics/bullet3/archive/${pkgver}.tar.gz")
+md5sums=('65f916eab9732436bdfbac36f8b282e7')
 
 build() {
-  cd ${pkgbase}-${pkgver}-r${_rev}
+  cd ${pkgbase}3-${pkgver}
 
-  # get a clean build dir
   [[ -d build ]] && rm -rf build
   mkdir build && cd build 
 
-  # generate CMake Makefile
   cmake .. \
        -DCMAKE_INSTALL_PREFIX=/usr \
        -DBUILD_SHARED_LIBS=1 \
-       -DBUILD_DEMOS=0 \
-       -DBUILD_MULTITHREADING=1 \
-       -DBUILD_EXTRAS=1 \
        -DINSTALL_LIBS=1 \
        -DINSTALL_EXTRA_LIBS=1 \
-       -DCMAKE_BUILD_TYPE=Release # set =Debug for debugging version
+       -DCMAKE_BUILD_TYPE=Release
 
-  # compile
   make
 
-  # generate docs
   cd ..
-  sed -i 's/GENERATE_HTMLHELP.*//g' Doxyfile
+  #sed -i 's/GENERATE_HTMLHELP.*//g' Doxyfile
   doxygen
 }
 
@@ -48,17 +38,13 @@
 package_bullet() {
   optdepends=('bullet-docs: documentation')
 
-  cd ${pkgbase}-${pkgver}-r${_rev}/build
+  cd ${pkgbase}3-${pkgver}/build
 
   # install it
   make DESTDIR=${pkgdir} install
 
-  # manually handle pkgconfig file
-  mkdir -p "${pkgdir}"/usr/lib/pkgconfig
-  sed "s|VERSION|${pkgver}|g" ${srcdir}/bullet.pc > ${pkgdir}/usr/lib/pkgconfig/bullet.pc
-
   # install license
-  install -Dm644 ../BulletLicense.txt ${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE
+  install -Dm644 ../LICENSE.txt ${pkgdir}/usr/share/licenses/${pkgbase}/LICENSE
 }
 
 package_bullet-docs() {
@@ -65,10 +51,12 @@
   pkgdesc="Documentation for bullet"
   depends=()
 
-  cd ${pkgbase}-${pkgver}-r${_rev}
+  cd ${pkgbase}3-${pkgver}
 
   # install docs
-  install -Dm644 Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf
+  install -Dm644 docs/GPU_rigidbody_using_OpenCL.pdf ${pkgdir}/usr/share/doc/bullet/GPU_rigidbody_using_OpenCL.pdf
+  install -Dm644 docs/Bullet_User_Manual.pdf ${pkgdir}/usr/share/doc/bullet/Bullet_User_Manual.pdf
+  install -Dm644 docs/BulletQuickstart.pdf ${pkgdir}/usr/share/doc/bullet/BulletQuickstart.pdf
   cp -r html ${pkgdir}/usr/share/doc/bullet/html  
 }
 # vim: sw=2 ts=2 et:

Deleted: bullet.pc
===================================================================
--- bullet.pc	2015-05-07 18:29:40 UTC (rev 238600)
+++ bullet.pc	2015-05-07 18:54:12 UTC (rev 238601)
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${exec_prefix}/lib
-includedir=${prefix}/include
-
-Name: bullet
-Description: Bullet Continuous Collision Detection and Physics Library
-Requires:
-Version: VERSION
-Libs: -L${libdir} -lBulletDynamics -lBulletCollision -lLinearMath -lBulletSoftBody
-Cflags: -I${includedir}/bullet