From 43793fab84041cfc5c60c0151d1591b8a69fb24a Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Aug 2018 07:36:27 +0100 Subject: gentoo resync : 25.08.2018 --- media-gfx/Manifest.gz | Bin 41894 -> 42053 bytes media-gfx/blender/Manifest | 8 +- media-gfx/blender/blender-2.79-r1.ebuild | 4 +- media-gfx/blender/blender-2.79.ebuild | 4 +- media-gfx/blender/blender-2.79b.ebuild | 291 ++++++++++++++++++ .../files/blender-2.79b-ffmpeg-4-compat.patch | 62 ++++ media-gfx/blender/files/blender-2.79b-gcc-8.patch | 22 ++ media-gfx/dmtx-utils/Manifest | 3 + media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild | 30 ++ media-gfx/dmtx-utils/metadata.xml | 21 ++ media-gfx/gifsicle/Manifest | 2 +- media-gfx/gifsicle/gifsicle-1.91.ebuild | 2 +- media-gfx/imagemagick/Manifest | 13 +- ...gick-7.0.8.10-quantum-private-compile-fix.patch | 24 ++ .../imagemagick/files/policy-hardening.snippet | 9 + media-gfx/imagemagick/files/policy.test.xml | 17 ++ .../imagemagick/imagemagick-6.9.10.10-r2.ebuild | 235 +++++++++++++++ media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild | 186 ------------ .../imagemagick/imagemagick-7.0.8.10-r2.ebuild | 243 +++++++++++++++ media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild | 186 ------------ media-gfx/imagemagick/imagemagick-9999.ebuild | 56 +++- media-gfx/kphotoalbum/Manifest | 3 +- .../kphotoalbum/files/kphotoalbum-5.3-gcc8.patch | 29 ++ media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild | 2 + media-gfx/openvdb/Manifest | 13 +- .../files/openvdb-4.0.2-findboost-fix.patch | 16 +- .../files/openvdb-5.1.0-use-gnuinstalldirs.patch | 327 +++++++++++++++++++++ ...1.0-use-pkgconfig-for-ilmbase-and-openexr.patch | 93 ++++++ media-gfx/openvdb/metadata.xml | 9 +- media-gfx/openvdb/openvdb-4.0.2-r1.ebuild | 79 ----- media-gfx/openvdb/openvdb-4.0.2-r2.ebuild | 78 +++++ media-gfx/openvdb/openvdb-4.0.2.ebuild | 2 +- media-gfx/openvdb/openvdb-5.1.0.ebuild | 72 +++++ media-gfx/pngcrush/Manifest | 4 +- media-gfx/pngcrush/metadata.xml | 2 +- media-gfx/pngcrush/pngcrush-1.8.13.ebuild | 4 +- media-gfx/qimgv/Manifest | 4 +- media-gfx/qimgv/metadata.xml | 4 + media-gfx/qimgv/qimgv-0.7.ebuild | 46 +++ 39 files changed, 1717 insertions(+), 488 deletions(-) create mode 100644 media-gfx/blender/blender-2.79b.ebuild create mode 100644 media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch create mode 100644 media-gfx/blender/files/blender-2.79b-gcc-8.patch create mode 100644 media-gfx/dmtx-utils/Manifest create mode 100644 media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild create mode 100644 media-gfx/dmtx-utils/metadata.xml create mode 100644 media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch create mode 100644 media-gfx/imagemagick/files/policy-hardening.snippet create mode 100644 media-gfx/imagemagick/files/policy.test.xml create mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.10-r2.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild create mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.10-r2.ebuild delete mode 100644 media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild create mode 100644 media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch create mode 100644 media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch create mode 100644 media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch delete mode 100644 media-gfx/openvdb/openvdb-4.0.2-r1.ebuild create mode 100644 media-gfx/openvdb/openvdb-4.0.2-r2.ebuild create mode 100644 media-gfx/openvdb/openvdb-5.1.0.ebuild create mode 100644 media-gfx/qimgv/qimgv-0.7.ebuild (limited to 'media-gfx') diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz index 695c48dff94d..c76b44f2e4c9 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 27f461c6de46..d88bfeae4dbd 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -5,10 +5,14 @@ AUX blender-2.72-T42797.diff 342 BLAKE2B 0aa4724ae35004bc629db5c359059d4dd732d4f 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.79-fix-build-with-OSL-1.9.x.patch 1119 BLAKE2B f0289707d5383ee11af257b7d77a725e83aba3c086c12a4a2fb390bb5e02a27c4f3376083ddfd827e3ff3ca24212df4ea463062c6bea524aaee373847837986e SHA512 0a02efdcc6710d34e57ff99ff5c999cebeb7cf130fba76fa82ba29f0827ee63c97448eb01aa10982096d22b61fbc1751be5e1fe3154792e266b0c9dd04c54f42 +AUX blender-2.79b-ffmpeg-4-compat.patch 2052 BLAKE2B 3e9f341416a3dc629d950623cc54da4c2984c7f73b6565cb7cb0aa00bf86eec725f0fdc503a517b29282596669de108d1dbe2c9783c8a0da412a6d14834d5cdf SHA512 afd90ee52a2a7d955417450e92642e2169c1f0e6d20d96a1f08521db718bc224941c15d23152eb3fcde1b4dc84ffb52162d77b23252ef8250a6b5ddbcd8ca67d +AUX blender-2.79b-gcc-8.patch 1259 BLAKE2B 7d204a953c71e656fb309e0560e2de03a9316a95e67a76ecdeb303fadeeca14338ba823d6780a50b62bf4686477a962030b42b15ceae12d48ab21034b0358cc1 SHA512 df0a6a0543a7feac22e6082652792e59ce675dcea99a821c480d5c13e42e9df4d7ab43c71d296a22dd195771714e630757b1e220177d3713f409ea21e9251504 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.79.tar.gz 50145270 BLAKE2B 5c11b36840d4bf4a414f01d1f8efcbfb2879ce56c9e2ebe32d8bb0be3ce29fd194dec8b3aa5bca9bf664804c1be57d01394494fdfebc7a4d8257bd2c47866338 SHA512 9b81c41882f4e150476ebda5b301b78c2d35ea918394c8a01671fc031f7cb7a34b5a3d68b6a345f6d23fd9ecedd25bc0bd24f9f9b3ec771237ac4496bbde7d2f +DIST blender-2.79b.tar.gz 50204270 BLAKE2B 78bda294df783ee9bcbcf32f9a112737b2947da5146fd4351b8b36d81c6630ed0ea302b2fb539642cfbdcc4b64df35af5c8545a3bbf50b1cf87dcf3a60eb4ac0 SHA512 2db21ace446168dd683cdb5aad9dec001f8888ae4e9603a04ddb44fb78489ded827deb07e83712b0f1118a0e7bf66f2a5d935dc4ebb3a6703d72672ff414367f EBUILD blender-2.72b-r4.ebuild 8106 BLAKE2B 32e220cf9afc0219a0b5d4adf14f540f381ac37d64b71be671f6edeb48f6bbf22aa62604fdb229aaa8b115d5a12b907f289e4fe458279eb2d7bbef623858d667 SHA512 068fad5bfd2fe25a5846e00f1a456ceb0e1e828549e537a3cb967cc062639ce6d179b3501504623c5a881ae662c4bba62275a70e148c2f2018eedd17948e4e21 -EBUILD blender-2.79-r1.ebuild 8112 BLAKE2B ea780dff719b0eb541e91614abf926a5d6a14815f78d0f18025f2a25680d5757bccfb2721ebdb71cdd7ae0274620030a9a135a9f3591465a8a126ea169968e39 SHA512 d1bc5fbbb3e157245e9a2446513738692cf64c8a457b99c08ec6d7b79eca9c36473d1c3048dde1d1a60f92a3a9099066491e773acf0fbe488ef3edf9cb7660a5 -EBUILD blender-2.79.ebuild 8061 BLAKE2B b272ffbd61642c168c1b248983a819928eea34fcb4f34c196ce75d92aa65dafe2f1f0cf5f1c823ce9cfa001c5e1758f9752f2a2dbd1081e002cfd1389adbef6d SHA512 5966a1b28386891fb9f2aafa0731fbcf0a69bc9c7ff2cb0ce631c3af3888d88364dd18d31d9a4c4b2e28b64727c3a37b9eaf0f0587f362e9fd27ad83ddfad0dc +EBUILD blender-2.79-r1.ebuild 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee +EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6 +EBUILD blender-2.79b.ebuild 8047 BLAKE2B 0b71da769d5a118f8bc76b8ad58f70a422421db068132e970f953b161f6e5984bc43b016c79ecaf7fd99a02bb3dfcd668cefa5dd8fed6f72f890062d605f042d SHA512 4c52099937783b9b4b6d5924567014214a4e0f1d3664f5f03049f0f9cf8decaf23298b6f6e08e5e4c92406233114f9db7fd25c0f645ee07af3644d208172f70a MISC metadata.xml 3716 BLAKE2B 2c04c8b2724d9153efc0bdf8772b4a107e072a009032d390977f53972fb4afe27eada91da3991f680f41d8114d22a75e84c4f359e00ef2b378e53d7b507a45de SHA512 77866e595fba02c31ac64d9a124af03a6fe9080b27434ea2f93e615c6e702d1a393103d96c361079b1b5af861f0775cc0e57888d23e528e32c326dca7af4c09d diff --git a/media-gfx/blender/blender-2.79-r1.ebuild b/media-gfx/blender/blender-2.79-r1.ebuild index 588dd53d6067..2db487bd238b 100644 --- a/media-gfx/blender/blender-2.79-r1.ebuild +++ b/media-gfx/blender/blender-2.79-r1.ebuild @@ -48,7 +48,7 @@ RDEPEND="${PYTHON_DEPS} 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?] ) + ffmpeg? ( =media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( @@ -74,7 +74,7 @@ RDEPEND="${PYTHON_DEPS} ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( - media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] + =dev-libs/c-blosc-1.5.2 ) diff --git a/media-gfx/blender/blender-2.79.ebuild b/media-gfx/blender/blender-2.79.ebuild index 145205ce35b8..7a99f994dd2f 100644 --- a/media-gfx/blender/blender-2.79.ebuild +++ b/media-gfx/blender/blender-2.79.ebuild @@ -48,7 +48,7 @@ RDEPEND="${PYTHON_DEPS} 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?] ) + ffmpeg? ( =media-video/libav-11.3:=[x264,mp3,encode,theora,jpeg2k?] ) fftw? ( sci-libs/fftw:3.0= ) !headless? ( @@ -74,7 +74,7 @@ RDEPEND="${PYTHON_DEPS} ) opensubdiv? ( >=media-libs/opensubdiv-3.3.0:=[cuda=,opencl=] ) openvdb? ( - media-gfx/openvdb[${PYTHON_USEDEP},abi3-compat(+),openvdb-compression(+)] + =dev-libs/c-blosc-1.5.2 ) diff --git a/media-gfx/blender/blender-2.79b.ebuild b/media-gfx/blender/blender-2.79b.ebuild new file mode 100644 index 000000000000..be1c95be0e8a --- /dev/null +++ b/media-gfx/blender/blender-2.79b.ebuild @@ -0,0 +1,291 @@ +# Copyright 1999-2018 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 eapi7-ver + +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="$(ver_cut 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} + cuda? ( cycles ) + cycles? ( openexr tiff openimageio ) + opencl? ( cycles ) + osl? ( cycles llvm ) + player? ( game-engine !headless )" + +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(-)] + 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} + >=dev-cpp/eigen-3.2.8:3 + virtual/pkgconfig + doc? ( + app-doc/doxygen[-nodot(-),dot(+),latex] + dev-python/sphinx[latex] + ) + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}/${PN}-fix-install-rules.patch" + "${FILESDIR}/${P}-gcc-8.patch" + "${FILESDIR}/${P}-ffmpeg-4-compat.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 + + 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.79b-ffmpeg-4-compat.patch b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch new file mode 100644 index 000000000000..4ad05aafb15d --- /dev/null +++ b/media-gfx/blender/files/blender-2.79b-ffmpeg-4-compat.patch @@ -0,0 +1,62 @@ +diff -urN a/intern/ffmpeg/ffmpeg_compat.h b/intern/ffmpeg/ffmpeg_compat.h +--- a/intern/ffmpeg/ffmpeg_compat.h 2018-03-23 15:22:25.000000000 +0000 ++++ b/intern/ffmpeg/ffmpeg_compat.h 2018-08-16 14:39:23.484489828 +0100 +@@ -109,6 +109,45 @@ + + #endif + ++/* XXX TODO Probably fix to correct modern flags in code? Not sure how old FFMPEG we want to support though, ++ * so for now this will do. */ ++ ++#ifndef FF_MIN_BUFFER_SIZE ++# ifdef AV_INPUT_BUFFER_MIN_SIZE ++# define FF_MIN_BUFFER_SIZE AV_INPUT_BUFFER_MIN_SIZE ++# endif ++#endif ++ ++#ifndef FF_INPUT_BUFFER_PADDING_SIZE ++# ifdef AV_INPUT_BUFFER_PADDING_SIZE ++# define FF_INPUT_BUFFER_PADDING_SIZE AV_INPUT_BUFFER_PADDING_SIZE ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_GLOBAL_HEADER ++# ifdef AV_CODEC_FLAG_GLOBAL_HEADER ++# define CODEC_FLAG_GLOBAL_HEADER AV_CODEC_FLAG_GLOBAL_HEADER ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_DCT ++# ifdef AV_CODEC_FLAG_INTERLACED_DCT ++# define CODEC_FLAG_INTERLACED_DCT AV_CODEC_FLAG_INTERLACED_DCT ++# endif ++#endif ++ ++#ifndef CODEC_FLAG_INTERLACED_ME ++# ifdef AV_CODEC_FLAG_INTERLACED_ME ++# define CODEC_FLAG_INTERLACED_ME AV_CODEC_FLAG_INTERLACED_ME ++# endif ++#endif ++ + /* FFmpeg upstream 1.0 is the first who added AV_ prefix. */ + #if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(54, 59, 100) + # define AV_CODEC_ID_NONE CODEC_ID_NONE +diff -urN a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c +--- a/source/blender/blenkernel/intern/writeffmpeg.c 2018-03-23 15:22:25.000000000 +0000 ++++ b/source/blender/blenkernel/intern/writeffmpeg.c 2018-08-16 14:39:21.702484751 +0100 +@@ -605,7 +605,8 @@ + c->rc_buffer_aggressivity = 1.0; + #endif + +- c->me_method = ME_EPZS; ++ /* Deprecated and not doing anything since July 2015, deleted in recent ffmpeg */ ++ //c->me_method = ME_EPZS; + + codec = avcodec_find_encoder(c->codec_id); + if (!codec) diff --git a/media-gfx/blender/files/blender-2.79b-gcc-8.patch b/media-gfx/blender/files/blender-2.79b-gcc-8.patch new file mode 100644 index 000000000000..3a64ad2f796d --- /dev/null +++ b/media-gfx/blender/files/blender-2.79b-gcc-8.patch @@ -0,0 +1,22 @@ +--- blender-2.79b-orig/intern/cycles/util/util_sseb.h 2018-03-24 02:22:25.000000000 +1100 ++++ blender-2.79b/intern/cycles/util/util_sseb.h 2018-05-30 20:43:33.888717930 +1000 +@@ -116,7 +116,7 @@ + __forceinline const sseb unpackhi( const sseb& a, const sseb& b ) { return _mm_unpackhi_ps(a, b); } + + template __forceinline const sseb shuffle( const sseb& a ) { +- return _mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0)); ++ return _mm_castsi128_ps(_mm_shuffle_epi32(a, _MM_SHUFFLE(i3, i2, i1, i0))); + } + + template<> __forceinline const sseb shuffle<0, 1, 0, 1>( const sseb& a ) { +--- blender-2.79b-orig/intern/itasc/kdl/tree.hpp 2018-03-24 02:22:25.000000000 +1100 ++++ blender-2.79b/intern/itasc/kdl/tree.hpp 2018-05-30 20:33:52.045179988 +1000 +@@ -34,7 +34,7 @@ + //Forward declaration + class TreeElement; + // Eigen allocator is needed for alignment of Eigen data types +- typedef std::map, Eigen::aligned_allocator > > SegmentMap; ++ typedef std::map, Eigen::aligned_allocator > > SegmentMap; + + class TreeElement + { diff --git a/media-gfx/dmtx-utils/Manifest b/media-gfx/dmtx-utils/Manifest new file mode 100644 index 000000000000..1e405c326f31 --- /dev/null +++ b/media-gfx/dmtx-utils/Manifest @@ -0,0 +1,3 @@ +DIST dmtx-utils-0.7.5.tar.gz 54754 BLAKE2B 0eaaa75dd8f650492f790aa960a6df93509e2bf5b1d0dd4b335a418f1524ee633d8d5f087cfef8b8950fc736dbb8ff702561e48506fa1b85d5846cf87601a197 SHA512 915104150d1cc5877d3012cb3934163b4a8e93f8132082835e8d12a8844d29e4afa06d020f5bd79e4bcacb8c153baadf183885619b7c4eb235d8c8c7041d325a +EBUILD dmtx-utils-0.7.5.ebuild 546 BLAKE2B 8a699e4dd6ccbe4e208736e9f2b7c74858fc8f852b7a1b80865017d9c23828bbcd532e5510aeea65134e5a47a8a12b6c0af72c77ee64b0d4af1ef866e701957b SHA512 2c3ceb32ae801fc1d07f349078b6feb4c8dfd5bfd9b3ea81d6c429af54269b3da7203834bcf90982cb4b6add9b19ed32a4c13266e6377a68d65ba4156df79820 +MISC metadata.xml 784 BLAKE2B 6d400f2933a256e39be8ef48286af7273c78d5ea67be927703c82471e0ad19720adc05dcc71e200cb0f373bec626690b38e4021a5d8f0f7509949001f84b87d4 SHA512 3ae4b194dffdc41978674a602861fabe327c9c9955583bb1ceda7910c4fb24563d2c5045c9f5e37a0d0b4f94951aa3b3c9dc7e5fec69a927f30cc180accabedf diff --git a/media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild b/media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild new file mode 100644 index 000000000000..35aad35ab7b6 --- /dev/null +++ b/media-gfx/dmtx-utils/dmtx-utils-0.7.5.ebuild @@ -0,0 +1,30 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +DESCRIPTION="Tools for reading and writing Data Matrix barcodes" +HOMEPAGE="https://github.com/dmtx/dmtx-utils" +SRC_URI="https://github.com/dmtx/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-2.1+" +SLOT="0" +KEYWORDS="~amd64" +IUSE="" + +RDEPEND=" + >=media-gfx/imagemagick-6.2.4:= + >=media-libs/libdmtx-0.7.0 +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" + +src_prepare() { + default + + eautoreconf +} diff --git a/media-gfx/dmtx-utils/metadata.xml b/media-gfx/dmtx-utils/metadata.xml new file mode 100644 index 000000000000..3971294e52ef --- /dev/null +++ b/media-gfx/dmtx-utils/metadata.xml @@ -0,0 +1,21 @@ + + + + + ahippo@yandex.ru + Andrey Mazo + + + proxy-maint@gentoo.org + Proxy Maintainers + + + Tools for reading and writing two-dimensional Data Matrix barcodes. + The tools are based on libdmtx library. + + + dmtx/dmtx-utils + libdmtx + https://github.com/dmtx/dmtx-utils/issues + + diff --git a/media-gfx/gifsicle/Manifest b/media-gfx/gifsicle/Manifest index f7c1be82fc08..b076dff32ae5 100644 --- a/media-gfx/gifsicle/Manifest +++ b/media-gfx/gifsicle/Manifest @@ -3,5 +3,5 @@ DIST gifsicle-1.90.tar.gz 571910 BLAKE2B 607f8ff93818c3ab9d3d74bd7735bcf1bb6412c DIST gifsicle-1.91.tar.gz 571588 BLAKE2B be3973141e57618d50efb5205f79e485a4450ceed02d6c718e49305250941656f0d220c91d2056554348d14348ed1ddf03f0aa9c47e22589994c5e80046422f6 SHA512 49b89e6f99bffd0dd732c920b936c2430a2f4f595d46e41654e5f39f180acaf9b0a4aec6cf52597c470d7c60265f16b730f6ce82e08701a2054fc3d08754c6da EBUILD gifsicle-1.86.ebuild 653 BLAKE2B 2df49285519d1948d5d49f1f5957bf77d25be210057f605e3bb4c79ae9187bcb47f189e0a388384459c78f8d44571d7f72d5cbadaf5b92cecb84afbd597170f2 SHA512 c79392cae433fb0ab41486f8587a50c342c76b899e43a0024ab4ceb1ffda7b6d1fb09faaa0d48335e815368ef3b72b05a37feed56820ba07d406c7d9bc3afe1f EBUILD gifsicle-1.90.ebuild 625 BLAKE2B 8df3dc5fdcb3d648278b9cda9b9525a5e0b3347a18462d0ee3311d2d907f1021497e560106ce4dd1e79a43a9c052365c63de510c32852c14a62c92fc1fa0f31a SHA512 dec6aa40b49711d08671f04054b5b3d98c4ca9e365a736b19d7e97d4fbc033a902ce462dc5bd6125d72c1c039d7b72af3f3a21c3b77bc6192b3945c3a645d894 -EBUILD gifsicle-1.91.ebuild 666 BLAKE2B 6a68025dc18ed43bd278538b041df12316fdf7d329acc84b63c7005cf63493b639fc48464d2b245a1c7c9c6d49fd2c65a0a1a76223d1785e4d1b470c6f07dea2 SHA512 e7ba7a3e15c09649e1f1fb903c8fa517f163c69546a1303782cb287089d835ebbc23cfef0e52fcb5a176fc84184b79ab97c12dd6e858881f9d5c4b8c9ce01a32 +EBUILD gifsicle-1.91.ebuild 665 BLAKE2B ca71e35302445cedad12ae3ba6179c100321cb77e1e66d28030af745055002bb7e213b46a88e00670d0c6a7ddb2df0e68b7a151fd820f0e87cd30695df5a7d51 SHA512 e401bc0507363a0d584995af296d67bda1b111c338e02a217fe9ccf06a26f554eefb6cebd6c7b43761d1791c1aa7d40898b851cbb746f6479c2ce8a81bf91f60 MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f diff --git a/media-gfx/gifsicle/gifsicle-1.91.ebuild b/media-gfx/gifsicle/gifsicle-1.91.ebuild index ef6f6157726f..553981f8938a 100644 --- a/media-gfx/gifsicle/gifsicle-1.91.ebuild +++ b/media-gfx/gifsicle/gifsicle-1.91.ebuild @@ -9,7 +9,7 @@ SRC_URI="https://www.lcdf.org/~eddietwo/${PN}/${P}.tar.gz" LICENSE="GPL-2 MIT" SLOT="0" -KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="X" RDEPEND=" diff --git a/media-gfx/imagemagick/Manifest b/media-gfx/imagemagick/Manifest index af871f7ee236..12ea63d01132 100644 --- a/media-gfx/imagemagick/Manifest +++ b/media-gfx/imagemagick/Manifest @@ -1,6 +1,9 @@ -DIST ImageMagick-6.9.10-8.tar.xz 8909952 BLAKE2B 0868759a5c6982c29d315bda69c1dec3b190fbea3757cf8e368b42976c9f35c4cd53610643e05e8872b0669768206559b2b726b494494f305b71dc2140d7d09c SHA512 63f131d4aa455e3f3a4a891359601d932aa6d43ff22fb9c6bed1a98a1a758da610db90cf951c131aaceabdbc8af0418d1a8e3752cabb39f95735ef18cd6745f2 -DIST ImageMagick-7.0.8-8.tar.xz 8639896 BLAKE2B 5971dbbee9726fab15e19e531bdbb50af710c67be84759030768958a33688b5492bb20758917c976dd9c08307031d041d5de7ae9a2326fecff6ba3a7dc226e84 SHA512 8cc18deb4c14feb71de2624637e1df708ddbcaebd543c03e177a1cfe6c2f63e09af7e787c730f11d3d0332659d2642e5076f6a83f3580f5c0afc8bdb9537733a -EBUILD imagemagick-6.9.10.8.ebuild 5125 BLAKE2B defc438b96f73a2af272220759e0d1e0c510165cb12eb2ffa2fdb8f571ffafb59037c62e92ed3c31f045b77bc90afcc11fc7eced7af39ca17be78df778d7131b SHA512 870751296c3b2e2a399037fa7f9d5206e2bc2e1efd1c0386f7f663c5e79a95ec6bc1011df1716a8da046f6a0c2a49fd2295b5ecacc325b5423e3735c43b31662 -EBUILD imagemagick-7.0.8.8.ebuild 5131 BLAKE2B 20cffac4ad29a620deb03c1a408a0550d191fbe79e05b85c26437298c15c004e1300ef6f6f698b4933fb27b0c059be391b2937e283fb157ee9e90ee53dce8710 SHA512 e21135d9cb19c096a372fe85f05e50f66e31899e77a4a84bdc201f9e924cc2495ed807090b42250612e494a6cc6be221a2852c123493188a5f931c00c794f508 -EBUILD imagemagick-9999.ebuild 5297 BLAKE2B dd922782da40926064b6fdceb7cd0c9cb16f7187ac94ace7aee3c2581bc5d4bc86dd19d4eb9068083d93f401970f2a673af445c589b93ab0709735a67af18b79 SHA512 24762b7a8642ad54f88dabfdf5966b99e406977eafc486544720c466f1eac54e84ab7a496b81d8438e04ff0ad2bb943680c258a37a66cd28b8bd4677aadd7dee +AUX imagemagick-7.0.8.10-quantum-private-compile-fix.patch 778 BLAKE2B c770f89f8b3b0f0505d32ce9c44b1ceac4f6ac817f85e756802c69cc394c3a6001a598bea88e081a461a1f775a7b5ebc4e5a27397186bc940a080ce780580bcf SHA512 cb18f10ebabc1af7065a3df50afcea500c908051fc91946f65b400df138c941c3576671cfa200d7f36ad62baae75198e3d5e4d2e206968da7d641d3de1c95a7f +AUX policy-hardening.snippet 442 BLAKE2B d79fdbddab418fc9d8391e78992e3dda844e096052115113ff6f759c1a54541bcd7d7793547bc7140776659c98379a9e9f004aa46f757300a33f445d396fbf14 SHA512 e9e723c40d5b8c52bbc2f2b9a3ad7c7e2aee493bc37b6c3940e8486b92a1c6659e47b1e12ee2fb11c8a8b6ee48a7fc10354617ae12c36181a58e9e73b239368d +AUX policy.test.xml 746 BLAKE2B 6bfa073606469b81cf517d9b069e48794cbda9272d12c3abb8ae3456aaf30cd1923510baddb7d813aa8ccde84e161de0b29314cef7b1a37730c7ad5236d1f5dc SHA512 22f66004324e3777393446a3df738ecd2aa405df088d39137008514cd86b436765b48ccd4355d670a42061ce4e5a7b2fd8e4be5852cd914f62ff0250a4a7ae57 +DIST ImageMagick-6.9.10-10.tar.xz 8929904 BLAKE2B 937a480554d881da9d477724ed7ff23c185a531778514397a6d46195963eb1449150c4d94fdbaf0798efc509d687a70b9dd999d2d9571ff478643cf754dde822 SHA512 8255db18d1b3ea727be320a643f67c8c27a729738de798c2b64570f9f8a96c74d59922ef85fae88b550e336f640d7d12b079ea354039dc08c4e75643b7e3a38c +DIST ImageMagick-7.0.8-10.tar.xz 8635496 BLAKE2B c9df902b5d582b278b3343c9889b01b921f505bf5686312c30fe55e0b023601ea8a51385a97d92f39d248bb8d57f0e91d163a983cda16f528ab234d53f35118a SHA512 a4869e0a9be5e04c04fcd1fce5c4141d63968ee7f1dd78d84724921f2f088bdcea8c3b3799e1ff555a2a04dec32a1fb7c4a1e6053a6185e9a36c6ae0f1b9c6ed +EBUILD imagemagick-6.9.10.10-r2.ebuild 6484 BLAKE2B 10c1e828767548c122c6d4c57ba5530473a1661debe7a122ff2d05a414c9bdd247f41851e9960c54e97779a9dd33f16e3716f0a64c6c35a490faf8c875e0cadc SHA512 96774194e1d6b17ce3a936dd8a488d6d30c13cdad7097134fb2170b8295d8238e2847cc2bc8169bfecc397aba174575a292c14edfabf2dc1797a069fbc4dab20 +EBUILD imagemagick-7.0.8.10-r2.ebuild 6714 BLAKE2B cae1616f7d5c7f72fb81fc722f75b944d63d5f013a85455c67b0db8ef7d0d3cabb522f077bcb7b6aebd3e98d13201352fa332ade89449ac905cc740ba100e996 SHA512 4d8590bfcf9ae38303cdc402cd3681e0a340301fd78bbd31a7d46e22041979b64a4f829090ab3a4e2a28cf6bdde0c2c3ca4fbccea098b6ad3eb9601c4585fa9e +EBUILD imagemagick-9999.ebuild 6648 BLAKE2B 856d9396231a685d7b17105d69eda477759c1b19229ed787699d76da2c583b9842068dcbee54e5a7449b0a8538c99244f6db0ae22c71a07129193447c414d6b2 SHA512 9203ed62e7f61de14af243d7e38d2e9d8ab87be557467ffb50923f266629c367d923d6525c4939a33466a26b218ac3f35e24fc7f7d6943f27da92f5bf524c5cd MISC metadata.xml 984 BLAKE2B ae695ec1fc34ad3b29269ad21cfb8b79ff6158a2ace9cd4194354448794dc183ac568757d6a7e6c07f31634dfb780e0411a0237b3c106344e6c7c7244a8aee36 SHA512 39a4c5aa27db2de81ad4621bacf43baf96415eecdf836fb2024890634c025b29f2b41dc003ac4d6f87b2365c1a4c68b6af2b9e169b3137bbee3e0a6cb435c5c7 diff --git a/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch b/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch new file mode 100644 index 000000000000..4514dcc7d2c6 --- /dev/null +++ b/media-gfx/imagemagick/files/imagemagick-7.0.8.10-quantum-private-compile-fix.patch @@ -0,0 +1,24 @@ +https://bugs.gentoo.org/664226 + +From 6cc5e2d68431249a647f22e5320f8a0481e3e3f4 Mon Sep 17 00:00:00 2001 +From: Cristy +Date: Wed, 15 Aug 2018 16:59:30 -0400 +Subject: [PATCH] Fix compile exception + +--- + MagickCore/quantum-private.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/MagickCore/quantum-private.h b/MagickCore/quantum-private.h +index e02c70348c..2ff6babb7c 100644 +--- a/MagickCore/quantum-private.h ++++ b/MagickCore/quantum-private.h +@@ -659,7 +659,7 @@ static inline MagickSizeType ScaleQuantumToLongLong(const Quantum quantum) + return(0); + if (quantum >= 18446744073709551615) + return(18446744073709551615); +- return((MagickSizeType (quantum+0.5)); ++ return((MagickSizeType) (quantum+0.5)); + #endif + } + diff --git a/media-gfx/imagemagick/files/policy-hardening.snippet b/media-gfx/imagemagick/files/policy-hardening.snippet new file mode 100644 index 000000000000..c1a91b0b8744 --- /dev/null +++ b/media-gfx/imagemagick/files/policy-hardening.snippet @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/media-gfx/imagemagick/files/policy.test.xml b/media-gfx/imagemagick/files/policy.test.xml new file mode 100644 index 000000000000..6db44b76d252 --- /dev/null +++ b/media-gfx/imagemagick/files/policy.test.xml @@ -0,0 +1,17 @@ + + + + + +]> + + + + + + diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.10-r2.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.10-r2.ebuild new file mode 100644 index 000000000000..970ff4c9a5a9 --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-6.9.10.10-r2.ebuild @@ -0,0 +1,235 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs + +MY_P=ImageMagick-$(ver_rs 3 '-') + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" +SRC_URI="mirror://${PN}/${MY_P}.tar.xz" + +LICENSE="imagemagick" +SLOT="0/${PV}" +KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +RESTRICT="perl? ( userpriv )" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( gnome-base/librsvg ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + virtual/pkgconfig + X? ( x11-base/xorg-proto )" + +REQUIRED_USE="corefonts? ( truetype ) + test? ( corefonts )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local mesa_cards ati_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ + emake check +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "6.9.10.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-6" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild b/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild deleted file mode 100644 index 02f80cc50b4e..000000000000 --- a/media-gfx/imagemagick/imagemagick-6.9.10.8.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local mesa_cards ati_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia** | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.10-r2.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.10-r2.ebuild new file mode 100644 index 000000000000..63922969bc3b --- /dev/null +++ b/media-gfx/imagemagick/imagemagick-7.0.8.10-r2.ebuild @@ -0,0 +1,243 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI="6" + +inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs + +if [[ ${PV} == "9999" ]] ; then + EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" + inherit git-r3 + MY_P="imagemagick-9999" +else + MY_P=ImageMagick-$(ver_rs 3 '-') + SRC_URI="mirror://${PN}/${MY_P}.tar.xz" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + + PATCHES=( "${FILESDIR}"/${P}-quantum-private-compile-fix.patch ) #664226 +fi + +DESCRIPTION="A collection of tools and libraries for many image formats" +HOMEPAGE="https://www.imagemagick.org/" + +LICENSE="imagemagick" +SLOT="0/${PV}" +IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" + +RESTRICT="perl? ( userpriv )" + +RDEPEND=" + dev-libs/libltdl:0 + bzip2? ( app-arch/bzip2 ) + corefonts? ( media-fonts/corefonts ) + djvu? ( app-text/djvu ) + fftw? ( sci-libs/fftw:3.0 ) + fontconfig? ( media-libs/fontconfig ) + fpx? ( >=media-libs/libfpx-1.3.0-r1 ) + graphviz? ( media-gfx/graphviz ) + jbig? ( >=media-libs/jbigkit-2:= ) + jpeg? ( virtual/jpeg:0 ) + jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) + lcms? ( media-libs/lcms:2= ) + lqr? ( media-libs/liblqr ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + pango? ( x11-libs/pango ) + perl? ( >=dev-lang/perl-5.8.8:0= ) + png? ( media-libs/libpng:0= ) + postscript? ( app-text/ghostscript-gpl ) + raw? ( media-libs/libraw:= ) + svg? ( gnome-base/librsvg ) + tiff? ( media-libs/tiff:0= ) + truetype? ( + media-fonts/urw-fonts + >=media-libs/freetype-2 + ) + webp? ( media-libs/libwebp:0= ) + wmf? ( media-libs/libwmf ) + X? ( + x11-libs/libICE + x11-libs/libSM + x11-libs/libXext + x11-libs/libXt + ) + xml? ( dev-libs/libxml2:= ) + lzma? ( app-arch/xz-utils ) + zlib? ( sys-libs/zlib:= )" +DEPEND="${RDEPEND} + !media-gfx/graphicsmagick[imagemagick] + virtual/pkgconfig + X? ( x11-base/xorg-proto )" + +REQUIRED_USE="corefonts? ( truetype ) + test? ( corefonts )" + +S="${WORKDIR}/${MY_P}" + +src_prepare() { + default + + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + + elibtoolize # for Darwin modules + + # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards + shopt -s nullglob + ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') + if test -n "${ati_cards}"; then + addpredict "${ati_cards}" + fi + mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') + if test -n "${mesa_cards}"; then + addpredict "${mesa_cards}" + fi + nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') + if test -n "${nvidia_cards}"; then + addpredict "${nvidia_cards}" + fi + render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') + if test -n "${render_cards}"; then + addpredict "${render_cards}" + fi + shopt -u nullglob + addpredict /dev/nvidiactl +} + +src_configure() { + local depth=16 + use q8 && depth=8 + use q32 && depth=32 + + local openmp=disable + use openmp && { tc-has-openmp && openmp=enable; } + + [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket + + local myeconfargs=( + $(use_enable static-libs static) + $(use_enable hdri) + $(use_enable opencl) + --with-threads + --with-modules + --with-quantum-depth=${depth} + $(use_with cxx magick-plus-plus) + $(use_with perl) + --with-perl-options='INSTALLDIRS=vendor' + --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts + $(use_with bzip2 bzlib) + $(use_with X x) + $(use_with zlib) + --without-autotrace + $(use_with postscript dps) + $(use_with djvu) + --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu + $(use_with fftw) + $(use_with fpx) + $(use_with fontconfig) + $(use_with truetype freetype) + $(use_with postscript gslib) + $(use_with graphviz gvc) + $(use_with jbig) + $(use_with jpeg) + $(use_with jpeg2k openjp2) + $(use_with lcms) + $(use_with lqr) + $(use_with lzma) + $(use_with openexr) + $(use_with pango) + $(use_with png) + $(use_with raw) + $(use_with svg rsvg) + $(use_with tiff) + $(use_with webp) + $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) + $(use_with wmf) + $(use_with xml) + --${openmp}-openmp + --with-gcc-arch=no-automagic + ) + CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" +} + +src_test() { + LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ + emake check +} + +src_install() { + # Ensure documentation installation files and paths with each release! + emake \ + DESTDIR="${D}" \ + DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ + install + + rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} + dodoc {AUTHORS,README}.txt ChangeLog + + if use perl; then + find "${ED}" -type f -name perllocal.pod -exec rm -f {} + + find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + + fi + + find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + + + if use opencl; then + cat <<-EOF > "${T}"/99${PN} + SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" + EOF + + insinto /etc/sandbox.d + doins "${T}"/99${PN} #472766 + fi + + insinto /usr/share/${PN} + doins config/*icm +} + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild b/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild deleted file mode 100644 index 9b07f999f005..000000000000 --- a/media-gfx/imagemagick/imagemagick-7.0.8.8.ebuild +++ /dev/null @@ -1,186 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils flag-o-matic libtool multilib toolchain-funcs eapi7-ver - -MY_P=ImageMagick-$(ver_rs 3 '-') - -DESCRIPTION="A collection of tools and libraries for many image formats" -HOMEPAGE="https://www.imagemagick.org/" -SRC_URI="mirror://${PN}/${MY_P}.tar.xz" - -LICENSE="imagemagick" -SLOT="0/${PV}" -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="bzip2 corefonts cxx djvu fftw fontconfig fpx graphviz hdri jbig jpeg jpeg2k lcms lqr lzma opencl openexr openmp pango perl png postscript q32 q8 raw static-libs svg test tiff truetype webp wmf X xml zlib" - -RESTRICT="perl? ( userpriv )" - -RDEPEND=" - dev-libs/libltdl:0 - bzip2? ( app-arch/bzip2 ) - corefonts? ( media-fonts/corefonts ) - djvu? ( app-text/djvu ) - fftw? ( sci-libs/fftw:3.0 ) - fontconfig? ( media-libs/fontconfig ) - fpx? ( >=media-libs/libfpx-1.3.0-r1 ) - graphviz? ( media-gfx/graphviz ) - jbig? ( >=media-libs/jbigkit-2:= ) - jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( >=media-libs/openjpeg-2.1.0:2 ) - lcms? ( media-libs/lcms:2= ) - lqr? ( media-libs/liblqr ) - opencl? ( virtual/opencl ) - openexr? ( media-libs/openexr:0= ) - pango? ( x11-libs/pango ) - perl? ( >=dev-lang/perl-5.8.8:0= ) - png? ( media-libs/libpng:0= ) - postscript? ( app-text/ghostscript-gpl ) - raw? ( media-libs/libraw:= ) - svg? ( gnome-base/librsvg ) - tiff? ( media-libs/tiff:0= ) - truetype? ( - media-fonts/urw-fonts - >=media-libs/freetype-2 - ) - webp? ( media-libs/libwebp:0= ) - wmf? ( media-libs/libwmf ) - X? ( - x11-libs/libICE - x11-libs/libSM - x11-libs/libXext - x11-libs/libXt - ) - xml? ( dev-libs/libxml2:= ) - lzma? ( app-arch/xz-utils ) - zlib? ( sys-libs/zlib:= )" -DEPEND="${RDEPEND} - !media-gfx/graphicsmagick[imagemagick] - virtual/pkgconfig - X? ( x11-base/xorg-proto )" - -REQUIRED_USE="corefonts? ( truetype ) - test? ( corefonts )" - -S="${WORKDIR}/${MY_P}" - -src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards - default - - elibtoolize # for Darwin modules - - # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 - shopt -s nullglob - ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') - if test -n "${ati_cards}"; then - addpredict "${ati_cards}" - fi - mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g') - if test -n "${mesa_cards}"; then - addpredict "${mesa_cards}" - fi - nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g') - if test -n "${nvidia_cards}"; then - addpredict "${nvidia_cards}" - fi - render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g') - if test -n "${render_cards}"; then - addpredict "${render_cards}" - fi - shopt -u nullglob - addpredict /dev/nvidiactl -} - -src_configure() { - local depth=16 - use q8 && depth=8 - use q32 && depth=32 - - local openmp=disable - use openmp && { tc-has-openmp && openmp=enable; } - - [[ ${CHOST} == *-solaris* ]] && append-ldflags -lnsl -lsocket - - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable hdri) - $(use_enable opencl) - --with-threads - --with-modules - --with-quantum-depth=${depth} - $(use_with cxx magick-plus-plus) - $(use_with perl) - --with-perl-options='INSTALLDIRS=vendor' - --with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts - $(use_with bzip2 bzlib) - $(use_with X x) - $(use_with zlib) - --without-autotrace - $(use_with postscript dps) - $(use_with djvu) - --with-dejavu-font-dir="${EPREFIX}"/usr/share/fonts/dejavu - $(use_with fftw) - $(use_with fpx) - $(use_with fontconfig) - $(use_with truetype freetype) - $(use_with postscript gslib) - $(use_with graphviz gvc) - $(use_with jbig) - $(use_with jpeg) - $(use_with jpeg2k openjp2) - $(use_with lcms) - $(use_with lqr) - $(use_with lzma) - $(use_with openexr) - $(use_with pango) - $(use_with png) - $(use_with raw) - $(use_with svg rsvg) - $(use_with tiff) - $(use_with webp) - $(use_with corefonts windows-font-dir "${EPREFIX}"/usr/share/fonts/corefonts) - $(use_with wmf) - $(use_with xml) - --${openmp}-openmp - --with-gcc-arch=no-automagic - ) - CONFIG_SHELL=$(type -P bash) econf "${myeconfargs[@]}" -} - -src_test() { - LD_LIBRARY_PATH="${S}/coders/.libs:${S}/filters/.libs:${S}/Magick++/lib/.libs:${S}/magick/.libs:${S}/wand/.libs" \ - emake check -} - -src_install() { - # Ensure documentation installation files and paths with each release! - emake \ - DESTDIR="${D}" \ - DOCUMENTATION_PATH="${EPREFIX}"/usr/share/doc/${PF}/html \ - install - - rm -f "${ED%/}"/usr/share/doc/${PF}/html/{ChangeLog,LICENSE,NEWS.txt} - dodoc {AUTHORS,README}.txt ChangeLog - - if use perl; then - find "${ED}" -type f -name perllocal.pod -exec rm -f {} + - find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + - fi - - find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + - - if use opencl; then - cat <<-EOF > "${T}"/99${PN} - SANDBOX_PREDICT="/dev/nvidiactl:/dev/nvidia-uvm:/dev/ati/card:/dev/dri/card:/dev/dri/renderD128" - EOF - - insinto /etc/sandbox.d - doins "${T}"/99${PN} #472766 - fi - - insinto /usr/share/${PN} - doins config/*icm -} diff --git a/media-gfx/imagemagick/imagemagick-9999.ebuild b/media-gfx/imagemagick/imagemagick-9999.ebuild index aa36a8a3e7be..25c4681ac138 100644 --- a/media-gfx/imagemagick/imagemagick-9999.ebuild +++ b/media-gfx/imagemagick/imagemagick-9999.ebuild @@ -1,16 +1,15 @@ # Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI="6" -inherit eutils flag-o-matic libtool multilib toolchain-funcs +inherit eapi7-ver eutils flag-o-matic libtool multilib toolchain-funcs if [[ ${PV} == "9999" ]] ; then EGIT_REPO_URI="https://github.com/ImageMagick/ImageMagick.git" inherit git-r3 MY_P="imagemagick-9999" else - inherit eapi7-ver MY_P=ImageMagick-$(ver_rs 3 '-') SRC_URI="mirror://${PN}/${MY_P}.tar.xz" KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" @@ -74,12 +73,29 @@ REQUIRED_USE="corefonts? ( truetype ) S="${WORKDIR}/${MY_P}" src_prepare() { - local ati_cards mesa_cards nvidia_cards render_cards default + # Apply hardening #664236 + cp "${FILESDIR}"/policy-hardening.snippet "${S}" || die + sed -i -e '/^$/ { + r policy-hardening.snippet + d + }' \ + config/policy.xml || \ + die "Failed to apply hardening of policy.xml" + einfo "policy.xml hardened" + + # Install default (unrestricted) policy in $HOME for test suite #664238 + local _im_local_config_home="${HOME}/.config/ImageMagick" + mkdir -p "${_im_local_config_home}" || \ + die "Failed to create IM config dir in '${_im_local_config_home}'" + cp "${FILESDIR}"/policy.test.xml "${_im_local_config_home}/policy.xml" || \ + die "Failed to install default blank policy.xml in '${_im_local_config_home}'" + elibtoolize # for Darwin modules # For testsuite, see https://bugs.gentoo.org/show_bug.cgi?id=500580#c3 + local ati_cards mesa_cards nvidia_cards render_cards shopt -s nullglob ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g') if test -n "${ati_cards}"; then @@ -191,3 +207,35 @@ src_install() { insinto /usr/share/${PN} doins config/*icm } + +pkg_postinst() { + local _show_policy_xml_notice= + + if [[ -z "${REPLACING_VERSIONS}" ]]; then + # This is a new installation + _show_policy_xml_notice=yes + else + local v + for v in ${REPLACING_VERSIONS}; do + if ! ver_test "${v}" -gt "7.0.8.10-r2"; then + # This is an upgrade + _show_policy_xml_notice=yes + + # Show this elog only once + break + fi + done + fi + + if [[ -n "${_show_policy_xml_notice}" ]]; then + elog "For security reasons, a policy.xml file was installed in /etc/ImageMagick-7" + elog "which will prevent the usage of the following coders by default:" + elog "" + elog " - PS" + elog " - PS2" + elog " - PS3" + elog " - EPS" + elog " - PDF" + elog " - XPS" + fi +} diff --git a/media-gfx/kphotoalbum/Manifest b/media-gfx/kphotoalbum/Manifest index c99230ef9bd2..13e68100075e 100644 --- a/media-gfx/kphotoalbum/Manifest +++ b/media-gfx/kphotoalbum/Manifest @@ -1,3 +1,4 @@ +AUX kphotoalbum-5.3-gcc8.patch 1127 BLAKE2B 6bc06c6b30ef6027199c0ad0dd3bcc539ec191faf71d168afeccf2a019e045508a41190b5b93a735c6cea5a7dcb2052e4b550525707bedbd8973b28e2e090a0f SHA512 1b59fa217efa9f5a784f520d2230785b23825184b89a4e58738c10e41e1a43be2a372fe706ed603e8f42fa15731f4226d4f99cacf460c6d03a1c0437522bdadd DIST kphotoalbum-5.3.tar.xz 11378768 BLAKE2B d71a52fdd5b389bb6353596c50ca4c5e1318128a0158048534512528a9315b7974da2b6685dc26fa74edb5b7f0f399c7910ba2ea5c5bbf50f9b15a7a0a8ebed3 SHA512 8296e9db17d7cc5b34dd29fbe9aeb8f7ab05e286e5d4a692c05f00cd1438dfd32bc48e1c4fd740c5fb932c463ba92fdb0620b9af49d3419ffcfa1354336dd26f -EBUILD kphotoalbum-5.3.ebuild 1617 BLAKE2B 6d28178917522ee8def4d3e2eb0d2612c25b417f14530ec0404ea256ef80aefdaf10db7a6ee3d708f01bc934986e84a5eda1dd1ca17dec4345e632117dcd6d0c SHA512 65baa8ce2fe98469b95964d33c791940320c85ee24d912409e50769dcd1b0150c921a9b36e50954c37fb15fddd22118b64043ec4c8a9d5ed69e987b907f7e3cf +EBUILD kphotoalbum-5.3.ebuild 1660 BLAKE2B 099b204d845146d55eb25cc914dc48d49e7bc0143e216a0c7313f7e4b6a5de458cdf3153b8ebb19473e8d5214f1b17805357f3fbb4498190d9154c8b3a87bc12 SHA512 47d0fee77e027563d5cf1d7a4838493ec4c7fc0ee48e2df66b0c7fdbd013df11654d687b71a1a5cb302bf0f04c3483af19728ad27614b09e63fc3c3244fa5737 MISC metadata.xml 424 BLAKE2B e5e77a618c93044474c0a049bfd37dddbddaaed85bf84fa2e5e7233064176032cc255dbce77607aceca20e431f43f98e29295c977e7841dc86b2c5b286c6df8e SHA512 ec0c2fb381cc5d4b38576c6d5c5b002a07d01027881906bdc1d786311d1d738f6dd67074a6c768a10bbefd3c2c5f01b88bc78cd3456c5884a6d5646593d0dbca diff --git a/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch new file mode 100644 index 000000000000..ce52589b23cc --- /dev/null +++ b/media-gfx/kphotoalbum/files/kphotoalbum-5.3-gcc8.patch @@ -0,0 +1,29 @@ +From 47f4c00adaa442cd03b02d44517b5503718f2813 Mon Sep 17 00:00:00 2001 +From: Christophe Giboudeaux +Date: Tue, 12 Jun 2018 22:52:06 +0200 +Subject: Fix build with Qt 5.11. + +Summary: 'id' is an int, it doesn't need qPrintable. + +Reviewers: johanneszarl + +Differential Revision: https://phabricator.kde.org/D13329 +--- + RemoteControl/RemoteConnection.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/RemoteControl/RemoteConnection.cpp b/RemoteControl/RemoteConnection.cpp +index 1dacb72..8bc18d0 100644 +--- a/RemoteControl/RemoteConnection.cpp ++++ b/RemoteControl/RemoteConnection.cpp +@@ -105,7 +105,7 @@ void RemoteConnection::dataReceived() + std::unique_ptr command = RemoteCommand::create(static_cast(id)); + command->decode(stream); + protocolDebug() << qPrintable(QTime::currentTime().toString(QString::fromUtf8("hh:mm:ss.zzz"))) +- << ": Received " << qPrintable(id); ++ << ": Received " << id; + + emit gotCommand(*command); + } +-- +cgit v0.11.2 diff --git a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild index ad95715accd9..c5416d5f9a77 100644 --- a/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild +++ b/media-gfx/kphotoalbum/kphotoalbum-5.3.ebuild @@ -52,6 +52,8 @@ RDEPEND="${COMMON_DEPEND} DOCS=( ChangeLog README ) +PATCHES=( "${FILESDIR}/${P}-gcc8.patch" ) + src_configure() { append-ldflags -fuse-ld=gold #bug #623566 diff --git a/media-gfx/openvdb/Manifest b/media-gfx/openvdb/Manifest index bdb4846cc28e..586b9ca3ea4a 100644 --- a/media-gfx/openvdb/Manifest +++ b/media-gfx/openvdb/Manifest @@ -1,6 +1,11 @@ -AUX openvdb-4.0.2-findboost-fix.patch 502 BLAKE2B 3840a5f267c27535654c890d877d050618f2263ada690eb7a0549589dfbf9236cae0b4e04abcad9f1bcfed902ec7d742f81b8ac5d9f60dbf1d0fea07c3b9ba13 SHA512 1e7cd905ee941c8713cf527d6c349127e98b7901c9e853c22abfa8ed691b46780c3817ed61815defaa41c1aa7c4f9895de8d08c3bef847c479af30a4b5f137e6 +AUX openvdb-4.0.2-findboost-fix.patch 747 BLAKE2B a9dbded82960113bc3e4f623636d446a3877abf117980abc3660703e513bbebfe70b153d5b216afbebee9ccb7edda0902cbfb88c0e702e0282b9798910e965a3 SHA512 e29ee68ffd907da86d67cf7ca8e2adb955acc1725d5d22be7e1851f2c387e17fb51b46630964e897c3b536be3f05705f86ddd70be53c2329a171a8d23dd7fd4e +AUX openvdb-5.1.0-use-gnuinstalldirs.patch 11555 BLAKE2B 3d5ceba96cbd21d58db9d1b76a5ea93f1b4abdb200875c728910d3872d4bba26d1b3ead21df43aab8d6bb7962d56d2585ffd1ae0995643581e4a5464226f1fa3 SHA512 d4a3383f7c757e3fa1380b33f92b5ba4c34719694608f7b8559d53d6b28c1fc183c873dbf88096bc66cd275302c655b528c801012f6de7609020d10b01a884d2 +AUX openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch 2990 BLAKE2B 4e485c1fd697665949f938f40fe71444c8a2d3dcce7b04a9ebc7142cfd653897c3cc9b23caaf2258c2ee59d1cb36f80aeb7a241f277ab767958af9e692b9bc54 SHA512 c123e51ca0bd6e9f8491fbc1164a5e327672433779a9ce4e607db52a2f2f46c4065ace0ebdf375e0d72be37194186dea360d3f98976cb387ac2dfecfb1eaf0d3 DIST openvdb-4.0.2-patchset-01.tar.xz 16420 BLAKE2B 2f825532d83d3a6756454f164a0608cfa776c1d4472cb4b25e4dad20d3c9648a952deef87ed0e24ce5f7c927c02da8cca76c829eafe1e2bb47fca061541668b3 SHA512 e9399d245d5e2b4130576d688691ac965f031b957df7803b8859f863634b27987c33aabadc5fb463b9d3eec333be84b89cb619dce5bc81c0390d8fb19da830c3 +DIST openvdb-4.0.2-patchset-02.tar.xz 12428 BLAKE2B 2684ddf010df975912fcfc8c4f944d9a9ba447b48750140b6c46db31d49297f7495e5c77e9d5b85af0b2e1d0c4987184865642dc95f1fb3e463e85ee5987d203 SHA512 04377d552e218a8eb31c43381ba32263ba206a0870dccda1bcc031863dfdbcc953da7ea89fd420dc1a338fbd6123ac30bac2039c0a2a01c1fa9253a3fdd0b54d DIST openvdb-4.0.2.tar.gz 1689119 BLAKE2B dbc8d4ab44990440e201327d76bbf9bfe3e8f597505b1d008dedb95dc540277513f465d455079c59820acc5056c9a2edf56235e1097b6c73a1f7dd8c59609c15 SHA512 8e3e12583b81f9b9303b309e839c8321c67b67ff8a0e61bb56c87276bf25c0deff22f5a73c7c5b661b8e5df345bfdabfa6b0aea9bf16fce57d9c53a76751c75d -EBUILD openvdb-4.0.2-r1.ebuild 2002 BLAKE2B 1c1d4ea08177f3d78790501742ab3c6ef41192256cc9f1b99eafa19a66990889e50caac4c66c43834b65fa85e7dcee871c90fa8f0d774c2c3d39bb6745395672 SHA512 c67cb1576bf56eccaee692de2f46bc9998ac4b8c1000fd0f4ce2004b8dd05ae15f46a4a020cf221b9cf25a7fc17cdec8244c501b3617174ef7a8f5b7c053cdab -EBUILD openvdb-4.0.2.ebuild 1953 BLAKE2B 52acb99e6a74fd2cd0ad7b96518b08acc7ed9fce91c1f0a50947cc9624e3663f44284e1def469870efe3f1b368dad2b036de1c7b4ad25c360f057023c6ca4c3e SHA512 b7a1da36eabbdce27090902769c80d9c72f97353e58b30802274a89553268b7916c2895356fa4563cc25829968c1c4dde83a972fdc863aae75bb724d556fd919 -MISC metadata.xml 1049 BLAKE2B ecb29e1aa1c1e507ee1dbd22b736c252f4013f100e6d47400e130335f2ab37877fa9439ddc73d3a585b44a453f125db37693c251424e92adb6dcf9b965d73d96 SHA512 74cf497d6517b8a9d2e0bf59ed642353a58810bab7727ed07192b3aa125d593a86d95399981e2bb9a5fda858428cc1d79f431d02d974da66001f814dbb9b3c08 +DIST openvdb-5.1.0.tar.gz 1739517 BLAKE2B e6ef09497d57dfd2069b8dd22856faa9dcc0591ca844b58c785ad0f2ab5b134d6c5278b0eb1820d2b7802303f1f073aea2380111ebda82ef04d7c503ba1d558b SHA512 c71d040a1862f5e31f084125e9695da3ebf171788956d7d4c16f99ead26a099a81d5a9c30ba2cc61f29e32e21f822796ae34f6c62496050894087735a19489f6 +EBUILD openvdb-4.0.2-r2.ebuild 2057 BLAKE2B 3890a45eeea15b6627e9b616bc98cad4f40e56a0bf756f48d0a98997d010c86c60e8dfaa4b8e0cfb3481c63432535c8963deca40351d1ba98afe030503b1e9be SHA512 6b708c5eb1041dbb0d9e6642db2fc599610cd8ef35b7892d1caf8d4fa3508f8e84a76730bd72c298ca0e1d69be9e19afa51f58f6ec1b0d38f395e6b1b0183136 +EBUILD openvdb-4.0.2.ebuild 1941 BLAKE2B a31708ae94c2e8b19b958878ee0653f4d1b14b5b4fa272b87c749e27d949211701eccc9508e39ac65d7175b0a39ab17b2ff99015fab8d8ace2c9863f1d0d4bec SHA512 33fc77be6833fa19dfc4783782b83182e4f7f3c5ce09e48fce856be6e3b32e937cc8da5ffb962e891c1b5903a10dba530956dd239644d3d010c301f290dc753e +EBUILD openvdb-5.1.0.ebuild 1767 BLAKE2B 53e9e42f11bec0306356000c7ce1e6cf851afc1b555eef5cd7f34a39dd093ad6a9f60965488c6db49d1b261b2c4fa68fe517070ef9c7567fbbfd7ed0b32f2908 SHA512 be1a6f9247a068cdfd9cfcb33776c5ff7e5d3e8f04d346bef9303a59dda7a575c8e6127c127c9a252b242d47648d5394205bddc406e951ea2cf33ed3ebfa7318 +MISC metadata.xml 983 BLAKE2B f6ecf0c7d5bda2e9442636d7482b4c0d6dad309646f7b8a3763ddf905063f3427a79ffacaa70d80b9e85fbe7c0160afe12a5b85011c5c5ad735420c5c419dd71 SHA512 c450db63c1cc834a024acf9e8bfa144d76e1797b354a1f6368be9fdd98fbe4d5602b7431c2d91a0a70a8efa3b3edb09ae666431bb197897263741aa148cd90f4 diff --git a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch index 12245be3e466..fbb29883fe2f 100644 --- a/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch +++ b/media-gfx/openvdb/files/openvdb-4.0.2-findboost-fix.patch @@ -1,11 +1,21 @@ ---- openvdb-4.0.2/openvdb/python/CMakeLists.txt.orig 2018-07-12 20:29:50.745624805 +0200 -+++ openvdb-4.0.2/openvdb/python/CMakeLists.txt 2018-07-12 20:30:10.452305180 +0200 +diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt +--- a/openvdb/python/CMakeLists.txt 2017-07-31 19:16:32.000000000 +0100 ++++ b/openvdb/python/CMakeLists.txt 2018-08-11 12:37:40.179360277 +0100 @@ -3,7 +3,7 @@ FIND_PACKAGE ( PythonInterp REQUIRED ) FIND_PACKAGE ( PythonLibs REQUIRED ) -FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python ) -+FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}${PYTHON_VERSION_MINOR} ) ++FIND_PACKAGE ( Boost ${MINIMUM_BOOST_VERSION} REQUIRED COMPONENTS python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR} ) IF ( NOT OPENVDB_BUILD_CORE ) +@@ -92,7 +92,7 @@ + ${GLFW_LINK_LIBRARY} + ${GLFW_DEPENDENT_LIBRARIES} + ${GLEW_GLEW_LIBRARY} +- ${Boost_PYTHON_LIBRARY} ++ ${Boost_LIBRARIES} + ${PYTHON_LIBRARY} + ${Ilmbase_HALF_LIBRARY} + ) diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch new file mode 100644 index 000000000000..791e05578729 --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-5.1.0-use-gnuinstalldirs.patch @@ -0,0 +1,327 @@ +diff -urN a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake +--- a/cmake/FindBlosc.cmake 2018-04-10 19:22:17.000000000 +0100 ++++ b/cmake/FindBlosc.cmake 2018-08-07 21:01:16.869879255 +0100 +@@ -37,7 +37,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH( BLOSC_LOCATION include/blosc.h ++FIND_PATH( BLOSC_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/blosc.h + "$ENV{BLOSC_ROOT}" + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH +@@ -49,7 +49,7 @@ + + IF ( BLOSC_FOUND ) + +- SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/lib ++ SET ( BLOSC_LIBRARYDIR ${BLOSC_LOCATION}/${CMAKE_INSTALL_LIBDIR} + CACHE STRING "Blosc library directories") + + SET ( _blosc_library_name "blosc" ) +@@ -75,6 +75,6 @@ + SET( CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES_BACKUP} ) + ENDIF() + +- SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/include" CACHE STRING "Blosc include directory" ) ++ SET( BLOSC_INCLUDE_DIR "${BLOSC_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "Blosc include directory" ) + + ENDIF ( BLOSC_FOUND ) +diff -urN a/cmake/FindCPPUnit.cmake b/cmake/FindCPPUnit.cmake +--- a/cmake/FindCPPUnit.cmake 2018-04-10 19:22:17.000000000 +0100 ++++ b/cmake/FindCPPUnit.cmake 2018-08-07 21:02:15.421037954 +0100 +@@ -38,7 +38,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH( CPPUNIT_LOCATION include/cppunit/Test.h ++FIND_PATH( CPPUNIT_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/cppunit/Test.h + "$ENV{CPPUNIT_ROOT}" + NO_DEFAULT_PATH + NO_CMAKE_ENVIRONMENT_PATH +@@ -53,13 +53,13 @@ + + IF ( CPPUNIT_FOUND ) + +- SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/include" CACHE STRING "CPPUNIT include directory") ++ SET( CPPUNIT_INCLUDE_DIR "${CPPUNIT_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "CPPUNIT include directory") + IF (CPPUnit_USE_STATIC_LIBS) + SET( CPPUNIT_LIBRARY_NAME libcppunit.a) + ELSE () + SET( CPPUNIT_LIBRARY_NAME cppunit) + ENDIF () + FIND_LIBRARY ( CPPUnit_cppunit_LIBRARY ${CPPUNIT_LIBRARY_NAME} +- PATHS ${CPPUNIT_LOCATION}/lib ) ++ PATHS ${CPPUNIT_LOCATION}/${CMAKE_INSTALL_LIBDIR} ) + + ENDIF ( CPPUNIT_FOUND ) +diff -urN a/cmake/FindGLEW.cmake b/cmake/FindGLEW.cmake +--- a/cmake/FindGLEW.cmake 2018-04-10 19:22:17.000000000 +0100 ++++ b/cmake/FindGLEW.cmake 2018-08-07 21:04:32.804431135 +0100 +@@ -39,7 +39,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH( GLEW_LOCATION include/GL/glew.h ++FIND_PATH( GLEW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glew.h + "$ENV{GLEW_ROOT}" + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH +@@ -51,7 +51,7 @@ + + IF ( GLEW_LOCATION ) + +- SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/include" CACHE STRING "GLEW include path") ++ SET( GLEW_INCLUDE_DIR "${GLEW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLEW include path") + + SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + IF (GLEW_USE_STATIC_LIBS) +@@ -74,11 +74,11 @@ + FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEW32MXS PATHS ${GLEW_LOCATION}/lib ) + ELSE (APPLE) + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") +- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib ++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib ++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +@@ -107,11 +107,11 @@ + ) + ELSE (APPLE) + # Unices +- FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/lib ++ FIND_LIBRARY ( GLEW_LIBRARY_PATH GLEW PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +- FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/lib ++ FIND_LIBRARY ( GLEWmx_LIBRARY_PATH GLEWmx PATHS ${GLEW_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +diff -urN a/cmake/FindGLFW3.cmake b/cmake/FindGLFW3.cmake +--- a/cmake/FindGLFW3.cmake 2018-04-10 19:22:17.000000000 +0100 ++++ b/cmake/FindGLFW3.cmake 2018-08-07 21:07:24.458954825 +0100 +@@ -39,7 +39,7 @@ + + FIND_PACKAGE ( PackageHandleStandardArgs ) + +-FIND_PATH( GLFW3_LOCATION include/GLFW/glfw3.h ++FIND_PATH( GLFW3_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GLFW/glfw3.h + "$ENV{GLFW3_ROOT}" + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH +@@ -50,9 +50,9 @@ + ) + + IF (GLFW3_FOUND) +- SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/include" CACHE STRING "GLFW3 include path") ++ SET( GLFW3_INCLUDE_DIR "${GLFW3_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW3 include path") + IF (GLFW3_USE_STATIC_LIBS) +- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/lib ++ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw3 ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_DEFAULT_PATH + NO_CMAKE_ENVIRONMENT_PATH + NO_CMAKE_PATH +@@ -60,7 +60,7 @@ + NO_CMAKE_SYSTEM_PATH + ) + ELSE (GLFW3_USE_STATIC_LIBS) +- FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/lib ++ FIND_LIBRARY ( GLFW3_glfw_LIBRARY glfw ${GLFW3_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_DEFAULT_PATH + NO_CMAKE_ENVIRONMENT_PATH + NO_CMAKE_PATH +diff -urN a/cmake/FindGLFW.cmake b/cmake/FindGLFW.cmake +--- a/cmake/FindGLFW.cmake 2018-04-10 19:22:17.000000000 +0100 ++++ b/cmake/FindGLFW.cmake 2018-08-07 21:06:26.358774164 +0100 +@@ -38,12 +38,12 @@ + + SET ( GLFW_FOUND FALSE ) + +-FIND_PATH( GLFW_LOCATION include/GL/glfw.h ++FIND_PATH( GLFW_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/GL/glfw.h + "$ENV{GLFW_ROOT}" + NO_SYSTEM_ENVIRONMENT_PATH + ) + +-SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/include" CACHE STRING "GLFW include path") ++SET( GLFW_INCLUDE_DIR "${GLFW_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "GLFW include path") + + SET ( ORIGINAL_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES}) + IF (GLFW_USE_STATIC_LIBS) +@@ -61,7 +61,7 @@ + FIND_LIBRARY ( GLFW_LIBRARY_PATH GLFW32S PATHS ${GLFW_LOCATION}/lib ) + ELSE (APPLE) + SET(CMAKE_FIND_LIBRARY_SUFFIXES ".a") +- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64 ++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH + ) +@@ -84,7 +84,7 @@ + ) + ELSE (APPLE) + # Unices +- FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/lib ${GLFW_LOCATION}/lib64 ++ FIND_LIBRARY ( GLFW_LIBRARY_PATH glfw PATHS ${GLFW_LOCATION}/${CMAKE_INSTALL_LIBDIR} + NO_SYSTEM_ENVIRONMENT_PATH + ) + ENDIF (APPLE) +diff -urN a/cmake/FindOpenVDB.cmake b/cmake/FindOpenVDB.cmake +--- a/cmake/FindOpenVDB.cmake 2018-04-10 19:22:17.000000000 +0100 ++++ b/cmake/FindOpenVDB.cmake 2018-08-07 21:10:41.640588458 +0100 +@@ -45,7 +45,7 @@ + + FIND_PACKAGE( PackageHandleStandardArgs ) + +-FIND_PATH( OPENVDB_LOCATION include/openvdb/version.h ++FIND_PATH( OPENVDB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/openvdb/version.h + "$ENV{OPENVDB_ROOT}" + NO_DEFAULT_PATH + NO_SYSTEM_ENVIRONMENT_PATH +@@ -56,10 +56,10 @@ + ) + + IF( OpenVDB_FOUND ) +- SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/include ++ SET( OpenVDB_INCLUDE_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR} + CACHE PATH "OpenVDB include directory") + +- SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/lib ++ SET( OpenVDB_LIBRARY_DIR ${OPENVDB_LOCATION}/${CMAKE_INSTALL_LIBDIR} + CACHE PATH "OpenVDB library directory" ) + + FIND_LIBRARY( OpenVDB_OPENVDB_LIBRARY openvdb +diff -urN a/cmake/FindTBB.cmake b/cmake/FindTBB.cmake +--- a/cmake/FindTBB.cmake 2018-04-10 19:22:17.000000000 +0100 ++++ b/cmake/FindTBB.cmake 2018-08-07 21:11:48.477809067 +0100 +@@ -42,7 +42,7 @@ + + # SET ( TBB_FOUND FALSE ) + +-FIND_PATH( TBB_LOCATION include/tbb/tbb.h ++FIND_PATH( TBB_LOCATION ${CMAKE_INSTALL_INCLUDEDIR}/tbb/tbb.h + "$ENV{TBB_ROOT}" + NO_DEFAULT_PATH + NO_CMAKE_ENVIRONMENT_PATH +@@ -57,7 +57,7 @@ + + IF ( TBB_FOUND ) + +- SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/include" CACHE STRING "TBB include directory") ++ SET( TBB_INCLUDE_DIR "${TBB_LOCATION}/${CMAKE_INSTALL_INCLUDEDIR}" CACHE STRING "TBB include directory") + + IF (APPLE) + IF (TBB_FOR_CLANG) +@@ -86,7 +86,7 @@ + LIST ( APPEND TBB_LIBRARIES_LIST ${TBB_LIBRARY_PATH} ${TBBmx_LIBRARY_PATH} ) + ELSE (APPLE) + # MESSAGE ( "CMAKE_COMPILER_IS_GNUCXX = ${CMAKE_COMPILER_IS_GNUCXX}") +- SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/lib CACHE STRING "TBB library directory") ++ SET ( TBB_LIBRARYDIR ${TBB_LOCATION}/${CMAKE_INSTALL_LIBDIR} CACHE STRING "TBB library directory") + IF (${CMAKE_COMPILER_IS_GNUCXX}) + IF ( TBB_MATCH_COMPILER_VERSION ) + STRING(REGEX MATCHALL "[0-9]+" GCC_VERSION_COMPONENTS ${CMAKE_CXX_COMPILER_VERSION}) +diff -urN a/CMakeLists.txt b/CMakeLists.txt +--- a/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100 ++++ b/CMakeLists.txt 2018-08-07 20:59:54.149613568 +0100 +@@ -32,6 +32,8 @@ + + ENABLE_TESTING() + ++INCLUDE ( GNUInstallDirs ) ++ + find_program(CCACHE_FOUND ccache) + if(CCACHE_FOUND) + set_property(GLOBAL PROPERTY RULE_LAUNCH_COMPILE ccache) +diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt +--- a/openvdb/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100 ++++ b/openvdb/CMakeLists.txt 2018-08-07 21:21:02.352705838 +0100 +@@ -414,7 +414,7 @@ + ) + + INSTALL ( CODE "EXECUTE_PROCESS(COMMAND \"${CMAKE_COMMAND}\" --build \"${PROJECT_BINARY_DIR}\" --target doc)") +- INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION docs) ++ INSTALL ( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doc/html DESTINATION ${CMAKE_INSTALL_DOCDIR}) + + ENDIF () + +@@ -423,37 +423,37 @@ + INSTALL ( TARGETS + vdb_view + DESTINATION +- bin ++ ${CMAKE_INSTALL_BINDIR} + ) + ENDIF () + INSTALL ( TARGETS + vdb_print + vdb_render + DESTINATION +- bin ++ ${CMAKE_INSTALL_BINDIR} + ) + + INSTALL ( TARGETS + openvdb_static + DESTINATION +- lib ++ ${CMAKE_INSTALL_LIBDIR} + ) + + IF (WIN32) + INSTALL ( TARGETS + openvdb_shared +- RUNTIME DESTINATION bin COMPONENT Runtime +- ARCHIVE DESTINATION lib COMPONENT Runtime ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR} COMPONENT Runtime + ) + ELSE() + INSTALL ( TARGETS + openvdb_shared + DESTINATION +- lib ++ ${CMAKE_INSTALL_LIBDIR} + ) + ENDIF () + +-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include ++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h" + PATTERN "python" EXCLUDE + PATTERN "cmd" EXCLUDE +diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt +--- a/openvdb/python/CMakeLists.txt 2018-04-10 19:22:17.000000000 +0100 ++++ b/openvdb/python/CMakeLists.txt 2018-08-07 21:20:56.549685541 +0100 +@@ -54,10 +54,12 @@ + pyVec3Grid.cc + ) + +-SET ( PYOPENVDB_INSTALL_DIRECTORY +- lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR} +- CACHE STRING "The directory to install the pyopenvdb.so module." +- ) ++IF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY ) ++ SET ( PYOPENVDB_INSTALL_DIRECTORY ++ lib/python${OPENVDB_PYTHON_VERSION_MAJOR}.${OPENVDB_PYTHON_VERSION_MINOR} ++ CACHE STRING "The directory to install the pyopenvdb.so module." ++ ) ++ENDIF ( NOT DEFINED PYOPENVDB_INSTALL_DIRECTORY ) + + SET_SOURCE_FILES_PROPERTIES ( ${OPENVDB_PYTHON_MODULE_SOURCE_FILES} + PROPERTIES +@@ -110,6 +112,6 @@ + ${PYOPENVDB_INSTALL_DIRECTORY} + ) + +-INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION include ++INSTALL ( DIRECTORY ${PROJECT_SOURCE_DIR} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} + FILES_MATCHING PATTERN "*.h" + ) diff --git a/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch new file mode 100644 index 000000000000..c2ecac0bf82d --- /dev/null +++ b/media-gfx/openvdb/files/openvdb-5.1.0-use-pkgconfig-for-ilmbase-and-openexr.patch @@ -0,0 +1,93 @@ +diff -urN a/openvdb/CMakeLists.txt b/openvdb/CMakeLists.txt +--- a/openvdb/CMakeLists.txt 2018-08-07 21:21:02.000000000 +0100 ++++ b/openvdb/CMakeLists.txt 2018-08-07 21:47:02.355277361 +0100 +@@ -83,11 +83,12 @@ + ADD_DEFINITIONS ( -DBOOST_ALL_NO_LIB ) + ENDIF () + ++FIND_PACKAGE ( PkgConfig REQUIRED ) + FIND_PACKAGE ( Blosc REQUIRED ) + FIND_PACKAGE ( TBB REQUIRED ) + FIND_PACKAGE ( ZLIB REQUIRED ) +-FIND_PACKAGE ( ILMBase REQUIRED ) +-FIND_PACKAGE ( OpenEXR REQUIRED ) ++PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase ) ++PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR ) + FIND_PACKAGE ( OpenGL REQUIRED ) + IF (OPENVDB_BUILD_DOCS) + FIND_PACKAGE ( Doxygen REQUIRED ) +@@ -111,8 +112,8 @@ + INCLUDE_DIRECTORIES ( SYSTEM ${ZLIB_INCLUDE_DIR} ) + ENDIF () + +-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} ) +-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} ) ++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} ) ++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} ) + INCLUDE_DIRECTORIES ( SYSTEM ${GLFW_INCLUDE_DIRECTORY} ) + + IF (WIN32) +@@ -184,7 +185,7 @@ + ${Boost_IOSTREAMS_LIBRARY} + ${Boost_SYSTEM_LIBRARY} + ${Tbb_TBB_LIBRARY} +- ${Ilmbase_HALF_LIBRARY} ++ ${ILMBASE_LIBS_LDFLAGS} + ${ZLIB_LIBRARY} + ${BLOSC_blosc_LIBRARY} + ) +@@ -192,7 +193,7 @@ + ${Boost_IOSTREAMS_LIBRARY} + ${Boost_SYSTEM_LIBRARY} + ${Tbb_TBB_LIBRARY} +- ${Ilmbase_HALF_LIBRARY} ++ ${ILMBASE_LIBS_LDFLAGS} + ${ZLIB_LIBRARY} + ${BLOSC_blosc_LIBRARY} + ) +@@ -246,9 +247,8 @@ + openvdb_shared + ${CMAKE_THREAD_LIBS_INIT} + ${BLOSC_blosc_LIBRARY} +- ${Openexr_ILMIMF_LIBRARY} +- ${Ilmbase_ILMTHREAD_LIBRARY} +- ${Ilmbase_IEX_LIBRARY} ++ ${OPENEXR_LIBS_LDFLAGS} ++ ${ILMBASE_LIBS_LDFLAGS} + m + stdc++ + ) +diff -urN a/openvdb/python/CMakeLists.txt b/openvdb/python/CMakeLists.txt +--- a/openvdb/python/CMakeLists.txt 2018-08-07 21:20:56.000000000 +0100 ++++ b/openvdb/python/CMakeLists.txt 2018-08-07 21:31:55.508016795 +0100 +@@ -9,8 +9,8 @@ + IF ( NOT OPENVDB_BUILD_CORE ) + FIND_PACKAGE ( OpenVDB REQUIRED ) + +- FIND_PACKAGE ( ILMBase REQUIRED ) +- FIND_PACKAGE ( OpenEXR REQUIRED ) ++ PKG_CHECK_MODULES ( ILMBASE_LIBS REQUIRED IlmBase ) ++ PKG_CHECK_MODULES ( OPENEXR_LIBS REQUIRED OpenEXR ) + FIND_PACKAGE ( Blosc REQUIRED ) + FIND_PACKAGE ( TBB REQUIRED ) + FIND_PACKAGE ( ZLIB REQUIRED ) +@@ -29,8 +29,8 @@ + SET ( OPENVDB_LIB openvdb_shared) + ENDIF ( NOT OPENVDB_BUILD_CORE ) + +-INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_INCLUDE_DIRS} ) +-INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_INCLUDE_DIRS} ) ++INCLUDE_DIRECTORIES ( SYSTEM ${ILMBASE_LIBS_INCLUDE_DIRS} ) ++INCLUDE_DIRECTORIES ( SYSTEM ${OPENEXR_LIBS_INCLUDE_DIRS} ) + INCLUDE_DIRECTORIES ( SYSTEM ${Boost_INCLUDE_DIR} ) + INCLUDE_DIRECTORIES ( SYSTEM ${BLOSC_INCLUDE_DIR} ) + INCLUDE_DIRECTORIES ( SYSTEM ${TBB_INCLUDE_DIR} ) +@@ -96,7 +96,7 @@ + ${GLEW_GLEW_LIBRARY} + ${Boost_PYTHON_LIBRARY} + ${PYTHON_LIBRARY} +- ${Ilmbase_HALF_LIBRARY} ++ ${ILMBASE_LIBS_LDFLAGS} + ) + + SET_TARGET_PROPERTIES ( pyopenvdb PROPERTIES diff --git a/media-gfx/openvdb/metadata.xml b/media-gfx/openvdb/metadata.xml index 806981efae06..71a04b9d558d 100644 --- a/media-gfx/openvdb/metadata.xml +++ b/media-gfx/openvdb/metadata.xml @@ -1,11 +1,11 @@ - + dracwyrm@gentoo.org Jonathan Scruggs - + agrigo2001@yahoo.com.au Adrian Grigo @@ -19,9 +19,8 @@ Chance of Meatballs2' and 'How to Train Your Dragon 2'. - - Enables compatibility with the old 3.x ABI. - enabled by dfault. + + Disables newer features to maintain compatibility with ABI3. Enabled by default. diff --git a/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild deleted file mode 100644 index 82941626ec77..000000000000 --- a/media-gfx/openvdb/openvdb-4.0.2-r1.ebuild +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) - -inherit cmake-utils flag-o-matic python-single-r1 - -DESCRIPTION="Libs for the efficient manipulation of volumetric data" -HOMEPAGE="http://www.openvdb.org" -SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz - https://github.com/dracwyrm/gentoo-patches/raw/master/${PN}/${P}-patchset-01.tar.xz" - -LICENSE="MPL-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" -IUSE="+abi3-compat doc python" -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -RDEPEND=" - >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] - >=dev-libs/c-blosc-1.5.0 - dev-libs/jemalloc - dev-libs/log4cplus - media-libs/glfw:= - media-libs/openexr:= - sys-libs/zlib:= - x11-libs/libXcursor - x11-libs/libXi - x11-libs/libXinerama - x11-libs/libXrandr - python? ( - ${PYTHON_DEPS} - dev-python/numpy[${PYTHON_USEDEP}] - )" - -DEPEND="${RDEPEND} - dev-cpp/tbb - virtual/pkgconfig - doc? ( app-doc/doxygen[latex] )" - -RESTRICT="test" - -PATCHES=( - "${WORKDIR}/0001-Change-hardcoded-paths-to-GNUInstallDirs-variables.patch" - "${WORKDIR}/0002-Use-PkgConfig-to-find-IlmBase-and-OpenEXR.patch" - "${WORKDIR}/0003-Boost-1.65-NumPy-support.patch" - "${FILESDIR}/${P}-findboost-fix.patch" -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_configure() { - local myprefix="${EPREFIX}/usr/" - - # To stay in sync with Boost - append-cxxflags -std=c++14 - - local mycmakeargs=( - -DBLOSC_LOCATION="${myprefix}" - -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" - -DGLEW_LOCATION="${myprefix}" - -DGLFW3_LOCATION="${myprefix}" - -DOPENVDB_BUILD_DOCS=$(usex doc) - -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) - -DOPENVDB_BUILD_UNITTESTS=OFF - -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat) - -DOPENVDB_ENABLE_RPATH=OFF - -DTBB_LOCATION="${myprefix}" - -DUSE_GLFW3=ON - ) - - use python && mycmakeargs+=( -DPYOENVDB_INSTALL_DIRECTORY=${python_get_sitedir} ) - - cmake-utils_src_configure -} diff --git a/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild new file mode 100644 index 000000000000..73415cb7ea20 --- /dev/null +++ b/media-gfx/openvdb/openvdb-4.0.2-r2.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit cmake-utils flag-o-matic python-single-r1 + +DESCRIPTION="Libs for the efficient manipulation of volumetric data" +HOMEPAGE="http://www.openvdb.org" +SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~dracwyrm/patches/${P}-patchset-02.tar.xz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="+abi3-compat doc python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] + >=dev-libs/c-blosc-1.5.0 + dev-libs/jemalloc + dev-libs/log4cplus + media-libs/glfw:= + media-libs/openexr:= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + python? ( + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + )" + +DEPEND="${RDEPEND} + dev-cpp/tbb + virtual/pkgconfig + doc? ( app-doc/doxygen[latex] ) + test? ( dev-util/cppunit )" + +PATCHES=( + "${WORKDIR}/${P}-patchset-02/0001-use-gnuinstalldirs.patch" + "${WORKDIR}/${P}-patchset-02/0002-use-pkgconfig-for-ilmbase-and-openexr.patch" + "${WORKDIR}/${P}-patchset-02/0003-boost-1.65-numpy-support.patch" + "${FILESDIR}/${P}-findboost-fix.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + # To stay in sync with Boost + append-cxxflags -std=c++14 + + local mycmakeargs=( + -DBLOSC_LOCATION="${myprefix}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DGLFW3_LOCATION="${myprefix}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_ENABLE_3_ABI_COMPATIBLE=$(usex abi3-compat) + -DOPENVDB_ENABLE_RPATH=OFF + -DTBB_LOCATION="${myprefix}" + -DUSE_GLFW3=ON + ) + + use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" ) + use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" ) + + cmake-utils_src_configure +} diff --git a/media-gfx/openvdb/openvdb-4.0.2.ebuild b/media-gfx/openvdb/openvdb-4.0.2.ebuild index 24ec7fce3e5b..97720b303f01 100644 --- a/media-gfx/openvdb/openvdb-4.0.2.ebuild +++ b/media-gfx/openvdb/openvdb-4.0.2.ebuild @@ -4,7 +4,7 @@ EAPI=6 PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) -inherit cmake-utils flag-o-matic python-single-r1 versionator +inherit cmake-utils flag-o-matic python-single-r1 DESCRIPTION="Libs for the efficient manipulation of volumetric data" HOMEPAGE="http://www.openvdb.org" diff --git a/media-gfx/openvdb/openvdb-5.1.0.ebuild b/media-gfx/openvdb/openvdb-5.1.0.ebuild new file mode 100644 index 000000000000..c93ccbfb9404 --- /dev/null +++ b/media-gfx/openvdb/openvdb-5.1.0.ebuild @@ -0,0 +1,72 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +PYTHON_COMPAT=( python{2_7,3_5,3_6} ) + +inherit cmake-utils flag-o-matic python-single-r1 + +DESCRIPTION="Libs for the efficient manipulation of volumetric data" +HOMEPAGE="http://www.openvdb.org" +SRC_URI="https://github.com/dreamworksanimation/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="MPL-2.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="doc python test" +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" + +RDEPEND=" + >=dev-libs/boost-1.62:=[python?,${PYTHON_USEDEP}] + >=dev-libs/c-blosc-1.5.0 + dev-libs/jemalloc + dev-libs/log4cplus + media-libs/glfw:= + media-libs/openexr:= + sys-libs/zlib:= + x11-libs/libXcursor + x11-libs/libXi + x11-libs/libXinerama + x11-libs/libXrandr + python? ( + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + )" + +DEPEND="${RDEPEND} + dev-cpp/tbb + virtual/pkgconfig + doc? ( app-doc/doxygen[latex] ) + test? ( dev-util/cppunit )" + +PATCHES=( + "${FILESDIR}/${PN}-4.0.2-findboost-fix.patch" + "${FILESDIR}/${P}-use-gnuinstalldirs.patch" + "${FILESDIR}/${P}-use-pkgconfig-for-ilmbase-and-openexr.patch" +) + +pkg_setup() { + use python && python-single-r1_pkg_setup +} + +src_configure() { + local myprefix="${EPREFIX}/usr/" + + local mycmakeargs=( + -DBLOSC_LOCATION="${myprefix}" + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DGLFW3_LOCATION="${myprefix}" + -DOPENVDB_BUILD_DOCS=$(usex doc) + -DOPENVDB_BUILD_PYTHON_MODULE=$(usex python) + -DOPENVDB_BUILD_UNITTESTS=$(usex test) + -DOPENVDB_ENABLE_RPATH=OFF + -DTBB_LOCATION="${myprefix}" + -DUSE_GLFW3=ON + ) + + use python && mycmakeargs+=( -DPYOPENVDB_INSTALL_DIRECTORY="$(python_get_sitedir)" ) + use test && mycmakeargs+=( -DCPPUNIT_LOCATION="${myprefix}" ) + + cmake-utils_src_configure +} diff --git a/media-gfx/pngcrush/Manifest b/media-gfx/pngcrush/Manifest index c4c3a09e00aa..b00acee3ce2a 100644 --- a/media-gfx/pngcrush/Manifest +++ b/media-gfx/pngcrush/Manifest @@ -1,4 +1,4 @@ DIST pngcrush-1.8.13-nolib.tar.xz 66104 BLAKE2B dad0bce2e8f2a135d085343da98ebecfb78a6b05019d43be1b0b1f940ce23ffa980bcb08e8948b6b8cc3efc04bc6ae92a0b9cf8ea8183e27eebfae4c6c48e31e SHA512 c073d573e9b13b72fa39b178271ce65d1a19fef35943ef0a9e6121a5c66d9db212aaad38ab777c5b44e20a107eb677003acbdb4a354bcb2dc40f535a97d9df0e DIST pngcrush-1.8.13.tar.xz 404564 BLAKE2B 6e3e9556b40f5616a488cd4d0fbbe788b31d965b748222383741e9dc0c8fe7c12880b2d2a39ef35aa41adbab1fa9f49e7272dadfbe74cc712a7b810a9787d9af SHA512 5fdb7913ec8c90af63d68477f4031c9008dac0d7f4bfd7bd47e971d218e3ef8b0e1a8bf6ba0f5d2cc4c2682c9297efb4f738b11538ad306eee5d01277ce3f628 -EBUILD pngcrush-1.8.13.ebuild 855 BLAKE2B 2e02402be63dee0ed0f80789b6e990b0f9d57ca05b20896bdb615f36a04a3123cf7860a79de08a8a6e5ff5b7f856cd9dd990a8b053cd4c9d38fc39e6603dd488 SHA512 113f5d242a72fa5cc301e4a9a7091ffa10a286a6e4b2bc6cea5eb079d74864a506fb792965b585547dd50e3e829aaf73213a53c920b2bd0ec254f41546084350 -MISC metadata.xml 635 BLAKE2B 47067a40efa72a4bb01c44944e50499db20b2aa23fe9faacdbf60702cd2c895f81bc8e335c540bbf7106b77ef2699ff41a98932bd1f2728ee3bb399a03bd6175 SHA512 9821899ae557a075512ff8764ca0b44212cc1ca4b64ba92e99ae6d2785154ea18ed70cb8b702b2f1460951a563235917f975bfdf64ad8bae7970b6e9d5776d6c +EBUILD pngcrush-1.8.13.ebuild 855 BLAKE2B 46788be2557cc7cd96c41f5bf54f40bef735ef0b04dba1abb0c0c834d9ec90f484d6e8404d04616ac3649fad7e43a1bc540b724af70dbb0436e8957cdaea043e SHA512 7fb3990a501ef008f37824318e4b92899857cc77429bb805ca5385b13cefacf76402a19b7c5d306b87e3a91eb6e6f5da6622e3fbafb591e35b1b0582e3f0044e +MISC metadata.xml 624 BLAKE2B 24563481e49bea22686f679fdf4aa82c780c6be37fc12da2a5236a9832912314e738077ac9a3198a0b3848f6e605bd93a04d8ffd027f1ada7017b40653c0fd70 SHA512 e3b808c02f0ee72bf2f25f09784025614317a7b375ae76c055432f083deef3917c3be713a4cd38d6b9a0b069428f7075f8e12414908934f73833fa7ca6e131e2 diff --git a/media-gfx/pngcrush/metadata.xml b/media-gfx/pngcrush/metadata.xml index 4ac970928467..4cef0cc2d108 100644 --- a/media-gfx/pngcrush/metadata.xml +++ b/media-gfx/pngcrush/metadata.xml @@ -10,7 +10,7 @@ glennrp@gmail.com Glenn Randers-Pehrson - https://sourceforge.net/tracker/?group_id=1689 + https://sourceforge.net/p/pmt/bugs/ pmt diff --git a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild index 2da3e2abd130..d312b40a5f58 100644 --- a/media-gfx/pngcrush/pngcrush-1.8.13.ebuild +++ b/media-gfx/pngcrush/pngcrush-1.8.13.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 inherit toolchain-funcs DESCRIPTION="Portable Network Graphics (PNG) optimizing utility" -HOMEPAGE="http://pmt.sourceforge.net/pngcrush/" +HOMEPAGE="https://pmt.sourceforge.io/pngcrush/" SRC_URI="system-libs? ( mirror://sourceforge/pmt/${P}-nolib.tar.xz ) !system-libs? ( mirror://sourceforge/pmt/${P}.tar.xz )" diff --git a/media-gfx/qimgv/Manifest b/media-gfx/qimgv/Manifest index 479f55d4706e..ab77a2471b93 100644 --- a/media-gfx/qimgv/Manifest +++ b/media-gfx/qimgv/Manifest @@ -1,4 +1,6 @@ DIST qimgv-0.6.3.tar.gz 238521 BLAKE2B 55da7c0e7b18547e7c2e2ab76f0a535c655c898707641c896469a07040e8f7f1a6e80580143016e24cdc0a7d9e2287c0d081ca8d262337faeea5d02168796a8e SHA512 c18ed0678bc094fedb339cfa227a5ddace6728b724f7640e4b018e52aa49dfb80d18879b372ab25bbf9e8c38497999471ba35a9bea5cd6b18d5ccbf1e55f3301 +DIST qimgv-0.7.tar.gz 273405 BLAKE2B c4f497eb132eeefa161e328f1ce246ff0a369e21b895cf85b68a69aaf446289ae0fc1170be9c424c32fc8659c196d1c7542938813edef30ea30f4e8509f22cfe SHA512 35fb8fbba75e08dad945fcbc679f449894c6eafc01ab0166b1929956dca636ccd25ba261c22c58a4d283aafa0690ca2c1f672092fc40c5b532f41944e4b0a9e3 EBUILD qimgv-0.6.3.ebuild 725 BLAKE2B a8e13551c1f0105a584ca932c720b22ec84d8877b36af8a3bafb33ebf85f713760ab9461a26f5be0684d1b6f3d2a171d406853d5502b7261739d368aa98a9c10 SHA512 026c66f462c52b63af2273e8b09711d8a27827fc3ef74192ec5d8816798b45e3abaf10304b65816c31103f181914e32aeeb85b675598a4780778871d335dacb0 +EBUILD qimgv-0.7.ebuild 943 BLAKE2B 7d57f7a600040c8924f549eacd6aee23c2709034322a4c108dda1e757d511573f729f7adb101eab31bed570158b69bc555b0fc1c8b5b0725c06d97e5c91b2d37 SHA512 846fc84fb4a00dd929763c33579575b1b3fe55aaa5b9d5c6112ed02a0291f53d1a9fe057bfc5e8748f2bb5d585f916b6153279d6e8551ae099a5aa6d57a1b982 EBUILD qimgv-9999.ebuild 696 BLAKE2B 4341560b05ddf294b877cd659b3647e5409e55bb39b34161106bec650c451ae46a2398a0a0d78580b1db0f27582b409162e1c199023891df764d77c123809586 SHA512 cb1d5e0eaff96f45f4cb63d50f75033a035ea0687fc801f921b0ca0c63a6812331c3efa17fd957fd07564f8d2a340530bfd4114851dab827b94830dfd09f6670 -MISC metadata.xml 365 BLAKE2B 84ac26390de8ab8b943b77f3922629d2b687fc15dd8a983480375c854fea4001b0772e52263a0883a5e0d8b32db7eaf3432c763cf54d0bfb0358b3ffc0fd0e69 SHA512 974bc950ab7ff01bc784247efbf1c5090974d5af3afc668554050bd0f0ae76254245c008175db0161896bf176049c574e421c1173774cb4e89e4ff9bd00db358 +MISC metadata.xml 454 BLAKE2B bb9012bfbeff8b79f1f3a4de8b7e24bbb664d0137a92c8bde3189612e99ce7f94f4d135b5fcda3a935b8d3b8181e9ca882b073cbe26a6f7ace7d52ac0a57804f SHA512 3f2ec50c29ac720c91d61a5ede051eb62a58771974e8c9591ee9b3a98a8a8d0af2071b29c8e7abb842999559ab330f63b39d7de87c8a1d6fd560002e9bf7d107 diff --git a/media-gfx/qimgv/metadata.xml b/media-gfx/qimgv/metadata.xml index ccef191fae16..21ece4b81016 100644 --- a/media-gfx/qimgv/metadata.xml +++ b/media-gfx/qimgv/metadata.xml @@ -9,4 +9,8 @@ proxy-maint@gentoo.org Proxy Maintainers + + + Add support for gif/webm playback via libmpv + diff --git a/media-gfx/qimgv/qimgv-0.7.ebuild b/media-gfx/qimgv/qimgv-0.7.ebuild new file mode 100644 index 000000000000..7af9daad7bfc --- /dev/null +++ b/media-gfx/qimgv/qimgv-0.7.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils gnome2-utils xdg-utils + +DESCRIPTION="A cross-platform image viewer with webm support. Written in qt5" +HOMEPAGE="https://github.com/easymodo/qimgv" +SRC_URI="https://github.com/easymodo/qimgv/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="kde video" + +RDEPEND=" + >=dev-qt/qtconcurrent-5.10.0 + >=dev-qt/qtcore-5.10.0 + >=dev-qt/qtgui-5.10.0 + >=dev-qt/qtwidgets-5.10.0 + kde? ( kde-frameworks/kwindowsystem:5 ) + video? ( media-video/mpv[libmpv] ) +" +DEPEND=" + ${RDEPEND} + virtual/pkgconfig +" + +src_configure() { + local mycmakeargs=( + -DKDE_BLUR=$(usex kde) + -DVIDEO_SUPPORT=$(usex video) + ) + cmake-utils_src_configure +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} -- cgit v1.2.3