summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Field3D/Field3D-1.7.2.ebuild4
-rw-r--r--media-libs/Field3D/Manifest4
-rw-r--r--media-libs/Field3D/metadata.xml2
-rw-r--r--media-libs/Manifest.gzbin66829 -> 66531 bytes
-rw-r--r--media-libs/babl/Manifest2
-rw-r--r--media-libs/babl/babl-0.1.42.ebuild55
-rw-r--r--media-libs/gegl/Manifest2
-rw-r--r--media-libs/gegl/gegl-0.3.28.ebuild177
-rw-r--r--media-libs/gst-plugins-good/Manifest2
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild50
-rw-r--r--media-libs/harfbuzz/Manifest6
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.7.2.ebuild2
-rw-r--r--media-libs/harfbuzz/harfbuzz-1.7.5.ebuild109
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild48
-rw-r--r--media-libs/ilmbase/Manifest2
-rw-r--r--media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild4
-rw-r--r--media-libs/libdvb/Manifest6
-rw-r--r--media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch617
-rw-r--r--media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch20
-rw-r--r--media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch129
-rw-r--r--media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild49
-rw-r--r--media-libs/libdvb/metadata.xml5
-rw-r--r--media-libs/libmatroska/Manifest2
-rw-r--r--media-libs/libmatroska/libmatroska-1.4.8.ebuild2
-rw-r--r--media-libs/mesa/Manifest2
-rw-r--r--media-libs/mesa/mesa-18.0.0_rc3.ebuild582
-rw-r--r--media-libs/opencollada/Manifest5
-rw-r--r--media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch122
-rw-r--r--media-libs/opencollada/metadata.xml6
-rw-r--r--media-libs/opencollada/opencollada-1.6.62.ebuild65
-rw-r--r--media-libs/openexr/Manifest2
-rw-r--r--media-libs/openexr/openexr-2.2.0-r2.ebuild4
-rw-r--r--media-libs/opensubdiv/Manifest2
-rw-r--r--media-libs/opensubdiv/metadata.xml2
-rw-r--r--media-libs/osl/Manifest4
-rw-r--r--media-libs/osl/metadata.xml8
-rw-r--r--media-libs/osl/osl-1.9.6.ebuild69
-rw-r--r--media-libs/partio/Manifest2
-rw-r--r--media-libs/partio/metadata.xml2
-rw-r--r--media-libs/ptex/Manifest2
-rw-r--r--media-libs/ptex/metadata.xml2
-rw-r--r--media-libs/tiff/Manifest2
-rw-r--r--media-libs/tiff/tiff-4.0.8.ebuild2
-rw-r--r--media-libs/vips/Manifest3
-rw-r--r--media-libs/vips/metadata.xml15
-rw-r--r--media-libs/vips/vips-7.38.5-r1.ebuild76
46 files changed, 1303 insertions, 975 deletions
diff --git a/media-libs/Field3D/Field3D-1.7.2.ebuild b/media-libs/Field3D/Field3D-1.7.2.ebuild
index 780a06db52ea..2238a60f8640 100644
--- a/media-libs/Field3D/Field3D-1.7.2.ebuild
+++ b/media-libs/Field3D/Field3D-1.7.2.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/imageworks/Field3D/archive/v${PV}.tar.gz -> ${P}.tar
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="
>=dev-libs/boost-1.62:=
diff --git a/media-libs/Field3D/Manifest b/media-libs/Field3D/Manifest
index 9086d3345a2c..2728cad4d0b9 100644
--- a/media-libs/Field3D/Manifest
+++ b/media-libs/Field3D/Manifest
@@ -1,4 +1,4 @@
AUX Field3D-1.7.2-Use-PkgConfig-for-IlmBase.patch 5371 BLAKE2B c8a1360db04de4cfa18b739af024934469b9cf2a2314d3fb248ad2df371be902369989f120dc7c1adb86ea77cf01a7a5e0944b9a4a57e9a9e329a06c5d24c97d SHA512 167da6b57983e317266ccbb9670cc5ec03f041343e44af3cbedc14366e349edd1d5f2a0ac163fa919827b2dfdd9811525b81c446a0e32016b3bd51f84f202bcb
DIST Field3D-1.7.2.tar.gz 502481 BLAKE2B 8d5fbac915b52b36e66250f8fcd2beb5fff9d2446696ad1829e3edf05c9810b5d54928c6ab4f5aa99c1338da24cea446134434a59aa1d053f3da3500c2800f59 SHA512 e4ea51310105980f759dce48830db8ae3592ce32a02b246214d8aed9df7a7f5c500314f2daf92196b7a76d648f2909b18112df4c5c3c8949c0676d710dfbf1f2
-EBUILD Field3D-1.7.2.ebuild 646 BLAKE2B 37b34d11f97150db07e6e2f0740f86ad0abc0004c4207796b4c5509b8187f706dc7858df1b09e16ed3e9385539ad46634e5dbdafecf13321e850e423e8eae302 SHA512 95a7b60b715a2d5eb33d9bed9fa146b212c1bfdc4fecc0af4c1ec02de66cfeefb02b55d3c6d7dc5ec83ba7499d97218050b17c266d78362f1071a5be6a859b51
-MISC metadata.xml 820 BLAKE2B 8558c45c84c40c1ef605324ca0d69a294722c6994ff664bea5bad5a8b69b61b82539c1d6d4312c99fa3e56a607bda58960fa19878dc5790d66dc116c3b2b4a23 SHA512 90162b712965ba70c22171185cc772e5fee4f6c34757fadebe03128e9e653df1c8bb5f1c8a100c2149eaf53a5f78e3928a9b110aaeba823300ebe39e2a78c6b7
+EBUILD Field3D-1.7.2.ebuild 645 BLAKE2B 9b02a5fbcefbed02b0434e553e24207ae103eb898322917caac724ed7ff39f3ce673dfc21b340e8cd1439f4d7e32a29202cd88ee4a387f8de8571aac4a4ed717 SHA512 5d31100bc97fb809082c3f8dd4bc727dd550168ebde3055f8d4a492216a77f7d0e45a1fa8cba65136799a34f7b6b060ff74600a789003ddf6ad8c47847729896
+MISC metadata.xml 820 BLAKE2B e8b04778684298db20cdea68773c50d5791eb0b024fcc0193293dcc34dd06eb0180cfb16075117c3a4b325d1ef1cb78b3bd40b64b67fb3e41e162a17fceb1cbc SHA512 3e8b636aaa7cae681572ceae3b942e20149864be38c5f437227c462185e3acf4660de7a9071988cf59e3a481e47d804de0c563d23674bc772287318cac9a933b
diff --git a/media-libs/Field3D/metadata.xml b/media-libs/Field3D/metadata.xml
index 2e6a3587ddce..c65f6ca4024a 100644
--- a/media-libs/Field3D/metadata.xml
+++ b/media-libs/Field3D/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>j.scruggs@gmail.com</email>
+ <email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
<maintainer type="person">
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 30676785de18..0bf69aa4aab1 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/babl/Manifest b/media-libs/babl/Manifest
index 5bd81aee1693..824a87839941 100644
--- a/media-libs/babl/Manifest
+++ b/media-libs/babl/Manifest
@@ -7,6 +7,7 @@ DIST babl-0.1.26.tar.bz2 614865 BLAKE2B 537f1f2e23f2df7710d79f7733f8cbad7c9ae79c
DIST babl-0.1.30.tar.bz2 616595 BLAKE2B e93f56c243373634ad8c2f5a493cae80113c9b9174bf388525b943e7702024fd4d2afeaf544fbeb01b44b3c77d90c7ebcb064f94a6953876bb91c06fbcb30311 SHA512 391182786312140fe3fa8b4b8448df2829230ef6a1d9957d8bb729c464e94f5b1300ad761d04f51b3d777c4de9fb462dd0391c3f0c2daa53e9c53bf697e58dca
DIST babl-0.1.38.tar.bz2 653047 BLAKE2B 8bc43a7e0b7265f72122743ff4b3e25825e4bbe6797a6e077de16d47239a67cc8fcb93253f54de31012cfb1622cafed2c220cba5cb3cdd9eb1599e5d11b4000f SHA512 4b55b666170322adad4b4624c98110d7a34c496f7aadb22a53c09d1ce5ae518122c2105fd2cb2a057e752fe1540beb703f8192e48e7c43601342a75db2bfdca0
DIST babl-0.1.40.tar.bz2 653272 BLAKE2B 4e5694db5a6d29c2faeada7046cacc511623bf54794386a47c6403abb2e86cfd5d0953cf9198e8a5cf20060366e770a344a8c8b503c0496d95ce9d92e149a4f6 SHA512 73812247bade66ce38cb4239974e94a6ced05e4d9f5feae7eb111ffdf2c364197c0a2d9883ba28f5ff839f9f9ffb9dd272209c4720046c12cf2446fedae34ce1
+DIST babl-0.1.42.tar.bz2 653385 BLAKE2B 62b33ccafb8bff2e7bbe06ea38692e715defe545b3651988bb160e52283a7080f49ccabc2cf71c7f51160e9a5a12121e4a5953471535e91de08d6733993b84a7 SHA512 0c37944d273b3818a7bb316d3086d48966daa6b401b4e6c0cb9ff52c8d69a80d8b632fe236110f376ab107d349fa4383b20f22cac31889ba50e48ab25d5c42d6
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
@@ -16,5 +17,6 @@ EBUILD babl-0.1.26.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa
EBUILD babl-0.1.30.ebuild 1470 BLAKE2B d57126777551602316904cf91ee2fef8fcc0816aa507e465cf53848145f981d7ca2437d6f70e8f5b789381d6c32fbe9229aa2df72aeb32a59d54300c08134d5a SHA512 136b249c012baec7e26867d8d226182f8f97606d5140c3157c9f5d85d9f91e14aea9ec86e527e112a1b1ad3e56d461b2272c9bfadd2f2f6f8aac8a561aea6d7c
EBUILD babl-0.1.38.ebuild 1466 BLAKE2B a01e99ec7894b18875a76ef70759d4852a2f7abe1f3300802d1d82ea414d0834691844fc81fd53edd62aefaf37e4ab27568a16bcf0e42ccb2936f03b4afa8c5c SHA512 2943ba0d28a786db5cf2819d3060d802b678f686acab74f7e114559d06d334428635765ad2d32781737db3fcb4e3d5d7897478b6def3b452b3711e896b8ef4e5
EBUILD babl-0.1.40.ebuild 1470 BLAKE2B 5c68d9ebae837139231a5a71ca7ef196344de0e791877050bb387599fd22c9c2f0ced492abf54a6196225fd8c9e0108aed5c0d5e794872be7a378acaebda4219 SHA512 fba1b10b076435a843562fe0920e757925f13b84b58d8e9901af0d11c2927fd69b817ef9907d68ad7d60de45f7139f8f4818b1b25022ecab2054dab5dcef1b56
+EBUILD babl-0.1.42.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.42.ebuild b/media-libs/babl/babl-0.1.42.ebuild
new file mode 100644
index 000000000000..f5da34a496f1
--- /dev/null
+++ b/media-libs/babl/babl-0.1.42.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 ~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/gegl/Manifest b/media-libs/gegl/Manifest
index bfddaa45f55b..8bc1baae9295 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -13,6 +13,7 @@ DIST gegl-0.3.0.tar.bz2 5463571 BLAKE2B 7ac52fb22bab3b84068e10610d8681a5bcf56f6c
DIST gegl-0.3.20.tar.bz2 5816967 BLAKE2B 4d1dea5b479dc56599d884c43dd8042f6c1c836fe3b5acdadc9b1a909ab4c4be549322767293cfbc065a5f9386b22a579c9c9d78fbad58a4eb6771eccf3a3b45 SHA512 9067467e3d4bbfe00594a8459c9ea15047c1331764dd3aa2331da7d842a77c98894e3a0e19a7c0b1cb59189ffe03561e9bd12f92bdb8fdf1799afc6a575962f7
DIST gegl-0.3.24.tar.bz2 6519831 BLAKE2B b6f9375de34b17270b92b7aeb0199f9c842813bc74175845ee8e8de8b48bc4d81d973282a1e398a39432c73c485cfb158b368989ecb40361f61f22620d53659a SHA512 c84950a4d2fddcb0fdcce77030841f862b1eeda72b31f115fb3604a52553414873923a321c48ed11a135113f40d026cf65425742663f23af79bfca2392eba9c5
DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa481d0e234f89b7e8bd9b05b3e515454bf768a66e64c88f61a57c83d51eecad9aab4450502dd3e02ce4f012df7a5 SHA512 1fafd6bb70b539bd31c052d2acfcb332fac92caf2a67e07a8c827db31b877aa373a184475952b6fc4dae455dcceccfd3943d782e9fe50f166323f698faf60957
+DIST gegl-0.3.28.tar.bz2 6530569 BLAKE2B ac802c312a0fa44bec8ec4c41454fc9aabebdb1d968a8f532be7dfcff58480f778e3d21cb6557c221e1206860818618fcfe06f2bb25bfb2e08a76f013ea4f256 SHA512 a515108ea4a65fa1ecc60ed18cd288a85877a5b69e573b8c3de04a2c11a3b2b50cdb5897df3f28c84842e6bd553adbd81053502a1ac8ed1d356332a56c58ce1b
DIST gegl-0.3.8.tar.bz2 5876259 BLAKE2B 24199148ffbef6454ea460d126c29f1cc8581e5430bc3e341a8ab48fff701a0d63c4cf8864d04219455feaeb7e03808e8de06cc8ae0a500eb4154f2ec9ba25fe SHA512 13207e7ab4723be1e31bdba5e30e5725e93c1adc61bad1413502128730391dbe7eb35419d243c8d0a1d8794341a58188790adacbb10d2a8e68db861c18d21bfb
EBUILD gegl-0.2.0-r2.ebuild 4780 BLAKE2B 5530236bd24e4bdc6b83ee0a9bd26611de9c77eb72e9329933d485d936fd60fbe95b6f40a4d2b781a15ac21740e3a91fe143b6248f343cedfff39abf0d1f5464 SHA512 9d48ad177c46d1f888bf3bf938dfc3045c04e9eed53c1c8882af5355dad1e99223e354c818d9d01367bc26f449700ab422543a4cd1ba57811e76aa62c6398467
EBUILD gegl-0.2.0-r4.ebuild 4931 BLAKE2B ef55c72d9ef11f9f5bf4fd307838016ff829868c4c2e9c87af2ce16b0818f374960e98c1131d059af8da6e100bc071bb12467d8570d1303a3573e13c3dff7441 SHA512 dc2381dd56beccf318a9768e618d7a2e00603f7aa6d76dba70b855d782bcfd88678dd0c317e62b0d1e65ca8c62ce01046622ac639705c9eadd01ae992a85d0e5
@@ -22,6 +23,7 @@ EBUILD gegl-0.3.0.ebuild 5290 BLAKE2B eb698fbe621dead0979582fa83a47c0cdab26a5561
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 5223 BLAKE2B 6e2f01a4f1f44325043539de3b16860a9b460d7aba6cc65c8bb0cba93c2e8c14510c4f5869a4d25d3f0bd2ce1f74efff0b8dec7d2fb521b52ca5967c08c37b8a SHA512 552259cc6d96f0d2c1d2a7c283cec207c2a9597fb144e35c1bc0ce0100baa3d183f03614b8891e2df2ea2a4423b03ff69f8c70c04af098f5087a098976319e33
+EBUILD gegl-0.3.28.ebuild 5227 BLAKE2B 19b83061af95946cba286bc90df405da7f1c55c26512db21b88cc8f2b1c7251ae7a5bd7b4fcc59e414210c4d2d972fde0df76cd1f693662da8050460f88b5583 SHA512 fb92b236bd142618689711161b1c632544e9e43218cd83e7630c868ef54dba63a2ecd8a4064e7a10cd942080d6be6f92bf378119f167c6a588b883ccc61e0502
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.28.ebuild b/media-libs/gegl/gegl-0.3.28.ebuild
new file mode 100644
index 000000000000..e0b6585227b0
--- /dev/null
+++ b/media-libs/gegl/gegl-0.3.28.ebuild
@@ -0,0 +1,177 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+# vala and introspection support is broken, bug #468208
+VALA_USE_DEPEND=vapigen
+
+inherit versionator gnome2-utils eutils autotools python-any-r1 vala
+
+if [[ ${PV} == *9999* ]]; then
+ inherit autotools git-r3
+ EGIT_REPO_URI="git://git.gnome.org/gegl"
+ 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"
+fi
+
+DESCRIPTION="A graph based image processing framework"
+HOMEPAGE="http://www.gegl.org/"
+
+LICENSE="|| ( GPL-3 LGPL-3 )"
+SLOT="0.3"
+
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
+REQUIRED_USE="
+ svg? ( cairo )
+ vala? ( introspection )
+"
+
+# NOTE: Even current libav 11.4 does not have AV_CODEC_CAP_VARIABLE_FRAME_SIZE
+# so there is no chance to support libav right now (Gentoo bug #567638)
+# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ dev-libs/json-glib
+ >=media-libs/babl-0.1.42
+ sys-libs/zlib
+ >=x11-libs/gdk-pixbuf-2.32:2
+ x11-libs/pango
+
+ cairo? ( >=x11-libs/cairo-1.12.2 )
+ ffmpeg? (
+ >=media-video/ffmpeg-2.8:0=
+ )
+ introspection? ( >=dev-libs/gobject-introspection-1.32:= )
+ virtual/jpeg:0=
+ jpeg2k? ( >=media-libs/jasper-1.900.1:= )
+ lcms? ( >=media-libs/lcms-2.8:2 )
+ lensfun? ( >=media-libs/lensfun-0.2.5 )
+ openexr? ( >=media-libs/openexr-1.6.1:= )
+ >=media-libs/libpng-1.6.0:0=
+ raw? ( >=media-libs/libraw-0.15.4:0= )
+ sdl? ( >=media-libs/libsdl-1.2.0 )
+ svg? ( >=gnome-base/librsvg-2.40.6:2 )
+ tiff? ( >=media-libs/tiff-4:0 )
+ umfpack? ( sci-libs/umfpack )
+ v4l? ( >=media-libs/libv4l-1.0.1 )
+ webp? ( >=media-libs/libwebp-0.5.0:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1
+ >=sys-devel/gettext-0.19.8
+ dev-lang/perl
+ virtual/pkgconfig
+ >=sys-devel/libtool-2.2
+ test? ( introspection? (
+ $(python_gen_any_dep '>=dev-python/pygobject-3.2[${PYTHON_USEDEP}]') ) )
+ vala? ( $(vala_depend) )
+"
+
+pkg_setup() {
+ use test && use introspection && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+ default
+
+ # FIXME: the following should be proper patch sent to upstream
+ # fix OSX loadable module filename extension
+ sed -i -e 's/\.dylib/.bundle/' configure.ac || die
+ # don't require Apple's OpenCL on versions of OSX that don't have it
+ if [[ ${CHOST} == *-darwin* && ${CHOST#*-darwin} -le 9 ]] ; then
+ sed -i -e 's/#ifdef __APPLE__/#if 0/' gegl/opencl/* || die
+ fi
+
+ # commit 7c78497b : tests that use gegl.png are broken on non-amd64
+ sed -e '/clones.xml/d' \
+ -e '/composite-transform.xml/d' \
+ -i tests/compositions/Makefile.am || die
+
+ epatch "${FILESDIR}"/${PN}-0.3.12-failing-tests.patch
+
+ eautoreconf
+
+ gnome2_environment_reset
+
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ # never enable altering of CFLAGS via profile option
+ # libspiro: not in portage main tree
+ # disable documentation as the generating is bit automagic
+ # if anyone wants to work on it just create bug with patch
+
+ # Also please note that:
+ #
+ # - Some auto-detections are not patched away since the docs are
+ # not built (--disable-docs, lack of --enable-gtk-doc) and these
+ # tools affect re-generation of docs, only
+ # (e.g. ruby, asciidoc, dot (of graphviz), enscript)
+ #
+ # - Parameter --with-exiv2 compiles a noinst-app only, no use
+ #
+ # - Parameter --disable-workshop disables any use of Lua, effectivly
+ #
+ # - v4l support does not work with our media-libs/libv4l-0.8.9,
+ # upstream bug at https://bugzilla.gnome.org/show_bug.cgi?id=654675
+ #
+ # - There are two checks for dot, one controllable by --with(out)-graphviz
+ # which toggles HAVE_GRAPHVIZ that is not used anywhere. Yes.
+ #
+ # - mrg is not in tree and gexiv2 support only has effect when mrg support
+ # is enabled
+ #
+ # So that's why USE="exif graphviz lua v4l" got resolved. More at:
+ # https://bugs.gentoo.org/show_bug.cgi?id=451136
+ #
+ econf \
+ --disable-docs \
+ --disable-profile \
+ --disable-silent-rules \
+ --disable-workshop \
+ --program-suffix=-${SLOT} \
+ --with-gdk-pixbuf \
+ --with-pango \
+ --without-libspiro \
+ $(use_enable cpu_flags_x86_mmx mmx) \
+ $(use_enable cpu_flags_x86_sse sse) \
+ $(use_enable debug) \
+ $(use_with cairo) \
+ $(use_with cairo pangocairo) \
+ --without-exiv2 \
+ $(use_with ffmpeg libavformat) \
+ --without-gexiv2 \
+ --without-graphviz \
+ $(use_with jpeg2k jasper) \
+ $(use_with lcms) \
+ $(use_with lensfun) \
+ --without-lua \
+ --without-mrg \
+ $(use_with openexr) \
+ $(use_with raw libraw) \
+ $(use_with sdl) \
+ $(use_with svg librsvg) \
+ $(use_with tiff libtiff) \
+ $(use_with umfpack) \
+ $(use_with v4l libv4l) \
+ $(use_with v4l libv4l2) \
+ $(use_enable introspection) \
+ $(use_with vala) \
+ $(use_with webp)
+}
+
+src_compile() {
+ default
+
+ [[ ${PV} == *9999* ]] && emake ./ChangeLog # "./" prevents "Circular ChangeLog <- ChangeLog dependency dropped."
+}
+
+src_install() {
+ default
+ prune_libtool_files --all
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index 345631946887..407097f4195e 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,6 +1,8 @@
AUX gst-plugins-good-0.10-clang.patch 662 BLAKE2B 19fd6e7bb5bd66e4414360a4b71b1b7594d91d0d4a0665c0b926dcace76cfe75115849b3b6130a4fde6237bc1b07dd87521919fb8be0af35b1158eb22325864b SHA512 773dee80e639e982e71048bb7cbe1b8be2bc94ad6f95403d5cab2e7df97234ccb7be17f9bdfaadcd61f35a47efc8ef616e219a704ec1abcac07c3b989819ac2a
DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9abc969bbf6338f65e42c2a74abb425f9e48e9cf2f71e89b92eefbcb9a3eff0ce765336b35b648a386214164cfecf66d03c2fd SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4
+DIST gst-plugins-good-1.12.4.tar.xz 3489992 BLAKE2B 41715d3e9bda183706d87085bc8cca546720f20e32fd5ecf6e284814745f2fe8ba4cfcd244e50d0734e57dde26944539b8273879608d3042262bfc10f82cc2b9 SHA512 18f270c01be80fe5b026e2c26db3ec200117ffd99c1dca55a8a78f0bd6dcc4701126836e52a410f179779e363f11218413c7b4d13e96ef5ee1bfa82e79a81178
EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
EBUILD gst-plugins-good-1.12.3.ebuild 1430 BLAKE2B d8779e22c9fa2e946ffab5b57b3e0e8f1fd6cc5ad99f3973b464b153cb903f26431c8417fdd7698ec9906c381b1a6d8234fa654bdabf8cf8684bac6d9172fe79 SHA512 3f468cfa4b74dd8f98093cb6b9acf9cb46b172e17de538f7689dd7463be13363bdd89509a2bd38867d80692017ea4eae0178885bf2c2e4bbc602dfd5c1775420
+EBUILD gst-plugins-good-1.12.4.ebuild 1438 BLAKE2B e5e74d93f7a6a9a2d81957e14b00781fbfe5f27efac5588dd53c06acc908cfa9134e9678e0511bd15b65dac68988f68e47fd3714a6b1fa3313033b4651494422 SHA512 8a265189bf641da6abbd9517b3ade80e04c1b1343cc488bed0f0a1d636bb8ba39973dff03de5c15312f62e243683deacea4aca1dffa5effd6eb444845750003f
MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild
new file mode 100644
index 000000000000..db6a08f1eef6
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.12.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit eutils flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2.1+"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="+orc"
+
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.12
+"
+
+multilib_src_configure() {
+ # Always enable optional bz2 support for matroska
+ # Always enable optional zlib support for qtdemux and matroska
+ # Many media files require these to work, as some container headers are often
+ # compressed, bug #291154
+ gstreamer_multilib_src_configure \
+ --enable-bz2 \
+ --enable-zlib \
+ --disable-examples \
+ --with-default-audiosink=autoaudiosink \
+ --with-default-visualizer=goom
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/plugins/html docs/plugins/html || die
+ fi
+
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 82abc0098b61..e02d65a515a0 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,9 +2,11 @@ DIST harfbuzz-1.4.5.tar.bz2 1474461 BLAKE2B 8f2fb5c20c92afe3fb344bf4d4024090d68a
DIST harfbuzz-1.4.6.tar.bz2 1475086 BLAKE2B 8fb082016bc50e8ae2ab9244ae2ac0b01dc5967ab14ec6aeba52a66b4926327f6c0cb7bce0020cd8183c07c57a41de1255a5782218fda87290cbad2c29d08860 SHA512 aade3902adadf3a8339ba1d05279e639da7cb53981adc64e2a2d32a5d49335a6a9782a62cdf80beca569ec8a639792bf0368c0b6ecad08f35bc85878678aa096
DIST harfbuzz-1.7.2.tar.bz2 1708416 BLAKE2B d182bdfa163e07ff41bf36e30373470bf0dded24b1c748f1114f09b3aec628f41111c4b3d6830c3f0d46206d5468816e3efb495a023747825adcdf2a9b516e39 SHA512 a895c96a1c4096622c797a5a877e80529ce63e3bd3adea9f68994b32e13e7b3be14cdfe824d338f48b12f49de537f7d0f6db14f422ea896697667c672daeb1cc
DIST harfbuzz-1.7.4.tar.bz2 1718260 BLAKE2B 9a1ded92df7682b161a3db8ee9de80d0a2bc7d6b28f3318bad37c9efe45d7b13b8e268346dc814d7875e739d22eb264c0e7e75b24c931be416e8dca4b7f6e9d9 SHA512 d5343822f2e7ed33b34f0ecb470d219be161ebb4d2349833a8fcd909cec18a97aed6ca51a97fd73407d5d70ebfc61cafb71bd13ce96c9a278c720681a04f47df
+DIST harfbuzz-1.7.5.tar.bz2 2350389 BLAKE2B 735fc36dda153e50bd83ae5e64a18d872506f07dbecf04ca85fb96b2b3c4bba46245c2326c1414811ba5d312cc21ac21dd7efe595665f134812b719c24ee9e49 SHA512 c2c13fc97bb74f0f13092b07804f7087e948bce49793f48b62c2c24a5792523acc0002840bebf21829172bb2e7c3df9f9625250aec6c786a55489667dd04d6a0
EBUILD harfbuzz-1.4.5.ebuild 3090 BLAKE2B e1a760f7ccd3b6fd7dd4de7e1aa2e6b37911171dcc1781dd6dbfa7780596c4e8e3e67ef6419439e65ca554d904071daf9105a60aea7a9e8de6dea63e819a6363 SHA512 bcc8829b5f60bafc34337d1cbf2c88bdcceae0e55ab28de5a0972bb83046e4895cc35705346b562310f281a2b357bb57d6fb35e3ec8eccd627e4a3de96e44f24
EBUILD harfbuzz-1.4.6-r2.ebuild 3167 BLAKE2B 7f7ed68df05d3d71c1977e253a8ba7da7ac28d65467b255e7076f39a47e46e91e558ecc5a30069c75f47d9933163ae2a661c3c11c9937dd768cc082136c14797 SHA512 e20d4f4d7573ddbf45eda1df6ac1302ef262e1023a02da03e9202c274681fe2fa7355afeec0edeee36898aa8e61195ecb2f3afbccea230b21d5c7c6bc1a38eeb
-EBUILD harfbuzz-1.7.2.ebuild 3155 BLAKE2B abc11b2c1318453d833d04a2c9c33c875b1eb7b0af4ac5d35bc9aa97961be8ef50b1f3d3e446440d2c7ac13a09baa1b472b66f8a14c150943982164712fce1cb SHA512 c148286f61e20af53d46097bb7198f4a41ffe2dac46a54fa676ea8bda0cc703cd18272e80aa54bc318d3350ca976193f0bb7389d8a10e75d254f80b384d646e7
+EBUILD harfbuzz-1.7.2.ebuild 3154 BLAKE2B e91364872142b3646afc357943204ab72e89b82d3d3f7a7e16aa27598b9dcd9011dab69b9c3762f754ac70cb5c72726e017eee1c626c50c024552ce2d1249521 SHA512 89df96cff739a56627acbefc996c4efa0030db1852710447c91dcbc0c27b46a42e424c0e3913a437134b7d53d77601356af4ce9f917b73537aba8f1b8df8fb8e
EBUILD harfbuzz-1.7.4.ebuild 3163 BLAKE2B f7b5020d32f758b354a0a4b4e836b60ccb2168cb7094fba0be740b594ea5aa2ae0d8400926b1e0440817a7b41f4ef2a3979c50f040477430f9d3489ee43df59e SHA512 9bdf551bb6f9667eed236e9f5cca9be01a68f78110bad24ce707c797db24d9a1aed5d1e3ebf549511897985d867190a66758af3501f68cff27a797c7e83159f8
-EBUILD harfbuzz-9999.ebuild 3193 BLAKE2B 50345bc2c90c47ba8e51cc8ae0097b42c063ff890d5f830f8bc20bdab91cc90470973ded3f8f8d0716040bacb25dd0b38ff3c53ab483fff8614f93ee3d7c24da SHA512 270388b8d4368ae5dd996a2e53bd54091265ae666d14a2c937facbeda4040d78f1dbff883f5ec0e16c335f489dd3717c851136192fabb4870b7c65557f4bdb8d
+EBUILD harfbuzz-1.7.5.ebuild 3169 BLAKE2B 70d12a02a3a70a748232e3a0797022c79e540ed68302605678cb4e01058e6c063c94abededd7a4a0fed91c50416dfb03ad92489dffe492c882c355b8be87b492 SHA512 8583728a3a3426cdbca765b68bc21724e4682ff291e66b972f12e95ea0b42ad1eedb6b1d941d3f7b202c8fe120811c4986a1d36216c09b242478c555f0c85f5a
+EBUILD harfbuzz-9999.ebuild 3169 BLAKE2B 70d12a02a3a70a748232e3a0797022c79e540ed68302605678cb4e01058e6c063c94abededd7a4a0fed91c50416dfb03ad92489dffe492c882c355b8be87b492 SHA512 8583728a3a3426cdbca765b68bc21724e4682ff291e66b972f12e95ea0b42ad1eedb6b1d941d3f7b202c8fe120811c4986a1d36216c09b242478c555f0c85f5a
MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
index 3fc51209e289..46d2487bcc16 100644
--- a/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-1.7.2.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
[[ ${PV} == 9999 ]] || \
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-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 ~x64-macos ~x86-macos ~x64-solaris"
IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
diff --git a/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild b/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild
new file mode 100644
index 000000000000..3ba2f34c80be
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-1.7.5.ebuild
@@ -0,0 +1,109 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool ltprune multilib-minimal python-any-r1 xdg-utils
+
+DESCRIPTION="An OpenType text shaping engine"
+HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
+
+if [[ ${PV} = 9999 ]] ; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+ inherit git-r3 autotools
+else
+ SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
+fi
+
+LICENSE="Old-MIT ISC icu"
+SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
+
+IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+ cairo? ( x11-libs/cairo:= )
+ fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
+ glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
+ graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
+ icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.34:= )
+ truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+ test? ( ${PYTHON_DEPS} )
+"
+# eautoreconf requires gobject-introspection-common
+# ragel needed if regenerating *.hh files from *.rl
+if [[ ${PV} = 9999 ]] ; then
+ DEPEND+="
+ >=dev-libs/gobject-introspection-common-1.34
+ dev-util/ragel
+ "
+fi
+
+pkg_setup() {
+ use test && python-any-r1_pkg_setup
+ if ! use debug ; then
+ append-cppflags -DHB_NDEBUG
+ fi
+}
+
+src_prepare() {
+ default
+
+ xdg_environment_reset
+
+ if [[ ${CHOST} == *-darwin* || ${CHOST} == *-solaris* ]] ; then
+ # on Darwin/Solaris we need to link with g++, like automake defaults
+ # to, but overridden by upstream because on Linux this is not
+ # necessary, bug #449126
+ sed -i \
+ -e 's/\<LINK\>/CXXLINK/' \
+ src/Makefile.am || die
+ sed -i \
+ -e '/libharfbuzz_la_LINK = /s/\<LINK\>/CXXLINK/' \
+ src/Makefile.in || die
+ sed -i \
+ -e '/AM_V_CCLD/s/\<LINK\>/CXXLINK/' \
+ test/api/Makefile.in || die
+ fi
+
+ [[ ${PV} == 9999 ]] && eautoreconf
+ elibtoolize # for Solaris
+
+ # failing test, https://bugs.freedesktop.org/show_bug.cgi?id=89190
+ sed -e 's#tests/arabic-fallback-shaping.tests##' -i test/shaping/Makefile.in || die "sed failed"
+}
+
+multilib_src_configure() {
+ # harfbuzz-gobject only used for instrospection, bug #535852
+ local myeconfargs=(
+ --without-coretext
+ --without-uniscribe
+ $(use_enable static-libs static)
+ $(multilib_native_use_with cairo)
+ $(use_with fontconfig)
+ $(use_with glib)
+ $(use_with introspection gobject)
+ $(use_with graphite graphite2)
+ $(use_with icu)
+ $(multilib_native_use_enable introspection)
+ $(use_with truetype freetype)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+ if multilib_is_native_abi; then
+ ln -s "${S}"/docs/html docs/html || die
+ fi
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ prune_libtool_files --modules
+}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index c785260b6c40..3ba2f34c80be 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -1,22 +1,21 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=6
PYTHON_COMPAT=( python2_7 )
-inherit eutils flag-o-matic libtool multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic libtool ltprune multilib-minimal python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-if [[ ${PV} != 9999 ]] ; then
+if [[ ${PV} = 9999 ]] ; then
+ EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
+ inherit git-r3 autotools
+else
SRC_URI="https://www.freedesktop.org/software/${PN}/release/${P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~x64-macos ~x86-macos ~x64-solaris"
-else
- inherit git-r3 autotools
- #EGIT_REPO_URI="git://anongit.freedesktop.org/harfbuzz"
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/harfbuzz.git"
fi
LICENSE="Old-MIT ISC icu"
@@ -41,10 +40,12 @@ DEPEND="${RDEPEND}
"
# eautoreconf requires gobject-introspection-common
# ragel needed if regenerating *.hh files from *.rl
-[[ ${PV} = 9999 ]] && DEPEND+="
- >=dev-libs/gobject-introspection-common-1.34
- dev-util/ragel
-"
+if [[ ${PV} = 9999 ]] ; then
+ DEPEND+="
+ >=dev-libs/gobject-introspection-common-1.34
+ dev-util/ragel
+ "
+fi
pkg_setup() {
use test && python-any-r1_pkg_setup
@@ -81,20 +82,21 @@ src_prepare() {
}
multilib_src_configure() {
- ECONF_SOURCE="${S}" \
# harfbuzz-gobject only used for instrospection, bug #535852
- econf \
- --without-coretext \
- --without-uniscribe \
- $(use_enable static-libs static) \
- $(multilib_native_use_with cairo) \
- $(use_with fontconfig) \
- $(use_with glib) \
- $(use_with introspection gobject) \
- $(use_with graphite graphite2) \
- $(use_with icu) \
- $(multilib_native_use_enable introspection) \
+ local myeconfargs=(
+ --without-coretext
+ --without-uniscribe
+ $(use_enable static-libs static)
+ $(multilib_native_use_with cairo)
+ $(use_with fontconfig)
+ $(use_with glib)
+ $(use_with introspection gobject)
+ $(use_with graphite graphite2)
+ $(use_with icu)
+ $(multilib_native_use_enable introspection)
$(use_with truetype freetype)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
if multilib_is_native_abi; then
ln -s "${S}"/docs/html docs/html || die
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index abbb2531c419..15d688cf63e8 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -8,6 +8,6 @@ DIST ilmbase-2.2.0.tar.gz 525289 BLAKE2B 951f6601075098b5f38e26d47f28a83f923d268
EBUILD ilmbase-1.0.2.ebuild 800 BLAKE2B 2527e4bf3601d64423e7e46b897bdf524c60dd0e369314e9bb0ab04f06c2f0812c226bff55dd885eb5083f43dc4b9a593e9a98b03856056c1eb1f33b18999eaf SHA512 e302e98e65e0620e0367d74b0a797578420ad540394e8ee307883b70a1d1673e863ae418f4e00966960dc5c39be4d43649e84f2338cb0fea31a5b79e7c8557a4
EBUILD ilmbase-2.0.1-r1.ebuild 591 BLAKE2B b196bf67401ac210bc4846e69ddd011281d265227dc5c63e70f7c84d5ea05ac177b416cc37744bc6f5360911ed3d3e112596f14f81aa456cd472682d017efaf2 SHA512 4a5392c5be8b1758dc8c2fc0e59530fafb7d353ca70711060f4e43759a9f22c6524323b3db50774b94d7a40472b4854810d012f5eeee375af8f08b4577eae18e
EBUILD ilmbase-2.1.0.ebuild 758 BLAKE2B 20825fee87f24bc2e31d4c01e690ed7d6ed4827ea9422dd83354da8a8c85c832f0d8d172ac802193b56a482f0d656f79a5aa483a995ae05e17e91ac8b4e8a202 SHA512 fdb41c8dc58900b21d3dd42e8cd65b99639f343985ae8b99e04a8a4e5eb0b68b13725d03b3bd03776d528d2998f62d0f6496bb6ef13b0cc9dda1d804d84b7e2e
-EBUILD ilmbase-2.2.0-r1.ebuild 915 BLAKE2B 9c51a7ef9ac66024d43dd2263021935f4072bedc16d26d8c7bf4255fe00635c747fed537650f6c3b07594d210a4ce4e79c6a4de97ed67dd64c1cf2a26372eade SHA512 3744b02d5f85d64b044469691db68944d57d820ab95799ce8788206f646575db5045c68c2b4f07c60b26b89a28f9b64b00a8579af21d7dd30e3cc37e3060dee8
+EBUILD ilmbase-2.2.0-r1.ebuild 914 BLAKE2B 078ca010333b9ecef17b489a46d96f70ab4309fec23faed0d4d8d173976d2744d71d1399d854aa5f34e0153f334bc9edd28458e04e84bcc1d39186c3f671ee24 SHA512 f60321ac0ca012b57738154782d7810553302ce3d068b68428e34ad345b0e5719fb6f046f5fd1cd3607a0cc7c955779326475a891a07033e618110e3d9356e34
EBUILD ilmbase-2.2.0.ebuild 773 BLAKE2B e2ce76ff50489895805194179dd647ff70f7cfae2e3960689a95c6b9b4d0aa543155c45fa12e461ceaadb6249df80dd75398c7841441adcfdfdbd75b01bc43b2 SHA512 a11bcce9aa6cd8a818ad2d8e9ab391e83b4a2b70155b1524d8b00b0f6c8a726aa1c4ad4f75acec1c8a81cd1d12626e0dd80da7b74a3410c7dc9aa12454b98c58
MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild b/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
index c9932b271a3b..0804f647bcf3 100644
--- a/media-libs/ilmbase/ilmbase-2.2.0-r1.ebuild
+++ b/media-libs/ilmbase/ilmbase-2.2.0-r1.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
@@ -10,7 +10,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/12" # based on SONAME
-KEYWORDS="~amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+KEYWORDS="amd64 -arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
IUSE="static-libs"
DEPEND="virtual/pkgconfig[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libdvb/Manifest b/media-libs/libdvb/Manifest
deleted file mode 100644
index d774b255758f..000000000000
--- a/media-libs/libdvb/Manifest
+++ /dev/null
@@ -1,6 +0,0 @@
-AUX libdvb-0.5.5.1-autotools.patch 17609 BLAKE2B 4e2b5560f53007c00231469749ec9ec4da4cb0106ef5c5149392bf66baec27d957e366a1a3876394d995b23da43cec433ceea3580f41c96aba61d28cf82fdf8d SHA512 ef4b40876cadaaedebfb4969a440de617669f6377b8eb092ba880518c53720517f8edbe662b859ecb574eab21ce3b4403f2eb860abfff352640e54eb5cc8cf01
-AUX libdvb-0.5.5.1-gcc43.patch 565 BLAKE2B c559f5da18f47b3660f7759ebf3ce6afb58fdb7d08a545bc013d10f910ffe0771117a62709c78eb154962d993b30b56c5c3d1694459e10db4a36ea67692583dc SHA512 bdc985b42beed0a24bd07e4c0a4aea190956c82eeaabd3b92ad43de70415d10b5c0e071ac07ec491950afcfd9534f4052f3befd63b44c8aebd673686b1ccc359
-AUX libdvb-0.5.5.1-rename-analyze.patch 4785 BLAKE2B 01e4d1bb89427a2103e0ba45aa076bd9bd071932f3976fb25a6ae61562fb01dcb322a2486f2da5e7a8de3ca87cda7e920d719da1bcb5f64a6b48491cf225b303 SHA512 b539974f6bfae5ba291ae3b405e6ad2ec5b3aacbc2e5e3fac4c94ef2de58bbd3fbfec0bdce97bf3c9e639d0c9aefea08819a91545be2f4bac19c283b862d50c5
-DIST libdvb-0.5.5.1.tar.gz 312295 BLAKE2B 914014d09c6ccbba9f58de0a8fd6430be8e2148cf999259ee98ba17239b857e7a5c011412c751932390bfbfec516efebdb12c6fe0e434449ac05930c2ef4988a SHA512 6e776e9a01b0059e46124f8525c1b83951295bc695100386e3a488dfbe058ef074a96019bb77c5fd2c51b9baf67beb889af00914cfd796e2dd175f9423c449d4
-EBUILD libdvb-0.5.5.1-r3.ebuild 1186 BLAKE2B 4d52aa0186a8462fb4b280919f453c2cbed5358ca46ed3438fdc134ddbd3e43abb9e009b5de02a513b93ccb5213c105e5df238247686952000c0ba7e9af9cf40 SHA512 4a02382d8f73acbfa8b536c3ff00033746d952677663c1bd6bfb788ce1a79f925caceba6537117ffb3374d7393ce13fdd9bd4d423befd13cd5a5415a7f6ee7f9
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch
deleted file mode 100644
index bf3ded22d60b..000000000000
--- a/media-libs/libdvb/files/libdvb-0.5.5.1-autotools.patch
+++ /dev/null
@@ -1,617 +0,0 @@
-diff -urpN libdvb-0.5.5.1/autogen.sh libdvb-0.5.5.1.az/autogen.sh
---- libdvb-0.5.5.1/autogen.sh 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/autogen.sh 2006-07-24 20:12:24.000000000 +0200
-@@ -0,0 +1,9 @@
-+#!/bin/bash
-+
-+aclocal-1.9 || exit 1
-+libtoolize --automake -c -f || exit 1
-+aclocal-1.9 || exit 1
-+autoconf || exit 1
-+autoheader || exit 1
-+automake-1.9 -a -c || exit 1
-+
-diff -urpN libdvb-0.5.5.1/config.mk libdvb-0.5.5.1.az/config.mk
---- libdvb-0.5.5.1/config.mk 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/config.mk 1970-01-01 02:00:00.000000000 +0200
-@@ -1,10 +0,0 @@
--# -*- makefile -*-
--#
--
--PREFIX = /usr/local
--VERSION = 0.5.5.1
--CFLAGS=-O2 -Wall -g
--INCLUDES=-I. -I../include
--TEST_PROGS= merge_dvb conv satscan cam_set cam_test quickscan cam_menu dump_TS
--#CXX = g++-3.2
--#CC = gcc-3.2
-diff -urpN libdvb-0.5.5.1/configure.ac libdvb-0.5.5.1.az/configure.ac
---- libdvb-0.5.5.1/configure.ac 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/configure.ac 2006-07-24 21:08:47.000000000 +0200
-@@ -0,0 +1,26 @@
-+AC_PREREQ([2.59])
-+AC_INIT([libdvb], [0.5.5.1], [mocm@metzlerbros.de])
-+AM_INIT_AUTOMAKE
-+AC_CONFIG_HEADER([config.h])
-+
-+dnl Checks for programs.
-+AC_PROG_CC
-+AC_PROG_CXX
-+AC_ISC_POSIX
-+AC_PROG_INSTALL
-+AC_PROG_MAKE_SET
-+AC_PROG_AWK
-+
-+AC_PROG_LIBTOOL
-+
-+AC_OUTPUT([
-+ Makefile
-+ include/Makefile
-+ libdvb/Makefile
-+ libdvbci/Makefile
-+ libdvbmpeg/Makefile
-+ dvb-mpegtools/Makefile
-+ sample_progs/Makefile
-+ samplerc/Makefile
-+])
-+
-diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile libdvb-0.5.5.1.az/dvb-mpegtools/Makefile
---- libdvb-0.5.5.1/dvb-mpegtools/Makefile 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile 1970-01-01 02:00:00.000000000 +0200
-@@ -1,82 +0,0 @@
--
--include ../config.mk
--
--DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--LIBS = -L../ -ldvbmpegtools
--MFLAG = -M
--MPLEXOBS = buffer.o inits.o interact.o systems.o domplex.o inptstrm.o \
-- multplex.o timecode.o mplex.o bits.o
--
--SRC = $(wildcard *.c)
--CPPSRC = $(wildcard *.cpp)
--CSRC = $(wildcard *.cc)
--COBJ = $(notdir $(SRC:.c=.o))
--LINKS = streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
-- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
-- pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es\
-- insert_pat_pmt get_http extract_pes extract_pes_payload\
-- change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
-- change_aspect_221_1
--
--.PHONY: depend clean install uninstall
--
--
--all: dvb-mpegtools_main dvb-mplex links audiofilter dvbaudio show_dvb_image
--
--links: dvb-mpegtools_main
-- for f in $(LINKS); do\
-- ln -sf dvb-mpegtools_main $$f ;\
-- done
--
--clean:
-- - rm -f *.o .depend dvb-mpegtools_main dvb-mplex ctest *~ $(LINKS) ctest audiofilter show_dvb_image\
-- dvbaudio
--
--dvb-mpegtools_main: main.o
-- $(CXX) main.o $(LIBS) -o $@
--
--ctest: mainc.o
-- $(CC) $(COBJ) -o $@
--
--dvb-mplex: $(MPLEXOBS)
-- $(CXX) $(MPLEXOBS) $(LIBS) -o $@
--
--dvbaudio: dvbaudio.o
-- $(CXX) dvbaudio.o $(LIBS) -ldvb -o $@
--
--audiofilter: audiofilter.o
-- $(CXX) audiofilter.o -o $@
--
--%.o: %.cc
-- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
--
--%.o: %.cpp
-- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
--
--%.o: %.c
-- $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
--
--install: dvb-mpegtools_main
-- install -D -m 755 dvb-mplex $(DESTDIR)$(PREFIX)/bin/dvb-mplex
-- install -m 755 audiofilter $(DESTDIR)$(PREFIX)/bin/
-- install -m 755 dvb-mpegtools_main $(DESTDIR)$(PREFIX)/bin/
-- install -m 755 dvbaudio $(DESTDIR)$(PREFIX)/bin/
-- install -m 755 show_dvb_image $(DESTDIR)$(PREFIX)/bin/
-- install -m 755 dia $(DESTDIR)$(PREFIX)/bin/
-- for f in $(LINKS); do\
-- (cd $(DESTDIR)$(PREFIX)/bin && ln -s -f dvb-mpegtools_main $$f) ;\
-- done
--
--uninstall:
-- for f in $(LINKS); do rm -f $(DESTDIR)$(PREFIX)/bin/$$f;done
-- rm -f $(DESTDIR)$(PREFIX)/bin/dvb-mpegtools_main
-- rm -f $(DESTDIR)$(PREFIX)/bin/dvbaudio
-- rm -f $(DESTDIR)$(PREFIX)/bin/audiofilter
-- rm -f $(DESTDIR)$(PREFIX)/lib/libdvbmpegtools
--
--.depend:
-- $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
--
--
--
--include .depend
-diff -urpN libdvb-0.5.5.1/dvb-mpegtools/Makefile.am libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am
---- libdvb-0.5.5.1/dvb-mpegtools/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/dvb-mpegtools/Makefile.am 2006-07-24 21:44:55.000000000 +0200
-@@ -0,0 +1,73 @@
-+INCLUDES = -I$(top_srcdir)/include
-+
-+dist_bin_SCRIPTS = dia
-+
-+bin_PROGRAMS = \
-+ dvb-mpegtools_main \
-+ dvb-mplex \
-+ audiofilter \
-+ dvbaudio \
-+ show_dvb_image
-+
-+# Don't build currently
-+#noinst_PROGRAMS = ctest
-+
-+LF_FLAGS = \
-+ -D_FILE_OFFSET_BITS=64 \
-+ -D_LARGEFILE_SOURCE \
-+ -D_LARGEFILE64_SOURCE
-+
-+LIBDVB = $(top_builddir)/libdvb/libdvb.la
-+LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
-+
-+LINKS = \
-+ streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
-+ tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
-+ pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es \
-+ insert_pat_pmt get_http extract_pes extract_pes_payload \
-+ change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
-+ change_aspect_221_1
-+
-+dvb_mpegtools_main_LDADD = $(LIBDVBMPEG)
-+dvb_mpegtools_main_CFLAGS = $(LF_FLAGS)
-+dvb_mpegtools_main_SOURCES = main.cc
-+
-+dvb_mplex_LDADD = $(LIBDVBMPEG)
-+dvb_mplex_CFLAGS = $(LF_FLAGS)
-+dvb_mplex_SOURCES = \
-+ bits.cpp \
-+ domplex.cpp \
-+ inptstrm.cpp \
-+ mplex.cpp \
-+ multplex.cpp \
-+ timecode.cpp \
-+ buffer.cpp \
-+ inits.cpp \
-+ interact.cpp \
-+ common.h \
-+ consts.h \
-+ consts1.h \
-+ main.h \
-+ mplex.h \
-+ systems.cpp
-+
-+dvbaudio_LDADD = $(LIBDVB) $(LIBDVBMPEG)
-+dvbaudio_CFLAGS = $(LF_FLAGS)
-+dvbaudio_SOURCES = dvbaudio.cc
-+
-+audiofilter_CFLAGS = $(LF_FLAGS)
-+audiofilter_SOURCES = audiofilter.c
-+
-+show_dvb_image_CFLAGS = $(LF_FLAGS)
-+show_dvb_image_SOURCES = show_dvb_image.c
-+
-+# Don't build currently
-+#ctest_CFLAGS = $(LF_FLAGS)
-+#ctest_SOURCES = mainc.c
-+
-+install-exec-hook:
-+ @for x in $(LINKS) ; do \
-+ rm -f $(DESTDIR)$(bindir)/$$x; \
-+ $(LN_S) dvb-mpegtools_main $(DESTDIR)$(bindir)/$$x; \
-+ done
-+
-diff -urpN libdvb-0.5.5.1/include/Makefile.am libdvb-0.5.5.1.az/include/Makefile.am
---- libdvb-0.5.5.1/include/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/include/Makefile.am 2006-07-24 20:16:18.000000000 +0200
-@@ -0,0 +1,13 @@
-+dvbdir = $(pkgincludedir)
-+dvb_HEADERS = \
-+ channel.h \
-+ ci.hh \
-+ cpptools.hh \
-+ ctools.h \
-+ devices.hh \
-+ DVB.hh \
-+ OSD.h \
-+ osd.hh \
-+ ringbuffy.h \
-+ transform.h
-+
-diff -urpN libdvb-0.5.5.1/libdvb/Makefile libdvb-0.5.5.1.az/libdvb/Makefile
---- libdvb-0.5.5.1/libdvb/Makefile 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/libdvb/Makefile 1970-01-01 02:00:00.000000000 +0200
-@@ -1,26 +0,0 @@
--
--include ../config.mk
--
--OBJS=devices.o DVB.o OSD.o
--LIBS=-L./ -lpthread
--DVB_LIBS=libdvb.a
--
--main: $(DVB_LIBS)
--
--libdvb.a: $(OBJS)
-- ar -rcs libdvb.a $(OBJS)
--
--DVB.o: DVB.cc ../include/DVB.hh
-- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
--
--devices.o: devices.cc ../include/devices.hh
-- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
--
--.c.o:
-- $(CC) $(INCLUDES) $(CFLAGS) -c $<
--
--.cc.o:
-- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
--
--clean:
-- -rm -f *.o $(DVB_LIBS) *~
-diff -urpN libdvb-0.5.5.1/libdvb/Makefile.am libdvb-0.5.5.1.az/libdvb/Makefile.am
---- libdvb-0.5.5.1/libdvb/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/libdvb/Makefile.am 2006-07-24 20:20:58.000000000 +0200
-@@ -0,0 +1,12 @@
-+AUTOMAKE_OPTIONS = foreign
-+
-+INCLUDES = -I$(top_srcdir)/include
-+
-+lib_LTLIBRARIES = libdvb.la
-+
-+libdvb_la_LDFLAGS = -lpthread
-+libdvb_la_SOURCES = \
-+ devices.cc \
-+ DVB.cc \
-+ OSD.c
-+
-diff -urpN libdvb-0.5.5.1/libdvbci/Makefile libdvb-0.5.5.1.az/libdvbci/Makefile
---- libdvb-0.5.5.1/libdvbci/Makefile 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/libdvbci/Makefile 1970-01-01 02:00:00.000000000 +0200
-@@ -1,23 +0,0 @@
--
--include ../config.mk
--
--CI_OBJS=ci.o ci2.o
--LIBS=-L./ -lpthread
--DVB_LIBS=libdvbci.a
--
--main: $(DVB_LIBS)
--
--libdvbci.a: $(CI_OBJS)
-- ar -rcs libdvbci.a $(CI_OBJS)
--
--ci.o: ci.cc ../include/ci.hh
-- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
--
--.c.o:
-- $(CC) $(INCLUDES) $(CFLAGS) -c $<
--
--.cc.o:
-- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
--
--clean:
-- -rm -f *.o $(DVB_LIBS) *~
-diff -urpN libdvb-0.5.5.1/libdvbci/Makefile.am libdvb-0.5.5.1.az/libdvbci/Makefile.am
---- libdvb-0.5.5.1/libdvbci/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/libdvbci/Makefile.am 2006-07-24 20:21:19.000000000 +0200
-@@ -0,0 +1,11 @@
-+AUTOMAKE_OPTIONS = foreign
-+
-+INCLUDES = -I$(top_srcdir)/include
-+
-+lib_LTLIBRARIES = libdvbci.la
-+
-+libdvbci_la_LDFLAGS = -lpthread
-+libdvbci_la_SOURCES = \
-+ ci2.c \
-+ ci.cc
-+
-diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile libdvb-0.5.5.1.az/libdvbmpeg/Makefile
---- libdvb-0.5.5.1/libdvbmpeg/Makefile 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile 1970-01-01 02:00:00.000000000 +0200
-@@ -1,36 +0,0 @@
--
--include ../config.mk
--
--DCFLAGS = $(CFLAGS) -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE
--MFLAG = -M
--OBJS = ctools.o ringbuffy.o transform.o cpptools.o
--SRC = $(wildcard *.c)
--CPPSRC = $(wildcard *.cpp)
--CSRC = $(wildcard *.cc)
--INCS = -I../include
--
--all: libdvbmpegtools.a
--
--.PHONY: depend clean install uninstall
--
--clean:
-- - rm -f *.o *~ *.a .depend
--
--libdvbmpegtools.a: $(OBJS)
-- ar -rcs libdvbmpegtools.a $(OBJS)
--
--%.o: %.cc
-- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
--
--%.o: %.cpp
-- $(CXX) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
--
--%.o: %.c
-- $(CC) -c $(DCFLAGS) $(INCLUDES) $(DEFINES) $<
--
--.depend:
-- $(CXX) $(DEFINES) $(MFLAG) $(SRC) $(CSRC) $(CPPSRC) $(INCLUDES)> .depend
--
--
--
--include .depend
-diff -urpN libdvb-0.5.5.1/libdvbmpeg/Makefile.am libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am
---- libdvb-0.5.5.1/libdvbmpeg/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/libdvbmpeg/Makefile.am 2006-07-24 20:21:30.000000000 +0200
-@@ -0,0 +1,21 @@
-+AUTOMAKE_OPTIONS = foreign
-+
-+INCLUDES = -I$(top_srcdir)/include
-+
-+lib_LTLIBRARIES = libdvbmpegtools.la
-+
-+LF_FLAGS = \
-+ -D_FILE_OFFSET_BITS=64 \
-+ -D_LARGEFILE_SOURCE \
-+ -D_LARGEFILE64_SOURCE
-+
-+libdvbmpegtools_la_CFLAGS = $(LF_FLAGS)
-+libdvbmpegtools_la_CXXFLAGS = $(LF_FLAGS)
-+libdvbmpegtools_la_LDFLAGS = -lpthread
-+libdvbmpegtools_la_SOURCES = \
-+ cpptools.cc \
-+ ctools.c \
-+ remux.c \
-+ ringbuffy.c \
-+ transform.c
-+
-diff -urpN libdvb-0.5.5.1/Makefile libdvb-0.5.5.1.az/Makefile
---- libdvb-0.5.5.1/Makefile 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/Makefile 1970-01-01 02:00:00.000000000 +0200
-@@ -1,82 +0,0 @@
--
--SOURCEDIRS=include libdvb libdvbci libdvbmpeg sample_progs dvb-mpegtools samplerc
--DVB-MPEGTOOLS= dvb-mpegtools_main dvb-mplex audiofilter dvbaudio
--DVB_LIBS=libdvb.a libdvbci.a libdvbmpegtools.a
--HEADERS=include/DVB.hh include/ci.hh include/devices.hh include/channel.h include/ctools.h \
-- include/transform.h include/ringbuffy.h include/cpptools.hh include/OSD.h \
-- include/osd.hh
--
--RESOURCES=README
--include config.mk
--
--
--
--main: $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS)
--
--install: $(DVB_LIBS) $(HEADERS)
-- mkdir -p $(DESTDIR)$(PREFIX)/lib
-- install -m 644 $(DVB_LIBS) $(DESTDIR)$(PREFIX)/lib/
-- mkdir -p $(DESTDIR)$(PREFIX)/include
-- install -m 644 $(HEADERS) $(DESTDIR)$(PREFIX)/include/
-- make -C dvb-mpegtools install
--
--uninstall:
-- for i in $(DVB_LIBS); do rm -f $(DESTDIR)$(PREFIX)/lib/$$i;done
-- for i in $(HEADERS); do rm -f $(DESTDIR)$(PREFIX)/$$i;done
-- make -C dvb-mpegtools uninstall
--
--libdvb.a: libdvb/libdvb.a
-- cp libdvb/libdvb.a .
--
--libdvbci.a: libdvbci/libdvbci.a
-- cp libdvbci/libdvbci.a .
--
--libdvbmpegtools.a: libdvbmpeg/libdvbmpegtools.a
-- cp libdvbmpeg/libdvbmpegtools.a .
--
--libdvb/libdvb.a:
-- make -C libdvb main
--
--libdvbci/libdvbci.a:
-- make -C libdvbci main
--
--libdvbmpeg/libdvbmpegtools.a:
-- make -C libdvbmpeg libdvbmpegtools.a
--
--merge_dvb: libdvb.a sample_progs/merge.cc
--conv: libdvb.a sample_progs/conv.cc
--satscan: libdvb.a sample_progs/satscan.cc
--quickscan: libdvb.a sample_progs/quickscan.cc
--cam_set: libdvbci.a sample_progs/cam_set.cc
--cam_test: libdvb.a libdvbmpegtools.a sample_progs/cam_test.cc
-- make -C sample_progs main
-- for f in $(TEST_PROGS); do cp sample_progs/$$f . ; done
--
--dvb-mpegtools_main: libdvbmpegtools.a dvb-mpegtools/main.cc
--dvb-mplex: libdvbmpegtools.a dvb-mpegtools/mplex.cpp
--audiofilter: dvb-mpegtools/audiofilter.c
--dvbaudio: libdvb.a libdvbmpegtools.a dvb-mpegtools/dvbaudio.cc
-- make -C dvb-mpegtools all
-- for f in $(DVB-MPEGTOOLS); do cp dvb-mpegtools/$$f . ; done
--
--dvbs: libdvb.a libdvbmpegtools.a dvbserver/dvbs_main.cc
-- make -C dvbserver dvbs_main
--
--
--clean:
-- -rm -f libdvb-$(VERSION).tar.gz $(DVB_LIBS) $(TEST_PROGS) $(DVB-MPEGTOOLS) *~
-- make -C libdvb clean
-- make -C libdvbci clean
-- make -C libdvbmpeg clean
-- make -C sample_progs clean
-- make -C dvb-mpegtools clean
-- rm include/*~
--
--dist:
-- mkdir libdvb-$(VERSION)
-- for f in $(SOURCEDIRS); do mkdir libdvb-$(VERSION)/$$f;done
-- cp -r $(SOURCEDIRS) libdvb-$(VERSION)
-- for f in $(SOURCEDIRS); do rm -rf libdvb-$(VERSION)/$$f/CVS;done
-- cp COPYING README Makefile config.mk libdvb-$(VERSION)
-- tar zcf libdvb-$(VERSION).tar.gz libdvb-$(VERSION)
-- rm -rf libdvb-$(VERSION)
-diff -urpN libdvb-0.5.5.1/Makefile.am libdvb-0.5.5.1.az/Makefile.am
---- libdvb-0.5.5.1/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/Makefile.am 2006-07-24 21:07:35.000000000 +0200
-@@ -0,0 +1,9 @@
-+SUBDIRS = \
-+ include \
-+ libdvb \
-+ libdvbci \
-+ libdvbmpeg \
-+ dvb-mpegtools \
-+ sample_progs \
-+ samplerc
-+
-diff -urpN libdvb-0.5.5.1/sample_progs/cam_menu.cc libdvb-0.5.5.1.az/sample_progs/cam_menu.cc
---- libdvb-0.5.5.1/sample_progs/cam_menu.cc 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/sample_progs/cam_menu.cc 2006-07-24 21:14:18.000000000 +0200
-@@ -46,7 +46,7 @@ void reset_keypress()
-
- void byebye(int i, void *f)
- {
-- int fd = (int) f;
-+ long fd = (long) f;
-
- CamPacket cp(fd, CMENU_CLOSE, 0, NULL);
- cp.psend();
-diff -urpN libdvb-0.5.5.1/sample_progs/Makefile libdvb-0.5.5.1.az/sample_progs/Makefile
---- libdvb-0.5.5.1/sample_progs/Makefile 2005-03-22 15:23:25.000000000 +0200
-+++ libdvb-0.5.5.1.az/sample_progs/Makefile 1970-01-01 02:00:00.000000000 +0200
-@@ -1,48 +0,0 @@
--
--include ../config.mk
--
--LIBS=-L../
--DVB_LIBS=libdvb.a libdvbci.a
--HEADERS=DVB.hh ci.hh devices.hh channel.h
--SOURCES=Makefile $(HEADERS) DVB.cc ci.cc devices.cc OSD.h OSD.c osd.hh\
-- merge.cc conv.cc satscan.cc cam_set.cc cam_test.cc quickscan.cc cam_menu.cc
--RESOURCES=README astrarc hotbirdrc
--
--main: $(TEST_PROGS)
--
--dump_TS: dump_TS.cc ../libdvb/libdvb.a ../include/DVB.hh
-- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o dump_TS dump_TS.cc -ldvb -ldvbmpegtools
--
--merge_dvb: merge.cc ../libdvb/libdvb.a ../include/DVB.hh
-- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o merge_dvb merge.cc -ldvb
--
--conv: conv.cc ../libdvb/libdvb.a ../include/DVB.hh
-- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o conv conv.cc -ldvb
--
--satscan: satscan.cc ../libdvb/libdvb.a ../include/DVB.hh
-- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o satscan satscan.cc -ldvb
--
--quickscan: quickscan.cc ../libdvb/libdvb.a ../include/DVB.hh
-- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o quickscan quickscan.cc -ldvb
--
--cam_set: cam_set.cc cam_menu.hh ../libdvbci/libdvbci.a ../include/ci.hh
-- $(CXX) $(LIBS) $(INCLUDES) $(CFLAGS) -o cam_set cam_set.cc -ldvbci
--
--cam_test: cam_test.cc ../libdvb/libdvb.a ../include/DVB.hh ../include/ci.hh
-- $(CXX) $(LIBS) $(INCLUDES) -o cam_test cam_test.cc -ldvb -ldvbmpegtools
--
--cam_menu: cam_menu.cc cam_menu.hh ../libdvb/libdvb.a ../include/DVB.hh
-- $(CXX) $(LIBS) $(INCLUDES) -o cam_menu cam_menu.cc -ldvb
--
--status_check: status_check.c
-- $(CC) $(INCLUDES) $(CFLAGS) -o status_check status_check.c
--
--.c.o:
-- $(CC) $(INCLUDES) $(CFLAGS) -c $<
--
--.cc.o:
-- $(CXX) $(INCLUDES) $(CFLAGS) -c $<
--
--clean:
-- -rm -f *.o $(TEST_PROGS) *~
--
-diff -urpN libdvb-0.5.5.1/sample_progs/Makefile.am libdvb-0.5.5.1.az/sample_progs/Makefile.am
---- libdvb-0.5.5.1/sample_progs/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/sample_progs/Makefile.am 2006-07-24 21:23:45.000000000 +0200
-@@ -0,0 +1,45 @@
-+INCLUDES = -I$(top_srcdir)/include
-+
-+noinst_PROGRAMS = \
-+ merge_dvb \
-+ conv \
-+ satscan \
-+ cam_set \
-+ cam_test \
-+ quickscan \
-+ cam_menu \
-+ dump_TS
-+# Not building currently
-+# status_check
-+
-+LIBDVB = $(top_builddir)/libdvb/libdvb.la
-+LIBDVBCI = $(top_builddir)/libdvbci/libdvbci.la
-+LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
-+
-+dump_TS_LDADD = $(LIBDVB) $(LIBDVBMPEG)
-+dump_TS_SOURCES = dump_TS.cc
-+
-+merge_dvb_LDADD = $(LIBDVB)
-+merge_dvb_SOURCES = merge.cc
-+
-+conv_LDADD = $(LIBDVB)
-+conv_SOURCES = conv.cc
-+
-+satscan_LDADD = $(LIBDVB)
-+satscan_SOURCES = satscan.cc
-+
-+quickscan_LDADD = $(LIBDVB)
-+quickscan_SOURCES = quickscan.cc
-+
-+cam_set_LDADD = $(LIBDVBCI)
-+cam_set_SOURCES = cam_set.cc cam_menu.hh
-+
-+cam_test_LDADD = $(LIBDVB) $(LIBDVBMPEG)
-+cam_test_SOURCES = cam_test.cc
-+
-+cam_menu_LDADD = $(LIBDVB)
-+cam_menu_SOURCES = cam_menu.cc cam_menu.hh
-+
-+# Not building currently
-+#status_check_SOURCES = status_check.c
-+
-diff -urpN libdvb-0.5.5.1/samplerc/Makefile.am libdvb-0.5.5.1.az/samplerc/Makefile.am
---- libdvb-0.5.5.1/samplerc/Makefile.am 1970-01-01 02:00:00.000000000 +0200
-+++ libdvb-0.5.5.1.az/samplerc/Makefile.am 2006-07-24 21:06:49.000000000 +0200
-@@ -0,0 +1,11 @@
-+EXTRA_DIST = \
-+ 28erc \
-+ astrarc \
-+ astra.xml \
-+ dvbt-koeln \
-+ hotbirdrc \
-+ nokia.dat \
-+ siriusrc \
-+ thorrc \
-+ w2-16.nokia
-+
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch
deleted file mode 100644
index 8f9ea6b76d6e..000000000000
--- a/media-libs/libdvb/files/libdvb-0.5.5.1-gcc43.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- libdvb-0.5.5.1.orig/sample_progs/cam_menu.hh 2008-01-28 10:23:53.000000000 +0100
-+++ libdvb-0.5.5.1/sample_progs/cam_menu.hh 2008-01-28 10:22:55.000000000 +0100
-@@ -2,6 +2,7 @@
- * cam_menu.hh
- *
- */
-+#include <cstring>
- #include <sys/types.h>
- #include <sys/socket.h>
-
---- libdvb-0.5.5.1.orig/libdvbmpeg/ringbuffy.c 2007-03-16 17:53:31.000000000 +0100
-+++ libdvb-0.5.5.1/libdvbmpeg/ringbuffy.c 2007-03-16 17:54:10.000000000 +0100
-@@ -19,6 +19,7 @@
- */
-
- #include "ringbuffy.h"
-+#include <string.h>
-
- int ring_init (ringbuffy *rbuf, int size)
- {
diff --git a/media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch b/media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch
deleted file mode 100644
index 23b4f22e44f6..000000000000
--- a/media-libs/libdvb/files/libdvb-0.5.5.1-rename-analyze.patch
+++ /dev/null
@@ -1,129 +0,0 @@
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc libdvb-0.5.5.1/dvb-mpegtools/main.cc
---- libdvb-0.5.5.1-orig/dvb-mpegtools/main.cc 2006-07-24 21:48:22.000000000 +0200
-+++ libdvb-0.5.5.1/dvb-mpegtools/main.cc 2006-07-24 21:50:03.000000000 +0200
-@@ -54,7 +54,7 @@
-
- #define PROGS 29
-
--char *prognames[PROGS+1] = { "streamtype", // 0
-+char *prognames[PROGS+1] = { "streamtype_mpg", // 0
- "ts2pes", // 1
- "ps2vid",
- "pes2aud_es",
-@@ -63,7 +63,7 @@
- "pes2vid",
- "tspids",
- "pes2ts",
-- "analyze",
-+ "analyze_mpg",
- "pes_demux", // 10
- "es_demux",
- "ts_demux",
-@@ -87,7 +87,7 @@
- };
-
-
--enum { streamtype_, // 0
-+enum { streamtype_mpg_, // 0
- ts2pes_, // 1
- ps2vid_,
- pes2aud_es_,
-@@ -96,7 +96,7 @@
- pes2vid_,
- tspids_,
- pes2ts_,
-- analyze_,
-+ analyze_mpg_,
- pes_demux_, // 10
- es_demux_,
- ts_demux_,
-@@ -123,9 +123,9 @@
- {
- switch(progn) {
-
-- case streamtype_:
-- cerr << "usage: streamtype <filename>" << endl;
-- cerr << "or streamtype < <filename> (or pipe)" << endl;
-+ case streamtype_mpg_:
-+ cerr << "usage: streamtype_mpg <filename>" << endl;
-+ cerr << "or streamtype_mpg < <filename> (or pipe)" << endl;
- break;
-
- case ts2pes_:
-@@ -175,9 +175,9 @@
- cerr << " (or pipe)" << endl;
- break;
-
-- case analyze_:
-- cerr << "usage: analyze <filename>" << endl;
-- cerr << " or analyze < <filename> (or pipe)" << endl;
-+ case analyze_mpg_:
-+ cerr << "usage: analyze_mpg <filename>" << endl;
-+ cerr << " or analyze_mpg < <filename> (or pipe)" << endl;
- break;
-
- case pes_demux_:
-@@ -320,7 +320,7 @@
- }
-
- switch( progn ) {
-- case streamtype_: {
-+ case streamtype_mpg_: {
- char *streams[4] = { "PS_STREAM", "TS_STREAM"
- , "PES_STREAM"};
- char *tv_form[3] = {"DUNNO", "PAL", "NTSC"};
-@@ -426,7 +426,7 @@
- }
- break;
-
-- case analyze_:
-+ case analyze_mpg_:
- if (fd == STDIN_FILENO) {
- analyze(cin);
- } else {
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile.am libdvb-0.5.5.1/dvb-mpegtools/Makefile.am
---- libdvb-0.5.5.1-orig/dvb-mpegtools/Makefile.am 2006-07-24 21:48:22.000000000 +0200
-+++ libdvb-0.5.5.1/dvb-mpegtools/Makefile.am 2006-07-24 22:04:56.000000000 +0200
-@@ -21,8 +21,8 @@
- LIBDVBMPEG = $(top_builddir)/libdvbmpeg/libdvbmpegtools.la
-
- LINKS = \
-- streamtype ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
-- tspids pes2ts analyze pes_demux es_demux ts_demux ts_es_demux \
-+ streamtype_mpg ts2pes ps2vid pes2aud_es pes2aud pes2vid_es pes2vid \
-+ tspids pes2ts analyze_mpg pes_demux es_demux ts_demux ts_es_demux \
- pesplot pes2ts2 pes_repack split_mpg cut_mpg ts2ps ts2es \
- insert_pat_pmt get_http extract_pes extract_pes_payload \
- change_aspect_1_1 change_aspect_4_3 change_aspect_16_9 \
-diff -ru libdvb-0.5.5.1-orig/dvb-mpegtools/README libdvb-0.5.5.1/dvb-mpegtools/README
---- libdvb-0.5.5.1-orig/dvb-mpegtools/README 2006-07-24 21:48:22.000000000 +0200
-+++ libdvb-0.5.5.1/dvb-mpegtools/README 2006-07-24 21:50:03.000000000 +0200
-@@ -21,10 +21,10 @@
- get_http http://mymachine:8090/test.avi | mplayer -
- usage: get_http <URL>
-
--streamtype
-+streamtype_mpg (original name was streamtype, renamed to avoid name collisions)
- tries to recognize the stream type and gives information about the stream.
--usage: streamtype <filename>
--or streamtype < <filename> (or pipe)
-+usage: streamtype_mpg <filename>
-+or streamtype_mpg < <filename> (or pipe)
-
- ts2ps
- ts2pes
-@@ -70,11 +70,11 @@
- usage: pes2ts2 <filename> <audio PID> <video PID>
- or pes2ts2 < <filename> <audio PID> <video PID> (or pipe)
-
--analyze
-+analyze_mpg (original name was analyze, renamed to avoid name collisions)
- gives some information about a PS/PES stream and all the packets
- contained therein.
--usage: analyze <filename>
--or analyze < <filename> (or pipe)
-+usage: analyze_mpg <filename>
-+or analyze_mpg < <filename> (or pipe)
-
- pes_demux
- es_demux
diff --git a/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild b/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
deleted file mode 100644
index 12b5f20a8f6d..000000000000
--- a/media-libs/libdvb/libdvb-0.5.5.1-r3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-inherit eutils autotools
-
-DESCRIPTION="libdvb package with CAM library. libdvbmpegtools, and dvb-mpegtools"
-HOMEPAGE="http://www.metzlerbros.org/dvb/"
-SRC_URI="http://www.metzlerbros.org/dvb/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE="doc"
-
-DEPEND="virtual/linuxtv-dvb-headers"
-
-src_unpack() {
- unpack ${A}
- cd "${S}"
-
- epatch "${FILESDIR}/${P}-autotools.patch"
- epatch "${FILESDIR}/${P}-rename-analyze.patch"
- epatch "${FILESDIR}/${P}-gcc43.patch"
-
- eautoreconf
-}
-
-src_install() {
- #einstall DESTDIR="${D}" || die "Install problem"
- insinto /usr/$(get_libdir)
- make DESTDIR="${D}" PREFIX=/usr LIBDIR=$(get_libdir) install || die "Problem at make install"
-
- cd "${D}"/usr/bin
- mv dia dia_dvb
-
- cd "${S}"
- if use doc; then
- insinto "/usr/share/doc/${PF}/sample_progs"
- doins sample_progs/*
- insinto "/usr/share/doc/${PF}/samplerc"
- doins samplerc/*
- fi
-
- elog "The script called 'dia' has been installed as dia_dvb"
- elog "so that it doesn't overwrite the binary of app-office/dia."
- elog "analyze has been renamed to analyze_mpg."
-
- dodoc README
-}
diff --git a/media-libs/libdvb/metadata.xml b/media-libs/libdvb/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/media-libs/libdvb/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/media-libs/libmatroska/Manifest b/media-libs/libmatroska/Manifest
index 7215b54d96f7..c2277b8f61e8 100644
--- a/media-libs/libmatroska/Manifest
+++ b/media-libs/libmatroska/Manifest
@@ -3,5 +3,5 @@ DIST libmatroska-1.4.7.tar.bz2 619463 BLAKE2B 5cd5adad33e327b07ded8ae042b8e2f898
DIST libmatroska-1.4.8.tar.xz 286284 BLAKE2B 46bec9bbba97d89fe7db63715c2b3d9b648076814b206f6fe2423b09e0b9c6ab130c9cd338442eb810471773c24fe6e32dc6cc044d02bd622789e6e41f36dda1 SHA512 af3b8bfae891be77896b6afa2da3325ebba73a957cd43a4e6086b68e1237bb37b2e6d5eb57322c05ede0ad0c03464087b77fbdf06101314f09411648e1073cee
EBUILD libmatroska-1.4.5.ebuild 694 BLAKE2B bd3cb928ea029955ea64ca953c29df990e9f433f91f0dd08ffce3e12afd5be04256bba6447f73afe681150242a06d750f3c4bc84c51ce64defd3d1e650543d67 SHA512 58d2222582303d3b556071b46e0fc141836ebbc2b16b5d8c7120a6508e9b798b83b755fe8312f786451ba1fb08bcf62cd30453873b39a73f2c4d9ca3b7aeb353
EBUILD libmatroska-1.4.7.ebuild 709 BLAKE2B 0cd3c996b2583541cd0db22420d46beb73aade0e6884ac4dca86341df70387d2e513f331b77c08b49dc7dcbe4f0072647996e4c4012bc40f3a2b3d6cc38a8175 SHA512 c1fd7b67325fd6895676f0391809dc71aa77b2d2b2bbfcc22b454f19ef692ae080ced026e1189d387a454723d6573831a0e9cb3d48691a1690f2235b7f98f5b5
-EBUILD libmatroska-1.4.8.ebuild 704 BLAKE2B 21427ad603e2ca8b71236f8f4ef236d826ba7c656048ab589c50c7fdde9170f54bd7cfc3d58b3ed79f07a8208529097f879684cf640bd5668eb3230f19c5250b SHA512 a88e12754b16666c5a63e231f6430b458b83fa2ef9d34a9b8fe722b6deb28bf8856184998485ad1b7c184db3892c9bc5a8a59ddd060618e41e665dbaf581ebaf
+EBUILD libmatroska-1.4.8.ebuild 703 BLAKE2B 6d29cc42cf921deb17935a6ce0b3d1308b2f49d22f9dfca37757024f0ed6cdffe8d59fe5b71625b1ac01f97f185c37bf1b32a501b1a72c936e18fb83b4bbef2e SHA512 daa8d2c3652a857a794c41b30933fbabb80c5e451bf1eee57589460406cb30551ec0203e97ec107a92dedf801b576a6975f44bd17fd72df83bd8ec7f661ec542
MISC metadata.xml 320 BLAKE2B edd6b2e35a7833d3510edec80f3771a319cbb257cbb203e0f71f33636431496c620cb3307b2bebb44360d6932a7e4376b0d134f3f42d26fc9271423c2eed11f6 SHA512 5c1dad06e1fef24b1ec68fb6b12d0d17b4bd05f22b1953f713c25a513340cb08540eebaec32fbe7c6607ba2142a057b8e6e5743a929b7368665d91bc014f35a9
diff --git a/media-libs/libmatroska/libmatroska-1.4.8.ebuild b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
index 1da3fb754fc6..929bbcf0397e 100644
--- a/media-libs/libmatroska/libmatroska-1.4.8.ebuild
+++ b/media-libs/libmatroska/libmatroska-1.4.8.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dl.matroska.org/downloads/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0/6" # subslot = soname major version
-KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 ia64 ~ppc ~ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-linux"
IUSE="static-libs"
RDEPEND=">=dev-libs/libebml-1.3.4:="
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index f6c533023d42..478fafa4a770 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -3,9 +3,11 @@ DIST mesa-17.1.10.tar.xz 9872168 BLAKE2B 205ece7b016fcc1de5bb72711775cd8f4b90f5d
DIST mesa-17.2.8.tar.xz 10393304 BLAKE2B 558321eefc6d599aaedfe468f03c2f1f99b5c96c253637db00b7da3265ec38e031d15f77623db1f4408f15912c93347e0f5769b01d92329be7f55e45f6f6bf75 SHA512 ce05ad2d3e1b55ffe9c8ef65023a840c04b29014c7876b23182a6a6dd0b768f248ec21bc5b738d21b846f59f4b73501a9fe834d6a87e7dba16c6f821008e0f01
DIST mesa-17.3.3.tar.xz 10637708 BLAKE2B a2cec4abc58eb71c1ec92d073ac3a128e1f993f69b163c9f6e474fef4520fe074d84ca8d972a7822a76226e132230f6e7fac320b940ea3462553d398ef6bcfce SHA512 7ac8ecdcf3b2b43239835bc2c5da7f2730f80a2db945fe00df03d1548920fbc074dd4806ddd345a1ce682fd29d75b2209ef81b6b06e657f9c8ae8622a34a03c1
DIST mesa-18.0.0-rc2.tar.xz 10962300 BLAKE2B 89444a46261d837bd5c7bc54898ebdafe58e863d3532bd80f6592432d2925317fc0ac144dd55862a249d6390efc3955942dc2980ce87e589b9360de61a1f6148 SHA512 aada4caf4c2021bc1e7c071b32ed0ccbbbfe415bc1cb5a80eee3911b1b11a2bd87a10e99c5a152790709488afbdb60e87b4b66c2ca22c0cf89c029fb10c6e8b3
+DIST mesa-18.0.0-rc3.tar.xz 10964880 BLAKE2B 4887e2962b3d1c328734af9effe33cac7fd69c888b3c500d28423c62bae0a26fe58396c8371b1e0861e68a90c03be0029d5a32019efa920f40908b0b054d7c6c SHA512 62e7491cdd5a6651c2bb7c0268685654d5376a68135c1904c684f716805695840c0a16fcff324c75f3ec000bebfa835b3da9a13c479b612da715b171fe68bc0b
EBUILD mesa-17.1.10.ebuild 13439 BLAKE2B bb22c34fa2e7a794ba78ea621e7e3fc6e0aeeb65efe3599f2d5d6024a2e1b21101ac91c5e3a706a7f23c868db662928684be478d1be4c0ee4ed3bb186d981285 SHA512 033085950f8ee3c6390e1f083ed18abfe3c0fb875a8f71fc488857c2fa663e4e10221c0d43d32520928abd2eaa308ee807c67bfe296e050ab90af0d811dbcb9d
EBUILD mesa-17.2.8.ebuild 14999 BLAKE2B 48693ff690c7f7283e5d8412b282265a24100d7e5a05acc2054b5058bad9d1971b3bfd5b4070803eff6c045c8904accc78b68e84958c73528036e42d8a856335 SHA512 c00b4d4ebaeabfbece7727f9605d9a91c691a759247b59d7b719bd576864f69ac6887a92b1bade227e374da19d8c609abe934a979714a7259e21cb60b10abe31
EBUILD mesa-17.3.3.ebuild 14892 BLAKE2B 4b44795597c2e47151553133e75476155fde4c438f384434254027a7d73f2d80de3412ba11edfee83d434814378234875b1f4f884897fce7153baab5ac6c592b SHA512 3246e7864889ffb4d0bb907e3393edc9d718398f0002478e0b5a5cb02aa3a2320c3675b7320053c46b3336d62dcd366d96af85c37d2b8d10539d0adbea66870e
EBUILD mesa-18.0.0_rc2.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
+EBUILD mesa-18.0.0_rc3.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
EBUILD mesa-9999.ebuild 14974 BLAKE2B b829d32a94238ffb139ad6f539f1a56207cc17fca91e3b61446688c760b1f04f1f36cf1419619a6ae9c16fd6e63c3959e47703d69ffc86839cb3cd93ecf48153 SHA512 2f882fd3a2735513e9fe0290c8203ed50955b0e3ac6a3a9b446041c447b1cb0914ce20c661813ce0ec2c04765f86b2b13284b7fc071dc5f65af9aab79e51dd49
MISC metadata.xml 2095 BLAKE2B c1c858a478bbb1c7e38a45dbf00e380a3d26c56920db1897521a7e9f4eb005157e535207ae2274d744e3ce5514a57654eb0effb2cfc773263a0f417874cdc742 SHA512 c3db8aeb4f4ae7ea27c8b48cb26ee9348d84e6fb4b99df815b177e62e78cd980a7834c152e2c10c6fdbe2b91a032861a0c0503625874bfb6df58ccc3bf54e705
diff --git a/media-libs/mesa/mesa-18.0.0_rc3.ebuild b/media-libs/mesa/mesa-18.0.0_rc3.ebuild
new file mode 100644
index 000000000000..e2f425d49acd
--- /dev/null
+++ b/media-libs/mesa/mesa-18.0.0_rc3.ebuild
@@ -0,0 +1,582 @@
+# Copyright 1999-2018 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/ https://mesa.freedesktop.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_vivante )
+ 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.89"
+# 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_DEPSTR="
+ || (
+ sys-devel/llvm:7[${MULTILIB_USEDEP}]
+ sys-devel/llvm:6[${MULTILIB_USEDEP}]
+ sys-devel/llvm:5[${MULTILIB_USEDEP}]
+ sys-devel/llvm:4[${MULTILIB_USEDEP}]
+ >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${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}]
+ vulkan? (
+ $(python_gen_any_dep ">=dev-python/mako-0.7.3[\${PYTHON_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-bellagio)
+ $(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 \
+ --disable-opencl-icd \
+ --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 /usr/share/doc/${P}/patents.txt.bz2 for an"
+ elog "explanation."
+ 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/opencollada/Manifest b/media-libs/opencollada/Manifest
index 6bb37ef9e4bf..296f2aef94b6 100644
--- a/media-libs/opencollada/Manifest
+++ b/media-libs/opencollada/Manifest
@@ -2,14 +2,17 @@ AUX opencollada-0_p864-expat.patch 353 BLAKE2B 6073e228061ec7b7cac27f0fe23325a65
AUX opencollada-1.2.2-libdir.patch 1258 BLAKE2B 4894f06c818311e907afa2ba01a02e6a02493da610bef6351a9fee7fdac47ea5943cb358bdc3966321a1b2abbe438faf5e5e76974149580833b2308ef9330bbd SHA512 28798609b2ca3daef7fe657cd1d086953b6834612d6857696516f805977298fd2f67507d1288bfb3afef57a55828b11370d933e33e3857502c04b56b6fec5481
AUX opencollada-1.2.2-no-undefined.patch 1361 BLAKE2B 6e19994497dcd9ccc9a0ca0c800c7fd010d7fc3f0ed9b5a26dc02694476c212049062608523666a4f0b187c91719a257144711dcbf5efd130e59519717146d0b SHA512 7ca496722fb6c7734dc82c2bba9dff28753f4ecdf361f74bc5cc96c49ab1dacc7accc8e4834e1ecdbc9d7b2a8ccf236f5c606c6a7a670baed2c43cfd0afa8ea3
AUX opencollada-1.2.2-soversion.patch 753 BLAKE2B 9a8d9ae8628834236d36c41aa207bbcc10ef3e7f4f14862657f84d7210d86d6786a61201506ec2da0d80ab7e11d64467aac4dbe257cf150009b68f50cee50d98 SHA512 891b0c63400c65929e72a2e78b331f5b94ef319c3a533b63194f52788bbc8f087a38589442b7a13c606db6188e381d036fb3d9241006fae9298f351012060a2c
+AUX opencollada-1.6.62-cmake-fixes.patch 4823 BLAKE2B 84805e591bb8212e0cfce78fa8c7b6c03684d2d54dc16644b2211768ecdf0868fa77f4836f5a24280f9bd7f0fe47b7715f70f06f48db1c6bf90efb6a23e05632 SHA512 db5c2389aa45d0924371e93b0006052d6a83f1fba2727c86c23093fa2e21194586fcaaec361828343676cf170aea30a5bfefb7126f1f19fb1c966257165743eb
AUX opencollada-build-fixes-v1.patch 3454 BLAKE2B 56f37e81232fea00fb9255e685cd030e32f3421169c5c31d36dd6d33d571de17ea6056d6547c05e639a4f748d60982d519a431ffd8ade131a022c4533d6ad008 SHA512 5c15d67f221400aa08f9542970730230018261af7ddfc5310ee689019f0986e1fa0385c16b58a78ea041a900e51d2e85fd70ebb857fc808499fc0cc69503285b
AUX opencollada-build-fixes-v3.patch 2571 BLAKE2B 013f45412ced572d9fbc29764942d7dac7c2320aa661b567d34e76beaa46d57386898cedcb817458da20146a72d657ae0866acf70034bf3063210d742301be5d SHA512 6c92e1d442543116fee6b0031c0330c497cf69a7bb1efd9bb9dfd6b37a07761ac6e4eca7939514fb7c96774743d215fc0f9ef678e0c3e0fea903773d7666de01
DIST opencollada-1.6.25.tar.gz 11817949 BLAKE2B 84278ae25d64ab827806c6ec588a333a7b0b70bb61c61ebfe98fa837e81e4c8737c8820b8eb555509cf6ea061dcafd1b93693a12169dd44cbe9695593f16331c SHA512 48ede841d43beddbaa153899e2a1eb45d875c468536b276f6b9cb80a84b90b16ca376fb2fbc68a7f25f4908ef94a376c431ed7e94e7c6657afe60464f067a00e
DIST opencollada-1.6.31.tar.gz 11832790 BLAKE2B 297130a8f844f4f80f4394db85098eaeaf42da125f34f20b4b6285c2bd0afc20c7066e3c54f73012c188b5b3c79f43be351fdc3b612b1e5c67ecc0ae19acb0f3 SHA512 6290600bed59fef72c4986a9d00683ae1bfedf6811a44fb9e05e1a46e4ceaee7585c2281918f0a491369e49b01d3dfab0eb38b3e0728f96fe8264a80ca28d8c9
DIST opencollada-1.6.36.tar.gz 12275972 BLAKE2B 3f7afb81767e92d1f6efeaf114caf0fa426d075ccd0fcd9f5c8e3951d7706329c545643cab8d18c05542d26933f3e016f96ca9931554b2929d8f815661917529 SHA512 bcee958d229a6d28043afd6dbe2e8536668ce57b510d2759ef68420aa9ac5b8f82ab5956fbcef7ecc6177ad5f0f20c9a7364a886236e583c85215de86f7066f8
DIST opencollada-1.6.58.tar.gz 12088428 BLAKE2B ef5da3eae1c7f4ffd5abf4f93fd9ae1399d7eb3d470ebf4d3c042562d654b6dbcab3010d64250ff9701bd2b1e310178ab2430ed59b3f774a610619e723786961 SHA512 122b841de28f82408bc6fe9d363894ab8f9033cfed949f8028b7a35445e3361f0df583d8b18f7198eaa9dbf3ad33b52dbe5fe6a7e652494789850effcbbf22c9
+DIST opencollada-1.6.62.tar.gz 12094443 BLAKE2B 6cd0ec893fc212bf3e8f166ad9c51c894dc298a3627e65dd41ece850a5638d91b8839830d5456bf3ba072a0b23f8c01247d8c676cc79d98464cdf0c1b55fd3c5 SHA512 bd39406b9a833409303ef7cd4e93beee0675fa57c267af95a34699348a81650d50ae042dbb1837cd41c72433533a3a9b827a44e9775a5b06c7c4f1a351146574
EBUILD opencollada-1.6.25.ebuild 1691 BLAKE2B d01cdf9536a3d07409fa95b7da589ce5dd4184d6ac23ed3e0ed4bae07afdefb868c5f5c5c3077ffb2fc210f2d7edf9bb23d8df1a499eda25f4e483f04740a655 SHA512 9bb7fc28114378b7691bb45ac6a5d8f4345509c1833f9f20e7cf7437748208133a324e02704f16fb8de97cd60d87bf4239de2f7da0bd98a7ef08324df3de4620
EBUILD opencollada-1.6.31.ebuild 1694 BLAKE2B 9bb917a9cd85160a31016d88dd0da513ef2ce79b741ef1ae38fe73808e28022d7e7009e291a44b5256d9bc37164cf2bcb090a90edce73bac87867f265b0aa472 SHA512 50ebec5252f221d3b54b1e2799ad9ef7ee03f4eee99f3383c26a7c79f0e0aecffeef240776f02ff94f5bd5fa24008cd11569f4bcb3da851a3e55df9dc488a12c
EBUILD opencollada-1.6.36.ebuild 1450 BLAKE2B 936aac1d783a849c9fdf12c119cd1d3ff1eca0f3224be95d8b7cefc40a52106ffd41ea6fd8cbab1070a07f85bca638d9950e9c539a703575cfbf4c0e3436ec67 SHA512 0f4357b0bf777a4a99fb42c12c79a4941c4042f04fdb5125e4267ba999b6b54c356d7a45de39058b55bff1efd101916c5689dd4491bde2c3f5c668cf6382bf0d
EBUILD opencollada-1.6.58.ebuild 1700 BLAKE2B b8bb86142d4cbc23814591037a1003a8332dfb60a9848d77d260276ec29ee8cf3547e635144bcf44e79e19ad245f277f515d8ae7944855da0e9e61730023935a SHA512 16d5478d28ee418899ad076ad97687530b26277bcc6d51028f3fb92365103dc2f2d184cafc399c3c0c6070a67f1d50d87ffa35cda491758c28baf49cc15f4f88
-MISC metadata.xml 619 BLAKE2B 5ed900b5400230826b5fbb833312b656eaae9f0c3a5376091ded5db6d90e3d8e5d12d8336b3d2229fb8b298f4c6cc1db717ce5281c749e5c77043609cf09ece9 SHA512 34b215a39874db328d26e9c03740672f701d6c9398a7cac50de7f42b9f6cc854ee4b04358d4afeab3966839f401189ad329b4376c977b80c94973838e08c0f63
+EBUILD opencollada-1.6.62.ebuild 1565 BLAKE2B bf2b5f041bb828ba4ebfb94b5fd402bb805b9da0d84826f2f67c982dfb6b6084293bf334e405ef51144a568509aa541cd8db7cbca294a6dc18c1150e5c55a958 SHA512 23c2e7b1524a501757082168c02b7f3db25e97fe8226f6aa6830ef5f6d67ac1047b0c6a9b8352b0d5001ce274990d59f8448425df523c3379202a61f4fc855bc
+MISC metadata.xml 502 BLAKE2B e90b34a1114955b06cb241d4b749d2e21e865fb09f25234a8618e23d704abe05b1aec7b3e2845db2c339c901315610f7e2062be08e2bb65ceaa3f0f8b12b0edb SHA512 a3ce2d18f67d4762f6081d523c619cc3e46b0c4a882cbca1d5d90b809f73a80896fb7b1759a2e4aaf20bef958d08a57977840d6452819c4e2966aefe698dca49
diff --git a/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
new file mode 100644
index 000000000000..8fc32784daa7
--- /dev/null
+++ b/media-libs/opencollada/files/opencollada-1.6.62-cmake-fixes.patch
@@ -0,0 +1,122 @@
+From c3ed65c2c60b8744163b3a57cf24469e688536dd Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Sat, 13 Jan 2018 11:54:44 +0000
+Subject: [PATCH] OpenCOLLADA/CMakeLists.txt
+
+Use CMAKE_BUILD_TYPE which can be overrided with custom distro types
+
+Adhere to GNU filesystem layout conventions. Not all distros and OSes
+have directories in the same locations and they define the
+GNUInstallDirs variables, so use those variables. Also, this enables
+multi lib installations.
+
+Define the version variables to enable SONAME versioning on the
+library files in case there is ABI changes in the future.
+---
+ CMakeLists.txt | 58 ++++++++++++++++++++++++++++++++++++----------------------
+ 1 file changed, 36 insertions(+), 22 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 95abbe21..00ad8d6a 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,14 +37,41 @@ cmake_policy(SET CMP0010 NEW)
+ # Input directories must have CMakeLists.txt
+ cmake_policy(SET CMP0014 NEW)
+
+-# avoid having empty buildtype
+-set(CMAKE_BUILD_TYPE_INIT "Release")
+
+-set(CMAKE_CONFIGURATION_TYPES "Debug;Release" CACHE STRING "Only do Release and Debug" FORCE )
+-mark_as_advanced(CMAKE_CONFIGURATION_TYPES)
++# Set Release type for builds where CMAKE_BUILD_TYPE is unset
++# This is usually a good default as this implictly enables
++#
++# CXXFLAGS = -O3 -DNDEBUG
++#
++if( NOT CMAKE_BUILD_TYPE )
++ set( CMAKE_BUILD_TYPE "Release" )
++endif()
+
+ SET(CMAKE_DEBUG_POSTFIX "" CACHE STRING "Add this string to as suffix to Debug libraries, e.g.: xml2_d.lib " )
+
++# Adhere to GNU filesystem layout conventions
++include( GNUInstallDirs )
++
++
++# #-----------------------------------------------------------------------------
++# Initialize project.
++
++project(OPENCOLLADA) # must be after setting cmake_configuration_types
++
++set(EXTERNAL_LIBRARIES ${OPENCOLLADA_SOURCE_DIR}/Externals) # external libraries
++set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
++
++set(OPENCOLLADA_VERSION_MAJOR 1)
++set(OPENCOLLADA_VERSION_MINOR 6)
++set(OPENCOLLADA_VERSION_PATCH 62)
++set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
++
++if(NOT SOVERSION)
++ set(SOVERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}
++ CACHE STRING "Set the SO version in the SO name of the output library")
++endif()
++
++
+ #-----------------------------------------------------------------------------
+ # Macro's
+
+@@ -58,7 +85,7 @@ macro(opencollada_add_lib
+
+ if (USE_STATIC)
+ add_library(${name}_static STATIC ${sources})
+- set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name})
++ set_target_properties(${name}_static PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION})
+ foreach(target_lib ${target_libs})
+ if(TARGET ${target_lib}_static)
+ target_link_libraries(${name}_static ${target_lib}_static)
+@@ -84,7 +111,7 @@ macro(opencollada_add_lib
+ message(${name} " WARNING: Shared library support implemented for UNIX-like OS only")
+ endif ()
+ add_library(${name}_shared SHARED ${sources})
+- set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name})
++ set_target_properties(${name}_shared PROPERTIES OUTPUT_NAME ${name} SOVERSION ${SOVERSION})
+ foreach(target_lib ${target_libs})
+ if(TARGET ${target_lib}_shared)
+ target_link_libraries(${name}_shared ${target_lib}_shared)
+@@ -145,19 +172,6 @@ endmacro()
+ # end copy
+ # --------
+
+-#-----------------------------------------------------------------------------
+-# Initialize project.
+-
+-project(OPENCOLLADA) # must be after setting cmake_configuration_types
+-
+-set(EXTERNAL_LIBRARIES ${OPENCOLLADA_SOURCE_DIR}/Externals) # external libraries
+-set(CMAKE_MODULE_PATH "${EXTERNAL_LIBRARIES}/cmake-modules")
+-
+-set(OPENCOLLADA_VERSION_MAJOR 0)
+-set(OPENCOLLADA_VERSION_MINOR 1)
+-set(OPENCOLLADA_VERSION_PATCH 0)
+-set(OPENCOLLADA_VERSION ${OPENCOLLADA_VERSION_MAJOR}.${OPENCOLLADA_VERSION_MINOR}.${OPENCOLLADA_VERSION_PATCH})
+-
+
+ #-----------------------------------------------------------------------------
+ # Compiler warnings.
+@@ -190,9 +204,9 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CXX_WARNINGS}")
+ #-----------------------------------------------------------------------------
+ # Install vars
+
+-set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_PREFIX}/include/opencollada)
+-set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_PREFIX}/lib/opencollada)
+-set(OPENCOLLADA_INST_CMAKECONFIG ${OPENCOLLADA_INST_LIBRARY}/cmake)
++set(OPENCOLLADA_INST_INCLUDE ${CMAKE_INSTALL_FULL_INCLUDEDIR}/opencollada)
++set(OPENCOLLADA_INST_LIBRARY ${CMAKE_INSTALL_FULL_LIBDIR}/opencollada)
++set(OPENCOLLADA_INST_CMAKECONFIG ${CMAKE_INSTALL_FULL_LIBDIR}/cmake/OpenCOLLADA)
+
+
+ #-----------------------------------------------------------------------------
+--
+2.15.1
+
diff --git a/media-libs/opencollada/metadata.xml b/media-libs/opencollada/metadata.xml
index 38856eeebcd5..74eab2d217a9 100644
--- a/media-libs/opencollada/metadata.xml
+++ b/media-libs/opencollada/metadata.xml
@@ -2,14 +2,10 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer restrict="&gt;=media-libs/opencollada-1.6.18" type="person">
- <email>j.scruggs@gmail.com</email>
+ <email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
<maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
- <maintainer type="project">
<email>office@gentoo.org</email>
<name>Gentoo Office project</name>
</maintainer>
diff --git a/media-libs/opencollada/opencollada-1.6.62.ebuild b/media-libs/opencollada/opencollada-1.6.62.ebuild
new file mode 100644
index 000000000000..4a0d0c352bd3
--- /dev/null
+++ b/media-libs/opencollada/opencollada-1.6.62.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils versionator
+
+DESCRIPTION="Stream based read/write library for COLLADA files"
+HOMEPAGE="http://www.opencollada.org/"
+SRC_URI="https://github.com/KhronosGroup/OpenCOLLADA/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 ~ppc64 x86"
+IUSE="static-libs"
+
+RDEPEND="dev-libs/libpcre
+ dev-libs/zziplib
+ media-libs/lib3ds
+ sys-libs/zlib
+ dev-libs/libxml2"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/OpenCOLLADA-${PV}"
+
+PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
+
+src_prepare() {
+ edos2unix CMakeLists.txt
+
+ cmake-utils_src_prepare
+
+ # Remove bundled depends that have portage equivalents
+ rm -rv Externals/{expat,lib3ds,LibXML,pcre,zziplib} || die
+
+ # Remove unused build systems
+ rm -v Makefile scripts/{unixbuild.sh,vcproj2cmake.rb} || die
+ find "${S}" -name SConscript -delete || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DUSE_SHARED=ON
+ -DUSE_STATIC=$(usex static-libs)
+ -DUSE_LIBXML=ON
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ echo "LDPATH=/usr/$(get_libdir)/opencollada" > "${T}"/99${PN} || die "echo failed"
+ doenvd "${T}"/99${PN}
+
+ dobin "${BUILD_DIR}/bin/DAEValidator"
+ dobin "${BUILD_DIR}/bin/OpenCOLLADAValidator"
+ # Need to be in same directory as above binaries
+ docinto "/usr/bin"
+ dodoc "${BUILD_DIR}/bin/COLLADAPhysX3Schema.xsd"
+ dodoc "${BUILD_DIR}/bin/collada_schema_1_4_1.xsd"
+ dodoc "${BUILD_DIR}/bin/collada_schema_1_5.xsd"
+}
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index 13bb281464c9..3a3b9653faf6 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -14,6 +14,6 @@ EBUILD openexr-1.7.0.ebuild 1181 BLAKE2B 13e1628151f4bdb52e961338990b2fba921fd09
EBUILD openexr-2.0.1-r1.ebuild 1255 BLAKE2B 23d26effb4996d82e843a5811fbbf2e609ba93a5383eb3844e4c53253c9748a915a08df1cfcedfa4393d695e000ec201eb92cd022b9fe9d607f3b78ea993dfdf SHA512 e46119eb545d174f1565746600df038e0028340f59f7670e1c0975a9b7a4c4a266a80970dccba054041b0bad31a98763b8aa5d4b9db32f83e65679e3fb0bab83
EBUILD openexr-2.1.0.ebuild 1256 BLAKE2B 0c8154e2bf910e9d3994c28f9a29f725efc1c677d1a587162e6766d24e6f6ac7d0ab7fd98b46d5ea3103321d12de217678d4de97ab555733af8e99cb1aed97fb SHA512 c5a8158b4ebb432479f7edfb39b41d3742d0bcd3cca4782dac1bfa1b4aaa6191355dc0a4b2a5c643874c19829c2118052ef1841975b6f7c97ee23542dd3063fd
EBUILD openexr-2.2.0-r1.ebuild 1578 BLAKE2B fd0dc90294f80362a6575e445a6510efa7f218566b97869dbc9f12c6187e3b0be0cfb24aebb2460925b40bced9bdb42b058974a9789d4c775494a6257f16cc2f SHA512 830f0c476b53b59bec9e65e0859c1623425a0b3a5bdd5081c1cf62be9f274b452c373e8ed2e7b4d6b92d8a20c9f477bdac9a80f604d3d8866ccdfac3a924849c
-EBUILD openexr-2.2.0-r2.ebuild 1769 BLAKE2B 0717062b5aa63a89d109cf0a2ff6563115d9f0dbd7a7c77479eaf8f1cfeda6410236a94209f2fb891367b3e6ee572cf507318d291a19043dabbc35d8a5767fec SHA512 bb93b487d40490629c7381c26d2d8df8f9b1a10b2bec1e9840b0b0c98a7f2d4f358257e2c8d00f7c78dea7120e140f346174557664f3122ee7b0c5c3ca436c9c
+EBUILD openexr-2.2.0-r2.ebuild 1768 BLAKE2B dc4bd8a5c3fcd9ea265938a59d0b510ad6811571d1856317c98bd702113adedb9e2b27836b0535260acd505177f830ad09711c9d8f42ff7e65c00794ac3fa541 SHA512 e3ccbb2afcd4e67d776036a0db519a89481aa1db4c3b9b0720ebdf81c6c3b47547c9117aef008f9b26fc3ca83722d330739b8eeb3e294d66917ea5d92b70864f
EBUILD openexr-2.2.0.ebuild 1248 BLAKE2B e4926afffcbf1f64891ed5ebdae8d4ab5895ffde3d79e3a29eeef121d8214c4c1528ccaaef62e35830b09bd1f54d1ceafd0b62d3652cff76160d7ce155e26955 SHA512 1af7a2a6c95ddd32b1688495b65954982974fa5cb3c0374ee16d6f89f049191a14a7e79fd6fdbefc8cf25ba67e0450e684015798325f2258982528909ee2ed9d
MISC metadata.xml 303 BLAKE2B 53fb5019bd6fe939d485f1eccb4a140ca9b7ce121b06744d8155842ccb6c5e1378ea39a9ae74c8d519be7b3926bd76040df4b8107137fcc2e25be97431e7a1be SHA512 0ab8d735dd7a8e0dc96b14cfde1ae06969d15cfbad956f4fda60b093660aee38fe98709376eedc9362a26858678d2f28eec795c1accb2560858fd804a11bb7ca
diff --git a/media-libs/openexr/openexr-2.2.0-r2.ebuild b/media-libs/openexr/openexr-2.2.0-r2.ebuild
index 039e62091ea2..4ae6430d82e6 100644
--- a/media-libs/openexr/openexr-2.2.0-r2.ebuild
+++ b/media-libs/openexr/openexr-2.2.0-r2.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
@@ -11,7 +11,7 @@ SRC_URI="http://download.savannah.gnu.org/releases/openexr/${P}.tar.gz"
LICENSE="BSD"
SLOT="0/22" # based on SONAME
-KEYWORDS="~amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="amd64 -arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris"
IUSE="cpu_flags_x86_avx examples static-libs"
RDEPEND="
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index f4d00b9945e0..e339e74bcdba 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -3,4 +3,4 @@ AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbf
AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
EBUILD opensubdiv-3.3.0.ebuild 1657 BLAKE2B 7df1f323931b06d457a78feba70b7e309f8191dfa5eb9a93d0878d3ea362195b3d477296eecf3667490198069b9cafbf40c14c2912db1c171979179e64d6079e SHA512 aad9c619fe5b44ce3d9328a931b6628c0a17c93db9676818fa428697c11eef00b9b6b34e513d5faae60760cf5846cf1d8bc328f209bdf1ce9851a1ea1958f418
-MISC metadata.xml 1233 BLAKE2B b7402765b4d89783d432e03f5f49b814939a3304a3f22b24f2a966739bffba6beaf9d42507a5282f192a83e0934cffd23b1e7034c3ed657c90ca392873cf7edd SHA512 ba8bea121fb2eea03e86799777427771ef869f72fcad9540be276d581d49d7f368f90197fac049c9cac2829bbf2952071dec0afeee6100328a90fc862b96092b
+MISC metadata.xml 1233 BLAKE2B a5508cb0e3c44cdfa63d01b709a47f974eb8a97028cfc0aeee184854623ab41fc7b1419df5a755423bbbc3156175d9a0021b42db198b290cc89fce92944f7cb0 SHA512 b225ff89ab0e2c45bfc68a1932d567b474e8f44573cf2d256445600a5ffa205f210ab63eecd4dcdefa68913babe5c21255dc6f75812f76430b8484c36322797a
diff --git a/media-libs/opensubdiv/metadata.xml b/media-libs/opensubdiv/metadata.xml
index 8a3f73ac7b22..864dbf3fb2b6 100644
--- a/media-libs/opensubdiv/metadata.xml
+++ b/media-libs/opensubdiv/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer restrict="&gt;=media-libs/opensubdiv-3.0.5" type="person">
- <email>j.scruggs@gmail.com</email>
+ <email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
<maintainer restrict="&gt;=media-libs/opensubdiv-3.0.5" type="person">
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index 5db35316f830..83984e58218d 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,4 +1,6 @@
AUX osl-1.8.12-cmake-fixes.patch 14704 BLAKE2B dd7d37ae117c338aa72893a26e59f3046c89d5ddc57c7dfc90225d1e49f5bd4346869db7621e2ec0b7c082650d54987a4f6c1196a169828fa17388ad7a3a32e3 SHA512 14059eb68c520e90ed3217b0480929efa4b1ccfa6860649ca86285856d8f5efd07a563ad01dc8bb46dd42d277708b27a9a9f8833f60960502162df0fc1ee243c
DIST osl-1.8.12.tar.gz 14572814 BLAKE2B edf742b104e723e1e3e56b2fb28b1cd4c81921b04a00b8c0f58cf174105a78881283837b550fb4a67d38f5f0a37327fac7a17310974895ed747e8813e6c8ad7b SHA512 29bb0a23d9e1aa445e87b7080be056f939a1828fa87f001cc1503a8c76d21a5620c69146158d27800db71b1abee71a0c39804d85aea7b5899b0cb7ca1c617b56
+DIST osl-1.9.6.tar.gz 14765052 BLAKE2B c6c82d02d49d263361b5b3ba03fca8f35f16199d7d30bbeb50a6b2ee16efcb06ddddc9ce515f749b38b2428365c27a23bf673e9be64d1453c7a49ab0f0d09002 SHA512 e2eb8487038795630bfb38cfb7a39f0cc6877f83689d1e00327b9d95c4b5270c263546a02dff1511272d1d2f429757e11fa28095f9d16cb170b777b531678961
EBUILD osl-1.8.12.ebuild 1785 BLAKE2B 3e9f514b592c1efc8393ccb49f3972aac28e7ed739e1eadf5b37f3fa78eb73d9eb0ad53090aed2e12038eebbdfd2378f8382c7a5c170e74e4a12683a36ca52ca SHA512 d3ca22e3a8ef7332cb4e9f62c078c4a1a5a77c91a635d183e0a0196d18d0be2e22ca263612b7c6e6f4a45a7eeb74df33657128089143111c408860a2329e26b7
-MISC metadata.xml 872 BLAKE2B 62a7dd02eb26c8784a8ac14469132120ad9e5f99985ceabae37c479e3097867c219e1508080c0f5659f4e9cc9d7964fb1b809fb539f9643b168e66349d7ae0e2 SHA512 549fddfb5428c2ca52bb8470d10ee48ceaa3495c4e55934f6a8a5864886f2e63ae43fbe6f716439897ac3a6bbbb0c9a8770f8243bb7a8bbf953dce030c37df73
+EBUILD osl-1.9.6.ebuild 1748 BLAKE2B e6b99e1822ced26cf8d6e138f46d4c5e038f078e0b697ecd40e6cde3870efa945160af3cf83f675825fe5a878b5e5bd6a7ec8caea79d4961a0da23130d2d652b SHA512 d0ce4444dc300b869a520a7bc50ea1d95a0ac0342684495c0742a62e55a8f0cb9453ad71fa2ca0ba412970d7d0323409ae8eff99862908d80a24977ce3babaa5
+MISC metadata.xml 1081 BLAKE2B eabbb5a86e04eed46ee43e48be4317009c619259c79df95b376d457a07a3ed3557297cad5fbe45f0dd81ce33eee9032c95016b55321295b1c49e63de4f95298e SHA512 e2752051556751cb815a34c39fa5a85898417753d0d933db7a5b14162e26c98e46d7e106bce65f7284cacc1b33e3aa3bf75e9801245dcb2266d51e9ef9c50504
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
index 73ffbf9c1415..b20cc8855738 100644
--- a/media-libs/osl/metadata.xml
+++ b/media-libs/osl/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>j.scruggs@gmail.com</email>
+ <email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
<maintainer type="person">
@@ -19,6 +19,12 @@
lights, displacement, and pattern generation.
</longdescription>
<use>
+ <flag name="cpu_flags_x86_avx512f" restrict="&gt;=media-libs/osl-1.9.0">
+ SIMD Optimization
+ </flag>
+ <flag name="cpu_flags_x86_f16c" restrict="&gt;=media-libs/osl-1.9.0">
+ SIMD Optimization
+ </flag>
<flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
</use>
<upstream>
diff --git a/media-libs/osl/osl-1.9.6.ebuild b/media-libs/osl/osl-1.9.6.ebuild
new file mode 100644
index 000000000000..17accb5fe95e
--- /dev/null
+++ b/media-libs/osl/osl-1.9.6.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit cmake-utils
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+
+MY_PV=${PV//_} # Remove underscore if any.
+[[ "${PV}" = *_rc* ]] && MY_PV=${MY_PV^^} # They use capitals for RC.
+
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+ sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+ avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND=">=media-libs/openexr-2.2.0
+ >=media-libs/openimageio-1.8.0
+ dev-libs/pugixml
+ sys-libs/zlib:=
+ partio? ( media-libs/partio )"
+
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.62
+ sys-devel/clang
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig"
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${MY_PV}"
+
+src_configure() {
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ # LLVM needs CPP11. Do not disable.
+ local mycmakeargs=(
+ -DLLVM_STATIC=ON
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_PARTIO=$(usex partio)
+ -DENABLERTTI=OFF
+ -DSTOP_ON_WARNING=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DINSTALL_DOCS=$(usex doc)
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/partio/Manifest b/media-libs/partio/Manifest
index 75d635a1bbe7..a25353be6474 100644
--- a/media-libs/partio/Manifest
+++ b/media-libs/partio/Manifest
@@ -1,4 +1,4 @@
AUX partio-1.1.0-Rename-partconv.patch 2459 BLAKE2B d811f5174dd2c5e158e7985e8fdea520faeb248249b88c8ebec37dc91f50312ed44d39563142cb3a28fa07ce9b6907824835484881782ceac9b8894978bcb061 SHA512 1965a236f43092c05c940c0f2b33d9c77066ed5fbf3b1753bcf5d9b13c8e5a6e60ef41ba13c9471d1d26d1dc74fead52d0ef1c18f04b1f942345fd1412b0c932
DIST partio-1.1.0_p20170829.tar.gz 275959 BLAKE2B 441c2d0ab9dd91fa52a826d49f7448dc4d5d0a8d6b72bdb58793dd3c97d86739b25e582bdff41160599489a2835ad8e68676012cb70ef8edff062df3205ab209 SHA512 daedb23ae2b89d3f2ef36ef13afc624a663b3fab91c22f9a454439ff3bc194b78a87e37c9133f6948567ab3b183eff960bb51951b0427cff8c1c29099b6578d6
EBUILD partio-1.1.0_p20170829.ebuild 1061 BLAKE2B d6a985afd56f4c564e6d66d38de07a2a794afd0798b8a0212c41a70188c556896111d8c8ea517387d91087b7c322abf4362698df70d2a0ac7f3ea54389663dfe SHA512 92dafb90ef000211544c9ed8e12282814be2a859ab92cc41df78204b3320fec5c0f60b5eca7cb5dd053c6c83aeedfd7d01eaaf7fbcdb09f276fc9775f7b06149
-MISC metadata.xml 640 BLAKE2B 4b9ddd46f310ab9d8ec30fcae2d95816fcfd07842c173530dcef3bd2cc36460e454238147cb2489546f0eddf97cabd9e909e51adce99378cff735dd9a60fbb51 SHA512 a865d1f0ad5b7f95e8a8be112b08de5972e66f49a43ed9904a9f9e6eb9f4b0eb981ea924600426f03562f34d49b1305918d2418485c66084f8dab35e524c40e5
+MISC metadata.xml 640 BLAKE2B 3b2c33cb14c466bd4641cc04781d1de05d01170ccc591b3caae40356f934944c4c969834bad5ccdcf9f5390d203270055863b08feb7321492a27d4d7575aced5 SHA512 7116217ccc87ab80d8cb4ee0ea20089ea1c0a5b4ea9b3f666548b37422c01a8917516a5db565fc55f779bb19613fbfb515cfae0b9f87f010f5034c14d27ed8e0
diff --git a/media-libs/partio/metadata.xml b/media-libs/partio/metadata.xml
index a8653bfa5b18..ac8d8a3f8290 100644
--- a/media-libs/partio/metadata.xml
+++ b/media-libs/partio/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer type="person">
- <email>j.scruggs@gmail.com</email>
+ <email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
<maintainer type="person">
diff --git a/media-libs/ptex/Manifest b/media-libs/ptex/Manifest
index 1928daa45269..7eacd6a9f26e 100644
--- a/media-libs/ptex/Manifest
+++ b/media-libs/ptex/Manifest
@@ -3,4 +3,4 @@ AUX ptex-2.1.28-allow-custom-build-type.patch 1410 BLAKE2B 9d1bd1b41752bc3d8c21f
DIST ptex-2.1.28.tar.gz 305327 BLAKE2B 4a91b08ae326e8ed8d420022c693ea60cb21908380b8c49a7672771686f9dd2ef05151b7d43755bc63ab6624db772c2b53d1ffdcdea9c1dff7627cc3fe0f3b15 SHA512 ddce3c79f14d196e550c1e8a5b371482f88190cd667a2e2aa84601de1639f7cabb8571c1b3a49b48df46ce550d27088a00a67b1403c3bfec2ed73437c3dca3e8
EBUILD ptex-2.1.28-r1.ebuild 576 BLAKE2B 6fbf75a3dece6a2cd57bf7c36f0d63e07e616eb0b156a922237943846ca9b63e7704dc0719a285a13b8d25fd535f71a6a6183b7d9b970e3f03409a031f797698 SHA512 e4de67adc85e04e70c2ea4a471fa263b9c923348825607e38698fad3c54b63dea628e3ad09e726c2e7a97394443ded0e5955d0211604b0bbc992738ade558ac7
EBUILD ptex-2.1.28.ebuild 544 BLAKE2B 60cb8bb36eea64f38f892a91bd270eccfaae2b8f409a319688e491069e7c02739977f95663b7eb4aaadbe368ef069d444902dbf3acb13d4f256c4313a5a0fb51 SHA512 546b82932cdb673e44b6aa7e843e8f96564cb22436e274678c0910d4beda2cd483812cc5a6b4b03bab8c2dcdf028ea3ac62bcffd088bf1f51c8a974e9e58f39e
-MISC metadata.xml 724 BLAKE2B 28615caaa219c3bb9521768b1600a6e3df2782e5ec39374a1e213c370f3972548150be43c3a487f5c3e017ce81b22f4bbea291695a8d2464d7f08e2f4f639d8a SHA512 7831bd58c292891f71606da8adb5f86c8c2af43995bab50815b6536710786809451c37fc70319b66a5217a637bb5dc137abc7cbf67a7c5f9544aa28f264d871c
+MISC metadata.xml 724 BLAKE2B eef5aec875f01dd70593862399d3edf26de9c9ae97848226017ea3e1f3c5834c57b1d59985d2d573196f79446971307751187adfed55c664aabc4908f93629e3 SHA512 c32578491cc729e4ac0b09e3dab84514356e8f3b03da810b6dcf93b293b8c36b86f9d7ab59ff2c6807866667a1097648c4fef118271f40a0f02f873a6275dd70
diff --git a/media-libs/ptex/metadata.xml b/media-libs/ptex/metadata.xml
index dd7f2efea148..51362a39459e 100644
--- a/media-libs/ptex/metadata.xml
+++ b/media-libs/ptex/metadata.xml
@@ -2,7 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<maintainer restrict="&gt;=media-libs/ptex-2.1.10" type="person">
- <email>j.scruggs@gmail.com</email>
+ <email>dracwyrm@gentoo.org</email>
<name>Jonathan Scruggs</name>
</maintainer>
<maintainer restrict="&gt;=media-libs/ptex-2.1.10" type="person">
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 9264e358b124..8f8fcbce4852 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -16,7 +16,7 @@ DIST tiff-3.9.7.tar.gz 1468097 BLAKE2B 303339acf9bb48558695b13fcc2b41acacbbf2ce6
DIST tiff-4.0.8.tar.gz 2065574 BLAKE2B b9ece26d3549836d2cbbce1b90ce724a6eae51adae0abbd6193942ced8be965df63d1aa8e774b83d9ae689e5d08033705ef62b77276b40c34913cd535caa72b9 SHA512 5d010ec4ce37aca733f7ab7db9f432987b0cd21664bd9d99452a146833c40f0d1e7309d1870b0395e947964134d5cfeb1366181e761fe353ad585803ff3d6be6
DIST tiff-4.0.9.tar.gz 2305681 BLAKE2B 3de03408d2974b9f9f5f2444029cc3018ef43beb67e9fd21be68ee400cdcc6deca1247f055d880841a18b92284ce81f112682c8b5f083ddc61e5255d73a7de3f SHA512 04f3d5eefccf9c1a0393659fe27f3dddd31108c401ba0dc587bca152a1c1f6bc844ba41622ff5572da8cc278593eff8c402b44e7af0a0090e91d326c2d79f6cd
EBUILD tiff-3.9.7-r1.ebuild 2072 BLAKE2B 1a1fbd60077b9d98c591041006443f2074d78d86dc6e165b9ca0e8d8b1578ec7b4a610046a1bb3a5860dac17f7dcfc7da142ae7a4f15ea2ca388ded15e4c9d6e SHA512 735b3fc6b18d754463f0b3b7e8c4ce31c9bf66a89bc5f761dcf1a8cdad28e494107784dd1a49a496095e0eec3dfca792bb62632190a95c9cb9e5c4ced03e3336
-EBUILD tiff-4.0.8.ebuild 2619 BLAKE2B ea84c84c765588cd4e148e4f62f3182062532cea1ec5a1460bf0fc0be286df2619b6daabbe999ba9446d4d4e9f16e6d8d8197e6696b6952d3593e9c5a2db48c3 SHA512 c2754d6d0a097319f2b1ac9122e16ec2e0f25ddd434f4158f806631670cfa00a9a5a838cb50fb9336d70e0baa54c6cfabaec9fe7380c65fb0f58e65dc0a39900
+EBUILD tiff-4.0.8.ebuild 2615 BLAKE2B 7cbfe610a0a6120946bcfcbbbbfdcd3de00d3355478900efe4206e95db378d60772f2e553a55719557d087669af653c7b151da93efc0afe0a287bf5d512a1bb3 SHA512 100bda64fb5f70919467585eac5d717d4cf7dfb6059c9a87482c370a3013eb566b73ad01160c0a9b5cab48e6b442182edbbe70d593293ce8984650032981c339
EBUILD tiff-4.0.9-r1.ebuild 2260 BLAKE2B 4bf6af1f52b2990ffe3ec4a6169ee8ac774f3bdb52bdfe46450a6b724b4ca0ac04d4d7f849e390125403e0aa8555465b32ce5a824d8344403688321a6708f2de SHA512 1b47e588d6578cc2d6d3c0b1264f896854f2279ee8f9dd07b377ed4f78d680306eefa3cd462e27e460af18289d8734fa69128b55d5d0352a0199ba93a4377e09
EBUILD tiff-4.0.9.ebuild 2486 BLAKE2B 39a931e22b9cc13b7ca8a863ddfa07e5812a3299465799b0bd156b044edb3154cb94a6d4cfe11cb1a3ff09a99df5d19485fd4f606a0072a898e848b3be0cba90 SHA512 fc596b278c56d07fa5f58a053528f73d4486935a3783d4d1653f0d83bd891697b70a9e0fc3098c419dc34a9f674398299037ea47870eed9d596a98109ff7f4c5
MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/tiff-4.0.8.ebuild b/media-libs/tiff/tiff-4.0.8.ebuild
index 238df3e4c9d5..f184c546851f 100644
--- a/media-libs/tiff/tiff-4.0.8.ebuild
+++ b/media-libs/tiff/tiff-4.0.8.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://download.osgeo.org/libtiff/${P}.tar.gz
LICENSE="libtiff"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test zlib"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/vips/Manifest b/media-libs/vips/Manifest
deleted file mode 100644
index ed6fdb76d604..000000000000
--- a/media-libs/vips/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST vips-7.38.5.tar.gz 3447505 BLAKE2B e0db7357054969618a7bc226a652425ee2cd2b0a4964ed5e575f62c7659796d7ba71439ec2a01efc10f615eb748119edbf66bf23b2b807b54fef49fc469f1efd SHA512 99b3a3efb32a976d17e5ce7d7d79e8bb708c148e981f866a8997a07f641866ba237cd677de9f7cafab30afb182a5bde7cc130368c8ff5d8f413d38801a24ed37
-EBUILD vips-7.38.5-r1.ebuild 1989 BLAKE2B 4b33f697032f3e888234f04dbf76496a225ab98a6c884284cb775dc279a0b1925307b175eb09a3b2ac6a4e7cba88a5b817724a20e4f6488fcc3b7e2f6094ace4 SHA512 ae4e4ceb744a3fb3065b412f32ef97a772ef8ecc4762d0953de5796f0626a6e288f6194f96e3eb4463f8a70ded2cfa428bdaebe7a9810118d68b8f9cc19f0a7d
-MISC metadata.xml 566 BLAKE2B ab76f070f1f02b13cf430c389b015b1c05af226ef4385108dabdafc75c78cee43ff1ec5ef29460bb35388ae145cfc01d5b1d12e4cf064e9c20dbf0d69372fbc1 SHA512 ec9f48afdc5c9dc261e4b6732c80d8fac42f579070bfb26ef1a83e0af90a40914424a7a30b7f3688e6455b2c089ded67fab4093248d378b6a7acb78b3d635d30
diff --git a/media-libs/vips/metadata.xml b/media-libs/vips/metadata.xml
deleted file mode 100644
index c950b991df55..000000000000
--- a/media-libs/vips/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>graphics@gentoo.org</email>
- <name>Gentoo Graphics Project</name>
- </maintainer>
- <use>
- <flag name="fits">Enable support for the FITS image format through <pkg>sci-libs/cfitsio</pkg></flag>
- <flag name='matio'>Enable support for reading images from Matlab files through <pkg>sci-libs/matio</pkg></flag>
- </use>
- <upstream>
- <remote-id type="sourceforge">vips</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/vips/vips-7.38.5-r1.ebuild b/media-libs/vips/vips-7.38.5-r1.ebuild
deleted file mode 100644
index 62f4c8af6f79..000000000000
--- a/media-libs/vips/vips-7.38.5-r1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit eutils versionator python-single-r1
-
-DESCRIPTION="VIPS Image Processing Library"
-SRC_URI="http://www.vips.ecs.soton.ac.uk/supported/$(get_version_component_range 1-2)/${P}.tar.gz"
-HOMEPAGE="http://www.vips.ecs.soton.ac.uk/index.php?title=VIPS"
-
-RESTRICT="mirror"
-LICENSE="LGPL-2.1"
-SLOT="1"
-KEYWORDS="~amd64 ~x86"
-IUSE="cxx debug exif fits fftw imagemagick jpeg lcms matio openexr
- +orc png python static-libs tiff webp"
-
-RDEPEND=">=dev-libs/glib-2.6:2
- dev-libs/libxml2
- sys-libs/zlib
- >=x11-libs/pango-1.8
- fftw? ( sci-libs/fftw:3.0= )
- imagemagick? ( virtual/imagemagick-tools )
- lcms? ( media-libs/lcms )
- matio? ( >=sci-libs/matio-1.3.4 )
- openexr? ( >=media-libs/openexr-1.2.2 )
- exif? ( >=media-libs/libexif-0.6 )
- tiff? ( media-libs/tiff:0= )
- jpeg? ( virtual/jpeg:0= )
- fits? ( sci-libs/cfitsio )
- png? ( >=media-libs/libpng-1.2.9:0= )
- python? ( ${PYTHON_DEPS} )
- webp? ( media-libs/libwebp )
- orc? ( >=dev-lang/orc-0.4.11 )"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_configure() {
- econf \
- $(use_enable debug) \
- $(use_enable cxx) \
- $(use_with fftw) \
- $(use_with lcms) \
- $(use_with openexr OpenEXR) \
- $(use_with matio ) \
- $(use_with exif libexif) \
- $(use_with imagemagick magick) \
- $(use_with png) \
- $(use_with tiff) \
- $(use_with fits cfitsio) \
- $(use_with jpeg) \
- $(use_with orc) \
- $(use_with python) \
- $(use_with webp libwebp) \
- $(use_enable static-libs static)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodoc AUTHORS ChangeLog NEWS THANKS TODO
-
- # 314101
- mv "${ED}"/usr/share/doc/${PN}/* "${ED}"/usr/share/doc/${PF} || die
- rmdir "${ED}"/usr/share/doc/${PN}/ || die
- dosym /usr/share/doc/${PF} /usr/share/doc/${PN}
-
- use python && python_optimize
- prune_libtool_files
-}