| 1 |
hasufell 14/09/27 14:55:43 |
| 2 |
|
| 3 |
Modified: ChangeLog |
| 4 |
Added: blender-2.71-r2.ebuild |
| 5 |
Log: |
| 6 |
re-add 2.71 with fixed Manifest wrt #523328 and unbundle minilzo wrt #515266 |
| 7 |
|
| 8 |
(Portage version: 2.2.14_rc1/cvs/Linux x86_64, signed Manifest commit with key BDEED020) |
| 9 |
|
| 10 |
Revision Changes Path |
| 11 |
1.273 media-gfx/blender/ChangeLog |
| 12 |
|
| 13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.273&view=markup |
| 14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?rev=1.273&content-type=text/plain |
| 15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/ChangeLog?r1=1.272&r2=1.273 |
| 16 |
|
| 17 |
Index: ChangeLog |
| 18 |
=================================================================== |
| 19 |
RCS file: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v |
| 20 |
retrieving revision 1.272 |
| 21 |
retrieving revision 1.273 |
| 22 |
diff -u -r1.272 -r1.273 |
| 23 |
--- ChangeLog 27 Sep 2014 12:45:45 -0000 1.272 |
| 24 |
+++ ChangeLog 27 Sep 2014 14:55:43 -0000 1.273 |
| 25 |
@@ -1,6 +1,13 @@ |
| 26 |
# ChangeLog for media-gfx/blender |
| 27 |
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 |
| 28 |
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.272 2014/09/27 12:45:45 hasufell Exp $ |
| 29 |
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/ChangeLog,v 1.273 2014/09/27 14:55:43 hasufell Exp $ |
| 30 |
+ |
| 31 |
+*blender-2.71-r2 (27 Sep 2014) |
| 32 |
+ |
| 33 |
+ 27 Sep 2014; Julian Ospald <hasufell@g.o> +blender-2.71-r2.ebuild, |
| 34 |
+ +files/04-blender-2.71-r2-unbundle-glog.patch, |
| 35 |
+ +files/09-blender-2.72-unbundle-minilzo.patch: |
| 36 |
+ re-add 2.71 with fixed Manifest wrt #523328 and unbundle minilzo wrt #515266 |
| 37 |
|
| 38 |
27 Sep 2014; Julian Ospald <hasufell@g.o> -blender-2.66-r1.ebuild, |
| 39 |
-blender-2.67b-r1.ebuild, -blender-2.68.ebuild, -blender-2.68a.ebuild, |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.1 media-gfx/blender/blender-2.71-r2.ebuild |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.71-r2.ebuild?rev=1.1&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-gfx/blender/blender-2.71-r2.ebuild?rev=1.1&content-type=text/plain |
| 47 |
|
| 48 |
Index: blender-2.71-r2.ebuild |
| 49 |
=================================================================== |
| 50 |
# Copyright 1999-2014 Gentoo Foundation |
| 51 |
# Distributed under the terms of the GNU General Public License v2 |
| 52 |
# $Header: /var/cvsroot/gentoo-x86/media-gfx/blender/blender-2.71-r2.ebuild,v 1.1 2014/09/27 14:55:43 hasufell Exp $ |
| 53 |
|
| 54 |
# TODO: |
| 55 |
# bundled-deps: bullet is modified |
| 56 |
# multiple python abi? |
| 57 |
|
| 58 |
EAPI=5 |
| 59 |
PYTHON_COMPAT=( python3_4 ) |
| 60 |
#PATCHSET="1" |
| 61 |
|
| 62 |
inherit multilib fdo-mime gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs |
| 63 |
|
| 64 |
DESCRIPTION="3D Creation/Animation/Publishing System" |
| 65 |
HOMEPAGE="http://www.blender.org" |
| 66 |
|
| 67 |
case ${PV} in |
| 68 |
*_p*) |
| 69 |
SRC_URI="http://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; |
| 70 |
*) |
| 71 |
SRC_URI="http://download.blender.org/source/${P}.tar.gz -> ${PF}.tar.gz" ;; |
| 72 |
esac |
| 73 |
|
| 74 |
if [[ -n ${PATCHSET} ]]; then |
| 75 |
SRC_URI+=" http://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" |
| 76 |
fi |
| 77 |
|
| 78 |
SLOT="0" |
| 79 |
LICENSE="|| ( GPL-2 BL )" |
| 80 |
KEYWORDS="~amd64 ~x86" |
| 81 |
IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile sse sse2 tiff" |
| 82 |
REQUIRED_USE="${PYTHON_REQUIRED_USE} |
| 83 |
player? ( game-engine ) |
| 84 |
redcode? ( jpeg2k ffmpeg ) |
| 85 |
cycles? ( boost openexr tiff ) |
| 86 |
nls? ( boost ) |
| 87 |
game-engine? ( boost )" |
| 88 |
|
| 89 |
RDEPEND=" |
| 90 |
${PYTHON_DEPS} |
| 91 |
>=dev-cpp/gflags-2.1.1-r1 |
| 92 |
>=dev-cpp/glog-0.3.3-r1[gflags] |
| 93 |
>=dev-libs/lzo-2.08:2 |
| 94 |
dev-python/numpy[${PYTHON_USEDEP}] |
| 95 |
dev-python/requests[${PYTHON_USEDEP}] |
| 96 |
>=media-libs/freetype-2.0 |
| 97 |
media-libs/glew |
| 98 |
media-libs/libpng:0 |
| 99 |
media-libs/libsamplerate |
| 100 |
sci-libs/colamd |
| 101 |
sci-libs/ldl |
| 102 |
sys-libs/zlib |
| 103 |
virtual/glu |
| 104 |
virtual/jpeg |
| 105 |
virtual/libintl |
| 106 |
virtual/opengl |
| 107 |
x11-libs/libXi |
| 108 |
x11-libs/libX11 |
| 109 |
boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) |
| 110 |
collada? ( media-libs/opencollada ) |
| 111 |
colorio? ( <=media-libs/opencolorio-1.0.9 ) |
| 112 |
cycles? ( |
| 113 |
media-libs/openimageio |
| 114 |
) |
| 115 |
ffmpeg? ( |
| 116 |
|| ( |
| 117 |
>=media-video/ffmpeg-2.1.4:0[x264,mp3,encode,theora,jpeg2k?] |
| 118 |
>=media-video/libav-9[x264,mp3,encode,theora,jpeg2k?] |
| 119 |
) |
| 120 |
) |
| 121 |
fftw? ( sci-libs/fftw:3.0 ) |
| 122 |
jack? ( media-sound/jack-audio-connection-kit ) |
| 123 |
jpeg2k? ( media-libs/openjpeg:0 ) |
| 124 |
ndof? ( |
| 125 |
app-misc/spacenavd |
| 126 |
dev-libs/libspnav |
| 127 |
) |
| 128 |
nls? ( virtual/libiconv ) |
| 129 |
openal? ( >=media-libs/openal-1.6.372 ) |
| 130 |
openimageio? ( media-libs/openimageio ) |
| 131 |
openexr? ( media-libs/openexr ) |
| 132 |
sdl? ( media-libs/libsdl[sound,joystick] ) |
| 133 |
sndfile? ( media-libs/libsndfile ) |
| 134 |
tiff? ( media-libs/tiff:0 )" |
| 135 |
DEPEND="${RDEPEND} |
| 136 |
>=dev-cpp/eigen-3.1.3:3 |
| 137 |
doc? ( |
| 138 |
app-doc/doxygen[-nodot(-),dot(+)] |
| 139 |
dev-python/sphinx |
| 140 |
) |
| 141 |
nls? ( sys-devel/gettext )" |
| 142 |
|
| 143 |
S=${WORKDIR}/${PN}-v${PV} |
| 144 |
|
| 145 |
pkg_pretend() { |
| 146 |
if use openmp && ! tc-has-openmp; then |
| 147 |
eerror "You are using gcc built without 'openmp' USE." |
| 148 |
eerror "Switch CXX to an OpenMP capable compiler." |
| 149 |
die "Need openmp" |
| 150 |
fi |
| 151 |
|
| 152 |
if use doc; then |
| 153 |
CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend |
| 154 |
fi |
| 155 |
} |
| 156 |
|
| 157 |
pkg_setup() { |
| 158 |
python-single-r1_pkg_setup |
| 159 |
} |
| 160 |
|
| 161 |
src_prepare() { |
| 162 |
epatch "${FILESDIR}"/01-${PN}-2.68-doxyfile.patch \ |
| 163 |
"${FILESDIR}"/02-${PN}-2.68-unbundle-colamd.patch \ |
| 164 |
"${FILESDIR}"/04-${PN}-2.71-r2-unbundle-glog.patch \ |
| 165 |
"${FILESDIR}"/05-${PN}-2.68-unbundle-eigen3.patch \ |
| 166 |
"${FILESDIR}"/06-${PN}-2.68-fix-install-rules.patch \ |
| 167 |
"${FILESDIR}"/07-${PN}-2.70-sse2.patch \ |
| 168 |
"${FILESDIR}"/08-${PN}-2.71-gflags.patch \ |
| 169 |
"${FILESDIR}"/09-${PN}-2.72-unbundle-minilzo.patch |
| 170 |
|
| 171 |
epatch_user |
| 172 |
|
| 173 |
# remove some bundled deps |
| 174 |
rm -r \ |
| 175 |
extern/Eigen3 \ |
| 176 |
extern/libopenjpeg \ |
| 177 |
extern/glew \ |
| 178 |
extern/colamd \ |
| 179 |
extern/lzo \ |
| 180 |
extern/libmv/third_party/{glog,gflags} \ |
| 181 |
|| die |
| 182 |
|
| 183 |
# we don't want static glew, but it's scattered across |
| 184 |
# thousand files |
| 185 |
# !!!CHECK THIS SED ON EVERY VERSION BUMP!!! |
| 186 |
sed -i \ |
| 187 |
-e '/-DGLEW_STATIC/d' \ |
| 188 |
$(find . -type f -name "CMakeLists.txt") || die |
| 189 |
|
| 190 |
ewarn "$(echo "Remaining bundled dependencies:"; |
| 191 |
( find extern -mindepth 1 -maxdepth 1 -type d; find extern/libmv/third_party -mindepth 1 -maxdepth 1 -type d; ) | sed 's|^|- |')" |
| 192 |
|
| 193 |
# linguas cleanup |
| 194 |
local i |
| 195 |
if ! use nls; then |
| 196 |
rm -r "${S}"/release/datafiles/locale || die |
| 197 |
else |
| 198 |
if [[ -n "${LINGUAS+x}" ]] ; then |
| 199 |
cd "${S}"/release/datafiles/locale/po |
| 200 |
for i in *.po ; do |
| 201 |
mylang=${i%.po} |
| 202 |
has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } |
| 203 |
done |
| 204 |
fi |
| 205 |
fi |
| 206 |
} |
| 207 |
|
| 208 |
src_configure() { |
| 209 |
# FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu |
| 210 |
# shadows, see bug #276338 for reference |
| 211 |
append-flags -funsigned-char |
| 212 |
append-lfs-flags |
| 213 |
|
| 214 |
# WITH_PYTHON_SECURITY |
| 215 |
# WITH_PYTHON_SAFETY |
| 216 |
local mycmakeargs=( |
| 217 |
-DCMAKE_INSTALL_PREFIX=/usr |
| 218 |
-DWITH_INSTALL_PORTABLE=OFF |
| 219 |
$(cmake-utils_use_with boost BOOST) |
| 220 |
$(cmake-utils_use_with cycles CYCLES) |
| 221 |
$(cmake-utils_use_with collada OPENCOLLADA) |
| 222 |
$(cmake-utils_use_with dds IMAGE_DDS) |
| 223 |
$(cmake-utils_use_with elbeem MOD_FLUID) |
| 224 |
$(cmake-utils_use_with ffmpeg CODEC_FFMPEG) |
| 225 |
$(cmake-utils_use_with fftw FFTW3) |
| 226 |
$(cmake-utils_use_with fftw MOD_OCEANSIM) |
| 227 |
$(cmake-utils_use_with game-engine GAMEENGINE) |
| 228 |
$(cmake-utils_use_with nls INTERNATIONAL) |
| 229 |
$(cmake-utils_use_with jack JACK) |
| 230 |
$(cmake-utils_use_with jpeg2k IMAGE_OPENJPEG) |
| 231 |
$(cmake-utils_use_with openimageio OPENIMAGEIO) |
| 232 |
$(cmake-utils_use_with openal OPENAL) |
| 233 |
$(cmake-utils_use_with openexr IMAGE_OPENEXR) |
| 234 |
$(cmake-utils_use_with openmp OPENMP) |
| 235 |
$(cmake-utils_use_with opennl OPENNL) |
| 236 |
$(cmake-utils_use_with player PLAYER) |
| 237 |
$(cmake-utils_use_with redcode IMAGE_REDCODE) |
| 238 |
$(cmake-utils_use_with sdl SDL) |
| 239 |
$(cmake-utils_use_with sndfile CODEC_SNDFILE) |
| 240 |
$(cmake-utils_use_with sse RAYOPTIMIZATION) |
| 241 |
$(cmake-utils_use_with sse2 SSE2) |
| 242 |
$(cmake-utils_use_with bullet BULLET) |
| 243 |
$(cmake-utils_use_with tiff IMAGE_TIFF) |
| 244 |
$(cmake-utils_use_with colorio OPENCOLORIO) |
| 245 |
$(cmake-utils_use_with ndof INPUT_NDOF) |
| 246 |
-DWITH_PYTHON_INSTALL=OFF |
| 247 |
-DWITH_PYTHON_INSTALL_NUMPY=OFF |
| 248 |
-DWITH_STATIC_LIBS=OFF |
| 249 |
-DWITH_SYSTEM_GLEW=ON |
| 250 |
-DWITH_SYSTEM_OPENJPEG=ON |
| 251 |
-DWITH_SYSTEM_BULLET=OFF |
| 252 |
-DPYTHON_VERSION="${EPYTHON/python/}" |
| 253 |
-DPYTHON_LIBRARY="$(python_get_library_path)" |
| 254 |
-DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
| 255 |
) |
| 256 |
cmake-utils_src_configure |
| 257 |
} |
| 258 |
|
| 259 |
src_compile() { |
| 260 |
cmake-utils_src_compile |
| 261 |
|
| 262 |
if use doc; then |
| 263 |
einfo "Generating Blender C/C++ API docs ..." |
| 264 |
cd "${CMAKE_USE_DIR}"/doc/doxygen || die |
| 265 |
doxygen -u Doxyfile |
| 266 |
doxygen || die "doxygen failed to build API docs." |
| 267 |
|
| 268 |
cd "${CMAKE_USE_DIR}" || die |
| 269 |
einfo "Generating (BPY) Blender Python API docs ..." |
| 270 |
"${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "blender failed." |
| 271 |
|
| 272 |
cd "${CMAKE_USE_DIR}"/doc/python_api || die |
| 273 |
sphinx-build sphinx-in BPY_API || die "sphinx failed." |
| 274 |
fi |
| 275 |
} |
| 276 |
|
| 277 |
src_test() { :; } |
| 278 |
|
| 279 |
src_install() { |
| 280 |
local i |
| 281 |
|
| 282 |
# Pax mark blender for hardened support. |
| 283 |
pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender |
| 284 |
|
| 285 |
if use doc; then |
| 286 |
docinto "API/python" |
| 287 |
dohtml -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/* |
| 288 |
|
| 289 |
docinto "API/blender" |
| 290 |
dohtml -r "${CMAKE_USE_DIR}"/doc/doxygen/html/* |
| 291 |
fi |
| 292 |
|
| 293 |
# fucked up cmake will relink binary for no reason |
| 294 |
emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast |
| 295 |
|
| 296 |
# fix doc installdir |
| 297 |
dohtml "${CMAKE_USE_DIR}"/release/text/readme.html |
| 298 |
rm -rf "${ED%/}"/usr/share/doc/blender |
| 299 |
|
| 300 |
python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py |
| 301 |
python_optimize "${ED%/}"/usr/share/blender/${PV}/scripts |
| 302 |
} |
| 303 |
|
| 304 |
pkg_preinst() { |
| 305 |
gnome2_icon_savelist |
| 306 |
} |
| 307 |
|
| 308 |
pkg_postinst() { |
| 309 |
elog |
| 310 |
elog "Blender uses python integration. As such, may have some" |
| 311 |
elog "inherit risks with running unknown python scripting." |
| 312 |
elog |
| 313 |
elog "It is recommended to change your blender temp directory" |
| 314 |
elog "from /tmp to /home/user/tmp or another tmp file under your" |
| 315 |
elog "home directory. This can be done by starting blender, then" |
| 316 |
elog "dragging the main menu down do display all paths." |
| 317 |
elog |
| 318 |
gnome2_icon_cache_update |
| 319 |
fdo-mime_desktop_database_update |
| 320 |
} |
| 321 |
|
| 322 |
pkg_postrm() { |
| 323 |
gnome2_icon_cache_update |
| 324 |
fdo-mime_desktop_database_update |
| 325 |
} |
Archives