[arch-commits] Commit in blender/repos (8 files)
Sven-Hendrik Haase
svenstaro at archlinux.org
Tue Feb 16 20:10:59 UTC 2016
Date: Tuesday, February 16, 2016 @ 21:10:59
Author: svenstaro
Revision: 161883
archrelease: copy trunk to community-staging-i686, community-staging-x86_64
Added:
blender/repos/community-staging-i686/
blender/repos/community-staging-i686/PKGBUILD
(from rev 161882, blender/trunk/PKGBUILD)
blender/repos/community-staging-i686/blender.install
(from rev 161882, blender/trunk/blender.install)
blender/repos/community-staging-i686/ffmpeg-3.0.patch
(from rev 161882, blender/trunk/ffmpeg-3.0.patch)
blender/repos/community-staging-x86_64/
blender/repos/community-staging-x86_64/PKGBUILD
(from rev 161882, blender/trunk/PKGBUILD)
blender/repos/community-staging-x86_64/blender.install
(from rev 161882, blender/trunk/blender.install)
blender/repos/community-staging-x86_64/ffmpeg-3.0.patch
(from rev 161882, blender/trunk/ffmpeg-3.0.patch)
-------------------------------------------+
community-staging-i686/PKGBUILD | 105 ++++++++++++++++++++++++++++
community-staging-i686/blender.install | 13 +++
community-staging-i686/ffmpeg-3.0.patch | 56 ++++++++++++++
community-staging-x86_64/PKGBUILD | 105 ++++++++++++++++++++++++++++
community-staging-x86_64/blender.install | 13 +++
community-staging-x86_64/ffmpeg-3.0.patch | 56 ++++++++++++++
6 files changed, 348 insertions(+)
Copied: blender/repos/community-staging-i686/PKGBUILD (from rev 161882, blender/trunk/PKGBUILD)
===================================================================
--- community-staging-i686/PKGBUILD (rev 0)
+++ community-staging-i686/PKGBUILD 2016-02-16 20:10:59 UTC (rev 161883)
@@ -0,0 +1,105 @@
+# $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.
+
+_gittag=v2.76b
+#_gitcommit=4f8e05
+
+pkgname=blender
+pkgver=2.76.b
+#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
+pkgrel=4
+epoch=17
+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' 'python-requests'
+ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg'
+ 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
+ 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
+ 'jemalloc' 'libspnav' 'ptex' 'opensubdiv')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm35')
+[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
+optdepends=('cuda: cycles renderer cuda support')
+options=(!strip)
+install=blender.install
+source=("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"
+ "ffmpeg-3.0.patch")
+if [[ -n $_gittag ]]; then
+ source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
+else
+ source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}")
+fi
+md5sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '0ebec522bf78bc3b2b3ebd939bafc779'
+ 'SKIP')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ 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
+
+ # ffmpeg-3.0 fixes
+ git cherry-pick -n 0b03785eb5d46dfc053d7f8ef4924219fe7759c5
+ git cherry-pick -n b82538d3b77e4b9fe3791059fef2e604d56f747f
+ patch -Np1 < ${srcdir}/ffmpeg-3.0.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir build && cd build
+
+ [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
+
+ cmake -C../build_files/cmake/config/blender_full.cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_INSTALL_PORTABLE=OFF \
+ -DWITH_PYTHON_INSTALL=OFF \
+ -DOPENIMAGEIO_ROOT_DIR=/usr \
+ -DWITH_LLVM=ON \
+ -DWITH_SYSTEM_OPENJPEG=ON \
+ -DWITH_GL_PROFILE_CORE=OFF \
+ -DWITH_GL_PROFILE_ES20=OFF \
+ -DLLVM_VERSION=3.5 \
+ -DLLVM_STATIC=ON \
+ -DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
+ -DWITH_CYCLES_OSL=ON \
+ -DWITH_CYCLES_PTEX=ON \
+ -DWITH_OPENSUBDIV=ON \
+ -DPYTHON_VERSION=3.5 \
+ -DPYTHON_LIBPATH=/usr/lib \
+ -DPYTHON_LIBRARY=python3.5m \
+ -DPYTHON_INCLUDE_DIRS=/usr/include/python3.5m
+ make -j4 # -j5 needs 48 GB of RAM while -j9 needs 64 GB
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/build"
+
+ make DESTDIR="${pkgdir}" install
+ python -m compileall "${pkgdir}/usr/share/blender"
+ python -O -m compileall "${pkgdir}/usr/share/blender"
+}
Copied: blender/repos/community-staging-i686/blender.install (from rev 161882, blender/trunk/blender.install)
===================================================================
--- community-staging-i686/blender.install (rev 0)
+++ community-staging-i686/blender.install 2016-02-16 20:10:59 UTC (rev 161883)
@@ -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
+}
Copied: blender/repos/community-staging-i686/ffmpeg-3.0.patch (from rev 161882, blender/trunk/ffmpeg-3.0.patch)
===================================================================
--- community-staging-i686/ffmpeg-3.0.patch (rev 0)
+++ community-staging-i686/ffmpeg-3.0.patch 2016-02-16 20:10:59 UTC (rev 161883)
@@ -0,0 +1,56 @@
+diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
+index b591032..78115b3 100644
+--- a/intern/ffmpeg/ffmpeg_compat.h
++++ b/intern/ffmpeg/ffmpeg_compat.h
+@@ -468,7 +468,32 @@ AVRational av_get_r_frame_rate_compat(const AVStream *stream)
+
+ #define MAX_NEG_CROP 1024
+
+-extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
++#define times4(x) x, x, x, x
++#define times256(x) times4(times4(times4(times4(times4(x)))))
++
++static const uint8_t ff_compat_crop_tab[256 + 2 * MAX_NEG_CROP] = {
++times256(0x00),
++0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
++0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
++0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
++0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
++0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
++0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
++0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
++0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
++0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
++0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
++0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
++0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
++0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
++0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
++0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
++0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
++times256(0xFF)
++};
++
++#undef times4
++#undef times256
+
+ /* filter parameters: [-1 4 2 4 -1] // 8 */
+ FFMPEG_INLINE
+@@ -478,7 +503,7 @@ void deinterlace_line(uint8_t *dst,
+ const uint8_t *lum,
+ int size)
+ {
+- const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
++ const uint8_t *cm = ff_compat_crop_tab + MAX_NEG_CROP;
+ int sum;
+
+ for(;size > 0;size--) {
+@@ -502,7 +527,7 @@ void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3,
+ uint8_t *lum_m2, uint8_t *lum_m1,
+ uint8_t *lum, int size)
+ {
+- const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
++ const uint8_t *cm = ff_compat_crop_tab + MAX_NEG_CROP;
+ int sum;
+
+ for(;size > 0;size--) {
\ No newline at end of file
Copied: blender/repos/community-staging-x86_64/PKGBUILD (from rev 161882, blender/trunk/PKGBUILD)
===================================================================
--- community-staging-x86_64/PKGBUILD (rev 0)
+++ community-staging-x86_64/PKGBUILD 2016-02-16 20:10:59 UTC (rev 161883)
@@ -0,0 +1,105 @@
+# $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.
+
+_gittag=v2.76b
+#_gitcommit=4f8e05
+
+pkgname=blender
+pkgver=2.76.b
+#[[ -n $_gitcommit ]] && pkgver=${pkgver}.git1.${_gitcommit}
+pkgrel=4
+epoch=17
+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' 'python-requests'
+ 'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew' 'openjpeg'
+ 'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
+ 'openimageio' 'libsndfile' 'jack' 'opencolorio' 'openshadinglanguage'
+ 'jemalloc' 'libspnav' 'ptex' 'opensubdiv')
+makedepends=('cmake' 'boost' 'mesa' 'git' 'llvm35')
+[[ $CARCH == x86_64 ]] && makedepends+=('cuda')
+optdepends=('cuda: cycles renderer cuda support')
+options=(!strip)
+install=blender.install
+source=("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"
+ "ffmpeg-3.0.patch")
+if [[ -n $_gittag ]]; then
+ source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#tag=${_gittag}")
+else
+ source+=("${pkgname}-${pkgver}::git://git.blender.org/blender.git#commit=${_gitcommit}")
+fi
+md5sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ '0ebec522bf78bc3b2b3ebd939bafc779'
+ 'SKIP')
+
+prepare() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ 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
+
+ # ffmpeg-3.0 fixes
+ git cherry-pick -n 0b03785eb5d46dfc053d7f8ef4924219fe7759c5
+ git cherry-pick -n b82538d3b77e4b9fe3791059fef2e604d56f747f
+ patch -Np1 < ${srcdir}/ffmpeg-3.0.patch
+}
+
+build() {
+ cd "$srcdir/$pkgname-$pkgver"
+
+ mkdir build && cd build
+
+ [[ $CARCH == i686 ]] && BUILDCUDA="OFF" || BUILDCUDA="ON"
+
+ cmake -C../build_files/cmake/config/blender_full.cmake .. \
+ -DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=Release \
+ -DWITH_INSTALL_PORTABLE=OFF \
+ -DWITH_PYTHON_INSTALL=OFF \
+ -DOPENIMAGEIO_ROOT_DIR=/usr \
+ -DWITH_LLVM=ON \
+ -DWITH_SYSTEM_OPENJPEG=ON \
+ -DWITH_GL_PROFILE_CORE=OFF \
+ -DWITH_GL_PROFILE_ES20=OFF \
+ -DLLVM_VERSION=3.5 \
+ -DLLVM_STATIC=ON \
+ -DWITH_CYCLES_CUDA_BINARIES=$BUILDCUDA \
+ -DWITH_CYCLES_OSL=ON \
+ -DWITH_CYCLES_PTEX=ON \
+ -DWITH_OPENSUBDIV=ON \
+ -DPYTHON_VERSION=3.5 \
+ -DPYTHON_LIBPATH=/usr/lib \
+ -DPYTHON_LIBRARY=python3.5m \
+ -DPYTHON_INCLUDE_DIRS=/usr/include/python3.5m
+ make -j4 # -j5 needs 48 GB of RAM while -j9 needs 64 GB
+}
+
+package() {
+ cd "$srcdir/$pkgname-$pkgver/build"
+
+ make DESTDIR="${pkgdir}" install
+ python -m compileall "${pkgdir}/usr/share/blender"
+ python -O -m compileall "${pkgdir}/usr/share/blender"
+}
Copied: blender/repos/community-staging-x86_64/blender.install (from rev 161882, blender/trunk/blender.install)
===================================================================
--- community-staging-x86_64/blender.install (rev 0)
+++ community-staging-x86_64/blender.install 2016-02-16 20:10:59 UTC (rev 161883)
@@ -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
+}
Copied: blender/repos/community-staging-x86_64/ffmpeg-3.0.patch (from rev 161882, blender/trunk/ffmpeg-3.0.patch)
===================================================================
--- community-staging-x86_64/ffmpeg-3.0.patch (rev 0)
+++ community-staging-x86_64/ffmpeg-3.0.patch 2016-02-16 20:10:59 UTC (rev 161883)
@@ -0,0 +1,56 @@
+diff --git a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h
+index b591032..78115b3 100644
+--- a/intern/ffmpeg/ffmpeg_compat.h
++++ b/intern/ffmpeg/ffmpeg_compat.h
+@@ -468,7 +468,32 @@ AVRational av_get_r_frame_rate_compat(const AVStream *stream)
+
+ #define MAX_NEG_CROP 1024
+
+-extern const uint8_t ff_crop_tab[256 + 2 * MAX_NEG_CROP];
++#define times4(x) x, x, x, x
++#define times256(x) times4(times4(times4(times4(times4(x)))))
++
++static const uint8_t ff_compat_crop_tab[256 + 2 * MAX_NEG_CROP] = {
++times256(0x00),
++0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0A,0x0B,0x0C,0x0D,0x0E,0x0F,
++0x10,0x11,0x12,0x13,0x14,0x15,0x16,0x17,0x18,0x19,0x1A,0x1B,0x1C,0x1D,0x1E,0x1F,
++0x20,0x21,0x22,0x23,0x24,0x25,0x26,0x27,0x28,0x29,0x2A,0x2B,0x2C,0x2D,0x2E,0x2F,
++0x30,0x31,0x32,0x33,0x34,0x35,0x36,0x37,0x38,0x39,0x3A,0x3B,0x3C,0x3D,0x3E,0x3F,
++0x40,0x41,0x42,0x43,0x44,0x45,0x46,0x47,0x48,0x49,0x4A,0x4B,0x4C,0x4D,0x4E,0x4F,
++0x50,0x51,0x52,0x53,0x54,0x55,0x56,0x57,0x58,0x59,0x5A,0x5B,0x5C,0x5D,0x5E,0x5F,
++0x60,0x61,0x62,0x63,0x64,0x65,0x66,0x67,0x68,0x69,0x6A,0x6B,0x6C,0x6D,0x6E,0x6F,
++0x70,0x71,0x72,0x73,0x74,0x75,0x76,0x77,0x78,0x79,0x7A,0x7B,0x7C,0x7D,0x7E,0x7F,
++0x80,0x81,0x82,0x83,0x84,0x85,0x86,0x87,0x88,0x89,0x8A,0x8B,0x8C,0x8D,0x8E,0x8F,
++0x90,0x91,0x92,0x93,0x94,0x95,0x96,0x97,0x98,0x99,0x9A,0x9B,0x9C,0x9D,0x9E,0x9F,
++0xA0,0xA1,0xA2,0xA3,0xA4,0xA5,0xA6,0xA7,0xA8,0xA9,0xAA,0xAB,0xAC,0xAD,0xAE,0xAF,
++0xB0,0xB1,0xB2,0xB3,0xB4,0xB5,0xB6,0xB7,0xB8,0xB9,0xBA,0xBB,0xBC,0xBD,0xBE,0xBF,
++0xC0,0xC1,0xC2,0xC3,0xC4,0xC5,0xC6,0xC7,0xC8,0xC9,0xCA,0xCB,0xCC,0xCD,0xCE,0xCF,
++0xD0,0xD1,0xD2,0xD3,0xD4,0xD5,0xD6,0xD7,0xD8,0xD9,0xDA,0xDB,0xDC,0xDD,0xDE,0xDF,
++0xE0,0xE1,0xE2,0xE3,0xE4,0xE5,0xE6,0xE7,0xE8,0xE9,0xEA,0xEB,0xEC,0xED,0xEE,0xEF,
++0xF0,0xF1,0xF2,0xF3,0xF4,0xF5,0xF6,0xF7,0xF8,0xF9,0xFA,0xFB,0xFC,0xFD,0xFE,0xFF,
++times256(0xFF)
++};
++
++#undef times4
++#undef times256
+
+ /* filter parameters: [-1 4 2 4 -1] // 8 */
+ FFMPEG_INLINE
+@@ -478,7 +503,7 @@ void deinterlace_line(uint8_t *dst,
+ const uint8_t *lum,
+ int size)
+ {
+- const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
++ const uint8_t *cm = ff_compat_crop_tab + MAX_NEG_CROP;
+ int sum;
+
+ for(;size > 0;size--) {
+@@ -502,7 +527,7 @@ void deinterlace_line_inplace(uint8_t *lum_m4, uint8_t *lum_m3,
+ uint8_t *lum_m2, uint8_t *lum_m1,
+ uint8_t *lum, int size)
+ {
+- const uint8_t *cm = ff_crop_tab + MAX_NEG_CROP;
++ const uint8_t *cm = ff_compat_crop_tab + MAX_NEG_CROP;
+ int sum;
+
+ for(;size > 0;size--) {
\ No newline at end of file
More information about the arch-commits
mailing list