Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 113 insertions, 23 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index 441e658a9..e303d8d2b 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,4 +1,3 @@
-# $Id$
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _spacenav=false
@@ -14,7 +13,7 @@ fi
 epoch=7
 pkgver=2.66a
 _pyver=3.3
-pkgrel=3
+pkgrel=4
 pkgdesc="Fully integrated 3D graphics creation suite, without nonfree povray and cuda support$_spndesc"
 arch=(
   i686
@@ -22,21 +21,23 @@ arch=(
   mips64el
 )
 license=GPL
-url="http://www.${_pkgname%-$_pkgflag}.org"
+url=http://www.${_pkgname%-$_pkgflag}.org
 depends=(
   desktop-file-utils
-  ffmpeg
-  fftw
-  freetype2
+  'ffmpeg=1:1.2'
+  fftw #3.3.3
+  freetype2 #2.4.11
   hicolor-icon-theme
+  'ilmbase=2.0.0'
   jack
-  libpng
-  libtiff
-  openal
-  openimageio
-  opencollada
-  opencolorio
-  openshadinglanguage
+  libpng #1.5.15
+  libtiff #4.0.3
+  openal #1.15.1
+  'openexr=2.0.0'
+  openimageio #1.1.9
+  'opencollada=20130305'
+  opencolorio #1.0.8
+  openshadinglanguage #1.3.0
   shared-mime-info
   xdg-utils
 )
@@ -45,27 +46,29 @@ if [ $_spacenav == true ]; then
     libspnav
   )
 fi
-optdepends='bullet: for Rigid Bodies and Physics Simulation'
+optdepends=(
+  'bullet: for Rigid Bodies and Physics Simulation'
+  'xcftools: for import GIMP images to scene (pcr repo)'
+)
 makedepends=(
   boost
   cmake
   mesa
   subversion
 )
-provides=(
-  ${_pkgname%-$_pkgflag}=$epoch:$pkgver
-)
+provides=(${_pkgname%-$_pkgflag}=$epoch:$pkgver)
 conflicts=${_pkgname%-$_pkgflag}
 replaces=${_pkgname%-$_pkgflag}
 install=$_pkgname.install
-source="http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz"
+source=http://download.${_pkgname%-$_pkgflag}.org/source/${_pkgname%-$_pkgflag}-$pkgver.tar.gz
 sha512sums=ea5def031daa220991f6165950234b311e8ae3baa6785d6226efefa90b64e1b83e8635f71f9a7fc7ae23923ce313d5ae48ffa0c54cf7ff794a4fb2dacbe8714f
 
-build() {
-  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver
+prepare() {
+  mkdir cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
+}
 
-  mkdir build
-  cd build
+build() {
+  cd $srcdir/${_pkgname%-$_pkgflag}-$pkgver/build
 
   [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
diff --git a/libre/opencollada/PKGBUILD b/libre/opencollada/PKGBUILD
new file mode 100644
index 000000000..2cf700e1f
--- /dev/null
+++ b/libre/opencollada/PKGBUILD
@@ -0,0 +1,52 @@
+# Maintainer: Márcio Silva <coadde@lavabit.com>
+
+pkgname=opencollada
+pkgver=20130305
+pkgrel=1
+pkgdesc="Stream based reader and writer library for COLLADA files (built for the blender-libre package)"
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+url=https://github.com/KhronosGroup/OpenCOLLADA
+license=GPL
+depends=(
+  libxml2
+  pcre
+)
+makedepends=(
+  git
+  cmake
+)
+source=git://github.com/KhronosGroup/OpenCOLLADA.git
+sha512sums=SKIP
+
+prepare() {
+  cd $srcdir/OpenCOLLADA
+
+  # adapt source to last blender release
+  git reset --hard da9f1c3d5da28d475f35ff1175d60cb74fa0f661 # Tue Mar 5 11:30:27 2013 +0100
+
+  [[ -d build ]] && rm -r build
+  mkdir build
+}
+
+build() {
+  cd $srcdir/OpenCOLLADA/build
+
+  setarch $CARCH cmake .. -DCMAKE_INSTALL_PREFIX=/usr
+  setarch $CARCH make
+}
+
+package() {
+  cd $srcdir/OpenCOLLADA/build
+
+  setarch $CARCH make DESTDIR=$pkgdir install
+
+  install -d  $pkgdir/etc/ld.so.conf.d
+  echo /usr/lib/$pkgname > $pkgdir/etc/ld.so.conf.d/$pkgname.conf
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/libre/python2-cssmin-fredj/PKGBUILD b/libre/python2-cssmin-fredj/PKGBUILD
new file mode 100644
index 000000000..0f155de89
--- /dev/null
+++ b/libre/python2-cssmin-fredj/PKGBUILD
@@ -0,0 +1,34 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=python2-cssmin
+pkgname=python2-cssmin-fredj
+pkgver=0.1.4.git4 # 0.1.4.git<number of commits after 0.1.4>
+_gitver='commit=3422b9962c5a6c2adb9597f418131d73e991c9b6'
+pkgdesc="Provides a country field for Django models"
+license=('custom:MIT')
+url="http://bitbucket.org/smileychris/django-countries/"
+
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+pkgrel=1
+arch=(any)
+
+makedepends=('python2-distribute')
+source=("libre://$pkgname-$pkgver.tar.gz")
+md5sums=('09649b374d148014a5644e9df8fcf18e')
+
+mkmakedepends=('git')
+mksource=("$pkgname-$pkgver::git://github.com/fredj/cssmin.git#${_gitver}")
+mkmd5sums=('SKIP')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  sed -i 's|#!/usr/bin/env python\s*$|#!/usr/bin/env python2|' setup.py src/cssmin.py
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./setup.py install --root="$pkgdir/" --optimize=1
+}
+
diff --git a/libre/python2-django-countries/PKGBUILD b/libre/python2-django-countries/PKGBUILD
index a7bd85da1..36bc6a580 100644
--- a/libre/python2-django-countries/PKGBUILD
+++ b/libre/python2-django-countries/PKGBUILD
@@ -10,7 +10,7 @@ license=('custom:MIT')
 replaces=($_pkgname)
 conflicts=($_pkgname)
 
-pkgrel=2
+pkgrel=3
 arch=(any)
 depends=('python2-django')
 makedepends=('python2-distribute')
@@ -28,4 +28,5 @@ build() {
 package() {
   cd "$srcdir/$_pkgname-$pkgver"
   ./setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 }