diff options
Diffstat (limited to 'media-libs')
45 files changed, 739 insertions, 488 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex c362f5c795ef..304dcb540014 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest index 6ee05dc51d27..3be6f4bb0544 100644 --- a/media-libs/babl/Manifest +++ b/media-libs/babl/Manifest @@ -9,6 +9,7 @@ DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6 DIST babl-0.1.40.tar.bz2 653272 BLAKE2B 4e5694db5a6d29c2faeada7046cacc511623bf54794386a47c6403abb2e86cfd5d0953cf9198e8a5cf20060366e770a344a8c8b503c0496d95ce9d92e149a4f6 SHA512 73812247bade66ce38cb4239974e94a6ced05e4d9f5feae7eb111ffdf2c364197c0a2d9883ba28f5ff839f9f9ffb9dd272209c4720046c12cf2446fedae34ce1 DIST babl-0.1.42.tar.bz2 653385 BLAKE2B 62b33ccafb8bff2e7bbe06ea38692e715defe545b3651988bb160e52283a7080f49ccabc2cf71c7f51160e9a5a12121e4a5953471535e91de08d6733993b84a7 SHA512 0c37944d273b3818a7bb316d3086d48966daa6b401b4e6c0cb9ff52c8d69a80d8b632fe236110f376ab107d349fa4383b20f22cac31889ba50e48ab25d5c42d6 DIST babl-0.1.44.tar.bz2 653829 BLAKE2B 8014d66886645c67291ffbe218b95bf492512cb80fe4337ffdf714723cc4221850e71c97b8208d4242bb90855e8121047d2c683560d0eba2d0077620acb8395f SHA512 bb86d3676e12217c042464c74e22f9243d3a9c26bf4f78b0df991f40e341e02165e58284077c743489eda69274e3afd4d5b2c5312e28cc290eebaf4e8e86a9e9 +DIST babl-0.1.46.tar.bz2 653887 BLAKE2B dacfb2c4761a454012532dd74a31aa425a7aa989a98b9862c69c4f74fe6238a6b4d7af32358711f53c40094c3a0e4995c105a97282418eb30fc78b429c92a605 SHA512 a62d78d49565cfb5c3187353f31d7793156ae318e2a29b7430ca08272ea98b9101afb602d73c5cc87bc9f20a4469bc08bf8c6c197529260ae0e41d183f300648 EBUILD babl-0.1.12.ebuild 1336 BLAKE2B 0034d85113ab047a7e0eb363e1bce67246678b4c08a5d562cd4121fa8465ab4c8f571af5ca46fed7e9184e2e710d36a0ecd57dc7c181e47e8a3f0488488da630 SHA512 4b97fc493ade3c9ab855e007120e710a6918875481656f86f9d721dfae0e68d591208f55787069fc6a7473da9ecdabe27dec7031906b3ab0f1116f1b9a7f03d4 EBUILD babl-0.1.18.ebuild 1466 BLAKE2B 8aa28a3d191cec1963032c99a7b8f6bcb663ba90290062c1e86efd760d96086a9e94de7f0bcc3881ce27ff583d627ded168e81693a9062a563ee47075aef9ca0 SHA512 4b4af9460080eeb97899a303c04527e7c970664b8bc754073b11ac8ace172b048109c40831bad70e14d3bd081a6a9f3509418f6f9995cbc3ae171e5d7a232d99 EBUILD babl-0.1.20.ebuild 1474 BLAKE2B 670df7c287b3ddb67aa63e770e58d546465f2fe67b484fc4847d761c4268a7582f7af84d55b3ca4db4b7e3a38ea46e9947cd3c1eb75a25683b0df3951fa86557 SHA512 76b6996b06b4b346d500752f2d6096c7b0ad568d8d81c540f0662454175143aa143ca856140cafb96941fc1259e6633892501281b421c66f6b7c1d322e83cb9d @@ -20,5 +21,6 @@ EBUILD babl-0.1.38.ebuild 1464 BLAKE2B 94b20009d5596aea1ca481a5ba6dfdb2c4488425a EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56 EBUILD babl-0.1.42.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56 EBUILD babl-0.1.44.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc +EBUILD babl-0.1.46.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc EBUILD babl-9999.ebuild 1477 BLAKE2B b7103c7ccc115334022b5ad180c6dd2b00bf93dc76a19eeb8175d47203908fe17a9e697e815612105a6416c5ce33fe5bfe3cca8acbcc7634447ed43e76993982 SHA512 be7931458741bf220ed321b1318feab820f4d14b36ff84484cbd37a77babef9d02d6d255b301014db43dab4d2dadefb79e2ae31db8c3cd46cbcbb98486b4b5cc MISC metadata.xml 307 BLAKE2B 95a78257a39aec8fdf8c1c1c1fa0a6f2d911f6c7f22021021f3d1457d7beffad0a47b0f0131926e988340fccc4ca8ef49d086940e0e17acb89d4f3c6845b79f4 SHA512 a86588c27e62fec9d8474d9ba5edd9d235a6ffd1251d5ba729593ba7bdffdb272020567a7db2d596f17bba9c2a39a75eed9ac5eee5e0ba73af081a05fcb1af9e diff --git a/media-libs/babl/babl-0.1.46.ebuild b/media-libs/babl/babl-0.1.46.ebuild new file mode 100644 index 000000000000..8c2968e647f6 --- /dev/null +++ b/media-libs/babl/babl-0.1.46.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit eutils + +if [[ ${PV} == *9999* ]]; then + inherit autotools git-r3 + EGIT_REPO_URI="git://git.gnome.org/babl" + SRC_URI="" +else + SRC_URI="http://ftp.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~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" +HOMEPAGE="http://www.gegl.org/babl/" + +LICENSE="LGPL-3" +SLOT="0" +IUSE="altivec cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_x86_mmx cpu_flags_x86_f16c" + +RDEPEND="" +DEPEND="${RDEPEND} + >=sys-devel/libtool-2.2 + virtual/pkgconfig +" + +src_prepare() { + default + [[ ${PV} == *9999* ]] && eautoreconf +} + +src_configure() { + # Automagic rsvg support is just for website generation we do not call, + # so we don't need to fix it + # w3m is used for dist target thus no issue for us that it is automagically + # detected + econf \ + --disable-docs \ + --disable-static \ + --disable-maintainer-mode \ + $(use_enable altivec) \ + $(use_enable cpu_flags_x86_f16c f16c) \ + $(use_enable cpu_flags_x86_mmx mmx) \ + $(use_enable cpu_flags_x86_sse sse) \ + $(use_enable cpu_flags_x86_sse2 sse2) \ + $(use_enable cpu_flags_x86_sse4_1 sse4_1) +} + +src_install() { + default + prune_libtool_files --all +} diff --git a/media-libs/exempi/Manifest b/media-libs/exempi/Manifest index 4ae57e549f80..0265f585f002 100644 --- a/media-libs/exempi/Manifest +++ b/media-libs/exempi/Manifest @@ -5,5 +5,5 @@ DIST exempi-2.4.2.tar.gz 3911796 BLAKE2B 73fc84dfff84b608e1408678af06b017617c3be DIST exempi-2.4.5.tar.gz 3901474 BLAKE2B 7db80266847a18464ee5d75e2ffa38a05b2b23a30fb02a16c0a4a512f853a625f00db3ee0de3f177af584e12d65c8ecd2acc96cae96ef02d7b39129ab4b5274a SHA512 2b3dd8b2d1763fbbfed1995635f625a8e909a4c3119147385737f349002b2fa038cfaca72b2b877db8f28b9022230e49264b58766a68060b0b7c322cad99b22c EBUILD exempi-2.2.1.ebuild 1067 BLAKE2B 0c3a3a919e27ed78ef0cd4c9912dd48aff0ed0b378214fe11b6abd25a67ec4ced85b0fc8191c2df91981535199ae7ac65e1a823b9b1a3aac0dbd6588dc758e6f SHA512 4671cc734e821f6fddea6a84c7b67f3dd58549be5d76acf8f99c44aaafda9cfcdf1ffca73262c8b67f355431f58a5fe3ebe37566c64ac58d154442305c35c8fa EBUILD exempi-2.4.2.ebuild 1168 BLAKE2B 20951be88c2e85f5ffc13bf7b36ab63d7130d84e8213c93c413f83e415f194c2c4477ccd8e228a706461499f549a0e00bf77f1b69a4bbbc645dbb441b8dacc66 SHA512 45e1f895a0cb7054f08f4d426d47c1be81e8d2367f3aceb2c2ca9cb3becc52742c314ded6e1da97fdc0af69b5e49404285b236235de340bafbfde0f8c0b26072 -EBUILD exempi-2.4.5.ebuild 1175 BLAKE2B b84d1cd1d9887ff2f08e732c11b45b40dc0db60e8e9e0f3f3a2d667311b4fb81036290f66e4d426c1075fc2e2974358c4a6032e7630494ab8ed624dfa10a5c85 SHA512 73cfbcf120253f441ffd01b7d26358fcdcdc1c3b06018bf0993f5847d4bf2fb9c5881475032dd2527ce0b631836e2546094b941828f8eaa91cae1043e9106827 +EBUILD exempi-2.4.5.ebuild 1174 BLAKE2B 62ab3cbeb11f312efa774f3e4890bf0ea9d0a91f1a5f87dd8d76cae3318d24270820bf0e2353923f7828fbec9c80dd8af77efd84f009ef0dd3ec342108367a01 SHA512 5f0362322858834f6841c74ac5c48f80e79fa30702ede121a98a9eb3e69d32cb24f826f73de34214a0333118361b84bb1c2e0cd6c651f8e7b688cc2817839f6e MISC metadata.xml 232 BLAKE2B b8ca675b002ba96d45a3afe7b6dd9f0e74d21db87eb002f72bae4e23fd49602115a18b372084596fdc09c3dccef80ae95ab540dad93fdf5dab0c9fb34f5d28db SHA512 21ba416ac701f1c9deb55d07f8afbf9da930fb04d274d84c5cf0df5e549554059959228ee6a4b8523d985fe0762af1a7c36aaefcb0e5b3c7baa5866e2841cfb4 diff --git a/media-libs/exempi/exempi-2.4.5.ebuild b/media-libs/exempi/exempi-2.4.5.ebuild index 237e4f528cea..9c0622f5fe64 100644 --- a/media-libs/exempi/exempi-2.4.5.ebuild +++ b/media-libs/exempi/exempi-2.4.5.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://libopenraw.freedesktop.org/download/${P}.tar.gz" LICENSE="BSD" SLOT="2/3" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 ~sh ~sparc x86 ~x86-fbsd" IUSE="examples static-libs test" RDEPEND=" diff --git a/media-libs/glm/Manifest b/media-libs/glm/Manifest index 6f2fbfbd6880..0fae2cea86a2 100644 --- a/media-libs/glm/Manifest +++ b/media-libs/glm/Manifest @@ -7,5 +7,5 @@ DIST glm-0.9.8.5.tar.gz 3756809 BLAKE2B 41abc10e1c41c40ad68b7148a8ccbe9d2f4fc8a8 EBUILD glm-0.9.6.1.ebuild 524 BLAKE2B 470804896aa3430cb812a7db1adc89c461ed7c2ef1428f63b92c88e6587c0e73f8730d32a454bbc6b63454506a18eabdaacb3a0ccf63dedca833efd3f2b40efe SHA512 c5c46d8dcad501804adbd4b75d852e3df36e93df2f453c862c0b344df5be9a9993dd9c938badb26cad1787ac70a70d33fb1f006d44d6b777f216dc10b4030a4c EBUILD glm-0.9.7.6.ebuild 884 BLAKE2B e916a774258380213b4beafd015105cc76592c512d373519d4a67c57d1ac8ceaf199189164270ab78a7d103d59b7c6ac7d60f9d416433cd3d08abf34cd98d660 SHA512 88038c4a32d943061db4879ea6d173b4a8ee8fc9a1574c18f7359ccf106704b70a5f532afc6f68e780ae3f94eebce08e802861b7d240a6ee87d5ba61a1d02ec5 EBUILD glm-0.9.8.4.ebuild 884 BLAKE2B dff985eff3489d2436afb02b3d3e65f06814e0b78c7690aeac19ec6028b60be37aa3209c8bf8bee0227bd46b9a9928ec959625bbf79e38cbe85ee1b6876c958a SHA512 4404107395ac1389e2c85757eb1c7aa60f75f7c4a4b57fcb9b0de816891d6675df9aa8269dac68008645e535814dda51401e68264741d159ba0602361f177541 -EBUILD glm-0.9.8.5-r1.ebuild 939 BLAKE2B 76ad40cb1aaae604f324f4c4a0e57a7b83c8527915ebf6bf6f200d9d9e7bf3abbee449c6aac11d9d81f1f752971b526c49ed6e1a55b8176be7a91c1e4a8e1341 SHA512 f1d55e62ecbb8f0b8a873c8418016d61cce1bd1f0e25c26eff4c2343e2c33ee9888d3aa243457c3fdfdcfc23588cfeb466809e6b39cd54e31006958b6e211bd0 +EBUILD glm-0.9.8.5-r1.ebuild 936 BLAKE2B 3d87f95580e299e0a43032bc9b3ac3d8b50d3490d76dda38c6d5b4823923d08354ddda89c780e9e86b189006fd29ad10bc5b6a091b2f208238deeaa45a836ee2 SHA512 91e37f4b86d86514211c652e1fbe58a6fe01542c61172c32c7f1b1ad9fc042c4cd66d2f8650de9e7268a586b0c0ba89057fa0e6dde0848bbcaf21a7bcc6c4e05 MISC metadata.xml 545 BLAKE2B 842701f1a6d1483b75f14aa99f546975b4c7de1a84d36b1e15a882d17662d98d37b491e236da73d9457706b667f0499405b5717af3ccfed73ad0518f34167c72 SHA512 637114ed9721e6d1c8f1d1ce56e9b9c208ca4dfe5f3a0c2b844d90bcdbab8344c00682c9647f7323eec7c485abcd841ef37300a8fe0bc8a5f5c12cfbb1da4971 diff --git a/media-libs/glm/glm-0.9.8.5-r1.ebuild b/media-libs/glm/glm-0.9.8.5-r1.ebuild index b30d2b1a0f8f..58732d5eb6dd 100644 --- a/media-libs/glm/glm-0.9.8.5-r1.ebuild +++ b/media-libs/glm/glm-0.9.8.5-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/g-truc/glm/archive/${PV}.tar.gz -> ${P}.tar.gz" LICENSE="|| ( HappyBunny MIT )" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~x86" +KEYWORDS="amd64 arm ~arm64 x86" IUSE="test cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_avx cpu_flags_x86_avx2" RDEPEND="virtual/opengl" diff --git a/media-libs/lensfun/Manifest b/media-libs/lensfun/Manifest index dfc98da34b76..9ea1d99bd27a 100644 --- a/media-libs/lensfun/Manifest +++ b/media-libs/lensfun/Manifest @@ -2,5 +2,4 @@ DIST lensfun-0.3.1.tar.gz 761892 BLAKE2B cbba497195a0efda181c67fa8e501d4efe7db4d DIST lensfun-0.3.2.tar.gz 784825 BLAKE2B c77cd6b2f1bda0313a980fbd3bbc7ca9ad5ed0b9777cce924f66da5de3974ccfc8939d054c7a7532508b6b0913e2d436a825a83916800b625ff2c552c96a0ae3 SHA512 9c6f546fa70e6dc692e66ef378447345be6d3383812934780d326d772d775c1918cbf3447cd91c067655044cf659025763bf47ba2d938a82a3c2de4d60127446 EBUILD lensfun-0.3.1.ebuild 1229 BLAKE2B 722636f25c329e927163e57214eb64e0e759c41c42c33681bfe7d8ede0290094b196c135ab556e90709b65554d7122394dd19b153681d3bd5019ae86a6a6581c SHA512 e9df8b1c261cd9e8b207afb72d7922a824d3b479d253f3aa28d06a85baaafb645309e1e6048bf4c5cf367a51d6a314967380b07050262bce7a1b4a31e655a6c8 EBUILD lensfun-0.3.2-r1.ebuild 1402 BLAKE2B 6a2965c5bbbbfc8a53ae0dd4eb128712c52badef5c35155584527cc4360b28e89aac4153ddca6159f9f24385ac715fd64419b2375b75618cdb9d8d64b95881f1 SHA512 7756e99fb5b5a97e95f770d2b4afe99aae4fbbb453ccaa3768d3a1f09e61af3d8a2f3a8ac35f46f5e2c3e7253aca89313f2c18ca102c03344b28b71eaf3c2717 -EBUILD lensfun-0.3.2.ebuild 1290 BLAKE2B 698144bf875b6d1d2c7ef4b80ad4abaaf696a3eeed67abb008e67ec7c4fa31b23c2f622c4c591c2b800b6722c3171fcd5848a9ea7d52b73cf174435d1c7e4cc9 SHA512 3b1c1b190ea09b59737b8e187ab976d44a3801a4190529d602a60f6398bad64ae90ecc286e3c642bd93fbe8a629dbec09bb9832226480bd0915b752bcdaf4b57 MISC metadata.xml 609 BLAKE2B f9ebe22f93c9622961688f478f0f46c111fda47252c57c96aa4f566107705f27b6beb820c0d3c6df6414f7d31dd3d1c89e31a66b064ff96fc7e7e481faf47b7c SHA512 f3c9ae5432aaae9e83dec01dc9d6a4b8d01998183ef1c6ba7731ea9eb92b4960ddfdd0a2395bfb9f137224e83d4c938a7187f01579eb5c9e882e9f4d8008ee39 diff --git a/media-libs/lensfun/lensfun-0.3.2.ebuild b/media-libs/lensfun/lensfun-0.3.2.ebuild deleted file mode 100644 index 721fa87f2f6a..000000000000 --- a/media-libs/lensfun/lensfun-0.3.2.ebuild +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -PYTHON_COMPAT=( python3_{4,5,6} ) - -inherit multilib python-single-r1 cmake-utils - -DESCRIPTION="lensfun: A library for rectifying and simulating photographic lens distortions" -HOMEPAGE="http://lensfun.sourceforge.net/" -SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" - -LICENSE="LGPL-3 CC-BY-SA-3.0" # See README for reasoning. -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux" -IUSE="doc cpu_flags_x86_sse cpu_flags_x86_sse2 test" - -RDEPEND=">=dev-libs/glib-2.28 - media-libs/libpng:0= - sys-libs/zlib:= - ${PYTHON_DEPS}" -DEPEND="${RDEPEND} - doc? ( - app-doc/doxygen - dev-python/docutils - )" - -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -DOCS=( README.md docs/mounts.txt ChangeLog ) - -src_configure() { - local mycmakeargs=( - -DDOCDIR="${EPREFIX}"/usr/share/doc/${PF}/html - -DLIBDIR="${EPREFIX}"/usr/$(get_libdir) - -DSETUP_PY_INSTALL_PREFIX="${ED}"/usr - -DBUILD_AUXFUN=ON - -DBUILD_DOC=$(usex doc ON OFF) - -DBUILD_FOR_SSE=$(usex cpu_flags_x86_sse ON OFF) - -DBUILD_FOR_SSE2=$(usex cpu_flags_x86_sse2 ON OFF) - -DBUILD_TESTS=$(usex test ON OFF) - -DBUILD_STATIC=OFF - ) - - cmake-utils_src_configure -} diff --git a/media-libs/libkate/Manifest b/media-libs/libkate/Manifest index 2a2d09183319..15804426d099 100644 --- a/media-libs/libkate/Manifest +++ b/media-libs/libkate/Manifest @@ -1,4 +1,4 @@ DIST libkate-0.4.1.tar.gz 906896 BLAKE2B 99e755a365fcd9983fcce59f38a313b4c0c23c3a274e3b98c8756aafae29d19dc3ed3d200cf2207dd2d4985d8e99ec0d47dcdadc273a78ff84c4be11330b1e0a SHA512 2635237753abc0f6c43fc07bd0ecc57c2f3c893efa6c62ad08de9191045612477302ed45acd61cdfea7447efd654ebbe0ed2d6a2cbf867eb834581d7ee43377b EBUILD libkate-0.4.1-r2.ebuild 1164 BLAKE2B f7f5e938758e94c9cf3726bdb6042e6df47c54a1ac576c12d5c6b26706d1b4f2beff6ab07b8dee237e4d91a72bdff0a3ac44ef574dcb0d7436625b6760ae0091 SHA512 ed50e21d9de360c16151aa3ccb661f021d86f13af6c8c441bb5fe86be3ede6d8236076abfa68bf6dbb480f41527334ba8dacee77271f2cdac391fd504c022fbf -EBUILD libkate-0.4.1-r3.ebuild 1313 BLAKE2B 129e33a69229eac216fbcc58cf4023ae91c36a4f7bd3739dbfbe2d6123e5581a610c1d92d34cb8640643bef6292b30d940df4a08c7367037b9e5c08b51e2e0de SHA512 455a7a82aa9420ca425b2e152204a893a3433f61e7e7d2cabe7097a324f8dbc22a85f1afa3576e86485c264872f55dead16984d73c32cf07757cc43281dfaa84 +EBUILD libkate-0.4.1-r3.ebuild 1312 BLAKE2B 6133b77abbda48df6289c90009a3c5e5a0e64188cab7f1307583173ff6eeaa9358ba5289bdd4c40c631203480eb8115692f509dead03ea2621fe394a4aad2c8c SHA512 a597e12833a3e423c099dfb475114103aa2b85942aec4eb55c2a1740e750d96cc43de20cbf93c7844371e5e384700d04066cc456386da8d3e394c700173097dd MISC metadata.xml 1066 BLAKE2B 61b532ca7ea79a560df1ea1d4e36a0ff5d00a3c1dc81b520d0c9e1a077206d6c9249711f9d76100ed9394a65ab29bbb74d02f4caa51f8f800c14b24ce9a17b47 SHA512 510dadea430ae39da68a3cd97b4a7717b91fcc26cbb0303155718ba5e46d69d2e52e099b272ffe26f34149ef8fe01df80e332009fc905a4f262ef8030327da29 diff --git a/media-libs/libkate/libkate-0.4.1-r3.ebuild b/media-libs/libkate/libkate-0.4.1-r3.ebuild index dba724470a60..70e8da3949fa 100644 --- a/media-libs/libkate/libkate-0.4.1-r3.ebuild +++ b/media-libs/libkate/libkate-0.4.1-r3.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://libkate.googlecode.com/files/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ~hppa ~ia64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="debug doc wxwidgets" REQUIRED_USE="wxwidgets? ( ${PYTHON_REQUIRED_USE} )" diff --git a/media-libs/liblastfm/Manifest b/media-libs/liblastfm/Manifest index fbf7a8a2c68e..07d86468343d 100644 --- a/media-libs/liblastfm/Manifest +++ b/media-libs/liblastfm/Manifest @@ -1,5 +1,7 @@ +AUX liblastfm-1.1.0_pre20150206-cmake.patch 2863 BLAKE2B a3bfd133819615ac059e11072ef6761074a2c9bae35caac25ec7c99c6e91ca0a13ddd6aa44302033a30d9f7328da1587e667ca02941b86e24fe50eb44279ddc5 SHA512 e8bd568d9b48f67f491db88099cb2f84410196cb4bfb3b31c1ca8c6c8e14f49727edbd3d6e80f25cb5603aeab79f57d334cf9266447a8abf9bb18f74a5d70983 +AUX liblastfm-1.1.0_pre20150206-qt-5.11b3.patch 6169 BLAKE2B 101077c99e91bc3f1b2024788adaed119d903012fe2263886d19105ff14b86120459ef7c0a795fe320373ebc19dff63cb6993d6655bb19ef5c432cf601e1c267 SHA512 e0b477fe8e059861a11791d98a315af1d9e2e84328913b1db84573c712db815efb82b0d68edfb7ec18934c864b5a51196365531d3ae0cf70a501ac72315dd6ee DIST liblastfm-1.0.9.tar.gz 119320 BLAKE2B 4c661b703af1e94b42d2bddffd994e0d33360979e47e0079f3824a9febcdba22c3ccedd8599da5c1d4b701a329cb4779bd680181837152cb1d23a231ec6eee73 SHA512 9d2bcf71b26d8a95920a07649c97b3faa071c49a8269268bb08fab01537392774873233d03cada09d3ce3fe2c45b0affdb74cd27c41f69342b973896effe1018 DIST liblastfm-1.1.0_pre20150206.tar.gz 119380 BLAKE2B ec532b7577e60c02f9e8202b06e4e496b052801d60a27795d58204c6fbec62eea24512979ea9e42f643e7cfc01794982e07b808f6411b884893e13c29d9e17b0 SHA512 984d4b6b36a12e019e486425d243fc5be24fc3968b30f7ec746204c976b9c526477d56793205c9a6eed79bff1b33a2b1c7063d1d08fd376c4b89346337d8b166 EBUILD liblastfm-1.0.9-r1.ebuild 1713 BLAKE2B 6f97bd3c43a5435b3b5e793966e71a8f23406589b9457b5d1715e6c6d364e9212616b4b1e74619b3f901b0b0f64d6105d9bff897b8586bac5c5693392a704614 SHA512 08262b6e37da21b66d869504c671cb46d4402a204a705571adac67bcc70b9bafad389905c8ec339196927580c0de3994113bc73ac6c41d365c4a1d1bc4a3de5b -EBUILD liblastfm-1.1.0_pre20150206.ebuild 1019 BLAKE2B 7b7530e11c33c2041f5065c2f77d3973b21a0583847688618d08ea276c77e34d33031451c8ca4b8a0bafbcdb2846aacc36c7cd1e462ac8930f97e6dd57f4267d SHA512 4d6de8e344ded1283c30d26d192bc017dca97718245ee8ee110dd6bd3379ada9a0c86cc2d18dd065221222172ffaecc3b44f7aad7e1543402024096d8a825803 +EBUILD liblastfm-1.1.0_pre20150206.ebuild 1100 BLAKE2B 98936bbc8dd4d9cddb3537c5d326cf36a511bf100ecb323db3ea7fe089c4775e1e511f4fc20c4c016f9f8a34e36582b5c0d16fafacedfec29f346550b319cc76 SHA512 cc1861f792777edbec11c57e8df39eb56c2594cbb5f764954ff74f8fc8749b34c2ce4a5932e570e7f01aa145e44c6e20069e968043b15ab9230ef6b9f12facc6 MISC metadata.xml 416 BLAKE2B 8f559223d9c09d5bcb551e582240252467d3846806e2d1ca1c2fe243286cd88b7f5760ec8313f15924b4041f55937c08795df1d4485e96c6523721c910b33efd SHA512 61b4387e1a4d837b28f13a7c705f1ab043fefb1ef80dda47399d52cb1a14ba79127f323967eb2e993fd6118375f134d9894fea9e132cc147c883758d1d5222a6 diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch new file mode 100644 index 000000000000..a42baf0ca30e --- /dev/null +++ b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-cmake.patch @@ -0,0 +1,97 @@ +From 8703c12d7a177627fab4a2f67018d01cc7bf0808 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 1 Apr 2018 11:51:42 +0200 +Subject: [PATCH 1/3] Make Qt5 build default and simplify logic, add missing + deps + +--- + CMakeLists.txt | 10 +++------- + 1 file changed, 3 insertions(+), 7 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be88967..a8c81dd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -27,16 +27,12 @@ set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Module + # setup qt stuff + set(CMAKE_AUTOMOC ON) + +-option(BUILD_WITH_QT4 "Build liblastfm with Qt4 no matter if Qt5 was found" OFF) ++option(BUILD_WITH_QT4 "Build liblastfm with Qt4" OFF) + +-if( NOT BUILD_WITH_QT4 ) +- # try Qt5 first, and prefer that if found +- find_package(Qt5Core QUIET) +-endif() ++if(NOT BUILD_WITH_QT4) ++ find_package(Qt5 CONFIG REQUIRED Core Network Sql Xml) + +-if(Qt5Core_DIR) + set(LASTFM_LIB_VERSION_SUFFIX 5) +- message(STATUS "Found Qt5! Please keep in mind, this is highly experimental and not our main development target..") + include_directories(${Qt5Core_INCLUDE_DIRS}) + if(UNIX AND NOT APPLE) + find_package(Qt5DBus REQUIRED) +-- +2.16.3 + + +From 22f6900552839bc90c0fc68b62707d42544eaccf Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 1 Apr 2018 11:56:48 +0200 +Subject: [PATCH 2/3] Make use of FeatureSummary + +--- + CMakeLists.txt | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a8c81dd..d5fd5b1 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -20,6 +20,7 @@ option(BUILD_TESTS "Build liblastfm tests" ON) + + # installation dirs + include(GNUInstallDirs) ++include(FeatureSummary) + + #cmake module path + set(CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}" "${PROJECT_SOURCE_DIR}/cmake/Modules") +@@ -93,3 +94,5 @@ if(BUILD_TESTS) + enable_testing() + add_subdirectory(tests) + endif() ++ ++feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES) +-- +2.16.3 + + +From bf3ee28f1aa5de7a3f3f5a3077adc97804e27b0e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 1 Apr 2018 12:06:48 +0200 +Subject: [PATCH 3/3] Cleanup include dirs + +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d5fd5b1..ef7fdd5 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -34,10 +34,10 @@ if(NOT BUILD_WITH_QT4) + find_package(Qt5 CONFIG REQUIRED Core Network Sql Xml) + + set(LASTFM_LIB_VERSION_SUFFIX 5) +- include_directories(${Qt5Core_INCLUDE_DIRS}) + if(UNIX AND NOT APPLE) + find_package(Qt5DBus REQUIRED) + endif() ++ include_directories(Qt5::Core Qt5::Network Qt5::Xml) + + # macro(qt_wrap_ui) + # qt5_wrap_ui(${ARGN}) +-- +2.16.3 + diff --git a/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch new file mode 100644 index 000000000000..dfbd694ed3d5 --- /dev/null +++ b/media-libs/liblastfm/files/liblastfm-1.1.0_pre20150206-qt-5.11b3.patch @@ -0,0 +1,196 @@ +From 5d6ef4c27804a43b26dffcb46d6b27523a1ca340 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 15 Apr 2018 21:31:14 +0200 +Subject: [PATCH] Fix build with Qt 5.11_beta3 (drop qt5_use_modules) + +--- + CMakeLists.txt | 3 -- + src/CMakeLists.txt | 63 +++++++++++++++++++--------------- + src/fingerprint/CMakeLists.txt | 20 ++++++----- + tests/lastfm_add_test.cmake | 16 +++++---- + 4 files changed, 55 insertions(+), 47 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index be88967..57da635 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -56,9 +56,6 @@ if(Qt5Core_DIR) + # endmacro() + else() + find_package(Qt4 COMPONENTS QtCore QtNetwork QtXml REQUIRED) +- +- macro(qt5_use_modules) +- endmacro() + endif() + + +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 0f872fb..22ce506 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -3,16 +3,6 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/global.h.in ${CMAKE_CURRENT_BINARY_DI + + add_definitions(${QT_DEFINITIONS}) + include_directories(${QT_INCLUDES} ${CMAKE_CURRENT_BINARY_DIR}) +-set(liblastfm_LIBRARIES +- ${QT_QTCORE_LIBRARY} +- ${QT_QTNETWORK_LIBRARY} +- ${QT_QTXML_LIBRARY} +-) +- +-list(APPEND liblastfm_QT5_MODULES +- Xml +- Network +-) + + set(liblastfm_SOURCES + ws.cpp +@@ -49,15 +39,11 @@ if(WIN32) + if(NOT MINGW) + add_definitions("-D_ATL_DLL -D_CRT_SECURE_NO_WARNINGS") + +- list(APPEND liblastfm_SOURCES ++ set(liblastfm_SOURCES ${liblastfm_SOURCES} + win/WNetworkConnectionMonitor_win.cpp + win/WmiSink.cpp + win/NdisEvents.cpp + ) +- list(APPEND liblastfm_LIBRARIES +- winhttp +- wbemuuid +- ) + endif() + endif() + +@@ -67,30 +53,51 @@ if(APPLE) + #set(CMAKE_OSX_DEPLOYMENT_TARGET 10.5) + #set(CMAKE_OSX_SYSROOT "/Developer/SDKs/MacOSX${CMAKE_OSX_DEPLOYMENT_TARGET}.sdk") + +- list(APPEND liblastfm_SOURCES ++ set(liblastfm_SOURCES ${liblastfm_SOURCES} + mac/MNetworkConnectionMonitor_mac.cpp + ) +- +- find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) +- find_library(COREFOUNDATION_LIBRARY CoreFoundation) +- list(APPEND liblastfm_LIBRARIES +- ${COREFOUNDATION_LIBRARY} +- ${SYSTEMCONFIGURATION_LIBRARY} +- ) + endif() + + if(UNIX AND NOT APPLE) +- list(APPEND liblastfm_SOURCES ++ set(liblastfm_SOURCES ${liblastfm_SOURCES} + linux/LNetworkConnectionMonitor_linux.cpp + ) +- list(APPEND liblastfm_LIBRARIES ${QT_QTDBUS_LIBRARY}) +- list(APPEND liblastfm_QT5_MODULES DBus) + endif() + + add_library(${LASTFM_LIB_TARGET_NAME} SHARED ${liblastfm_SOURCES}) +-qt5_use_modules(${LASTFM_LIB_TARGET_NAME} ${liblastfm_QT5_MODULES}) + +-target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${liblastfm_LIBRARIES}) ++if(Qt5Core_DIR) ++ target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::Network Qt5::Xml) ++ if(UNIX AND NOT APPLE) ++ target_link_libraries(${LASTFM_LIB_TARGET_NAME} Qt5::DBus) ++ endif() ++else() ++ target_link_libraries(${LASTFM_LIB_TARGET_NAME} ++ ${QT_QTCORE_LIBRARY} ++ ${QT_QTNETWORK_LIBRARY} ++ ${QT_QTXML_LIBRARY} ++ ) ++ if(UNIX AND NOT APPLE) ++ target_link_libraries(${LASTFM_LIB_TARGET_NAME} ${QT_QTDBUS_LIBRARY}) ++ endif() ++endif() ++ ++if(WIN32 AND NOT MINGW) ++ target_link_libraries(${LASTFM_LIB_TARGET_NAME} ++ winhttp ++ wbemuuid ++ ) ++endif() ++ ++if(APPLE) ++ find_library(SYSTEMCONFIGURATION_LIBRARY SystemConfiguration) ++ find_library(COREFOUNDATION_LIBRARY CoreFoundation) ++ target_link_libraries(${LASTFM_LIB_TARGET_NAME} ++ ${COREFOUNDATION_LIBRARY} ++ ${SYSTEMCONFIGURATION_LIBRARY} ++ ) ++endif() ++ + set_target_properties(${LASTFM_LIB_TARGET_NAME} PROPERTIES + VERSION ${LASTFM_VERSION_STRING} + SOVERSION ${LASTFM_SOVERSION} +diff --git a/src/fingerprint/CMakeLists.txt b/src/fingerprint/CMakeLists.txt +index 126f8d9..4a74e0d 100644 +--- a/src/fingerprint/CMakeLists.txt ++++ b/src/fingerprint/CMakeLists.txt +@@ -26,21 +26,23 @@ set(lastfm_fingerprint_HEADERS + + add_library(${FINGERPRINT_LIB_TARGET_NAME} SHARED ${lastfm_fingerprint_SOURCES}) + +-target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} +- ${LASTFM_LIB_TARGET_NAME} +- ${QT_QTSQL_LIBRARY} +- ${QT_QTCORE_LIBRARY} +- ${LIBSAMPLERATE_LIBRARY} +- ${LIBFFTW3_LIBRARY} +-) +- + set_target_properties(${FINGERPRINT_LIB_TARGET_NAME} PROPERTIES + COMPILE_DEFINITIONS LASTFM_FINGERPRINT_LIB + VERSION ${LASTFM_VERSION_STRING} + SOVERSION ${LASTFM_SOVERSION} + ) + +-qt5_use_modules(${FINGERPRINT_LIB_TARGET_NAME} Network Sql Xml) ++target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} ++ ${LASTFM_LIB_TARGET_NAME} ++ ${LIBSAMPLERATE_LIBRARY} ++ ${LIBFFTW3_LIBRARY} ++) ++ ++if(Qt5Core_DIR) ++ target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} Qt5::Network Qt5::Sql Qt5::Xml) ++else() ++ target_link_libraries(${FINGERPRINT_LIB_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTSQL_LIBRARY}) ++endif() + + install(TARGETS ${FINGERPRINT_LIB_TARGET_NAME} + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} +diff --git a/tests/lastfm_add_test.cmake b/tests/lastfm_add_test.cmake +index a4a1686..2f0664d 100644 +--- a/tests/lastfm_add_test.cmake ++++ b/tests/lastfm_add_test.cmake +@@ -6,13 +6,15 @@ macro(lastfm_add_test test_class) + configure_file(Test${LASTFM_TEST_CLASS}.h Test${LASTFM_TEST_CLASS}.h) + add_executable(${LASTFM_TEST_CLASS}Test Test${LASTFM_TEST_CLASS}.cpp) + +- qt5_use_modules(${LASTFM_TEST_CLASS}Test Core Test Xml Network) +- +- target_link_libraries(${LASTFM_TEST_CLASS}Test +- ${LASTFM_LIB_TARGET_NAME} +- ${QT_QTTEST_LIBRARY} +- ${QT_QTCORE_LIBRARY} +- ) ++ if(Qt5Core_DIR) ++ target_link_libraries(${LASTFM_TEST_CLASS}Test Qt5::Core Qt5::Test Qt5::Xml Qt5::Network ++ ${LASTFM_LIB_TARGET_NAME} ++ ) ++ else() ++ target_link_libraries(${LASTFM_TEST_CLASS}Test ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ++ ${LASTFM_LIB_TARGET_NAME} ++ ) ++ endif() + + add_test(NAME ${LASTFM_TEST_CLASS}Test COMMAND ${LASTFM_TEST_CLASS}Test) + endmacro() +-- +2.17.0 + diff --git a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild index 07c936ffe144..6e0926da1028 100644 --- a/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild +++ b/media-libs/liblastfm/liblastfm-1.1.0_pre20150206.ebuild @@ -33,6 +33,11 @@ DEPEND="${RDEPEND} # 1 of 2 (UrlBuilderTest) is failing, last checked version 1.0.9 RESTRICT="test" +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" + "${FILESDIR}/${P}-qt-5.11b3.patch" +) + src_configure() { # demos not working local mycmakeargs=( diff --git a/media-libs/libmygpo-qt/Manifest b/media-libs/libmygpo-qt/Manifest index fca00f1f59c4..532e5d6fe9ad 100644 --- a/media-libs/libmygpo-qt/Manifest +++ b/media-libs/libmygpo-qt/Manifest @@ -1,7 +1,8 @@ AUX libmygpo-qt-1.0.8-fix-JsonCreatorTest-failure.patch 2832 BLAKE2B 54d040461db07b12dc5d259d5521693a4af6dc1f2b55af9418f3b45ffe89024f25f4f388406804e7c1acd9980adbce8f08372fda60b4d6099c76d44bfbb1ec2d SHA512 f51a9edfa359f7bced8c70254c7200aed7688fd356159e6dc53298dc376855c7cfe47ad4ab5e809d8e748b41dccad3175e967c173f1d2ae751c7f2c3e46fce27 +AUX libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch 4846 BLAKE2B 05aca9ef29a790243ddc7a8d84cf1c2fe70e51321d4b95c3dd8d3385a29ffa8c2ec12266c6ba742fed458e85f506a0e161b6b89edf96e736c7d922ede8efc94d SHA512 3fa47945af5dff87d781db033b4f9bc34606c8a7a66db5c16091716374774eccd7b3cca16aadadcb063c42a616cfb445ac51e61b055a45832f81742a6e9b2f9e DIST libmygpo-qt-1.0.9.tar.gz 65153 BLAKE2B 67ad1530eccabb7fc76f9aaec19714716ee1e55888c02a0c8ca2efb7549929c00fbe86d066c7cd310f6203db27374b70306e737b49eb254eb53b8a1aa6364f45 SHA512 c7920841310c7b971d305e38586238e081c80a449a1b442e668d2b07ada5d6ff626e697db905a83d7b12a06127f975a9b02af13d8d3e1ebee04d407b4d4b48b6 -DIST libmygpo-qt-1.0.9_p20180307.tar.gz 65245 BLAKE2B 16fe3a9659a53c907979156b14ef55a413d1ee856ea6653bc140b39342db721f10b26c3f8ee5fe6be69793f93dbea4acf11eb2589b1c9a9e9bb4e153c0d0fbd8 SHA512 a09f4f2b9f5dda0f23b15b9670c0f1fe76c8a54677633db18b2980a89e2821b494b0ab1d7f97ab973d8ea3f2e2dea49d4010dad7184800582b0dc503dece7897 +DIST libmygpo-qt-1.1.0_pre20180401.tar.gz 64989 BLAKE2B dde55657b6ac391aa64756b40cc0e1152a33ab2c77e7ce8efe1d7731f6485ef7199ac45b41d4eb5df1c2ed86f8e7b86e831f7683f3966574550bd9ea355a8ccd SHA512 3a06d1e40843d460bafba4db166bfcb2f706f906e7d239506bb80ecbc5607c438914d2920f35d65d544596f07d3ed6fbd5e19bd01e5a3a70131aa6d795e3d193 EBUILD libmygpo-qt-1.0.9.ebuild 1670 BLAKE2B 5aaaa48f08ca84400c554b499499a817b3b7c4b11c9bc97db84b969db86193abf264239c1f33d3304033e451e7c4e1e40f025e7104a3c3bb3ca1831e36b7bfa3 SHA512 6d5c206312cd2cb1bce3e9fdc92ff85a5a7429b6e186032088fc58fde15042d8ba9d6c86e2b7a6f1feda430c95da4c656899a56ad4183acf098736e7bf48af8d -EBUILD libmygpo-qt-1.0.9_p20180307.ebuild 828 BLAKE2B 93935fa5aa5b1d80341a5e5cc6c681ac1ee6622cdaba74d6fb4c7e28b4f0ba4ff7353fc082652ba0ea1cb849e2a2b8e050b560c790798bfa36e95271c52bf710 SHA512 9797da18e9ff508b1c01d777d572ca26494b4086cf947cf155531fdd91ed0f0ef36f1696f9807e7e5a80b333073123cf0c5cf09dfe1a13552bd18a47d6f3766d +EBUILD libmygpo-qt-1.1.0_pre20180401.ebuild 876 BLAKE2B 891bb3a733805fe1a35a8ef39e2e62bdad4fa0fe0724182d6d9a231fc78b13c8c21c6a42d27b7b7c1ce7de54d51f043d395eed9388319a1ccde4ef3a31c89005 SHA512 4e7477055a570f8ac70db3857f055fffcc19768dc9027d6fab409680d95ac197b335adf0abcb29737a07b01b7903d3e58d3df1f316622bf1cab0e15cc689e828 EBUILD libmygpo-qt-9999.ebuild 763 BLAKE2B f939dd1c0f26fb2a940b83d3a709dfac0c7e6ebf25c07c56175313015a4b109333dfbe3bea6c64184a7c3488f3d6faba8c53842a044c990c2daa2dcd75403990 SHA512 3e010b8c420eb3a605f2490cfea52d30e5147abcd5601575dff993743f3a459bdba7abcbe0e5c5371f6f4905f6d7ac5c70e34b9cfff7d71b06994c08d90c9a74 MISC metadata.xml 347 BLAKE2B 22a365b5f63dd847e2b9ed77d778fd645c8ebb5cbe30f933488739b5e039f879eecb5d07b176a29cd43defc9bb9a73d241c898623c11b60e753fd9a801b823ea SHA512 c9a3b16cdced1a5876ed473cce964ed24e72fac4ed6e78de8d74ac0bac4c3d1a9b6d372e4f2271e1aca75125f22c25c84a2acae448e514d623d524e844bb68db diff --git a/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch new file mode 100644 index 000000000000..2b10ae4d7bd9 --- /dev/null +++ b/media-libs/libmygpo-qt/files/libmygpo-qt-1.1.0_pre20180401-qt-5.11b3.patch @@ -0,0 +1,131 @@ +From e5128384620014bca2cd9d1b5f31c405818e1a74 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 15 Apr 2018 22:20:34 +0200 +Subject: [PATCH 1/2] Add missing Qt5Network, make BUILD_WITH_QT4 more strict + +--- + CMakeLists.txt | 18 +++++++----------- + 1 file changed, 7 insertions(+), 11 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 2a1f652..85d46fd 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -5,25 +5,21 @@ project( libmygpo-qt ) + set( CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) + set( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_NO_CAST_FROM_ASCII -DQT_NO_CAST_TO_ASCII" ) + +-option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4 no matter if Qt5 was found" OFF) ++option(BUILD_WITH_QT4 "Build libmygpo-qt with Qt4" OFF) + + if( NOT BUILD_WITH_QT4 ) +- find_package(Qt5Core QUIET) +- if( Qt5Core_DIR ) +- set(MYGPO_QT_VERSION_SUFFIX 5) ++ find_package(Qt5 CONFIG REQUIRED Core Network) ++ set(MYGPO_QT_VERSION_SUFFIX 5) + +- macro(qt_wrap_cpp) +- qt5_wrap_cpp(${ARGN}) +- endmacro() +- endif() ++ macro(qt_wrap_cpp) ++ qt5_wrap_cpp(${ARGN}) ++ endmacro() + + # pkg-config names of QtCore and QtNetwork are Qt5Core and Qt5Network for + # Qt5 + set(MYGPO_QT_MAJOR_VERSION "5") + set(MYGPO_QT4_QJSON_DEP "") +-endif() +- +-if( NOT Qt5Core_DIR ) ++else() + message(STATUS "Could not find Qt5, searching for Qt4 instead...") + message(STATUS "Qt4 Support is deprecated, building with Qt4 is no longer officially supported") + if( MYGPO_BUILD_TESTS ) +-- +2.17.0 + + +From 1cadc5d15d0de4dd2d7d08069a421337547031d2 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 15 Apr 2018 22:29:33 +0200 +Subject: [PATCH 2/2] Fix build with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + CMakeLists.txt | 3 --- + src/CMakeLists.txt | 8 ++++++-- + tests/CMakeLists.txt | 12 +++++++++--- + 3 files changed, 15 insertions(+), 8 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 85d46fd..d6b3a15 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -30,9 +30,6 @@ else() + set( QT_DONT_USE_QTGUI TRUE ) + include( ${QT_USE_FILE} ) + +- macro(qt5_use_modules) +- endmacro() +- + macro(qt_wrap_cpp) + qt4_wrap_cpp(${ARGN}) + endmacro() +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 802125b..253e81e 100644 +--- a/src/CMakeLists.txt ++++ b/src/CMakeLists.txt +@@ -79,9 +79,13 @@ QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${LIBMYGPO_QT_MOC_H} ) + + add_library( ${MYGPO_QT_TARGET_NAME} SHARED ${LIBMYGPO_QT_SRC} ${LIBMYGPO_QT_MOC_SRC} ) + +-target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QJSON_LIBRARIES} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ) + set_target_properties( ${MYGPO_QT_TARGET_NAME} PROPERTIES VERSION ${MYGPO_QT_VERSION} SOVERSION ${MYGPO_QT_SONAME} DEFINE_SYMBOL MYGPO_MAKEDLL) +-qt5_use_modules( ${MYGPO_QT_TARGET_NAME} Core Network ) ++ ++if( NOT BUILD_WITH_QT4 ) ++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} Qt5::Core Qt5::Network) ++else() ++ target_link_libraries( ${MYGPO_QT_TARGET_NAME} ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QJSON_LIBRARIES}) ++endif() + + install( TARGETS ${MYGPO_QT_TARGET_NAME} EXPORT ${MYGPO_QT_TARGET_NAME}Export DESTINATION ${LIB_INSTALL_DIR} ) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index a3e3223..4f77158 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -11,11 +11,15 @@ include_directories( ${QJSON_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CU + + # UrlBuilder library + add_library( UrlBuilder ${TESTOBJECTS_SRCDIR}/UrlBuilder.cpp ${TESTOBJECTS_SRCDIR}/Config.cpp ) +-qt5_use_modules( UrlBuilder Core ) ++if( NOT BUILD_WITH_QT4 ) ++ target_link_libraries( UrlBuilder Qt5::Core ) ++endif() + # JSONCreator library + QT_WRAP_CPP(LIBMYGPO_QT_MOC_SRC ${TESTOBJECTS_SRCDIR}/EpisodeAction.h ${TESTOBJECTS_SRCDIR}/EpisodeAction_p.h ) + add_library( JsonCreator ${TESTOBJECTS_SRCDIR}/JsonCreator.cpp ${TESTOBJECTS_SRCDIR}/EpisodeAction.cpp ${TESTOBJECTS_SRCDIR}/qjsonwrapper/Json.cpp ${LIBMYGPO_QT_MOC_SRC}) +-qt5_use_modules( JsonCreator Core Network ) ++if( NOT BUILD_WITH_QT4 ) ++ target_link_libraries( JsonCreator Qt5::Core Qt5::Network ) ++endif() + + set( EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR} ) + +@@ -25,7 +29,9 @@ macro(add_libmygpo_test _source) + add_executable(${_name} ${_source} ${${_name}_MOC_SRC}) + target_link_libraries(${_name} ${QT_QTCORE_LIBRARY} ${QT_QTTEST_LIBRARY} ${QT_QTNETWORK_LIBRARY}) + add_test(${_name}-test ${EXECUTABLE_OUTPUT_PATH}/${_name}) +- qt5_use_modules(${_name} Network Test) ++ if( NOT BUILD_WITH_QT4 ) ++ target_link_libraries(${_name} Qt5::Network Qt5::Test) ++ endif() + endmacro(add_libmygpo_test) + + add_libmygpo_test( UrlBuilderTest.cpp ) +-- +2.17.0 + diff --git a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild index f528099bacff..7f7d18f3bf03 100644 --- a/media-libs/libmygpo-qt/libmygpo-qt-1.0.9_p20180307.ebuild +++ b/media-libs/libmygpo-qt/libmygpo-qt-1.1.0_pre20180401.ebuild @@ -3,7 +3,7 @@ EAPI=6 -COMMIT=28c492b6b789ba1c3c292995a52fe4e456268182 +COMMIT=b84549b8803033b803f7d4dc14d5dcd7a5c344b7 inherit cmake-utils vcs-snapshot DESCRIPTION="Qt/C++ library wrapping the gpodder.net webservice" @@ -30,6 +30,8 @@ DEPEND="${RDEPEND} test? ( dev-qt/qttest:5 ) " +PATCHES=( "${FILESDIR}/${P}-qt-5.11b3.patch" ) + src_configure() { local mycmakeargs=( -DBUILD_WITH_QT4=OFF diff --git a/media-libs/libsndfile/Manifest b/media-libs/libsndfile/Manifest index e3d46f1d02b0..baa3cd861d25 100644 --- a/media-libs/libsndfile/Manifest +++ b/media-libs/libsndfile/Manifest @@ -1,6 +1,3 @@ -AUX libsndfile-1.0.17-regtests-need-sqlite.patch 894 BLAKE2B 400db01952199dba2d2f2c6aa9f6daf223f446b61acb9dd0687275f66068860ac48aa649f05e0ca47d2c5e38e25d0d8ee405e426805cdd9ca38b4a02bac0af3b SHA512 1c914a1e51b15149bdba7d242f1ce6979d36cee7e6a6771c6b301d309805e1d5c9db28d4ab968b573504b88a9531c1a3b67af8d92d69f59c047ba692746ce5ed -AUX libsndfile-1.0.25-make.patch 444 BLAKE2B 6c9b8dad3226941da9f288ffc7d545cd8e271d716cdbce8a729349205ae37e4f331847bfaf074a7ad672c561719faeb34128209c766f9ed0af43248325d21602 SHA512 4a5b92904ac15b3116ea864a77f77c504751630ed9eadbe520466410f27179729a1493099f7229a08755ef50a91b08bb2b27fa14c99d84418a08de22bdab131d -AUX libsndfile-1.0.27-fix-tests.patch 366 BLAKE2B 3899153192b89a8adcba3437a35f6a435a43e5529d8dcd8fa046e8f5f63367717aa5387114a2cf7f8de50c5b52a5d31a00ec079338cc98bf1583d7197691f855 SHA512 df934cb531b2cc64296534cf8e6cd6aaf9ba538aeb4abf6d86f1f0abdd46f0a76317b2192a71054fe4ea99bfa2eaaa52b2e5701ac3dbf4a8f404d5d8720284fa AUX libsndfile-1.0.28-arm-varargs-failure.patch 1329 BLAKE2B d8a995e6596db880d2188cfc3243b7aff2dc13ed617b0bf589e918c5a852d4fc1d69c00eec26ec8c8b258ab00eb860872e01b149254d554cd563fd6d7b532891 SHA512 4577282dc0b71d456a562d06d8b22958f24caf383c6c4c8aa2c9006614d3110b7d6bbf896ce393468455460cb8d466c09a48416cdf159e30de6d5ecaa0d4cf09 DIST libsndfile-1.0.28.tar.gz 1202833 BLAKE2B 102735766e2c22b5278fde43feaaa664598c08fadb5264d5130e4bf1e354bd4202948db38e2912d7487bd7f8c0b9faf1616c0873eed886a56b1d7f49452bf488 SHA512 890731a6b8173f714155ce05eaf6d991b31632c8ab207fbae860968861a107552df26fcf85602df2e7f65502c7256c1b41735e1122485a3a07ddb580aa83b57f EBUILD libsndfile-1.0.28-r1.ebuild 1663 BLAKE2B 7c6a0c188b0ffba2b67b87c117ef186e0bbc12dadc61cd4d1e58e8f4d02be44bb63d1244fb41ec1520d66b230c66d7d4a466ada116e1cd3ce7551995353db113 SHA512 9ad9784b4dfddb8f4d1b3f70cc47965e35fa2e3b4469e3906dec6be2dc53841f102603f37cb078438148d6fdecace56696038f04c02ace9c14d0c26ec6a12825 diff --git a/media-libs/libsndfile/files/libsndfile-1.0.17-regtests-need-sqlite.patch b/media-libs/libsndfile/files/libsndfile-1.0.17-regtests-need-sqlite.patch deleted file mode 100644 index 85d628000f96..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.17-regtests-need-sqlite.patch +++ /dev/null @@ -1,25 +0,0 @@ -Index: libsndfile-1.0.17/configure.ac -=================================================================== ---- libsndfile-1.0.17.orig/configure.ac -+++ libsndfile-1.0.17/configure.ac -@@ -268,6 +268,7 @@ else - fi - - AC_DEFINE_UNQUOTED([HAVE_SQLITE3],$HAVE_SQLITE3,[Set to 1 if you have libsqlite3.]) -+AM_CONDITIONAL(HAVE_SQLITE3, [test "x$ac_cv_sqlite3" = "xyes"]) - - #==================================================================================== - # Determine if the processor can do clipping on float to int conversions. -Index: libsndfile-1.0.17/regtest/Makefile.am -=================================================================== ---- libsndfile-1.0.17.orig/regtest/Makefile.am -+++ libsndfile-1.0.17/regtest/Makefile.am -@@ -1,6 +1,8 @@ - ## Process this file with automake to produce Makefile.in - -+if HAVE_SQLITE3 - bin_PROGRAMS = sndfile-regtest -+endif - - noinst_HEADERS = regtest.h - diff --git a/media-libs/libsndfile/files/libsndfile-1.0.25-make.patch b/media-libs/libsndfile/files/libsndfile-1.0.25-make.patch deleted file mode 100644 index 70cc4e2e4b4b..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.25-make.patch +++ /dev/null @@ -1,14 +0,0 @@ -Honour MAKE variable for systems with make != GNU make (eg fbsd) - -Index: libsndfile-1.0.25/configure.ac -=================================================================== ---- libsndfile-1.0.25.orig/configure.ac -+++ libsndfile-1.0.25/configure.ac -@@ -701,5 +701,5 @@ if test x$prefix != "x/usr" ; then - echo - fi - --(cd src && make genfiles) --(cd tests && make genfiles) -+(cd src && ${MAKE-make} genfiles) -+(cd tests && ${MAKE-make} genfiles) diff --git a/media-libs/libsndfile/files/libsndfile-1.0.27-fix-tests.patch b/media-libs/libsndfile/files/libsndfile-1.0.27-fix-tests.patch deleted file mode 100644 index b8e7e2e815be..000000000000 --- a/media-libs/libsndfile/files/libsndfile-1.0.27-fix-tests.patch +++ /dev/null @@ -1,12 +0,0 @@ -Fix tests - ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -1,6 +1,6 @@ - ## Process this file with automake to produce Makefile.in - --noinst_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle \ -+check_PROGRAMS = make_sine sfprocess list_formats generate sndfilehandle \ - sndfile-to-text sndfile-loopify - - AM_CPPFLAGS = -I$(top_srcdir)/src diff --git a/media-libs/libtiger/Manifest b/media-libs/libtiger/Manifest index c99d73e897fc..4e0e4d701cee 100644 --- a/media-libs/libtiger/Manifest +++ b/media-libs/libtiger/Manifest @@ -1,4 +1,4 @@ DIST libtiger-0.3.4.tar.gz 383685 BLAKE2B 92bfb1ec5879c9d4af2eb1ecb26eda007fd583121eaa6e3bb23de9f8b477612eb4c87359ec61869c5a70233f1055eedcef270cb79cdd94944013147e04a85bcf SHA512 559e522b5127f32fdd08d62c40dfb493dc2db1efd1e21707d723ef27cbe03e7e38fb04d40856d824ed0c3c94a223ed1a0358fc11ecb30446b5ee5c7a3b802e6d -EBUILD libtiger-0.3.4-r1.ebuild 891 BLAKE2B 665ea8a478c7bfabb33b67792a08cd86cf3545a10fbb409ce52f4cd3bc03a0b89ef071e6fc8b22eb4028673c0a972e0d33d9c2e0109df803925365be19ddeee0 SHA512 f1fd8f2352e23a95cdaac0d066314675375ecd8f69a7e304e4fceb72940a29f7c04fa08c0f4dcff68949c95b0452bb70cff4a781cf311c58f8b9ee41c72add85 +EBUILD libtiger-0.3.4-r1.ebuild 890 BLAKE2B c65de7e2df940d3e242106cae9dfb1f62ec9778b7d9176db5cc356bcf8bc3c78351b213c597829fbe0ef19cccc2b0f8c1bf8e52cad93fca7670dd2dae13ce5e3 SHA512 ad4522ebccca78811a4d5c0b892b54269418f163b5896eed8216ed0b1cda50f85a4c81aa2674bc3fabf6844dbdddfedf8cfb68ffb99ae97ba029074cb18e1081 EBUILD libtiger-0.3.4.ebuild 798 BLAKE2B ee3c41098e2f60aa373eec044ade439558ebb9f2a0ccf520f1bf0c2fe4b2d13b21c2a998f449d8d8e45e687695b013d7a16266bcb99d6c49448e50337c413288 SHA512 efd46d6eea24aae8159d583a08bc809d6a8dca9f4ee5a32ac998e9855b8c6ce5765ffb7d3188f39ec567aeca57230d32af5757e2729617ebe1bf65b2075dd06d MISC metadata.xml 550 BLAKE2B 58756433fc1ab142f1f2dc2c465371e19c3838874b697297cf3cd62c88bbfd5805807db521135ab76972cc176b131657caf6ba1c8b75ca792f539816a3baa3d1 SHA512 2590f113bd0261f583083f51aee3beb97771b4a112ed23d2b75028daba956278ad3a56cb7de84973c9bbcc72d1c0ee0e4281531a01a8a44f6e55289d8081a500 diff --git a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild index f6ec52424829..7b458195712e 100644 --- a/media-libs/libtiger/libtiger-0.3.4-r1.ebuild +++ b/media-libs/libtiger/libtiger-0.3.4-r1.ebuild @@ -10,7 +10,7 @@ SRC_URI="https://libtiger.googlecode.com/files/${P}.tar.gz" LICENSE="BSD" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" +KEYWORDS="alpha amd64 arm ~arm64 ~ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd" IUSE="doc" RDEPEND="x11-libs/pango[${MULTILIB_USEDEP}] diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest index 4177bca06487..951aa77960f0 100644 --- a/media-libs/opus/Manifest +++ b/media-libs/opus/Manifest @@ -1,6 +1,3 @@ -AUX opus-1.1.3-CVE-2017-0381.patch 1011 BLAKE2B 856b9b22525e7eb9bd16ebc1d8b6f0782f11441d23c941db0f981cf5da77d0a62c8c78240e124283d51ac57f3082017f8bf9d7c6ff73244093929efa8195edf2 SHA512 0aeb8103a222e88a4e905db2a31d24dc7eafd1c3dfa61a096cce882d45242dc01e35ce07396b8904adb808d2d4e1217fdd7c87d3baa50a9b379675dc3db054df -DIST opus-1.1.3.tar.gz 978848 BLAKE2B 0b376c2d0e219b5821e4219e937121ecd6c7b0f17f5d38ffe841a711a6f6b0551ee9ef1bf657e67005750a8d2cbe4ed262ad231195abff527f39b764e0773d81 SHA512 99fe272ade3f072e38101ec29f9125c9f4f2bacbcc002a9caca6e64a721f6c4193d7b1b81bd8370225693249c94293c4eea980e66c704424939dabbab890ab43 DIST opus-1.2.1.tar.gz 1011070 BLAKE2B eff3e20c22cd5370a6a3aabf90cfe6f950a3a8d33cbaed8e053ff637c3c45d1d007a10da2f7983564c0bfcc3768f79ffbc041489fc8835f1faaa2fb6c0ef3800 SHA512 4a98d0a7dbd1a313e89407576805fd733c1192e8ef7e1137e3260025478a1cf1c5a8b71b48c372a0cffe6340524137fe47f181651888284f8221fb4d673f7cd5 -EBUILD opus-1.1.3-r1.ebuild 1065 BLAKE2B 633595386e7135ccaf55bc51992a92d739397bb749c47ab11cd6c1f752a32a1989168ea1b04474c04b4066b291cea93f9a76c3aa2941c131788ae53a0e30aa5a SHA512 2fa3b9611b39b9fa3cbd2f0b57cb717cdd3d3df6acba3f046a19205fd10c3c64201e78b94411f17d3aac2128f11a544a2b8463087f5ad85a225560fe535e6c1f -EBUILD opus-1.2.1.ebuild 1093 BLAKE2B 63df57d9cf806b2be26557bf9e6f72db31740b6a48720491acf3b932b68d95376bb039a9a72d65302a18d81884685a213a65eaae63cf76d7dd443ab5caae0948 SHA512 45713b1f82084acd0c5fe5235a980f1c1a98402b6d12cf9d85ab8e8da4310d3d54b04f5962633527293371e4014ef9aee2f24727f3a47c5fd722d701c35419b9 +EBUILD opus-1.2.1.ebuild 1092 BLAKE2B b20442c5544e25e21f2b1236876a68a697cfbe9108ded8df77727c9cc8b98184f180a7b902f5324ed8e17232e7843d861ee89cc71baac657542c77f2bd67295f SHA512 adc7b0ba8cc8c6b8a44925b744cce35f31cc3702597e17820f9e894013ec9d75ba2578f101ea283f7e32321ea67033d60d856cb890d8c585a16b90108e147605 MISC metadata.xml 415 BLAKE2B 17b08c77ce2fde1c129cbbe276fc1ffe28d7f200769ac2e811c3923d3c069a00c359f42a1aecc01d13fff5ee78e8c786935d1234ac49557be55028daf3136bac SHA512 0138063170ab15d60dace8a720fbde24bbc6c8406835dc5098a70c78b21b39a2d8046844652014734c2121f03200fcaa25a22418c864aa22999a1dc1a6023800 diff --git a/media-libs/opus/files/opus-1.1.3-CVE-2017-0381.patch b/media-libs/opus/files/opus-1.1.3-CVE-2017-0381.patch deleted file mode 100644 index 621236b5855c..000000000000 --- a/media-libs/opus/files/opus-1.1.3-CVE-2017-0381.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 79e8f527b0344b0897a65be35e77f7885bd99409 Mon Sep 17 00:00:00 2001 -From: Felicia Lim <flim@google.com> -Date: Thu, 28 Jul 2016 15:21:19 +0200 -Subject: [PATCH] Ensure that NLSF cannot be negative when computing a min - distance between them - -Signed-off-by: Jean-Marc Valin <jmvalin@jmvalin.ca> ---- - silk/NLSF_stabilize.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/silk/NLSF_stabilize.c b/silk/NLSF_stabilize.c -index 1fa1ea3..8f3426b 100644 ---- a/silk/NLSF_stabilize.c -+++ b/silk/NLSF_stabilize.c -@@ -130,7 +130,7 @@ void silk_NLSF_stabilize( - - /* Keep delta_min distance between the NLSFs */ - for( i = 1; i < L; i++ ) -- NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], NLSF_Q15[i-1] + NDeltaMin_Q15[i] ); -+ NLSF_Q15[i] = silk_max_int( NLSF_Q15[i], silk_ADD_SAT16( NLSF_Q15[i-1], NDeltaMin_Q15[i] ) ); - - /* Last NLSF should be no higher than 1 - NDeltaMin[L] */ - NLSF_Q15[L-1] = silk_min_int( NLSF_Q15[L-1], (1<<15) - NDeltaMin_Q15[L] ); diff --git a/media-libs/opus/opus-1.1.3-r1.ebuild b/media-libs/opus/opus-1.1.3-r1.ebuild deleted file mode 100644 index 03fade575979..000000000000 --- a/media-libs/opus/opus-1.1.3-r1.ebuild +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -inherit multilib-minimal - -if [[ ${PV} == *9999 ]] ; then - inherit git-r3 - EGIT_REPO_URI="https://git.xiph.org/opus.git" -else - SRC_URI="http://downloads.xiph.org/releases/${PN}/${P}.tar.gz" - KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd" -fi - -DESCRIPTION="Open codec designed for internet transmission of interactive speech and audio" -HOMEPAGE="http://opus-codec.org/" -SRC_URI="http://downloads.xiph.org/releases/opus/${P}.tar.gz" - -LICENSE="BSD-2" -SLOT="0" -INTRINSIC_FLAGS="cpu_flags_x86_sse neon" -IUSE="ambisonics custom-modes doc static-libs ${INTRINSIC_FLAGS}" - -DEPEND="doc? ( app-doc/doxygen )" - -PATCHES=( - "${FILESDIR}"/${PN}-1.1.3-CVE-2017-0381.patch -) - -multilib_src_configure() { - local myeconfargs=( - $(use_enable custom-modes) - $(use_enable ambisonics) - $(use_enable doc) - ) - for i in ${INTRINSIC_FLAGS} ; do - use ${i} && myeconfargs+=( --enable-intrinsics ) - done - ECONF_SOURCE="${S}" \ - econf "${myeconfargs[@]}" -} diff --git a/media-libs/opus/opus-1.2.1.ebuild b/media-libs/opus/opus-1.2.1.ebuild index 68e1f94fd224..3c5cc10addd3 100644 --- a/media-libs/opus/opus-1.2.1.ebuild +++ b/media-libs/opus/opus-1.2.1.ebuild @@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then else SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz" if [[ "${PV}" != *_alpha* ]] && [[ "${PV}" != *_beta* ]] ; then - KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-fbsd" + KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd" fi fi diff --git a/media-libs/qt-gstreamer/Manifest b/media-libs/qt-gstreamer/Manifest index 473da4a7d59e..0d4f19234638 100644 --- a/media-libs/qt-gstreamer/Manifest +++ b/media-libs/qt-gstreamer/Manifest @@ -1,5 +1,7 @@ AUX qt-gstreamer-1.2.0-boost157.patch 5474 BLAKE2B 72827e5a70e9d204271450f3cdfbe4b400c748e4b0722301de6de3c62cd0ef8ac68e2986732238cf0e5767fb398b73c7c3acd904d7a3aa3e24305012dddc354d SHA512 81f0ff93cf66635283114c35c1e8b0299c9f0f29b2d5c0cbf4e493b0e1895069a813aa898d7a2c1d2110661feffc512f8c91fef1e4e63a83d1d0e807c77b0c28 AUX qt-gstreamer-1.2.0-gstreamer15.patch 1494 BLAKE2B 1be10fb02d4a68406b17ccc758bb1bc79ad85fbde217de7ac12dd5c306326e68cddcdda82b55eebb24c6befb929008c85150b99d7bc6040e7b91984260287d3e SHA512 999ccdd8d9772887e5d302a43e14c2400519306332facc1e4a1c4a65d941ca278a473c84816e4a5358f08df2b42675e7ec9285e1616f77f755562942acaaa4a3 +AUX qt-gstreamer-1.2.0-qt-5.11b3.patch 1834 BLAKE2B 9869694e31a546d1c31bc965c7e0f44de28f5566076cee8d1bb36f274f42757256d5c77e4bf7be23e12260d235eb72868252a5b920a293adc71520bd91c70e3c SHA512 235418641f23e5bbbceef53f561bdfd3b06b5d247c8d81cfb5b72388f494142458bb0171e5b146f8be9613d22a5c286eec6730414d7cbd35b62744dcfc87e667 DIST qt-gstreamer-1.2.0.tar.xz 313632 BLAKE2B e41fd7073e223a06b0115025dcfcd637f4803f953b4fe175f5b05713bd5282c7fa12039d5a5b4c98eff5a181bbb7cd4140a0f1de32a8aadeef5d7217b339eadf SHA512 ae58c72765d590b84fa8709b45934ac464d7e00dba862783a2c4fe9d41afd09c6e5f95523cdf465fcfd2c6fa705335071b101912c42cd6c1fd15ae207b0864c7 EBUILD qt-gstreamer-1.2.0-r3.ebuild 1128 BLAKE2B e4000d90af874d1986748069ca1aea904911737a296e453fd0a96a20629f85399dcae76b3120d9042da124a0f969ac0c559261acdb5876e3b5197f3ce9ef3033 SHA512 73ebe2a3ad890ad1d87e58350d930adab57594017566ead036677b3d60d02ccd96f3d0c771b5990939bff1fa754c2fa0bbfdf4e96e01991476f206239993bc76 +EBUILD qt-gstreamer-1.2.0-r4.ebuild 1166 BLAKE2B 448bc1642dae8828012f03a2e4341a96ef1998bc9556f1186a479b1bc60475056e734cfe99060e02af0bc633133ef8c09062625fb55033153a77a60f5287b85e SHA512 6fa39286eefa219cd3e8cf26da7f6164c7094ba6b8921c1f3866bf0d0a2e34ee4f391f025ffc381237f65130465ca155b13b2a7465703fcce6811fa090d1ff4b MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3 diff --git a/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch new file mode 100644 index 000000000000..537516db8ec1 --- /dev/null +++ b/media-libs/qt-gstreamer/files/qt-gstreamer-1.2.0-qt-5.11b3.patch @@ -0,0 +1,50 @@ +From 8ed5453b1b5e6e8b3c202fb03c2084e04e5f6b44 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <andreas.sturmlechner@gmail.com> +Date: Sun, 15 Apr 2018 23:46:50 +0200 +Subject: [PATCH] Fix cmake with Qt 5.11_beta3 (dropping qt5_use_modules) + +--- + cmake/modules/FindQt4or5.cmake | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/FindQt4or5.cmake b/cmake/modules/FindQt4or5.cmake +index 855a48e..d73b3a2 100644 +--- a/cmake/modules/FindQt4or5.cmake ++++ b/cmake/modules/FindQt4or5.cmake +@@ -49,6 +49,16 @@ macro(_qt4or5_component_names_to_qt_components output_list) + list(REMOVE_DUPLICATES ${output_list}) + endmacro() + ++macro(_qt5_component_names_to_target_link_libaries output_list) ++ foreach(module ${ARGN}) ++ _qt4or5_component_name_to_qt_component(qt_component ${module}) ++ list(APPEND ${output_list} Qt5::${qt_component}) ++ unset(qt_component) ++ endforeach() ++ ++ list(REMOVE_DUPLICATES ${output_list}) ++endmacro() ++ + if (Qt4or5_FIND_QUIETLY) + set(_Qt4or5_FIND_PACKAGE_ARGS QUIET) + endif() +@@ -195,13 +205,13 @@ function(qt4or5_use_modules _target _link_type) + set(modules ${_link_type} ${ARGN}) + endif() + +- _qt4or5_component_names_to_qt_components(real_modules ${modules}) +- + # Verify that Qt5 was found before using qt5_* macros, + # otherwise cmake will bail out if they are undefined. + if (${QT_VERSION} STREQUAL "5" AND Qt5Core_FOUND) +- qt5_use_modules(${_target} ${link_type} ${real_modules}) ++ _qt5_component_names_to_target_link_libaries(real_modules ${modules}) ++ target_link_libraries(${_target} ${link_type} ${real_modules}) + elseif (${QT_VERSION} STREQUAL "4") ++ _qt4or5_component_names_to_qt_components(real_modules ${modules}) + qt4_use_modules(${_target} ${link_type} ${real_modules}) + endif() + endfunction() +-- +2.17.0 + diff --git a/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild new file mode 100644 index 000000000000..474afd4d00dc --- /dev/null +++ b/media-libs/qt-gstreamer/qt-gstreamer-1.2.0-r4.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +if [[ ${PV} != *9999* ]]; then + SRC_URI="https://gstreamer.freedesktop.org/src/qt-gstreamer/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86" +else + EGIT_REPO_URI="https://anongit.freedesktop.org/git/gstreamer/qt-gstreamer.git" + inherit git-r3 +fi + +inherit cmake-utils + +DESCRIPTION="C++ bindings for GStreamer with a Qt-style API" +HOMEPAGE="https://gstreamer.freedesktop.org/modules/qt-gstreamer.html" + +LICENSE="LGPL-2.1" +SLOT="0" +IUSE="test" + +RDEPEND=" + dev-libs/glib:2 + dev-libs/boost:= + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 +" +DEPEND="${RDEPEND} + test? ( dev-qt/qttest:5 ) +" + +PATCHES=( + "${FILESDIR}/${P}-gstreamer15.patch" + "${FILESDIR}/${P}-boost157.patch" + "${FILESDIR}/${P}-qt-5.11b3.patch" +) + +# bug 497880 +RESTRICT="test" + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON + -DQTGSTREAMER_EXAMPLES=OFF + -DQTGSTREAMER_TESTS=$(usex test) + -DQT_VERSION=5 + ) + cmake-utils_src_configure +} diff --git a/media-libs/spandsp/Manifest b/media-libs/spandsp/Manifest index db0ceafda8af..08124100ca16 100644 --- a/media-libs/spandsp/Manifest +++ b/media-libs/spandsp/Manifest @@ -1,7 +1,7 @@ DIST spandsp-0.0.6.tar.gz 3309837 BLAKE2B 6ee95501473d5758c9ff96580bb51222f49a230dc6a5f52f5a852781cbb70079bb07f9d7224f5c7ea91c0dd617fa543a37518f68875c76a44b3be1415aece696 SHA512 16bb215ca89a39282e832403f69bc4c98ad3fe35ab3a6eb4731ee5029a6acd9b2df243c3701de845441cbdc16c88b3cd398ef15dc3502e45d5aeca8a161917d4 DIST spandsp-0.0.6pre12.tgz 2566669 BLAKE2B 5e5175e2db7ea3b990f39edc4f26a8f59f091a25187bdd8cfdcaf93b5a285b68caaff05e33af8bebb3964daa91f12706d1726f71cb7736628135270fb7322b31 SHA512 19a7fe491b836fe604373aa2d31d4b35dde19e593a8f3d5d2a4b866ea69a137ba5ebfd43c34f74e8f7800a7eb1ba93d1a0401540e310bad2b73aecb17c45de0b DIST spandsp-0.0.6pre21.tgz 3278758 BLAKE2B 481bf98d728a6f4243b24eb67f1998ef789fa0929950270638ea8527f3b035affe6b150427dfa1e6906ec2901d063c38b5c8e1a1cac5e39be134fc5fe6a50d29 SHA512 6f846021cd6a1605d371a8e5d1ac3a5b6adc5b85de2517e24a5afaa57b4864202c2d16c1196959f7f11d866732d17d301d2d37121228cec75077678f8fc3e488 -EBUILD spandsp-0.0.6.ebuild 2046 BLAKE2B 8bccacc7ec81651155898b156949733953925ef6712f20e76961583d99578b8354eb4f61a0f371f73c5e1f3c399f10017b4ea2402b62033e43d504361c31297d SHA512 51c4609900238bf417d743177c4d646ff1cd109888acb820a6635e61f584688fe7f65ff194e018bb64115d9900895d92372b9d84c6d68e9eebabaeda43d56bb1 +EBUILD spandsp-0.0.6.ebuild 2045 BLAKE2B 9185489ee96c990b46524d3308b724fa93ab8ccfa478572120723df5e71e436fb8ad23a57a4868602a27490ce7c6849ccbdfbdc6bb6d7858823ab8c60dfdf45c SHA512 e81bfa2225c59b786db3805301a166bc037918892fe09ea2b04b5fa8f6a4716c0af8b748bf56fbe0f240d978feebfdef052f11165ade9b7c996dfe55647a6068 EBUILD spandsp-0.0.6_pre12-r1.ebuild 1290 BLAKE2B 3c42b8fbd0f49a5aeb0cc7614e01e90701ac08d90715000a72ecd41f55b35e588128e9c80bc4d37a5c9f73762a44a49bbf669a79bb2940f5c29491a337f54d3c SHA512 9ab74ba79a7c814a427415b4b03430d8cbecb1b2e7fc766c4e3facbb783ba2bf321f868fc7ba293afa52db7764c176d762c34c24b75eaad50722cb608d5f6b78 EBUILD spandsp-0.0.6_pre21.ebuild 1420 BLAKE2B a1a19a208b74ec67b14c391553e4afc6241cb7d40f6c786508785ef0ae375671b49085672c21db314e7bd3a628cc6e87c90eced3715b7e0755ecd56a765915c3 SHA512 7b7a36520e5f0f76d066078df5d3fd277540c1f7670a4beed8f3166e35f0be7eb67dace9e303586197919ba70ca00805eef0137dc3448f8b046d6b60d18f5099 MISC metadata.xml 295 BLAKE2B fdbb4c9e5e6392277d1096f1a966b5ee26ed4f752bc77f1433c2bb97f9b7337f3ffde846baf8e1d2df797b01cd46e3a530427b8b83ab56697ede4172239c34ee SHA512 da977d763bedbbdbde4231bd708f3a9fa932241a6a88990884108a8d8309328a5ed80ecac0686ff0dd38a7efab246500e31f360af995611f4ecc60c61302acff diff --git a/media-libs/spandsp/spandsp-0.0.6.ebuild b/media-libs/spandsp/spandsp-0.0.6.ebuild index d8fa319ad621..86b99facda02 100644 --- a/media-libs/spandsp/spandsp-0.0.6.ebuild +++ b/media-libs/spandsp/spandsp-0.0.6.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://www.soft-switch.org/downloads/spandsp/${P/_}.tar.gz" LICENSE="LGPL-2.1" SLOT="0" -KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ppc64 ~sparc x86" +KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~ppc ppc64 ~sparc x86" IUSE="doc fixed-point cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 static-libs" RDEPEND="media-libs/tiff diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest index ee41d653b292..95c17f37d4bd 100644 --- a/media-libs/vulkan-loader/Manifest +++ b/media-libs/vulkan-loader/Manifest @@ -1,15 +1,6 @@ -AUX vulkan-loader-1.0.54.0-remove-executable-stack.patch 691 BLAKE2B 8bee7ed09784ac0528b91a3b52d99e51fd3b09be73a468276d491549987cbadc1d0a402b253055e95f3ba794e6d218f22f72c103944793606165ad32b64e15d7 SHA512 b19e8aee1bb1dcf081017d41a4ea228d98515bf403e84a3d81f9ff359014cf1aaf28a7f1d29bce3951000d49df2b260a2f4ff6c27f368ec12791dfad28a4257b -DIST vulkan-loader-1.0.42.0.tar.gz 3699030 BLAKE2B acf29a2379f37367b37f2d8278cf1b512fb016c05fb5f5ee0d5d4b9c995123310728a01d1f0e341686bc2041265a9d9f64c19be451e8e6e608b748ee4d3035af SHA512 2c35aecffc60992023184e499d036d99a3c39b3b3856341f341fc9c5b2b0c71cc49a4658634165f4d5218a7202f4c2ddfb95107ba95f2c8a9870e375cff7a15b -DIST vulkan-loader-1.0.42.2.tar.gz 3701608 BLAKE2B b6769a29c1a385ec564cdd897255a1055c583c95d9948ee8bd653606bcfb0d07dbf4abf10c3d2711059635a0d9d73edb82fda4f7aeb12107f0b2b705c809ade4 SHA512 6f591bcb69edde516cf170936e23a3f19f2f57a22b65d19683c10528ed6559501d3dae29ee1d3e820a81a5cd6e608f5710ba15f7c9bc050ea0eaceef2cf82d37 -DIST vulkan-loader-1.0.46.0.tar.gz 3732605 BLAKE2B 364f6a763d016bebb1100dc594a006da7b4a27147398ce9efdceac4ca7bc5ced235ab6bad978cfa9bca4489e6a069c145030b38354778dccbc8559babba1cbf5 SHA512 dc0728c00e017a2ed0b1e34a500a6335f6dee5dd77c7801d7d450c68c6e8c7cd5dec640be6dec1dea28941d927764a636b82a628e0260ca724163afa4152d8b6 -DIST vulkan-loader-1.0.51.0.tar.gz 3796337 BLAKE2B 9a418e6e4cfe1f19c8716788452f4ed219be14fcdadf3c5cb983d031f3a95a7f6322a94aced391711ba486274611ff5ea2ae87c2116a6c16b9aa0b2f97e10c72 SHA512 5d198fc9537c8fa3cbde19fc74f8d47595fabcb52c8db1c626fa157f171ed74ad202e086f7c9e94827c1ab682d03bae58af690c510c6705ca92db0548ee575f6 -DIST vulkan-loader-1.0.54.0.tar.gz 3842785 BLAKE2B 72b14546859f38f090554a9ff04dce91fb0764f5180ca22a3e863e992276c4c4e9a85ca946b18a0c54fed99b58a39b9c65a67c4302aa337e89a04d435a606df2 SHA512 f5478e1a7f966a2d09b97a3b47a04b4c9ccd68b88126fefcd6f97bfd0347c5a5bebf52e1cdfccc4863d22dd3b875e04cddf406e3e546eb3dc50d2ef61d85a21f -DIST vulkan-loader-1.0.61.1.tar.gz 3889453 BLAKE2B 0d5f1335e874294350e02063b11e5efb3d1f3bb69a7c970f2b6a6cbe9b78651c7810644d30b404016ed126ad63c4ab46b017c2ef033ba1c45046fd310218cd55 SHA512 e16599ca458dc1c636c80a03693edc4a24563e08768de95e7711cd7927d7cfdcd0ce14d16d938ca066bfe4ce8fe43836d2b61973bc2a7ba6ad14ab5f18166e0e -EBUILD vulkan-loader-1.0.42.0.ebuild 1277 BLAKE2B e50d6ff15c36cb302b8afe331d203c2bb05422437371546ee8949965f637901e3c1a0536191509ff45f65b76d6f34cf56a86d62c3d6b4e3a3b5e8d84b5afc7ab SHA512 0d027423b2419565ea3c3d27e76328ff44cd931ae7596b445fe509ce8f13319e1dc1b0e102f18d87d11a1795f5b8c44595d8c1ee54561c03b86a08246ed8b2d5 -EBUILD vulkan-loader-1.0.42.2.ebuild 1278 BLAKE2B 22ee349f9896e57a3fe4abdb46114000ec6e555b6daa88ebf9ff3cb933f76b3bade931006a3349322a0757fcca4812c0a225326c04c2c84173584971fb4eee7d SHA512 2fed44bc56f923aecb47ad0bdd576d1bf69bf0c764ff6d8ca54def5f39a58eafffc68bd880ffd769fe41e234633031c0675657fd56b0214812608b327664a46f -EBUILD vulkan-loader-1.0.46.0.ebuild 1277 BLAKE2B e50d6ff15c36cb302b8afe331d203c2bb05422437371546ee8949965f637901e3c1a0536191509ff45f65b76d6f34cf56a86d62c3d6b4e3a3b5e8d84b5afc7ab SHA512 0d027423b2419565ea3c3d27e76328ff44cd931ae7596b445fe509ce8f13319e1dc1b0e102f18d87d11a1795f5b8c44595d8c1ee54561c03b86a08246ed8b2d5 -EBUILD vulkan-loader-1.0.51.0.ebuild 1278 BLAKE2B 22ee349f9896e57a3fe4abdb46114000ec6e555b6daa88ebf9ff3cb933f76b3bade931006a3349322a0757fcca4812c0a225326c04c2c84173584971fb4eee7d SHA512 2fed44bc56f923aecb47ad0bdd576d1bf69bf0c764ff6d8ca54def5f39a58eafffc68bd880ffd769fe41e234633031c0675657fd56b0214812608b327664a46f -EBUILD vulkan-loader-1.0.54.0.ebuild 1340 BLAKE2B 45d4ca3d73be49bec8500a58775d5e2f42b850545a598c50a4058ac0d93ba132d38c0c58225a769aa593eeaac435757153a1be3a29de54c456d8b81dba33b859 SHA512 aab75dbf1d379074f5b856e38ec05b4dd2a8d05ccaf6a1a355c8efb58f95ec547aff6b57a1e5debd0dd6a8c22a45d606585bc68992671e53b6ba9fd2bb749180 -EBUILD vulkan-loader-1.0.61.1.ebuild 1280 BLAKE2B f24d954fddbf81b22366030b3fd7295557af6b337dfceaffca0275e63823c64daf442fdef54161dc4e89531aaff82ef649305fc1f7551b06bc221fb9285a723b SHA512 2302e7294eea97962b6943648c9caefd45ad49f6fe19dae50215ad444eb4da2059afeefb09c40d8facf23fb4bd037b822d6a20d843c3e6114dda68b56dd3216e -EBUILD vulkan-loader-9999.ebuild 1391 BLAKE2B 115450cc2c2efe654742c1f2ee0c7d8c52897a79fca17153f8cc9981cf0baed0a752581e7ed59fa97154fe8e4d111d2528b3025426677662d107d9ced180052f SHA512 90198fde245c90f95ddc4f11f40cd64207ac67cbc9ac097f1ff6b32c11c3374aee112fcbe4eadecfed1639d7ddfc819ae7be9952d548974d89663b8f8471b8c1 -MISC metadata.xml 421 BLAKE2B cf66b02385608d94378b1c5ea66886849f73efdcb86ce0584c9998308dff6f050109e9bc4fbd04da7c2df72191825fa8ba5e04adc97170fbb0420ad2fc2936a4 SHA512 800852fbb61d7e27456cfe8c31c969e89bf9de3ef82c64e6b48a972dbc1591401fd1af16f46a473af8c83a7dd76635d3c228cba44ea7c632cca57e5963de7a93 +AUX vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch 1736 BLAKE2B 10c31ec7214a64f65daaa265d84b913906f0007a4503a11218f35012aba697b87bef6a93e1120edc3dd33c5951a18abf4b1b54841afdedd7b8dbfb12aed325d1 SHA512 a27135d82d366925487f3fda147c531fe93bb556207fcc36310cc5c361fa5879f812cfbe1c5677da987311e31c09e3f573d69183f60a5788dc0489ac27e63918 +AUX vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1608 BLAKE2B eadbe49f109ce32c7ad75739ba43f7629a3955fb5a9fdf03ac6e16f890394b13b95c979ee456b75964ff421e016dd7a0c47acbe6c79f3a5f28813dbbad61e874 SHA512 d371cde49a630b7530b25a5fa6ccc2324885048320db0a140f9ba09b490a40edf460602ffc156767b1773a88d642d6917d73cb13ac869f811c68b00cfc00d297 +DIST vulkan-loader-1.1.70.0.tar.gz 4107351 BLAKE2B 86859e74839a0a7c667476db62a1bc73d89f22e6bb951f2742bc6990ed498e9201bd17973e887f360b2eec610e29d547e79d5323ed74fd5618cb0fc75dbba063 SHA512 ae57e6890225b6e4607fde04a296a14bc54fd6b61b360b771bd24f00607dcb6fff06b3ec38a761173c92c90628a139f1424445e174c21adad4af6f445b91ed26 +EBUILD vulkan-loader-1.1.70.0.ebuild 1723 BLAKE2B d48aae98640a12fd8c12dda77ef3fdb077bf9b4d6989c2163ec83c2f0bd752b1dd9db580861d197a9aefb77bde81a0bff3569a6aacc64c7c8dc6554d4a09ab4a SHA512 517530704b352e470353b4d39e04129a1b09ac264001016bb30d1af10a7803d22d35d6f348b945e7629874b13dfabd725773e603d7855044339f5b4bab69a681 +EBUILD vulkan-loader-9999.ebuild 1649 BLAKE2B cbd06a6d61272d7b4c5a72cd78386bc133c8789c7f0b98af3bdec194262837412398eb4bdff8441d3b05b96f5aae1fa06b62df672e2e892e6490edb8366ba408 SHA512 550bab7fd8d6de1d2c1ddf8071edfa63d69ae89e462ecf2d806ed330cd9b4f2d12708374b87557bfef9b38bd5af5f5698fb753cf74c9e7a9e7f64857491a5b8d +MISC metadata.xml 474 BLAKE2B a6924616c2d59914dc11c4e8ad4f0f5bfbdaa923d3bf4c6488cc9b52b6319b285d3470d7d724ee38b4bfc27ff442d103209b6681c634bd0770ced3d907597e87 SHA512 8122c1adabb7b4d2128a2885a816f348c5c34e22a14a63f0f7452ce74ff646bd7a4496d730c465740143dbd6b2aeb63fa4a212cea6414dc99d13a26044a29574 diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch deleted file mode 100644 index 36b50b91e73e..000000000000 --- a/media-libs/vulkan-loader/files/vulkan-loader-1.0.54.0-remove-executable-stack.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 3152f2a5056077d3e1061ac61e3ef7888ff96dc7 Mon Sep 17 00:00:00 2001 -From: Lenny Komow <lenny@lunarg.com> -Date: Thu, 20 Jul 2017 16:07:14 -0600 -Subject: [PATCH] loader: Remove executable stack from libvulkan.so - -Change-Id: Id77d5560479cbbc6f5453a6362c5a20dd721fdd0 ---- - loader/unknown_ext_chain_gas.asm | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/loader/unknown_ext_chain_gas.asm b/loader/unknown_ext_chain_gas.asm -index e463f45be..798760bd8 100644 ---- a/loader/unknown_ext_chain_gas.asm -+++ b/loader/unknown_ext_chain_gas.asm -@@ -108,6 +108,10 @@ vkdev_ext\num: - - .endif - -+#if defined(__ELF__) -+.section .note.GNU-stack,"",%progbits -+#endif -+ - .data - - termin_error_string: diff --git a/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch new file mode 100644 index 000000000000..3c5a30b10a00 --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-1.1.70.0-Dont-require-glslang-if-not-building-layers.patch @@ -0,0 +1,45 @@ +From 4efbd5c81cfb9071757e446d57957aa81e9d9374 Mon Sep 17 00:00:00 2001 +From: James Le Cuirot <chewi@gentoo.org> +Date: Thu, 15 Mar 2018 22:25:19 +0000 +Subject: [PATCH] build: Don't require glslang if not building layers + +--- + CMakeLists.txt | 10 ++++++++-- + 1 file changed, 8 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 713a9cdfd3..c9f73ce965 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -350,6 +350,10 @@ macro(run_external_revision_generate source_dir symbol_name output) + endmacro() + + # Custom target for generated vulkan helper file dependencies ++set(generate_helper_files_DEPENDS) ++if(BUILD_LAYERS) ++ LIST(APPEND generate_helper_files_DEPENDS spirv_tools_commit_id.h) ++endif() + add_custom_target(generate_helper_files DEPENDS + vk_enum_string_helper.h + vk_safe_struct.h +@@ -359,7 +363,7 @@ add_custom_target(generate_helper_files DEPENDS + vk_dispatch_table_helper.h + vk_extension_helper.h + vk_typemap_helper.h +- spirv_tools_commit_id.h ++ ${generate_helper_files_DEPENDS} + ) + set_target_properties(generate_helper_files PROPERTIES FOLDER ${LVL_TARGET_FOLDER}) + +@@ -372,7 +376,9 @@ run_vk_xml_generate(helper_file_generator.py vk_enum_string_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_object_types.h) + run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) +-run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++if(BUILD_LAYERS) ++ run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++endif() + + + + diff --git a/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch b/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch new file mode 100644 index 000000000000..066f126e437d --- /dev/null +++ b/media-libs/vulkan-loader/files/vulkan-loader-Use-a-file-to-get-the-spirv-tools-commit-ID.patch @@ -0,0 +1,42 @@ +From 58299a001068a28f5d5f6985c2066b7c4caa7b18 Mon Sep 17 00:00:00 2001 +From: Nick Sarnie <commendsarnex@gmail.com> +Date: Fri, 23 Mar 2018 20:23:54 -0400 +Subject: [PATCH] Use a file to get the spirv-tools commit ID + +Signed-off-by: Nick Sarnie <commendsarnex@gmail.com> +--- + CMakeLists.txt | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c9f73ce9..c3e200b3 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -349,6 +349,14 @@ macro(run_external_revision_generate source_dir symbol_name output) + ) + endmacro() + ++macro(run_external_revision_generate_spirv_tools source_dir symbol_name output) ++ add_custom_command(OUTPUT ${output} ++ COMMAND ${PYTHON_CMD} ${SCRIPTS_DIR}/external_revision_generator.py --rev_file ${source_dir}/spirv-tools-commit.h -s ${symbol_name} -o ${output} ++ DEPENDS ${SCRIPTS_DIR}/external_revision_generator.py ${source_dir}/spirv-tools-commit.h ++ ) ++endmacro() ++ ++ + # Custom target for generated vulkan helper file dependencies + set(generate_helper_files_DEPENDS) + if(BUILD_LAYERS) +@@ -377,7 +385,7 @@ run_vk_xml_generate(helper_file_generator.py vk_object_types.h) + run_vk_xml_generate(helper_file_generator.py vk_extension_helper.h) + run_vk_xml_generate(helper_file_generator.py vk_typemap_helper.h) + if(BUILD_LAYERS) +- run_external_revision_generate(${EXTERNAL_SOURCE_ROOT}/glslang/External/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) ++ run_external_revision_generate_spirv_tools(/usr/include/spirv-tools SPIRV_TOOLS_COMMIT_ID spirv_tools_commit_id.h) + endif() + + +-- +2.16.3 + + diff --git a/media-libs/vulkan-loader/metadata.xml b/media-libs/vulkan-loader/metadata.xml index 9e5a300d8633..5896567b6cb5 100644 --- a/media-libs/vulkan-loader/metadata.xml +++ b/media-libs/vulkan-loader/metadata.xml @@ -10,5 +10,6 @@ </upstream> <use> <flag name="demos">Build vulkan demos and vulkaninfo</flag> + <flag name="layers">Build the vulkan layers</flag> </use> </pkgmetadata> diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild deleted file mode 100644 index 56caaa6fd6ed..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.42.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.42.2.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.42.2.ebuild deleted file mode 100644 index 4ab7f86d5494..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.42.2.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild deleted file mode 100644 index 56caaa6fd6ed..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.46.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.51.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.51.0.ebuild deleted file mode 100644 index 4ab7f86d5494..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.51.0.ebuild +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild deleted file mode 100644 index 6ad40bf0e05b..000000000000 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.54.0.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_{4,5} ) - -if [[ "${PV}" == "9999" ]]; then - EGIT_REPO_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git" - inherit git-r3 -else - KEYWORDS="~amd64" - SRC_URI="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers/archive/sdk-${PV}.tar.gz -> ${P}.tar.gz" - S="${WORKDIR}/Vulkan-LoaderAndValidationLayers-sdk-${PV}" -fi - -inherit python-any-r1 cmake-multilib - -DESCRIPTION="Vulkan Installable Client Driver (ICD) Loader" -HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="wayland X" - -RDEPEND="" -DEPEND="${PYTHON_DEPS} - wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" - -PATCHES=( "${FILESDIR}"/${P}-remove-executable-stack.patch ) - -multilib_src_configure() { - local mycmakeargs=( - -DCMAKE_SKIP_RPATH=True - -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False - -DBUILD_VKJSON=False - -DBUILD_LOADER=True - -DBUILD_WSI_MIR_SUPPORT=False - -DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland) - -DBUILD_WSI_XCB_SUPPORT=$(usex X) - -DBUILD_WSI_XLIB_SUPPORT=$(usex X) - ) - cmake-utils_src_configure -} - -multilib_src_install() { - keepdir /etc/vulkan/icd.d - - default -} diff --git a/media-libs/vulkan-loader/vulkan-loader-1.0.61.1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.ebuild index c4fe082f0783..4bed360605f5 100644 --- a/media-libs/vulkan-loader/vulkan-loader-1.0.61.1.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-1.1.70.0.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 @@ -20,19 +20,33 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" LICENSE="Apache-2.0" SLOT="0" -IUSE="wayland X" +IUSE="demos layers wayland X" +REQUIRED_USE="demos? ( X )" RDEPEND="" DEPEND="${PYTHON_DEPS} + demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) + layers? ( + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + ) wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) - X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] )" + X? ( + x11-libs/libX11:=[${MULTILIB_USEDEP}] + x11-libs/libXrandr:=[${MULTILIB_USEDEP}] + )" + +PATCHES=( + "${FILESDIR}/${P}-Dont-require-glslang-if-not-building-layers.patch" + "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" + ) multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True -DBUILD_TESTS=False - -DBUILD_LAYERS=False - -DBUILD_DEMOS=False + -DBUILD_LAYERS=$(usex layers) + -DBUILD_DEMOS=$(usex demos) -DBUILD_VKJSON=False -DBUILD_LOADER=True -DBUILD_WSI_MIR_SUPPORT=False @@ -46,5 +60,5 @@ multilib_src_configure() { multilib_src_install() { keepdir /etc/vulkan/icd.d - default + cmake-utils_src_install } diff --git a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild b/media-libs/vulkan-loader/vulkan-loader-9999.ebuild index 67822d5a388d..b83dbcb76bcd 100644 --- a/media-libs/vulkan-loader/vulkan-loader-9999.ebuild +++ b/media-libs/vulkan-loader/vulkan-loader-9999.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 @@ -20,22 +20,29 @@ HOMEPAGE="https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" LICENSE="Apache-2.0" SLOT="0" -IUSE="demos wayland X" +IUSE="demos layers wayland X" +REQUIRED_USE="demos? ( X )" RDEPEND="" DEPEND="${PYTHON_DEPS} demos? ( dev-util/glslang:=[${MULTILIB_USEDEP}] ) + layers? ( + dev-util/glslang:=[${MULTILIB_USEDEP}] + >=dev-util/spirv-tools-2018.2-r1:=[${MULTILIB_USEDEP}] + ) wayland? ( dev-libs/wayland:=[${MULTILIB_USEDEP}] ) X? ( x11-libs/libX11:=[${MULTILIB_USEDEP}] x11-libs/libXrandr:=[${MULTILIB_USEDEP}] )" +PATCHES=( "${FILESDIR}/${PN}-Use-a-file-to-get-the-spirv-tools-commit-ID.patch" ) + multilib_src_configure() { local mycmakeargs=( -DCMAKE_SKIP_RPATH=True -DBUILD_TESTS=False - -DBUILD_LAYERS=False + -DBUILD_LAYERS=$(usex layers) -DBUILD_DEMOS=$(usex demos) -DBUILD_VKJSON=False -DBUILD_LOADER=True @@ -50,5 +57,5 @@ multilib_src_configure() { multilib_src_install() { keepdir /etc/vulkan/icd.d - default + cmake-utils_src_install } |