diff options
| author | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-05 03:57:42 -0300 |
|---|---|---|
| committer | André Fabian Silva Delgado <emulatorman@parabola.nu> | 2014-09-05 03:57:42 -0300 |
| commit | 1df686610d221b3754f2cfbc462f6b007eae2fb4 (patch) | |
| tree | bdad7878878f5c2652936cfb5bc6b19a42cc66c1 | |
| parent | f23dfdc81b1c993520a9ab7cc12263efa31cd9bc (diff) | |
| parent | 8c05497ea182e4034e799ea08cb85014b6b371c7 (diff) | |
Merge branch 'master' of ssh://lukeshu.com:1863/srv/git/mirror/parabola/abslibre
| -rw-r--r-- | libre/blender/PKGBUILD | 21 | ||||
| -rw-r--r-- | libre/dvdrtools/PKGBUILD | 4 |
2 files changed, 9 insertions, 16 deletions
diff --git a/libre/blender/PKGBUILD b/libre/blender/PKGBUILD index 7d665ec9f..db5c6f0ad 100644 --- a/libre/blender/PKGBUILD +++ b/libre/blender/PKGBUILD @@ -4,9 +4,9 @@ # Maintainer: Márcio Silva <coadde@parabola.nu> pkgbase=blender -pkgname=("$pkgbase-parabola" "$pkgbase-addon-gimp" "$pkgbase-addon-povray" "$pkgbase-addons-contrib") +pkgname=blender pkgver=2.71 -pkgrel=2 +pkgrel=2.parabola1 epoch=14 _jpgver=1.5 _pyver=3.4 @@ -15,10 +15,10 @@ arch=('i686' 'x86_64' 'mips64el') license=('GPL') url="http://www.$pkgbase.org" depends=('boost-libs' 'desktop-file-utils' 'ffmpeg' 'fftw' 'freetype2' 'glew' - 'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libtiff' 'openal' - 'opencolorio' 'opencollada=20140214' 'openexr' 'openimageio' + 'hicolor-icon-theme' 'jack' 'libpng' 'libsndfile' 'libtiff' 'llvm-libs' + 'openal' 'opencolorio' 'opencollada=20140214' 'openexr' 'openimageio' 'openshadinglanguage=1.4.2' 'python' 'shared-mime-info' 'xdg-utils') -makedepends=('boost' 'cmake' 'git') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n) +makedepends=('boost' 'cmake' 'git' 'llvm') # 'bullet' (boost: for cycles, booleans, audaspace and/or i18n) optdepends=('bullet: for Rigid Bodies and Physics Simulation' #'mesa-libcl: for rendering with optional Mesa OpenCL' 'povray: for optional renderer with POV-Ray' @@ -27,20 +27,13 @@ optdepends=('bullet: for Rigid Bodies and Physics Simulation' 'blender-addon-mitsuba: for optional renderer and exporter with Mitsuba (pcr repo)' 'blender-addon-ogre: for export to Ogre3D formats (pcr repo)' 'blender-addon-yafaray: for optional renderer with YafaRay (pcr repo)') -provides=("$pkgbase") -conflicts=("$pkgbase" "$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") -replaces=("$pkgbase" "$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") +conflicts=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") +replaces=("$pkgbase-libre" "$pkgbase-libre-spacenav" "$pkgbase-spacenav-libre") options=('!strip') install="$pkgbase.install" source=("http://download.$pkgbase.org/source/$pkgbase-$pkgver.tar.gz") md5sums=('fc1112adb493ea62e9587ca0e86d6b0d') -#source=("git://git.$pkgbase.org/$pkgbase.git#tag=$pkgver" -# "git://git.$pkgbase.org/$pkgbase-translations.git#tag=$pkgver" -# "git://git.$pkgbase.org/$pkgbase-addons.git#tag=$pkgver" -# "git://git.$pkgbase.org/$pkgbase-addons-contrib.git#tag=$pkgver" -#md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP') - prepare() { cd $srcdir/$pkgbase-v$pkgver diff --git a/libre/dvdrtools/PKGBUILD b/libre/dvdrtools/PKGBUILD index 8f63f4734..ff3c51221 100644 --- a/libre/dvdrtools/PKGBUILD +++ b/libre/dvdrtools/PKGBUILD @@ -18,8 +18,8 @@ optdepends=('transcode: video/DVD ripper and encoder for the terminal/console') provides=('cdrkit') conflicts=("$_pkgname" 'cdrkit') replaces=("$_pkgname") -mksource=(ftp://ftp.archlinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz) -source=(https://repo.parabolagnulinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) +mksource=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.gz) +source=(https://repo.parabolagnulinux.org/other/$_pkgname/$_pkgname-$pkgver.tar.gz) mkmd5sums=('5707b7e877b853e258cd738938833006') md5sums=('2f5328b875b34b48f27b5ec4c26b35a6') |