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

2 files changed, 153 insertions, 90 deletions

diff --git a/artistic/blender-spacenav-libre/PKGBUILD b/artistic/blender-spacenav-libre/PKGBUILD
index bcd07aff4..9ef4b7b07 100755
--- a/artistic/blender-spacenav-libre/PKGBUILD
+++ b/artistic/blender-spacenav-libre/PKGBUILD
@@ -1,65 +1,97 @@
 # $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-_pkgname=blender
 pkgname=blender-spacenav-libre
-pkgver=2.64
+pkgver=2.64a
 pkgrel=1
-pkgdesc="A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils'
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
-         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
-         'openimageio' 'libsndfile' 'jack' 'libspnav')
-makedepends=('cmake' 'boost')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}" "${_pkgname}-libre")
-provides=("${_pkgname}=${pkgver}" "${_pkgname}-libre=${pkgver}")
-install=${_pkgname}.install
-source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
-        ffmpeg-0.11.patch
-        boost-1.50.patch)
-md5sums=('caec080d2a3dcd57fe1ca20c51c00e53'
-         '9e5649403e51654615d30b10bc460217'
-         '0bab80da07d980c47b8ce3cb998edaef')
+pkgaev=5
+pkgdesc='A fully integrated 3D graphics creation suite, compiled with spacenav (without nonfree cuda-toolkit support)'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+license=(
+  GPL
+)
+url=http://www.${pkgname%-spacenav-libre}.org
+depends=(
+  boost-libs
+  desktop-file-utils
+  ffmpeg
+  fftw
+  freetype2
+  glew
+  glu
+  hicolor-icon-theme
+  jack
+  libgl
+  libpng
+  libsndfile
+  libspnav
+  libtiff
+  openal
+  opencollada
+  opencolorio
+  openexr
+  openimageio
+  python
+  shared-mime-info
+  xdg-utils
+)
+makedepends=(
+  mesa
+  boost
+  cmake
+  subversion
+)
+replaces=(
+  ${pkgname%-spacenav-libre}
+)
+conflicts=(
+  ${pkgname%-spacenav-libre}
+)
+provides=(
+  ${pkgname%-spacenav-libre}=$pkgaev:$pkgver
+)
+install=${pkgname%-spacenav-libre}.install
+source=(
+  http://download.${pkgname%-spacenav-libre}.org/source/${pkgname%-spacenav-libre}-$pkgver.tar.gz
+)
+sha512sums=(
+  77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
+)
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  #patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
-  #patch -Np1 < "${srcdir}"/boost-1.50.patch
-  #sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
-  #sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
+  cd $srcdir/${pkgname%-spacenav-libre}-$pkgver
 
   mkdir build
   cd build
 
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF"
+  [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_INSTALL_PORTABLE=OFF \
-    -DWITH_PYTHON_INSTALL=OFF \
-    -DWITH_OPENCOLLADA=ON \
-    -DOPENIMAGEIO_ROOT_DIR=/usr \
-    -DWITH_GAMEENGINE=ON \
-    -DWITH_JACK=ON \
-    -DWITH_PLAYER=ON \
-    -DWITH_BUILTIN_GLEW=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \
+    -DPYTHON_LIBPATH=/usr/lib \
+    -DPYTHON_LIBRARY=python3.2mu \
+    -DPYTHON_VERSION=3.2 \
+    $DSUPPORT_SSE2_BUILD \
     -DWITH_CODEC_FFMPEG=ON \
     -DWITH_CODEC_SNDFILE=ON \
     -DWITH_CYCLES=ON \
     -DWITH_CYCLES_CUDA_BINARIES=OFF \
     -DWITH_FFTW3=ON \
+    -DWITH_GAMEENGINE=ON \
+    -DWITH_IMAGE_REDCODE=OFF \
+    -DWITH_INSTALL_PORTABLE=OFF \
+    -DWITH_JACK=ON \
     -DWITH_MOD_OCEANSIM=ON \
-    -DPYTHON_VERSION=3.2 \
-    -DPYTHON_LIBPATH=/usr/lib \
-    -DPYTHON_LIBRARY=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \
-    $ENABLESSE2
+    -DWITH_OPENCOLLADA=ON \
+    -DWITH_PLAYER=ON \
+    -DWITH_PYTHON_INSTALL=OFF \
+    -DWITH_SYSTEM_GLEW=ON
 
   make $MAKEFLAGS
 
@@ -67,7 +99,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
+  cd $srcdir/${pkgname%-spacenav-libre}-$pkgver/build
+  make DESTDIR=$pkgdir install
+  python -m compileall $pkgdir/usr/share/blender
 }
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index f7005d739..fcaa11298 100755
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,65 +1,96 @@
 # $Id$
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-_pkgname=blender
 pkgname=blender-libre
-pkgver=2.64
+pkgver=2.64a
 pkgrel=1
-pkgdesc="A fully integrated 3D graphics creation suite (without nonfree cuda-toolkit support)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL')
-url="http://www.blender.org"
-depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils'
-         'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
-         'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
-         'openimageio' 'libsndfile' 'jack')
-makedepends=('cmake' 'boost')
-replaces=("${_pkgname}")
-conflicts=("${_pkgname}")
-provides=("${_pkgname}=${pkgver}")
-install=${_pkgname}.install
-source=(http://download.${_pkgname}.org/source/${_pkgname}-${pkgver}.tar.gz
-        ffmpeg-0.11.patch
-        boost-1.50.patch)
-md5sums=('caec080d2a3dcd57fe1ca20c51c00e53'
-         '9e5649403e51654615d30b10bc460217'
-         '0bab80da07d980c47b8ce3cb998edaef')
+pkgaev=5
+pkgdesc='A fully integrated 3D graphics creation suite, without nonfree cuda-toolkit support'
+arch=(
+  i686
+  x86_64
+  mips64el
+)
+license=(
+  GPL
+)
+url=http://www.${pkgname%-libre}.org
+depends=(
+  boost-libs
+  desktop-file-utils
+  ffmpeg
+  fftw
+  freetype2
+  glew
+  glu
+  hicolor-icon-theme
+  jack
+  libgl
+  libpng
+  libsndfile
+  libtiff
+  openal
+  opencollada
+  opencolorio
+  openexr
+  openimageio
+  python
+  shared-mime-info
+  xdg-utils
+)
+makedepends=(
+  mesa
+  boost
+  cmake
+  subversion
+)
+replaces=(
+  ${pkgname%-libre}
+)
+conflicts=(
+  ${pkgname%-libre}
+)
+provides=(
+  ${pkgname%-libre}=$pkgaev:$pkgver
+)
+install=${pkgname%-libre}.install
+source=(
+  http://download.${pkgname%-libre}.org/source/${pkgname%-libre}-$pkgver.tar.gz
+)
+sha512sums=(
+  77d171a36f1c87a82613ed7601df9cef444069a2a6600e05260607e9a2009c292068a2b4753f3cbd53d820cdc8d9ed88ddd1685f20647b943f75bfbeb905b9b5
+)
 
 build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  #patch -Np1 < "${srcdir}"/ffmpeg-0.11.patch
-  #patch -Np1 < "${srcdir}"/boost-1.50.patch
-  #sed -i "/<libavcodec\/opt.h>/d" intern/ffmpeg/ffmpeg_compat.h
-  #sed -i "/<libavcodec\/opt.h>/d" source/blender/blenkernel/intern/writeffmpeg.c
+  cd $srcdir/${pkgname%-libre}-$pkgver
 
   mkdir build
   cd build
 
-  [[ $CARCH == i686 ]] && ENABLESSE2="-DSUPPORT_SSE2_BUILD=OFF"
+  [[ $CARCH == i686 ]] && DSUPPORT_SSE2_BUILD='-DSUPPORT_SSE2_BUILD=OFF'
 
   cmake .. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DWITH_INSTALL_PORTABLE=OFF \
-    -DWITH_PYTHON_INSTALL=OFF \
-    -DWITH_OPENCOLLADA=ON \
-    -DOPENIMAGEIO_ROOT_DIR=/usr \
-    -DWITH_GAMEENGINE=ON \
-    -DWITH_JACK=ON \
-    -DWITH_PLAYER=ON \
-    -DWITH_BUILTIN_GLEW=OFF \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \
+    -DPYTHON_LIBPATH=/usr/lib \
+    -DPYTHON_LIBRARY=python3.2mu \
+    -DPYTHON_VERSION=3.2 \
+    $DSUPPORT_SSE2_BUILD \
     -DWITH_CODEC_FFMPEG=ON \
     -DWITH_CODEC_SNDFILE=ON \
     -DWITH_CYCLES=ON \
     -DWITH_CYCLES_CUDA_BINARIES=OFF \
     -DWITH_FFTW3=ON \
+    -DWITH_GAMEENGINE=ON \
+    -DWITH_IMAGE_REDCODE=OFF \
+    -DWITH_INSTALL_PORTABLE=OFF \
+    -DWITH_JACK=ON \
     -DWITH_MOD_OCEANSIM=ON \
-    -DPYTHON_VERSION=3.2 \
-    -DPYTHON_LIBPATH=/usr/lib \
-    -DPYTHON_LIBRARY=python3.2mu \
-    -DPYTHON_INCLUDE_DIRS=/usr/include/python3.2mu \
-    $ENABLESSE2
+    -DWITH_OPENCOLLADA=ON \
+    -DWITH_PLAYER=ON \
+    -DWITH_PYTHON_INSTALL=OFF \
+    -DWITH_SYSTEM_GLEW=ON
 
   make $MAKEFLAGS
 
@@ -67,7 +98,7 @@ build() {
 }
 
 package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-  python -m compileall "${pkgdir}/usr/share/blender"
+  cd $srcdir/${pkgname%-libre}-$pkgver/build
+  make DESTDIR=$pkgdir install
+  python -m compileall $pkgdir/usr/share/blender
 }