diff options
Diffstat (limited to 'media-gfx')
46 files changed, 1116 insertions, 454 deletions
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz Binary files differindex a9276efa5c02..aba448976deb 100644 --- a/media-gfx/Manifest.gz +++ b/media-gfx/Manifest.gz diff --git a/media-gfx/blender/Manifest b/media-gfx/blender/Manifest index 36ed0c13b794..e8e067a3b9c2 100644 --- a/media-gfx/blender/Manifest +++ b/media-gfx/blender/Manifest @@ -1,10 +1,18 @@ +AUX blender-2.68-doxyfile.patch 732 BLAKE2B f5c1682aca8a2d6ba8baec140d1766965f1dabc6c99f5bbc8a7b43ce5d2083e96555a0c73df519132fd6953ec91a80b210ccba5a4a862ebe8f9831c0e8e049ef SHA512 5191a25127e24d3ac7b18f6cd0b247e76a3fdeec46640f5d1ecba118fa35abbdaf19642c718e85149a304e9dc2093465b54b96e343f125163d091f045ab09db7 +AUX blender-2.68-fix-install-rules.patch 740 BLAKE2B f6dbb945666a39b30b00388279a6e456be61f1d611d7cd04d8006360b43ca7d9fc4921d97287322f4856b3e910892bb2a332fbc2aa7dc568985af683a919d990 SHA512 dd21cb3aa8bf965631132d39ad8a43c15d0c32faeaee00e8b8a970108fba0ab43b2402e3637dcd0b3430b7023ac9203b0395bbd2dc2dd9eb80d8c1d994d89e4f +AUX blender-2.70-sse2.patch 1421 BLAKE2B d8566eccad25534f8c97100c7f12b630adec156c5293e5923577068db1f1565e68b1ddbe841fecadd0b64b94b6a6ba10a525e649f212f9e3f84ca2358f74bdc4 SHA512 9888110efaab16ec15438ad463c3ffa0bb4f64c23bb162254abe0ddb4acd42935a5fd1fdbf186b1cf1dad042044f8777b5f58c446423894788c655187bfe3cca +AUX blender-2.72-T42797.diff 342 BLAKE2B 0aa4724ae35004bc629db5c359059d4dd732d4f13fb9a8eabdde9cac9fbfcf009f52e435895405bd81180061ebab3c9a7030fbc257e967b2a1800753bcec37a3 SHA512 abe6c6e28a094ef76bad97c979f5927c464a8421a430bde3ea0fadc76eabd7a9049678a5d475363aba5e534fe12c8858ddcfd5e01fa39ba24ea79ebabec71407 +AUX blender-2.72b-fix-util_simd.patch 292 BLAKE2B 176faae00e80e741297e0c06998b0c40d7b5a2d2939ca947094144ca90daf0a33d91ab0b7704aa32e09ef13f4aca9c79d5f969ecaad72251fc86e9b7bcce7a07 SHA512 17c328b9c64f1f42b4223d5f0777a68500235f95a85b761fdef216c5af4be17f67455e8044ab52fe6dd3e0bdfc6a7075cc3c21dae135a9cc7d174b6972b0326b +AUX blender-2.72b-gcc6-fixes.patch 4828 BLAKE2B aa189c58028c61102be7f1b6485700fd8d2968e65f6f71b6a2527f38f4ada0039017c67d2110b4a532140f1903c7ea7fbeaffadebbafa781e07e900803bfeac8 SHA512 886d594a87aafe827ed65c6106c29c727ec31b92a3a2df32023cc2b728719c4e6e7a8418b725201d338331e23cca17a88f518b353735b33e40cee30a754050cc AUX blender-2.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 8100 BLAKE2B 7c077c8d3847fa0d7b881b5f5989e42339574b7104bc78869c8e481073b1e6ca062e5a74233f0b96b9ff6b1390f1cc0f203038e733223ddf21b796e696ba508b SHA512 9af0b9f17969a6601c3945fbe3d3d10dc6707df0c88e86e1c2f1617e9b750019a21d05cecab5e726069b9908ba6345d2e190732d3960bbb87674d1f983e311ee EBUILD blender-2.79.ebuild 8049 BLAKE2B b4effa99e23ee172e685dff46235c88aecf129a40ab4e01a7b8dd0fb4993e52849c5ebbc712ff63999176644ea9027e572b1f21f4838d31845a525d09d396bbd SHA512 7b660679c69df11a108e58e76cc2e950843bf0285e962cf1f776b3cabf8e7b187ab65984ff6e4bd85120347489d10853ab163d916a4f1c833d890112dd2692c6 EBUILD blender-2.79b-r1.ebuild 8163 BLAKE2B cfa1181a4044655d55606a1ab20105aa41b629671e6c6ae7ab501f7de199a4369b07a100a33ff9a0caa33869e57ceadeb5ec0976aa32e7f0fb336efa2b8de4b3 SHA512 705967cd0c67a2185f17fb335320dfc5b69c605c6e6615a1b84aa7073a3bf9c34adbf0b43d90707e54bba1219b5472eb320aa22f6897afa1a9ac0b6fcb1860eb -MISC metadata.xml 2642 BLAKE2B 9575416eeb3ef81373e60263e095b5dcd441b710945775ae3a79c1bfd5b511e15751d37c0e9f6833d2e7de9f39d628a1e3c6c91707b3ee1573e64e8e1ae4b874 SHA512 0bc219e6065e76753c1dbe1aeee7c277d29e6574db388994e2dac13ecf4837233155e4c319bf41f484c7341a074dc2b60dd0b86a350ac438504205c555761b4f +MISC metadata.xml 3466 BLAKE2B e09a22c7fe5200a7b592c3fda2bdb4ae719ebe614f85d8cb8e9c4c72684fe785575e6b6b4f0e302b1e9beddc7476125e2e443943ff018d35d37f015c1b6414d8 SHA512 0112674420ffeb427dd2ad1cda3ad3e01801e02fa2bbb5dcaec15db21b4582cfff4712d5e587ab875619e94dacab4fa0263d9f635c48e5c94569bc6155577523 diff --git a/media-gfx/blender/blender-2.72b-r4.ebuild b/media-gfx/blender/blender-2.72b-r4.ebuild new file mode 100644 index 000000000000..9d68984d4e3c --- /dev/null +++ b/media-gfx/blender/blender-2.72b-r4.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +## BUNDLED-DEPS: +# extern/cuew +# extern/Eigen3 +# extern/xdnd +# extern/carve +# extern/glew +# extern/libmv +# extern/clew +# extern/colamd +# extern/lzma +# extern/gtest +# extern/rangetree +# extern/libredcode +# extern/wcwidth +# extern/binreloc +# extern/recastnavigation +# extern/bullet2 +# extern/lzo +# extern/libopenjpeg +# extern/libmv/third_party/msinttypes +# extern/libmv/third_party/ceres +# extern/libmv/third_party/gflags +# extern/libmv/third_party/glog + +EAPI=6 +PYTHON_COMPAT=( python3_4 ) +#PATCHSET="1" + +inherit multilib gnome2-utils cmake-utils eutils python-single-r1 versionator flag-o-matic toolchain-funcs pax-utils check-reqs xdg-utils + +DESCRIPTION="3D Creation/Animation/Publishing System" +HOMEPAGE="https://www.blender.org" + +case ${PV} in + *_p*) + SRC_URI="https://dev.gentoo.org/~lu_zero/${P}.tar.gz" ;; + *) + SRC_URI="https://download.blender.org/source/${P}.tar.gz" ;; +esac + +if [[ -n ${PATCHSET} ]]; then + SRC_URI+=" https://dev.gentoo.org/~flameeyes/${PN}/${P}-patches-${PATCHSET}.tar.xz" +fi + +SLOT="0" +LICENSE="|| ( GPL-2 BL )" +KEYWORDS="amd64 x86" +IUSE="+boost +bullet collada colorio cycles +dds debug doc +elbeem ffmpeg fftw +game-engine jack jpeg2k libav ndof nls openal openimageio +opennl openmp +openexr player redcode sdl sndfile cpu_flags_x86_sse cpu_flags_x86_sse2 tiff" +REQUIRED_USE="${PYTHON_REQUIRED_USE} + player? ( game-engine ) + redcode? ( jpeg2k ffmpeg ) + cycles? ( boost openexr tiff ) + nls? ( boost ) + colorio? ( boost ) + openal? ( boost ) + game-engine? ( boost ) + ?? ( ffmpeg libav )" + +RDEPEND=" + ${PYTHON_DEPS} + dev-python/numpy[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}] + >=media-libs/freetype-2.0:2 + media-libs/glew:0= + media-libs/libpng:0 + media-libs/libsamplerate + sys-libs/zlib + virtual/glu + virtual/jpeg:0 + virtual/libintl + virtual/opengl + x11-libs/libX11 + x11-libs/libXi + x11-libs/libXxf86vm + boost? ( >=dev-libs/boost-1.44[nls?,threads(+)] ) + collada? ( >=media-libs/opencollada-1.6.18 ) + colorio? ( >=media-libs/opencolorio-1.0.9-r2 ) + cycles? ( + media-libs/openimageio + ) + ffmpeg? ( media-video/ffmpeg:0=[x264,mp3,encode,theora,jpeg2k?] ) + libav? ( >=media-video/libav-11.3:0=[x264,mp3,encode,theora,jpeg2k?] ) + fftw? ( sci-libs/fftw:3.0 ) + jack? ( media-sound/jack-audio-connection-kit ) + jpeg2k? ( media-libs/openjpeg:0 ) + ndof? ( + app-misc/spacenavd + dev-libs/libspnav + ) + nls? ( virtual/libiconv ) + openal? ( >=media-libs/openal-1.6.372 ) + openimageio? ( media-libs/openimageio ) + openexr? ( media-libs/ilmbase media-libs/openexr ) + sdl? ( media-libs/libsdl[sound,joystick] ) + sndfile? ( media-libs/libsndfile ) + tiff? ( media-libs/tiff:0 )" +DEPEND="${RDEPEND} + doc? ( + app-doc/doxygen[-nodot(-),dot(+)] + dev-python/sphinx + ) + nls? ( sys-devel/gettext )" + +PATCHES=( + "${FILESDIR}"/${PN}-2.68-doxyfile.patch + "${FILESDIR}"/${PN}-2.68-fix-install-rules.patch + "${FILESDIR}"/${PN}-2.70-sse2.patch + "${FILESDIR}"/${PN}-2.72-T42797.diff + "${FILESDIR}"/${P}-fix-util_simd.patch + "${FILESDIR}"/${P}-gcc6-fixes.patch +) + +pkg_pretend() { + if use openmp && ! tc-has-openmp; then + eerror "You are using gcc built without 'openmp' USE." + eerror "Switch CXX to an OpenMP capable compiler." + die "Need openmp" + fi + + if use doc; then + CHECKREQS_DISK_BUILD="4G" check-reqs_pkg_pretend + fi +} + +pkg_setup() { + python-single-r1_pkg_setup +} + +src_prepare() { + default + + # we don't want static glew, but it's scattered across + # thousand files + # !!!CHECK THIS SED ON EVERY VERSION BUMP!!! + sed -i \ + -e '/-DGLEW_STATIC/d' \ + $(find . -type f -name "CMakeLists.txt") || die + + # linguas cleanup + local i + if ! use nls; then + rm -r "${S}"/release/datafiles/locale || die + else + if [[ -n "${LINGUAS+x}" ]] ; then + cd "${S}"/release/datafiles/locale/po + for i in *.po ; do + mylang=${i%.po} + has ${mylang} ${LINGUAS} || { rm -r ${i} || die ; } + done + fi + fi +} + +src_configure() { + # FIX: forcing '-funsigned-char' fixes an anti-aliasing issue with menu + # shadows, see bug #276338 for reference + append-flags -funsigned-char + append-lfs-flags + append-ldflags $(no-as-needed) + + # WITH_PYTHON_SECURITY + # WITH_PYTHON_SAFETY + local mycmakeargs=( + -DCMAKE_INSTALL_PREFIX=/usr + -DWITH_INSTALL_PORTABLE=OFF + -DWITH_BOOST=$(usex boost ON OFF ) + -DWITH_CYCLES=$(usex cycles ON OFF ) + -DWITH_OPENCOLLADA=$(usex collada ON OFF ) + -DWITH_IMAGE_DDS=$(usex dds ON OFF ) + -DWITH_MOD_FLUID=$(usex elbeem ON OFF ) + -DWITH_CODEC_FFMPEG=$(usex ffmpeg ON OFF ) + -DWITH_FFTW3=$(usex fftw ON OFF ) + -DWITH_MOD_OCEANSIM=$(usex fftw ON OFF ) + -DWITH_GAMEENGINE=$(usex game-engine ON OFF ) + -DWITH_INTERNATIONAL=$(usex nls ON OFF ) + -DWITH_JACK=$(usex jack ON OFF ) + -DWITH_IMAGE_OPENJPEG=$(usex jpeg2k ON OFF ) + -DWITH_OPENIMAGEIO=$(usex openimageio ON OFF ) + -DWITH_OPENAL=$(usex openal ON OFF ) + -DWITH_IMAGE_OPENEXR=$(usex openexr ON OFF ) + -DWITH_OPENMP=$(usex openmp ON OFF ) + -DWITH_OPENNL=$(usex opennl ON OFF ) + -DWITH_PLAYER=$(usex player ON OFF ) + -DWITH_IMAGE_REDCODE=$(usex redcode ON OFF ) + -DWITH_SDL=$(usex sdl ON OFF ) + -DWITH_CODEC_SNDFILE=$(usex sndfile ON OFF ) + -DWITH_RAYOPTIMIZATION=$(usex cpu_flags_x86_sse ON OFF ) + -DWITH_SSE2=$(usex cpu_flags_x86_sse2 ON OFF ) + -DWITH_BULLET=$(usex bullet ON OFF ) + -DWITH_IMAGE_TIFF=$(usex tiff ON OFF ) + -DWITH_OPENCOLORIO=$(usex colorio ON OFF ) + -DWITH_INPUT_NDOF=$(usex ndof ON OFF ) + -DWITH_CXX_GUARDEDALLOC=$(usex debug ON OFF ) + -DWITH_ASSERT_ABORT=$(usex debug ON OFF ) + -DWITH_PYTHON_INSTALL=OFF + -DWITH_PYTHON_INSTALL_NUMPY=OFF + -DWITH_STATIC_LIBS=OFF + -DWITH_SYSTEM_GLEW=ON + -DWITH_SYSTEM_OPENJPEG=ON + -DWITH_SYSTEM_BULLET=OFF + -DPYTHON_VERSION="${EPYTHON/python/}" + -DPYTHON_LIBRARY="$(python_get_library_path)" + -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" + ) + cmake-utils_src_configure +} + +src_compile() { + cmake-utils_src_compile + + if use doc; then + # Workaround for binary drivers. + cards=( /dev/ati/card* /dev/nvidia* ) + for card in "${cards[@]}"; do addpredict "${card}"; done + + einfo "Generating Blender C/C++ API docs ..." + cd "${CMAKE_USE_DIR}"/doc/doxygen || die + doxygen -u Doxyfile + 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 "blender failed." + + cd "${CMAKE_USE_DIR}"/doc/python_api || die + sphinx-build sphinx-in BPY_API || die "sphinx failed." + fi +} + +src_test() { :; } + +src_install() { + local i + + # 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 + + # fucked up cmake will relink binary for no reason + emake -C "${CMAKE_BUILD_DIR}" DESTDIR="${D}" install/fast + + # fix doc installdir + docinto "html" + dodoc "${CMAKE_USE_DIR}"/release/text/readme.html + rm -rf "${ED%/}"/usr/share/doc/blender + + python_fix_shebang "${ED%/}"/usr/bin/blender-thumbnailer.py + python_optimize "${ED%/}"/usr/share/blender/${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 scripting." + 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_desktop_database_update +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-gfx/blender/files/blender-2.68-doxyfile.patch b/media-gfx/blender/files/blender-2.68-doxyfile.patch new file mode 100644 index 000000000000..c11c793fda97 --- /dev/null +++ b/media-gfx/blender/files/blender-2.68-doxyfile.patch @@ -0,0 +1,19 @@ +commit 62308d9fc24bde22a50497816c44c8ca91f96f63 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:36:34 2013 +0200 + + remove hhc.exe reference + +diff --git a/doc/doxygen/Doxyfile b/doc/doxygen/Doxyfile +index 397cc30..ac61756 100644 +--- a/doc/doxygen/Doxyfile ++++ b/doc/doxygen/Doxyfile +@@ -1051,7 +1051,7 @@ CHM_FILE = blender.chm + # the HTML help compiler (hhc.exe). If non-empty doxygen will try to run + # the HTML help compiler on the generated index.hhp. + +-HHC_LOCATION = "C:/Program Files (x86)/HTML Help Workshop/hhc.exe" ++HHC_LOCATION = + + # If the GENERATE_HTMLHELP tag is set to YES, the GENERATE_CHI flag + # controls if a separate .chi index file is generated (YES) or that diff --git a/media-gfx/blender/files/blender-2.68-fix-install-rules.patch b/media-gfx/blender/files/blender-2.68-fix-install-rules.patch new file mode 100644 index 000000000000..aa8ecc9f6174 --- /dev/null +++ b/media-gfx/blender/files/blender-2.68-fix-install-rules.patch @@ -0,0 +1,26 @@ +commit 94eed33f878e35a8c7b69b0c23b3b30026460f33 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:50:08 2013 +0200 + + remove stupid uninstall snippet + + whoever coded this... it is dangerous + uninstall methods have NO PLACE in install rules + +diff --git a/source/creator/CMakeLists.txt b/source/creator/CMakeLists.txt +index c84d944..2b9bf46 100644 +--- a/source/creator/CMakeLists.txt ++++ b/source/creator/CMakeLists.txt +@@ -268,12 +268,6 @@ endif() + # Install Targets (Generic, All Platforms) + + +-# important to make a clean install each time, else old scripts get loaded. +-install( +- CODE +- "file(REMOVE_RECURSE ${TARGETDIR_VER})" +-) +- + if(WITH_PYTHON) + # install(CODE "message(\"copying blender scripts...\")") + diff --git a/media-gfx/blender/files/blender-2.70-sse2.patch b/media-gfx/blender/files/blender-2.70-sse2.patch new file mode 100644 index 000000000000..6fc870ea3258 --- /dev/null +++ b/media-gfx/blender/files/blender-2.70-sse2.patch @@ -0,0 +1,35 @@ +commit 0e0b27a589680e10e38a26575ad4dba8f3af2ec6 +Author: hasufell <hasufell@gentoo.org> +Date: Fri Jul 19 18:50:19 2013 +0200 + + add option to explicitly control sse2 optimization + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 78bb3c6..d5f4576 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -86,6 +86,7 @@ + #----------------------------------------------------------------------------- + # Load some macros. + include(build_files/cmake/macros.cmake) ++include(CMakeDependentOption) + + + #----------------------------------------------------------------------------- +@@ -251,6 +252,7 @@ + # Misc + option(WITH_INPUT_NDOF "Enable NDOF input devices (SpaceNavigator and friends)" ON) + option(WITH_RAYOPTIMIZATION "Enable use of SIMD (SSE) optimizations for the raytracer" ON) ++cmake_dependent_option(WITH_SSE2 "SSE2 optimizations" ON WITH_RAYOPTIMIZATION OFF) + option(WITH_OPENNL "Enable use of Open Numerical Library" ON) + if(UNIX AND NOT APPLE) + option(WITH_INSTALL_PORTABLE "Install redistributeable runtime, otherwise install into CMAKE_INSTALL_PREFIX" ON) +@@ -1950,7 +1952,7 @@ + set(PLATFORM_CFLAGS " ${COMPILER_SSE_FLAG} ${PLATFORM_CFLAGS}") + add_definitions(-D__SSE__ -D__MMX__) + endif() +- if(SUPPORT_SSE2_BUILD) ++ if(WITH_SSE2 AND SUPPORT_SSE2_BUILD) + set(PLATFORM_CFLAGS " ${COMPILER_SSE2_FLAG} ${PLATFORM_CFLAGS}") + add_definitions(-D__SSE2__) + if(NOT SUPPORT_SSE_BUILD) # dont double up diff --git a/media-gfx/blender/files/blender-2.72-T42797.diff b/media-gfx/blender/files/blender-2.72-T42797.diff new file mode 100644 index 000000000000..cef03853434c --- /dev/null +++ b/media-gfx/blender/files/blender-2.72-T42797.diff @@ -0,0 +1,13 @@ +--- a/source/blender/blenfont/intern/blf_glyph.c ++++ a/source/blender/blenfont/intern/blf_glyph.c +@@ -262,8 +262,8 @@ + g->xoff = -1; + g->yoff = -1; + bitmap = slot->bitmap; +- g->width = bitmap.width; +- g->height = bitmap.rows; ++ g->width = (int)bitmap.width; ++ g->height = (int)bitmap.rows; + + if (g->width && g->height) { + if (sharp) { diff --git a/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch b/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch new file mode 100644 index 000000000000..8c83ee096284 --- /dev/null +++ b/media-gfx/blender/files/blender-2.72b-fix-util_simd.patch @@ -0,0 +1,10 @@ +--- a/intern/cycles/util/util_simd.h 2014-10-20 12:58:22.000000000 +0500 ++++ b/intern/cycles/util/util_simd.h 2015-05-17 11:57:37.000000000 +0500 +@@ -19,6 +19,7 @@ + #define __UTIL_SIMD_TYPES_H__ + + #include <limits> ++#include <x86intrin.h> + + #include "util_debug.h" + #include "util_types.h" diff --git a/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch new file mode 100644 index 000000000000..1c4ab09e62cb --- /dev/null +++ b/media-gfx/blender/files/blender-2.72b-gcc6-fixes.patch @@ -0,0 +1,126 @@ +diff -purN a/source/blender/imbuf/intern/dds/ColorBlock.cpp b/source/blender/imbuf/intern/dds/ColorBlock.cpp +--- a/source/blender/imbuf/intern/dds/ColorBlock.cpp 2014-10-20 08:58:23.000000000 +0100 ++++ b/source/blender/imbuf/intern/dds/ColorBlock.cpp 2016-09-22 15:50:25.359318967 +0100 +@@ -86,8 +86,8 @@ void ColorBlock::init(const Image *img, + + void ColorBlock::init(uint w, uint h, const uint *data, uint x, uint y) + { +- const uint bw = min(w - x, 4U); +- const uint bh = min(h - y, 4U); ++ const uint bw = MIN(w - x, 4U); ++ const uint bh = MIN(h - y, 4U); + + // Blocks that are smaller than 4x4 are handled by repeating the pixels. + // @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :( +@@ -107,8 +107,8 @@ void ColorBlock::init(uint w, uint h, co + + void ColorBlock::init(uint w, uint h, const float *data, uint x, uint y) + { +- const uint bw = min(w - x, 4U); +- const uint bh = min(h - y, 4U); ++ const uint bw = MIN(w - x, 4U); ++ const uint bh = MIN(h - y, 4U); + + // Blocks that are smaller than 4x4 are handled by repeating the pixels. + // @@ Thats only correct when block size is 1, 2 or 4, but not with 3. :( +@@ -124,10 +124,10 @@ void ColorBlock::init(uint w, uint h, co + const uint idx = ((y + by) * w + x + bx); + + Color32 & c = color(e, i); +- c.r = uint8(255 * clamp(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes? +- c.g = uint8(255 * clamp(data[idx + 1 * srcPlane], 0.0f, 1.0f)); +- c.b = uint8(255 * clamp(data[idx + 2 * srcPlane], 0.0f, 1.0f)); +- c.a = uint8(255 * clamp(data[idx + 3 * srcPlane], 0.0f, 1.0f)); ++ c.r = uint8(255 * CLAMP(data[idx + 0 * srcPlane], 0.0f, 1.0f)); // @@ Is this the right way to quantize floats to bytes? ++ c.g = uint8(255 * CLAMP(data[idx + 1 * srcPlane], 0.0f, 1.0f)); ++ c.b = uint8(255 * CLAMP(data[idx + 2 * srcPlane], 0.0f, 1.0f)); ++ c.a = uint8(255 * CLAMP(data[idx + 3 * srcPlane], 0.0f, 1.0f)); + } + } + } +diff -purN a/source/blender/imbuf/intern/dds/Common.h b/source/blender/imbuf/intern/dds/Common.h +--- a/source/blender/imbuf/intern/dds/Common.h 2014-10-20 08:58:23.000000000 +0100 ++++ b/source/blender/imbuf/intern/dds/Common.h 2016-09-22 15:47:31.327081239 +0100 +@@ -28,14 +28,14 @@ + #ifndef __COMMON_H__ + #define __COMMON_H__ + +-#ifndef min +-#define min(a,b) ((a) <= (b) ? (a) : (b)) ++#ifndef MIN ++#define MIN(a,b) ((a) <= (b) ? (a) : (b)) + #endif +-#ifndef max +-#define max(a,b) ((a) >= (b) ? (a) : (b)) ++#ifndef MAX ++#define MAX(a,b) ((a) >= (b) ? (a) : (b)) + #endif +-#ifndef clamp +-#define clamp(x,a,b) min(max((x), (a)), (b)) ++#ifndef CLAMP ++#define CLAMP(x,a,b) MIN(MAX((x), (a)), (b)) + #endif + + template<typename T> +diff -purN a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp +--- a/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp 2014-10-20 08:58:23.000000000 +0100 ++++ b/source/blender/imbuf/intern/dds/DirectDrawSurface.cpp 2016-09-22 16:10:53.985775837 +0100 +@@ -1102,8 +1102,8 @@ void DirectDrawSurface::mipmap(Image *im + // Compute width and height. + for (uint m = 0; m < mipmap; m++) + { +- w = max(1U, w / 2); +- h = max(1U, h / 2); ++ w = MAX(1U, w / 2); ++ h = MAX(1U, h / 2); + } + + img->allocate(w, h); +@@ -1223,9 +1223,9 @@ void DirectDrawSurface::readBlockImage(I + readBlock(&block); + + // Write color block. +- for (uint y = 0; y < min(4U, h-4*by); y++) ++ for (uint y = 0; y < MIN(4U, h-4*by); y++) + { +- for (uint x = 0; x < min(4U, w-4*bx); x++) ++ for (uint x = 0; x < MIN(4U, w-4*bx); x++) + { + img->pixel(4*bx+x, 4*by+y) = block.color(x, y); + } +@@ -1240,7 +1240,7 @@ static Color32 buildNormal(uint8 x, uint + float ny = 2 * (y / 255.0f) - 1; + float nz = 0.0f; + if (1 - nx*nx - ny*ny > 0) nz = sqrt(1 - nx*nx - ny*ny); +- uint8 z = clamp(int(255.0f * (nz + 1) / 2.0f), 0, 255); ++ uint8 z = CLAMP(int(255.0f * (nz + 1) / 2.0f), 0, 255); + + return Color32(x, y, z); + } +@@ -1379,9 +1379,9 @@ uint DirectDrawSurface::mipmapSize(uint + + for (uint m = 0; m < mipmap; m++) + { +- w = max(1U, w / 2); +- h = max(1U, h / 2); +- d = max(1U, d / 2); ++ w = MAX(1U, w / 2); ++ h = MAX(1U, h / 2); ++ d = MAX(1U, d / 2); + } + + if (header.pf.flags & DDPF_FOURCC) +diff -purN a/source/blender/imbuf/intern/dds/FlipDXT.cpp b/source/blender/imbuf/intern/dds/FlipDXT.cpp +--- a/source/blender/imbuf/intern/dds/FlipDXT.cpp 2014-10-20 08:58:23.000000000 +0100 ++++ b/source/blender/imbuf/intern/dds/FlipDXT.cpp 2016-09-22 16:11:35.626829002 +0100 +@@ -246,8 +246,8 @@ int FlipDXTCImage(unsigned int width, un + + // mip levels are contiguous. + data += block_bytes * blocks; +- mip_width = max(1U, mip_width >> 1); +- mip_height = max(1U, mip_height >> 1); ++ mip_width = MAX(1U, mip_width >> 1); ++ mip_height = MAX(1U, mip_height >> 1); + } + + return 1; diff --git a/media-gfx/blender/metadata.xml b/media-gfx/blender/metadata.xml index 14a1619c7d4c..9dd73dfe3522 100644 --- a/media-gfx/blender/metadata.xml +++ b/media-gfx/blender/metadata.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> - <maintainer type="person"> + <maintainer restrict=">=media-gfx/blender-2.77" type="person"> <email>dracwyrm@gentoo.org</email> <name>Jonathan Scruggs</name> </maintainer> - <maintainer type="person"> + <maintainer restrict=">=media-gfx/blender-2.77" type="person"> <email>agrigo2001@yahoo.com.au</email> <name>Adrian Grigo</name> </maintainer> @@ -20,6 +20,9 @@ </longdescription> <use> + <flag name="boost"> + Enable features depending on boost. + </flag> <flag name="bullet"> Enable Bullet (Physics Engine). </flag> @@ -47,42 +50,49 @@ <flag name="elbeem"> Adds surface fluid simulation to Blender using El'Beem library. </flag> - <flag name="game-engine"> + <flag name="game-engine" restrict=">=media-gfx/blender-2.50"> Adds Game Engine support to Blender. </flag> - <flag name="headless"> + <flag name="headless" restrict=">=media-gfx/blender-2.77"> Build without graphical support (renderfarm, server mode only). </flag> - <flag name="llvm"> + <flag name="llvm" restrict=">=media-gfx/blender-2.77"> Enable features depending on llvm. </flag> - <flag name="man"> + <flag name="man" restrict=">=media-gfx/blender-2.77"> Build and install man pages. </flag> <flag name="ndof"> Enable NDOF input devices (SpaceNavigator and friends). </flag> - <flag name="opencl"> + <flag name="opencl" restrict="<=media-gfx/blender-2.79"> Allow OpenCL Graphics Acceleration. This may require extra graphics card drivers.</flag> <flag name="openimageio">Enable OpenImageIO Support</flag> - <flag name="opensubdiv"> + <flag name="opennl" restrict="<=media-gfx/blender-2.73"> + Enable use of Open Numerical Library + </flag> + <flag name="opensubdiv" restrict=">=media-gfx/blender-2.77"> Add rendering support form OpenSubdiv from Dreamworks Animation through <pkg>media-libs/opensubdiv</pkg>. </flag> - <flag name="openvdb"> + <flag name="openvdb" restrict=">=media-gfx/blender-2.77"> Add GPU preview rendering. Only works with nVidia cards. </flag> - <flag name="osl"> + <flag name="osl" restrict=">=media-gfx/blender-2.79"> Add support for OpenShadingLanguage scripting. </flag> <flag name="player"> Build the Blender Player. THis requires the Game engine. </flag> - <flag name="test"> + <flag name="redcode" restrict="<=media-gfx/blender-2.73"> + This flag add support for RED CODE camera digital format (5K HD + images *.r3d) - EXPERIMENTAL. + </flag> + <flag name="test" restrict=">=media-gfx/blender-2.77"> Build the provided unit tests. </flag> - <flag name="valgrind"> + <flag name="valgrind" restrict=">=media-gfx/blender-2.77"> Add support for memory debugging using <pkg>dev-util/valgrind</pkg> </flag> diff --git a/media-gfx/darktable/Manifest b/media-gfx/darktable/Manifest index 009f5701b6cc..3d93295d5dfa 100644 --- a/media-gfx/darktable/Manifest +++ b/media-gfx/darktable/Manifest @@ -1,8 +1,16 @@ AUX darktable-find-opencl-header.patch 601 BLAKE2B 0102ea562ec0addb619f06b59cc73834d734c454a7c561654bc27f052de55db6c62f454927b2c701b7f4f6c52d5d2fac0b7c230b90ef89bdc9431856bd4ae69a SHA512 93023a318158850a5bac4a1d871ea6e69a3c9f2bc57f8af47bc83bb131f96e8972c23b07945df2eddfb05bffdd950e8250da77c47d1543b776a7e9405adad020 +DIST darktable-2.2.5.tar.xz 3092540 BLAKE2B 8196ed501c96e6738057ee593c6437257b917907a02c365bd011cbf8ba258178e2915e097d373a2dca6a03ea6920df48b8f16f477e7479959371ef19937ceed9 SHA512 fbc79398660b51e580d22dbdfc9a74d213f69335d6058e2844ef397951a1e840264b6d03d1b52b424319fb647a274ac14ff23ee9a9c60071f71497988bdf989b +DIST darktable-2.4.3.tar.xz 3422460 BLAKE2B 2fa1d7787301b6bc83b09e8d93bda251d2f9b7cf7d47979087b6da5126272d17c15f925be26652580aad6601f8613eac593c08e91638f2d445de1981f8694798 SHA512 adc0740f866890c53a1389b43042d76a4c668dd22654d91fd5a7eb728aa6979cb7dd3703d6e7d3689b6d3840e892432b3c3ce6953a76d4355dfc1f90a8f29506 +DIST darktable-2.4.4.tar.xz 3432268 BLAKE2B 75d22187c4a32eaf240803e68b8ffe9a29b4dfeaab3eb0061dd817e65c7118a5fe3f1832ce2d7b5adf1d8501c17adff7f1e87545774ca17bd2e33b749e993886 SHA512 143739b18217cb2b47f7c5cb29bbb17e0d78b380ccd9358e96e179639d8e3526c76f3822edace605856ec3272b099a09f052867479d20879bf36ef45dafe5df6 +DIST darktable-2.6.0.tar.xz 3358508 BLAKE2B 1d6dc414d0f5c7dc1340ce1db229e5f4629534e6ccc3d4f017dea87a1e33d897ee8d73affece22311bbb27338075e48384b86b9aece83cbd6c582f761226a863 SHA512 066a8766edf3d961b2995bd681c9be65ae118f650a34da3c87c9096b76586c4a949b4c620993bcba3e7cd29f255c19dad9c2e205ed413c309398b4bc606eb73b DIST darktable-2.6.1.tar.xz 3473300 BLAKE2B e2194d9d967872b3dbc5dd608b3aa946424ff8a20a00b8cd8e1e9dd7ad3146acd791d2a7f20652d4673fdaac7bec86e405e055bab664c41b601b5788f0f15e72 SHA512 0d92fa35629ca02ca7cbb2910966b3fad57e536c967fd05381ad02dc9645106e6baaf1a93c1c186618624850c876f23305704e41d7151150e3367e21c415a967 -DIST darktable-2.6.2.tar.xz 3512572 BLAKE2B ee3070ac0f6b6b1c401865801631fb28397f484f30778065b7f899204813530a47ff6e752504b645f59bc29f868e1498e39f5f4e70f8259d8fecf5abc3f15cd6 SHA512 e7a90535747a8615fa2dbd1eb05f81314cc61c689a8a85fda0e2be40208ab0248e6f6ef296bb0894d3d527ed47c6cf6640538029c0c2d58a38d2d5ce10f6f5c0 +DIST darktable-usermanual-2.2.0.pdf 14998142 BLAKE2B 68332239b4d2e34a0cd9f9e9bc26a18149ef1a8c033e3d5a7a7c150e952546669d74d0eeb97ad6793955d65a3259df51932829aca3d46f5c3ce7e01b59ee709b SHA512 5408193b442a7f60783aace507d8dd39c638f5f58d8b5fb5ab68eca03ce9853477b0cbe14184375d58cd6a648de18e9ecae586376698571222be755159cc0b20 +DIST darktable-usermanual-2.4.0.pdf 15072726 BLAKE2B a10fb02bb732040e45e4b2c6b6a6e022c6095a29aac894727c8a803bf76ac50924bcd938f3c7085222f32542074cbe051afe8752059a0796db22adabecce3faf SHA512 0259ccd264ec0569a770d92a517932bf5b24ce279c699a636f36656519c400456f0bdbd5de1eacf96e0cb05c0b7e59a6c6fa02803b809bc0fabb902ffe454dd1 DIST darktable-usermanual-2.6.0.pdf 15623135 BLAKE2B a7a254e49dd57ee03480d52f4506a436210324cc4a2651f3c2fd70ca65cb7aa1735934a5e046ffa662b2aa1f081042d2d1e6ce0f70b6768719c52e2d14c358ce SHA512 e68005ee8706f2342755ce3e4dcd6c2907c1607bc9b750154dceb4b52dcccf50c581ab65212efc8ffb2447f5d828e0fdb61d0471c3d14938e098528e50f32e14 +EBUILD darktable-2.2.5.ebuild 3856 BLAKE2B 01adcaf0ca198b5cea7c49b5dc3844c76a7f0a0a1c83e1a9729161721aa73b390971156bb3784ec4d9c7577821da90390b5bdd1c3c3820976963d45fab510187 SHA512 daf6de876de7db156d979292562411581f06e58f8bddf5b3cb96f75c4b8d38f7dd8ac951c275192ce5d6f5f139566492aa7c08238e35da131a056113c08d9a94 +EBUILD darktable-2.4.3.ebuild 3998 BLAKE2B ab0356bea66039573ec818f3f93670cee2728230e71e07e9f4acbb89e369971112ecb8cc9186b0235847619d583dbd61edcf287c03ade0eee484d93df2f817f5 SHA512 3a33ecadd7229bce3c2645fe37ad8673a3c68ac3c071c87173206753701703819f6e1ad2e3ed07f822356fa0b0bcde70b9988a9c8e0f3705749424e7cf878079 +EBUILD darktable-2.4.4.ebuild 3999 BLAKE2B f4b1905eae4d77f485150f40bc2eaee25e5515e1872975a209e1d190442589b237065715c7e4da35f335376085f99173641c7f4b1a811422a33b28e52b1ada3e SHA512 572edf9c1f5f3a9f794bef774129b0ed751a87d60ecfa668d7a7f2199b2f76a6ccb6de640b22cd64139501130d58df8fcb5303937b51444566528330e05f7307 +EBUILD darktable-2.6.0.ebuild 3731 BLAKE2B 6afcf3c29ad6876d7d9c20ae7f124d789e51f3325f14d6d1084e141b98b7bb6e259c38c066236255ef1ec10257ea12379bc91d9c6b80c43d0049c1b8c33e3387 SHA512 0e06808fd7d8689d12ac3f91d7cbbcb411d5015cbfa70ce98458332a747bfda199ec662dd0ff3074a9fa889a4a124ae4e3f13f1563a8e82b2cc3faa78683c843 EBUILD darktable-2.6.1.ebuild 3735 BLAKE2B 12db2af18017c4770acf9553035542292f501149583e4037961f3f0ffa4bd70fd123e97f0d7771c95224482da615d72ab6458ea0f2fb43076d6de6924a32e010 SHA512 7d762bad746d01c80bd85c33233ef1dbf8ab7e4b5992c4dbeda79bb5579bbfece81903d3ad8532d0ab36bd0a1d76a3a22eb2c1285ef761cfa36de9542eac506d -EBUILD darktable-2.6.2.ebuild 3737 BLAKE2B a030fb0083587d73a5195a374cf37a7dea114a9207283841a4e07bf071cfac7ee3db77dd0f840160887402297041e64a29a9b4565088003c1a60aea78a39d49d SHA512 b8a7e75e9c247c12b1ce5c584ec3b2524b81a0f1aae4fcbcf284e9e37858ba70b54e0942dd92578eac84489415531a40e9827e8df26e150054833d915facc790 EBUILD darktable-9999.ebuild 3131 BLAKE2B 09a86d4cebb9c362edbd7c208ee1b3cb84743d25357ec7d9bc1141161587e8b7efaf4ab5261802207cf5b075cce222d67cb304351e476d5300c896620330adb2 SHA512 86db075f0f28a1cea81f3f1edd45b2adad7888f2637af58e6babd5d45ce13f015e3c598c7cfdc4ba3edc979cef3002a9606297ccce5670d19df061e5c7ae4dbd MISC metadata.xml 871 BLAKE2B 5576cc42a46ae48d681043c22cbf206855a0770f112e42138a264950235b1af96751740800f8d9402bf5e00adf725511e557f3b65ec355abbe26de451ad5b70c SHA512 330c5e8b17daee39f3152fbcaed1979814b3b5d0aa205860e5ff309ae068037da0f4190f91672be17c138fcda91890954b2cd310b3725bada6f3916a73cebf1a diff --git a/media-gfx/darktable/darktable-2.2.5.ebuild b/media-gfx/darktable/darktable-2.2.5.ebuild new file mode 100644 index 000000000000..09628ed7484f --- /dev/null +++ b/media-gfx/darktable/darktable-2.2.5.ebuild @@ -0,0 +1,139 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils + +DOC_PV="2.2.0" +MY_PV="${PV/_/}" +MY_P="${P/_/.}" + +DESCRIPTION="A virtual lighttable and darkroom for photographers" +HOMEPAGE="https://www.darktable.org/" +SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" + +LICENSE="GPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="amd64 x86" +LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" +# TODO add lua once dev-lang/lua-5.2 is unmasked +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet +nls opencl openmp openexr pax_kernel webp +${LANGS// / l10n_}" + +# sse3 support is required to build darktable +REQUIRED_USE="cpu_flags_x86_sse3" + +CDEPEND=" + dev-db/sqlite:3 + dev-libs/json-glib + dev-libs/libxml2:2 + dev-libs/pugixml:0= + gnome-base/librsvg:2 + >=media-gfx/exiv2-0.25-r2:0=[xmp] + media-libs/lcms:2 + >=media-libs/lensfun-0.2.3:0= + media-libs/libpng:0= + media-libs/tiff:0 + net-libs/libsoup:2.4 + net-misc/curl + virtual/jpeg:0 + virtual/glu + virtual/opengl + x11-libs/cairo + >=x11-libs/gtk+-3.14:3 + x11-libs/pango + colord? ( x11-libs/colord-gtk:0= ) + cups? ( net-print/cups ) + flickr? ( media-libs/flickcurl ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) + gphoto2? ( media-libs/libgphoto2:= ) + graphicsmagick? ( media-gfx/graphicsmagick ) + jpeg2k? ( media-libs/openjpeg:0 ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + webp? ( media-libs/libwebp:0= )" +RDEPEND="${CDEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" +DEPEND="${CDEPEND} + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext )" + +S="${WORKDIR}/${P/_/~}" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + use cpu_flags_x86_sse3 && append-flags -msse3 + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PRINT=$(usex cups) + -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCUSTOM_CFLAGS=ON + -DUSE_CAMERA_SUPPORT=$(usex gphoto2) + -DUSE_COLORD=$(usex colord) + -DUSE_FLICKR=$(usex flickr) + -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) + -DUSE_KWALLET=$(usex kwallet) + -DUSE_LIBSECRET=$(usex gnome-keyring) + -DUSE_LUA=OFF + -DUSE_MAP=$(usex geolocation) + -DUSE_NLS=$(usex nls) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENEXR=$(usex openexr) + -DUSE_OPENJPEG=$(usex jpeg2k) + -DUSE_OPENMP=$(usex openmp) + -DUSE_WEBP=$(usex webp) + ) + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf + + for lang in ${LANGS} ; do + use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_} + done + + if use pax_kernel && use opencl ; then + pax-mark Cm "${ED}"/usr/bin/${PN} || die + eqawarn "USE=pax_kernel is set meaning that ${PN} will be run" + eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary" + eqawarn "must be modified and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + + elog "when updating from the currently stable 1.6 series," + elog "please bear in mind that your edits will be preserved during this process," + elog "but it will not be possible to downgrade from 2.0 to 1.6 any more." + echo + ewarn "It will not be possible to downgrade!" +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-gfx/darktable/darktable-2.4.3.ebuild b/media-gfx/darktable/darktable-2.4.3.ebuild new file mode 100644 index 000000000000..2d418fad028b --- /dev/null +++ b/media-gfx/darktable/darktable-2.4.3.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils + +DOC_PV="2.4.0" +MY_PV="${PV/_/}" +MY_P="${P/_/.}" + +DESCRIPTION="A virtual lighttable and darkroom for photographers" +HOMEPAGE="https://www.darktable.org/" +SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" + +LICENSE="GPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="amd64 ~x86" +LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" +# TODO add lua once dev-lang/lua-5.2 is unmasked +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet +nls opencl openmp openexr pax_kernel webp +${LANGS// / l10n_}" + +# sse3 support is required to build darktable +REQUIRED_USE="cpu_flags_x86_sse3" + +CDEPEND=" + dev-db/sqlite:3 + dev-libs/json-glib + dev-libs/libxml2:2 + dev-libs/pugixml:0= + gnome-base/librsvg:2 + >=media-gfx/exiv2-0.25-r2:0=[xmp] + media-libs/lcms:2 + >=media-libs/lensfun-0.2.3:0= + media-libs/libpng:0= + media-libs/tiff:0 + net-libs/libsoup:2.4 + net-misc/curl + sys-libs/zlib:= + virtual/jpeg:0 + x11-libs/cairo + >=x11-libs/gtk+-3.14:3 + x11-libs/pango + colord? ( x11-libs/colord-gtk:0= ) + cups? ( net-print/cups ) + flickr? ( media-libs/flickcurl ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) + gphoto2? ( media-libs/libgphoto2:= ) + graphicsmagick? ( media-gfx/graphicsmagick ) + jpeg2k? ( media-libs/openjpeg:2= ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + webp? ( media-libs/libwebp:0= )" +RDEPEND="${CDEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" +DEPEND="${CDEPEND} + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) + opencl? ( + >=sys-devel/clang-4 + >=sys-devel/llvm-4 + )" + +PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch ) + +S="${WORKDIR}/${P/_/~}" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + use cpu_flags_x86_sse3 && append-flags -msse3 + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PRINT=$(usex cups) + -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCUSTOM_CFLAGS=ON + -DUSE_CAMERA_SUPPORT=$(usex gphoto2) + -DUSE_COLORD=$(usex colord) + -DUSE_FLICKR=$(usex flickr) + -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) + -DUSE_KWALLET=$(usex kwallet) + -DUSE_LIBSECRET=$(usex gnome-keyring) + -DUSE_LUA=OFF + -DUSE_MAP=$(usex geolocation) + -DUSE_NLS=$(usex nls) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENEXR=$(usex openexr) + -DUSE_OPENJPEG=$(usex jpeg2k) + -DUSE_OPENMP=$(usex openmp) + -DUSE_WEBP=$(usex webp) + ) + CMAKE_BUILD_TYPE="RELWITHDEBINFO" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf + + for lang in ${LANGS} ; do + use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_} + done + + if use pax_kernel && use opencl ; then + pax-mark Cm "${ED}"/usr/bin/${PN} || die + eqawarn "USE=pax_kernel is set meaning that ${PN} will be run" + eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary" + eqawarn "must be modified and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + + elog "when updating from the currently stable 1.6 series," + elog "please bear in mind that your edits will be preserved during this process," + elog "but it will not be possible to downgrade from 2.0 to 1.6 any more." + echo + ewarn "It will not be possible to downgrade!" +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-gfx/darktable/darktable-2.4.4.ebuild b/media-gfx/darktable/darktable-2.4.4.ebuild new file mode 100644 index 000000000000..76721f6a80a4 --- /dev/null +++ b/media-gfx/darktable/darktable-2.4.4.ebuild @@ -0,0 +1,145 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils eutils flag-o-matic gnome2-utils pax-utils toolchain-funcs xdg-utils + +DOC_PV="2.4.0" +MY_PV="${PV/_/}" +MY_P="${P/_/.}" + +DESCRIPTION="A virtual lighttable and darkroom for photographers" +HOMEPAGE="https://www.darktable.org/" +SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_PV}/${MY_P}.tar.xz + doc? ( https://github.com/darktable-org/${PN}/releases/download/release-${DOC_PV}/${PN}-usermanual.pdf -> ${PN}-usermanual-${DOC_PV}.pdf )" + +LICENSE="GPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +LANGS=" ca cs da de es fr he hu it ja nl pl ru sk sl sv uk" +# TODO add lua once dev-lang/lua-5.2 is unmasked +IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet +nls opencl openmp openexr pax_kernel webp +${LANGS// / l10n_}" + +# sse3 support is required to build darktable +REQUIRED_USE="cpu_flags_x86_sse3" + +CDEPEND=" + dev-db/sqlite:3 + dev-libs/json-glib + dev-libs/libxml2:2 + dev-libs/pugixml:0= + gnome-base/librsvg:2 + >=media-gfx/exiv2-0.25-r2:0=[xmp] + media-libs/lcms:2 + >=media-libs/lensfun-0.2.3:0= + media-libs/libpng:0= + media-libs/tiff:0 + net-libs/libsoup:2.4 + net-misc/curl + sys-libs/zlib:= + virtual/jpeg:0 + x11-libs/cairo + >=x11-libs/gtk+-3.14:3 + x11-libs/pango + colord? ( x11-libs/colord-gtk:0= ) + cups? ( net-print/cups ) + flickr? ( media-libs/flickcurl ) + geolocation? ( >=sci-geosciences/osm-gps-map-1.1.0 ) + gnome-keyring? ( >=app-crypt/libsecret-0.18 ) + gphoto2? ( media-libs/libgphoto2:= ) + graphicsmagick? ( media-gfx/graphicsmagick ) + jpeg2k? ( media-libs/openjpeg:2= ) + opencl? ( virtual/opencl ) + openexr? ( media-libs/openexr:0= ) + webp? ( media-libs/libwebp:0= )" +RDEPEND="${CDEPEND} + kwallet? ( >=kde-frameworks/kwallet-5.34.0-r1 )" +DEPEND="${CDEPEND} + dev-util/intltool + virtual/pkgconfig + nls? ( sys-devel/gettext ) + opencl? ( + >=sys-devel/clang-4 + >=sys-devel/llvm-4 + )" + +PATCHES=( "${FILESDIR}"/"${PN}"-find-opencl-header.patch ) + +S="${WORKDIR}/${P/_/~}" + +pkg_pretend() { + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi +} + +src_prepare() { + use cpu_flags_x86_sse3 && append-flags -msse3 + + cmake-utils_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DBUILD_PRINT=$(usex cups) + -DCMAKE_INSTALL_DOCDIR="/usr/share/doc/${PF}" + -DCUSTOM_CFLAGS=ON + -DUSE_CAMERA_SUPPORT=$(usex gphoto2) + -DUSE_COLORD=$(usex colord) + -DUSE_FLICKR=$(usex flickr) + -DUSE_GRAPHICSMAGICK=$(usex graphicsmagick) + -DUSE_KWALLET=$(usex kwallet) + -DUSE_LIBSECRET=$(usex gnome-keyring) + -DUSE_LUA=OFF + -DUSE_MAP=$(usex geolocation) + -DUSE_NLS=$(usex nls) + -DUSE_OPENCL=$(usex opencl) + -DUSE_OPENEXR=$(usex openexr) + -DUSE_OPENJPEG=$(usex jpeg2k) + -DUSE_OPENMP=$(usex openmp) + -DUSE_WEBP=$(usex webp) + ) + CMAKE_BUILD_TYPE="RELWITHDEBINFO" + cmake-utils_src_configure +} + +src_install() { + cmake-utils_src_install + use doc && dodoc "${DISTDIR}"/${PN}-usermanual-${DOC_PV}.pdf + + for lang in ${LANGS} ; do + use l10n_${lang} || rm -r "${ED}"/usr/share/locale/${lang/-/_} + done + + if use pax_kernel && use opencl ; then + pax-mark Cm "${ED}"/usr/bin/${PN} || die + eqawarn "USE=pax_kernel is set meaning that ${PN} will be run" + eqawarn "under a PaX enabled kernel. To do so, the ${PN} binary" + eqawarn "must be modified and this *may* lead to breakage! If" + eqawarn "you suspect that ${PN} is broken by this modification," + eqawarn "please open a bug." + fi +} + +pkg_preinst() { + gnome2_icon_savelist +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + + elog "when updating from the currently stable 1.6 series," + elog "please bear in mind that your edits will be preserved during this process," + elog "but it will not be possible to downgrade from 2.0 to 1.6 any more." + echo + ewarn "It will not be possible to downgrade!" +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update +} diff --git a/media-gfx/darktable/darktable-2.6.2.ebuild b/media-gfx/darktable/darktable-2.6.0.ebuild index 16cb27650ab5..0a6833989c25 100644 --- a/media-gfx/darktable/darktable-2.6.2.ebuild +++ b/media-gfx/darktable/darktable-2.6.0.ebuild @@ -17,7 +17,7 @@ SRC_URI="https://github.com/darktable-org/${PN}/releases/download/release-${MY_P LICENSE="GPL-3 CC-BY-3.0" SLOT="0" KEYWORDS="~amd64 ~x86" -LANGS=" ca de es fi fr hu ja nb nl pl pt-BR ru sl" +LANGS=" ca de fi fr hu ja nb nl pt-BR ru sl" # TODO add lua once dev-lang/lua-5.2 is unmasked IUSE="colord cups cpu_flags_x86_sse3 doc flickr geolocation gnome-keyring gphoto2 graphicsmagick jpeg2k kwallet nls opencl openmp openexr pax_kernel webp diff --git a/media-gfx/duhdraw/Manifest b/media-gfx/duhdraw/Manifest index ac3add273cfd..e18005eba24e 100644 --- a/media-gfx/duhdraw/Manifest +++ b/media-gfx/duhdraw/Manifest @@ -1,5 +1,5 @@ -AUX duhdraw-2.8.13-macos.patch 248 BLAKE2B ba9bd84d8cf3b271dd8292062894c76ff4e2d18a114326d505b1a4bd135a49420b0984554e894162ae292297836268d7e1868b635be9d7641d021135a60d9845 SHA512 5ee28dd33ad8589c64a69de3eac5636a178419061df167228be2f63f88c626f9a1d8f0df03d3c5890c42b7fa90d3a330d39a808579451345feb584fce5429ae0 -AUX duhdraw-2.8.13-prestrip.patch 344 BLAKE2B dc84ac31a40a9fc57b2a0edc6454a3b0f1df3ad7b280bad84e9443c52eb64ba6c0396c93b6048561aee0c2d48fc5c02128ee21eb68f3dfaf63e19f479c21b5a0 SHA512 461a167ccc609b96f2a4fc8064cda9a97f22952f17c08a68e4980e7366a1fe91685fce7bdf2a5aa6e59aa8b5ebf0d9ada640c67ad64ba59c8b0d7d10a047b3d2 +AUX duhdraw-2.8.13-macos.patch 329 BLAKE2B b1529683f8468e9396183e1c552618a74b0a501b78b3d2f3df430097a268e7b07957060a187fcbecad7a656f64f3c096f53c01de2e9cd87936c4509232f8beb3 SHA512 6a971ed804c04594e88b240a7361a94f61c721ff47fd3e81d99af812cf20ded8a4ef5213b644eaeee76d73145f5057d3839569941b060e7b93589debe0c73e40 +AUX duhdraw-2.8.13-prestrip.patch 425 BLAKE2B 11c6a67f2608356e1ba3021face193067b09e6c5b72a2c44567b3dc78242aff5271b00f41de17250a5b634b60db7b4c95428f527414533354337dc83bab3644a SHA512 cc37c5e6c41b9e4088f956db44241ebca6e34a01e89f87e0d28674395569af4cbe69b8a03f6ef9ec131d87ec38eb34992da17360f674f583e6275fce20732fe1 DIST duhdraw-2.8.13.tar.gz 51779 BLAKE2B 7d87c9bb7a23b9c520636dacec34ca20281bf68e650dfb133cfaf59e3f71e27fa2086f1aee60ce9c01e5f0a6c6483553fe1103ff503bfbb80df9679057ca8e49 SHA512 fa9102133dcd100b2cde58d4d92aabfcdf86bb16a8066191e92922d6cea470094ff226e569bf92d34e1f0f6a3e657eaf3326cecf091ed1bc37bd2faace340798 -EBUILD duhdraw-2.8.13-r1.ebuild 725 BLAKE2B dc9ec0bdb1a13615f9df2f9da00e8b29cc9fe07a3387e8f950c399f309ef56dbb3bc694055fc9010add162e2454c5b57ab1d4a9ac6b3a7b3cee4a76e3c6ea6eb SHA512 fe078f198a5587af0b56aa8bc27a4c5f31bce6af418c9907256c4f479b6b573bc8ec7da1797060bc5e167599be7d35767ced018a1b6e925b1747d9abf1af24f0 +EBUILD duhdraw-2.8.13-r1.ebuild 671 BLAKE2B 72d2da6e88d9fb162cc93e57f1db7369c9cf84947f236265ded6487293760bdd26b3d78eca95f7cc4f0587cfba00909613d66c0e1d2d48d265d40a1ade32b8b6 SHA512 453eaea31c3da4705c0eb8875ce9a1904b554a3420f1d7cb04fef5bc8c69fe1a9f062e59e085ba34a14ff9bf9bcf9709145f034ba8d46c88e2b50610fec39a0c MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f diff --git a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild index ead354248580..64e4f8d7f285 100644 --- a/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild +++ b/media-gfx/duhdraw/duhdraw-2.8.13-r1.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -inherit toolchain-funcs +EAPI=5 +inherit toolchain-funcs eutils DESCRIPTION="ASCII art editor" HOMEPAGE="http://www.cs.helsinki.fi/u/penberg/duhdraw" @@ -12,19 +12,16 @@ LICENSE="GPL-2" SLOT="0" KEYWORDS="amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos" -DEPEND="sys-libs/ncurses:0=" +DEPEND="sys-libs/ncurses" RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" -PATCHES=( - "${FILESDIR}"/${P}-macos.patch - "${FILESDIR}"/${P}-prestrip.patch -) +src_prepare() { + epatch "${FILESDIR}"/${P}-macos.patch + epatch "${FILESDIR}"/${P}-prestrip.patch +} src_compile() { - emake \ - CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" \ - LIBS="$($(tc-getPKG_CONFIG) --libs ncurses)" + emake CC="$(tc-getCC) ${CFLAGS} ${LDFLAGS}" } src_install() { diff --git a/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch b/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch index cdf18e48e41d..30be358e46d3 100644 --- a/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch +++ b/media-gfx/duhdraw/files/duhdraw-2.8.13-macos.patch @@ -1,5 +1,5 @@ ---- duhdraw-2.8.13/duhdraw.c -+++ duhdraw-2.8.13/duhdraw.c +--- ./duhdraw-2.8.13/duhdraw.c.orig 2005-03-02 09:22:46.000000000 +0100 ++++ ./duhdraw-2.8.13/duhdraw.c 2006-11-16 09:56:21.000000000 +0100 @@ -12,7 +12,9 @@ #include <stdio.h> #include <dirent.h> diff --git a/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch b/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch index 3112a015748d..0162f39370aa 100644 --- a/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch +++ b/media-gfx/duhdraw/files/duhdraw-2.8.13-prestrip.patch @@ -1,5 +1,5 @@ ---- duhdraw-2.8.13/Makefile -+++ duhdraw-2.8.13/Makefile +--- ./duhdraw-2.8.13/Makefile.orig 2005-03-02 09:22:46.000000000 +0100 ++++ ./duhdraw-2.8.13/Makefile 2006-11-16 09:58:29.000000000 +0100 @@ -12,15 +12,12 @@ ansi: cleanansi diff --git a/media-gfx/fontforge/Manifest b/media-gfx/fontforge/Manifest index 9a34822ac0a3..c296ee6d9b5a 100644 --- a/media-gfx/fontforge/Manifest +++ b/media-gfx/fontforge/Manifest @@ -2,8 +2,7 @@ AUX 20170731-PyMem_Free.patch 5579 BLAKE2B ffb048f9790ea237f37bedf17ec50087002c6 AUX 20170731-gethex-unaligned.patch 510 BLAKE2B ed943be0d150c8de7c99decf898cc4cfccf4c3990045a92af79b60c7e018a118996aa4f4b7146408b713b4eaf2b867110dc41d6c99ba302cdc522f62d035572a SHA512 ef4df9ac6589615f4ce619d073cb78dc9fcc281f24a01941567a09a9e536d105672856fa3fded436bddefac4de094d017ed51ace9d5bb0454f44dc373c95927b AUX 20170731-startnoui-FindOrMakeEncoding.patch 751 BLAKE2B c4a0248affa9117c5150aacb40a54bcb6f29d84866e1d193898f49a4fe58735eda2319856b6cfdbce450492871a5fe2255443849dd0f98ee70285614f7e44bb1 SHA512 0135717d9760a0bbf6d35ce21c19fb9019d3da01859882918a5643bbe6011a55eaf57ad07c8063c2c5c20cd6c6907420f8015abf54210ccdd75b2ba473e6b366 AUX 20170731-tilepath.patch 411 BLAKE2B 39ef99a26b85fc25d6c0b778a6b0ddfdb2c366b6456bd8ed47b12ca8681e8970e65e3b69cd06880794832f761c6de801d9e7c51e1edfff5abf434aa7f7dcc7c2 SHA512 026f6765b2db7549f72cd6ccff8d23bdf357ab24035c89cd792fa933f6033445f6cbaf7fa20f1372bdeda2caa242b9f8237f3019292cba0cc551c6de9e5c8341 -DIST fontforge-20190317.tar.gz 22762120 BLAKE2B 5cb85d2fb9a2a08fe64548f2667c026e916dd0239d17d8f8d7d2fe8ecb51f2106cf3dc6e6298014c0deadffbfe91925327b483ed4750a171fb621aea8bdee60b SHA512 55f9b0f7cafb1aa5a1461dbf39b52ca6b69a2baa6b761c8c28f86a0bb99e090d9ecc981294f51dadd9297b5ebd3036f01cb4f17b9a97a737eb567b4ae6522f20 DIST fontforge-dist-20170731.tar.xz 13985256 BLAKE2B 7bc49a3b7747de419e4fafb445062873cf9bf56aa73fd7499509b787a1c0fd6c47b0b5d7bfeb2a69d9237f9f66f989af968b0d00e9d5e57030906394f042f29c SHA512 26f7a40714460716a24dd0229fdb027f3766bcc48db64b8993436ddcb6277898f9f3b67ad4fc0be515b2b38e01370d1c7d9ee3c6ece1be862b7d8c9882411f11 +EBUILD fontforge-20170731-r3.ebuild 2790 BLAKE2B 8d0290229ff389cca1f1e4915801b1f9ee0683a55030eadec60da8c82d4177f47af0592b366c9f1c7b730568e01a98d202e9502647f91cfccb02c5ac0b7bc98b SHA512 f14898b95f7a457b793d5ebabc84ce845296c84fe7360ab6069db4c99b485b5231ff12285981ba0e6fabe815204fe0b5cf878f0c84d594622e367afb62497b89 EBUILD fontforge-20170731-r4.ebuild 2849 BLAKE2B 3989df4621ff1d3a29abce501a9aa3490daa2caceeee9205f8571c51ccbe6f2328e1cde3a2ebbfd954cdd75a86cce3a27cd38ed690927a7b3309000546bee4aa SHA512 2c5c592c8b637c04da4f532c5357fabdb8dd5850bdb77af6a24b8c0b7dfe539e16f86570f65f1e66cee2b97e79227552e4fafb2aa40aa9a1a06365eb49449f07 -EBUILD fontforge-20190317.ebuild 2587 BLAKE2B def6ade3b07db1efcf5a70acf7a5fc32ac9042d31a9e0ef0716516483b63a573748b2ac4da2f2f328549dbe0b55fcc7c9e9e2ebead60b52044a3f43226221db1 SHA512 f94e1313e7b0d377e62c10bddf4646dd4878325b870b2daaddb810f590ce322c865e638aa5764f9e161216ac9fd0f9f9ca0db30ada6340724ebbb47cf7745a8a MISC metadata.xml 908 BLAKE2B 57e840cbf69ebd2780ecaf5a3009905b782223a16339beae90acf1c087a185944e33fe952b477184244cb3f5f313fcce32a561ce903d751de457b77f4a90cd74 SHA512 973d4967be4eb7aad087ce977a4d94945a8894138604e8d37257dac97f74e98f7fb9a7cad7e7f46abb4c8c39dcb4bd79e9ad26f96838ad39ac1894e154834d28 diff --git a/media-gfx/fontforge/fontforge-20190317.ebuild b/media-gfx/fontforge/fontforge-20170731-r3.ebuild index ab6e67576687..4fd342e71902 100644 --- a/media-gfx/fontforge/fontforge-20190317.ebuild +++ b/media-gfx/fontforge/fontforge-20170731-r3.ebuild @@ -1,32 +1,30 @@ -# Copyright 2004-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 -PYTHON_COMPAT=( python{2_7,3_{5,6,7}} ) +PYTHON_COMPAT=( python{2_7,3_4,3_5} ) -inherit python-single-r1 xdg +inherit gnome2-utils python-single-r1 xdg-utils DESCRIPTION="postscript font editor and converter" HOMEPAGE="http://fontforge.github.io/" -SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-${PV}.tar.gz" +SRC_URI="https://github.com/fontforge/fontforge/releases/download/${PV}/fontforge-dist-${PV}.tar.xz" LICENSE="BSD GPL-3+" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="cairo truetype-debugger gif gtk jpeg png +python readline test tiff svg unicode X" RESTRICT="!test? ( test )" REQUIRED_USE=" cairo? ( png ) - gtk? ( cairo ) python? ( ${PYTHON_REQUIRED_USE} ) test? ( png python ) " RDEPEND=" - dev-libs/glib dev-libs/libltdl:0 dev-libs/libxml2:2= >=media-libs/freetype-2.3.7:2= @@ -39,7 +37,7 @@ RDEPEND=" png? ( media-libs/libpng:0= ) tiff? ( media-libs/tiff:0= ) truetype-debugger? ( >=media-libs/freetype-2.3.8:2[fontforge,-bindist(-)] ) - gtk? ( >=x11-libs/gtk+-3.10:3 ) + gtk? ( x11-libs/gtk+:2= ) python? ( ${PYTHON_DEPS} ) readline? ( sys-libs/readline:0= ) unicode? ( media-libs/libuninameslist:0= ) @@ -51,11 +49,9 @@ RDEPEND=" !media-gfx/pfaedit " DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" -BDEPEND=" sys-devel/gettext virtual/pkgconfig + X? ( x11-base/xorg-proto ) " # Needs keywording on many arches. @@ -64,7 +60,11 @@ BDEPEND=" # >=net-libs/zeromq-4.0.4:0= # ) +S="${WORKDIR}/fontforge-2.0.${PV}" + PATCHES=( + "${FILESDIR}"/20170731-startnoui-FindOrMakeEncoding.patch + "${FILESDIR}"/20170731-tilepath.patch "${FILESDIR}"/20170731-gethex-unaligned.patch ) @@ -76,6 +76,7 @@ src_configure() { local myeconfargs=( --disable-static $(use_enable truetype-debugger freetype-debugger "${EPREFIX}/usr/include/freetype2/internal4fontforge") + $(use_enable gtk gtk2-use) $(use_enable python python-extension) $(use_enable python python-scripting) --enable-tile-path @@ -92,11 +93,6 @@ src_configure() { --without-libzmq $(use_with X x) ) - if use gtk; then - # broken AC_ARG_ENABLE usage - # https://bugs.gentoo.org/681550 - myeconfargs+=( --enable-gdk=gdk3 ) - fi econf "${myeconfargs[@]}" } @@ -108,5 +104,17 @@ src_compile() { src_install() { default - find "${ED}" -name '*.la' -type f -delete || die + find "${D}" -name '*.la' -delete || die +} + +pkg_postrm() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postinst() { + gnome2_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update } diff --git a/media-gfx/fotoxx/Manifest b/media-gfx/fotoxx/Manifest index 4a6f2d779be7..ff91e8c6defb 100644 --- a/media-gfx/fotoxx/Manifest +++ b/media-gfx/fotoxx/Manifest @@ -1,4 +1,4 @@ AUX fotoxx-15.05.patch 460 BLAKE2B 95f19579fecaa13dacf5249cae1e05561070f2ac9cf8856d17d0bbf0e4b4c55ea476960f5e49580200e190d0f84daa3c29862a1414848a14b6d72a058b694767 SHA512 e4d2ddd827de492ac4890c8c8b34719b9dcc6acd555de60c7d5bef35d8c0dca032635fac9b989c92594ea92d5bd47c0300acca9074696058321bd401fdbb7b0b DIST fotoxx-15.05.tar.gz 3573278 BLAKE2B 0a7f564b2a31cf7db131d8a09a8624f087b7a5beb377949843d99d5933d5b16fb270177fe233f943af7f26753fffc6a52a5a5feea18c065f0dd99a74256a33f0 SHA512 07155e5f32c0ada33dd95de333a4a124c9fc56b3807bb2edc2b078f0eab37968f374f84701bb8ce9b200f00ed4587c83f772899ba39527378d3527050960ac0e -EBUILD fotoxx-15.05.ebuild 1151 BLAKE2B e57effd1bcc1ef9f867e9c93a0080c55f108ed87a9c7e1ee58faeb4632e23f06939f8aa2d97347ef25e58cdd96784e00960abf944886d0450873e259a021de64 SHA512 7fbb27c242856ea797982b6799a558394da5e245b1adad434fcfa087a8f4b11ab5665f1ca8419943ca7ae74ff7f96e16c0c1a4dede948fbb93e0842d1af69f7f +EBUILD fotoxx-15.05.ebuild 1146 BLAKE2B f1a7701b0fe1d9e23a3e644aa05c7683b55fbaaa048757d88104c843c9864e45eb5e9d8489ec5c275463f09e01742da9275f044a3c1986550812655a1bf4d994 SHA512 aa6838cf7d5461c9b5526641979b50e1d742247dca5703ccad0e161d43ea4765cc2c90b422e8bdb5680eb022407afbfb343286a9a29dc00f0f14e478945e387e MISC metadata.xml 773 BLAKE2B 75c03d8cf914e9aeb25db837d5e945908082d8711b19fbeb8694371ebb8c2ff6c69088dd4c887ce4f29eb456e2f412f6d992ac04c447a31e814838dbf5932aa1 SHA512 1fbf87c22810a242a8d7f0e91e6ee6bcb6b1a08cb39c3e827171e110bdcc5468a2440c42d56f1630860555a54fee0133483d8551dac164492bb630fcb45c7cc8 diff --git a/media-gfx/fotoxx/fotoxx-15.05.ebuild b/media-gfx/fotoxx/fotoxx-15.05.ebuild index dd440e48f705..0a425e4da1d4 100644 --- a/media-gfx/fotoxx/fotoxx-15.05.ebuild +++ b/media-gfx/fotoxx/fotoxx-15.05.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -6,7 +6,7 @@ EAPI=6 inherit desktop toolchain-funcs xdg-utils DESCRIPTION="Program for improving image files made with a digital camera" -HOMEPAGE="https://www.kornelix.net/fotoxx/fotoxx.html" +HOMEPAGE="http://www.kornelix.com/fotoxx.html" SRC_URI="http://www.kornelix.com/uploads/1/3/0/3/13035936/${P}.tar.gz" LICENSE="GPL-3" diff --git a/media-gfx/gif2png/Manifest b/media-gfx/gif2png/Manifest index 50b6b2ffd1ed..7a10f0068e89 100644 --- a/media-gfx/gif2png/Manifest +++ b/media-gfx/gif2png/Manifest @@ -1,9 +1,10 @@ AUX gif2png-2.5.11-makefile.patch 968 BLAKE2B ccc9c0955d105a6be48bd5e761304c11d451b8e0afcdbe60c168cc7f530041140e78b10c63a8791a74ce736f888e9be511ef63d2037304551f5fd368ee11ffd6 SHA512 d5d10837171ebf0db971a3a0513e34f94b4a070f4cf61dcb38b3e301edb7d151c2965e2bf483dd6a0631fbc98d621a4b02f53aac6bed8ed85549dc12b7423756 -AUX gif2png-2.5.12-makefile.patch 1049 BLAKE2B bbf558d2fbfeea6ea5c4b8bc863541f2118d93994b78d80390cbad4179d739e2a547a06359a13d0e2a0c2b9dd056a62e0a7a954043e69ea35a57e6082c1bba9e SHA512 1c0278626ead4640eeae69408020007fcc96fd6078fe6abcc5ab81c1fec2a89eb8ccdf134bd22c8b4e26abfe390aded4fda3a9d9ccf600e2128bcf1ebcaef735 +DIST gif2png-2.5.10.tar.gz 138944 BLAKE2B bb299a4a00920f2979455f63e8c0cdedd4046fd3cf726cf30bc73ab476277002a828f7c1f59e2292f08d53742038c11ded13d8b9f1fa7bc2c7e07b25cb3cb120 SHA512 3ca1c0d41a38b4b628f929afa231b8f67079f9998210e63b68e4438379a5d70b64d332f7e0786fb199ef866e188f5095c0d0d4570ec9da829aeac63c8918ad3e DIST gif2png-2.5.11.tar.gz 31507 BLAKE2B d35c1afc8dc790fb99ee819495eb41ac6d0555d14c12707c0f844a33f631d7d6e074776b8f51b1439b0b0ee608f67622d92de761f42e44e2974b24f47ad0db0c SHA512 c7e42aca45f941bca970ff14f49881f485c4dee18be448ae71aa7c80dabd9384bcba6d6de05a0a78757150b3e775d99df315231ddae8e32c91c08f1c9cfefb67 -DIST gif2png-2.5.12.tar.gz 31613 BLAKE2B 8614d3e0435bab334465d3f43d8676a80f1041e6cd5572fb525295c00d9027b505741331bd3df452d55e8f49893ab611832f2d4d150794d268a436a04f5f20b2 SHA512 481775d0efc65e0606a60546ed2a1e4a976587ca1a406620f8ea9126b32dc810d3b549cc99ba33ff9f88379de2ce47a799840b92978ee621bd18d3ae08b2c6a8 +DIST gif2png-2.5.8.tar.gz 128373 BLAKE2B a8b374661a03cdaaabe0a534f5fcbe1c56f40bb74cdf73bfe2a7b8f4fdbc2ac078bdd30a9232795ee804963bed1a36ec5d81e7494595de644591f6b4f855fefd SHA512 050c516c125efda315e6bc7e4fadcdd612a9596bd1e6f611865a457efb06153a45516eca343422e15ad75b1219f82ec855f03781285df411590008f5a67e0554 DIST gif2png-2.5.9.tar.gz 137750 BLAKE2B a5fb0570f6263c1911a4cad52f1b974f8010a02cf882f2e1e40ed7dbbce4be8b75290e4b0a78b5dde74cc244c9a848dd429a937e696746d3d39b8cec9dd469fd SHA512 0632f1b4b96a1e4b5567101fbac36db55e658503977c8c875d75d9c1db5b374deba5afbda5507585b6b79242781fd70afc477e686458cc124adb8e1b29860c1e +EBUILD gif2png-2.5.10.ebuild 476 BLAKE2B 4720d8061e93f87f241d981c3c5fd116df76ae4a5f876e4029868b374219936de4b526d1c923730565eb8d80d67988bfbb8d7a64a63bd994424d88f9217651a6 SHA512 5e94bc0156e9e0c21c12b1998c63fc1731db0501eb4b6e65286cadf4b3f6cacf40d4df9f7bea78a258affcd0cd2b25157344900f1bd6ce9970e8e5a1ac9be040 EBUILD gif2png-2.5.11.ebuild 620 BLAKE2B f7db5fdcab6140e9d69e2e9a55a52f14b0374a978a0023c492aa3255120775102c64f9f1ec8d4071418dcb6110aa7a55be2208f6d389f062a733b3baacc31823 SHA512 b6b173a8a3cb48eba996253cc28eb7835d902e13db7f67c55f6e6634a27ca81a3e850eee322508e21d8127fbcfef34fe437e743a036513e4af2f363e41a8b5c1 -EBUILD gif2png-2.5.12.ebuild 824 BLAKE2B 9102092ff19c7f7c8e2628a1d93699c628202e50f0d587a2c05bf0c6dbe7cbb51f524403435552ca08b3c98a6666822eda153e363514a73a01f99bfdf9702a6e SHA512 22fd274b541e4779a990009a3365a830f85b26835385c1ece11a3cf266474b90bdab477bd73e15a91e32c5c947565c7519bfc3dba00d1fe87639a06f1e740ca1 +EBUILD gif2png-2.5.8.ebuild 472 BLAKE2B 082fe78d6b0aaeb507e7d3d8e2693e93d8de888da1b0d1fa52e0f45164d53c0c7b98fe534a70377353db38f31c80a5ea4d93fb6e98c45c27bb7d4d6b9e2170f1 SHA512 7e71654906afee75a3b094ed796ccdba126b1e8c635bbd65ed018222be651a65fd5cd2ac84346beb0d2fbb305f7c8040f5dccb553ffbbcb0b80b3fcc74249daa EBUILD gif2png-2.5.9.ebuild 472 BLAKE2B 7e87e3e7bcc682a9d0642882312fce3c9cd70a47a427be947989cad1fe66f49fbb82404b417c8388c60cc4bd313a4ca6a94062a430ee465403f1ad0031e31734 SHA512 e3fed27af7cd3ccfbe2ee618a547fc3a7a5729cef1fa48798a9f8001de6b08a23ce67a239cf33b96ff8a41a49e2941c1f68e93271de626a7a605813ac6745d8e MISC metadata.xml 255 BLAKE2B f12a1ca502ad96bd6de4c8b83dfb8887ab70dec78f10a8b52dcd4618eb182192477ddca18738d734a43f3c7ac3b5e0955f4ae9347ea80e788a92974c7d50a574 SHA512 b7bc93530a1726c2d4dfbc71ae29cfbb57712fd9fdd2e76fd52f35ab4368cba0497b50145d1527a3b79e465d459a380821bb1371a01c2e915dc9adc6c7fafd5f diff --git a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch b/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch deleted file mode 100644 index e99180f8686e..000000000000 --- a/media-gfx/gif2png/files/gif2png-2.5.12-makefile.patch +++ /dev/null @@ -1,42 +0,0 @@ -Respect CFLAGS/LDFLAGS/DESTDIR and don't try to run missing tests. - ---- gif2png-2.5.12/Makefile -+++ gif2png-2.5.12/Makefile -@@ -2,8 +2,7 @@ - - VERSION = $(shell sed -n <NEWS '/::/s/^\([^:]*\).*/\1/p' | head -1) - --CFLAGS = -DVERSION=\"$(VERSION)\" -O2 --LDFLAGS = -s -+CFLAGS = -DVERSION=\"$(VERSION)\" - - SOURCES = 437_l1.c gif2png.c gifread.c memory.c version.c - OBJECTS = $(SOURCES:.c=.o) -@@ -28,22 +27,19 @@ - web2png.1: web2png.xml - xmlto man web2png.xml - --check: -- cd test; make --quiet test -- - clean: - rm -f gif2png *.o gif2png.1 web2png.1 - - version: - @echo $(VERSION) - --prefix?=/usr -+prefix ?= /usr - - install: gif2png gif2png.1 web2png.1 -- mkdir -p $(prefix)/bin -- mkdir -p $(prefix)/share/man/man1 -- cp gif2png web2png $(prefix)/bin/ -- cp gif2png.1 web2png.1 $(prefix)/share/man/man1/ -+ mkdir -p $(DESTDIR)$(prefix)/bin -+ mkdir -p $(DESTDIR)$(prefix)/share/man/man1 -+ cp gif2png web2png $(DESTDIR)$(prefix)/bin/ -+ cp gif2png.1 web2png.1 $(DESTDIR)$(prefix)/share/man/man1/ - - uninstall: - rm $(prefix)/bin/gif2png $(prefix)/bin/web2png diff --git a/media-gfx/gif2png/gif2png-2.5.10.ebuild b/media-gfx/gif2png/gif2png-2.5.10.ebuild new file mode 100644 index 000000000000..6d952faaee56 --- /dev/null +++ b/media-gfx/gif2png/gif2png-2.5.10.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2015 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +DESCRIPTION="Converts images from gif format to png format" +HOMEPAGE="http://catb.org/~esr/gif2png/" +SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="" + +RDEPEND=">=media-libs/libpng-1.2:0 + sys-libs/zlib" +DEPEND="${RDEPEND}" + +DOCS="AUTHORS NEWS README" diff --git a/media-gfx/gif2png/gif2png-2.5.12.ebuild b/media-gfx/gif2png/gif2png-2.5.12.ebuild deleted file mode 100644 index 937a694a8ebb..000000000000 --- a/media-gfx/gif2png/gif2png-2.5.12.ebuild +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit toolchain-funcs - -DESCRIPTION="Converts images from gif format to png format" -HOMEPAGE="http://catb.org/~esr/gif2png/" -SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz" - -LICENSE="ZLIB" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos" - -RDEPEND=">=media-libs/libpng-1.2:0= - sys-libs/zlib:=" -DEPEND="${RDEPEND}" - -PATCHES=( - "${FILESDIR}"/${PN}-2.5.12-makefile.patch -) - -src_prepare() { - default - - # this release lacks the NEWS file that is being used to - # query the release version - # https://gitlab.com/esr/gif2png/issues/4 - sed "s@^VERSION.*@VERSION = ${PV}@" -i Makefile || die - - tc-export CC -} - -src_install() { - emake DESTDIR="${D}" prefix="${EPREFIX}/usr" install -} diff --git a/media-gfx/gif2png/gif2png-2.5.8.ebuild b/media-gfx/gif2png/gif2png-2.5.8.ebuild new file mode 100644 index 000000000000..e3d4326da751 --- /dev/null +++ b/media-gfx/gif2png/gif2png-2.5.8.ebuild @@ -0,0 +1,19 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=4 + +DESCRIPTION="Converts images from gif format to png format" +HOMEPAGE="http://catb.org/~esr/gif2png/" +SRC_URI="http://catb.org/~esr/${PN}/${P}.tar.gz" + +LICENSE="ZLIB" +SLOT="0" +KEYWORDS="amd64 ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +IUSE="" + +RDEPEND=">=media-libs/libpng-1.2:0 + sys-libs/zlib" +DEPEND="${RDEPEND}" + +DOCS="AUTHORS NEWS README" diff --git a/media-gfx/gmic/Manifest b/media-gfx/gmic/Manifest index 31050e3db56a..cf64f92501c3 100644 --- a/media-gfx/gmic/Manifest +++ b/media-gfx/gmic/Manifest @@ -1,8 +1,6 @@ AUX gmic-2.4.3-curl.patch 2527 BLAKE2B 8bb6a9fb4aff5a1ae19437f93ec4336d87ab61f334a56c1d2083b0a8c02c37697795ea82f37d4caaf23edb37111d201db75315169a12f256571ad081f60b9890 SHA512 1c5cef3879749ab9a62e52ae5ac1c26ab60ff4b323352af9e7fb0f55b3ca7804290d03bd63dcaedb68c3d6fe43da332681a1eeb84543a1ac30163169ccee6368 DIST gmic_2.4.3.tar.gz 3816129 BLAKE2B 1c9dd6c7e45809d0cf8b8a45476a4b20ad321b5f34fbc5214cb149777c6e9a6aba845cd816cc1503010e281bda0b32e1059dd34d052afe2ebc086469163967be SHA512 482e70b0c82992799c5769ded1547904d16dbc9206d67279b6f524c1214258b97fa539678844a450d6f64144dc7a2715c754d6a1d85398e648bc34086fc3218f DIST gmic_2.4.5.tar.gz 3819428 BLAKE2B 71d19bf6d79ca00bf95006bd96595b83ee28caadf46a9c899176dcd96c5da1b3b9fa7b2150ea2383262c1db2357838c4c716c8ab09060c6c06faa5f7c52975c8 SHA512 39f7c35303704c579d62377f491830f6d310be672f3015aafbd6715c5fa1185d64671f841fd5e0cb818dfc96851afc6dbdbbb99f9b5156ccaeab91e7e1b08033 -DIST gmic_2.5.3.tar.gz 5278154 BLAKE2B 9549798eac0cf0cd869dcaeb14fca184bee3587ec8ac03f80e7f48002dfcd0afe4ad61f2c6a6f1929fb91c010aee3960d6301a0c6c6b6a2f32a7b62db9ddecb0 SHA512 fede101892d6867b83a8995dbc2b7f9e502401bf1ea952fbf95c459c932bb447693d6434e9562b00c9d96f109cbbb35d9ee876fa1f6ec9dfc52186276033e5a5 EBUILD gmic-2.4.3.ebuild 4306 BLAKE2B 608561cc5f9dc176f4b7951033a7a9cdcddf033bbc3f229a6a0a2ee72c08801ffc564b125eab25e1168bc8c93a8c60a6da2099337a1cd3483d087cff670bc094 SHA512 4b1501fd135e1133e6d8cf8404a20ee6155e04377821a00c0719679f8ce03e156d09a84f0c6104de356b9847f61c8d502db62bc1c2f31330f9d7b7d6b453ef99 EBUILD gmic-2.4.5.ebuild 4351 BLAKE2B e9baff4d80ff61668f29ed4fd4dc8ac4a289df1cd0e9b7981ba9de75880463a3a9371a6d38495a7186f04d9bb2be45ecbe23ddda7deca181981fc17bbcd36740 SHA512 135f2c950c90f0052c60c891b323a016d2ba9c78b937a88b0244c43e7239880a85742a178c4f5866aa75079ba28ce38db76d127c41f6aa4957d46b49c0087bcc -EBUILD gmic-2.5.3.ebuild 4346 BLAKE2B 7d403804948db22dec88c15ac345b8b76237370bbd879a1711154dee5d654b203b20d0416db23d2f313678b6965a42df033c678656d01e7b096fd1e180977d26 SHA512 53fb2252a564a6060587594498277037d3844ee5cf3837ae754104a7304895f3ca9d18fb779cf131b335d346d6b73ab255a3aa301b57b04b754a08457224438e MISC metadata.xml 547 BLAKE2B 0da3088e531217099bf3f690059d3725ba3c62ad9337dfbf3817584f95594a328b647b0a81eb4d58c2cbc030026bf2aa94e01c817b04072aea1caee435f6ef9f SHA512 e58e976f8e80eea8e3620888858d6386e5d922c842e08c39f7ad611a5fc96e5fb85e39864bc0e805dd20a2c19e02b9fb8d1a5eaaa470075ed73759dcdcd4fbee diff --git a/media-gfx/gmic/gmic-2.5.3.ebuild b/media-gfx/gmic/gmic-2.5.3.ebuild deleted file mode 100644 index bfd30752357e..000000000000 --- a/media-gfx/gmic/gmic-2.5.3.ebuild +++ /dev/null @@ -1,171 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -CMAKE_BUILD_TYPE=Release -CMAKE_MIN_VERSION=3.9 - -inherit cmake-utils bash-completion-r1 - -if [[ ${PV} == "9999" ]]; then - EGIT_REPO_URI="https://github.com/dtschump/gmic.git" - inherit git-r3 -else - SRC_URI="https://gmic.eu/files/source/${PN}_${PV}.tar.gz" - KEYWORDS="~amd64 ~x86" -fi - -DESCRIPTION="GREYC's Magic Image Converter" -HOMEPAGE="https://gmic.eu/ https://github.com/dtschump/gmic" - -LICENSE="CeCILL-2 GPL-3" -SLOT="0" -IUSE="+cli curl ffmpeg fftw gimp graphicsmagick jpeg krita opencv openexr openmp png qt5 static-libs tiff X zlib" -REQUIRED_USE=" - || ( cli gimp krita qt5 ) - gimp? ( png zlib fftw X ) - krita? ( png zlib fftw X ) - qt5? ( png zlib fftw X ) -" - -MIN_QT_VER="5.2.0" -QT_DEPEND=" - >=dev-qt/qtcore-${MIN_QT_VER}:5= - >=dev-qt/qtgui-${MIN_QT_VER}:5= - >=dev-qt/qtnetwork-${MIN_QT_VER}:5= - >=dev-qt/qtwidgets-${MIN_QT_VER}:5= -" -COMMON_DEPEND=" - curl? ( net-misc/curl ) - fftw? ( sci-libs/fftw:3.0=[threads] ) - gimp? ( - >=media-gfx/gimp-2.8.0 - ${QT_DEPEND} - ) - graphicsmagick? ( media-gfx/graphicsmagick:0= ) - jpeg? ( virtual/jpeg:0 ) - krita? ( ${QT_DEPEND} ) - opencv? ( >=media-libs/opencv-2.3.1a-r1:0= ) - openexr? ( - media-libs/ilmbase:0= - media-libs/openexr:0= - ) - png? ( media-libs/libpng:0= ) - qt5? ( ${QT_DEPEND} ) - tiff? ( media-libs/tiff:0 ) - X? ( - x11-libs/libX11 - x11-libs/libXext - ) - zlib? ( sys-libs/zlib:0= )" -RDEPEND="${COMMON_DEPEND} - ffmpeg? ( media-video/ffmpeg:0= ) -" -DEPEND="${COMMON_DEPEND} - virtual/pkgconfig - gimp? ( dev-qt/linguist-tools ) - krita? ( dev-qt/linguist-tools ) - qt5? ( dev-qt/linguist-tools ) -" - -pkg_pretend() { - if use openmp ; then - tc-has-openmp || die "Please switch to an openmp compatible compiler" - fi - - if ! test-flag-CXX -std=c++11 ; then - die "You need at least GCC 4.7.x or Clang >= 3.3 for C++11-specific compiler flags" - fi -} - -src_prepare() { - local PATCHES=( "${FILESDIR}"/${PN}-2.4.3-curl.patch ) - cmake-utils_src_prepare - sed -i '/CMAKE_CXX_FLAGS/s/-g //' CMakeLists.txt || die - - if use gimp || use krita || use qt5; then - sed -i '/CMAKE_CXX_FLAGS_RELEASE/d' gmic-qt/CMakeLists.txt || die - local S="${S}/gmic-qt" - PATCHES=() - cmake-utils_src_prepare - fi -} - -src_configure() { - local mycmakeargs=( - -DBUILD_LIB=ON - -DBUILD_LIB_STATIC=$(usex static-libs) - -DBUILD_CLI=$(usex cli) - -DBUILD_MAN=$(usex cli) - -DBUILD_BASH_COMPLETION=$(usex cli) - -DCUSTOM_CFLAGS=ON - -DENABLE_CURL=$(usex curl) - -DENABLE_X=$(usex X) - -DENABLE_FFMPEG=$(usex ffmpeg) - -DENABLE_FFTW=$(usex fftw) - -DENABLE_GRAPHICSMAGICK=$(usex graphicsmagick) - -DENABLE_JPEG=$(usex jpeg) - -DENABLE_OPENCV=$(usex opencv) - -DENABLE_OPENEXR=$(usex openexr) - -DENABLE_OPENMP=$(usex openmp) - -DENABLE_PNG=$(usex png) - -DENABLE_TIFF=$(usex tiff) - -DENABLE_ZLIB=$(usex zlib) - -DENABLE_DYNAMIC_LINKING=ON - ) - - cmake-utils_src_configure - - # configure gmic-qt frontends - local CMAKE_USE_DIR="${S}/gmic-qt" - mycmakeargs=( - -DENABLE_DYNAMIC_LINKING=ON - -DENABLE_CURL=$(usex curl) - -DGMIC_LIB_PATH="${BUILD_DIR}" - -DGMIC_PATH="${S}/src" - ) - - if use gimp; then - mycmakeargs+=( -DGMIC_QT_HOST=gimp ) - BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_configure - fi - - if use krita; then - mycmakeargs+=( -DGMIC_QT_HOST=krita ) - BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_configure - fi - - if use qt5; then - mycmakeargs+=( -DGMIC_QT_HOST=none ) - BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_configure - fi -} - -src_compile() { - cmake-utils_src_compile - - # build gmic-qt frontends - local S="${S}/gmic-qt" - use gimp && { BUILD_DIR="${BUILD_DIR}"/gimp cmake-utils_src_compile || die "failed building gimp plugin" ; } - use krita && { BUILD_DIR="${BUILD_DIR}"/krita cmake-utils_src_compile || die "failed building krita plugin" ; } - use qt5 && { BUILD_DIR="${BUILD_DIR}"/qt5 cmake-utils_src_compile || die "failed building qt5 GUI" ; } -} - -src_install() { - cmake-utils_src_install - dodoc README - use cli && newbashcomp "${BUILD_DIR}"/resources/gmic_bashcompletion.sh ${PN} - - local PLUGINDIR="/usr/$(get_libdir)/gimp/2.0/plug-ins" - insinto "${PLUGINDIR}" - doins resources/gmic_cluts.gmz - - # install gmic-qt frontends - if use gimp; then - exeinto "${PLUGINDIR}" - doexe "${BUILD_DIR}"/gimp/gmic_gimp_qt - fi - use krita && dobin "${BUILD_DIR}"/krita/gmic_krita_qt - use qt5 && dobin "${BUILD_DIR}"/qt5/gmic_qt -} diff --git a/media-gfx/kgraphviewer/Manifest b/media-gfx/kgraphviewer/Manifest index 652722b3eb5f..3617f7ff907f 100644 --- a/media-gfx/kgraphviewer/Manifest +++ b/media-gfx/kgraphviewer/Manifest @@ -1,4 +1,3 @@ -AUX kgraphviewer-2.4.3-set-startupwmclass.patch 1045 BLAKE2B 8e48bc5a67cf8857a5eb5a57873fbe19a5a3cc52ef70d5c01ca3674d889acfa28dc46456caccd3a6078572b876e9f73b15e483f46fe35f82bd6fcdbed5d2312c SHA512 b4005bf61e448be43f7bcc3886ec092c9f2930e475067f4c1a382db4039dfdb580ce7e2a4765480438f80dc2e905013c43c8b65711f87fb14e62de73c60bedcd DIST kgraphviewer-2.4.3.tar.xz 1491328 BLAKE2B b51cf825ad4763538139f917a7d16d15a7244c19b3cab9c79bbd938ee3dd80e4e35e37012199e1256bcc9a9404d756cdb0f5ffb975484d527577c208ecf1d3fa SHA512 d18146ba380efe73e1ec716dd1cc310fe1eac23eccb10e2a699b107451637b9332cc25d62a4de762df4706cea182c9474ba1e885801c9832e1bb9bff1648e72d -EBUILD kgraphviewer-2.4.3-r1.ebuild 1024 BLAKE2B 940daf0846ae9311673255a8922bd87c975338bef4fd78254af9ef3b2f3deff78db481aa2a16d7895be05cc0f074f6ab23ca1bccddbcefa7a40e4098abfb265c SHA512 e9f566e219c313f20bbf1c49320c919fd0ad52cb89865eae1f33b29f8f803dc9f80a91606c3cc3079381b8d04707b57f7b562de569f121605132590fa1947b35 +EBUILD kgraphviewer-2.4.3.ebuild 971 BLAKE2B cd38fbfe2c701f736ec608f1c3f658dc315254f398bc1b82a88b72588408dedfbfff09d392b43aaf86eaf39f1833cae9373f029d65d37fc2235ed438cc8bf53b SHA512 33d7d4e16eb680de6dd39b2e93bed30ddf28bcb35ff20ccf804bf81daf04e4fbbb609e7e8aa6be9c2b562d1a4fd7901cf2858124f32938687521b7907dacbfb5 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch b/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch deleted file mode 100644 index 970bf57f2cfb..000000000000 --- a/media-gfx/kgraphviewer/files/kgraphviewer-2.4.3-set-startupwmclass.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 50fea8d6413e06fcfaf0d0ca03cc6c266a1cda14 Mon Sep 17 00:00:00 2001 -From: "Friedrich W. H. Kossebau" <kossebau@kde.org> -Date: Tue, 5 Feb 2019 04:49:16 +0100 -Subject: Set StartupWMClass in desktop file - -Used by non-Plasma unixoid X-based shells to map windows to desktop files -e.g. in launcher UIs, which do not know about _KDE_NET_WM_DESKTOP_FILE and -instead expect (one of) the WM_CLASS entries to match the basename of the -desktop file by default. StartupWMClass overwrites that default. ---- - src/org.kde.kgraphviewer.desktop | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/org.kde.kgraphviewer.desktop b/src/org.kde.kgraphviewer.desktop -index bfff1bf..6b3affb 100644 ---- a/src/org.kde.kgraphviewer.desktop -+++ b/src/org.kde.kgraphviewer.desktop -@@ -41,6 +41,7 @@ MimeType=text/vnd.graphviz - Exec=kgraphviewer -qwindowtitle %c %u - Icon=kgraphviewer - Type=Application -+StartupWMClass=kgraphviewer - Categories=Qt;KDE;Graphics;Viewer;2DGraphics;DataVisualization; - X-DocPath=kgraphviewer/index.html - InitialPreference=10 --- -cgit v1.1 diff --git a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild b/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild index 80476c054574..3bc5085a5a82 100644 --- a/media-gfx/kgraphviewer/kgraphviewer-2.4.3-r1.ebuild +++ b/media-gfx/kgraphviewer/kgraphviewer-2.4.3.ebuild @@ -1,13 +1,13 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 KDE_HANDBOOK="forceoptional" inherit kde5 DESCRIPTION="Graphviz dot graph file viewer" -HOMEPAGE="https://kde.org/applications/graphics/kgraphviewer/" +HOMEPAGE="https://www.kde.org/applications/graphics/kgraphviewer/" [[ ${PV} != *9999* ]] && SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" LICENSE="GPL-2 GPL-2+ LGPL-2+ LGPL-2.1+ handbook? ( FDL-1.2 )" @@ -36,5 +36,3 @@ DEPEND="${COMMON_DEPEND} RDEPEND="${COMMON_DEPEND} !media-gfx/kgraphviewer:4 " - -PATCHES=( "${FILESDIR}/${P}-set-startupwmclass.patch" ) diff --git a/media-gfx/kxstitch/Manifest b/media-gfx/kxstitch/Manifest index 043f296a202f..121a9d1ff3a3 100644 --- a/media-gfx/kxstitch/Manifest +++ b/media-gfx/kxstitch/Manifest @@ -1,4 +1,4 @@ AUX kxstitch-2.1.1-qt-5.11.patch 992 BLAKE2B f0be157270ddd27e1f997f57afbb8e3d80c31816334664a7a2804c4c9971a81c11ecd775820b7fe0db36dff7ea00d046c7f005a0bf715e9336f4f238a36c2b18 SHA512 93d6a5ddc2fa928369b09637ee6b856ba60d35d02e5e93f16fc08c4fdbc2ebead44224d2ad98fa2ffe6efcea8b93a0211eb00ad83c9cd91b8ddc30edff17602e DIST kxstitch-2.1.1.tar.xz 1726364 BLAKE2B 47257408f31ca7db4bddf984150baac6cd850206cedb95c73b0d62ee9f966028afd97bb3653b385104a1c679512c35f41aa25c5b703c715e565d48cfda59da36 SHA512 d5a6b6d06bfb894dd7404cb81350389f1ebf5c8a463eb792358abd67f362d1e1f578d06319461a006625864f1c4a69ebb4ccd0db422870c3eae0516c9132a3b3 -EBUILD kxstitch-2.1.1-r1.ebuild 964 BLAKE2B 19695be54baf8f3a0f8d21eb48f02f13d9513672d89d7c3d0f22ca8d51356bf52360424fdb2b097d0f22890103b56e95a9afaedb6d98688384dd94c5f164b952 SHA512 6d962753cad9e1fec89043d9039e14996bc161d343447a8d674a1defceb1d4eaeec55e47f463b7685390282da01525cdaad0610ccabba1eb393e15a6f1160dd7 +EBUILD kxstitch-2.1.1.ebuild 996 BLAKE2B c4501fe2dd6f65972f32638ce780bdae756963aea4ae91c16a5963d6009345b61cb20449d9633928afe045efc4c260e044cf5b6507aba48cca4d30f6a0554cc5 SHA512 707d79a84adfcb6c17a7d2a9cfdaba94eccf10d4de2c2cf43f6759a638978f6f9e52a312445c1c12089a996d7da311c754faaa2bf7038ca6326e2fdbd42cbcb6 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild index bf995e2e238c..e9ec0691e3f9 100644 --- a/media-gfx/kxstitch/kxstitch-2.1.1-r1.ebuild +++ b/media-gfx/kxstitch/kxstitch-2.1.1.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 KDE_HANDBOOK="forceoptional" inherit kde5 @@ -15,10 +15,7 @@ SLOT="5" KEYWORDS="~amd64" IUSE="" -BDEPEND=" - sys-devel/gettext -" -DEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kcompletion) $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) @@ -36,7 +33,10 @@ DEPEND=" media-gfx/imagemagick[cxx] x11-libs/libX11 " -RDEPEND="${DEPEND} +DEPEND="${COMMON_DEPEND} + sys-devel/gettext +" +RDEPEND="${COMMON_DEPEND} !media-gfx/kxstitch:4 " diff --git a/media-gfx/libimagequant/Manifest b/media-gfx/libimagequant/Manifest index 3280c734fb39..59e7e2a28ffd 100644 --- a/media-gfx/libimagequant/Manifest +++ b/media-gfx/libimagequant/Manifest @@ -3,5 +3,5 @@ AUX libimagequant-2.12.2-respect-CFLAGS.patch 449 BLAKE2B fb3679a05e024a276b5ae1 DIST libimagequant-2.11.7.tar.gz 74311 BLAKE2B 204fbe794014c11d767991a03e729b234978fb1edb1fdffcb7d332461ccaa1a536a1e9dbc7b44a8838db61cc76fdbc1eb75087b480f4fc42bf791fea913639a2 SHA512 8816811c06eec27232e39725c581e382b7076f3bc23b017810de0e92236e6e4eb480def7b50347c9b75f7d792245669398c39a17359eb81077badf12e6f0a172 DIST libimagequant-2.12.2.tar.gz 75611 BLAKE2B 23f5d3666fd21696d4f4dab9db3669642a9e3f6ca971804b914e845018df538136c3db900419ac35230be9fd487b48e0ab672b653e2ee82387c19569b49d6cfc SHA512 7e7bfcffd163d8b73a46d523dc441e4a4726f5dde804f306f13900f74afae6f6e7cf780bf157b5823a71c790bcdd0e9c9c34cf43f84a21289e470fc78835d8d8 EBUILD libimagequant-2.11.7.ebuild 1191 BLAKE2B 61db0687381d1ad9c124e94be50b93bba3d70a3758dfdde81bbf3fe2a9a9ffd26cc73ef29ee1fc7bbd3fdab8947b7316c76622ca1c5f28f923212c63ca2c81fa SHA512 38db43ddfb6c4e8aad817dde0cc20ccf5397f4bcc4a3183a33d1256122a42a79ba6b079677746b31d17625b275f2e3d9e346e314a1311981b86d4add48238dce -EBUILD libimagequant-2.12.2.ebuild 1456 BLAKE2B 4e6c7a3b2781eccecc8be6875d9c0156537084b8baf1c5593a9fe6b34d31db4c6cfccf7faccd15ce95d112996a9f9729d7aa5b101b7bd2f55347f7b4c973d8d6 SHA512 bca314cdba2c204dd9281fcfc7b1fad94d77843364e2faa63a32787effdbda5c8d15d77df75d9ff14315fe746e4f337040e0ee5ff240fbc7ef3223882976ae1c +EBUILD libimagequant-2.12.2.ebuild 1457 BLAKE2B 835275cf0cfba833abd472b9ad71b90541766df82c0ae67b2702d85efa0d94693176663f648e19fde1f9df39a510c63657da9d534adf6fe311b0821263cf7349 SHA512 b7343fd41663b075834272736924bc9f7cb92f3ae5167ce21dc9175a9e112c5122762509995ae94546e90f2e3470d58c9906f9d4b8e9a708dfb1399c59f06eff MISC metadata.xml 527 BLAKE2B c3fa42153fa6cfede4de3d59e12063aeb44f67ce89d36be63c7df4671c57ecfdd43d08aee89bd96387ecbee2e41b1d5921e9ad2486b4dd8f06e6e93529afb0a8 SHA512 82b458b27288b6b49df16d5778f6c75b492d958bcc1c2f2950dee741bfddc82f561be50f590d3f891bf736ee67e5325ae297bf49f99c769ca97ac68042beee11 diff --git a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild index 9bb6ee7ea6d6..51cfc32c7338 100644 --- a/media-gfx/libimagequant/libimagequant-2.12.2.ebuild +++ b/media-gfx/libimagequant/libimagequant-2.12.2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/ImageOptim/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz LICENSE="GPL-3" SLOT="0/0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" IUSE="cpu_flags_x86_sse2 debug openmp static-libs" DEPEND="" diff --git a/media-gfx/simple-scan/Manifest b/media-gfx/simple-scan/Manifest index 5fac865f3256..95b9b67342e4 100644 --- a/media-gfx/simple-scan/Manifest +++ b/media-gfx/simple-scan/Manifest @@ -1,6 +1,6 @@ AUX 3.26-add-control-optional-deps.patch 2773 BLAKE2B e6c3faa98ecda13c926752defef389fd155f615df2010d8499aba7870b929f520662f5c718f457edd5f14f68c26d63ab58a5ee1a583af9f5721d4cf4141385a8 SHA512 e786172609ca64afa85663077794cb146edf7f59bd6187bc253d2ab682f5cf244f5238df18648641f7450ce6add97f2db1adfa11b52a3ba5e29c16356e9fac08 DIST simple-scan-3.24.1.tar.xz 669452 BLAKE2B 927c3479a96525e2996aab7c8d37b585f93fb07315a4f5cb0292b29befb0417df6e6afb059158d9840903d7474bf0d4fb97e634c585ca7654581b82a264e80f0 SHA512 9f0ced644b13dcaad4f1e23a6520b1cbe3c36d995fca4791383f959986cd396f123638a23dbd02a9511ef7e1c9c915b3a025e9b7e4de4542a4c180c4fe29e2b9 DIST simple-scan-3.30.2.tar.xz 512540 BLAKE2B 908af68fbd297e2cc0c0c5440166ebc706f6c0a1a88948e9cdfe30a2e9e548125b31e6a00684a8a0db8e4c37c9d0930765b74e2ba9e1d540e4ae705cfd404349 SHA512 3a4d19bd36a88124ba43d388807afd1d6a51fc691ed83570a095e3b9719b5db5f3eb457a41bc8e36f2f1bf25ff4ab83edc150d4cdddd0d528e9280ea2da6cdb6 -EBUILD simple-scan-3.24.1.ebuild 1335 BLAKE2B 63576693a802db62460e1082dff99268639ee3253dd261facd0db3bde5b399461e0e268a417dd4b3e7346de47287b1dee9321be09ba80fa03462d08961718a31 SHA512 071db78d53b4c1dede6c5509b9de07ccebe9f46664ad023764e352cb8c1c87ce3e17321a8e78602e6cda6c8f4a3a7e98fac8a4b19b60c4e4271ee3237d73410d -EBUILD simple-scan-3.30.2.ebuild 1385 BLAKE2B 0f406f83606d4203dd0d7785b5330db5a0cf7d5a6c00d7a86b8d5768388d8de0016100184ce6afbd95e0e4ab9e598b8d635a8abbcad00024bf7dabe491dc9799 SHA512 6176fa51739f6975a17a0e7147a152464566d3192bc7414e6239351189674768a5d83bb80575f38968e8cc57266a028947c1e10a38c16697736853023e1449b0 +EBUILD simple-scan-3.24.1.ebuild 1307 BLAKE2B 8b90d4018beaec2add9b1a9b9b5988caaae286304dfdc1c6180db1794ed53c20796f28144d8c3d4b37893219c18f7162e773d337978034ef5abaf5c5cc7d1506 SHA512 859a7b62b6717cd3ab921343be728e964a60c92b32de3a2ac1493a2f6d71d6ba5c5f07188e392250e1aae75673646de9f91bf25570bb43a99d564920ec98062d +EBUILD simple-scan-3.30.2.ebuild 1399 BLAKE2B 2bb1071bda32bc657aad896ebad72dacdac7b7f2c91ef2e07e42855bba1e096c8153fa87ddb92131b3f0a04eba419811bc79c07c94f04c13567bd05698db8d48 SHA512 94079609c6a0cf84d902a97bdf1a71cf90a4265a7fab323649530fa7d8f842817c5b79b983dc491504c0014b5b239312de86cee6f5b59947da767b63ab6d09ce MISC metadata.xml 718 BLAKE2B 46e5929721e967a667f32a8993903b635599ae06c5b5179edf0579070b2b393f750a044bc280519b820f336843d1b98a795f73ef9500a27951a64b61794901e5 SHA512 82244c0dc32c4ded72048a387cee5f350a66148ecaa12a941e4a86d9d9079f1769f1f240ee564c7f991f9d53c050e9fd3e9113024fc8831a6766ec3d88b665ca diff --git a/media-gfx/simple-scan/simple-scan-3.24.1.ebuild b/media-gfx/simple-scan/simple-scan-3.24.1.ebuild index b5767b15057f..9cb904fdf738 100644 --- a/media-gfx/simple-scan/simple-scan-3.24.1.ebuild +++ b/media-gfx/simple-scan/simple-scan-3.24.1.ebuild @@ -2,7 +2,6 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -VALA_MAX_API_VERSION="0.40" inherit gnome2 vala versionator DESCRIPTION="Simple document scanning utility" diff --git a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild index c3f42c9f23b3..0c95a91a0257 100644 --- a/media-gfx/simple-scan/simple-scan-3.30.2.ebuild +++ b/media-gfx/simple-scan/simple-scan-3.30.2.ebuild @@ -2,13 +2,12 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=6 -VALA_MIN_API_VERSION="0.34" inherit gnome.org gnome2-utils meson vala xdg DESCRIPTION="Simple document scanning utility" -HOMEPAGE="https://gitlab.gnome.org/GNOME/simple-scan" +HOMEPAGE="https://launchpad.net/simple-scan" -LICENSE="GPL-3+" +LICENSE="GPL-3" SLOT="0" KEYWORDS="~amd64 ~arm ~ppc64 ~x86" IUSE="colord webp" # packagekit @@ -34,7 +33,7 @@ DEPEND="${COMMON_DEPEND} $(vala_depend) dev-libs/libxml2:2 dev-util/itstool - >=sys-devel/gettext-0.19.8 + >=sys-devel/gettext-0.19.7 virtual/pkgconfig >=dev-libs/libgusb-0.2.7[vala] colord? ( >=x11-misc/colord-0.1.24:=[vala] ) @@ -52,8 +51,8 @@ src_prepare() { src_configure() { local emesonargs=( - $(meson_use colord) -Dpackagekit=false + $(meson_use colord) $(meson_use webp) ) meson_src_configure @@ -62,9 +61,11 @@ src_configure() { pkg_postinst() { xdg_pkg_postinst gnome2_schemas_update + gnome2_icon_cache_update } pkg_postrm() { xdg_pkg_postrm gnome2_schemas_update + gnome2_icon_cache_update } diff --git a/media-gfx/symboleditor/Manifest b/media-gfx/symboleditor/Manifest index a096a2a71a8f..6fa2f9fd2e5f 100644 --- a/media-gfx/symboleditor/Manifest +++ b/media-gfx/symboleditor/Manifest @@ -1,5 +1,3 @@ -AUX symboleditor-2.0.0-cmake.patch 1248 BLAKE2B 09298608568c20dc29b8139abbd83544862fdcb84ac67ed6c1d3094b16fd864647d686b0685df0891ef74227038a61c40e42d0fa24ebe9e8faffa4729d39f2a8 SHA512 bfb9ae87492675cfcd19abfcf255aa720196129a8715b6315a9b6cd5cfa199b63be98a891d1c068c2feb789e6ec0bbc88a4f24cf23b766aec0953e39f6f7ecd0 -AUX symboleditor-2.0.0-doc-optional.patch 798 BLAKE2B d3ff8e71c6adc72f0cfb8914723eeaa7f4b80f07d5433638546536e018d4256b2d130e47b1963c5a11ca9338934c295019b7db8ea29475b9df2e4a7c01cce9e9 SHA512 2f84f7e772fe74dbc6733861d2f4a48adf95dab1ec33e4ef6e56c85123a190a17af1ed04ce554f95a5bd3ce80a402c6239c31ba20a8ac128c7362abc26a84281 DIST SymbolEditor-2.0.0.tar.bz2 544789 BLAKE2B 2d0566d1e4b765e4cccec93def5fb184a27edbeb90bed8a76514e880e49a9c4139d4679f380c6c831c3f25a857af2df367d9ef96c56009189b2db9f964202e73 SHA512 8baee88fd8ff5f2b6334e80fe7c3fe8044ae521e5a8ffa2588f37dc4a8bf0495c902789bfaaed21a6eaf3c4f6380d18550aaed8046e84b396317104c8a49c993 -EBUILD symboleditor-2.0.0-r1.ebuild 1019 BLAKE2B a73fd66ba9ebdb1a95a5b69ed8e2da4ec67a4c8155785960b4bd70fd12f7ccec5b65e8e5289630183bdf346b2cfa8f8bbc5e665a240428b2a1c53efc596a4ea9 SHA512 a1c52dc93b696da3d8d94448d0af55cdedfa02f319d0a8f0e085df9266ff0667a0cce91111b0ecc009bed941f9df3f328a930669dc4a5f6a7ddef2b41fd1aea3 +EBUILD symboleditor-2.0.0.ebuild 1030 BLAKE2B 4e2cecde14a23c4aae6dc4df71522b958eb9c56d52ebc39880f3b08e2cfb906ca067a2342a3f827cb9f07b3a173c89b315c69e4800433748173243fe360b52c5 SHA512 83f82650e0811e2669f00b03e3b0bfb6253543914225e8691fff6344296ba5f8bc692e816170f01c0c89ded7a30b7f0c4327e64a3eb961c8c6ee5bb3d02ceb31 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch deleted file mode 100644 index ab0bd049bef3..000000000000 --- a/media-gfx/symboleditor/files/symboleditor-2.0.0-cmake.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 8739cd6f5fe0f2ed0cf9913170573c62ee246c63 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Burkhard=20L=C3=BCck?= <lueck@hube-lueck.de> -Date: Thu, 22 Sep 2016 21:17:07 +0200 -Subject: cleanup CMakeLists.txt - -remove qt5_wrap_ui wrong because the app uses xgettext and line 60 already has ki18n_wrap_ui -remove add_definitions (-DTRANSLATION_DOMAIN=SymbolEditor), that is only for libraries -and -src/Main.cpp:84: KLocalizedString::setApplicationDomain(SymbolEditor); -is used to load the translation catalog -REVIEW:128126 ---- - CMakeLists.txt | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d1016cb..d88174a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,10 +64,6 @@ add_subdirectory (doc) - - kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc) - --qt5_wrap_ui (SymbolEditor_SRCS -- ui/EditorConfigPage.ui --) -- - ecm_install_icons (ICONS sc-apps-SymbolEditor.svgz DESTINATION ${ICON_INSTALL_DIR}) - - add_executable (SymbolEditor ${SymbolEditor_SRCS}) -@@ -89,8 +85,6 @@ add_definitions ( - -DKDE_NO_COMPAT - ) - --add_definitions (-DTRANSLATION_DOMAIN="SymbolEditor") -- - if (SILENCE_DEPRECATED) - add_definitions( -Wno-deprecated-declarations ) - endif (SILENCE_DEPRECATED) --- -cgit v1.1 diff --git a/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch b/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch deleted file mode 100644 index 3434e90c6122..000000000000 --- a/media-gfx/symboleditor/files/symboleditor-2.0.0-doc-optional.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 2b809c68d40a3d0af2da668bad3f4d9ced86f56e Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> -Date: Thu, 10 Mar 2016 20:26:57 +0100 -Subject: KF5DocTools is optional, so add doc subdir conditionally - -REVIEW: 127336 ---- - CMakeLists.txt | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index d88174a..da7458f 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -60,7 +60,10 @@ file (GLOB SymbolEditor_UI ${CMAKE_CURRENT_SOURCE_DIR}/ui/*.ui) - ki18n_wrap_ui (SymbolEditor_SRCS ${SymbolEditor_UI}) - - add_subdirectory (icons) --add_subdirectory (doc) -+ -+if (KF5DocTools_FOUND) -+ add_subdirectory (doc) -+endif (KF5DocTools_FOUND) - - kconfig_add_kcfg_files (SymbolEditor_SRCS SymbolEditor.kcfgc) - --- -cgit v1.1 diff --git a/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild b/media-gfx/symboleditor/symboleditor-2.0.0.ebuild index 3661330a67f4..194321ebd65b 100644 --- a/media-gfx/symboleditor/symboleditor-2.0.0-r1.ebuild +++ b/media-gfx/symboleditor/symboleditor-2.0.0.ebuild @@ -1,12 +1,12 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2016 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=6 -KDE_HANDBOOK="optional" +KDE_HANDBOOK="true" inherit kde5 -DESCRIPTION="Application to create libraries of QPainterPath objects with rendering hints" +DESCRIPTION="Application to create libraries of QPainterPath objects with redering hints" HOMEPAGE="https://userbase.kde.org/SymbolEditor" if [[ ${KDE_BUILD_TYPE} != live ]]; then MY_P=SymbolEditor-${PV} @@ -18,10 +18,7 @@ LICENSE="GPL-2" KEYWORDS="amd64" IUSE="" -BDEPEND=" - sys-devel/gettext -" -DEPEND=" +COMMON_DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) @@ -32,16 +29,17 @@ DEPEND=" $(add_qt_dep qtgui) $(add_qt_dep qtwidgets) " -RDEPEND="${DEPEND}" - -PATCHES=( - "${FILESDIR}/${P}-cmake.patch" - "${FILESDIR}/${P}-doc-optional.patch" -) +DEPEND="${COMMON_DEPEND} + sys-devel/gettext + x11-misc/shared-mime-info +" +RDEPEND="${COMMON_DEPEND} + !media-gfx/symboleditor:4 +" src_configure() { local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=ON + $(cmake-utils_use_find_package handbook KF5DocTools) ) kde5_src_configure diff --git a/media-gfx/xloadimage/Manifest b/media-gfx/xloadimage/Manifest index abc2fe1eb226..cf5bce18379e 100644 --- a/media-gfx/xloadimage/Manifest +++ b/media-gfx/xloadimage/Manifest @@ -9,5 +9,5 @@ AUX xloadimage-gentoo.patch 8956 BLAKE2B 9834cb47e16fb20f970e9d33a6e42fef09d5a3d DIST xloadimage-4.1-gentoo-r1.diff.bz2 41535 BLAKE2B 77cdbb2e6d5dda6084aae2831bcb8750a027f59a673f5a1f8eeb61385bd21243d640bd13a3be7fb24d2ce2cb475a05cb04c91c2b53977c61fb3aa4416e67e112 SHA512 a1a52d576eb68c44e5ff3b68a6bd87cd9b8f21f6fa8edee2d7df2329002d40f6513df6c04ecd57f66018583d0251019bd02e15756dac705b8c9cb8470cb386e3 DIST xloadimage.4.1.tar.gz 596021 BLAKE2B 3c22facf05167d1836c21243799d8f66c211e44d659b4397668ed604cdd82b3bd8f11ab7b3be5e87c59a9b3aa8569d0d3d2e474b572c3bca07b6437b293014bf SHA512 2c91699c8ef07c101ff9b458708ace01cab2979a5e88cf8a4e47ec971f7b4cb5571108afa3e53271ade4e8ccfdcf72ef9e2e09edfc0be6b8afaba50847aa0586 EBUILD xloadimage-4.1-r11.ebuild 2552 BLAKE2B 9ea8ec71be31f995f78aa0cd1801a9a47c9aacb3462f7397ed43b697021e0bced2f0a144082972daed3a10ac9589a65570506e0fa50fe2a64abe1663f3e31332 SHA512 03b9f7de5b6d51bde25176cbac7f82b37a13d73545916588b41469b1b158003663db5c534ad9fa0afde16773799634fe6f8527ab1335786d58d9daa604e7e2b9 -EBUILD xloadimage-4.1-r12.ebuild 2518 BLAKE2B 06c81fb00f5a09800ab2df5fa3874f74f81c5cb41abf9dcef3dccdfb43b2cb24f3e8aca8c42eceae0281c7300c4d2ce8cc6ef1a64c3b2bf6a9a1c4bf5ed1d27e SHA512 c734cab1070526eeade8a687f35a59f1f9b480c2f63e9c41392e3b7f95a586d60b12600c854a8803905622a6aa3206d06a7ff9899bd9fdfe097ff11d6daba7c1 +EBUILD xloadimage-4.1-r12.ebuild 2519 BLAKE2B 80d64f282abb3c67a8b3e610dee00fe4ed383638cfe696c1ba876198477157509cc28b75b73dc84359450dde0c8f230f9314b98f9b9b1f30fe76c40fe6790f8b SHA512 8b7a85c4b19e5c16e68e221594bd99b70399bb19d9f313ec4385329a5f745ae780e25f8b316ddf521917a4b97867438e6269a52e33b7b1b20bb4b55905e2ebee MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf diff --git a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild index d2619767a777..f609119f5784 100644 --- a/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild +++ b/media-gfx/xloadimage/xloadimage-4.1-r12.ebuild @@ -11,7 +11,7 @@ SRC_URI="ftp://ftp.x.org/R5contrib/${P/-/.}.tar.gz LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" +KEYWORDS="~alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 ~sh sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos" IUSE="tiff jpeg png" RDEPEND="x11-libs/libX11 |