diff options
Diffstat (limited to 'media-libs')
33 files changed, 774 insertions, 1692 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex eb307de99f29..5b3b5910878f 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest index 9b38d0933f8e..ec747bacb1ac 100644 --- a/media-libs/babl/Manifest +++ b/media-libs/babl/Manifest @@ -14,7 +14,7 @@ EBUILD babl-0.1.22.ebuild 1470 BLAKE2B ed22d82d070011f4ea7b74287354d7a24fa3d678c EBUILD babl-0.1.24.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c -EBUILD babl-0.1.38.ebuild 1468 BLAKE2B 4ab7be16d6559d1a6b1ff4ddcacb66d52e9a415bae39e1792d4a219f0f28739b7eb91dfcf4ca3b63a8a9c747c1941b6585c829c053c5510bae392202ef719f6d SHA512 171b3777b21aee036ee3ac720512bfbe6b13accda5df860496b394629535cde6b19a9da1ea464fa9017e00cafc80966c302a5b153750ec8e60d67d51ff894ab8 +EBUILD babl-0.1.38.ebuild 1467 BLAKE2B 647da34623564f7f80f61f3ac3244f5e1a860582d7744a89a833c27e2797b9869de278a25e5361e8d91bddbe043b6286db7a62c5c72a30c3791db741eb64ebf5 SHA512 0a4db61b341670504cdf81a4436f84aa9a13064ac64456f48f46c7bd1bb9576e6b704e3d0d7af0cf2378bb22a147fa02a94e616f964c0f5bd3f1c2e3a5bee3c3 EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56 EBUILD babl-9999.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e diff --git a/media-libs/babl/babl-0.1.38.ebuild b/media-libs/babl/babl-0.1.38.ebuild index 60f420141191..56e3e620a12b 100644 --- a/media-libs/babl/babl-0.1.38.ebuild +++ b/media-libs/babl/babl-0.1.38.ebuild @@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A dynamic, any to any, pixel format conversion library" diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest index 748ce0cd73e4..a6e6df3c46f7 100644 --- a/media-libs/gegl/Manifest +++ b/media-libs/gegl/Manifest @@ -21,7 +21,7 @@ EBUILD gegl-0.3.0-r1.ebuild 5372 BLAKE2B 843c8bb6c10947cc0378be51d6b269ae866840f EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a556194778375045b25b6774dc72375b9fe19dfda8b6ce64ad024a5ee69cb26aea51fd3693f3e80b13a78d812a6 SHA512 eae35de6ca10d0fee700ce98bcf4fe8ba4af0ec43325fb097f67d2934bc951cc356f9e07ad0b81f07e8d715ba3fba9c50babc27ba6b2670c2e23056d6108e41b EBUILD gegl-0.3.20.ebuild 5182 BLAKE2B 97e2103ba355c528511106181c826feffeb7a2956521212d4973167ea088e39e90ff8d01af17f2e46becbfbebbe8b72a0847a5a20ec5b466c9e1721023ef9bc1 SHA512 ce8f8bb01a6469f1a5cefc6bc2b127f6ba38e8492496bae712b811ce7227c2c6102d2ab84e0da2c25dbb8a4b48ced1b00e0fb173b54d3e325d2445249841c13e EBUILD gegl-0.3.24.ebuild 5227 BLAKE2B fa9df9507e86249d5ea604dd879b86aa8fcd323401ed2f34b1f172ebf82df88ac9618457c11da08f821de1bb013c5b85f660da7ed52f6e1069e45765ce27267a SHA512 ff2b34a6fda2bd47c38203010140988bdf6b7565638b3edb8a71a8c4e26318c028cc121ee99ab4d974c077ea2d7242498f6e98dcb38e57a9d10f0d68b250142d -EBUILD gegl-0.3.26.ebuild 5225 BLAKE2B 0856fa12c5382a81e4c182c2d636be4825d1a85f7bb2078e62106c42cd0a8314668805cbb58064df52eb1065bff40b2eccf52e5d5880b4c3bf35d58d050b1a5f SHA512 288bb3b22c419d1f659d41de213518d88fdf85dda0a4e6b09ede20563c92069e76831a8fc9a65e922b7594b9b17845532c4b7d2658cb898a23b526bfcd91db3c +EBUILD gegl-0.3.26.ebuild 5224 BLAKE2B f82174df3e6b9ebccf7b15ca4cfbc1af02dbfc71665ebf8b558b57a5b3b34a56a95b13ca2beaf62d35a0c3f0ad0d7b0cad2d493de9fbabd7cac983ea32dcb138 SHA512 f7853ceb410245b35a0625e2e8b83400fc1af7cee486d08249da5619345d18145287b62fa903afad2b0cb92b58982451e1f43cdc03e025f0645546efd97b3759 EBUILD gegl-0.3.8-r1.ebuild 5299 BLAKE2B 413dfe970b595bef38e51dd2e749b10b014952ff00d609587c23f61135864e4640e2ccefc7d2faba02cfa8769c00d46cdd48bf5b9197ff79be89a6f34d86fbe9 SHA512 9a53f0b3633c4374c696a6be3d69226ae6e2116eb5d7f3c1a5362353e840e6507aa189aeae89c178b2b8ba896fdbfb1a929d3e478060a0fd906e27db65a48501 EBUILD gegl-0.3.8.ebuild 5219 BLAKE2B 093e9816058f439e3b18308256d8c00acdb7dd2fc3a6595df03a04f26ab4b13830160783a0c745a544a277ffa7b2e9290332d89bd93685cfe94157462a88ba9a SHA512 66deb4d2c45850c9ac870d741419c16bf84a20c14cd936f90aebf626f6d9a45471aa65d3f632c617c78d9717206b0418424614b9edc3e8643ec1f61c93c3ac42 EBUILD gegl-9999.ebuild 4921 BLAKE2B c5e2f1513eb418db2b725759bee29b5c97cd3be89b020d7b86eac4edf56b295d93b3dfbc8b7d2766411b3dcd4fb3c618ed44e9ed5a27ed38b844e530465b6acf SHA512 c6acfcfa7e2c50aa64b1ad31dda9c52d530a886e4ef477f06c56d32eab809215bc018ccf0180175abd81745b4432b8f9563e51ec6e1df72cf0a6125c95635478 diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild index e3e898f40bb3..ae53b1e4361a 100644 --- a/media-libs/gegl/gegl-0.3.26.ebuild +++ b/media-libs/gegl/gegl-0.3.26.ebuild @@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then SRC_URI="" else SRC_URI="http://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" - KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris" fi DESCRIPTION="A graph based image processing framework" diff --git a/media-libs/giflib/Manifest b/media-libs/giflib/Manifest index 6c82c6d65264..7410d68f1a1e 100644 --- a/media-libs/giflib/Manifest +++ b/media-libs/giflib/Manifest @@ -1,14 +1,10 @@ AUX giflib-4.1.6-gif2rle.patch 764 BLAKE2B af377785f83dcd5c2c4382eb2d490ccc01000aa2a1ef8f306c7e0284857de02765a714fea73870ac6226331a88e422bd8afd3b0ec90b7f3e225bcabf079dc32e SHA512 6714906d49a0c285c1fb642a81c092378042ec06be6c4d7c586459e80bb010423fe4b9801124b71c945fd118d99432869bc180bfa32a6c3c29bcfb6b4c5a027f AUX giflib-4.1.6-giffix-null-Extension-fix.patch 693 BLAKE2B b0faee004c9cbb95839cb047de902500b1c46f6d3185fc061fb99b0759a57512cb030ca965bb927c68c642ecd72a714260c288b19d24404a6b4cb022ba41094b SHA512 9006c85529735a84afaddddbb06b25cb2b7eff64574edea693d75171c6b2bb7a666e498920a9abca2b28290e4c601b6eb6eecc6ea1b0e6b8602fd4a55863338f DIST giflib-4.1.6.tar.bz2 506050 BLAKE2B 154c95425a570a822447d1fc5bddbecf31fd81473e18d49fdeb93e72ade7541197fc6147b2d4cdf6857b3326b2f4c40e01f026041369242f4e9fbe892cc8e150 SHA512 f47954218ed7d3415cc195a1031a688fcb7dd2bc2b394491830e6b5f5332903ed7c4433b795cd3da9ac53bfc969fe94bec2a4e66b15c0385c732c01b1b7e5057 -DIST giflib-4.2.3.tar.bz2 560968 BLAKE2B 360820e19e4aaf654872abb0f54bc7058730ff5d448f80d46c42a872caf3aac5c7a4e2a5ca7304e0dbb8470db412baad454b7d06be8106600f698a280d96c8d5 SHA512 f582fafa3ccb0f9ae6f040df0e33469a26fb275437f8615c39af613523ef5f3b09003ed3419f62880200606edfbe08b5aa3ba18a4d615ecd8da27331aec16b36 DIST giflib-5.0.6.tar.bz2 621073 BLAKE2B ae162c281755cae4d00bcbd07273f7c7488ae67c42fef819abae1011eddf801bc4525e326417d3e8a036b18b75d7064de59ceda370e5ded956b22d319c67d3a9 SHA512 117e20319f2df32bdf094678cdececad2b6f33a40baff172d4df68ade86547825ebca81186071bff51e60126692df84dbd7bb5cc4877ba68448f7c47a2cc2491 -DIST giflib-5.1.3.tar.bz2 639420 BLAKE2B b660c7a0488a521a4e496b6e7babee3e8e667517a842571fdd41964dd203dca1a492eeec38636dd7822129a909f335c99b4ece15832c8ea882e25b5539141219 SHA512 02c1fa3619e0bcd80db6ff12a5caf4c9e5ab370c7741956165fe6cc67fd15a00754d5a6e33dd9393e4754201ff60a4f1f0666026604a662bc0d120c6f13bb0e2 DIST giflib-5.1.4.tar.bz2 639703 BLAKE2B 5176fbd94c37a86a7f7a3964b6b5f2637d76ba5d40e594a0db52a3a09e22b915a0388fc9bd2f1446dcf66b3b9c0d76741583e4d5d3f7362fa3997e8b26503fc4 SHA512 32b5e342056c210e6478e9cb3b6ceec9594dcfaf34feea1eb4dad633a081ed4465bceee578c19165907cb47cb83912ac359ceea666a8e07dbbb5420f9928f96d EBUILD giflib-4.1.6-r2.ebuild 1381 BLAKE2B 53da805ac9c0e6641536fb57b772c9921c4e41441fddfd0e53a6b2d00e76eac38e0f6a53fbfa3a8b13058c5ae8885b5212d62b8a7eec5afef6c13b2c40048803 SHA512 51e54c7163c24477b664add2201347df4e41dc819f8e2b444810dc7c0b5cc6766f3e0176bd073188fc5ec953fd09b55b5066082ca307ac7552df164905dcecdd EBUILD giflib-4.1.6-r3.ebuild 1609 BLAKE2B fa19054072551719fc111d0ba1c8df029d5f47649500fd9859c328915a5335e36c098075c2d2c9954bd3f2a1c9435d0dee7308fc36499963d09d255170b40e54 SHA512 e138e276d2504904e3bed4e478cf492fdf663805a50fd4ae510b90c6160a6d3a591214eb738cc7ec545818fb88b7f36f7699ee0b6c5464af199e3a699b805fed -EBUILD giflib-4.2.3-r1.ebuild 1532 BLAKE2B fb6c4bba1532d94655cde10567d6a910b7cfe4ed1c267f1b976877b866eaa3a2e35d101092b395537ddfeecddc3d58b6a34f81e1886cefe6ad930e85a0c9448a SHA512 77f3d966d7c8045917a3e16b0b1a479693479414a57de6b812d1bd385773b25c7877caada33610b6a15dba63eae51a665d0ec175b1d5c3936a03e0220723d183 EBUILD giflib-5.0.6.ebuild 1219 BLAKE2B b4fd9c6b45c9cba3b5ffbcacc4a378ce73dbb6d5bc15d7de8c43248ec997463bb8ee9637edc48f98ac541c9e7b152f40bfecbdeaded007f80c5acf1d88972546 SHA512 b46fd57c3ec565cb8f39c885d0f0eb7e4a3fd6a64779f1abea9be3dc8f56feb554b3546c5564081169d91ce8a1e18ef4ad644837df90085629d149866f1870b1 -EBUILD giflib-5.1.3.ebuild 1296 BLAKE2B 99da48aa25269bbcd74ea44060c272d8ac689a87120990db7f111dcd30e8fda6fd26429b95e092e16632591803d5d00596729bffaf66019029afacbd6f55dcdb SHA512 757931d3ac812703bc057f91f7f9cfdca7c1362d12b4986b170e26903f693e2c4556649df7319499a09ba4272d89be4a6482c20334bc387ec218417998b38fe3 EBUILD giflib-5.1.4.ebuild 1541 BLAKE2B 69bda497857d80d0e29632d4f485ca97e42812c1dd789f0e0c28fa0cf7b400da28e73a73cc6aa4fdcce0d8b62a22c86f2c2f9fb52cd204c1243de6e5bc9a8c7f SHA512 a663761cd299ede6e929b4d1c4ec1835c07bd59ca54d2fcb8aaddce4fc6e184b1ddf79128238d13ea4af9b56c91fdaa2198ecaf49bcdc2d4910f271acd6c360d MISC metadata.xml 444 BLAKE2B 50913e89623c9855de9b3344c4f7a9f6266b42d99ab88cd4c6be63b8fb00a984dc05b89efbac92ed2b5980e9bed163473925a88384a61b3887ef86473f89b216 SHA512 10f7b2069a73ae9d488fba9febb6b8edcab5f278e1d68ef5b998037f02de5de81d07983b66f3c4ac8a59fa9a4836b92a909c66a4c1188a97aa03174cf4f546cf diff --git a/media-libs/giflib/giflib-4.2.3-r1.ebuild b/media-libs/giflib/giflib-4.2.3-r1.ebuild deleted file mode 100644 index 78bc63666e88..000000000000 --- a/media-libs/giflib/giflib-4.2.3-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit autotools-multilib eutils - -DESCRIPTION="Library to handle, display and manipulate GIF images" -HOMEPAGE="https://sourceforge.net/projects/giflib/" -SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs X" - -RDEPEND="X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND}" - -src_prepare() { - # don't generate html docs - sed -i '/^SUBDIRS/s/doc//' Makefile.am || die - - epatch "${FILESDIR}"/${PN}-4.1.6-giffix-null-Extension-fix.patch - sed -i \ - -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' \ - -e 's:${X_PRE_LIBS}::' \ - configure.ac || die #486542,#483258 - eautoreconf - - sed -i '/X_PRE_LIBS/s:-lSM -lICE::' configure || die #483258 -} - -src_configure() { - local myeconfargs=( - $(use_enable static-libs static) - $(use_enable X x11) - ) - autotools-multilib_src_configure -} - -src_test() { - autotools-multilib_src_test -C tests -} - -src_install() { - autotools-multilib_src_install - - # for static libs the .la file is required if built with +X - use static-libs || prune_libtool_files --all - - doman doc/*.1 - dodoc doc/*.txt -} diff --git a/media-libs/giflib/giflib-5.1.3.ebuild b/media-libs/giflib/giflib-5.1.3.ebuild deleted file mode 100644 index 2f3d325833e4..000000000000 --- a/media-libs/giflib/giflib-5.1.3.ebuild +++ /dev/null @@ -1,53 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit eutils libtool multilib-minimal - -DESCRIPTION="Library to handle, display and manipulate GIF images" -HOMEPAGE="https://sourceforge.net/projects/giflib/" -SRC_URI="mirror://sourceforge/giflib/${P}.tar.bz2" - -LICENSE="MIT" -SLOT="0/7" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="static-libs" - -RDEPEND=" - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-baselibs-20140406-r1 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32] - )" -DEPEND="${RDEPEND}" - -src_prepare() { - default - elibtoolize -} - -multilib_src_configure() { - local myeconfargs=( - # No need for xmlto as they ship generated files. - ac_cv_prog_have_xmlto=no - - $(use_enable static-libs static) - ) - - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} - -multilib_src_install() { - default - - # for static libs the .la file is required if built with +X - use static-libs || prune_libtool_files --all -} - -multilib_src_install_all() { - doman doc/*.1 - dodoc AUTHORS BUGS ChangeLog NEWS README TODO doc/*.txt - docinto html - dodoc -r doc/whatsinagif -} diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest index e75a570f8ebc..96fd30c65e30 100644 --- a/media-libs/libdvdnav/Manifest +++ b/media-libs/libdvdnav/Manifest @@ -1,4 +1,6 @@ DIST libdvdnav-5.0.3.tar.bz2 372203 BLAKE2B 82b935157cb59c14c0dc2ce043027dca43d181b1dc24435a4876310b4edb9961da96b202c6e99b6531fce22aa05dda2352cdbcfa42ab47051e533ca3fd458158 SHA512 d6d0519f654649bd65b3029224191e7d6acc893d94e8578e435d77b75327584e9f44410a062c1fc60c6211f5bea6b3971228d84de595808733ab7356980e0123 +DIST libdvdnav-6.0.0.tar.bz2 369605 BLAKE2B 911b786f1cf37d32b0516df9f3ae3c388ad352206e67f73f758984795459ced7507f1454747a205b64c2d1f42922ee26ee9d434499ceaf05053dfbeb4d7e52c7 SHA512 89d1e976d8f1cc92692e86e793403759b4d705682ba7418dcfd7dd3c38861238cead303fe4baa2059ebd7e9b82a77bbdbf32e50b20848e78939ee9e75d1b96d4 EBUILD libdvdnav-5.0.3.ebuild 1085 BLAKE2B f864c4c461f7be859d7efb886f4110c12c7468014427b7db51ba03cc6ade114fd9f0d1239a3da2f3394f11e778ae68bf07c68607cad1f115444aa7271ed34f8d SHA512 77c4bb2c123ab734829e764a762ae4d32ff29817140a287f8660e913a063dff21664aa57a8973b70418bafef6919db45c1db263a0a5541948eadca78d49b70c3 -EBUILD libdvdnav-9999.ebuild 1094 BLAKE2B 0a569947b3e8a436c7ced513d60d291ba2fde447659d1cf905f3ce87afa5c51dafb56b08ca7ab91934555a76d0de58c9d510621b08f7df3e5f4361ee917cc573 SHA512 50a801284a5f3dc096e4b96c959838090ea8e6fab5a291aa0dbc0e8129db4746e3cbd98538db125ae80e5516c422e18595413164189e89c2ed782285641763f7 +EBUILD libdvdnav-6.0.0.ebuild 1186 BLAKE2B 2f6ae269963f4ffe99400737fe9bf0b9abdb7ae2d162aeeaafbd2b9afc10feef07647f7059479956a6594e032e63b4ace45ad55cf0b1f215deb16ad0038d7b13 SHA512 5e86d911f940bce20f8e3e962c953116bc306d3fc020e845b104abeab1fd1017a9e6967d17ac5cc639bf2257ff01054ed0945e995e1683df006e06513cbd96d4 +EBUILD libdvdnav-9999.ebuild 1186 BLAKE2B 2f6ae269963f4ffe99400737fe9bf0b9abdb7ae2d162aeeaafbd2b9afc10feef07647f7059479956a6594e032e63b4ace45ad55cf0b1f215deb16ad0038d7b13 SHA512 5e86d911f940bce20f8e3e962c953116bc306d3fc020e845b104abeab1fd1017a9e6967d17ac5cc639bf2257ff01054ed0945e995e1683df006e06513cbd96d4 MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 diff --git a/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild new file mode 100644 index 000000000000..61b7dbaa549a --- /dev/null +++ b/media-libs/libdvdnav/libdvdnav-6.0.0.ebuild @@ -0,0 +1,43 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools multilib-minimal + +DESCRIPTION="Library for DVD navigation tools" +HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html" +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git" +else + SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="static-libs" + +RDEPEND=">=media-libs/libdvdread-5.0.3[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391 + +DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO ) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die +} diff --git a/media-libs/libdvdnav/libdvdnav-9999.ebuild b/media-libs/libdvdnav/libdvdnav-9999.ebuild index af3c795d7a55..61b7dbaa549a 100644 --- a/media-libs/libdvdnav/libdvdnav-9999.ebuild +++ b/media-libs/libdvdnav/libdvdnav-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -inherit autotools-multilib +EAPI=6 + +inherit autotools multilib-minimal DESCRIPTION="Library for DVD navigation tools" HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html" @@ -20,10 +19,25 @@ LICENSE="GPL-2" SLOT="0" IUSE="static-libs" -RDEPEND=">=media-libs/libdvdread-5.0.2[${MULTILIB_USEDEP}] - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" +RDEPEND=">=media-libs/libdvdread-5.0.3[${MULTILIB_USEDEP}]" DEPEND="${RDEPEND} virtual/pkgconfig" # To get pkg.m4 for eautoreconf #414391 DOCS=( AUTHORS ChangeLog doc/dvd_structures doc/library_layout README TODO ) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die +} diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest index ae5d201ac82f..fbba370f5b90 100644 --- a/media-libs/libdvdread/Manifest +++ b/media-libs/libdvdread/Manifest @@ -1,4 +1,6 @@ DIST libdvdread-5.0.3.tar.bz2 394885 BLAKE2B dc30548b8cdf30b9c114f4314fe0a2350b31e38321f662072e81492d126050eea8a601f12c03a8aa2c10c453f3ff84064fa4768cebe9395e4314cb2a29e872ca SHA512 1ca438f0b5c406549eec62e1abef1e8745b9f932bcd30a3194ee9e37995b269ec8f1652a24cc3d2cb11ddb964e4a47a06e5405f9402e616586ff6263a1af3fc2 +DIST libdvdread-6.0.0.tar.bz2 394627 BLAKE2B 08007113d726f96d2b179aadd2e5737ab9eeee2a52864eeaab3d2633993c66ca076559c920bd291033de794f2037d7480e4ad6f704822303f5c5b29db6b8d7cd SHA512 b07179f2f665adf6ddd7bf8b7c48cd279f3f413c5719b8ca8467e53c7cd0cac02a40101f3717186dc0e4e69e5d9c7ac6bf98a76901412d74150b9fc7bfdd2479 EBUILD libdvdread-5.0.3.ebuild 1008 BLAKE2B 4e629e1d24dda90ccedff708db1a54d73b435641c997b75805ca784ecc3d8bab106178bbbf9768196b61a962831d30c7b145bdace0bca7f87392059280f61da7 SHA512 557cf66d4d654fbf0f26f1917700209edf7a8ca67f83792224658c6c44559802f4d6da8f6cf67bcf520f9279fbb67542233575dfcf3575dd64a4a7a09bcc4c62 -EBUILD libdvdread-9999.ebuild 1017 BLAKE2B 6dfc7242a9fbeafeaad35fc868022e626dd3f674a4d7fff94672c9e24d7c531f619f423a95f7451bb2006ffc650dc05dae676a47ba2fd124ae9b650d9fd754e9 SHA512 79d7549e9467957bcd57997e531600c990da884d1e5fa468483847af1fac3b9c1a010e1f9feb64157664d205b645c674be0ea6ec2b2128d25b8db768f8156fb7 +EBUILD libdvdread-6.0.0.ebuild 1156 BLAKE2B ffdc1f7a0f7fd5e2a8e17e64a18f7a6df2f93cb305b5851251ee2c494dec221dc8e50e8d6d69b8a8e7be56b042d7ba36496b7f7c05bed189256bc309d0b02008 SHA512 193e1c2ece5c75ff5e326ee789fe493a5e42ccb8f8afa311edef85196e6dd32506d1443489e6ae5b26edc86d135aa662de84bdb609fc8249b8a068bbd6a7729f +EBUILD libdvdread-9999.ebuild 1156 BLAKE2B ffdc1f7a0f7fd5e2a8e17e64a18f7a6df2f93cb305b5851251ee2c494dec221dc8e50e8d6d69b8a8e7be56b042d7ba36496b7f7c05bed189256bc309d0b02008 SHA512 193e1c2ece5c75ff5e326ee789fe493a5e42ccb8f8afa311edef85196e6dd32506d1443489e6ae5b26edc86d135aa662de84bdb609fc8249b8a068bbd6a7729f MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4 diff --git a/media-libs/libdvdread/libdvdread-6.0.0.ebuild b/media-libs/libdvdread/libdvdread-6.0.0.ebuild new file mode 100644 index 000000000000..3a46c0663f6a --- /dev/null +++ b/media-libs/libdvdread/libdvdread-6.0.0.ebuild @@ -0,0 +1,44 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit autotools multilib-minimal + +DESCRIPTION="Library for DVD navigation tools" +HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html" +if [[ ${PV} = 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git" +else + SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="+css static-libs" + +RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + virtual/pkgconfig" + +DOCS=( AUTHORS ChangeLog NEWS TODO README ) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + $(use_with css libdvdcss) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die +} diff --git a/media-libs/libdvdread/libdvdread-9999.ebuild b/media-libs/libdvdread/libdvdread-9999.ebuild index 8ca3b52a7401..3a46c0663f6a 100644 --- a/media-libs/libdvdread/libdvdread-9999.ebuild +++ b/media-libs/libdvdread/libdvdread-9999.ebuild @@ -1,10 +1,9 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -AUTOTOOLS_AUTORECONF=1 -AUTOTOOLS_PRUNE_LIBTOOL_FILES=all -inherit autotools-multilib +EAPI=6 + +inherit autotools multilib-minimal DESCRIPTION="Library for DVD navigation tools" HOMEPAGE="https://www.videolan.org/developers/libdvdnav.html" @@ -20,9 +19,26 @@ LICENSE="GPL-2" SLOT="0" IUSE="+css static-libs" -RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] ) - abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r4 - !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" -DEPEND="${RDEPEND}" +RDEPEND="css? ( >=media-libs/libdvdcss-1.3.0[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + virtual/pkgconfig" DOCS=( AUTHORS ChangeLog NEWS TODO README ) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --enable-shared + $(use_enable static-libs static) + $(use_with css libdvdcss) + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + find "${ED}" -name "*.la" -delete || die +} diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest index 7579161d6490..ee637eb89abd 100644 --- a/media-libs/libgphoto2/Manifest +++ b/media-libs/libgphoto2/Manifest @@ -1,5 +1,3 @@ -DIST libgphoto2-2.5.12.tar.bz2 6974928 BLAKE2B dbeb173d2aa0de0f4e0f45b5ad3607da041c80d48c429c677ed79fb10e74dac3693a75da10e168d82d7dfb13148baf574019cde8cebb4897c676c0a8dc9a5cba SHA512 aa47e9be64579e0691f58b775ca4d80f3ed65763e6d832cba9fd28603ba2dce4c9b5b3291f38dad399b69393d325896f67f2bde622062ca38b9b138f48f12336 DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688 -EBUILD libgphoto2-2.5.12.ebuild 6180 BLAKE2B 3769021d2fd5fc8ef44bb6860cb822b304b61d1f67b091f28b07cc43771d2c174386a390d0a9bc4764389d4590a54d59b2c1321e247778abc80559c889d99086 SHA512 f93d213bfbc4e4a61fe7aea4a63e5c3d3d5e59a0c5c262463bf6b4f36687f47ec3082ab7554a2e56f286ff7b4393a52dafeb29feecf8d6e6a9c12430e4c2f583 EBUILD libgphoto2-2.5.14.ebuild 6273 BLAKE2B 50694401872006701c09767b28b49e8b8aec364ee4a7256e689fc8fbd48fa7190a5a142cddcc1ea602db407a0bf9ee3b4bf098420aeb5bddd410f8bf73d7b16a SHA512 d198382821c1c7e8a59f27de930a901991a645837d038e57d47c9037a2bede022cde0123ae3a18362a0f0c69dcd52fc0098bf0fc8025165f64bf1ba58372086e MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0 diff --git a/media-libs/libgphoto2/libgphoto2-2.5.12.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.12.ebuild deleted file mode 100644 index 9f4583a71b8a..000000000000 --- a/media-libs/libgphoto2/libgphoto2-2.5.12.ebuild +++ /dev/null @@ -1,207 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -# TODO -# 1. Track upstream bug --disable-docs does not work. -# https://sourceforge.net/tracker/index.php?func=detail&aid=1643870&group_id=8874&atid=108874 - -EAPI=6 -inherit eutils multilib multilib-minimal udev user - -DESCRIPTION="Library that implements support for numerous digital cameras" -HOMEPAGE="http://www.gphoto.org/" -SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2" - -LICENSE="GPL-2" - -# FIXME: should we also bump for libgphoto2_port.so soname version? -SLOT="0/6" # libgphoto2.so soname version - -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux" -IUSE="doc examples exif gd jpeg nls serial" - -# By default, drivers for all supported cameras will be compiled. -# If you want to only compile for specific camera(s), set CAMERAS -# environment to a space-separated list (no commas) of drivers that -# you want to build. -IUSE_CAMERAS=" - adc65 agfa_cl20 aox ax203 - barbie - canon casio_qv clicksmart310 - digigr8 digita dimagev dimera3500 directory - enigma13 - fuji - gsmart300 - hp215 - iclick - jamcam jd11 jl2005a jl2005c - kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150 - largan lg_gsm - mars mustek - panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2 - ricoh ricoh_g3 - samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z - toshiba_pdrm11 topfield tp6801 -" - -for camera in ${IUSE_CAMERAS}; do - IUSE="${IUSE} +cameras_${camera}" -done - -# libgphoto2 actually links to libltdl -RDEPEND=" - >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}] - dev-libs/libltdl:0[${MULTILIB_USEDEP}] - >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}] - cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) - cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] ) - exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] ) - gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] ) - jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] ) - serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] ) - !<sys-fs/udev-201 -" -DEPEND="${RDEPEND} - dev-util/gtk-doc-am - sys-devel/flex - >=sys-devel/gettext-0.14.1 - >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] - doc? ( app-doc/doxygen ) -" - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gphoto2-port-config - /usr/bin/gphoto2-config -) - -pkg_pretend() { - if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then - einfo "No camera drivers will be built since you did not specify any." - fi -} - -pkg_setup() { - enewgroup plugdev -} - -src_prepare() { - default - - # Handle examples ourselves - sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \ - || die "examples sed failed" - - sed -e 's/sleep 2//' -i configure || die -} - -multilib_src_configure() { - local cameras - local cam - local cam_warn=no - for cam in ${IUSE_CAMERAS} ; do - if use "cameras_${cam}"; then - cameras="${cameras},${cam}" - else - cam_warn=yes - fi - done - - if [ "${cam_warn}" = "yes" ]; then - [ -z "${cameras}" ] || cameras="${cameras:1}" - einfo "Enabled camera drivers: ${cameras:-none}" - einfo "Upstream will not support you if you do not compile all camera drivers first" - else - cameras="all" - einfo "Enabled camera drivers: all" - fi - - local myconf - use doc || myconf=( ac_cv_path_DOXYGEN=false ) - - # Upstream doesn't default to --enable-option-checking due having another - # configure in libgphoto2_port/ that also needs to be checked on every bump - # - # Serial port uses either lockdev or ttylock, but we don't have ttylock - # --with-doc-dir needed to prevent duplicate docs installation, bug #586842 - ECONF_SOURCE=${S} \ - econf \ - --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \ - --disable-docs \ - --disable-gp2ddb \ - $(use_enable nls) \ - $(use_with exif libexif auto) \ - $(use_with gd) \ - $(use_with jpeg) \ - $(use_enable serial) \ - $(use_enable serial lockdev) \ - --with-libusb=no \ - --with-libusb-1.0=auto \ - --disable-ttylock \ - --with-camlibs=${cameras} \ - --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \ - --with-rpmbuild=$(type -P true) \ - udevscriptdir="$(get_udevdir)" \ - "${myconf[@]}" -} - -multilib_src_compile() { - default - - if multilib_is_native_abi && use doc; then - doxygen doc/Doxyfile || die "Documentation generation failed" - fi -} - -multilib_src_install_all() { - prune_libtool_files --modules - - einstalldocs - dodoc TESTERS MAINTAINERS HACKING - - if use examples; then - insinto /usr/share/doc/${PF}/examples - doins examples/README examples/*.c examples/*.h - fi - - # FIXME: fixup autoconf bug #???? - if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then - rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html" - fi - # end fixup - - local udev_rules cam_list - udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules" - cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list" - - if [ -x "${ED}"${cam_list} ]; then - # Let print-camera-list find libgphoto2.so - export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)" - # Let libgphoto2 find its camera-modules - export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}" - - einfo "Generating UDEV-rules ..." - mkdir -p "${ED}"/${udev_rules%/*} - echo -e "# do not edit this file, it will be overwritten on update\n#" \ - > "${ED}"/${udev_rules} - "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \ - || die "failed to create udev-rules" - else - eerror "Unable to find print-camera-list" - eerror "and therefore unable to generate hotplug usermap." - eerror "You will have to manually generate it by running:" - eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}" - fi - -} - -pkg_postinst() { - if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" ; then - elog "Don't forget to add yourself to the plugdev group " - elog "if you want to be able to access your camera." - fi - - local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules - if [[ -f ${old_udev_rules} ]]; then - rm -f "${old_udev_rules}" - fi -} diff --git a/media-libs/libmtp/Manifest b/media-libs/libmtp/Manifest index 8027bd88fc33..725502465115 100644 --- a/media-libs/libmtp/Manifest +++ b/media-libs/libmtp/Manifest @@ -1,7 +1,5 @@ -DIST libmtp-1.1.12.tar.gz 776555 BLAKE2B 219a99d03d6c026b0541b82f8d45cd4a39b8169d0b463f81cbd59dd652bd58c65925b6ff5902bd8b6f0472dc7f967c41f5b7ecdf2f9ed20037c11131d6310a0c SHA512 2fff8f6653aa1fa6d7a545fc4f0ae8cb3e54fdb4486a0f065b733ffb5c33f994f66067a697ffe52fe65fb39ffe2bacc418543f84e504e18f443e3c563a116c4f DIST libmtp-1.1.13.tar.gz 801519 BLAKE2B f0452515f83d001a4e7a32528265d46814898fbaff5afd9a66c1a1fd85d78dae1b9ed9c057030849fd8fc0acec5f2ad012c0f098323d3596f6c38d5b01a9603a SHA512 99d5a277806f29f1d27a64a478e344916e8bfc9949a41a807c16d37bd29ec99dc3f36d504cfc6e67f1e91ee932a7cf82f13d4c9fe14b7e34333d9b12b04fff77 DIST libmtp-1.1.14.tar.gz 804354 BLAKE2B 8a5ec431b3a3c1445b3ae62dd0f6ebee36a473ce3d7da07400263434d6e1be49624b8c807bce015f9e55d450f9e25eb2dcf0831c639b97e39cb900ac4d62f81c SHA512 337d259462cf9700fe5a5f09b38f4652045ee71249d54562661362e6d0ec7fe087ab77ec68d443e4fb84839a8ad9dc686c207d723ab47bc1a542dd0a71b294b1 -EBUILD libmtp-1.1.12.ebuild 1589 BLAKE2B 81f4eb8b2d6df1dcfa2f2cd0460e21774b1992949efb8dbc9c41650daaf120907270a026dc097ae00a511c454c3e5529f8a29e97aa7205a368bc07b6ad264a4f SHA512 878072bb351d6d5e0de55c534d495f7536d44af5b8c01644cecac86948f951d4801e84477e8ef5bd45bedb3de33b3115933bc5f808cd147821730416c03b1915 EBUILD libmtp-1.1.13.ebuild 1596 BLAKE2B 34ae4dc534b04f1a010155aa2c20c956e1ff692a57b3b291bd701a1c20f291c79eb4f7dd9263749374c3b3b13796379f0eba1fb2acd65c77882214258a0e71ac SHA512 fc4452159dd8d8d7285002ea14f8ed64739cacf00551dd0408450f8370480de0388ee27b27ef617e239c24aef63e239d22265e8b75e97af49bd875a71f55df8b EBUILD libmtp-1.1.14.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a EBUILD libmtp-9999.ebuild 1603 BLAKE2B 68dbef72c8b95ddf2e6f483c4f29edd373190900750f1fe8b14ec9136877fff8c8905e9fca6065daeb447b0ce60359e1f828b92fd457f665a47ce4cc58ef4a66 SHA512 19295d09b442b0fd7bc5961cc38a587edc9f41e0d8a3656f92628db71cf4f542e27af35a2f23535678fba7d76dbe1fa926a58bcf3fdbe612dcf8db7a527c601a diff --git a/media-libs/libmtp/libmtp-1.1.12.ebuild b/media-libs/libmtp/libmtp-1.1.12.ebuild deleted file mode 100644 index 80a2b0270821..000000000000 --- a/media-libs/libmtp/libmtp-1.1.12.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit eutils udev user - -if [[ ${PV} == 9999* ]]; then - EGIT_REPO_URI="git://git.code.sf.net/p/${PN}/code" - inherit autotools git-r3 -else - SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - KEYWORDS="amd64 arm hppa ia64 ppc ppc64 x86 ~amd64-fbsd ~x86-fbsd" -fi - -DESCRIPTION="An implementation of Microsoft's Media Transfer Protocol (MTP)" -HOMEPAGE="http://libmtp.sourceforge.net/" - -LICENSE="LGPL-2.1" # LGPL-2+ and LGPL-2.1+ ? -SLOT="0/9" # Based on SONAME of libmtp shared library -IUSE="+crypt doc examples static-libs" - -RDEPEND="virtual/libusb:1 - crypt? ( >=dev-libs/libgcrypt-1.5.4:0= )" -DEPEND="${RDEPEND} - virtual/pkgconfig - doc? ( app-doc/doxygen )" - -DOCS="AUTHORS README TODO" - -pkg_setup() { - enewgroup plugdev -} - -src_prepare() { - default - - # ChangeLog says "RETIRING THIS FILE ..pause.. GIT" (Last entry from start of 2011) - rm -f ChangeLog - - if [[ ${PV} == 9999* ]]; then - local crpthf=config.rpath - local crpthd=/usr/share/gettext/${crpthf} - if has_version '>sys-devel/gettext-0.18.3' && [[ -e ${crpthd} ]]; then - cp "${crpthd}" . - else - touch ${crpthf} # This is from upstream autogen.sh - fi - eautoreconf - fi -} - -src_configure() { - econf \ - $(use_enable static-libs static) \ - $(use_enable doc doxygen) \ - $(use_enable crypt mtpz) \ - --with-udev="$(get_udevdir)" \ - --with-udev-group=plugdev \ - --with-udev-mode=0660 -} - -src_install() { - default - prune_libtool_files --all - - if use examples; then - docinto examples - dodoc examples/*.{c,h,sh} - fi -} diff --git a/media-libs/libopenraw/Manifest b/media-libs/libopenraw/Manifest index 4d6d65846812..562eecbda2ed 100644 --- a/media-libs/libopenraw/Manifest +++ b/media-libs/libopenraw/Manifest @@ -4,7 +4,7 @@ DIST libopenraw-0.0.9.tar.bz2 478687 BLAKE2B d51410aa2a4ce297c660f80f99c912374fa DIST libopenraw-0.1.0.tar.bz2 525449 BLAKE2B b2ad6cbeb13bb2ece2c782e404c8ad75a3e0906a6ae7c6dfeee706c0b6adf1df7f0e094c6da129405f06837bfb61ec0d9ca0c4492fa1c876e661a646e46c5d70 SHA512 f3b867d831d03350e487a98f08cadf6a24d5e4296129a401c0066cfdf0e628663e821ed0b7e42613d1533513a9c36a1693d6c3cbbd918246dbdfbb111b5a470a DIST libopenraw-0.1.1.tar.bz2 561718 BLAKE2B 90ddf5f3d195954418291251aee52d04c7bb4011c8ed20599c5149c056a41f55df8022ed88d9da97aa4884da4114ee7bcc9226c85a5cda0194d42bc99056503c SHA512 ac8195fddc165d32337f518cc89297b91a8c2805132e380a261e9855f88ecbe074d6090f1f7b547c18fd2016b313a19e04e0428f9ba85b18928115b9dc0c1bc2 DIST libopenraw-0.1.2.tar.bz2 563981 BLAKE2B 60332274c72602e5b3eea3e41dfee8c62303a2f09028df4a637cea6f07391d912f354752cb6f354e06dd9e223dfabe5dbed1d50e0f325d85be42fb5012ecede6 SHA512 edd7e5a71feecbce1d5a20622bd3c7111acd2d4792038fd19920367ebb55d2cc7614627b9739512bbe34d6b5ae2eb65a4da9cee70c400b5cb846bf5fff08efc8 -EBUILD libopenraw-0.0.9.ebuild 1169 BLAKE2B 008e0f2dee27c41c5d66511751de230460b4ede585c6641fba0b708a8a110b7f871a55349c085bfede81713ee55d6f55dcebd98f9287d8f3c712d99a0bf44fb2 SHA512 e255a359193e494f2fb69f0a74085c417dabb698642bb93efcae3c38f2bf7b9ab0b54feec80e764951e5694a24578ebd7c1f167fdc2e12c49ce4f96809445833 +EBUILD libopenraw-0.0.9.ebuild 1170 BLAKE2B 35efa92d7c0d355d08df75448e491abb8b93ac437ead9128c396757f849ce89b624e9b3c3563bde8dd60cb63b170c07bc5d9b337419dd92f4d36f16ee9c1e827 SHA512 a93aeb33eaa9568f8d8b1451fcba4492c66a29380e28a09653e535ca870856b432524405bffec6b0bdb007503bfded6b4e931bfeed1fe56675c60bae6f819785 EBUILD libopenraw-0.1.0.ebuild 1221 BLAKE2B fcdbbbff7ac8fef777a9366ff255f36296fbcd86d2750d581bec1b5fddf3af0da45628591b6afc849d09893f774b69e4ddd1d415f898ea196ff66abb6732584b SHA512 a2b73e4e3d407bd4e06e8e077027109ad395e9720dc8b8f49e957b68cde7139a274fda5e98be5a5ecfdef19f5f569b3412a443e64363053cada2c22799d1e986 EBUILD libopenraw-0.1.1.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6 EBUILD libopenraw-0.1.2.ebuild 1113 BLAKE2B f307eb191171c2dc977c7f87c57396470d4b6951406fb9cbb3c244395503865e67f74e1d577491878732de43a4e8789cb6b436da07b104ef0c5a7d528abbee61 SHA512 92c0ea3a04232eba0f796bc94ffb2f76d47a26b0f18f0571bd85625c0dc8a64078cb203d20fb8116258bfd9e16dc6349f5c31737453ec23ad888e6168a006af6 diff --git a/media-libs/libopenraw/libopenraw-0.0.9.ebuild b/media-libs/libopenraw/libopenraw-0.0.9.ebuild index 5286863365b0..8a3b8e0888c5 100644 --- a/media-libs/libopenraw/libopenraw-0.0.9.ebuild +++ b/media-libs/libopenraw/libopenraw-0.0.9.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ SRC_URI="https://${PN}.freedesktop.org/download/${P}.tar.bz2" LICENSE="GPL-3 LGPL-3" SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" +KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris" IUSE="gtk static-libs test" RDEPEND="virtual/jpeg:0 diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 3d39ffd037b3..1c30391a96e0 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,13 +1,9 @@ AUX eselect-mesa.conf.9.2 1630 BLAKE2B 6c67ef9b5dc94f2f26378c004a459680b05084900a9199107a23f9c55514b59438265bce9ca207b05e2d20c3aa43e475d3f228c283dc965402c962a4cd0b6ebf SHA512 0fa9a23b4fba10599268266a82c7fa8dc5bfa1a0d565732875064c381dc4ff40c23faddb02b5849b1522eb9b7fd2ec2a0fac14406442a4aa0afa44bf760b42b5 DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d6c26db77d1576752fcd4a99a36cbcd902bb6ad1041d476d1c3b32479baceb4087c902ce598ede3d57851c6b9d SHA512 728dbd41f5d3a7a1c33fc18c08a8b8eb1f6d236c5f00781209f46b144dd66a27ecd723ab1635868b7ad77de3a18ad53f1a88c932f17c0be97605a2775e3b3a9b -DIST mesa-17.2.6.tar.xz 10387604 BLAKE2B 43bd60f9e61bb04e3a2afe4bc6e18099a524cdec3c7948d9ccfffa5bfe50eb3e0625ba6da7bb3b32959ef4a5e3db982daf2f90d3ee555cf65084d70849b3ca12 SHA512 739645d963da2ff79fa0f2bfcc4948516c4f0a768f9d21f98eff049edc88218847afd3786003ccf7b10deec585f4f1d7f70fcc5e5f6e33186ebbb86cd8cb0202 -DIST mesa-17.2.7.tar.xz 10353448 BLAKE2B cb116d7d7f8ace7769c348f04c0db194312553fd2b307471240dce5f971798e73c13cb7e2af6ed96a1109ea405207c3d7e8c910a1bc6197fcf37bdf4921d10b2 SHA512 f7cd06aa3ffb8ab80358304fa6a554f75c66105371072dae3a6f8f8e2a13891c8ac9eaf13c5defa74fa1236fed386ccd8c8b107e5fe80f9384237c9b1e726898 DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01 -DIST mesa-17.3.1.tar.xz 10669392 BLAKE2B 8e7a1299f79b47e9a4bc4d27123fda4e0effcb192f031c26942fd9eb056e751524c8d3f6e9f70c5871818b8c9972071e030f47ca73c112854d67695c53490597 SHA512 a2bd0123bf2df0db03197001a9e001b25f2609f3c6bf1bae66f3bc50c51d2558b5b77e232e81c1658c3a4dec88eda32a8b5a85c1fedc937a7441476228ef8238 +DIST mesa-17.3.3.tar.xz 10637708 BLAKE2B a2cec4abc58eb71c1ec92d073ac3a128e1f993f69b163c9f6e474fef4520fe074d84ca8d972a7822a76226e132230f6e7fac320b940ea3462553d398ef6bcfce SHA512 7ac8ecdcf3b2b43239835bc2c5da7f2730f80a2db945fe00df03d1548920fbc074dd4806ddd345a1ce682fd29d75b2209ef81b6b06e657f9c8ae8622a34a03c1 EBUILD mesa-17.1.10.ebuild 13439 BLAKE2B bb22c34fa2e7a794ba78ea621e7e3fc6e0aeeb65efe3599f2d5d6024a2e1b21101ac91c5e3a706a7f23c868db662928684be478d1be4c0ee4ed3bb186d981285 SHA512 033085950f8ee3c6390e1f083ed18abfe3c0fb875a8f71fc488857c2fa663e4e10221c0d43d32520928abd2eaa308ee807c67bfe296e050ab90af0d811dbcb9d -EBUILD mesa-17.2.6.ebuild 15006 BLAKE2B afff4eb4640402b2fd36d86cbae220e956c4a09917d6081c304779124ba86a4373ca37cbbe8610396ee7c2a0a24659432689e70fde79b4a355c122b61b4d2caa SHA512 9d1e62aca188b73dbfc63434934f1202060945320e35805f519bc85c22f7765057d594b095874f12f04f0f9ebe3be0705a92392c7deb52711dc232c2ca93739f -EBUILD mesa-17.2.7.ebuild 14999 BLAKE2B 85c899efe821c04912c7e2463ece1dabbb5498c69dd09072653d30675fc56408ff26eb4fb97b59e8e54f73b41077fae1cc19b8050a1e604b8177996958586c70 SHA512 2aebaf94acd8fccce398ab82a30fcae2034116b13f050ff9cd4b67551c2b46f65e4a691ef475ea35f174972e86794b27b9107b6f0c4ebf627c8c93a21f500a62 -EBUILD mesa-17.2.8.ebuild 15006 BLAKE2B 217122a845047790221274e4b26a1be368ae60e981ba871a777b8bc7b05c3147a48a73d818a92a129e29b7569a1adb00495bc53b296a509e54f33a21f4521815 SHA512 f1bbb1cfca6aeacbf2ad6d4efae9df91c0b2af5e01ca476067b58c79fe4a7b43801bee868d10e8daa52e921e079f48f8c95b9464495539cccdee8f6935122887 -EBUILD mesa-17.3.1.ebuild 14892 BLAKE2B e3fb731721a648981bc901a4b96a0d76d6e0a1d9393d515bff62c808c700626052983a5d0ec29b2f584da70246fb53eba99abb9403eccb62fd74e289b9113d11 SHA512 57ac595432a400c8435ba4e60d4a64e2333e33cd5f2c0ad8292a30677fbcd85ebe60c913f8d47b66cb79ed06b42f4da3e288675514ecefaed8c74d1f98553087 +EBUILD mesa-17.2.8.ebuild 14999 BLAKE2B 48693ff690c7f7283e5d8412b282265a24100d7e5a05acc2054b5058bad9d1971b3bfd5b4070803eff6c045c8904accc78b68e84958c73528036e42d8a856335 SHA512 c00b4d4ebaeabfbece7727f9605d9a91c691a759247b59d7b719bd576864f69ac6887a92b1bade227e374da19d8c609abe934a979714a7259e21cb60b10abe31 +EBUILD mesa-17.3.3.ebuild 14892 BLAKE2B 4b44795597c2e47151553133e75476155fde4c438f384434254027a7d73f2d80de3412ba11edfee83d434814378234875b1f4f884897fce7153baab5ac6c592b SHA512 3246e7864889ffb4d0bb907e3393edc9d718398f0002478e0b5a5cb02aa3a2320c3675b7320053c46b3336d62dcd366d96af85c37d2b8d10539d0adbea66870e EBUILD mesa-9999.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49 MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705 diff --git a/media-libs/mesa/mesa-17.2.6.ebuild b/media-libs/mesa/mesa-17.2.6.ebuild deleted file mode 100644 index c73b6d0c97be..000000000000 --- a/media-libs/mesa/mesa-17.2.6.ebuild +++ /dev/null @@ -1,582 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git" - -if [[ ${PV} = 9999 ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/" - -if [[ $PV == 9999 ]]; then - SRC_URI="" -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT="!bindist? ( bindist )" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind - +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind - vdpau vulkan wayland xvmc xa" - -REQUIRED_USE=" - d3d9? ( dri3 gallium ) - llvm? ( gallium ) - opencl? ( gallium llvm ) - openmax? ( gallium ) - gles1? ( egl ) - gles2? ( egl ) - vaapi? ( gallium ) - vdpau? ( gallium ) - vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) - video_cards_radeonsi? ( llvm ) ) - wayland? ( egl gbm ) - xa? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_imx? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_radeon? ( || ( classic gallium ) - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) - >=app-eselect/eselect-opengl-1.3.0 - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - opencl? ( - app-eselect/eselect-opencl - dev-libs/libclc - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) - vaapi? ( - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] - video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) - ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] - - video_cards_intel? ( - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 7. -# 3. Specify LLVM_MAX_SLOT, e.g. 6. -LLVM_MAX_SLOT="5" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:5[${MULTILIB_USEDEP}] - sys-devel/llvm:4[${MULTILIB_USEDEP}] - >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-6:=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/gettext - virtual/pkgconfig - valgrind? ( dev-util/valgrind ) - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] -" -[[ ${PV} == 9999 ]] && DEPEND+=" - sys-devel/bison - sys-devel/flex - $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - !pic? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) -)" - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 - fi - has_version "sys-devel/llvm[${flags}]" -} - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - if use llvm; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -src_prepare() { - [[ ${PV} == 9999 ]] && eautoreconf - eapply_user -} - -multilib_src_configure() { - local myconf - - if use classic; then - # Configurable DRI drivers - driver_enable swrast - - # Intel code - driver_enable video_cards_i915 i915 - driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - driver_enable video_cards_nouveau nouveau - - # ATI code - driver_enable video_cards_r100 radeon - driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - driver_enable video_cards_radeon radeon r200 - fi - fi - - if use egl; then - myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")" - fi - - if use gallium; then - myconf+=" - $(use_enable d3d9 nine) - $(use_enable llvm) - $(use_enable openmax omx) - $(use_enable vaapi va) - $(use_enable vdpau) - $(use_enable xa) - $(use_enable xvmc) - " - use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers" - - gallium_enable swrast - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_imx imx - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - - gallium_enable video_cards_virgl virgl - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_radeonsi radeon - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if [[ ${ABI} == x86 ]]; then - myconf+=" $(use_enable pax_kernel glx-read-only-text)" - fi - - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - myconf+=" --disable-asm" - fi - - if use gallium; then - myconf+=" $(use_enable osmesa gallium-osmesa)" - else - myconf+=" $(use_enable osmesa)" - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - ECONF_SOURCE="${S}" \ - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(use_enable !bindist texture-float) \ - $(use_enable d3d9 nine) \ - $(use_enable debug) \ - $(use_enable dri3) \ - $(use_enable egl) \ - $(use_enable gbm) \ - $(use_enable gles1) \ - $(use_enable gles2) \ - $(use_enable nptl glx-tls) \ - $(use_enable unwind libunwind) \ - --enable-valgrind=$(usex valgrind auto no) \ - --enable-llvm-shared-libs \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - --with-vulkan-drivers=${VULKAN_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use classic || use gallium; then - ebegin "Moving DRI/Gallium drivers for dynamic switching" - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) - keepdir /usr/$(get_libdir)/dri - dodir /usr/$(get_libdir)/mesa - for x in ${gallium_drivers[@]}; do - if [ -f "$(get_libdir)/gallium/${x}" ]; then - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ - || die "Failed to move ${x}" - fi - done - if use classic; then - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install - fi - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${x/dri/mesa}" \ - || die "Failed to move ${x}" - fi - done - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" - ln -s ../mesa/*.so . || die "Creating symlink failed" - # remove symlinks to drivers known to eselect - for x in ${gallium_drivers[@]}; do - if [ -f ${x} -o -L ${x} ]; then - rm "${x}" || die "Failed to remove ${x}" - fi - done - popd - eend $? - fi - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi - - if use openmax; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" - doenvd "${T}"/99mesaxdgomx - keepdir /usr/share/mesa/xdg - fi -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -multilib_src_test() { - if use llvm; then - local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' - pushd src/gallium/drivers/llvmpipe >/dev/null || die - emake ${llvm_tests} - pax-mark m ${llvm_tests} - popd >/dev/null || die - fi - emake check -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - - # Select classic/gallium drivers - if use classic || use gallium; then - eselect mesa set --auto - fi - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - fi - - # run omxregister-bellagio to make the OpenMAX drivers known system-wide - if use openmax; then - ebegin "Registering OpenMAX drivers" - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ - omxregister-bellagio - eend $? - fi - - # warn about patent encumbered texture-float - if use !bindist; then - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" - elog "enabled. Please see patents.txt for an explanation." - fi - - if ! has_version media-libs/libtxc_dxtn; then - elog "Note that in order to have full S3TC support, it is necessary to install" - elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" - elog "textures in some apps, and some others even require this to run." - fi -} - -pkg_prerm() { - if use openmax; then - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister - fi -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -# TODO: avoid code duplication for a more elegant implementation -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -gallium_enable() { - case $# in - # for enabling unconditionally - 1) - GALLIUM_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - GALLIUM_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -vulkan_enable() { - case $# in - # for enabling unconditionally - 1) - VULKAN_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - VULKAN_DRIVERS+=",${i}" - done - fi - ;; - esac -} diff --git a/media-libs/mesa/mesa-17.2.7.ebuild b/media-libs/mesa/mesa-17.2.7.ebuild deleted file mode 100644 index c0cbb1bbe502..000000000000 --- a/media-libs/mesa/mesa-17.2.7.ebuild +++ /dev/null @@ -1,582 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -EGIT_REPO_URI="https://anongit.freedesktop.org/git/mesa/mesa.git" - -if [[ ${PV} = 9999 ]]; then - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python2_7 ) - -inherit autotools llvm multilib-minimal python-any-r1 pax-utils ${GIT_ECLASS} - -OPENGL_DIR="xorg-x11" - -MY_P="${P/_/-}" - -DESCRIPTION="OpenGL-like graphic library for Linux" -HOMEPAGE="https://www.mesa3d.org/" - -if [[ $PV == 9999 ]]; then - SRC_URI="" -else - SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" -fi - -LICENSE="MIT" -SLOT="0" -RESTRICT="!bindist? ( bindist )" - -RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 imx intel nouveau vc4 virgl vivante vmware" -for card in ${VIDEO_CARDS}; do - IUSE_VIDEO_CARDS+=" video_cards_${card}" -done - -IUSE="${IUSE_VIDEO_CARDS} - bindist +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 gles2 unwind - +llvm +nptl opencl osmesa pax_kernel openmax pic selinux vaapi valgrind - vdpau vulkan wayland xvmc xa" - -REQUIRED_USE=" - d3d9? ( dri3 gallium ) - llvm? ( gallium ) - opencl? ( gallium llvm ) - openmax? ( gallium ) - gles1? ( egl ) - gles2? ( egl ) - vaapi? ( gallium ) - vdpau? ( gallium ) - vulkan? ( || ( video_cards_i965 video_cards_radeonsi ) - video_cards_radeonsi? ( llvm ) ) - wayland? ( egl gbm ) - xa? ( gallium ) - video_cards_freedreno? ( gallium ) - video_cards_intel? ( classic ) - video_cards_i915? ( || ( classic gallium ) ) - video_cards_i965? ( classic ) - video_cards_imx? ( gallium ) - video_cards_nouveau? ( || ( classic gallium ) ) - video_cards_radeon? ( || ( classic gallium ) - gallium? ( x86? ( llvm ) amd64? ( llvm ) ) ) - video_cards_r100? ( classic ) - video_cards_r200? ( classic ) - video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) ) - video_cards_r600? ( gallium ) - video_cards_radeonsi? ( gallium llvm ) - video_cards_vc4? ( gallium ) - video_cards_virgl? ( gallium ) - video_cards_vivante? ( gallium gbm ) - video_cards_vmware? ( gallium ) -" - -LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.82" -# keep correct libdrm and dri2proto dep -# keep blocks in rdepend for binpkg -RDEPEND=" - !<x11-base/xorg-server-1.7 - !<=x11-proto/xf86driproto-2.0.3 - abi_x86_32? ( !app-emulation/emul-linux-x86-opengl[-abi_x86_32(-)] ) - classic? ( app-eselect/eselect-mesa ) - gallium? ( app-eselect/eselect-mesa ) - >=app-eselect/eselect-opengl-1.3.0 - >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] - >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}] - >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}] - >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}] - >=x11-libs/libxcb-1.9.3:=[${MULTILIB_USEDEP}] - x11-libs/libXfixes:=[${MULTILIB_USEDEP}] - unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) - llvm? ( - video_cards_radeonsi? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_r600? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - video_cards_radeon? ( - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - ) - opencl? ( - app-eselect/eselect-opencl - dev-libs/libclc - virtual/libelf:0=[${MULTILIB_USEDEP}] - ) - openmax? ( >=media-libs/libomxil-bellagio-0.9.3:=[${MULTILIB_USEDEP}] ) - vaapi? ( - >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] - video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 ) - ) - vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) - wayland? ( - >=dev-libs/wayland-1.11.0:=[${MULTILIB_USEDEP}] - >=dev-libs/wayland-protocols-1.8 - ) - xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] ) - ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] - - video_cards_intel? ( - !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) - ) - video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] ) -" -for card in ${RADEON_CARDS}; do - RDEPEND="${RDEPEND} - video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) - " -done -RDEPEND="${RDEPEND} - video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) -" - -# Please keep the LLVM dependency block separate. Since LLVM is slotted, -# we need to *really* make sure we're not pulling one than more slot -# simultaneously. -# -# How to use it: -# 1. List all the working slots (with min versions) in ||, newest first. -# 2. Update the := to specify *max* version, e.g. < 7. -# 3. Specify LLVM_MAX_SLOT, e.g. 6. -LLVM_MAX_SLOT="5" -LLVM_DEPSTR=" - || ( - sys-devel/llvm:5[${MULTILIB_USEDEP}] - sys-devel/llvm:4[${MULTILIB_USEDEP}] - >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}] - ) - <sys-devel/llvm-6:=[${MULTILIB_USEDEP}] -" -LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang} -CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]} -RDEPEND="${RDEPEND} - llvm? ( - opencl? ( - video_cards_r600? ( - ${CLANG_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${CLANG_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${CLANG_DEPSTR} - ) - ) - ) - ) - !opencl? ( - video_cards_r600? ( - ${LLVM_DEPSTR_AMDGPU} - ) - !video_cards_r600? ( - video_cards_radeonsi? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - !video_cards_r600? ( - !video_cards_radeonsi? ( - video_cards_radeon? ( - ${LLVM_DEPSTR_AMDGPU} - ) - ) - ) - !video_cards_r600? ( - !video_cards_radeon? ( - !video_cards_radeonsi? ( - ${LLVM_DEPSTR} - ) - ) - ) - ) - ) -" -unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - opencl? ( - >=sys-devel/gcc-4.6 - ) - sys-devel/gettext - virtual/pkgconfig - valgrind? ( dev-util/valgrind ) - >=x11-proto/dri2proto-2.8-r1:=[${MULTILIB_USEDEP}] - dri3? ( - >=x11-proto/dri3proto-1.0:=[${MULTILIB_USEDEP}] - >=x11-proto/presentproto-1.0:=[${MULTILIB_USEDEP}] - ) - >=x11-proto/glproto-1.4.17-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xextproto-7.2.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86driproto-2.1.1-r1:=[${MULTILIB_USEDEP}] - >=x11-proto/xf86vidmodeproto-2.3.1-r1:=[${MULTILIB_USEDEP}] -" -[[ ${PV} == 9999 ]] && DEPEND+=" - sys-devel/bison - sys-devel/flex - $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_USEDEP}]") -" - -S="${WORKDIR}/${MY_P}" -EGIT_CHECKOUT_DIR=${S} - -QA_WX_LOAD=" -x86? ( - !pic? ( - usr/lib*/libglapi.so.0.0.0 - usr/lib*/libGLESv1_CM.so.1.1.0 - usr/lib*/libGLESv2.so.2.0.0 - usr/lib*/libGL.so.1.2.0 - usr/lib*/libOSMesa.so.8.0.0 - ) -)" - -llvm_check_deps() { - local flags=${MULTILIB_USEDEP} - if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi - then - flags+=",llvm_targets_AMDGPU(-)" - fi - - if use opencl; then - has_version "sys-devel/clang[${flags}]" || return 1 - fi - has_version "sys-devel/llvm[${flags}]" -} - -pkg_setup() { - # warning message for bug 459306 - if use llvm && has_version sys-devel/llvm[!debug=]; then - ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" - ewarn "detected! This can cause problems. For details, see bug 459306." - fi - - if use llvm; then - llvm_pkg_setup - fi - python-any-r1_pkg_setup -} - -src_prepare() { - [[ ${PV} == 9999 ]] && eautoreconf - eapply_user -} - -multilib_src_configure() { - local myconf - - if use classic; then - # Configurable DRI drivers - driver_enable swrast - - # Intel code - driver_enable video_cards_i915 i915 - driver_enable video_cards_i965 i965 - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - driver_enable video_cards_intel i915 i965 - fi - - # Nouveau code - driver_enable video_cards_nouveau nouveau - - # ATI code - driver_enable video_cards_r100 radeon - driver_enable video_cards_r200 r200 - if ! use video_cards_r100 && \ - ! use video_cards_r200; then - driver_enable video_cards_radeon radeon r200 - fi - fi - - if use egl; then - myconf+=" --with-platforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm")" - fi - - if use gallium; then - myconf+=" - $(use_enable d3d9 nine) - $(use_enable llvm) - $(use_enable openmax omx) - $(use_enable vaapi va) - $(use_enable vdpau) - $(use_enable xa) - $(use_enable xvmc) - " - use vaapi && myconf+=" --with-va-libdir=/usr/$(get_libdir)/va/drivers" - - gallium_enable swrast - gallium_enable video_cards_vc4 vc4 - gallium_enable video_cards_vivante etnaviv - gallium_enable video_cards_vmware svga - gallium_enable video_cards_nouveau nouveau - gallium_enable video_cards_i915 i915 - gallium_enable video_cards_imx imx - if ! use video_cards_i915 && \ - ! use video_cards_i965; then - gallium_enable video_cards_intel i915 - fi - - gallium_enable video_cards_r300 r300 - gallium_enable video_cards_r600 r600 - gallium_enable video_cards_radeonsi radeonsi - if ! use video_cards_r300 && \ - ! use video_cards_r600; then - gallium_enable video_cards_radeon r300 r600 - fi - - gallium_enable video_cards_freedreno freedreno - # opencl stuff - if use opencl; then - myconf+=" - $(use_enable opencl) - --with-clang-libdir="${EPREFIX}/usr/lib" - " - fi - - gallium_enable video_cards_virgl virgl - fi - - if use vulkan; then - vulkan_enable video_cards_i965 intel - vulkan_enable video_cards_radeonsi radeon - fi - - # x86 hardened pax_kernel needs glx-rts, bug 240956 - if [[ ${ABI} == x86 ]]; then - myconf+=" $(use_enable pax_kernel glx-read-only-text)" - fi - - # on abi_x86_32 hardened we need to have asm disable - if [[ ${ABI} == x86* ]] && use pic; then - myconf+=" --disable-asm" - fi - - if use gallium; then - myconf+=" $(use_enable osmesa gallium-osmesa)" - else - myconf+=" $(use_enable osmesa)" - fi - - # build fails with BSD indent, bug #428112 - use userland_GNU || export INDENT=cat - - ECONF_SOURCE="${S}" \ - econf \ - --enable-dri \ - --enable-glx \ - --enable-shared-glapi \ - $(use_enable !bindist texture-float) \ - $(use_enable d3d9 nine) \ - $(use_enable debug) \ - $(use_enable dri3) \ - $(use_enable egl) \ - $(use_enable gbm) \ - $(use_enable gles1) \ - $(use_enable gles2) \ - $(use_enable nptl glx-tls) \ - $(use_enable unwind libunwind) \ - --enable-valgrind=$(usex valgrind auto no) \ - --enable-llvm-shared-libs \ - --with-dri-drivers=${DRI_DRIVERS} \ - --with-gallium-drivers=${GALLIUM_DRIVERS} \ - --with-vulkan-drivers=${VULKAN_DRIVERS} \ - PYTHON2="${PYTHON}" \ - ${myconf} -} - -multilib_src_install() { - emake install DESTDIR="${D}" - - if use classic || use gallium; then - ebegin "Moving DRI/Gallium drivers for dynamic switching" - local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so ) - keepdir /usr/$(get_libdir)/dri - dodir /usr/$(get_libdir)/mesa - for x in ${gallium_drivers[@]}; do - if [ -f "$(get_libdir)/gallium/${x}" ]; then - mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \ - || die "Failed to move ${x}" - fi - done - if use classic; then - emake -C "${BUILD_DIR}/src/mesa/drivers/dri" DESTDIR="${D}" install - fi - for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do - if [ -f ${x} -o -L ${x} ]; then - mv -f "${x}" "${x/dri/mesa}" \ - || die "Failed to move ${x}" - fi - done - pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed" - ln -s ../mesa/*.so . || die "Creating symlink failed" - # remove symlinks to drivers known to eselect - for x in ${gallium_drivers[@]}; do - if [ -f ${x} -o -L ${x} ]; then - rm "${x}" || die "Failed to remove ${x}" - fi - done - popd - eend $? - fi - if use opencl; then - ebegin "Moving Gallium/Clover OpenCL implementation for dynamic switching" - local cl_dir="/usr/$(get_libdir)/OpenCL/vendors/mesa" - dodir ${cl_dir}/{lib,include} - if [ -f "${ED}/usr/$(get_libdir)/libOpenCL.so" ]; then - mv -f "${ED}"/usr/$(get_libdir)/libOpenCL.so* \ - "${ED}"${cl_dir} - fi - if [ -f "${ED}/usr/include/CL/opencl.h" ]; then - mv -f "${ED}"/usr/include/CL \ - "${ED}"${cl_dir}/include - fi - eend $? - fi - - if use openmax; then - echo "XDG_DATA_DIRS=\"${EPREFIX}/usr/share/mesa/xdg\"" > "${T}/99mesaxdgomx" - doenvd "${T}"/99mesaxdgomx - keepdir /usr/share/mesa/xdg - fi -} - -multilib_src_install_all() { - find "${ED}" -name '*.la' -delete - einstalldocs - - if use !bindist; then - dodoc docs/patents.txt - fi - - # Install config file for eselect mesa - insinto /usr/share/mesa - newins "${FILESDIR}/eselect-mesa.conf.9.2" eselect-mesa.conf -} - -multilib_src_test() { - if use llvm; then - local llvm_tests='lp_test_arit lp_test_arit lp_test_blend lp_test_blend lp_test_conv lp_test_conv lp_test_format lp_test_format lp_test_printf lp_test_printf' - pushd src/gallium/drivers/llvmpipe >/dev/null || die - emake ${llvm_tests} - pax-mark m ${llvm_tests} - popd >/dev/null || die - fi - emake check -} - -pkg_postinst() { - # Switch to the xorg implementation. - echo - eselect opengl set --use-old ${OPENGL_DIR} - - # Select classic/gallium drivers - if use classic || use gallium; then - eselect mesa set --auto - fi - - # Switch to mesa opencl - if use opencl; then - eselect opencl set --use-old ${PN} - fi - - # run omxregister-bellagio to make the OpenMAX drivers known system-wide - if use openmax; then - ebegin "Registering OpenMAX drivers" - BELLAGIO_SEARCH_PATH="${EPREFIX}/usr/$(get_libdir)/libomxil-bellagio0" \ - OMX_BELLAGIO_REGISTRY=${EPREFIX}/usr/share/mesa/xdg/.omxregister \ - omxregister-bellagio - eend $? - fi - - # warn about patent encumbered texture-float - if use !bindist; then - elog "USE=\"bindist\" was not set. Potentially patent encumbered code was" - elog "enabled. Please see patents.txt for an explanation." - fi - - if ! has_version media-libs/libtxc_dxtn; then - elog "Note that in order to have full S3TC support, it is necessary to install" - elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice" - elog "textures in some apps, and some others even require this to run." - fi -} - -pkg_prerm() { - if use openmax; then - rm "${EPREFIX}"/usr/share/mesa/xdg/.omxregister - fi -} - -# $1 - VIDEO_CARDS flag -# other args - names of DRI drivers to enable -# TODO: avoid code duplication for a more elegant implementation -driver_enable() { - case $# in - # for enabling unconditionally - 1) - DRI_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - DRI_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -gallium_enable() { - case $# in - # for enabling unconditionally - 1) - GALLIUM_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - GALLIUM_DRIVERS+=",${i}" - done - fi - ;; - esac -} - -vulkan_enable() { - case $# in - # for enabling unconditionally - 1) - VULKAN_DRIVERS+=",$1" - ;; - *) - if use $1; then - shift - for i in $@; do - VULKAN_DRIVERS+=",${i}" - done - fi - ;; - esac -} diff --git a/media-libs/mesa/mesa-17.2.8.ebuild b/media-libs/mesa/mesa-17.2.8.ebuild index 6540d5ea3f90..dc6df51c7224 100644 --- a/media-libs/mesa/mesa-17.2.8.ebuild +++ b/media-libs/mesa/mesa-17.2.8.ebuild @@ -25,7 +25,7 @@ if [[ $PV == 9999 ]]; then SRC_URI="" else SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="MIT" diff --git a/media-libs/mesa/mesa-17.3.1.ebuild b/media-libs/mesa/mesa-17.3.3.ebuild index 14e934a13216..bf3fa77a49cd 100644 --- a/media-libs/mesa/mesa-17.3.1.ebuild +++ b/media-libs/mesa/mesa-17.3.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest index 13bdd1186459..bb2bc3341acc 100644 --- a/media-libs/ming/Manifest +++ b/media-libs/ming/Manifest @@ -1,6 +1,4 @@ AUX ming-0.4.8-CVE-2017-8782.patch 772 BLAKE2B 4425c357155b1a57b6498ffcc31119408aae3ca0de8e31160a9d449599ce94139438e55638808bb667042f0c0e3dcf3f6b5de9959314f17bed3e3f11e090f871 SHA512 69a445d41856e4a567c253d5a0a1f63128ad8f71d8c418da855d62e2f1ff13e2a19a6887a22cfdaa8682811695b79b3bc736b569756f88e8472d294d89561005 -DIST ming-0_4_7.tar.gz 14903570 BLAKE2B 48e7b3c2b8a81fa63da18dd140064c572efe563eb621f33b4bc57cdcad8d6cb828e8f62fc63b47144389b0eefa5b571c47e39013ec2724611d20e74928275213 SHA512 232cf45daabd7b60203c9382aa6568455a42ddcd1bd60eec9bfe3f5e80376fcc9ff6304efbafca1ac8a504e2e167bc394e4902e0d067303d9582551461e09d3c DIST ming-0_4_8.tar.gz 14908459 BLAKE2B df89beab98a7fbdcbefccad3a2fb013453405a7dba757131a61f06d9e40b7e1fe7beeadab42c113b12cff24b91cb1e76e9fabee0e1b4af58e2127eba13cc27bc SHA512 e395acde9119ad32f4cedd500bcceee70bdd563222a41dda899cc318d5e34eb580abc38ac39c6dec7821913a0a70d2f953fc81f52255b623e34f7c3aaafbc9c0 -EBUILD ming-0.4.7.ebuild 2119 BLAKE2B 162cd507f22b4db159e1bc480decad2cfe184dfee92b23d23609733839232f34248436bb226155047c649b8633eadb6c72ffc8d05b62dc9e94eb148ab7f3c73b SHA512 9f4652a5c63ffb44cd87ec8c6536ed53666074e72af8bb1e15cbf8329667d23c7333e177428eb37aab6d7baa99cb107955da847604212fc8b76243dda42afd26 EBUILD ming-0.4.8-r1.ebuild 2185 BLAKE2B 0ee8885e23283b655b6770367cd2b742a91e808bfbbc1cc4e724e2e6870ec7299037f488948dac935203fb08c6898d65d1de47a57af6ecea45d4baa099ec46e6 SHA512 701d0be12876a3d143960f6478d499f7cc2d9906f18675a1aef51b983f0ed40d5a0c153b612f630d8c7477f397e246c07e12a083f08b9eb87ff976852e196ae6 MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0 diff --git a/media-libs/ming/ming-0.4.7.ebuild b/media-libs/ming/ming-0.4.7.ebuild deleted file mode 100644 index 5d5b23fa2fa6..000000000000 --- a/media-libs/ming/ming-0.4.7.ebuild +++ /dev/null @@ -1,94 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) -PHP_EXT_NAME=ming -PHP_EXT_OPTIONAL_USE=php -AUTOTOOLS_AUTORECONF=yes -GENTOO_DEPEND_ON_PERL=no -inherit autotools distutils-r1 flag-o-matic multilib perl-module vcs-snapshot - -DESCRIPTION="An Open Source library for Flash movie generation" -HOMEPAGE="http://ming.sourceforge.net/" -SRC_URI="https://github.com/libming/libming/archive/${P//./_}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd" -IUSE="+perl php +python static-libs" - -RDEPEND="perl? ( dev-lang/perl:= ) - python? ( ${PYTHON_DEPS} ) - media-libs/freetype:= - media-libs/libpng:0= - media-libs/giflib:= - sys-libs/zlib:= - !media-libs/libswf" -DEPEND="${RDEPEND} - sys-devel/flex - virtual/yacc" -PDEPEND="php? ( dev-php/ming-php )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" -S=${WORKDIR}/${P//./_} - -# Tests only work when the package is tested on a system -# which does not presently have any version of ming installed. -RESTRICT="test" - -src_prepare() { - default - - # Let's get rid of the TEXTRELS, link dynamic. Use gif. - sed -i \ - -e 's/libming.a/libming.so/' \ - -e 's/lungif/lgif/' \ - perl_ext/Makefile.PL - - sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.in || die - - eautoreconf -} - -src_configure() { - # build is sensitive to -O3 (bug #297437) - replace-flags -O3 -O2 - - # build python via distutils calls, disable here - # php is done in dev-php/ming-php - local myconf=( - --disable-python - --disable-php - $(use_enable static-libs static) - $(use_enable perl) - ) - econf "${myconf[@]}" -} - -run_distutils() { - if use python; then - pushd py_ext > /dev/null || die - distutils-r1_"${@}" - popd > /dev/null || die - fi -} - -src_compile() { - # some parallel make issues on flex/bison - emake -C src/actioncompiler -j1 - emake - - run_distutils ${FUNCNAME} -} - -src_install() { - run_distutils ${FUNCNAME} - - emake DESTDIR="${D}" INSTALLDIRS="vendor" install - einstalldocs - - perl_delete_localpod - find "${ED}"usr/lib* -name '*.la' -delete -} diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest index 716683edf473..4e8039bc6a54 100644 --- a/media-libs/opencv/Manifest +++ b/media-libs/opencv/Manifest @@ -17,6 +17,9 @@ AUX opencv-3.2.0-fix_ussage_cpu_instructions.patch 1931 BLAKE2B 7a4764d8b0a6d5f5 AUX opencv-3.2.0-gcc-6.0.patch 407 BLAKE2B 41f4f6416f1cf8418a397dd37ba489780ba9488365837a0cc3df945b0392b00ddf3295208d79a413d27ee76a846ffcea1e5f11bb1a46d46c05d2cffd78bd5ee9 SHA512 2615d79b237df196425628838bbfeead2a9410e3c05d83f134e2f5a1ed6d1225236ad7e2e5797e96d4a0d28743e2ac5a441e385461c3b872c726a6a37bedb4b1 AUX opencv-3.2.0-vtk.patch 857 BLAKE2B 4fcf3ed98bbf1a566d1af1f16e7dd8eef7734ee9dcb33323ae6c1849313df6c7ad404f93bee7d53906ded46d35ac8d90e25297fc9a4abb361f8e9da52b41c09d SHA512 c4c1f232b1814e7bcd93980a886b9c40b84c3ed41864e102f3a13c2272ab45bda8e488f21f5b1e25137a70533c0c24c83a3cb6355285bab5234ee083ff412d5b AUX opencv-3.3.0-contrib-xfeatures2d.patch 1038 BLAKE2B 19b304148474a5baab14c23148ef28e7eccfccf524ef5649d6a03452d02647413b681e095d21dc4c010c3aac12f93e67aacf36a78705fecac47b0d9bf081dcbf SHA512 fbcd3fd68203d9bf865528c97aa69d69e41645d3549e6202d369047840d024aec1cf229f0dfb10e71d78b9433014611bf53673d6f36d60c02a643454955a9e8c +AUX opencv-3.3.0-cuda9-cmake.patch 4676 BLAKE2B 9de3c4b988720a0b5fad1674d3967271def339c9fe45bd733b0843bede6da9ecc24b6f58b41a8f329f7f97a11e6c9ce6eacb33d9819d046d16acf257486fd4c2 SHA512 a526c9b0b248dac465da67adfd2260c9edd24ad3c335e060af134fa8700c7fb4e4a0ca0450b666966f917fb73ef2f168254a31488ce2bb74262f915d67225f90 +AUX opencv-3.3.0-cuda9-compute20.patch 775 BLAKE2B 7a818042ba9c75fd835b7fc8f6c0793aab8fef6f72964e9b57738e164c67ca16f885a8ad362360065b13bd35d4045e9c1a2683b59cc5d2b4162dc7794558a542 SHA512 00468ac115865acaba15efcf3791a927d6434ee54e37af3dd78bae3485868108ce4d1068ce94739a4d92b1673dd2111ebc30831446d69db4c999b95c5454c9cf +AUX opencv-3.3.0-cuda9-saturate.patch 1075 BLAKE2B 9e7af021924e84d0f12e8f9b764630dbd35e8d732550f2c16d7f812e9cbd4d4a1499182d7239b266985d39061a8a3f3e95b65e876c8dd339de9f1b764e769089 SHA512 e19b95957c282af846d08d2d6a7d8290c32692af165bc9c627a3d2e42319775d5128a832a4f639915b1331f8db979f2b88c1528e6059aeb78159a8f5409e1644 DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37 DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6 DIST opencv-3.1.0.tar.gz 76135587 BLAKE2B 59d0facba6573ae7b6ec8b4d8097693181244988c8c460a738004b975a65442230f387eef172920cd56682a4fa19f28368262ad85b7c79f243e2063c56275755 SHA512 57e0fe41e3d5d1dc036e7fc5673523e53d54f5f62e4d3bcb95238a9cd53e79da7c1704dc136ce632f7cfce369ebf5eb27f629a9b6ac4f7fa34120b80b5c7438f @@ -25,6 +28,7 @@ DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 6d44263792b9cd2d009c7eeaddc2ef87acb014 DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7 SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e +DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44 EBUILD opencv-2.4.13-r3.ebuild 6007 BLAKE2B 1b78cbb84733a057876a8e0a942c753786ac0b836b4e1116b9225b46cb36c37deca4c53d5df78784b99ce628e15010bf60ee750691c657d935ffa75733f54cdf SHA512 eb633e9f6e19de369a8bfcc75ca644a47cb2ca2fb2ccc8a91703e1c964d952dbdbcbae635163014839d62a647b0fa9a6c6ad8ae20c9d72fa87b270de55a57a44 EBUILD opencv-3.1.0-r8.ebuild 10666 BLAKE2B cb0777a26f6258df80001bedb0705bd1804d1bc3a01592eba66c9d52d0d93b1538697e41ceeef7ca90ef57c7d7e6a834450cfb463bdb5b0a4614dae1f662a0aa SHA512 a8c40927311623d1b40f96c4a49bf7f135c74e7956246ea0b8f817a49faeaf694216afae498786fb4d46bfefa9222bab25fc01e4f544f521fc4d19b1db14c3ff @@ -32,4 +36,5 @@ EBUILD opencv-3.2.0-r2.ebuild 10387 BLAKE2B d9b6b704e465ee03862a2b264af592025197 EBUILD opencv-3.2.0-r3.ebuild 12171 BLAKE2B f5fdc59285166a2a4e2e31901eef8d66cf0bfa948ce4b06ee9f80c91f2acceeefccc6fa4a03cbf05f609d1d51ebe58f9b192df071a016d157f921b738d00ef13 SHA512 b4dc53882ea13aeb90454dd54818d5d7ea3f0d00425c2f3eaea9ee493f84dd0956115bf2289e58b36b5de35dff455a86e24df0a804faf0f53db490030e99affb EBUILD opencv-3.3.0-r2.ebuild 12169 BLAKE2B a6ed4ce0fc0f3a2bd432979c2caa88f8e27ad2dfe2b94e8c871d394496b7443452323463e7cbc47b52a8bdfaf02d9573d146746bd38248e26da05bcf36d0203e SHA512 d56942b7173929b842e068fcc83dceba38c9cad6e48dfc745438d2bd007a1db604e312034a423e299fd082a3d22ae0cbe52ad82219ffe8a228fb3a8e3ecc80f6 EBUILD opencv-3.3.0-r4.ebuild 16525 BLAKE2B 053b335e77f6a85ccc3d31de2e0ab7211fff0ef93d37d43f659161581d130c2fd64d9e5558e4f3c0fb2628dee01e37093782ed05e57c74a1eff74064d4c194bd SHA512 4b2a62017bc97ea01c08e56fb33a55f48abebea743cb6d6b9be15cc42c7fbc26707bc016b4f27f39c183abbeca1c4666e7c98844413e2495ebd6a93cf85d42ba -MISC metadata.xml 2478 BLAKE2B b0d6572ef8991fe4df9e63f43a736eae0ec84091d31193081f7c844f0f9743631da78275fae2c2ef0570f8581abf713cc4e467a42f6c0d0afa3b5540e26c2e6f SHA512 865176271b361efedc54ca6f64c6b1810430cad04bef2d6351304c88c4212549700724b1475356d73a84d324be675ba0bb4c06e3b67639385b39e61e1922e92f +EBUILD opencv-3.3.0-r5.ebuild 17096 BLAKE2B b831fe5601493b228023ee9f2d86d265b3841375beec391c1c2622df8c7b673c239086d249470a98b09aade2be3c7f983e7748b386f385d23dd2762ccd8cfa0e SHA512 9f8b51d1adaae620133c144ca3f4c1ad6d249a4bc77db883a7318eb3d80034978e371852d003866de5376824e1808fc2644da2308365920842f4c3590b0b452f +MISC metadata.xml 2589 BLAKE2B 461791c4838078ef4a73add8fe730195ffc941e535e63a2d23603a0229e345071d08bf040cf86a17453239e5a7419fd8ccb1c78abfbf6b656b807ea766385913 SHA512 4db9642180623f050783e7d6018c5e0d8455791efe9fd23d329400af30dda7e2266f6b05a886b3cc327bf53b6c40027e77339636bc805e326db0fbf4d84381c9 diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch new file mode 100644 index 000000000000..270c599d708c --- /dev/null +++ b/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch @@ -0,0 +1,87 @@ +diff --git a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake +index 678b450ab..c2a58bd00 100644 +--- a/cmake/FindCUDA.cmake ++++ b/cmake/FindCUDA.cmake +@@ -283,7 +283,38 @@ + # CUDA_nppc_LIBRARY -- NVIDIA Performance Primitives lib (core). + # Only available for CUDA version 5.5+. + # CUDA_nppi_LIBRARY -- NVIDIA Performance Primitives lib (image processing). +-# Only available for CUDA version 5.5+. ++# Only available for CUDA version 5.5+ and was split up ++# in CUDA version 8.0+ and doesn't exist in combined ++# form in CUDA version 9.0+. ++# CUDA_nppial_LIBRARY -- NVIDIA Performance Primatives library (arithmetic and ++# logical operation functions). Only available for CUDA ++# version 8.0+. ++# CUDA_nppicc_LIBRARY -- NVIDIA Performance Primatives library (color conversion ++# and sampling functions). Only available for CUDA version ++# 8.0+. ++# CUDA_nppicom_LIBRARY -- NVIDIA Performance Primatives library (JPEG compression ++# and decompression functions). Only available for CUDA ++# version 8.0+. ++# CUDA_nppidei_LIBRARY -- NVIDIA Performance Primatives library (data exchange and ++# initialization functions). Only available for CUDA ++# version 8.0+. ++# CUDA_nppif_LIBRARY -- NVIDIA Performance Primatives library (filtering and ++# computer vision functions). Only available for CUDA ++# version 8.0+. ++# CUDA_nppig_LIBRARY -- NVIDIA Performance Primatives library (geometry ++# transformation functions). Only available for CUDA ++# version 8.0+. ++# CUDA_nppim_LIBRARY -- NVIDIA Performance Primatives library (morphological ++# operation functions). Only available for CUDA version ++# 8.0+. ++# CUDA_nppist_LIBRARY -- NVIDIA Performance Primatives library (statistics and ++# linear transform). Only available for CUDA version ++# 8.0+. ++# CUDA_nppisu_LIBRARY -- NVIDIA Performance Primatives library (memory support ++# functions). Only available for CUDA version 8.0+. ++# CUDA_nppitc_LIBRARY -- NVIDIA Performance Primatives library (threshold and ++# compare operation functions). Only available for CUDA ++# version 8.0+. + # CUDA_npps_LIBRARY -- NVIDIA Performance Primitives lib (signal processing). + # Only available for CUDA version 5.5+. + # CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library. +@@ -522,6 +553,16 @@ macro(cuda_unset_include_and_libraries) + unset(CUDA_npp_LIBRARY CACHE) + unset(CUDA_nppc_LIBRARY CACHE) + unset(CUDA_nppi_LIBRARY CACHE) ++ unset(CUDA_nppial_LIBRARY CACHE) ++ unset(CUDA_nppicc_LIBRARY CACHE) ++ unset(CUDA_nppicom_LIBRARY CACHE) ++ unset(CUDA_nppidei_LIBRARY CACHE) ++ unset(CUDA_nppif_LIBRARY CACHE) ++ unset(CUDA_nppig_LIBRARY CACHE) ++ unset(CUDA_nppim_LIBRARY CACHE) ++ unset(CUDA_nppist_LIBRARY CACHE) ++ unset(CUDA_nppisu_LIBRARY CACHE) ++ unset(CUDA_nppitc_LIBRARY CACHE) + unset(CUDA_npps_LIBRARY CACHE) + unset(CUDA_nvcuvenc_LIBRARY CACHE) + unset(CUDA_nvcuvid_LIBRARY CACHE) +@@ -787,7 +828,22 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2") + find_cuda_helper_libs(nvcuvid) + endif() + endif() +-if(CUDA_VERSION VERSION_GREATER "5.0") ++if(CUDA_VERSION VERSION_GREATER "7.5") ++ # In CUDA 8.0 NPP was splitted onto 12 separate libraries. ++ find_cuda_helper_libs(nppc) ++ find_cuda_helper_libs(nppial) ++ find_cuda_helper_libs(nppicc) ++ find_cuda_helper_libs(nppicom) ++ find_cuda_helper_libs(nppidei) ++ find_cuda_helper_libs(nppif) ++ find_cuda_helper_libs(nppig) ++ find_cuda_helper_libs(nppim) ++ find_cuda_helper_libs(nppist) ++ find_cuda_helper_libs(nppisu) ++ find_cuda_helper_libs(nppitc) ++ find_cuda_helper_libs(npps) ++ set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY};${CUDA_npps_LIBRARY}") ++elseif(CUDA_VERSION VERSION_GREATER "5.0") + # In CUDA 5.5 NPP was splitted onto 3 separate libraries. + find_cuda_helper_libs(nppc) + find_cuda_helper_libs(nppi) + + diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch new file mode 100644 index 000000000000..384630002d98 --- /dev/null +++ b/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch @@ -0,0 +1,21 @@ +--- a/cmake/OpenCVDetectCUDA.cmake 2018-01-02 11:57:50.358147518 -0500 ++++ b/cmake/OpenCVDetectCUDA.cmake 2018-01-02 12:48:44.108965500 -0500 +@@ -104,7 +104,7 @@ + if(${CUDA_VERSION} VERSION_LESS "8.0") + set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2") + else() +- set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2 6.0 6.1") ++ set(__cuda_arch_bin "3.0 3.5 3.7 5.0 5.2 6.0 6.1") + endif() + endif() + endif() +@@ -209,7 +209,7 @@ if(CUDA_FOUND) + endif() + + if(UNIX OR APPLE) +- set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC) ++ set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC --expt-relaxed-constexpr) + endif() + if(APPLE) + set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fno-finite-math-only) + diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch new file mode 100644 index 000000000000..43e2a0833cae --- /dev/null +++ b/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch @@ -0,0 +1,41 @@ +diff --git a/var/tmp/portage/media-libs/opencv-3.3.0-r4/work/opencv-3.3.0/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp b/./saturate_cast.hpp +index ec9804c..4359d18 100644 +--- a/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp ++++ b/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp +@@ -47,6 +47,9 @@ + #define OPENCV_CUDEV_UTIL_SATURATE_CAST_HPP + + #include "../common.hpp" ++#if __CUDACC_VER_MAJOR__ >= 9 ++#include <cuda_fp16.h> ++#endif + + namespace cv { namespace cudev { + +@@ -274,15 +277,25 @@ template <typename T, typename D> __device__ __forceinline__ D cast_fp16(T v); + + template <> __device__ __forceinline__ float cast_fp16<short, float>(short v) + { ++#if __CUDACC_VER_MAJOR__ >= 9 ++ return float(*(__half*)&v); ++#else + return __half2float(v); ++#endif + } + + template <> __device__ __forceinline__ short cast_fp16<float, short>(float v) + { +- return (short)__float2half_rn(v); ++#if __CUDACC_VER_MAJOR__ >= 9 ++ __half h(v); ++ return *(short*)&v; ++#else ++ return (short)__float2half_rn(v); ++#endif + } + //! @} + + }} + + #endif ++ diff --git a/media-libs/opencv/metadata.xml b/media-libs/opencv/metadata.xml index 271e88041349..a557fc060986 100644 --- a/media-libs/opencv/metadata.xml +++ b/media-libs/opencv/metadata.xml @@ -25,6 +25,7 @@ Face Recognition; Gesture Recognition; Motion Tracking, Ego Motion, Motion Under <flag name="ipp">Enable Intel Integrated Primitive support</flag> <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_xfeatures2d">Enables xfeatures2d and autodownload of samples in contrib</flag> <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_cvv">CVV module requires Qt5</flag> + <flag restrict=">=media-libs/opencv-3.3.0" name="contrib_dnn">DNN module contrib requires tiny dnn</flag> <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_hdf">HDF module requires <pkg>sci-libs/hdf5</pkg></flag> <flag restrict=">=media-libs/opencv-3.1.0" name="contrib_sfm">SFM module requires eigen, gflags, and glog</flag> <flag name="opencl">Add support for OpenCL</flag> diff --git a/media-libs/opencv/opencv-3.3.0-r5.ebuild b/media-libs/opencv/opencv-3.3.0-r5.ebuild new file mode 100644 index 000000000000..8b76d7910413 --- /dev/null +++ b/media-libs/opencv/opencv-3.3.0-r5.ebuild @@ -0,0 +1,466 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} ) + +inherit toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 cmake-multilib + +DESCRIPTION="A collection of algorithms and sample code for various computer vision problems" +HOMEPAGE="https://opencv.org" +TINY_DNN_PV="1.0.0a3" +SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz + https://dev.gentoo.org/~amynka/snap/imgcodecs-${P}.tar.gz + contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz + contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz ) + contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) ) " +LICENSE="BSD" +SLOT="0/3.3" # subslot = libopencv* soname version +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux" +IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 ipp jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d" + +# OpenGL needs gtk or Qt installed to activate, otherwise build system +# will silently disable it without the user knowing, which defeats the +# purpose of the opengl use flag. +REQUIRED_USE=" + cuda? ( tesseract? ( opencl ) ) + gflags? ( contrib ) + glog? ( contrib ) + contrib_cvv? ( contrib qt5 ) + contrib_dnn? ( contrib ) + contrib_hdf? ( contrib ) + contrib_sfm? ( contrib eigen gflags glog ) + contrib_xfeatures2d? ( contrib cuda ) + java? ( python ) + opengl? ( || ( gtk qt5 ) ) + python? ( ${PYTHON_REQUIRED_USE} ) + tesseract? ( contrib )" + +# The following logic is intrinsic in the build system, but we do not enforce +# it on the useflags since this just blocks emerging pointlessly: +# gtk? ( !qt5 ) +# openmp? ( !threads ) + +RDEPEND=" + app-arch/bzip2[${MULTILIB_USEDEP}] + dev-libs/protobuf:=[${MULTILIB_USEDEP}] + sys-libs/zlib[${MULTILIB_USEDEP}] + cuda? ( dev-util/nvidia-cuda-toolkit:0= ) + contrib_hdf? ( sci-libs/hdf5 ) + ffmpeg? ( + libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] ) + !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] ) + ) + gdal? ( sci-libs/gdal:= ) + gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] ) + glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] ) + gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] ) + gstreamer? ( + media-libs/gstreamer:1.0[${MULTILIB_USEDEP}] + media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}] + ) + gtk? ( + dev-libs/glib:2[${MULTILIB_USEDEP}] + x11-libs/gtk+:2[${MULTILIB_USEDEP}] + opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] ) + ) + ieee1394? ( + media-libs/libdc1394[${MULTILIB_USEDEP}] + sys-libs/libraw1394[${MULTILIB_USEDEP}] + ) + ipp? ( sci-libs/ipp ) + java? ( >=virtual/jre-1.6:* ) + jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] ) + jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] ) + lapack? ( virtual/lapack ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] ) + opengl? ( + virtual/opengl[${MULTILIB_USEDEP}] + virtual/glu[${MULTILIB_USEDEP}] + ) + png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] ) + python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] ) + qt5? ( + dev-qt/qtgui:5 + dev-qt/qtwidgets:5 + dev-qt/qttest:5 + dev-qt/qtconcurrent:5 + opengl? ( dev-qt/qtopengl:5 ) + ) + tesseract? ( app-text/tesseract[opencl=] ) + threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] ) + tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) + v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] ) + vtk? ( sci-libs/vtk[rendering] ) + webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] ) + xine? ( media-libs/xine-lib )" +DEPEND="${RDEPEND} + virtual/pkgconfig[${MULTILIB_USEDEP}] + contrib_dnn? ( dev-libs/cereal ) + eigen? ( dev-cpp/eigen:3 ) + java? ( >=virtual/jdk-1.6 )" + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/opencv2/cvconfig.h + /usr/include/opencv2/opencv_modules.hpp + # [contrib_cvv] + /usr/include/opencv2/cvv.hpp + /usr/include/opencv2/cvv/call_meta_data.hpp + /usr/include/opencv2/cvv/cvv.hpp + /usr/include/opencv2/cvv/debug_mode.hpp + /usr/include/opencv2/cvv/dmatch.hpp + /usr/include/opencv2/cvv/filter.hpp + /usr/include/opencv2/cvv/final_show.hpp + /usr/include/opencv2/cvv/show_image.hpp + # [contrib_hdf] + /usr/include/opencv2/hdf.hpp + /usr/include/opencv2/hdf/hdf5.hpp + # [vtk] + /usr/include/opencv2/viz.hpp + /usr/include/opencv2/viz/types.hpp + /usr/include/opencv2/viz/viz3d.hpp + /usr/include/opencv2/viz/vizcore.hpp + /usr/include/opencv2/viz/widget_accessor.hpp + /usr/include/opencv2/viz/widgets.hpp + # [cudev] + /usr/include/opencv2/cudaarithm.hpp + /usr/include/opencv2/cudabgsegm.hpp + /usr/include/opencv2/cudacodec.hpp + /usr/include/opencv2/cudafeatures2d.hpp + /usr/include/opencv2/cudafilters.hpp + /usr/include/opencv2/cudaimgproc.hpp + /usr/include/opencv2/cudalegacy.hpp + /usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp + /usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp + /usr/include/opencv2/cudalegacy/NCV.hpp + /usr/include/opencv2/cudalegacy/NCVPyramid.hpp + /usr/include/opencv2/cudalegacy/NPP_staging.hpp + /usr/include/opencv2/cudaobjdetect.hpp + /usr/include/opencv2/cudaoptflow.hpp + /usr/include/opencv2/cudastereo.hpp + /usr/include/opencv2/cudawarping.hpp + /usr/include/opencv2/cudev/block/block.hpp + /usr/include/opencv2/cudev/block/detail/reduce.hpp + /usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp + /usr/include/opencv2/cudev/block/dynamic_smem.hpp + /usr/include/opencv2/cudev/block/reduce.hpp + /usr/include/opencv2/cudev/block/scan.hpp + /usr/include/opencv2/cudev/block/vec_distance.hpp + /usr/include/opencv2/cudev/common.hpp + /usr/include/opencv2/cudev/expr/binary_func.hpp + /usr/include/opencv2/cudev/expr/binary_op.hpp + /usr/include/opencv2/cudev/expr/color.hpp + /usr/include/opencv2/cudev/expr/deriv.hpp + /usr/include/opencv2/cudev/expr/expr.hpp + /usr/include/opencv2/cudev/expr/per_element_func.hpp + /usr/include/opencv2/cudev/expr/reduction.hpp + /usr/include/opencv2/cudev/expr/unary_func.hpp + /usr/include/opencv2/cudev/expr/unary_op.hpp + /usr/include/opencv2/cudev/expr/warping.hpp + /usr/include/opencv2/cudev/functional/color_cvt.hpp + /usr/include/opencv2/cudev/functional/detail/color_cvt.hpp + /usr/include/opencv2/cudev/functional/functional.hpp + /usr/include/opencv2/cudev/functional/tuple_adapter.hpp + /usr/include/opencv2/cudev/grid/copy.hpp + /usr/include/opencv2/cudev/grid/detail/copy.hpp + /usr/include/opencv2/cudev/grid/detail/histogram.hpp + /usr/include/opencv2/cudev/grid/detail/integral.hpp + /usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp + /usr/include/opencv2/cudev/grid/detail/pyr_down.hpp + /usr/include/opencv2/cudev/grid/detail/pyr_up.hpp + /usr/include/opencv2/cudev/grid/detail/reduce.hpp + /usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp + /usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp + /usr/include/opencv2/cudev/grid/detail/split_merge.hpp + /usr/include/opencv2/cudev/grid/detail/transform.hpp + /usr/include/opencv2/cudev/grid/detail/transpose.hpp + /usr/include/opencv2/cudev/grid/histogram.hpp + /usr/include/opencv2/cudev/grid/integral.hpp + /usr/include/opencv2/cudev/grid/pyramids.hpp + /usr/include/opencv2/cudev/grid/reduce.hpp + /usr/include/opencv2/cudev/grid/reduce_to_vec.hpp + /usr/include/opencv2/cudev/grid/split_merge.hpp + /usr/include/opencv2/cudev/grid/transform.hpp + /usr/include/opencv2/cudev/grid/transpose.hpp + /usr/include/opencv2/cudev.hpp + /usr/include/opencv2/cudev/ptr2d/constant.hpp + /usr/include/opencv2/cudev/ptr2d/deriv.hpp + /usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp + /usr/include/opencv2/cudev/ptr2d/extrapolation.hpp + /usr/include/opencv2/cudev/ptr2d/glob.hpp + /usr/include/opencv2/cudev/ptr2d/gpumat.hpp + /usr/include/opencv2/cudev/ptr2d/interpolation.hpp + /usr/include/opencv2/cudev/ptr2d/lut.hpp + /usr/include/opencv2/cudev/ptr2d/mask.hpp + /usr/include/opencv2/cudev/ptr2d/remap.hpp + /usr/include/opencv2/cudev/ptr2d/resize.hpp + /usr/include/opencv2/cudev/ptr2d/texture.hpp + /usr/include/opencv2/cudev/ptr2d/traits.hpp + /usr/include/opencv2/cudev/ptr2d/transform.hpp + /usr/include/opencv2/cudev/ptr2d/warping.hpp + /usr/include/opencv2/cudev/ptr2d/zip.hpp + /usr/include/opencv2/cudev/util/atomic.hpp + /usr/include/opencv2/cudev/util/detail/tuple.hpp + /usr/include/opencv2/cudev/util/detail/type_traits.hpp + /usr/include/opencv2/cudev/util/limits.hpp + /usr/include/opencv2/cudev/util/saturate_cast.hpp + /usr/include/opencv2/cudev/util/simd_functions.hpp + /usr/include/opencv2/cudev/util/tuple.hpp + /usr/include/opencv2/cudev/util/type_traits.hpp + /usr/include/opencv2/cudev/util/vec_math.hpp + /usr/include/opencv2/cudev/util/vec_traits.hpp + /usr/include/opencv2/cudev/warp/detail/reduce.hpp + /usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp + /usr/include/opencv2/cudev/warp/reduce.hpp + /usr/include/opencv2/cudev/warp/scan.hpp + /usr/include/opencv2/cudev/warp/shuffle.hpp + /usr/include/opencv2/cudev/warp/warp.hpp +) + +PATCHES=( + "${FILESDIR}/${PN}-3.0.0-gles.patch" + "${FILESDIR}/${PN}-3.1.0-java-magic.patch" + "${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch" + "${WORKDIR}/${P}-imgcodecs-gcc.patch" # bug 627958 and https://github.com/opencv/opencv/pull/9376 + "${FILESDIR}/${P}-cuda9-cmake.patch" + "${FILESDIR}/${P}-cuda9-saturate.patch" + "${FILESDIR}/${P}-cuda9-compute20.patch" +) + +pkg_pretend() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp +} + +pkg_setup() { + [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp + java-pkg-opt-2_pkg_setup +} + +src_prepare() { + cmake-utils_src_prepare + + # remove bundled stuff + rm -rf 3rdparty || die "Removing 3rd party components failed" + sed -e '/add_subdirectory(.*3rdparty.*)/ d' \ + -i CMakeLists.txt cmake/*cmake || die + + if use contrib && use contrib_dnn; then + cd "${WORKDIR}/${PN}_contrib-${PV}" || die + eapply "${FILESDIR}/${P}-remove-tiny-dnn-autodownload.patch" + fi + + if use contrib && use contrib_xfeatures2d; then + cd "${WORKDIR}/${PN}_contrib-${PV}" || die + eapply "${FILESDIR}/${P}-contrib-xfeatures2d.patch" + mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die + fi + + java-pkg-opt-2_src_prepare + + # this really belongs in src_prepare() too + JAVA_ANT_ENCODING="iso-8859-1" + # set encoding so even this cmake build will pick it up. + export ANT_OPTS+=" -Dfile.encoding=iso-8859-1" + java-ant-2_src_configure +} + +multilib_src_configure() { + # please dont sort here, order is the same as in CMakeLists.txt + GLOBALCMAKEARGS=( + # Optional 3rd party components + # =================================================== + -DWITH_1394=$(usex ieee1394) + # -DWITH_AVFOUNDATION=OFF # IOS + -DWITH_VTK=$(multilib_native_usex vtk) + -DWITH_EIGEN=$(usex eigen) + -DWITH_VFW=OFF # Video windows support + -DWITH_FFMPEG=$(usex ffmpeg) + -DWITH_GSTREAMER=$(usex gstreamer) + -DWITH_GSTREAMER_0_10=OFF # Don't want this + -DWITH_GTK=$(usex gtk) + -DWITH_GTK_2_X=$(usex gtk) + -DWITH_IPP=$(multilib_native_usex ipp) + -DWITH_JASPER=$(usex jpeg2k) + -DWITH_JPEG=$(usex jpeg) + -DWITH_WEBP=$(usex webp) + -DWITH_OPENEXR=$(usex openexr) + -DWITH_OPENGL=$(usex opengl) + -DWITH_OPENVX=OFF + -DWITH_OPENNI=OFF # Not packaged + -DWITH_OPENNI2=OFF # Not packaged + -DWITH_PNG=$(usex png) + -DWITH_GDCM=OFF + -DWITH_PVAPI=OFF + -DWITH_GIGEAPI=OFF + -DWITH_ARAVIS=OFF + -DWITH_QT=$(multilib_native_usex qt5 5 OFF) + -DWITH_WIN32UI=OFF # Windows only + # -DWITH_QUICKTIME=OFF + # -DWITH_QTKIT=OFF + -DWITH_TBB=$(usex threads) + -DWITH_OPENMP=$(usex openmp) + -DWITH_CSTRIPES=OFF + -DWITH_PTHREADS_PF=ON + -DWITH_TIFF=$(usex tiff) + -DWITH_UNICAP=OFF # Not packaged + -DWITH_V4L=$(usex v4l) + -DWITH_LIBV4L=$(usex v4l) + -DWITH_DSHOW=ON # direct show supp + -DWITH_MSMF=OFF + -DWITH_XIMEA=OFF # Windows only + -DWITH_XINE=$(multilib_native_usex xine) + -DWITH_CLP=OFF + -DWITH_OPENCL=$(usex opencl) + -DWITH_OPENCL_SVM=OFF + -DWITH_OPENCLAMDFFT=$(usex opencl) + -DWITH_OPENCLAMDBLAS=$(usex opencl) + -DWITH_DIRECTX=OFF + -DWITH_INTELPERC=OFF + -DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag + -DWITH_IPP_A=OFF + -DWITH_MATLAB=OFF + -DWITH_VA=$(usex vaapi) + -DWITH_VA_INTEL=$(usex vaapi) + -DWITH_GDAL=$(multilib_native_usex gdal) + -DWITH_GPHOTO2=$(usex gphoto2) + -DWITH_LAPACK=$(multilib_native_usex lapack) + -DWITH_ITT=OFF # 3dparty libs itt_notify + # =================================================== + # CUDA build components: nvidia-cuda-toolkit takes care of GCC version + # =================================================== + -DWITH_CUDA=$(multilib_native_usex cuda) + -DWITH_CUBLAS=$(multilib_native_usex cuda) + -DWITH_CUFFT=$(multilib_native_usex cuda) + -DWITH_NVCUVID=OFF +# -DWITH_NVCUVID=$(usex cuda) + -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "") + # =================================================== + # OpenCV build components + # =================================================== + -DBUILD_SHARED_LIBS=ON + -DBUILD_ANDROID_EXAMPLES=OFF + -BUILD_opencv_apps= + -DBUILD_DOCS=OFF # Doesn't install anyways. + -DBUILD_EXAMPLES=$(multilib_native_usex examples) + -DBUILD_PERF_TESTS=OFF + -DBUILD_TESTS=$(multilib_native_usex testprograms) + -DBUILD_WITH_DEBUG_INFO=$(usex debug) + # -DBUILD_WITH_STATIC_CRT=OFF + -DBUILD_WITH_DYNAMIC_IPP=OFF + -DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java) + # -DBUILD_ANDROID_SERVICE=OFF + -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda) + -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "") + # =================================================== + # OpenCV installation options + # =================================================== + -DINSTALL_CREATE_DISTRIB=OFF + -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples) + -DINSTALL_TESTS=$(multilib_native_usex testprograms) + -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples) + # -DINSTALL_ANDROID_EXAMPLES=OFF + -DINSTALL_TO_MANGLED_PATHS=OFF + # =================================================== + # OpenCV build options + # =================================================== + -DENABLE_CCACHE=OFF + -DENABLE_PRECOMPILED_HEADERS=$(usex pch) + -DENABLE_SOLUTION_FOLDERS=OFF + -DENABLE_PROFILING=OFF + -DENABLE_COVERAGE=OFF + + -DHAVE_opencv_java=$(multilib_native_usex java YES NO) + -DENABLE_NOISY_WARNINGS=OFF + -DOPENCV_WARNINGS_ARE_ERRORS=OFF + -DENABLE_IMPL_COLLECTION=OFF + -DENABLE_INSTRUMENTATION=OFF + -DGENERATE_ABI_DESCRIPTOR=OFF + -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF + # =================================================== + # things we want to be hard off or not yet figured out + # =================================================== + -DBUILD_PACKAGE=OFF + # =================================================== + # Not building protobuf but update files bug #631418 + # =================================================== + -DBUILD_PROTOBUF=OFF + -DPROTOBUF_UPDATE_FILES=ON + # =================================================== + # things we want to be hard enabled not worth useflag + # =================================================== + -DCMAKE_SKIP_RPATH=ON + -DOPENCV_DOC_INSTALL_PATH= + ) + + # =================================================== + # OpenCV Contrib Modules + # =================================================== + if use contrib; then + GLOBALCMAKEARGS+=( + -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF) + -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}" + -DBUILD_opencv_dnns_easily_fooled=OFF + -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF) + -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF) + -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF) + -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF) + ) + + if multilib_is_native_abi; then + GLOBALCMAKEARGS+=( + -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract) + ) + else + GLOBALCMAKEARGS+=( + -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON + ) + fi + fi + + # workaround for bug 413429 + tc-export CC CXX + + local mycmakeargs=( ${GLOBALCMAKEARGS[@]} + -DPYTHON_EXECUTABLE=OFF + -DINSTALL_PYTHON_EXAMPLES=OFF + ) + + cmake-utils_src_configure +} + +python_module_compile() { + local BUILD_DIR=${orig_BUILD_DIR} + local mycmakeargs=( ${GLOBALCMAKEARGS[@]} ) + + # Set all python variables to load the correct Gentoo paths + mycmakeargs+=( + # cheap trick: python_setup sets one of them as a symlink + # to the correct interpreter, and the other to fail-wrapper + -DPYTHON2_EXECUTABLE=$(type -P python2) + -DPYTHON3_EXECUTABLE=$(type -P python3) + -DINSTALL_PYTHON_EXAMPLES=$(usex examples) + ) + + # Regenerate cache file. Can't use rebuild_cache as it won't + # have the Gentoo specific options. + rm -rf CMakeCache.txt || die "rm failed" + cmake-utils_src_configure + cmake-utils_src_compile + cmake-utils_src_install + + # Remove compiled binary so new version compiles + # Avoid conflicts with new module builds as build system doesn't + # really support it. + rm -rf modules/python2 || die "rm failed" +} + +multilib_src_install() { + cmake-utils_src_install + + # Build and install the python modules for all targets + if multilib_is_native_abi && use python; then + local orig_BUILD_DIR=${BUILD_DIR} + python_foreach_impl python_module_compile + fi +} |