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

2 files changed, 41 insertions, 86 deletions

diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index b39705eed..f386e5e6c 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -1,21 +1,12 @@
 # Maintainer: Márcio Silva <coadde@lavabit.com>
 
 _pkgname=blender
-epoch=9
-_pkgver=2.68
-pkgrel=1
+epoch=10
+_pkgver=2.68a
+pkgrel=2
 _jpgver=1.5
 _pyver=3.3
 
-# Only used if package is unstable.
-_svn=false
-[[ $_svn == true ]] && {
-  pkgrel=1
-  _svnrev=58224
-  _svnver=.r$_svnrev
-  _svndesc=', svn version'
-}
-
 _spn=false
 [[ $_spn == true ]] && {
   _spnname=-spacenav
@@ -23,8 +14,8 @@ _spn=false
 }
 
 pkgname=$_pkgname$_spnname-libre
-pkgver=$_pkgver$_svnver
-pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_svndesc$_spndesc
+pkgver=$_pkgver
+pkgdesc='Fully integrated 3D graphics creation suite, without nonfree povray and cuda support'$_spndesc
 arch=(
   mips64el
   x86_64
@@ -60,22 +51,30 @@ makedepends=(
   boost
   cmake
   mesa
-  subversion
 )
-provides=($_pkgname=$epoch:$_pkgver)
-conflicts=$_pkgname
+provides=($_pkgname)
+[[ $_spn == true ]] && provides+=($_pkgname-libre)
+conflicts=($_pkgname)
+[[ $_spn == true ]] && conflicts+=($_pkgname-libre)
 replaces=$_pkgname
 install=$_pkgname.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
-sha512sums=b7a8ce36714881d8dd809c3597695945cceddfc65ab2d20597a7d9c6327805d86edc4131cdc543d9267e120833781764a8a43a2dba06866fc4e62761f7c93ebf
-[[ $_svn == true ]] && {
-  source=$_pkgname-$pkgver::svn+https://svn.$_pkgname.org/svnroot/bf-$_pkgname/trunk/$_pkgname#revision=$_svnrev
-  sha512sums=SKIP
-}
+sha512sums=ce93779c5cbadf361f08ad0f9d5370d52878f94edc0b113d73711b842169d0e000e1500ece8e534439d94c5983e6ff3f15ca4ccd74db5f21447274c475090019
 
 prepare() {
   cd $srcdir/$_pkgname-$pkgver
 
+  msg 'renaming wrong OS name'
+  _OS=$(uname -o)
+  [[ $_OS == GNU ]] && sed -i 's|BUILD_PLATFORM;|"GNU";|' source/creator/buildinfo.c
+  [[ $_OS == GNU/Linux ]] && sed -i 's|BUILD_PLATFORM;|"GNU/Linux-libre";|' source/creator/buildinfo.c
+  sed -i 's|Linux, Mac OS X, Windows and FreeBSD|GNU and GNU/Linux-libre|
+          s|Linux, FreeBSD|GNU, GNU/Linux-libre|
+         ' release/text/readme.html
+
+  msg 'removing Open Source term'
+  sed -i 's|free, open source|free|' release/text/readme.html
+
   mkdir -v build
 
   msg 'Remove nonfree povray render support'
@@ -85,7 +84,7 @@ prepare() {
 build() {
   cd $srcdir/$_pkgname-$pkgver/build
 
-  [[ $CARCH == x86_64 ]] && _SSE2=ON || _SSE2=OFF
+  [[ $CARCH == x86_64 || $CARCH == i686 ]] && _SSE=ON _SSE2=ON || _SSE=OFF _SSE2=OFF
   [[ $_spn == true ]] && _NDOF=ON || _NDOF=OFF
   cmake ..\
     -DCMAKE_BUILD_TYPE=Release\
@@ -96,6 +95,7 @@ build() {
     -DPYTHON_LIBPATH=/usr/lib\
     -DPYTHON_LIBRARY=python${_pyver}m\
     -DPYTHON_VERSION=$_pyver\
+    -DSUPPORT_SSE_BUILD=$_SSE\
     -DSUPPORT_SSE2_BUILD=$_SSE2\
     -DWITH_BULLET=ON\
     -DWITH_CODEC_FFMPEG=ON\
@@ -123,7 +123,7 @@ build() {
 package() {
   cd $srcdir/$_pkgname-$pkgver/build
   make DESTDIR=$pkgdir install
-  python -m compileall $pkgdir/usr/share/$_pkgname || return 0
+  python -m compileall $pkgdir/usr/share/$_pkgname
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/libre/gst-plugins-bad-libre/PKGBUILD b/libre/gst-plugins-bad-libre/PKGBUILD
index eac23b4be..6477c774c 100644
--- a/libre/gst-plugins-bad-libre/PKGBUILD
+++ b/libre/gst-plugins-bad-libre/PKGBUILD
@@ -1,70 +1,25 @@
-# $Id: PKGBUILD 190001 2013-07-12 20:00:03Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
 
-pkgbase=gst-plugins-bad
-pkgname=gst-plugins-bad-libre
-pkgver=1.0.8
+_pkgname=gst-plugins-bad
+pkgname=$_pkgname-libre
+pkgver=1.0.9
 pkgrel=1
 pkgdesc='GStreamer Multimedia Framework Bad Plugins, without nonfree faac support'
-arch=(
-  i686
-  x86_64
-  mips64el
-)
-license=(
-  LGPL
-)
+arch=('i686' 'x86_64' 'mips64el')
+license=('LGPL')
 url="http://gstreamer.freedesktop.org/"
-depends=(
-  celt
-  chromaprint
-  curl
-  faad2
-  gst-plugins-base-libs
-  libdca
-  libdvdnav
-  libgme
-  libmms
-  libmodplug
-  libofa
-  neon
-  mjpegtools
-  mpg123
-  opus
-  soundtouch
-  spandsp
-  wayland
-)
-makedepends=(
-  libdvdread
-  libexif
-  libmpeg2
-  libvdpau
-  schroedinger
-)
-provides=(
-  $pkgbase=$pkgver
-)
-conflicts=(
-  $pkgbase
-)
-replaces=(
-  $pkgbase 
-)
-options=(
-  '!libtool'
-  '!emptydirs'
-)
-source=(
-  "$url/src/$pkgbase/$pkgbase-$pkgver.tar.xz"
-)
-sha256sums=(
-  6949b5532034fc37d5a874e4e3330107767238bc4def9f769b8193124e2420cc
-)
+depends=('mjpegtools' 'gst-plugins-base-libs' 'curl' 'chromaprint' 'libmms' 'faad2' 'mpg123' 'celt' 'libdca' 'soundtouch' 'spandsp' 'libdvdnav' 'libmodplug' 'libgme' 'opus' 'wayland' 'neon' 'libofa' 'fluidsynth' 'openjpeg')
+makedepends=('schroedinger' 'libexif' 'libdvdread' 'libvdpau' 'libmpeg2')
+provides=($_pkgname=$pkgver)
+conflicts=$_pkgname
+replaces=$_pkgname
+options=(!libtool !emptydirs)
+source=(${url}/src/$_pkgname/$_pkgname-$pkgver.tar.xz)
+sha256sums=('69d236b1d8188270a3f51f6710146d0ca63c2f1a9f6cfbab3399ef01b9498f75')
 
 build() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
   sed -i '/AC_PATH_XTRA/d' configure.ac
   aclocal -I m4 -I common/m4
   autoconf
@@ -78,11 +33,11 @@ build() {
 }
 
 check() {
-  cd $pkgbase-$pkgver
+  cd $_pkgname-$pkgver
   make check
 }
 
 package() {
-  cd $pkgbase-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $_pkgname-$pkgver
+  make DESTDIR="${pkgdir}" install
 }