[arch-commits] Commit in blender/repos (8 files)
Sven-Hendrik Haase
svenstaro at nymeria.archlinux.org
Tue Mar 4 04:28:28 UTC 2014
Date: Tuesday, March 4, 2014 @ 05:28:28
Author: svenstaro
Revision: 106473
archrelease: copy trunk to community-i686, community-x86_64
Added:
blender/repos/community-i686/PKGBUILD
(from rev 106472, blender/trunk/PKGBUILD)
blender/repos/community-i686/blender.install
(from rev 106472, blender/trunk/blender.install)
blender/repos/community-x86_64/PKGBUILD
(from rev 106472, blender/trunk/PKGBUILD)
blender/repos/community-x86_64/blender.install
(from rev 106472, blender/trunk/blender.install)
Deleted:
blender/repos/community-i686/PKGBUILD
blender/repos/community-i686/blender.install
blender/repos/community-x86_64/PKGBUILD
blender/repos/community-x86_64/blender.install
----------------------------------+
/PKGBUILD | 196 +++++++++++++++++++++++++++++++++++++
/blender.install | 26 ++++
community-i686/PKGBUILD | 90 ----------------
community-i686/blender.install | 13 --
community-x86_64/PKGBUILD | 90 ----------------
community-x86_64/blender.install | 13 --
6 files changed, 222 insertions(+), 206 deletions(-)
Deleted: community-i686/PKGBUILD
===================================================================
--- community-i686/PKGBUILD 2014-03-04 04:01:25 UTC (rev 106472)
+++ community-i686/PKGBUILD 2014-03-04 04:28:28 UTC (rev 106473)
@@ -1,90 +0,0 @@
-# $Id$
-# Contributor: John Sowiak <john at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-# Sometimes blender.org takes some time to release patch releases and because Arch users
-# are impatient, we sometimes need to build from git directly.
-
-_gitcommit=c7ac0e
-
-pkgname=blender
-pkgver=2.69
-[[ -n $_gitcommit ]] && pkgver=2.69.$_gitcommit
-pkgrel=1
-epoch=12
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-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' 'llvm'
- 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage')
-makedepends=('cmake' 'boost' 'subversion' 'mesa' 'git')
-[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
-optdepends=('cuda: cycles renderer cuda support')
-options=(!strip)
-install=blender.install
-if [[ -z $_gitcommit ]]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-md5sums=('e77f53951fdaea69631cdd8c0f42cbcb')
-else
- source=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}"
- "git://git.blender.org/blender-addons.git"
- "git://git.blender.org/blender-addons-contrib.git"
- "git://git.blender.org/blender-translations.git"
- "git://git.blender.org/scons.git")
- true && md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
-fi
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- if [[ -n $_gitcommit ]]; then
- git submodule update --init --recursive
- git submodule foreach git checkout master
- git submodule foreach git pull --rebase origin master
- fi
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- mkdir build && cd build
-
- [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
-
- 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_CODEC_FFMPEG=ON \
- -DWITH_CODEC_SNDFILE=ON \
- -DWITH_CYCLES=ON \
- -DWITH_LLVM=ON \
- -DLLVM_VERSION=3.4 \
- -DLLVM_STATIC=OFF \
- -DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
- -DWITH_CYCLES_OSL=ON \
- -DWITH_FFTW3=ON \
- -DWITH_MOD_OCEANSIM=ON \
- -DPYTHON_VERSION=3.3 \
- -DPYTHON_LIBPATH=/usr/lib \
- -DPYTHON_LIBRARY=python3.3m \
- -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver/build"
-
- make DESTDIR="${pkgdir}" install
- python -m compileall "${pkgdir}/usr/share/blender"
-}
Copied: blender/repos/community-i686/PKGBUILD (from rev 106472, blender/trunk/PKGBUILD)
===================================================================
--- community-i686/PKGBUILD (rev 0)
+++ community-i686/PKGBUILD 2014-03-04 04:28:28 UTC (rev 106473)
@@ -0,0 +1,98 @@
+# $Id$
+# Contributor: John Sowiak <john at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+# Sometimes blender.org takes some time to release patch releases and because Arch users
+# are impatient, we sometimes need to build from git directly.
+# Update because I get so many queries on this:
+# Due to our other rolling deps, it's sometimes not possible to build Blender stable releases.
+# More often than not, a new openshadinglanguage breaks it and I could either backport fixes
+# or simply roll with a new version. I usually choose the latter when the former seems
+# unreasonable.
+
+_gitcommit=13290d
+
+pkgname=blender
+pkgver=2.69
+[[ -n $_gitcommit ]] && pkgver=2.69.$_gitcommit
+pkgrel=1
+epoch=13
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+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' 'llvm'
+ 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage')
+makedepends=('cmake' 'boost' 'subversion' 'mesa' 'git')
+[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
+optdepends=('cuda: cycles renderer cuda support')
+options=(!strip)
+install=blender.install
+if [[ -z $_gitcommit ]]; then
+ source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+md5sums=('e77f53951fdaea69631cdd8c0f42cbcb')
+else
+ source=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}"
+ "git://git.blender.org/blender-addons.git"
+ "git://git.blender.org/blender-addons-contrib.git"
+ "git://git.blender.org/blender-translations.git"
+ "git://git.blender.org/scons.git")
+ true && md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+fi
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ if [[ -n $_gitcommit ]]; then
+ git submodule init
+ git config submodule."release/scripts/addons".url ${srcdir}/blender-addons
+ git config submodule."release/scripts/addons_contrib".url ${srcdir}/blender-addons-contrib
+ git config submodule."release/datafiles/locale".url ${srcdir}/blender-translations
+ git config submodule."scons".url ${srcdir}/scons
+ git submodule update
+ fi
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir build && cd build
+
+ [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
+
+ 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_CODEC_FFMPEG=ON \
+ -DWITH_CODEC_SNDFILE=ON \
+ -DWITH_CYCLES=ON \
+ -DWITH_LLVM=ON \
+ -DLLVM_VERSION=3.4 \
+ -DLLVM_STATIC=OFF \
+ -DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
+ -DWITH_CYCLES_OSL=ON \
+ -DWITH_FFTW3=ON \
+ -DWITH_MOD_OCEANSIM=ON \
+ -DPYTHON_VERSION=3.3 \
+ -DPYTHON_LIBPATH=/usr/lib \
+ -DPYTHON_LIBRARY=python3.3m \
+ -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/build"
+
+ make DESTDIR="${pkgdir}" install
+ python -m compileall "${pkgdir}/usr/share/blender"
+}
Deleted: community-i686/blender.install
===================================================================
--- community-i686/blender.install 2014-03-04 04:01:25 UTC (rev 106472)
+++ community-i686/blender.install 2014-03-04 04:28:28 UTC (rev 106473)
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: blender/repos/community-i686/blender.install (from rev 106472, blender/trunk/blender.install)
===================================================================
--- community-i686/blender.install (rev 0)
+++ community-i686/blender.install 2014-03-04 04:28:28 UTC (rev 106473)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
Deleted: community-x86_64/PKGBUILD
===================================================================
--- community-x86_64/PKGBUILD 2014-03-04 04:01:25 UTC (rev 106472)
+++ community-x86_64/PKGBUILD 2014-03-04 04:28:28 UTC (rev 106473)
@@ -1,90 +0,0 @@
-# $Id$
-# Contributor: John Sowiak <john at archlinux.org>
-# Contributor: tobias <tobias at archlinux.org>
-# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
-
-# Sometimes blender.org takes some time to release patch releases and because Arch users
-# are impatient, we sometimes need to build from git directly.
-
-_gitcommit=c7ac0e
-
-pkgname=blender
-pkgver=2.69
-[[ -n $_gitcommit ]] && pkgver=2.69.$_gitcommit
-pkgrel=1
-epoch=12
-pkgdesc="A fully integrated 3D graphics creation suite"
-arch=('i686' 'x86_64')
-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' 'llvm'
- 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage')
-makedepends=('cmake' 'boost' 'subversion' 'mesa' 'git')
-[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
-optdepends=('cuda: cycles renderer cuda support')
-options=(!strip)
-install=blender.install
-if [[ -z $_gitcommit ]]; then
- source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
-md5sums=('e77f53951fdaea69631cdd8c0f42cbcb')
-else
- source=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}"
- "git://git.blender.org/blender-addons.git"
- "git://git.blender.org/blender-addons-contrib.git"
- "git://git.blender.org/blender-translations.git"
- "git://git.blender.org/scons.git")
- true && md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
-fi
-
-prepare() {
- cd "$srcdir/$pkgname-$pkgver"
-
- if [[ -n $_gitcommit ]]; then
- git submodule update --init --recursive
- git submodule foreach git checkout master
- git submodule foreach git pull --rebase origin master
- fi
-}
-
-build() {
- cd "$srcdir/$pkgname-$pkgver"
-
- mkdir build && cd build
-
- [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
-
- 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_CODEC_FFMPEG=ON \
- -DWITH_CODEC_SNDFILE=ON \
- -DWITH_CYCLES=ON \
- -DWITH_LLVM=ON \
- -DLLVM_VERSION=3.4 \
- -DLLVM_STATIC=OFF \
- -DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
- -DWITH_CYCLES_OSL=ON \
- -DWITH_FFTW3=ON \
- -DWITH_MOD_OCEANSIM=ON \
- -DPYTHON_VERSION=3.3 \
- -DPYTHON_LIBPATH=/usr/lib \
- -DPYTHON_LIBRARY=python3.3m \
- -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m
- make
-}
-
-package() {
- cd "$srcdir/$pkgname-$pkgver/build"
-
- make DESTDIR="${pkgdir}" install
- python -m compileall "${pkgdir}/usr/share/blender"
-}
Copied: blender/repos/community-x86_64/PKGBUILD (from rev 106472, blender/trunk/PKGBUILD)
===================================================================
--- community-x86_64/PKGBUILD (rev 0)
+++ community-x86_64/PKGBUILD 2014-03-04 04:28:28 UTC (rev 106473)
@@ -0,0 +1,98 @@
+# $Id$
+# Contributor: John Sowiak <john at archlinux.org>
+# Contributor: tobias <tobias at archlinux.org>
+# Maintainer: Sven-Hendrik Haase <sh at lutzhaase.com>
+
+# Sometimes blender.org takes some time to release patch releases and because Arch users
+# are impatient, we sometimes need to build from git directly.
+# Update because I get so many queries on this:
+# Due to our other rolling deps, it's sometimes not possible to build Blender stable releases.
+# More often than not, a new openshadinglanguage breaks it and I could either backport fixes
+# or simply roll with a new version. I usually choose the latter when the former seems
+# unreasonable.
+
+_gitcommit=13290d
+
+pkgname=blender
+pkgver=2.69
+[[ -n $_gitcommit ]] && pkgver=2.69.$_gitcommit
+pkgrel=1
+epoch=13
+pkgdesc="A fully integrated 3D graphics creation suite"
+arch=('i686' 'x86_64')
+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' 'llvm'
+ 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage')
+makedepends=('cmake' 'boost' 'subversion' 'mesa' 'git')
+[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
+optdepends=('cuda: cycles renderer cuda support')
+options=(!strip)
+install=blender.install
+if [[ -z $_gitcommit ]]; then
+ source=(http://download.blender.org/source/$pkgname-$pkgver.tar.gz)
+md5sums=('e77f53951fdaea69631cdd8c0f42cbcb')
+else
+ source=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}"
+ "git://git.blender.org/blender-addons.git"
+ "git://git.blender.org/blender-addons-contrib.git"
+ "git://git.blender.org/blender-translations.git"
+ "git://git.blender.org/scons.git")
+ true && md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'SKIP')
+fi
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ if [[ -n $_gitcommit ]]; then
+ git submodule init
+ git config submodule."release/scripts/addons".url ${srcdir}/blender-addons
+ git config submodule."release/scripts/addons_contrib".url ${srcdir}/blender-addons-contrib
+ git config submodule."release/datafiles/locale".url ${srcdir}/blender-translations
+ git config submodule."scons".url ${srcdir}/scons
+ git submodule update
+ fi
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir build && cd build
+
+ [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
+
+ 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_CODEC_FFMPEG=ON \
+ -DWITH_CODEC_SNDFILE=ON \
+ -DWITH_CYCLES=ON \
+ -DWITH_LLVM=ON \
+ -DLLVM_VERSION=3.4 \
+ -DLLVM_STATIC=OFF \
+ -DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
+ -DWITH_CYCLES_OSL=ON \
+ -DWITH_FFTW3=ON \
+ -DWITH_MOD_OCEANSIM=ON \
+ -DPYTHON_VERSION=3.3 \
+ -DPYTHON_LIBPATH=/usr/lib \
+ -DPYTHON_LIBRARY=python3.3m \
+ -DPYTHON_INCLUDE_DIRS=/usr/include/python3.3m
+ make
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/build"
+
+ make DESTDIR="${pkgdir}" install
+ python -m compileall "${pkgdir}/usr/share/blender"
+}
Deleted: community-x86_64/blender.install
===================================================================
--- community-x86_64/blender.install 2014-03-04 04:01:25 UTC (rev 106472)
+++ community-x86_64/blender.install 2014-03-04 04:28:28 UTC (rev 106473)
@@ -1,13 +0,0 @@
-post_install() {
- update-desktop-database -q
- update-mime-database usr/share/mime &> /dev/null
- xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
- post_install
-}
-
-post_remove() {
- post_install
-}
Copied: blender/repos/community-x86_64/blender.install (from rev 106472, blender/trunk/blender.install)
===================================================================
--- community-x86_64/blender.install (rev 0)
+++ community-x86_64/blender.install 2014-03-04 04:28:28 UTC (rev 106473)
@@ -0,0 +1,13 @@
+post_install() {
+ update-desktop-database -q
+ update-mime-database usr/share/mime &> /dev/null
+ xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+ post_install
+}
+
+post_remove() {
+ post_install
+}
More information about the arch-commits
mailing list