From d5658cc688c95828beea3f847e7f893fc8b1b80d Mon Sep 17 00:00:00 2001 From: Alexpux Date: Sun, 1 Jun 2014 23:41:38 +0400 Subject: [PATCH] blender, blender-git: Rebuild against new libraries. --- mingw-w64-blender-git/PKGBUILD | 11 ++++--- mingw-w64-blender-git/fix-osl.patch | 28 +++++++++++++++++ mingw-w64-blender/PKGBUILD | 48 +++++++++++++++-------------- mingw-w64-blender/fix-osl.patch | 28 +++++++++++++++++ 4 files changed, 88 insertions(+), 27 deletions(-) create mode 100644 mingw-w64-blender-git/fix-osl.patch create mode 100644 mingw-w64-blender/fix-osl.patch diff --git a/mingw-w64-blender-git/PKGBUILD b/mingw-w64-blender-git/PKGBUILD index 9ba7579213..b796aad163 100644 --- a/mingw-w64-blender-git/PKGBUILD +++ b/mingw-w64-blender-git/PKGBUILD @@ -6,7 +6,7 @@ pkgname="${_mingw_suff}-${_realname}-git" provides=("${_mingw_suff}-${_realname}") conflicts=("${_mingw_suff}-${_realname}") blender_version=2.71 -pkgver=r54288.b3f9117 +pkgver=r54383.27630f4 pkgrel=1 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)" arch=('any') @@ -40,14 +40,16 @@ source=("${_realname}"::"git://git.blender.org/blender.git" "addons-contrib"::"git://git.blender.org/blender-addons-contrib.git" "mingw-w64-cmake.patch" "fix-mingw-w64-definitions.patch" - "mingw-dont-install-3rdparty.patch") + "mingw-dont-install-3rdparty.patch" + "fix-osl.patch") md5sums=('SKIP' 'SKIP' 'SKIP' 'SKIP' 'f3bca1b341a6af6b1a78e1407bbb29f8' - '2c4725eacaf998be6dc89cb38296ffe0' - '1969914e11d0a4f74dbfeddad742c9da') + '696a364118b5b9adbde81f2d871febfa' + '1969914e11d0a4f74dbfeddad742c9da' + 'cd59e2ed1d0d4318e6c200436b3277e5') pkgver() { cd "$srcdir/$_realname" @@ -59,6 +61,7 @@ prepare() { patch -p1 -i ${srcdir}/mingw-w64-cmake.patch patch -p1 -i ${srcdir}/fix-mingw-w64-definitions.patch patch -p1 -i ${srcdir}/mingw-dont-install-3rdparty.patch + patch -p1 -i ${srcdir}/fix-osl.patch cp -rf $srcdir/translations/* $srcdir/$_realname/release/datafiles/locale/ cp -rf $srcdir/addons/* $srcdir/$_realname/release/scripts/addons/ diff --git a/mingw-w64-blender-git/fix-osl.patch b/mingw-w64-blender-git/fix-osl.patch new file mode 100644 index 0000000000..b7a3773882 --- /dev/null +++ b/mingw-w64-blender-git/fix-osl.patch @@ -0,0 +1,28 @@ +--- blender/intern/cycles/render/osl.cpp.orig 2014-06-01 19:42:48.435400000 +0400 ++++ blender/intern/cycles/render/osl.cpp 2014-06-01 19:46:55.180600000 +0400 +@@ -248,20 +248,20 @@ + + bool OSLShaderManager::osl_compile(const string& inputfile, const string& outputfile) + { +- vector options; ++ vector options; + string stdosl_path; + + /* specify output file name */ +- options.push_back("-o"); +- options.push_back(outputfile); ++ options.push_back(OIIO::string_view("-o")); ++ options.push_back(OIIO::string_view(outputfile)); + + /* specify standard include path */ +- options.push_back("-I" + path_get("shader")); ++ options.push_back(OIIO::string_view("-I" + path_get("shader"))); + stdosl_path = path_get("shader/stdosl.h"); + + /* compile */ + OSL::OSLCompiler *compiler = OSL::OSLCompiler::create(); +- bool ok = compiler->compile(inputfile, options, stdosl_path); ++ bool ok = compiler->compile(OIIO::string_view(inputfile), options, stdosl_path); + delete compiler; + + return ok; diff --git a/mingw-w64-blender/PKGBUILD b/mingw-w64-blender/PKGBUILD index f6e45d2169..b5463fafd9 100644 --- a/mingw-w64-blender/PKGBUILD +++ b/mingw-w64-blender/PKGBUILD @@ -4,48 +4,50 @@ _realname=blender _mingw_suff=mingw-w64-${CARCH} pkgname="${_mingw_suff}-${_realname}" pkgver=2.70a -pkgrel=1 +pkgrel=2 pkgdesc="A fully integrated 3D graphics creation suite (mingw-w64)" arch=('any') license=('GPL') url="http://www.blender.org" -depends=( - "${_mingw_suff}-boost" - "${_mingw_suff}-glew" - "${_mingw_suff}-ffmpeg" - "${_mingw_suff}-fftw" - "${_mingw_suff}-freetype" - "${_mingw_suff}-libpng" - "${_mingw_suff}-libsndfile" - "${_mingw_suff}-libtiff" - "${_mingw_suff}-openexr" - "${_mingw_suff}-openal" - "${_mingw_suff}-opencollada" - "${_mingw_suff}-opencolorio" - "${_mingw_suff}-openimageio" - "${_mingw_suff}-openshadinglanguage" - "${_mingw_suff}-python3" - "${_mingw_suff}-python3-numpy" - "${_mingw_suff}-wintab-sdk") +depends=("${_mingw_suff}-boost" + "${_mingw_suff}-glew" + "${_mingw_suff}-ffmpeg" + "${_mingw_suff}-fftw" + "${_mingw_suff}-freetype" + "${_mingw_suff}-libpng" + "${_mingw_suff}-libsndfile" + "${_mingw_suff}-libtiff" + "${_mingw_suff}-openexr" + "${_mingw_suff}-openal" + "${_mingw_suff}-opencollada" + "${_mingw_suff}-opencolorio" + "${_mingw_suff}-openimageio" + "${_mingw_suff}-openshadinglanguage" + "${_mingw_suff}-python3" + "${_mingw_suff}-python3-numpy" + "${_mingw_suff}-wintab-sdk") makedepends=("${_mingw_suff}-cmake" "${_mingw_suff}-boost" "${_mingw_suff}-llvm") #[[ $CARCH == x86_64 ]] && makedepends+=('cuda') #optdepends=('cuda: cycles renderer cuda support') options=(!strip staticlibs) #install=blender.install source=(http://download.blender.org/source/$_realname-$pkgver.tar.gz - "mingw-w64-cmake.patch" - "fix-mingw-w64-definitions.patch" - "mingw-dont-install-3rdparty.patch") + "mingw-w64-cmake.patch" + "fix-mingw-w64-definitions.patch" + "mingw-dont-install-3rdparty.patch" + "fix-osl.patch") md5sums=('12858464ee9347d9883982973b1689d9' 'd89ba38e140bddb546c9975c4c76dd8e' '57bce4d96f2724d44d5bbeedaa36d392' - '1969914e11d0a4f74dbfeddad742c9da') + '1969914e11d0a4f74dbfeddad742c9da' + 'cd59e2ed1d0d4318e6c200436b3277e5') prepare() { cd "$srcdir/$_realname-v$pkgver" patch -p1 -i ${srcdir}/mingw-w64-cmake.patch patch -p1 -i ${srcdir}/fix-mingw-w64-definitions.patch patch -p1 -i ${srcdir}/mingw-dont-install-3rdparty.patch + patch -p1 -i ${srcdir}/fix-osl.patch } build() { diff --git a/mingw-w64-blender/fix-osl.patch b/mingw-w64-blender/fix-osl.patch new file mode 100644 index 0000000000..b7a3773882 --- /dev/null +++ b/mingw-w64-blender/fix-osl.patch @@ -0,0 +1,28 @@ +--- blender/intern/cycles/render/osl.cpp.orig 2014-06-01 19:42:48.435400000 +0400 ++++ blender/intern/cycles/render/osl.cpp 2014-06-01 19:46:55.180600000 +0400 +@@ -248,20 +248,20 @@ + + bool OSLShaderManager::osl_compile(const string& inputfile, const string& outputfile) + { +- vector options; ++ vector options; + string stdosl_path; + + /* specify output file name */ +- options.push_back("-o"); +- options.push_back(outputfile); ++ options.push_back(OIIO::string_view("-o")); ++ options.push_back(OIIO::string_view(outputfile)); + + /* specify standard include path */ +- options.push_back("-I" + path_get("shader")); ++ options.push_back(OIIO::string_view("-I" + path_get("shader"))); + stdosl_path = path_get("shader/stdosl.h"); + + /* compile */ + OSL::OSLCompiler *compiler = OSL::OSLCompiler::create(); +- bool ok = compiler->compile(inputfile, options, stdosl_path); ++ bool ok = compiler->compile(OIIO::string_view(inputfile), options, stdosl_path); + delete compiler; + + return ok;