diff options
| -rw-r--r-- | libre/blender-addon-luxrender/PKGBUILD | 8 | ||||
| -rw-r--r-- | libre/clementine-libre/PKGBUILD | 6 | ||||
| -rw-r--r-- | libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch | 11 | ||||
| -rw-r--r-- | pcr/blender-addon-ogre/PKGBUILD | 13 | ||||
| -rw-r--r-- | pcr/yafaray/PKGBUILD | 54 |
5 files changed, 56 insertions, 36 deletions
diff --git a/libre/blender-addon-luxrender/PKGBUILD b/libre/blender-addon-luxrender/PKGBUILD index 6ec5ec2f5..d3c891067 100644 --- a/libre/blender-addon-luxrender/PKGBUILD +++ b/libre/blender-addon-luxrender/PKGBUILD @@ -4,21 +4,21 @@ _srcname=luxrender _pkgver=1.2.1 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=${_srcname::3}${_bldname::5}25 _srcver=c9deae0646d0 pkgname=$_bldname-addon-$_srcname pkgver=$_pkgver.v$_bldver -pkgrel=2 +pkgrel=3 pkgdesc="$_pkgname: A addon for the ${_bldname^} which allows render and export with LuxRender (built for the $_bldname-libre package)" arch=any url=http://www.$_srcname.net/ license=GPL depends=( $_srcname=$_pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) provides=($_pkgname=$_pkgver) conflicts=$_pkgname diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD index f219c9c43..4cc986be1 100644 --- a/libre/clementine-libre/PKGBUILD +++ b/libre/clementine-libre/PKGBUILD @@ -32,11 +32,11 @@ source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar 'moognu.png') md5sums=('28e4afb822388bd337a761db8f86febf' '736df6cd828a3172701f63c8dc978cb9' - '5cc8f800dd4df7bd5548196009ab68e0' + '9ccfe62f8784a1ccbe8c96f8cacad9d0' '59a8c0d7659898c457b95f877718cf1c') prepare() { - cd ${pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} patch -Np1 -i ../clementine-1.1.1-libimobiledevice-fix.patch @@ -64,7 +64,7 @@ prepare() { } build() { - cd ${pkgname}-${pkgver} + cd ${_pkgname}-${pkgver} if [[ -d build ]]; then rm -rf build diff --git a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch index 6008b2d28..3a948bf96 100644 --- a/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch +++ b/libre/clementine-libre/remove-nonfree-artwork-and-spotify.patch @@ -658,8 +658,15 @@ diff -rauN clementine-1.1.1/src/core/backgroundstreams.cpp clementine-libre-1.1. if (version < kVersion) { diff -rauN clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp --- clementine-1.1.1/src/analyzers/nyancatanalyzer.cpp 2012-10-16 08:17:37.000000000 -0200 -+++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-05-13 03:56:04.732771832 -0300 -@@ -29,7 +29,7 @@ ++++ clementine-libre-1.1.1/src/analyzers/nyancatanalyzer.cpp 2013-08-02 00:16:25.974215711 -0300 +@@ -23,13 +23,13 @@ + #include <QTimerEvent> + #include <QBrush> + +-const char* NyanCatAnalyzer::kName = "Nyanalyzer cat"; ++const char* NyanCatAnalyzer::kName = "MooGNU"; + const float NyanCatAnalyzer::kPixelScale = 0.02f; + NyanCatAnalyzer::NyanCatAnalyzer(QWidget* parent) : Analyzer::Base(parent, 9), diff --git a/pcr/blender-addon-ogre/PKGBUILD b/pcr/blender-addon-ogre/PKGBUILD index 77ae390f6..4baf8ca39 100644 --- a/pcr/blender-addon-ogre/PKGBUILD +++ b/pcr/blender-addon-ogre/PKGBUILD @@ -2,23 +2,28 @@ _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _pkgname=ogre pkgname=$_bldname-addon-$_pkgname pkgver=0.6.0 -pkgrel=1 +pkgrel=2 pkgdesc="${_bldname}2$_pkgname: A addon for the ${_bldname^} which allows export to ${_pkgname^}3D formats (scene/mesh/material/skeleton) (built for the $_bldname-libre package)" arch=any url=https://code.google.com/p/${_bldname}2$_pkgname license=LGPL2.1 depends=( - "$_bldname-libre>=$(($_bldep-1)):$_bldver" - "$_bldname-libre<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) source=https://${_bldname}2$_pkgname.googlecode.com/files/${_bldname}2$_pkgname-$pkgver.zip sha512sums=15609a6dc3f5901ec59193acb6944017cc426fa12ce658715006ba781b6c39a09f38a64c858b28f7e662dff50eccf06ec6ef6efc22e0d2876c6c77fb18c04712 +prepare() { + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux|' io_export_${_pkgname}DotScene.py +} + package() { cd $srcdir a=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname diff --git a/pcr/yafaray/PKGBUILD b/pcr/yafaray/PKGBUILD index e42a63269..458181279 100644 --- a/pcr/yafaray/PKGBUILD +++ b/pcr/yafaray/PKGBUILD @@ -1,27 +1,30 @@ # Maintainer: Márcio Silva <coadde@lavabit.com> _pkgname=yafaray +_pkgver=1.5 +_pkgrel=3 _pkgdate=20130510 _bldname=blender _bldver=2.68 -_bldep=10 +_bldep=9 _gitname=Core _addname=${_bldname^}-Exporter -_addrel=2 +_addrel=1 +_adddate=20130623 _pyver=3.3 # Fri May 10 00:57:12 2013 -0700 - Merge pull request #67 from DarkTide/master // Depth fix for hist on background _srcver=44323def5b3866ff601fd401ef2160b80ced8141 -# Fri May 10 00:24:58 2013 -0700 - Merge pull request #14 from DarkTide/master // Version bump, and some other fixes -_addver=e6688fc4f480bcb1ae7d0a6dbe65563b3d070169 +# Sun Jun 23 15:10:57 2013 +0200 - Refine AA changes for SPPM integrator +_addver=9bcb22e8b8bd9281999ad36c5b22604f671484bb pkgname=( $_pkgname $_bldname-addon-$_pkgname ) -pkgver=1.5.$_pkgdate -pkgrel=2 -pkgdesc='A libre software raytracing engine' +pkgver=$_pkgver.$_pkgdate +pkgrel=$_pkgrel +pkgdesc='A free software raytracing engine' arch=( mips64el x86_64 @@ -33,7 +36,7 @@ depends=( freetype2 libjpeg libxml2 - openexr + openexr-libre ) optdepends=( 'python: Python bindings' @@ -48,22 +51,30 @@ makedepends=( swig ) source=( - git://github.com/YafaRay/$_gitname.git - git://github.com/YafaRay/$_addname.git + $_gitname-$_srcver.tar.gz::https://github.com/YafaRay/$_gitname/archive/$_srcver.tar.gz + $_addname-$_addver.tar.gz::https://github.com/YafaRay/$_addname/archive/$_addver.tar.gz +) +sha512sums=( + 5045a3de89e0a2d029e8b6ce962eeadeb5587369217d11d42ca79706a65e6ac7b07584f68307f76c90dbaf190af9626e3351e391107a4e763fc9e41d48cfd7a6 + 59322686d0623481b38c531e2a8350cafcf8942eb08df2dfcc8f59657715aa716ca34d473f862291e8a375fccdf717d93898caa3e344cfa1a3e5e760c903d32c ) -sha512sums=(SKIP SKIP) prepare() { - cd $srcdir/$_gitname + cd $srcdir/$_gitname-$_srcver + + msg 'Renaming addon dir' + mv -v $srcdir/$_addname-$_addver $srcdir/$_pkgname - git checkout $_srcver + msg 'renaming wrong OS name' + sed -i 's|Linux|GNU/Linux| + ' $srcdir/$_pkgname/prop/yaf_scene.py [[ -d build ]] && rm -vr build mkdir -v build } build() { - cd $srcdir/$_gitname/build + cd $srcdir/$_gitname-$_srcver/build cmake .. -DCMAKE_INSTALL_PREFIX=/usr\ -DYAF_PY_VERSION=$_pyver\ -DYAF_BINDINGS_PY_DIR=/usr/lib/python$_pyver @@ -71,7 +82,7 @@ build() { } package_yafaray() { - cd $srcdir/$_gitname/build + cd $srcdir/$_gitname-$_srcver/build make DESTDIR=$pkgdir install } @@ -80,22 +91,19 @@ package_blender-addon-yafaray() { arch=any depends=( $_pkgname=$pkgver - "$_bldname>=$(($_bldep-1)):$_bldver" - "$_bldname<$_bldep:${_bldver::2}$((${_bldver:2:4}+1))" + "$_bldname-libre>=$_bldep:$_bldver" + "$_bldname-libre<$(($_bldep+1)):${_bldver::2}$((${_bldver:2:4}+1))" ) - pkgver=$pkgver.v$_bldver + pkgver=$_pkgver.$_adddate.v$_bldver pkgrel=$_addrel optdepends= - cd $srcdir/$_addname + cd $srcdir a=/usr/lib b=$pkgdir/usr/share/$_bldname/$_bldver/scripts/addons/$_pkgname/bin - git checkout $_addver - git checkout-index -a -f --prefix=${b%bin} - - install -vd $b + install -vd $b && cp -a $_pkgname ${b%$_pkgname/bin} ln -vsf $a/lib${_pkgname}core.so $b/lib${_pkgname}core.so ln -vsf $a/lib${_pkgname}plugin.so $b/lib${_pkgname}plugin.so ln -vsf $a/$_pkgname $b/plugins |