From 2f51c9978dda4c6e8debca43e4235ecc86914032 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 25 Dec 2017 17:37:52 +0000 Subject: gentoo resync : 25.12.2017 --- media-gfx/Manifest.gz | Bin 43752 -> 43753 bytes media-gfx/blender/Manifest | 10 +- media-gfx/blender/blender-2.78-r1.ebuild | 296 --------------------- media-gfx/blender/blender-2.78a-r1.ebuild | 295 -------------------- media-gfx/blender/blender-2.79.ebuild | 287 ++++++++++++++++++++ .../files/blender-2.78-C++11-build-fix.patch | 11 - .../blender/files/blender-2.78-eigen-3.3.1.patch | 25 -- media-gfx/blender/metadata.xml | 6 + media-gfx/darktable/Manifest | 2 + media-gfx/darktable/darktable-2.4.0.ebuild | 147 ++++++++++ media-gfx/shotwell/Manifest | 2 + media-gfx/shotwell/shotwell-0.27.2.ebuild | 63 +++++ 12 files changed, 510 insertions(+), 634 deletions(-) delete mode 100644 media-gfx/blender/blender-2.78-r1.ebuild delete mode 100644 media-gfx/blender/blender-2.78a-r1.ebuild create mode 100644 media-gfx/blender/blender-2.79.ebuild delete mode 100644 media-gfx/blender/files/blender-2.78-C++11-build-fix.patch delete mode 100644 media-gfx/blender/files/blender-2.78-eigen-3.3.1.patch create mode 100644 media-gfx/darktable/darktable-2.4.0.ebuild create mode 100644 media-gfx/shotwell/shotwell-0.27.2.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 669a63eb6efb..b288433f27b0 100644 Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index e3bbf61bfdde..8c48cdafaae7 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -4,13 +4,9 @@ AUX blender-2.70-sse2.patch 1421 BLAKE2B d8566eccad25534f8c97100c7f12b630adec156 AUX blender-2.72-T42797.diff 342 BLAKE2B 0aa4724ae35004bc629db5c359059d4dd732d4f13fb9a8eabdde9cac9fbfcf009f52e435895405bd81180061ebab3c9a7030fbc257e967b2a1800753bcec37a3 SHA512 abe6c6e28a094ef76bad97c979f5927c464a8421a430bde3ea0fadc76eabd7a9049678a5d475363aba5e534fe12c8858ddcfd5e01fa39ba24ea79ebabec71407 AUX blender-2.72b-fix-util_simd.patch 292 BLAKE2B 176faae00e80e741297e0c06998b0c40d7b5a2d2939ca947094144ca90daf0a33d91ab0b7704aa32e09ef13f4aca9c79d5f969ecaad72251fc86e9b7bcce7a07 SHA512 17c328b9c64f1f42b4223d5f0777a68500235f95a85b761fdef216c5af4be17f67455e8044ab52fe6dd3e0bdfc6a7075cc3c21dae135a9cc7d174b6972b0326b AUX blender-2.72b-gcc6-fixes.patch 4828 BLAKE2B aa189c58028c61102be7f1b6485700fd8d2968e65f6f71b6a2527f38f4ada0039017c67d2110b4a532140f1903c7ea7fbeaffadebbafa781e07e900803bfeac8 SHA512 886d594a87aafe827ed65c6106c29c727ec31b92a3a2df32023cc2b728719c4e6e7a8418b725201d338331e23cca17a88f518b353735b33e40cee30a754050cc -AUX blender-2.78-C++11-build-fix.patch 473 BLAKE2B 053c856defdcc592ace30e98040222a5040bad4b3246087b8913bcff681aad042642d9ec88a7583404b9278529c4a09ec6e2f901227c1af33c21591147704fd7 SHA512 5d48121124e1f3832d24273b95908922827111fad4449b574908f52c9c02b9d7a0d89502850df4b653ba82b8150f2f4369b2807cddd45ca352f1fe0e74e738ef -AUX blender-2.78-eigen-3.3.1.patch 666 BLAKE2B 1015a56f8a1937aad1c72a6d641010eb83ea7affbaa1b7cd3139d40a5c398e230af1440b0097066b34306975a44186866b4e409f7842f8be6cdc26fc56a13834 SHA512 9a2ee48fa38e23a5b086514468bd1c96ee2b97228e95cdfaac3c5d3b2c21c4e47a0ced4306d7dc89268d63b60e551b655d6d627790215ad68791fe3f35717bf5 AUX blender-fix-install-rules.patch 518 BLAKE2B 178929de7adb1b4a0063134da93248af8c2c42fe0d3e9730833272b4fe8387075ce592ee65668cc9862a1ad10c9857a31b3f1c0614c9e69f937998ccb5c86a17 SHA512 5343f0e9e6bba2d15a38cb5db95a1aeff0a704c0762e558b9b74d88dd58e2fb5077289f0d8f25a61fa092d083f7db916d27c4642dfd7cf84d4c989258c3253ec DIST blender-2.72b.tar.gz 52018242 BLAKE2B fa0b8ab3feaeb35e76d833415984eb21d7b6dca47b9e5fb337cdfbdc9924165d3345caa5608ee2849bf71855c917a6fa56d79d4f375b57ff367047ef92e8e0b9 SHA512 9767797621e443ff9b6810d1713dda110f883c33626d40d7fe5dda676f549e3591516dc24b75feebd85823dd13437c34521ca752139cd31ddacf31ea6b14e124 -DIST blender-2.78.tar.gz 44489809 BLAKE2B 98377ec7db3d1c0f1df12c120688881761aba5b2b2000b3ec3738b3a2e7841cff9022f99859fcd410351534a839ae5db1a6883308984b108ee98981b7ee1e46c SHA512 9144ce28377271dafe973b59721da41b6e3954736c705e1540be8dba3124e4c32e5cce5fb3ef7158505d45401478d257720350b38fa8e8649cc35cbd28a2f978 -DIST blender-2.78a.tar.gz 44188123 BLAKE2B 2e475e4ff4d5b57c739c413d4e09de25af653d7363fe816424c44e478818fbc3a65b0606b17a9bc2a97255866644772ff95f995697334a4fbe4eecb2cf50f2c0 SHA512 57239b6ce473aaef114453f97a6e88535ec0a2f50cfecd221fa6bdcca6fe6559dcbefd48c3f20dc2235c195de13c59a1a155d5b64d777be31812d32e68be9370 +DIST blender-2.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f EBUILD blender-2.72b-r4.ebuild 8113 BLAKE2B a4d67b0ecd15f1a4f6eedb11d1160ef9514970052b2daa145848e8fc1247839bcfbeb61851a7c550be06b7153ea6e4e159932d36eddd7cb253d1bb6317221439 SHA512 837256447e727e165cb05e733236162ac03a82fa72a41e3a7d894c5efb60a26a959442cdc6eb528ad676b641f127b37d454080392ce54d14676cc8e29487c783 -EBUILD blender-2.78-r1.ebuild 8410 BLAKE2B 8b85164a3d998986aaa27024b6f1bd32946949f86c6ae8bf301f1fd22f9230bd373a448f9e968fcf839ea3016e56d7fdbdb47c09b7370a6dd12a24d98fd7c39d SHA512 0c9da4dd2ec174ce4ca15e548d2a326763b8a58a871c888f1c3c5eee73833a9cf6ffae647390453409f098093df232fb78eed47827ee362c44c61d5394e75242 -EBUILD blender-2.78a-r1.ebuild 8378 BLAKE2B 181076e2953f2e9b16cf01ef888311e3d819f8773f07024a3ab948a65fbcaa604e04e8e33521b9506e95f3b1d1506d01f20273f61510f8867ce149518085c554 SHA512 6ec1d4bf323b22c671784018391335c43efa8e8474985d2c94a83a810fdebf617a5b66a1f4bc8d980e60d21be1dc8b46cc1a139f12c39d20c25cc53d290f0dc5 -MISC metadata.xml 3440 BLAKE2B 3afb20cbddab0643a82587c5b607921ff6f97a27675a8f8dd48d172e0a035233b5eebb241b8b290062ade80beb59949830cb97760fda32e4b723926ae7c56338 SHA512 75c1cfb4998e9bbd2c3d4836bfba2f273d90920a2a72f70b599ee4cdfdfbf02cf1f2508aa24df6c762e3c323000de0a04623b21caaf5843e235888d3906043a8 +EBUILD blender-2.79.ebuild 8059 BLAKE2B d60a56884d15f6d1ddf5a2b8070de29284cf63ac152a19bfa4a0ecb3c66f4fdb200ce7831cd928133882614d5e29f2a5d3bde7c22cfc4506df5ead0792aea503 SHA512 99e7f652915b69087deb9ef11a5d78951b7553db60f8327150dd349a8a84672e9cb9fb2740acc00a927171388d346a3a57904ff2dfa0f826dddb2ce3c5e11eed +MISC metadata.xml 3716 BLAKE2B a83b3437a47923843bbe791b0508b34e75f1b5428984b7184b4939da073e07f1ec888121cd04bee106b870570eb82a31703a630ed3fb82230c99ed2d36522e12 SHA512 8ad522a14790a011fb26fe52a47ade818d161f2cfddb0cb49658a43e2dc0a9ddfd3a232e06b4f4441e852085bd1657a378219bdcd4a0249b2c30d341c24231ea diff --git a/media-gfx/blender/blender-2.78-r1.ebuild b/media-gfx/blender/blender-2.78-r1.ebuild deleted file mode 100644 index 8fa572492341..000000000000 --- a/media-gfx/blender/blender-2.78-r1.ebuild +++ /dev/null @@ -1,296 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_5 ) - -inherit check-reqs cmake-utils fdo-mime flag-o-matic gnome2-utils \ - pax-utils python-single-r1 toolchain-funcs versionator - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -SRC_URI="http://download.blender.org/source/${P}.tar.gz" - -# Blender can have letters in the version string, -# so strip of the letter if it exists. -MY_PV="$(get_version_component_range 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \ - cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ - llvm man ndof nls openal openimageio openmp opensubdiv openvdb \ - player sdl sndfile test tiff valgrind" - -# OpenCL and nVidia performance is rubbish with Blender -# If you have nVidia, use CUDA. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine !headless ) - cuda? ( cycles ) - cycles? ( boost openexr tiff openimageio ) - colorio? ( boost ) - openvdb? ( boost ) - opensubdiv? ( cuda ) - nls? ( boost ) - openal? ( boost ) - game-engine? ( boost ) - ?? ( ffmpeg libav )" - -# Since not using OpenCL with nVidia, depend on ATI binary -# blobs as Cycles with OpenCL does not work with any open -# source drivers. -RDEPEND="${PYTHON_DEPS} - dev-libs/lzo:2 - >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - media-libs/freetype - media-libs/glew:* - media-libs/libpng:0= - media-libs/libsamplerate - sys-libs/zlib - virtual/glu - virtual/jpeg:0= - virtual/libintl - virtual/opengl - boost? ( >=dev-libs/boost-1.62:=[nls?,threads(+)] ) - collada? ( >=media-libs/opencollada-1.6.18:= ) - colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) - cuda? ( dev-util/nvidia-cuda-toolkit:= ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( media-sound/jack-audio-connection-kit ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:0 ) - llvm? ( sys-devel/llvm ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - openimageio? ( >=media-libs/openimageio-1.6.9 ) - openexr? ( - >=media-libs/ilmbase-2.2.0:= - >=media-libs/openexr-2.2.0:= - ) - opensubdiv? ( media-libs/opensubdiv[cuda=] ) - openvdb? ( - media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] - dev-cpp/tbb - >=dev-libs/c-blosc-1.5.2 - ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 ) - valgrind? ( dev-util/valgrind )" - -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.2.8:3 - nls? ( sys-devel/gettext ) - doc? ( - app-doc/doxygen[-nodot(-),dot(+),latex] - dev-python/sphinx[latex] - )" - -PATCHES=( "${FILESDIR}"/${P}-C++11-build-fix.patch - "${FILESDIR}"/${PN}-fix-install-rules.patch - "${FILESDIR}"/${P}-eigen-3.3.1.patch ) - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - append-cppflags -DOPENVDB_3_ABI_COMPATIBLE - - local mycmakeargs=( - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_C11=ON - -DWITH_CXX11=ON - -DWITH_BOOST=$(usex boost) - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CUDA=$(usex cuda) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_OSL=OFF - -DWITH_LLVM=$(usex llvm) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GAMEENGINE=$(usex game-engine) - -DWITH_HEADLESS=$(usex headless) - -DWITH_X11=$(usex !headless) - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCL=OFF - -DWITH_CYCLES_DEVICE_OPENCL=OFF - -DWITH_OPENCOLORIO=$(usex colorio) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PLAYER=$(usex player) - -DWITH_SDL=$(usex sdl) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_GTESTS=$(usex test) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake-utils_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED%/}"/usr/share/doc/blender || die - - python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.78a-r1.ebuild b/media-gfx/blender/blender-2.78a-r1.ebuild deleted file mode 100644 index f61dd89b1184..000000000000 --- a/media-gfx/blender/blender-2.78a-r1.ebuild +++ /dev/null @@ -1,295 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_5 ) - -inherit check-reqs cmake-utils fdo-mime flag-o-matic gnome2-utils \ - pax-utils python-single-r1 toolchain-funcs versionator - -DESCRIPTION="3D Creation/Animation/Publishing System" -HOMEPAGE="http://www.blender.org" - -SRC_URI="http://download.blender.org/source/${P}.tar.gz" - -# Blender can have letters in the version string, -# so strip of the letter if it exists. -MY_PV="$(get_version_component_range 1-2)" - -SLOT="0" -LICENSE="|| ( GPL-2 BL )" -KEYWORDS="~amd64 ~x86" -IUSE="+boost +bullet +dds +elbeem +game-engine +openexr collada colorio \ - cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ - llvm man ndof nls openal openimageio openmp opensubdiv openvdb \ - player sdl sndfile test tiff valgrind" - -# OpenCL and nVidia performance is rubbish with Blender -# If you have nVidia, use CUDA. -REQUIRED_USE="${PYTHON_REQUIRED_USE} - player? ( game-engine !headless ) - cuda? ( cycles ) - cycles? ( boost openexr tiff openimageio ) - colorio? ( boost ) - openvdb? ( boost ) - opensubdiv? ( cuda ) - nls? ( boost ) - openal? ( boost ) - game-engine? ( boost ) - ?? ( ffmpeg libav )" - -# Since not using OpenCL with nVidia, depend on ATI binary -# blobs as Cycles with OpenCL does not work with any open -# source drivers. -RDEPEND="${PYTHON_DEPS} - dev-libs/lzo:2 - >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}] - media-libs/freetype - media-libs/glew:* - media-libs/libpng:0= - media-libs/libsamplerate - sys-libs/zlib - virtual/glu - virtual/jpeg:0= - virtual/libintl - virtual/opengl - boost? ( >=dev-libs/boost-1.62:=[nls?,threads(+)] ) - collada? ( >=media-libs/opencollada-1.6.18:= ) - colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) - cuda? ( =dev-util/nvidia-cuda-toolkit-8.0*:= ) - ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) - libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) - fftw? ( sci-libs/fftw:3.0= ) - !headless? ( - x11-libs/libX11 - x11-libs/libXi - x11-libs/libXxf86vm - ) - jack? ( media-sound/jack-audio-connection-kit ) - jemalloc? ( dev-libs/jemalloc:= ) - jpeg2k? ( media-libs/openjpeg:0 ) - llvm? ( sys-devel/llvm ) - ndof? ( - app-misc/spacenavd - dev-libs/libspnav - ) - nls? ( virtual/libiconv ) - openal? ( media-libs/openal ) - openimageio? ( >=media-libs/openimageio-1.6.9 ) - openexr? ( - >=media-libs/ilmbase-2.2.0:= - >=media-libs/openexr-2.2.0:= - ) - opensubdiv? ( media-libs/opensubdiv[cuda=] ) - openvdb? ( - media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] - dev-cpp/tbb - >=dev-libs/c-blosc-1.5.2 - ) - sdl? ( media-libs/libsdl2[sound,joystick] ) - sndfile? ( media-libs/libsndfile ) - tiff? ( media-libs/tiff:0 ) - valgrind? ( dev-util/valgrind )" - -DEPEND="${RDEPEND} - >=dev-cpp/eigen-3.2.8:3 - nls? ( sys-devel/gettext ) - doc? ( - app-doc/doxygen[-nodot(-),dot(+),latex] - dev-python/sphinx[latex] - )" - -PATCHES=( "${FILESDIR}"/${PN}-fix-install-rules.patch - "${FILESDIR}"/${PN}-2.78-eigen-3.3.1.patch ) - -blender_check_requirements() { - [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp - - if use doc; then - CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend - fi -} - -pkg_pretend() { - blender_check_requirements -} - -pkg_setup() { - blender_check_requirements - python-single-r1_pkg_setup -} - -src_prepare() { - default - - # we don't want static glew, but it's scattered across - # multiple files that differ from version to version - # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! - local file - while IFS="" read -d $'\0' -r file ; do - sed -i -e '/-DGLEW_STATIC/d' "${file}" || die - done < <(find . -type f -name "CMakeLists.txt") - - # Disable MS Windows help generation. The variable doesn't do what it - # it sounds like. - sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ - -i doc/doxygen/Doxyfile || die -} - -src_configure() { - # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu - # shadows, see bug #276338 for reference - append-flags -funsigned-char - append-lfs-flags - append-cppflags -DOPENVDB_3_ABI_COMPATIBLE - - local mycmakeargs=( - -DPYTHON_VERSION="${EPYTHON/python/}" - -DPYTHON_LIBRARY="$(python_get_library_path)" - -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" - -DWITH_INSTALL_PORTABLE=OFF - -DWITH_PYTHON_INSTALL=OFF - -DWITH_PYTHON_INSTALL_NUMPY=OFF - -DWITH_STATIC_LIBS=OFF - -DWITH_SYSTEM_GLEW=ON - -DWITH_SYSTEM_OPENJPEG=ON - -DWITH_SYSTEM_EIGEN3=ON - -DWITH_SYSTEM_LZO=ON - -DWITH_C11=ON - -DWITH_CXX11=ON - -DWITH_BOOST=$(usex boost) - -DWITH_BULLET=$(usex bullet) - -DWITH_CODEC_FFMPEG=$(usex ffmpeg) - -DWITH_CODEC_SNDFILE=$(usex sndfile) - -DWITH_CUDA=$(usex cuda) - -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) - -DWITH_CYCLES=$(usex cycles) - -DWITH_CYCLES_OSL=OFF - -DWITH_LLVM=$(usex llvm) - -DWITH_FFTW3=$(usex fftw) - -DWITH_GAMEENGINE=$(usex game-engine) - -DWITH_HEADLESS=$(usex headless) - -DWITH_X11=$(usex !headless) - -DWITH_IMAGE_DDS=$(usex dds) - -DWITH_IMAGE_OPENEXR=$(usex openexr) - -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) - -DWITH_IMAGE_TIFF=$(usex tiff) - -DWITH_INPUT_NDOF=$(usex ndof) - -DWITH_INTERNATIONAL=$(usex nls) - -DWITH_JACK=$(usex jack) - -DWITH_MOD_FLUID=$(usex elbeem) - -DWITH_MOD_OCEANSIM=$(usex fftw) - -DWITH_OPENAL=$(usex openal) - -DWITH_OPENCL=OFF - -DWITH_CYCLES_DEVICE_OPENCL=OFF - -DWITH_OPENCOLORIO=$(usex colorio) - -DWITH_OPENCOLLADA=$(usex collada) - -DWITH_OPENIMAGEIO=$(usex openimageio) - -DWITH_OPENMP=$(usex openmp) - -DWITH_OPENSUBDIV=$(usex opensubdiv) - -DWITH_OPENVDB=$(usex openvdb) - -DWITH_OPENVDB_BLOSC=$(usex openvdb) - -DWITH_PLAYER=$(usex player) - -DWITH_SDL=$(usex sdl) - -DWITH_CXX_GUARDEDALLOC=$(usex debug) - -DWITH_ASSERT_ABORT=$(usex debug) - -DWITH_GTESTS=$(usex test) - -DWITH_DOC_MANPAGE=$(usex man) - -DWITH_MEM_JEMALLOC=$(usex jemalloc) - -DWITH_MEM_VALGRIND=$(usex valgrind) - ) - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile - - if use doc; then - # Workaround for binary drivers. - addpredict /dev/ati - addpredict /dev/nvidiactl - - einfo "Generating Blender C/C++ API docs ..." - cd "${CMAKE_USE_DIR}"/doc/doxygen || die - doxygen -u Doxyfile || die - doxygen || die "doxygen failed to build API docs." - - cd "${CMAKE_USE_DIR}" || die - einfo "Generating (BPY) Blender Python API docs ..." - "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." - - cd "${CMAKE_USE_DIR}"/doc/python_api || die - sphinx-build sphinx-in BPY_API || die "sphinx failed." - fi -} - -src_test() { - if use test; then - einfo "Running Blender Unit Tests ..." - cd "${BUILD_DIR}"/bin/tests || die - local f - for f in *_test; do - ./"${f}" || die - done - fi -} - -src_install() { - # Pax mark blender for hardened support. - pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender - - if use doc; then - docinto "html/API/python" - dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. - - docinto "html/API/blender" - dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. - fi - - cmake-utils_src_install - - # fix doc installdir - docinto "html" - dodoc "${CMAKE_USE_DIR}"/release/text/readme.html - rm -r "${ED%/}"/usr/share/doc/blender || die - - python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py" - python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts" -} - -pkg_preinst() { - gnome2_icon_savelist -} - -pkg_postinst() { - elog - elog "Blender uses python integration. As such, may have some" - elog "inherit risks with running unknown python scripts." - elog - elog "It is recommended to change your blender temp directory" - elog "from /tmp to /home/user/tmp or another tmp file under your" - elog "home directory. This can be done by starting blender, then" - elog "dragging the main menu down do display all paths." - elog - ewarn - ewarn "This ebuild does not unbundle the massive amount of 3rd party" - ewarn "libraries which are shipped with blender. Note that" - ewarn "these have caused security issues in the past." - ewarn "If you are concerned about security, file a bug upstream:" - ewarn " https://developer.blender.org/" - ewarn - gnome2_icon_cache_update - fdo-mime_desktop_database_update -} - -pkg_postrm() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update - - ewarn "" - ewarn "You may want to remove the following directory." - ewarn "~/.config/${PN}/${MY_PV}/cache/" - ewarn "It may contain extra render kernels not tracked by portage" - ewarn "" -} diff --git a/media-gfx/blender/blender-2.79.ebuild b/media-gfx/blender/blender-2.79.ebuild new file mode 100644 index 000000000000..06c60b3f827e --- /dev/null +++ b/media-gfx/blender/blender-2.79.ebuild @@ -0,0 +1,287 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{3_5,3_6} ) + +inherit check-reqs cmake-utils xdg-utils flag-o-matic gnome2-utils \ + pax-utils python-single-r1 toolchain-funcs versionator + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="http://www.blender.org" + +SRC_URI="http://download.blender.org/source/${P}.tar.gz" + +# Blender can have letters in the version string, +# so strip of the letter if it exists. +MY_PV="$(get_version_component_range 1-2)" + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="~amd64 ~x86" +IUSE="+bullet +dds +elbeem +game-engine +openexr collada colorio \ + cuda cycles debug doc ffmpeg fftw headless jack jemalloc jpeg2k libav \ + llvm man ndof nls openal opencl openimageio openmp opensubdiv openvdb \ + osl player sdl sndfile test tiff valgrind" + +REQUIRED_USE="${PYTHON_REQUIRED_USE} + player? ( game-engine !headless ) + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + opencl? ( cycles ) + osl? ( cycles llvm )" + +RDEPEND="${PYTHON_DEPS} + >=dev-libs/boost-1.62:=[nls?,threads(+)] + dev-libs/lzo:2 + >=dev-python/numpy-1.10.1[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + media-libs/freetype + media-libs/glew:* + media-libs/libpng:0= + media-libs/libsamplerate + sys-libs/zlib + virtual/glu + virtual/jpeg:0= + virtual/libintl + virtual/opengl + collada? ( >=media-libs/opencollada-1.6.18:= ) + colorio? ( media-libs/opencolorio ) + cuda? ( dev-util/nvidia-cuda-toolkit:= ) + ffmpeg? ( media-video/ffmpeg:=[x264,mp3,encode,theora,jpeg2k?] ) + libav? ( >=media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) + fftw? ( sci-libs/fftw:3.0= ) + !headless? ( + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + ) + jack? ( virtual/jack ) + jemalloc? ( dev-libs/jemalloc:= ) + jpeg2k? ( media-libs/openjpeg:0 ) + llvm? ( sys-devel/llvm:= ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( media-libs/openal ) + opencl? ( virtual/opencl ) + openimageio? ( >=media-libs/openimageio-1.7.0 ) + openexr? ( + >=media-libs/ilmbase-2.2.0:= + >=media-libs/openexr-2.2.0:= + ) + opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) + openvdb? ( + media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] + dev-cpp/tbb + >=dev-libs/c-blosc-1.5.2 + ) + osl? ( media-libs/osl:= ) + sdl? ( media-libs/libsdl2[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tiff? ( media-libs/tiff:0 ) + valgrind? ( dev-util/valgrind )" + +DEPEND="${RDEPEND} + virtual/pkgconfig + >=dev-cpp/eigen-3.2.8:3 + nls? ( sys-devel/gettext ) + doc? ( + app-doc/doxygen[-nodot(-),dot(+),latex] + dev-python/sphinx[latex] + )" + +PATCHES=( "${FILESDIR}/${PN}-fix-install-rules.patch" ) + +blender_check_requirements() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +pkg_pretend() { + blender_check_requirements +} + +pkg_setup() { + blender_check_requirements + python-single-r1_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # we don't want static glew, but it's scattered across + # multiple files that differ from version to version + # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! + local file + while IFS="" read -d $'\0' -r file ; do + sed -i -e '/-DGLEW_STATIC/d' "${file}" || die + done < <(find . -type f -name "CMakeLists.txt") + + # Disable MS Windows help generation. The variable doesn't do what it + # it sounds like. + sed -e "s|GENERATE_HTMLHELP = YES|GENERATE_HTMLHELP = NO|" \ + -i doc/doxygen/Doxyfile || die +} + +src_configure() { + # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu + # shadows, see bug #276338 for reference + append-flags -funsigned-char + append-lfs-flags + append-cppflags -DOPENVDB_3_ABI_COMPATIBLE + + local mycmakeargs=( + -DPYTHON_VERSION="${EPYTHON/python/}" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_PYTHON_INSTALL=OFF + -DWITH_PYTHON_INSTALL_NUMPY=OFF + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_OPENJPEG=ON + -DWITH_SYSTEM_EIGEN3=ON + -DWITH_SYSTEM_LZO=ON + -DWITH_C11=ON + -DWITH_CXX11=ON + -DWITH_BOOST=ON + -DWITH_BULLET=$(usex bullet) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg) + -DWITH_CODEC_SNDFILE=$(usex sndfile) + -DWITH_CUDA=$(usex cuda) + -DWITH_CYCLES_DEVICE_CUDA=$(usex cuda TRUE FALSE) + -DWITH_CYCLES=$(usex cycles) + -DWITH_CYCLES_OSL=$(usex osl) + -DWITH_LLVM=$(usex llvm) + -DWITH_FFTW3=$(usex fftw) + -DWITH_GAMEENGINE=$(usex game-engine) + -DWITH_HEADLESS=$(usex headless) + -DWITH_X11=$(usex !headless) + -DWITH_IMAGE_DDS=$(usex dds) + -DWITH_IMAGE_OPENEXR=$(usex openexr) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k) + -DWITH_IMAGE_TIFF=$(usex tiff) + -DWITH_INPUT_NDOF=$(usex ndof) + -DWITH_INTERNATIONAL=$(usex nls) + -DWITH_JACK=$(usex jack) + -DWITH_MOD_FLUID=$(usex elbeem) + -DWITH_MOD_OCEANSIM=$(usex fftw) + -DWITH_OPENAL=$(usex openal) + -DWITH_OPENCL=$(usex opencl) + -DWITH_OPENCOLORIO=$(usex colorio) + -DWITH_OPENCOLLADA=$(usex collada) + -DWITH_OPENIMAGEIO=$(usex openimageio) + -DWITH_OPENMP=$(usex openmp) + -DWITH_OPENSUBDIV=$(usex opensubdiv) + -DWITH_OPENVDB=$(usex openvdb) + -DWITH_OPENVDB_BLOSC=$(usex openvdb) + -DWITH_PLAYER=$(usex player) + -DWITH_SDL=$(usex sdl) + -DWITH_CXX_GUARDEDALLOC=$(usex debug) + -DWITH_ASSERT_ABORT=$(usex debug) + -DWITH_GTESTS=$(usex test) + -DWITH_DOC_MANPAGE=$(usex man) + -DWITH_MEM_JEMALLOC=$(usex jemalloc) + -DWITH_MEM_VALGRIND=$(usex valgrind) + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + # Workaround for binary drivers. + addpredict /dev/ati + addpredict /dev/dri + addpredict /dev/nvidiactl + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile || die + doxygen || die "doxygen failed to build API docs." + + cd "${CMAKE_USE_DIR}" || die + einfo "Generating (BPY) Blender Python API docs ..." + "${BUILD_DIR}"/bin/blender --background --python doc/python_api/sphinx_doc_gen.py -noaudio || die "sphinx failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { + if use test; then + einfo "Running Blender Unit Tests ..." + cd "${BUILD_DIR}"/bin/tests || die + local f + for f in *_test; do + ./"${f}" || die + done + fi +} + +src_install() { + # Pax mark blender for hardened support. + pax-mark m "${CMAKE_BUILD_DIR}"/bin/blender + + if use doc; then + docinto "html/API/python" + dodoc -r "${CMAKE_USE_DIR}"/doc/python_api/BPY_API/. + + docinto "html/API/blender" + dodoc -r "${CMAKE_USE_DIR}"/doc/doxygen/html/. + fi + + cmake-utils_src_install + + # fix doc installdir + docinto "html" + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -r "${ED%/}"/usr/share/doc/blender || die + + python_fix_shebang "${ED%/}/usr/bin/blender-thumbnailer.py" + python_optimize "${ED%/}/usr/share/blender/${MY_PV}/scripts" +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + elog + elog "Blender uses python integration. As such, may have some" + elog "inherit risks with running unknown python scripts." + elog + elog "It is recommended to change your blender temp directory" + elog "from /tmp to /home/user/tmp or another tmp file under your" + elog "home directory. This can be done by starting blender, then" + elog "dragging the main menu down do display all paths." + elog + ewarn + ewarn "This ebuild does not unbundle the massive amount of 3rd party" + ewarn "libraries which are shipped with blender. Note that" + ewarn "these have caused security issues in the past." + ewarn "If you are concerned about security, file a bug upstream:" + ewarn " https://developer.blender.org/" + ewarn + gnome2_icon_cache_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_mimeinfo_database_update + + ewarn "" + ewarn "You may want to remove the following directory." + ewarn "~/.config/${PN}/${MY_PV}/cache/" + ewarn "It may contain extra render kernels not tracked by portage" + ewarn "" +} diff --git a/media-gfx/blender/files/blender-2.78-C++11-build-fix.patch b/media-gfx/blender/files/blender-2.78-C++11-build-fix.patch deleted file mode 100644 index ca9b5e1fa8e5..000000000000 --- a/media-gfx/blender/files/blender-2.78-C++11-build-fix.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -purN a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp ---- a/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp 2016-09-28 10:26:55.000000000 +0100 -+++ b/source/blender/render/intern/raytrace/rayobject_rtbuild.cpp 2016-10-04 11:13:46.489404123 +0100 -@@ -34,6 +34,7 @@ - #include - #include - #include -+#include - - #include "rayobject_rtbuild.h" - diff --git a/media-gfx/blender/files/blender-2.78-eigen-3.3.1.patch b/media-gfx/blender/files/blender-2.78-eigen-3.3.1.patch deleted file mode 100644 index 540aa6b9a511..000000000000 --- a/media-gfx/blender/files/blender-2.78-eigen-3.3.1.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- blender-2.78a-orig/extern/ceres/include/ceres/jet.h 2016-10-25 01:13:56.000000000 +1100 -+++ blender-2.78a/extern/ceres/include/ceres/jet.h 2017-01-11 13:27:24.708241265 +1100 -@@ -757,6 +757,7 @@ - typedef ceres::Jet Real; - typedef ceres::Jet NonInteger; - typedef ceres::Jet Nested; -+ typedef ceres::Jet Literal; - - static typename ceres::Jet dummy_precision() { - return ceres::Jet(1e-12); -@@ -777,6 +778,14 @@ - HasFloatingPoint = 1, - RequireInitialization = 1 - }; -+ -+ template -+ struct Div { -+ enum { -+ AVX = false, -+ Cost = 1 -+ }; -+ }; - }; - - } // namespace Eigen diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index ef8d0871a231..92981d95ed42 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -72,6 +72,9 @@ Enable NDOF input devices (SpaceNavigator and friends). + + Allow OpenCL Graphics Acceleration. This may + require extra graphics card drivers. Enable OpenImageIO Support Enable use of Open Numerical Library @@ -83,6 +86,9 @@ Add GPU preview rendering. Only works with nVidia cards. + + Add support for OpenShadingLanguage scripting. + Build the Blender Player. THis requires the Game engine. diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 2d794ff7b364..e6ceb1318de6 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,7 +1,9 @@ DIST darktable-2.2.4.tar.xz 3083400 BLAKE2B 1b8c79157c4ff6e966c20588d47094dc9a0a3c77d70a6326c24d85e089bc58e8eda5c46653c12a9263c56deff2411a48e8cd82d66624598772e08bbe6b6c3f6c SHA512 4231bcbbf975fb9cd73d3a9e4ab1a05ebd1c58e681f776896b252bb245529d89bfd34d05c1a6dcf0d6a9a190898eaaa495084906f92bfb1aa8bb2ca0cf84eb9d DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b +DIST darktable-2.4.0.tar.xz 3387972 BLAKE2B 9583dfac379430d21de798da922f747e066e237b87cc5f1f5934fad9cede181f1817ef451ddcb7790ca632d78c577d6651cd301083cbf1342003d9f413b31c4d SHA512 7bd73915f575e837aeee68e791280df01940daccb7efa14e78e38c53dd3f62dcbd1a7cea6ae86af05dfa31b0ed1a8ccbcdb108788668249d13bb7e55ec5ad5db DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20 EBUILD darktable-2.2.4.ebuild 3861 BLAKE2B 425ceb4384274b4a8c59b2aca784097c7171a3e871c5816b8c6905ec4edf02299372ffc227103a20b9895fcb8a285f7ccb19c0098273183db906b9cac7e9a7c2 SHA512 689144ba9ddc485a23285c157b55999b62fdabe0b356cc7e08a6f7a732d3e96d4bd141d2e1e0dd7e64813f5918f5ae0482f842616750b4a2de3b537a0cc93556 EBUILD darktable-2.2.5.ebuild 3863 BLAKE2B 0be32440f9a0c22ab31c0add8d10c61d31e2eb8e2a989be1546b2718b1efd78cae6f848a84742b172566021433676f20eb3719509d9d2fc2fe4d13b2233dc32e SHA512 0a5df348c5163c861a42018e64c48bf405d69fea6496e6361139342c850a42daa0251692a21e2a8174e3c5e34b92fb50b4d3bc03f7feda547fe31732ebcf430c +EBUILD darktable-2.4.0.ebuild 3942 BLAKE2B 259f0c9865fd8ba394a79ba5adf333d7e8f3ff3cba9a56a838d1a734821b90f6f91932bb57d33885c10f9cd27b1081eda8f44e72a31a48d5d95ccc590c0634a1 SHA512 2b68258a47c4ed8a66793385c7daf809688c36c7547ffc6684f60c19410235652c9e3c5175b1e3f96c92981c3fe56ddac283cb6cf3a85d912ec487d577be8e40 EBUILD darktable-9999.ebuild 3296 BLAKE2B 9a1410977c2093469a7324098787189364cf5bdd7b6e67c415dd54b608dc2db6f7bc7efe591f907c66a32600e5d5329022d1bcd539c6a5bdc8c14c5f23c3254f SHA512 2c04ee7ccc6a191bbeb0a75212e027838f6a5f4cdeeeff5ac638cd36cbf10e221d0d0a4ff58344723c8694b01dfde4c2774ba51d54a9c19c61565180fd8d6a62 MISC metadata.xml 1001 BLAKE2B 7da2598419c82747ec5d95f1454c86ac276ee2df931c4e61d0f6c1b52e112d1f49944ed0c1fb7dc8d7390d1fab5117cf734e6a1fec70d31af01d28c9c50d580e SHA512 6d5d277e74c9c97a57a1cdb80c6b8ea300e90cb65a937fb69e682d8117acb4b6048fb4d0895769c5b5d84545f4ccad4edbfedc7b898bbb8292b161cea5588c88 diff --git a/media-gfx/darktable/darktable-2.4.0.ebuild b/media-gfx/darktable/darktable-2.4.0.ebuild new file mode 100644 index 000000000000..e61d402bf8e5 --- /dev/null +++ b/media-gfx/darktable/darktable-2.4.0.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils flag-o-matic toolchain-funcs gnome2-utils fdo-mime pax-utils eutils + +DOC_PV="2.2.0" +MY_PV="${PV/_/}" +MY_P="${P/_/.}" + +DESCRIPTION="A virtual lighttable and darkroom for photographers" +HOMEPAGE="https://www.darktable.org/" +SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" + +LICENSE="GPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" +# TODO add lua once dev-lang/lua-5.2 is unmasked +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geo gphoto2 graphicsmagick jpeg2k kwallet libsecret +nls opencl openmp openexr pax_kernel webp +${LANGS// / l10n_}" + +# sse3 support is required to build darktable +REQUIRED_USE="cpu_flags_x86_sse3" + +CDEPEND=" + dev-db/sqlite:3 + dev-libs/json-glib + dev-libs/libxml2:2 + dev-libs/pugixml:0= + gnome-base/librsvg:2 + >=media-gfx/exiv2-0.25-r2:0=[xmp] + media-libs/lcms:2 + >=media-libs/lensfun-0.2.3:0= + media-libs/libpng:0= + media-libs/tiff:0 + net-libs/libsoup:2.4 + net-misc/curl + virtual/jpeg:0 + virtual/glu + virtual/opengl + x11-libs/cairo + >=x11-libs/gtk+-3.14:3 + x11-libs/pango + colord? ( x11-libs/colord-gtk:0= ) + cups? ( net-print/cups ) + flickr? ( media-libs/flickcurl ) + geo? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gphoto2? ( media-libs/libgphoto2:= ) + graphicsmagick? ( media-gfx/graphicsmagick ) + jpeg2k? ( media-libs/openjpeg:0 ) + libsecret? ( >=app-crypt/libsecret-0.18 ) + opencl? ( + sys-devel/clang:4= + sys-devel/llvm:4= + virtual/opencl + ) + openexr? ( media-libs/openexr:0= ) + webp? ( media-libs/libwebp:0= )" +RDEPEND="${CDEPEND} + kwallet? ( || ( + >=kde-frameworks/kwallet-5.34.0-r1 + kde-apps/kwalletd:4 + ) )" +DEPEND="${CDEPEND} + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/${P/_/~}" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + use cpu_flags_x86_sse3 && append-flags -msse3 + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PRINT=$(usex cups) + -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCUSTOM_CFLAGS=ON + -DUSE_CAMERA_SUPPORT=$(usex gphoto2) + -DUSE_COLORD=$(usex colord) + -DUSE_FLICKR=$(usex flickr) + -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) + -DUSE_KWALLET=$(usex kwallet) + -DUSE_LIBSECRET=$(usex libsecret) + -DUSE_LUA=OFF + -DUSE_MAP=$(usex geo) + -DUSE_NLS=$(usex nls) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENEXR=$(usex openexr) + -DUSE_OPENJPEG=$(usex jpeg2k) + -DUSE_OPENMP=$(usex openmp) + -DUSE_WEBP=$(usex webp) + ) + CMAKE_BUILD_TYPE="RELWITHDEBINFO" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf + + for lang in ${LANGS} ; do + use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_} + done + + if use pax_kernel && use opencl ; then + pax-mark Cm "${ED}"/usr/bin/${PN} || die + eqawarn "USE=pax_kernel is set meaning that ${PN} will be run" + eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary" + eqawarn "must be modified and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update + + elog "when updating from the currently stable 1.6 series," + elog "please bear in mind that your edits will be preserved during this process," + elog "but it will not be possible to downgrade from 2.0 to 1.6 any more." + echo + ewarn "It will not be possible to downgrade!" +} + +pkg_postrm() { + gnome2_icon_cache_update + fdo-mime_desktop_database_update +} diff --git a/media-gfx/shotwell/Manifest b/media-gfx/shotwell/Manifest index 89646fd1a46e..4ae05959a69e 100644 --- a/media-gfx/shotwell/Manifest +++ b/media-gfx/shotwell/Manifest @@ -7,6 +7,7 @@ DIST shotwell-0.26.3.tar.xz 5581204 BLAKE2B 1b28be1bef1b5b9305020d92bca8b535b7a4 DIST shotwell-0.26.4.tar.xz 5619280 BLAKE2B 0ca9ecf6e96019aa8e9bd4bae09d1b888902fc054633271854e09e1fa9b474774b7b5f2e6e3bcfed60a5b0f3ba30a2d89133d2676a94db5f4da6ee6a0af41102 SHA512 6a0772a40759d636807652ef27814306cbc2217119b071590db36c628b6e9d04f876ae1748c88476fbebc1db0c83e6a108c9f74261b7faa348c6bd37c1da198d DIST shotwell-0.27.0.tar.xz 5574988 BLAKE2B 30ab9ebe5fa12f8d7be3775d044b983c644b1b88e6ca4a69522db0c3859f55846b785761ced8e1af8da8c4ec72c4b46925c6a77dd2f995936c12638913856c2c SHA512 e7b5fe153fff96e04507588b4b8a1e71c121787cb6d28b7e14bb31824f1a09ca1948edc4bccfa069b2ffebe1ac753580257c1af4b7aec0ed49af74944ee91fbb DIST shotwell-0.27.1.tar.xz 5619824 BLAKE2B 7ba1606b1604ca156aacd71d014bdec507abd2a5447696b60ce4400cf835dd484b39e737ec7659a8744e0a5f72b9e9a561fb297db6f256db7008ca5e4b2ae0d8 SHA512 b26c25b45af305903cf0698e65d5230820dda447b70175c92a66e25148e47d620847b3fa2b3bdb8d70656186d5b30d98edf3eee4138f07db9f8260e81a95a7d6 +DIST shotwell-0.27.2.tar.xz 5619692 BLAKE2B 0a532d6d2f7391f0783cb0fb91fbc15a681e87041d12355ca75581d4b7f4ebe7fe3feeaca7fc12b0fd82710bf2d906c1d3abd382b61a5dfac3041cec482edd38 SHA512 a64fec52ff1ba3bca0e4b07be557ea3b838845998ae64ac7504cd9a8c976380cf0d7aae4aaccf931f1f40b5d247e081ec98472da8e8835363779dd39d9d2f69b EBUILD shotwell-0.24.6.ebuild 1444 BLAKE2B a9882a2e047187e613755ac71e587242a1b8e0a113a981a4e47620c07177bc2b1e4c01e6cdd3f00036dd09481e4e31c64c319fb30a708c6350c45a0e5ea5656f SHA512 559e06d8bed36ab72880dfb409d4151d9ddc040201f4bd144b67202cd103db09c1b3a428b94c5875ac50159da0e22beb7e3242e515cb8dea259dfae75f383dd9 EBUILD shotwell-0.25.0.1.ebuild 1471 BLAKE2B 529d3e84b62254eb35fbc93c346c44e961d59ba895b6d86bc49766ab78d446967f8b8b4ad17e0efb4220a1d23a5e40cb048f4c1a0317373c3daa17629a181a61 SHA512 ff395918298ad2b4e7725149177ebcf19b30f517e3e78ec4e62aa421e4cc61ccdc41be2c4234301f10df1ec5d8e8a188f17f69048dc0decd3b77e0a2bb52d67e EBUILD shotwell-0.26.0.ebuild 1471 BLAKE2B 9b5c8f1541c0d9fc96923ee19e9856c1320af4065552d3fc100a55d1765677af6ba524bd9225e8b385477c016aa692bb0e4ccddb3911558771d4b8b9e36bc966 SHA512 7738e3cf9e6e545005071c01500ce091b1908b651162187bb91ee88bd954371ce9ed0962f76d4a688783f6a27374835d6c517a7c9b2c477cbca0f4b1ecbfa521 @@ -16,4 +17,5 @@ EBUILD shotwell-0.26.3.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a EBUILD shotwell-0.26.4.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 EBUILD shotwell-0.27.0.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 EBUILD shotwell-0.27.1.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 +EBUILD shotwell-0.27.2.ebuild 1490 BLAKE2B 47029b46edd6f386842b82cf28aef5a75790a8bb9f9ce5f0437897c8e1933571013de8f82aaf97ea15076ec162b94b645c830fb55dd0f68b01d6e9b1fd030767 SHA512 c8f6fb632fb4b49aa60cbb5cbc572aaa191bbe047d434c6bd6b97a3bc9bd61540d7ab31fec1121d8faad55e622cd39e1bc10f1d2139f54daa58346542c162cf6 MISC metadata.xml 900 BLAKE2B 62d1bd65c242a5da435f9217c538250495879be4d0b2de3477111018ed456f019abeb0bf678835997ff2c567fdbb844ca257d0c4bad8d07c3ad590adc82202cf SHA512 aab4bb7556cb7fc926b59e68d16a2425af57cab5ae80c68ce2dd650bf49b9e3872771fee51552aa0aba9c50167a33b1976700f65bbc1531de44ac638cdd4a0be diff --git a/media-gfx/shotwell/shotwell-0.27.2.ebuild b/media-gfx/shotwell/shotwell-0.27.2.ebuild new file mode 100644 index 000000000000..0cafa2080fcf --- /dev/null +++ b/media-gfx/shotwell/shotwell-0.27.2.ebuild @@ -0,0 +1,63 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +GNOME2_LA_PUNT="yes" +VALA_MIN_API_VERSION="0.28" + +inherit gnome2 multilib toolchain-funcs vala versionator + +MY_PV=$(get_version_component_range 1-2) +DESCRIPTION="Open source photo manager for GNOME" +HOMEPAGE="https://wiki.gnome.org/Apps/Shotwell" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86" +IUSE="" + +RDEPEND=" + >=app-crypt/gcr-3[gtk] + >=dev-db/sqlite-3.5.9:3 + >=dev-libs/glib-2.40.0:2 + >=dev-libs/json-glib-0.7.6 + >=dev-libs/libgee-0.8.5:0.8 + >=dev-libs/libxml2-2.6.32:2 + gnome-base/dconf + >=media-libs/gexiv2-0.10.4 + media-libs/gst-plugins-base:1.0 + media-libs/gst-plugins-good:1.0 + media-libs/gstreamer:1.0 + media-libs/lcms:2 + >=media-libs/libexif-0.6.16:= + >=media-libs/libgphoto2-2.5:= + >=media-libs/libraw-0.13.2:= + media-plugins/gst-plugins-gdkpixbuf:1.0 + >=net-libs/libsoup-2.42.0:2.4 + net-libs/webkit-gtk:4 + virtual/libgudev:=[introspection] + >=x11-libs/gtk+-3.14.0:3[X] + dev-libs/libgdata + +" +DEPEND="${RDEPEND} + $(vala_depend) + dev-util/itstool + >=sys-devel/gettext-0.19.7 + >=sys-devel/m4-1.4.13 + virtual/pkgconfig +" + +# This probably comes from libraries that +# shotwell-video-thumbnailer links to. +# Nothing we can do at the moment. #435048 +QA_FLAGS_IGNORED="/usr/libexec/${PN}/${PN}-video-thumbnailer" + +src_prepare() { + vala_src_prepare + gnome2_src_prepare +} + +src_configure() { + gnome2_src_configure --disable-static +} -- cgit v1.2.3