summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin66297 -> 66472 bytes
-rw-r--r--media-libs/ffmpegsource/Manifest2
-rw-r--r--media-libs/ffmpegsource/metadata.xml9
-rw-r--r--media-libs/gst-plugins-bad/Manifest2
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild2
-rw-r--r--media-libs/gst-plugins-base/Manifest2
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild2
-rw-r--r--media-libs/gst-plugins-good/Manifest2
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild2
-rw-r--r--media-libs/gst-plugins-ugly/Manifest2
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild2
-rw-r--r--media-libs/gstreamer/Manifest2
-rw-r--r--media-libs/gstreamer/gstreamer-1.12.3.ebuild2
-rw-r--r--media-libs/libextractor/Manifest5
-rw-r--r--media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch125
-rw-r--r--media-libs/libextractor/libextractor-1.6.ebuild116
-rw-r--r--media-libs/libextractor/metadata.xml1
-rw-r--r--media-libs/libtxc_dxtn/Manifest2
-rw-r--r--media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild2
-rw-r--r--media-libs/libvisio/Manifest2
-rw-r--r--media-libs/libvisio/libvisio-0.1.6.ebuild2
-rw-r--r--media-libs/openmoiv/Manifest2
-rw-r--r--media-libs/openmoiv/openmoiv-1.0.3a.ebuild4
-rw-r--r--media-libs/opensubdiv/Manifest8
-rw-r--r--media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch34
-rw-r--r--media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch25
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.1.0.ebuild59
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.1.1.ebuild64
-rw-r--r--media-libs/opensubdiv/opensubdiv-3.3.0.ebuild1
-rw-r--r--media-libs/osl/Manifest4
-rw-r--r--media-libs/osl/files/osl-1.8.12-cmake-fixes.patch332
-rw-r--r--media-libs/osl/metadata.xml27
-rw-r--r--media-libs/osl/osl-1.8.12.ebuild70
-rw-r--r--media-libs/speex/Manifest2
-rw-r--r--media-libs/speex/speex-1.2.0-r1.ebuild2
-rw-r--r--media-libs/speexdsp/Manifest2
-rw-r--r--media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild2
37 files changed, 730 insertions, 194 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index e8818ff9aa4d..aebc4159d7bb 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/ffmpegsource/Manifest b/media-libs/ffmpegsource/Manifest
index 36bfd4e759ed..ab571536aba7 100644
--- a/media-libs/ffmpegsource/Manifest
+++ b/media-libs/ffmpegsource/Manifest
@@ -1,4 +1,4 @@
DIST ffmpegsource-2.23.tar.gz 488940 BLAKE2B 0e565a02606a73ea0b6ee7bce64fcaea825a2beb473127b4d9c768981519e92cf29bd792b1524369fb44344ce63cb0777adb672f6ee1ec5eae35d92ed549748e SHA512 dbbc3c53062f9b66beeea57b57250abbc331807aad9300966ace4ddd3603273c6345e20d105b668cd852442b494e047ade8b8b1d8340c464ca748f6b11a5292c
EBUILD ffmpegsource-2.23.ebuild 940 BLAKE2B 88cf60aeece0ed73f2704f2d2728ad41b1ef2b064e8c581a147112962ca1cb9951d01de736bf75e65d81d9f1dd9ee5002274f3d9f520c5560c93abf3ac06415f SHA512 016aa1092cee9af16e1b4362f960976ffdd63f22bb09f4eafa3cb28e4ffbec797469706c88f404f6f294012951c2d66dde965461f7f8eb08d0ea44da5cd5cdc7
EBUILD ffmpegsource-9999.ebuild 927 BLAKE2B 1d6d0723c92ed3fcd78987cd9edcc6e684449c80e110001d85c2994e77c86a5da1ffba110ef572f9c664bd38bcffec947833175b1779d7dffdbc712ba13a5d4a SHA512 0107b996a1bed26c046a774a61fbf58b7d1a044f6c949f7d7163d02fc62af9e0ba674f435ee2ea350d2781e5ec4aae42d6734d36ae33709907537f2701b7efb0
-MISC metadata.xml 507 BLAKE2B 6ce2ceb8bd9827a50784948705d2ffc4169fdc376db667c3e3297b2fb0ebf3855933893bc0912f8f6acc1622255877330485ad25dcd00da332144f1a97fda1cc SHA512 c3e00526e12e471551692e9d8c5728a0201fc9d71c6f4ecab7a7ce44ccba492a0c89073a47a49f73f6c2569e4d1f92ba0ad586a2c544d4e65ff5caae6b8f6c9d
+MISC metadata.xml 308 BLAKE2B f8a202e4bf52b16aa495c09b7ab1341093f2bceccc0c5316b77897de97c6896720cdfebfe6078e6aa92f38624ad69070cc478c8c40cd55bb57494ddb7eb9b8a5 SHA512 7ba87927b0f446e7b47a677003380bdf9d75ada3dde1aa363f842efedc48bfaa833c5dad62ebb3a678acafd9dfb814f261beabcee6262f4b2fbbd65044951527
diff --git a/media-libs/ffmpegsource/metadata.xml b/media-libs/ffmpegsource/metadata.xml
index 057f0e4daafb..ce8e375ad330 100644
--- a/media-libs/ffmpegsource/metadata.xml
+++ b/media-libs/ffmpegsource/metadata.xml
@@ -1,14 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>itumaykin+gentoo@gmail.com</email>
- <name>Coacher</name>
- </maintainer>
- <maintainer type="project">
- <email>proxy-maint@gentoo.org</email>
- <name>Proxy Maintainers</name>
- </maintainer>
+ <!-- maintainer-needed -->
<slots>
<subslots>libffms2 soname version</subslots>
</slots>
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 8c613bcf6272..f39012c987c3 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-bad-1.10.5.tar.xz 4737820 BLAKE2B e050813b59be50792d290a171e9e0
DIST gst-plugins-bad-1.12.3.tar.xz 4707000 BLAKE2B 1cb82e6f1c20d24a42ed0c7465e4dd8815627b0e716fe9be5d005ddd609c92a08619214a6b15059e7f537dadbc36c34d4c6ebfde1284c6a6029d2edf89bf9fa2 SHA512 6df47381de3a2f4286d047c1e7de2c76dd4312c9806636e2012717282cde0f3e5b2d0ffa910c564c8e122b19363e842b663cce1eda7ae95a05d63d1dbbd52661
EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
EBUILD gst-plugins-bad-1.10.5.ebuild 2696 BLAKE2B 24d2b7e65903744847081897647095c1196ca9adc9bcb8ee19c3d7d7863bc04215151685c7e593b03f14ee9cc96417addc8302a3318b5bb4c662ffda20b5a6a6 SHA512 3702ba22b3747a965155d1d2a51e9d973e582eb80bf1d4a13ccecd0268ae68d2fd7e5246af699ec4292604f648b90053e43b45af57ea282c3779381ce416e7a5
-EBUILD gst-plugins-bad-1.12.3.ebuild 2813 BLAKE2B 909df02f084302f41136a8945346acfb14e673246f71e08fece6c656062a88611a9a1a3beed730ec797d698ed79313a0f50c403bc175c537cda8861216ebb8b6 SHA512 d496615579ea073ea920bb5103e59f4062454b17637bde64ca4ca99bc1fcccabf0dc9df04af7b810ab6f21163e709be963ff6bc2784ee3f40f3658b3cac25312
+EBUILD gst-plugins-bad-1.12.3.ebuild 2812 BLAKE2B f6ea1539d722daf9296ea0c1ce99653f709e36297e0c04ccb1ae45705ae3ee11325036e892aeffedba002632f2379f0c7486cfc92b67fae76b69036ed58b1ac4 SHA512 27e72cde6700f40d738abe14e709072326ca2af3e556b65acd09604b472168f7e705808c8756edc8d14a1992c8091a6065c2500cec6aa9cbbdda137a229a0bc4
MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
index b2922d0024c0..5dd32650676e 100644
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Less plugins for GStreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="LGPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland"
REQUIRED_USE="
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index 80b99e735eca..bade57cd5e50 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -5,5 +5,5 @@ DIST gst-plugins-base-1.10.5.tar.xz 3060092 BLAKE2B 45dfd3a7513559cc482714ad6725
DIST gst-plugins-base-1.12.3.tar.xz 3117364 BLAKE2B c5c16f1b46b10cfc5b9731ea990638238b82eb7f312345fece3826deed20992aff1c5a48e031060dc175b5ab5ad8ee21bb3e1e950fc0681ee4b596e65f5f92fe SHA512 d32f71836e25081b00040709a2184da85489e5af90902a0b27b820a478f5805bde93a04cefaeabf36dde53c16ad12f2816777cc195f1e027f19d1883e088e2b2
EBUILD gst-plugins-base-0.10.36-r2.ebuild 2274 BLAKE2B 58f8930c8694880b5ca270637cf0f46be89e19e30c670fee61e3a04680008e2e80536676ebc91f7fc9250fe14f13a093d6e4156b0af57f4e0eff613c030828d7 SHA512 2455419d70993b01fd436a2954df6c811384338a0d4a2ca3a2c04e83a2602c0d6aefd2bef29d64d7535ee2a767390d5910300f0d2a8351435c360f32c83869f2
EBUILD gst-plugins-base-1.10.5.ebuild 2611 BLAKE2B b230c3e82ac84bfb9a90e89038dd1023978e47d0cb15eb579568e00cb5ada7cd43f35b0ec5734a99f0ad092427eef28419d7515048e82cd67c8eedb99a4dba9e SHA512 1a6117687e38e46e42db0cd1f2324ae0ac34e3420766fcbb5fe568517ad72b22138c91ae35cc969f8e2b6dba62f6d10b9e0af7aa53537f49e7005af4a4a4b365
-EBUILD gst-plugins-base-1.12.3.ebuild 2720 BLAKE2B 9729082acf0fc5785416490d9f5da0a6a170f0045a1b431167228381f040094446a2e3c00bba9824b04a4d0083858981e393d45a4598c4c30391280242507f1a SHA512 667eadaa351cfe3de5e9a08788ef5c487fb65430c32d007a068654f7ba4d223e852477acea056f6eca8fe7289453fead1a6445ed23fab1930171997558d56a85
+EBUILD gst-plugins-base-1.12.3.ebuild 2719 BLAKE2B a94595ce1544795bbf62c3c489255e30d53d404220f0d132ebdfcb19547eb35e6f217c7363a88e875022f3df4ace7f0270f2ad99543ebb962134eed07a1708c7 SHA512 9aef3d6262351f76b623ac6df278980ae8962ff7f35cdd3e6e59f3ec83d3dfdcc4899f38841cf02710fe8e6cf0e8db0aec1d0e77fbe908992dbbc89e057195ae
MISC metadata.xml 397 BLAKE2B 4bb000c5586a8912669b1584356b30d8483b6f15180e7acfdb03d0c4e169c3cc703487a9f1f96867c23ba6b5114903b92bb2b2fda4deb9b979ccf610f8151b8e SHA512 89c4bdb8f7a5da325255b43be4017510c4a5b4a3f8f650dc625b513d0cd2260267f840fc52926fe9ca262d9f3f2c16bcf0aff9c22dd0c8b577e632155910b568
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
index e1b27a618f0e..f001ed06e67f 100644
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="GPL-2+ LGPL-2+"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="alsa +introspection ivorbis +ogg +orc +pango theora +vorbis X"
REQUIRED_USE="
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index e57431591fc7..53e7db9c27e8 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -4,5 +4,5 @@ DIST gst-plugins-good-1.10.5.tar.xz 3425088 BLAKE2B 1e8eab244f8cb4915100c78e7c3a
DIST gst-plugins-good-1.12.3.tar.xz 3487448 BLAKE2B 2c27918f8020c50078b983244e9abc969bbf6338f65e42c2a74abb425f9e48e9cf2f71e89b92eefbcb9a3eff0ce765336b35b648a386214164cfecf66d03c2fd SHA512 8ed96d2b2c8724659cf8163be5246ec30c8a92d70fc6632e207ad258cff5624d6fc03576e6e674011bb88a4825c8ce225545bc7e60cdf66a173d9e1d4bfbbaa4
EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
EBUILD gst-plugins-good-1.10.5.ebuild 1431 BLAKE2B f567f07fff7a6a4cb391b0672cd65a18616c416efc91812cb6fa38b9659a6c4d927127549138ec234dd902329d719c2dda83396396cb8fdb664e4864ec98861e SHA512 1fdf863ad41824673b05df92cd44897769209ef5ec1b2780f5d4dc927e1929989cbffa350e4549e70095d7cdd8c9c54f05cbd9eefad566a597a31f60302d43bf
-EBUILD gst-plugins-good-1.12.3.ebuild 1431 BLAKE2B 8150d3e7b98ec0942b5ab23f3c6c21cf647316404d47c8e43a8b14cfcd52b76b77cb83c6a178175e19dccf32b666c3c5aae7330a45344ceba9078fe25cd80c11 SHA512 3f2b3032064892f535149d28a566c619e0f91213c4c6b1028e3f2b1c25977eb75bd6892981a08024b0ee2495cdeb9ae73e8ba881a0e6441c4acf7b6512371ed2
+EBUILD gst-plugins-good-1.12.3.ebuild 1430 BLAKE2B d8779e22c9fa2e946ffab5b57b3e0e8f1fd6cc5ad99f3973b464b153cb903f26431c8417fdd7698ec9906c381b1a6d8234fa654bdabf8cf8684bac6d9172fe79 SHA512 3f468cfa4b74dd8f98093cb6b9acf9cb46b172e17de538f7689dd7463be13363bdd89509a2bd38867d80692017ea4eae0178885bf2c2e4bbc602dfd5c1775420
MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild
index 3ecae8c66c90..8c087fc54a51 100644
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.12.3.ebuild
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-libs/gst-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index 574a9ad80c3d..8fad74a54f20 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -3,5 +3,5 @@ DIST gst-plugins-ugly-1.10.5.tar.xz 908604 BLAKE2B 1e422579e99ce87efabc8373d2b84
DIST gst-plugins-ugly-1.12.3.tar.xz 903784 BLAKE2B f0a9538f8d3c2500470a721a998d385af3611aaa003e1f0f315747f8df1680529c4c0332c5b4130eadfbcbd57d18b7fa1deb794e07cc9b0d8db22b98e27d9cee SHA512 9ca5769c325df3d2d97ba83d785fab08da5119f6d26c4ac4db72853af143477ea8fb7087464a8614b6e59f384463ac01087ee76cec2af8acd80a4dc15e392e34
EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
EBUILD gst-plugins-ugly-1.10.5.ebuild 964 BLAKE2B 9cae372adc4107015a8188f9cd0eda5acdbee6b9c85e39c1d69c296137b25649ba5d28c2089ef15dab63c65de63d17fc74bd232a8e7114dd1c01e8fd2fc219fa SHA512 c556c4076298ac9bb71aa8401614a04e102825fcf20e65e70b3d620119b5a212f15d46bac2a77e2a46a2ddb4c4ceae03a520d783a69eec9ece05bce21a5f5e6e
-EBUILD gst-plugins-ugly-1.12.3.ebuild 964 BLAKE2B 9901382d5e568e59b61246058458c93697101de422dccbec613c7e683d869f552e7491fcb3296cd755f53665f85ab38c36a6cc5a47675b6f084dd04671cbc50f SHA512 29930a719efbe86d2c7ee4b02dbc3a2918c2893b9cf82f2271070ffb448b52c7a7e7d38b4bd4e69de9e5cd77dd3f4a567daefd6cee9d6868993e4d2a2358e066
+EBUILD gst-plugins-ugly-1.12.3.ebuild 963 BLAKE2B 82203025bcece6b6566b2a29bdb2bcd3fc460ac02b9d3be42cdad13aeb62510d1c3739ff72856bec86c7b7bbd6645b365d9528b5cd68cb35965a687f8ab0bdd9 SHA512 ba2965acd379fa1d93681c93317c09ea8db6c48d482d905955b54b1e4d471ffc45c893066dc7633654c2ab52d7447cd44c3394dd78cd5a596d91e2177a004fa7
MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild
index 9a25e8b13b7c..594e5f911987 100644
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild
+++ b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.12.3.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="Basepack of plugins for gstreamer"
HOMEPAGE="https://gstreamer.freedesktop.org/"
LICENSE="GPL-2"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
IUSE="+orc"
RDEPEND="
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index 421fda96b265..5d5f389f7e52 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -6,5 +6,5 @@ DIST gstreamer-1.10.5.tar.xz 3798304 BLAKE2B 37be838d5cfb7299bc9ba2a475cc8e5f339
DIST gstreamer-1.12.3.tar.xz 3175480 BLAKE2B e42b908b6fef2be5d4a0ad435cab5760a5e73e6f09afa0fd0993dd84d01f956b6437beb367082002e875307970f3b4b3fcb8735f7f69836da0ba76ed186e42db SHA512 fceeeca4314aead7ff358db3474bd6fe1eef70f745a6ba20505da6c0caaea6ea6317246dc66c23edab396ca811a610c52fa930f8f99c701241ae7f15857aa2b0
EBUILD gstreamer-0.10.36-r2.ebuild 3975 BLAKE2B fd2155ec778c09848da944eaaeeef191050fa98be5fe3463cbfe9acf75233e2d1f5571a28c7e0f14891005bcd8678664ed4d0ccb37b6773fe359285e265780f3 SHA512 b3e544ebed44ab38c1fa3dea0dc776abac7920a3674d12ad09b82ace577d5ee2cc367647165da15d227e0a12670248557fb7431eb9b764468feac8040c6f2623
EBUILD gstreamer-1.10.5.ebuild 3473 BLAKE2B 8b97247781482c7a9df93ae277bef38c6f6307f00d6e0dd369e1a6e65b5c60eb16db8d612ef19b5078d96807580646dcd0ec88207c7242d58d4538b82a34b02c SHA512 2d032bb18978ab3266e15928342699b7a36991b59d44c99d9159bcf8b90d296d9b0ffcd9f16926b5c2a9a753c1fedcdf739d478cead723e1cf9ac193401ad91a
-EBUILD gstreamer-1.12.3.ebuild 3310 BLAKE2B 2156aa5724f3c0cdd1fa3f7f694f64c8c491f7b3e33132ec959985e83c8f1e725cc04e0a5130349fd53a373d7c62a13d9cc5442c3d09cee4a3d246e418ef5070 SHA512 11f189288127fb1f4cd56f0251bc337ae2977486d6e2fd6a9817610c9c65658098b379c4b2757a5dc2c5e966cc654b0caef1c43860f67e9bf0b6f2fc823c5704
+EBUILD gstreamer-1.12.3.ebuild 3309 BLAKE2B f2dae365901d455f952bcb9a568a4aafaa46ac2da6e90307108ebc1f28d89adec2e96c3c0aae0811ce20f6dd7559d5cf90e4c8e8022a65c3ac26b06a9ece3997 SHA512 4fd05a9b129e65dff3420defc93b5dd7b3f2573c3c587f410c301732b879e12b904dbaafcab98aa7f8aef0b9cb897488e62fde387d40c199a42929172a9c7119
MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/gstreamer-1.12.3.ebuild b/media-libs/gstreamer/gstreamer-1.12.3.ebuild
index e400651136b5..c7edd553697d 100644
--- a/media-libs/gstreamer/gstreamer-1.12.3.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.12.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://${PN}.freedesktop.org/src/${PN}/${P}.tar.xz"
LICENSE="LGPL-2+"
SLOT="1.0"
-KEYWORDS="alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="+caps +introspection nls +orc test unwind"
RDEPEND="
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 41b189ec6f26..bf538c016334 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,6 +1,9 @@
AUX libextractor-1.3-exiv2-0.26.patch 607 BLAKE2B cebd0507df203a20231d5bb243af9d66dcce20a69e5bac323baae5bbb337f15eea43f1a43d60f7e7e72a4b96396ebbb8267104a1fde069f3e42bc3a54b815b0d SHA512 4f782dc427ad5c54b2bf362acdba84741c07e8e4a3691be80939e008d2727c54c4509b853c070ad9581afbe94ddd0bf65bbb685d74ea4956c5bbbf03820aa431
AUX libextractor-1.3-ffmpeg-2.9.patch 1884 BLAKE2B 35b19375cd40be4da8ee8c3c9aff44d74713f84755a6a320b8b80e0763ad93ab3becf8fb4d5100b8f2e231bc935b43fa0d5955bbf9b5fef628457485d70f649f SHA512 219d155bae9e4d8ab868373309e5642a3ae3dad2d0f5afce689a9ec46d6d2fe57966319e454e86af96b473add7f01b3e55115121dae7a703f10df18f6d85f00b
AUX libextractor-1.3-giflib-5.patch 1139 BLAKE2B 2db6e06c73f4d94170756aeb9854febf9947d7962035c64fc48b3980eae39fd5258fd098462254ac34ace4244f1f7d2d1425a448ff08bce870bcc456fa2c7606 SHA512 4aaed95a427ebcff58433673e5469061a87a1eb11665896660150d863ef52c0c5c657e5ab8a07d4475861f3b53f8772d3b72ecd7401d8f2eb11174b6255e12d7
+AUX libextractor-1.6-CVE-2017-17440.patch 3584 BLAKE2B a50d293c88c95c59d3399a2ca4fee6f6e935bee84d4f7c7a5a85e27f0f1e34edb0713f0e0010491015e0c792de5bbde64c2dc392a01ec3470ecec46ed8691a04 SHA512 defa28c0303028cdb8c2d08d15ff62a56a7548ed57d6b577bc61842e74b69b4da6d82ba48082e89341643db433b7f256423556ab482fd6a61936ecd18637796b
DIST libextractor-1.3.tar.gz 7942021 BLAKE2B 76856cd70b1981b95db55b7070d5e82574e8842f49dc3ee7cfc6f35f71b66f7b8e642b82cbbaa8446488ab29ca39c9792e4153f3cd9624dde731b3daefe2e86f SHA512 38ed47e5e5f50ddf216408f698a104900baa3b03cc8a81a14e63afd30b3e3922acda17363d88d9ba1356ebf70287c8a5152ff6933a36ec1042ca0d832218d45d
+DIST libextractor-1.6.tar.gz 8053454 BLAKE2B cf5e9d5fd1bc09e20495810e5a85280916632eb1c5e5c6c68aaf1cbccb8a5970465d3fd6b313e0cfc7e5c262a815996d7bec563c04b04faf7467ddbe987dfb4c SHA512 1e477450d89cc83030100fc9dc11734f39b1ccd1765f8cf4a4938f32253e2e19a48b5337328605451589865142b2d6bf6d7102198115985a1e0da22fca4bc2a8
EBUILD libextractor-1.3-r1.ebuild 2891 BLAKE2B 3a81d0ea12b6ef517466bd8606e3b79a797ff3c6e74196b46bdc250a186b300e42c41986d660c401fb1dde29eebb671be7223cfc3cc4b431ab4875fdf0c19f4c SHA512 be168b3a46046e3a3186f29523ab82de17e350a77ab4cfb01c70ba4cb89c1fcc13495ad6afbe1e6d6ed43d8c94d4ee9f61f575a2298650f983f76673430e0183
-MISC metadata.xml 520 BLAKE2B 14b3987c0832f725b53b6848b90fc4507ba820dc8cf9d0b286d39d591bbe33a085a545255413d33251436370a04ab9855bedbd4353235995fe96eb91badba704 SHA512 6de14a41b912e26fd01d4e468ae5de4893c054d43ad90891a92aa7dc267498d754607251210f3b6ddd4e7b4e739478494ec827a0717a4ebaa5313e83d7fa17ff
+EBUILD libextractor-1.6.ebuild 2871 BLAKE2B 8e55e69fcc2b2db0f86c4647465cb9db2934f447c63743e1080b916bbb34267dfebc0156dcc298ba3531316af28dc7dd6e8cc5f23f745ff7c5627da114f80949 SHA512 3e22f744bd950817e1a816a020c0439b611ad81b9ea04aa0a48192ad6cb6e92b78aa87c24bc9b53233350d852e237a8e93e64b61f9585e7cfbc800fa24bae618
+MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch b/media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch
new file mode 100644
index 000000000000..1870375664de
--- /dev/null
+++ b/media-libs/libextractor/files/libextractor-1.6-CVE-2017-17440.patch
@@ -0,0 +1,125 @@
+From 7cc63b001ceaf81143795321379c835486d0c92e Mon Sep 17 00:00:00 2001
+From: Christian Grothoff <christian@grothoff.org>
+Date: Wed, 1 Nov 2017 09:07:35 +0100
+Subject: fix misc NULL pointer exceptions
+
+---
+ src/include/extractor.h | 2 +-
+ src/plugins/gif_extractor.c | 16 +++++++++-------
+ src/plugins/it_extractor.c | 6 +++---
+ src/plugins/nsfe_extractor.c | 8 ++++----
+ src/plugins/s3m_extractor.c | 2 +-
+ src/plugins/sid_extractor.c | 24 ++++++++++++------------
+ src/plugins/xm_extractor.c | 8 ++++----
+ 21 files changed, 169 insertions(+), 162 deletions(-)
+
+* asturm: Cleaned up unrelated whitespace and translations changes.
+
+diff --git a/src/include/extractor.h b/src/include/extractor.h
+index 0325dc6..782134b 100644
+--- a/src/include/extractor.h
++++ b/src/include/extractor.h
+@@ -35,7 +35,7 @@ extern "C" {
+ * 0.2.6-1 => 0x00020601
+ * 4.5.2-0 => 0x04050200
+ */
+-#define EXTRACTOR_VERSION 0x01060000
++#define EXTRACTOR_VERSION 0x01060001
+
+ #include <stdio.h>
+
+diff --git a/src/plugins/gif_extractor.c b/src/plugins/gif_extractor.c
+index aae2b82..8ee5807 100644
+@@ -122,6 +122,8 @@ EXTRACTOR_gif_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ if (GIF_OK !=
+ DGifGetExtension (gif_file, &et, &ext))
+ continue;
++ if (NULL == ext)
++ continue;
+ if (COMMENT_EXT_FUNC_CODE == et)
+ {
+ ec->proc (ec->cls,
+--- a/src/plugins/it_extractor.c
++++ b/src/plugins/it_extractor.c
+@@ -70,7 +70,7 @@ EXTRACTOR_it_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ char itversion[8];
+ const struct Header *head;
+
+- if (HEADER_SIZE >
++ if ((ssize_t) HEADER_SIZE >
+ ec->read (ec->cls,
+ &data,
+ HEADER_SIZE))
+--- a/src/plugins/nsfe_extractor.c
++++ b/src/plugins/nsfe_extractor.c
+@@ -175,7 +175,7 @@ info_extract (struct EXTRACTOR_ExtractContext *ec,
+
+ if (size < 8)
+ return 0;
+- if (size >
++ if ((ssize_t) size >
+ ec->read (ec->cls,
+ &data,
+ size))
+@@ -243,7 +243,7 @@ tlbl_extract (struct EXTRACTOR_ExtractContext *ec,
+ void *data;
+ const char *cdata;
+
+- if (size >
++ if ((ssize_t) size >
+ ec->read (ec->cls,
+ &data,
+ size))
+@@ -285,7 +285,7 @@ auth_extract (struct EXTRACTOR_ExtractContext *ec,
+
+ if (left < 1)
+ return 0;
+- if (size >
++ if ((ssize_t) size >
+ ec->read (ec->cls,
+ &data,
+ size))
+@@ -342,7 +342,7 @@ EXTRACTOR_nsfe_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ uint32_t chunksize;
+ int ret;
+
+- if (sizeof (struct header) >
++ if ((ssize_t) sizeof (struct header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (struct header)))
+--- a/src/plugins/s3m_extractor.c
++++ b/src/plugins/s3m_extractor.c
+@@ -80,7 +80,7 @@ EXTRACTOR_s3m_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ struct S3MHeader header;
+ char song_name_NT[29];
+
+- if (sizeof (header) >
++ if ((ssize_t) sizeof (header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (header)))
+--- a/src/plugins/sid_extractor.c
++++ b/src/plugins/sid_extractor.c
+@@ -176,7 +176,7 @@ EXTRACTOR_sid_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ const struct header *head;
+ void *data;
+
+- if (sizeof (struct header) >
++ if ((ssize_t) sizeof (struct header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (struct header)))
+--- a/src/plugins/xm_extractor.c
++++ b/src/plugins/xm_extractor.c
+@@ -70,7 +70,7 @@ EXTRACTOR_xm_extract_method (struct EXTRACTOR_ExtractContext *ec)
+ char xmversion[8];
+ size_t n;
+
+- if (sizeof (struct Header) >
++ if ((ssize_t) sizeof (struct Header) >
+ ec->read (ec->cls,
+ &data,
+ sizeof (struct Header)))
+--
+cgit v1.1
diff --git a/media-libs/libextractor/libextractor-1.6.ebuild b/media-libs/libextractor/libextractor-1.6.ebuild
new file mode 100644
index 000000000000..db1013736cfd
--- /dev/null
+++ b/media-libs/libextractor/libextractor-1.6.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+DESCRIPTION="Library to extract metadata from files of arbitrary type"
+HOMEPAGE="https://www.gnu.org/software/libextractor/"
+SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
+
+RESTRICT="test"
+
+COMMON_DEPEND="
+ app-text/iso-codes
+ dev-libs/glib:2
+ media-gfx/exiv2:=
+ sys-devel/libtool
+ virtual/libiconv
+ virtual/libintl
+ apparmor? ( sys-libs/libapparmor )
+ archive? ( app-arch/libarchive:= )
+ bzip2? ( app-arch/bzip2 )
+ ffmpeg? ( virtual/ffmpeg )
+ flac? (
+ media-libs/flac
+ media-libs/libogg
+ )
+ gif? ( media-libs/giflib:= )
+ gsf? ( gnome-extra/libgsf:= )
+ gstreamer? (
+ media-libs/gstreamer:1.0
+ media-libs/gst-plugins-base:1.0
+ )
+ gtk? ( x11-libs/gtk+:3 )
+ jpeg? ( virtual/jpeg:0 )
+ magic? ( sys-apps/file )
+ midi? ( media-libs/libsmf )
+ mp4? ( media-libs/libmp4v2:0 )
+ mpeg? ( media-libs/libmpeg2 )
+ tidy? ( app-text/htmltidy )
+ tiff? ( media-libs/tiff:0 )
+ vorbis? (
+ media-libs/libogg
+ media-libs/libvorbis
+ )
+ zlib? ( sys-libs/zlib )
+"
+DEPEND="${COMMON_DEPEND}
+ sys-devel/gettext
+ virtual/pkgconfig"
+# test? ( app-forensics/zzuf )
+RDEPEND="${COMMON_DEPEND}
+ !sci-biology/glimmer
+"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2017-17440.patch" )
+
+src_prepare() {
+ default
+
+ # m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
+ sed -i \
+ -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
+ -e 's:tidy/tidy.h:tidy.h:' \
+ -e 's:tidy/tidybuffio.h:buffio.h:' \
+ configure src/plugins/html_extractor.c || die
+
+ if ! use tidy; then
+ sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
+ fi
+}
+
+src_configure() {
+ e_ac_cv() {
+ export ac_cv_"$@"
+ }
+
+ e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
+
+ e_ac_cv header_FLAC_all_h=$(usex flac)
+ e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
+ e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
+
+ e_ac_cv header_sys_apparmor_h=$(usex apparmor)
+ e_ac_cv header_archive_h=$(usex archive)
+ e_ac_cv header_bzlib_h=$(usex bzip2)
+ e_ac_cv header_gif_lib_h=$(usex gif)
+ e_ac_cv header_jpeglib_h=$(usex jpeg)
+ e_ac_cv header_magic_h=$(usex magic)
+ e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
+ e_ac_cv header_tiffio_h=$(usex tiff)
+ e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
+ e_ac_cv header_zlib_h=$(usex zlib)
+ e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
+ e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
+
+ econf \
+ --disable-static \
+ --enable-experimental \
+ --enable-glib \
+ --disable-gsf-gnome \
+ $(use_enable gsf) \
+ $(use_with gstreamer) \
+ $(use_enable ffmpeg)
+}
+
+src_install() {
+ default
+
+ # package provides .pc files
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index 7df945748e38..63d0717ca8c8 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -2,6 +2,7 @@
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
<use>
+ <flag name="apparmor">Enable apparmor support using <pkg>sys-libs/libapparmor</pkg></flag>
<flag name="archive">Enable archive support using <pkg>app-arch/libarchive</pkg></flag>
<flag name="gsf">Enable OLE2 (MS Office) plug-in support using <pkg>gnome-extra/libgsf</pkg></flag>
<flag name="magic">Enable magic support using <pkg>sys-apps/file</pkg></flag>
diff --git a/media-libs/libtxc_dxtn/Manifest b/media-libs/libtxc_dxtn/Manifest
index 72ded0b22ac7..0a4c839e9980 100644
--- a/media-libs/libtxc_dxtn/Manifest
+++ b/media-libs/libtxc_dxtn/Manifest
@@ -1,4 +1,4 @@
DIST libtxc_dxtn-1.0.1.tar.bz2 214038 BLAKE2B a342bda7375dcbd4001adb5469c90a043fa039bc2505c9cf717613054b494fea9054136b25ac80b016c62aec248085a60ab5e71190cd5c2d90941bdda6408d16 SHA512 56714a8c947d9b1f47e3ccb23cff9e4e57bd131907a82968de521d094a000275b3aaeecff28e9184bcc4f3932baa1a8bfbbefbc970fcd034ff953d0617148479
EBUILD libtxc_dxtn-1.0.1-r1.ebuild 888 BLAKE2B 4036b3d209131cb43495b342701142c745d9943ffd008f2a47e9b70bf1a77b3e870768ea98cdba83bcd3d77a9c754f9f3bccaae7d64c4344cac5babd5c2f87f7 SHA512 aa78415fc9c1bc06f8dbda9413dddb1b8d2ba7fc624cdba37e306db49bc87ff3112a06557aead9417f4a26bf9cf37857048165e2a8af6fc5823e341bdc2627a6
-EBUILD libtxc_dxtn-1.0.1-r3.ebuild 963 BLAKE2B 4ddfc0236966c4cc99cfbed1e9ff2e9e82abaec7d1b99f90af92ad0446bba75d8033804b3a8f3c13ed63af9a68550e5eaf55657f9b13ff792c2199b620510d52 SHA512 0dc9d28bdb2d558fc70e4a256c2867a47b14b02a2b53764635ff2d541dae023870e8f27828cbb36cc35f8103ca9fd78d45f854ba63f33d5d4c2a193964090ac8
+EBUILD libtxc_dxtn-1.0.1-r3.ebuild 970 BLAKE2B 7b461ab1cb74f21fb4eda25ba7826b863d34990184bb3168b4492735b1e67327b1d54d90481a702703645b5c9af049b40b5367897627fb19b15742f3f4c4ceba SHA512 343a4d26aeaf14559810f94c929d8407385c70ae5890c94f06d4ff83541d0b906f9c3fc620c5c2671c1fc386d2ddc49912bcab132d2157dca6466a911ea2a66e
MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057
diff --git a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
index 44eb74149d25..e44c81b33584 100644
--- a/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
+++ b/media-libs/libtxc_dxtn/libtxc_dxtn-1.0.1-r3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://people.freedesktop.org/~cbrill/${PN}/${P}.tar.bz2"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
IUSE=""
RDEPEND="media-libs/mesa[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libvisio/Manifest b/media-libs/libvisio/Manifest
index 3f7dbb7ef2be..75db9b11bf66 100644
--- a/media-libs/libvisio/Manifest
+++ b/media-libs/libvisio/Manifest
@@ -4,6 +4,6 @@ AUX libvisio-0.1.5-no-zlib.patch 1420 BLAKE2B 312a1a91c9103e2855bc26f3ec39bb4a4d
DIST libvisio-0.1.5.tar.xz 504196 BLAKE2B d5b02b9724e17e1a5b48eee750f6e1a50f8d0a5e74ac6cfd90ad5ae6ab4bc79d40718486c6164faa192ac0ce26c13d55918ff1c6f3c03a09b61399754c5920d0 SHA512 094ab546f650840d52fc34c1b105eff139d2f6e4d5cab7c9c99f8387ece0d0c6b02ec1376b3281d56a901bac016c2a024bb708c065b8b5d9404104e6494b5fab
DIST libvisio-0.1.6.tar.xz 676396 BLAKE2B dbd96b64a3789e275a47fe59cd939620787937e31ee11b7af7977575c183ade233afdb952d4c2e362312ae400d23726cbd01e3ccb644c9a413abc84ddbe0f161 SHA512 58cee8cfe4205b2cad2f11dbe17882e57ebf0d10500116ca9d8d120e138f8eb0c65a5fea3bd7d2746bf8140377ee9deb34258597e028f9fdc8d21f270606cce1
EBUILD libvisio-0.1.5-r1.ebuild 1283 BLAKE2B c63d91f770d9775ca50de4f2d3f72a5d9d3e3c85d8054d5222c3294d137567db3df0fe7e23b5c895b00793939a897b83a20923c81f6c443cfee7890a115cb325 SHA512 8da42252872dd328c49436ffeafc566b157cef3d5c991e76c8179c7b0025576d73d2265f3db73e087bf7b332e8bc153fa24d54b6b63a3edb8656e884384dbdc0
-EBUILD libvisio-0.1.6.ebuild 1146 BLAKE2B 3c13cdc85db0149721f3669241d536e0b641cf3be42ac1b0578a223ed63b6dbc2de4bad92f587ed95523cd99af54b77e715933f1243e4fec28083aa3834b56d1 SHA512 52d9fd56bc9ab3b37a87ada2b490133ae02932af8bc26c6570a6ca35d40bcd389011059fb24ae9f8f4ee2ec289d65f81fbb1d85d52ac512e6a8f0258edc391b1
+EBUILD libvisio-0.1.6.ebuild 1144 BLAKE2B f783eb3a49c374f1f8bcb4cb57395b20277005793fcf71f267776a2c1df46bc8ff41c05d7a77ce657f7106ca5ece8d4e04666a07e6348ce7ac4b2573e6755bb3 SHA512 77727d74b55b45222e4606e2cfeca39b5a15546994c1038dc38dd2850d035a87484f8c5943114c78d9cd2a5b24da9a45d462e155fcac88aa183d78d531a6a310
EBUILD libvisio-9999.ebuild 1146 BLAKE2B 3c13cdc85db0149721f3669241d536e0b641cf3be42ac1b0578a223ed63b6dbc2de4bad92f587ed95523cd99af54b77e715933f1243e4fec28083aa3834b56d1 SHA512 52d9fd56bc9ab3b37a87ada2b490133ae02932af8bc26c6570a6ca35d40bcd389011059fb24ae9f8f4ee2ec289d65f81fbb1d85d52ac512e6a8f0258edc391b1
MISC metadata.xml 321 BLAKE2B 845e098f8136b178e62b70bb06d8ce26ed7e2b9aec93358180d36cc8de5d4436501fa13521dcc7b4a7f8e311603b25c9d30d23db216008d3d96af5e462611a9a SHA512 a9d2208bf93a05e3406aee66412b46e731ce5a858e3e5e4a6668568b3ccba863d540f3e6224bc7e5ed8c6ad22d330fc0e30ecc90df2f8a866280bb138040fc12
diff --git a/media-libs/libvisio/libvisio-0.1.6.ebuild b/media-libs/libvisio/libvisio-0.1.6.ebuild
index 79aa9cdc0188..86720bd728b0 100644
--- a/media-libs/libvisio/libvisio-0.1.6.ebuild
+++ b/media-libs/libvisio/libvisio-0.1.6.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libvisio"
LICENSE="|| ( GPL-2+ LGPL-2.1 MPL-1.1 )"
SLOT="0"
[[ ${PV} == 9999 ]] || \
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ppc ppc64 ~x86"
IUSE="doc static-libs test tools"
RDEPEND="
diff --git a/media-libs/openmoiv/Manifest b/media-libs/openmoiv/Manifest
index ae4e1310beb3..7d6400127428 100644
--- a/media-libs/openmoiv/Manifest
+++ b/media-libs/openmoiv/Manifest
@@ -1,3 +1,3 @@
DIST OpenMOIV.src.1.0.3a.tar.bz2 327168 BLAKE2B d713a597d1b13de80bca52541ead2a4701c52dac0f501ee2f9e8020fbe26120c1580dd09ccf5281df4f90ada40fdbae07535f0c87b67934a9458a75853e1c11a SHA512 428b151101f257e8a86b94dae9a2eb88bf0232dca613a95ea2d304985a46955a36dd00e1b709db793bbf856dd59c031b3d21fd5142f07f655f85d95a5a530c47
-EBUILD openmoiv-1.0.3a.ebuild 843 BLAKE2B 270c3c33d3cf32686e8fb0f753fedbf76e72e1e8116b7d6477b63f90556442d3869298a22bc60827ab8a57218ede2773eb0a7055d7754f3d734f45c5d70f27ec SHA512 80b6260059886f8745641164d9cb05f130084b360fd82ac4395cd0867f4eeb3208b84f1a66d0a47d6ae85c6185090a4a88b21ca3b153cadcdb29cf40ffab7476
+EBUILD openmoiv-1.0.3a.ebuild 865 BLAKE2B c0991e27a906e05971a046f9c0af00c780c7de0d4ca900f25cd9b358fb630b918836a44125890facd41c719bcdde378bd1e896969bf3d7e056c33b9473b8e1e4 SHA512 f5e95d610d254effd722b4a0bb77307e90dfeefcd5d140f1803d6658e82c342ef950fec2d47f000fe831744ef61f9ffcd85ceb29947280218e20e988f9dea79e
MISC metadata.xml 368 BLAKE2B 3a5b104241b195d377cbad2120137231cd61fbd1c7a7bcb69d1cf5128ec40502852afd4a9f7604a55f90800d8c5b727455fcc42d476648bcb7d370b95584dd72 SHA512 431276fad5a93e8c42af9e9387a5004afce41c9fe4988f5ce07600c89e63449f52d314519f7e309dd9b19b0b0c46dbdbb69194a5cc0886852e06c84f556cd3dd
diff --git a/media-libs/openmoiv/openmoiv-1.0.3a.ebuild b/media-libs/openmoiv/openmoiv-1.0.3a.ebuild
index 7bf763c6cd8f..3e747e2cbb4f 100644
--- a/media-libs/openmoiv/openmoiv-1.0.3a.ebuild
+++ b/media-libs/openmoiv/openmoiv-1.0.3a.ebuild
@@ -19,14 +19,14 @@ DEPEND="${RDEPEND}"
S="${WORKDIR}/OpenMOIV.src.${PV/a//}"
src_prepare() {
- default
+ cmake-utils_src_prepare
sed \
-e 's:$ENV{OIV_DIR}/include:/usr/include/coin:g' \
-i CMakeLists.txt || die
}
src_configure() {
- mycmakeargs=(
+ local mycmakeargs=(
-Dshared:int=1
-Dcoin:int=1
-Dsys_fonts:int=1
diff --git a/media-libs/opensubdiv/Manifest b/media-libs/opensubdiv/Manifest
index 202e3450f554..f4d00b9945e0 100644
--- a/media-libs/opensubdiv/Manifest
+++ b/media-libs/opensubdiv/Manifest
@@ -1,10 +1,6 @@
-AUX opensubdiv-3.1.0-skip-osd-regression.patch 1104 BLAKE2B cee6c6541ab125bee6c3e98e7322eb5b672fc564bb247146d785b2888948728da585b542d7381e674011e7f59a88aae12c85fcad11bf194400c92084cf17a217 SHA512 8e6ec60e10209b39ad9ebb66c4c43496250bf93a0fdfc4bebb502dd71fb3ada2b685521d94fb05eab3a09f5ced9c288292a338bb7e0159c940dd379ff05f873b
+AUX opensubdiv-3.3.0-add-CUDA9-compatibility.patch 897 BLAKE2B 528eaabdbe1613e6fde30f3e0688c64d796c599a7c9efa49575b817de559938344326b8606f9c9ed013a97c46037a49805ee1d1c27fa9beb78b3d9153771e119 SHA512 0a4c20dff82f6500019f45ef88539a32fb7e5b885d48c7108f05d6c018890518cd735e20a020cf058d47cf68e19f74e14e8496c5facabfa90e9401478d315ffa
AUX opensubdiv-3.3.0-fix-quotes.patch 432 BLAKE2B e2b80762392cfe6b9ddb714780adbfffed3eb05feb5072c4b1856164eb01896eb9298723aac4bc032e0aaba8ec55d84bb1dfa6664f1def32af2bd93b553c396b SHA512 89eca174bf991920f71fd278e61f04bb90d143491ec05575507013215c92bca18f0274b6084d61750a66f877d928f01f0e779d08dd3b2372d8119aecaa8b58a9
AUX opensubdiv-3.3.0-use-gnuinstalldirs.patch 1133 BLAKE2B f762b52e23c60c2dded82948be891654923adae6a2e4f870857e357478f92cb9a239c282f0d09f75f6f2a58682c50d8f437989859710668071b46b1cde499424 SHA512 4f463fbea3e94e93711888a077faa375054aae193abfbe4c600081fae43efa4adf5dc5687ceb7c59795c20ae97ec158ce4035e72dfdb0c89ee5943e41e58bdef
-DIST opensubdiv-3.1.0.tar.gz 18014579 BLAKE2B 88f16e81eda8c1626b161f94160d02cda7027dff1ac9c795dfe9694250e707dfa106e564dfa22a18bfd3f5e355337626349b6a162c999c10c4d8c8695d03b925 SHA512 9b59cb4e5b124e222b67a48986251cff91bcdc2aee9f71c4b653ad7bb089e860c5954c251a91c0004fa5c28fc4524a0dcbf51d3ae51ea86ee7665ba05d8ec97f
-DIST opensubdiv-3.1.1.tar.gz 18014871 BLAKE2B 5f3a8a7cfb3f2c4cebb8dab1ea65dde1ac3ef6f42a9603e0fa8c89b2ecdd0f16809510b7b03f6a4c3b0fe522e7b07536a09ab476720d44cc7e4289ba1931beb8 SHA512 700db7e1dde3e916011721a5b42d5e32ea4ae355ab5e3e415541d62efa2059d56d5f30cef853285e95a93f3a3b5fe24a906547a52cce94d47b101ae20021d5b5
DIST opensubdiv-3.3.0.tar.gz 19263469 BLAKE2B f169b5c58877d1dd4ea45cb04d52567803da7c2d11edab072e2b65583109c7c2d52abe07f5bd2b03cba215cdb524a0468900419d8381e95c35eb2f3f4bebe02b SHA512 7c17d847187d46182d08fbee9396fd8793ac04591821084d40da475c9d25560d01575282946e1a30252bba12db9ea06cbf50ff649f91adce72f6127ad6a36418
-EBUILD opensubdiv-3.1.0.ebuild 1420 BLAKE2B e93b376a5020ec8003454e327ea88171e372a716a49d732386697f959a9e6cf43d88f740517fc438a21e1465b95035680fd193055d4377825252956738d649c1 SHA512 c6312bb22d85c640ee743989c909a7e633f7a842c8e4ff48e81da08f013402f8db81621419035f3a708a9058af5f5e79b2a2dbf584242dba7c262170989611b2
-EBUILD opensubdiv-3.1.1.ebuild 1504 BLAKE2B 1fae9b504bc3e9cc32b2416e86aaba0136bb95929ac8d1f24fb38931a6a8307f425c2cd30da5bd972460fbca3e4ab144619618067110c23f53841bb646a8fdc1 SHA512 1a06bcf9d20f0225e116acaa91ceea96cbc36920cc506e13096e2f6fa983f708cfef598daa956556bb565ed0eeac5e108a7d1cb4464d4b02023faac9b95e384a
-EBUILD opensubdiv-3.3.0.ebuild 1607 BLAKE2B 66eb6116962dcf5da7b315e9e5939c429a3cd67a78a535ba86d7298445a1b258af094eb287df3a2bb460ac65e9f218aa184c0b5abc62af999e178774533281b3 SHA512 5f994b831f8ffb4dac17516b665b6ecdeb200c9166020f16594b7afcf901325974fb3609afff00db090a6c9d73256439fb707148a9a9745cb7dd862f027d106b
+EBUILD opensubdiv-3.3.0.ebuild 1657 BLAKE2B 7df1f323931b06d457a78feba70b7e309f8191dfa5eb9a93d0878d3ea362195b3d477296eecf3667490198069b9cafbf40c14c2912db1c171979179e64d6079e SHA512 aad9c619fe5b44ce3d9328a931b6628c0a17c93db9676818fa428697c11eef00b9b6b34e513d5faae60760cf5846cf1d8bc328f209bdf1ce9851a1ea1958f418
MISC metadata.xml 1233 BLAKE2B b7402765b4d89783d432e03f5f49b814939a3304a3f22b24f2a966739bffba6beaf9d42507a5282f192a83e0934cffd23b1e7034c3ed657c90ca392873cf7edd SHA512 ba8bea121fb2eea03e86799777427771ef869f72fcad9540be276d581d49d7f368f90197fac049c9cac2829bbf2952071dec0afeee6100328a90fc862b96092b
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch b/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
deleted file mode 100644
index 2ebb638e3838..000000000000
--- a/media-libs/opensubdiv/files/opensubdiv-3.1.0-skip-osd-regression.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff -purN a/regression/CMakeLists.txt b/regression/CMakeLists.txt
---- a/regression/CMakeLists.txt 2016-03-25 22:15:29.000000000 +0000
-+++ b/regression/CMakeLists.txt 2016-06-05 14:09:19.202849569 +0100
-@@ -32,30 +32,4 @@ if (NOT NO_REGRESSION)
-
- add_subdirectory(far_perf)
-
-- if(OPENGL_FOUND AND (GLEW_FOUND OR APPLE) AND GLFW_FOUND)
-- add_subdirectory(osd_regression)
-- else()
-- set(MISSING "")
--
-- if (NOT OPENGL_FOUND)
-- list(APPEND MISSING OpenGL)
-- endif()
--
-- if (NOT GLEW_FOUND)
-- list(APPEND MISSING glew)
-- endif()
--
-- if (NOT GLFW_FOUND)
-- list(APPEND MISSING glfw)
-- endif()
--
-- message(WARNING
-- "The following libraries could not be found : ${MISSING}. "
-- "The osd regression test will not be available. "
-- "If you have these libraries installed, please specify their "
-- "path to cmake (through the GLEW_LOCATION and GLFW_LOCATION "
-- "command line arguments or environment variables)."
-- )
-- endif()
--
- endif()
diff --git a/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
new file mode 100644
index 000000000000..9fe81c4ee199
--- /dev/null
+++ b/media-libs/opensubdiv/files/opensubdiv-3.3.0-add-CUDA9-compatibility.patch
@@ -0,0 +1,25 @@
+From 7b9157bca7138480c387ef3d5b69b6cf1eb498e5 Mon Sep 17 00:00:00 2001
+From: "Daniel M. Weeks" <dan@danweeks.net>
+Date: Fri, 15 Dec 2017 22:45:55 -0500
+Subject: [PATCH] CUDA 9 compatible gpu-architecture default
+
+---
+ CMakeLists.txt | 4 +++-
+ 1 file changed, 3 insertions(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4f3cd9d4..fa438b46 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -513,8 +513,10 @@ if(CUDA_FOUND)
+ if (NOT DEFINED OSD_CUDA_NVCC_FLAGS)
+ if (CUDA_VERSION_MAJOR LESS 6)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_11 )
+- else()
++ elseif (CUDA_VERSION_MAJOR LESS 9)
+ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_20 )
++ else()
++ set( OSD_CUDA_NVCC_FLAGS --gpu-architecture compute_30 )
+ endif()
+ endif()
+ endif()
diff --git a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
deleted file mode 100644
index aa63d90eeda4..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.1.0.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs versionator
-
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
-
-MY_PV="$(replace_all_version_separators '_')"
-
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="cuda doc opencl openmp ptex tbb test"
-
-RDEPEND="media-libs/glew:=
- media-libs/glfw:=
- cuda? ( dev-util/nvidia-cuda-toolkit:* )
- ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
- tbb? ( dev-cpp/tbb )
- doc? ( dev-python/docutils app-doc/doxygen )"
-
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"/OpenSubdiv-${MY_PV}
-
-PATCHES=( "${FILESDIR}"/${P}-skip-osd-regression.patch )
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_configure() {
- local mycmakeargs=(
- -DNO_MAYA=1
- -DNO_CLEW=1
- -DNO_DOC=$(usex !doc)
- -DNO_TBB=$(usex !tbb)
- -DNO_PTEX=$(usex !ptex)
- -DNO_OMP=$(usex !openmp)
- -DNO_OPENCL=$(usex !opencl)
- -DNO_CUDA=$(usex !cuda)
- -DNO_REGRESSION=$(usex !test)
- -DNO_EXAMPLES=1 # broken
- -DNO_TUTORIALS=1 # broken
- -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
- -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild b/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
deleted file mode 100644
index 5c1768b6b37c..000000000000
--- a/media-libs/opensubdiv/opensubdiv-3.1.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils toolchain-funcs versionator
-
-DESCRIPTION="An Open-Source subdivision surface library"
-HOMEPAGE="http://graphics.pixar.com/opensubdiv/"
-
-MY_PV="$(replace_all_version_separators '_')"
-
-SRC_URI="https://github.com/PixarAnimationStudios/OpenSubdiv/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="ZLIB"
-SLOT="0"
-IUSE="cuda doc opencl openmp ptex tbb"
-
-RDEPEND="media-libs/glew:=
- media-libs/glfw:=
- cuda? ( dev-util/nvidia-cuda-toolkit:* )
- ptex? ( media-libs/ptex )"
-
-DEPEND="${RDEPEND}
- tbb? ( dev-cpp/tbb )
- doc? ( dev-python/docutils app-doc/doxygen )"
-
-KEYWORDS="~amd64 ~x86"
-
-S="${WORKDIR}"/OpenSubdiv-${MY_PV}
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- sed -e 's|"${OSD_SONAME}"|${OSD_SONAME}|' \
- -i CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DNO_MAYA=1
- -DNO_CLEW=1
- -DNO_DOC=$(usex !doc)
- -DNO_TBB=$(usex !tbb)
- -DNO_PTEX=$(usex !ptex)
- -DNO_OMP=$(usex !openmp)
- -DNO_OPENCL=$(usex !opencl)
- -DNO_CUDA=$(usex !cuda)
- -DNO_REGRESSION=1 # The don't work with certain settings
- -DNO_EXAMPLES=1 # Broken
- -DNO_TUTORIALS=1 # Broken
- -DGLEW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
- -DGLFW_LOCATION="${EPREFIX}/usr/$(get_libdir)"
- )
-
- cmake-utils_src_configure
-}
diff --git a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
index 1c1abebee365..f34298cd5960 100644
--- a/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
+++ b/media-libs/opensubdiv/opensubdiv-3.3.0.ebuild
@@ -32,6 +32,7 @@ S="${WORKDIR}/OpenSubdiv-${MY_PV}"
PATCHES=(
"${FILESDIR}/${P}-fix-quotes.patch"
"${FILESDIR}/${P}-use-gnuinstalldirs.patch"
+ "${FILESDIR}/${P}-add-CUDA9-compatibility.patch"
)
pkg_pretend() {
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
new file mode 100644
index 000000000000..1b2d6b4d4a40
--- /dev/null
+++ b/media-libs/osl/Manifest
@@ -0,0 +1,4 @@
+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
+EBUILD osl-1.8.12.ebuild 1791 BLAKE2B bf0aec35ff9f0b9007795cfd45f5b75aada87a3ca1a98b3cba6f7f457d42ce884c542e7814da1ffdfa31ed381879ccb9c39b42ec4a50ca6adb0725b1db6aca80 SHA512 bb70c8957567653bf9ae2f8ea7beaba631c55e94695a6e60e21f5b30520c2bc437ad966e9c596981a5ca4be6d89e378a14cb65ff2e52154a14827922bdcb3d80
+MISC metadata.xml 872 BLAKE2B 62a7dd02eb26c8784a8ac14469132120ad9e5f99985ceabae37c479e3097867c219e1508080c0f5659f4e9cc9d7964fb1b809fb539f9643b168e66349d7ae0e2 SHA512 549fddfb5428c2ca52bb8470d10ee48ceaa3495c4e55934f6a8a5864886f2e63ae43fbe6f716439897ac3a6bbbb0c9a8770f8243bb7a8bbf953dce030c37df73
diff --git a/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch b/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
new file mode 100644
index 000000000000..6ad5d94ac93a
--- /dev/null
+++ b/media-libs/osl/files/osl-1.8.12-cmake-fixes.patch
@@ -0,0 +1,332 @@
+From cb34603cce0a8814dc66f76ecc5ceeb04a8d3791 Mon Sep 17 00:00:00 2001
+From: Jonathan Scruggs <j.scruggs@gmail.com>
+Date: Fri, 18 Aug 2017 13:37:54 +0100
+Subject: [PATCH] OpenShadingLanguage/RB-1.8: Change to GNUInstallDirs for
+ install paths
+
+The variables: BIN_INSTALL_DIR, LIB_INSTALL_DIR, INCLUDE_INSTALL_DIR,
+DOC_INSTALL_DIR, and MAN_INSTALL_DIR are defined but never used.
+Instead, hard coded paths to lib, include, and bin were used. This
+will cause difficulty on multi-lib systems or in cases where they
+are named differently. The existing variables were replaced by the
+GNUInstallDirs variables, which is compatible on all systems.
+
+The macro install_targets was defined, but never used in code,
+so all library installs were changed to use it.
+Thus all library installs now use GNUInstallDirs.
+
+INSTALL_DOCS variable is defined, so it's now controlling if
+the documentation is being installed.
+
+Signed-off by: Jonathan Scruggs <j.scruggs@gmail.com>
+---
+ CMakeLists.txt | 66 +++++++++---------------------------------
+ src/cmake/util_macros.cmake | 6 ++--
+ src/doc/CMakeLists.txt | 6 ++--
+ src/include/CMakeLists.txt | 2 +-
+ src/liboslcomp/CMakeLists.txt | 2 +-
+ src/liboslexec/CMakeLists.txt | 2 +-
+ src/liboslnoise/CMakeLists.txt | 2 +-
+ src/liboslquery/CMakeLists.txt | 2 +-
+ src/osl.imageio/CMakeLists.txt | 19 +-----------
+ src/oslc/CMakeLists.txt | 2 +-
+ src/oslinfo/CMakeLists.txt | 2 +-
+ src/testrender/CMakeLists.txt | 2 +-
+ src/testshade/CMakeLists.txt | 6 ++--
+ 13 files changed, 32 insertions(+), 87 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 305047c0..da4635ab 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -248,6 +248,8 @@ set (OSL_BUILD_PLUGINS ON CACHE BOOL "Bool OSL plugins, for example OIIO plugin"
+ set (USE_CCACHE ON CACHE BOOL "Use ccache if found")
+ set (CODECOV OFF CACHE BOOL "Build code coverage tests")
+ option (USE_BOOST_WAVE "Use Boost Wave for C preprocessor (alternative is to use clang)" OFF)
++set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
++set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+
+ # Use ccache if found
+ find_program (CCACHE_FOUND ccache)
+@@ -349,6 +351,14 @@ if (OSL_NAMESPACE)
+ endif ()
+ message(STATUS "Setting Namespace to: ${OSL_NAMESPACE}")
+
++include (GNUInstallDirs)
++
++message (STATUS "CMAKE_INSTALL_PREFIX is ${CMAKE_INSTALL_PREFIX}")
++message (STATUS "CMAKE_INSTALL_LIBDIR is ${CMAKE_INSTALL_LIBDIR}")
++message (STATUS "CMAKE_INSTALL_BINDIR is ${CMAKE_INSTALL_BINDIR}")
++message (STATUS "CMAKE_INSTALL_DOCDIR is ${CMAKE_INSTALL_DOCDIR}")
++message (STATUS "CMAKE_INSTALL_INCLUDEDIR is ${CMAKE_INSTALL_INCLUDEDIR}")
++
+ set (CMAKE_MODULE_PATH
+ "${PROJECT_SOURCE_DIR}/src/cmake/modules"
+ "${PROJECT_SOURCE_DIR}/src/cmake")
+@@ -363,58 +373,6 @@ include_directories (
+ )
+
+
+-###########################################################################
+-# Paths for install tree customization. Note that relative paths are relative
+-# to CMAKE_INSTALL_PREFIX.
+-set (DEFAULT_BIN_INSTALL_DIR "bin")
+-set (DEFAULT_LIB_INSTALL_DIR "lib")
+-set (DEFAULT_INCLUDE_INSTALL_DIR "include/OSL")
+-if (UNIX AND NOT SELF_CONTAINED_INSTALL_TREE)
+- # Try to be well-behaved and install into reasonable places according to
+- # the "standard" unix directory heirarchy
+- # TODO: Figure out how to get the correct python directory
+- set (DEFAULT_PYLIB_INSTALL_DIR "lib/python/site-packages")
+- set (DEFAULT_PYLIB3_INSTALL_DIR "lib/python3/site-packages")
+- set (DEFAULT_DOC_INSTALL_DIR "share/doc/OSL")
+- set (DEFAULT_MAN_INSTALL_DIR "share/man/man1")
+-else ()
+- # Here is the "self-contained install tree" case: the expectation here is
+- # that everything OSL related will go into its own directory, not into
+- # some standard system heirarchy.
+- set (DEFAULT_PYLIB_INSTALL_DIR "python")
+- set (DEFAULT_PYLIB3_INSTALL_DIR "python3")
+- set (DEFAULT_DOC_INSTALL_DIR "doc")
+- set (DEFAULT_MAN_INSTALL_DIR "doc/man")
+-endif ()
+-if (EXEC_INSTALL_PREFIX)
+- # Tack on an extra prefix to support multi-arch builds.
+- set (DEFAULT_BIN_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_BIN_INSTALL_DIR}")
+- set (DEFAULT_LIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_LIB_INSTALL_DIR}")
+- set (DEFAULT_PYLIB_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB_INSTALL_DIR}")
+- set (DEFAULT_PYLIB3_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/${DEFAULT_PYLIB3_INSTALL_DIR}")
+-endif ()
+-# Set up cmake cache variables corresponding to the defaults deduced above, so
+-# that the user can override them as desired:
+-set (BIN_INSTALL_DIR ${DEFAULT_BIN_INSTALL_DIR} CACHE STRING
+- "Install location for binaries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (LIB_INSTALL_DIR ${DEFAULT_LIB_INSTALL_DIR} CACHE STRING
+- "Install location for libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (PYLIB_INSTALL_DIR ${DEFAULT_PYLIB_INSTALL_DIR} CACHE STRING
+- "Install location for python libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (PYLIB3_INSTALL_DIR ${DEFAULT_PYLIB3_INSTALL_DIR} CACHE STRING
+- "Install location for python3 libraries (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (INCLUDE_INSTALL_DIR ${DEFAULT_INCLUDE_INSTALL_DIR} CACHE STRING
+- "Install location of header files (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-set (DOC_INSTALL_DIR ${DEFAULT_DOC_INSTALL_DIR} CACHE STRING
+- "Install location for documentation (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-if (UNIX)
+- set (MAN_INSTALL_DIR ${DEFAULT_MAN_INSTALL_DIR} CACHE STRING
+- "Install location for manual pages (relative to CMAKE_INSTALL_PREFIX or absolute)")
+-endif()
+-set (PLUGIN_SEARCH_PATH "" CACHE STRING "Default plugin search path")
+-set (INSTALL_DOCS ON CACHE BOOL "Install documentation")
+-
+-
+ if (APPLE)
+ set (MACOSX_RPATH ON)
+ endif ()
+@@ -425,7 +383,7 @@ set (CMAKE_SKIP_BUILD_RPATH FALSE)
+ # (but later on when installing)
+ set (CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+ # the RPATH to be used when installing
+-set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib")
++set (CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
+ # add the automatically determined parts of the RPATH
+ # which point to directories outside the build tree to the install RPATH
+ set (CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
+@@ -472,7 +430,9 @@ add_subdirectory (src/osl.imageio)
+ endif ()
+
+ add_subdirectory (src/include)
++if (INSTALL_DOCS)
+ add_subdirectory (src/doc)
++endif ()
+
+
+
+diff --git a/src/cmake/util_macros.cmake b/src/cmake/util_macros.cmake
+index 5691c925..fdaeb042 100644
+--- a/src/cmake/util_macros.cmake
++++ b/src/cmake/util_macros.cmake
+@@ -107,6 +107,8 @@ endmacro ()
+ # install_targets (target1 [target2 ...])
+ #
+ macro (install_targets)
+- install (TARGETS ${ARGN} RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++ install (TARGETS ${ARGN}
++ RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" COMPONENT user
++ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT user
++ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}" COMPONENT developer)
+ endmacro()
+diff --git a/src/doc/CMakeLists.txt b/src/doc/CMakeLists.txt
+index 9fefa26d..f90c6f00 100644
+--- a/src/doc/CMakeLists.txt
++++ b/src/doc/CMakeLists.txt
+@@ -3,15 +3,15 @@ set (public_docs osl-languagespec.pdf
+ markdeep.min.js
+ )
+
+-install (FILES ${public_docs} DESTINATION doc COMPONENT documentation)
++install (FILES ${public_docs} DESTINATION ${CMAKE_INSTALL_DOCDIR} COMPONENT documentation)
+
+ install ( FILES "${PROJECT_SOURCE_DIR}/LICENSE"
+ "${PROJECT_SOURCE_DIR}/INSTALL.md"
+ "${PROJECT_SOURCE_DIR}/CHANGES.md"
+ "${PROJECT_SOURCE_DIR}/README.md"
+- DESTINATION doc )
++ DESTINATION ${CMAKE_INSTALL_DOCDIR} )
+
+
+ file (GLOB testshade_figures "Figures/testshade/*.jpg")
+ install (FILES ${testshade_figures}
+- DESTINATION doc/Figures/testshade )
++ DESTINATION ${CMAKE_INSTALL_DOCDIR}/Figures/testshade )
+diff --git a/src/include/CMakeLists.txt b/src/include/CMakeLists.txt
+index cf3747d1..4656ee78 100644
+--- a/src/include/CMakeLists.txt
++++ b/src/include/CMakeLists.txt
+@@ -6,4 +6,4 @@ set (OSL_BUILD_CPP14 ${USE_CPP14})
+ configure_file (OSL/oslversion.h.in "${CMAKE_BINARY_DIR}/include/OSL/oslversion.h" @ONLY)
+ list (APPEND public_headers "${CMAKE_BINARY_DIR}/include/OSL/oslversion.h")
+
+-INSTALL ( FILES ${public_headers} DESTINATION include/OSL )
++INSTALL ( FILES ${public_headers} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/OSL )
+diff --git a/src/liboslcomp/CMakeLists.txt b/src/liboslcomp/CMakeLists.txt
+index b6fa459d..6ad9172f 100644
+--- a/src/liboslcomp/CMakeLists.txt
++++ b/src/liboslcomp/CMakeLists.txt
+@@ -25,5 +25,5 @@ TARGET_LINK_LIBRARIES ( oslcomp ${OPENIMAGEIO_LIBRARIES} ${ILMBASE_LIBRARIES}
+ ${CLANG_LIBRARIES} ${LLVM_LIBRARIES} ${LLVM_LDFLAGS}
+ ${LLVM_SYSTEM_LIBRARIES})
+
+-INSTALL ( TARGETS oslcomp RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
++install_targets (oslcomp)
+
+diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
+index a0ffca5c..fa8a8728 100644
+--- a/src/liboslexec/CMakeLists.txt
++++ b/src/liboslexec/CMakeLists.txt
+@@ -157,7 +157,7 @@ TARGET_LINK_LIBRARIES ( oslexec
+ ${LLVM_SYSTEM_LIBRARIES})
+ ADD_DEPENDENCIES (oslexec "${CMAKE_SOURCE_DIR}/src/build-scripts/hidesymbols.map")
+
+-INSTALL ( TARGETS oslexec RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
++install_targets (oslexec)
+
+ # Unit tests
+ if (OSL_BUILD_TESTS)
+diff --git a/src/liboslnoise/CMakeLists.txt b/src/liboslnoise/CMakeLists.txt
+index bc4c175c..2df16afe 100644
+--- a/src/liboslnoise/CMakeLists.txt
++++ b/src/liboslnoise/CMakeLists.txt
+@@ -11,7 +11,7 @@ endif ()
+
+ TARGET_LINK_LIBRARIES ( oslnoise ${OPENIMAGEIO_LIBRARY} ${ILMBASE_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
+
+-INSTALL ( TARGETS oslnoise RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
++install_targets (oslnoise)
+
+
+ if (OSL_BUILD_TESTS)
+diff --git a/src/liboslquery/CMakeLists.txt b/src/liboslquery/CMakeLists.txt
+index 328fa4bb..083d0d5a 100644
+--- a/src/liboslquery/CMakeLists.txt
++++ b/src/liboslquery/CMakeLists.txt
+@@ -14,4 +14,4 @@ endif ()
+
+ TARGET_LINK_LIBRARIES ( oslquery ${OPENIMAGEIO_LIBRARY} ${ILMBASE_LIBRARIES} ${Boost_LIBRARIES} )
+
+-INSTALL ( TARGETS oslquery RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib )
++install_targets (oslquery)
+diff --git a/src/osl.imageio/CMakeLists.txt b/src/osl.imageio/CMakeLists.txt
+index af612544..a8065e72 100644
+--- a/src/osl.imageio/CMakeLists.txt
++++ b/src/osl.imageio/CMakeLists.txt
+@@ -1,20 +1,3 @@
+-# Macro to install targets to the appropriate locations. Use this instead of
+-# the install(TARGETS ...) signature.
+-#
+-# Note: the original is in OIIO's src/cmake/oiio_macros.cmake
+-#
+-# Usage:
+-#
+-# oiio_install_targets (target1 [target2 ...])
+-#
+-macro (oiio_install_targets)
+- install (TARGETS ${ARGN}
+- RUNTIME DESTINATION "${BIN_INSTALL_DIR}" COMPONENT user
+- LIBRARY DESTINATION "${LIB_INSTALL_DIR}" COMPONENT user
+- ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT developer)
+-endmacro ()
+-
+-
+ # Macro to add a build target for an IO plugin.
+ #
+ # Note: the original is in OIIO's src/cmake/oiio_macros.cmake
+@@ -37,7 +20,7 @@ macro (add_oiio_plugin)
+ add_library (${_target_name} SHARED ${_plugin_DEFAULT_ARGS})
+ target_link_libraries (${_target_name} ${OPENIMAGEIO_LIBRARY} ${_plugin_LINK_LIBRARIES})
+ set_target_properties (${_target_name} PROPERTIES PREFIX "" FOLDER "Plugins")
+- oiio_install_targets (${_target_name})
++ install_targets (${_target_name})
+ endmacro ()
+
+
+diff --git a/src/oslc/CMakeLists.txt b/src/oslc/CMakeLists.txt
+index d57fc595..47b73611 100644
+--- a/src/oslc/CMakeLists.txt
++++ b/src/oslc/CMakeLists.txt
+@@ -9,5 +9,5 @@ endif ()
+
+ ADD_EXECUTABLE ( oslc ${oslc_srcs} )
+ TARGET_LINK_LIBRARIES ( oslc oslcomp ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-INSTALL ( TARGETS oslc RUNTIME DESTINATION bin )
++INSTALL ( TARGETS oslc RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+
+diff --git a/src/oslinfo/CMakeLists.txt b/src/oslinfo/CMakeLists.txt
+index e67b4670..d3519033 100644
+--- a/src/oslinfo/CMakeLists.txt
++++ b/src/oslinfo/CMakeLists.txt
+@@ -1,4 +1,4 @@
+ SET ( oslinfo_srcs oslinfo.cpp )
+ ADD_EXECUTABLE ( oslinfo ${oslinfo_srcs} )
+ TARGET_LINK_LIBRARIES ( oslinfo oslquery ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-INSTALL ( TARGETS oslinfo RUNTIME DESTINATION bin )
++INSTALL ( TARGETS oslinfo RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+diff --git a/src/testrender/CMakeLists.txt b/src/testrender/CMakeLists.txt
+index 6643e1ee..03197346 100644
+--- a/src/testrender/CMakeLists.txt
++++ b/src/testrender/CMakeLists.txt
+@@ -2,4 +2,4 @@
+ FILE(GLOB testrender_src *.cpp)
+ ADD_EXECUTABLE ( testrender ${testrender_src} )
+ TARGET_LINK_LIBRARIES ( testrender oslexec oslquery ${OPENIMAGEIO_LIBRARY} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-INSTALL ( TARGETS testrender RUNTIME DESTINATION bin )
++INSTALL ( TARGETS testrender RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+diff --git a/src/testshade/CMakeLists.txt b/src/testshade/CMakeLists.txt
+index ee2f12ce..638097d4 100644
+--- a/src/testshade/CMakeLists.txt
++++ b/src/testshade/CMakeLists.txt
+@@ -2,7 +2,7 @@
+ SET ( testshade_srcs testshade.cpp simplerend.cpp )
+ ADD_EXECUTABLE ( testshade ${testshade_srcs} testshademain.cpp )
+ TARGET_LINK_LIBRARIES ( testshade oslexec oslquery ${OPENIMAGEIO_LIBRARY} ${OPENEXR_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS})
+-INSTALL ( TARGETS testshade RUNTIME DESTINATION bin )
++INSTALL ( TARGETS testshade RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+
+ # The 'libtestshade' library
+ if (BUILDSTATIC)
+@@ -14,10 +14,10 @@ endif ()
+ TARGET_LINK_LIBRARIES (libtestshade oslexec oslquery ${OPENIMAGEIO_LIBRARY} ${OPENEXR_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
+ SET_TARGET_PROPERTIES (libtestshade PROPERTIES PREFIX "")
+
+-INSTALL ( TARGETS libtestshade RUNTIME DESTINATION bin LIBRARY DESTINATION lib ARCHIVE DESTINATION lib)
++install_targets (libtestshade)
+
+ # The 'testshade_dso' executable
+ ADD_EXECUTABLE ( testshade_dso testshade_dso.cpp )
+ TARGET_LINK_LIBRARIES ( testshade_dso ${OPENIMAGEIO_LIBRARY} ${OPENEXR_LIBRARIES} ${Boost_LIBRARIES} ${CMAKE_DL_LIBS} )
+-INSTALL ( TARGETS testshade_dso RUNTIME DESTINATION bin )
++INSTALL ( TARGETS testshade_dso RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} )
+
+--
+2.14.1
+
diff --git a/media-libs/osl/metadata.xml b/media-libs/osl/metadata.xml
new file mode 100644
index 000000000000..73ffbf9c1415
--- /dev/null
+++ b/media-libs/osl/metadata.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>j.scruggs@gmail.com</email>
+ <name>Jonathan Scruggs</name>
+ </maintainer>
+ <maintainer type="person">
+ <email>agrigo2001@yahoo.com.au</email>
+ <name>Adrian Grigo</name>
+ </maintainer>
+ <maintainer type="project">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ A small but rich language for programmable shading in advanced
+ renderers and other applications, ideal for describing materials,
+ lights, displacement, and pattern generation.
+ </longdescription>
+ <use>
+ <flag name="partio">Use <pkg>media-libs/partio</pkg></flag>
+ </use>
+ <upstream>
+ <remote-id type="github">imageworks/OpenShadingLanguage</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-libs/osl/osl-1.8.12.ebuild b/media-libs/osl/osl-1.8.12.ebuild
new file mode 100644
index 000000000000..6bbe3b7c837d
--- /dev/null
+++ b/media-libs/osl/osl-1.8.12.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2017 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 sse4_1:sse4.1 sse4_2:sse4.2 )
+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.7.0
+ dev-libs/pugixml
+ sys-libs/zlib:=
+ partio? ( media-libs/partio )"
+
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.62
+ sys-devel/llvm[clang]
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig"
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+PATCHES=( "${FILESDIR}/${P}-cmake-fixes.patch" )
+
+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=(
+ -DUSE_EXTERNAL_PUGIXML=ON
+ -DUSE_PARTIO=$(usex partio)
+ -DOSL_BUILD_CPP11=ON
+ -DENABLERTTI=OFF
+ -DSTOP_ON_WARNING=OFF
+ -DSELF_CONTAINED_INSTALL_TREE=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DINSTALL_DOCS=$(usex doc)
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DUSE_SIMD=${mysimd%,}
+ -DLLVM_STATIC=ON
+ -DVERBOSE=OFF
+ )
+
+ cmake-utils_src_configure
+}
diff --git a/media-libs/speex/Manifest b/media-libs/speex/Manifest
index d25e60f6fbb0..145508ea79a4 100644
--- a/media-libs/speex/Manifest
+++ b/media-libs/speex/Manifest
@@ -2,6 +2,6 @@ AUX speex-1.2.0-configure.patch 920 BLAKE2B 57b43aee0c57d6f0bf29202573d8f5caa65d
AUX speex-1.2_rc1-r1-configure.patch 1153 BLAKE2B ef6e7e227b19b532a89c819481050aa9aab5c805934ae12f6ab2f666f6e7d056f4375cb0cce31a688c4b725fda057ad01e5b400b5024313c788f02af5880ebd6 SHA512 4cc6ca75ca85861e37fa4084d5614c941ec31459d2c2770264f024c2143cb305a6c63df1b9fd62a14c9f68e45254cd880cc5dd7094fc593f34378a23d2318f84
DIST speex-1.2.0.tar.gz 1047080 BLAKE2B 928e044e1195d4d977497cd1275a07323df233ee85e3ec188f362720f96303c2fc2002c1147c2ac93ca03570ff98428d983eb7d00439c9cdbe131041d9aa2697 SHA512 7fe10838c7d1bafcbe42295b82b79262420dba793b8a4388e2f73a3007850b5572face1b5308d9f4e8d7dfc9cb1c016cbad88cd65b2892667986107ed946836b
DIST speex-1.2rc1.tar.gz 1061882 BLAKE2B 1ce4a2c6682c7142cec64dab7075525ffb485d43f61aabab82e01333df2e59c04dba56bf8982a28dd544011dab45db03b4830430303e9610846ed79d77d69d0f SHA512 bdf1ddb2d60496ab220b94c1bec7a43f267fc964fdbb5cc9f24b71b9b571f237f5ce98c1d74b02699d71a95281f4694ff464ebec25e3b135244e5b3099cb1813
-EBUILD speex-1.2.0-r1.ebuild 1664 BLAKE2B a4a0de680430b500926ed7d17e053451c6a49b23a978e82f9dcf91f3e0300a652815d443985c8685246c2de75e45a17bfcdfe4501d1e71096dfc398ced140481 SHA512 0e8a7ae967363881c2bf9f139d0285e49465c2db0209586d2e52488a7ecb7e67acfa20c77ad8227c619fe690bbf0f1aef7fa975045458c3c47bb88f215a08f94
+EBUILD speex-1.2.0-r1.ebuild 1663 BLAKE2B 64a596a81eaa73007234dfcd5337957c7d021a3e895aa9091ac852425a4c2fbec57b60b124a11b90bc08e24d66777de583de8c0b73ac2240ab5d17f0cba3beb9 SHA512 f0a8d621efc083c9e0463bbf2b32141a977adb65a5859b7b7312467b262dc3392f8c622c14f977c876d12ab1ebbb6978d89b691204d5458f41d5e57ab1eeed6f
EBUILD speex-1.2_rc1-r2.ebuild 1585 BLAKE2B a0f2e029fac58e02469d8fc71c201052311e6a6de7a3b500ba832491f3c3fd389a7459a592e837e971f16c64240255e839ad06bae5ac062ad8d190a1f71d2d5e SHA512 16920e4bd2a50e933b9a288e0f4a91fee1e2bcfd62adac3f2a438e8f0896a72eef7e35e644c795605caaacb92d3bd880eed8618014d1df53136400818038b1ab
MISC metadata.xml 495 BLAKE2B a93e81b5e5b7c39cd680dbd8294451e3b034f1506e0c48d36d2a6e7525638bfc7dee964541b0e03847e43a344689d97de94e245dc4bc8099674a24b12a0a4115 SHA512 6b6a16e69139c71477c76a96c2aec025992a28079a15db234bc624619dc6ee5b3d20025418a49a0119d75b9964dd91fb38459c642c53a98b6bb444c6698beeb8
diff --git a/media-libs/speex/speex-1.2.0-r1.ebuild b/media-libs/speex/speex-1.2.0-r1.ebuild
index e9094c737626..959d53d9bd46 100644
--- a/media-libs/speex/speex-1.2.0-r1.ebuild
+++ b/media-libs/speex/speex-1.2.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cpu_flags_arm_v4 cpu_flags_arm_v5 cpu_flags_arm_v6 cpu_flags_x86_sse static-libs utils +vbr"
RDEPEND="
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index 67a8dc49e620..272fcd611124 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -3,6 +3,6 @@ AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60e
AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
EBUILD speexdsp-1.2_rc3-r1.ebuild 1466 BLAKE2B 3778e15394c69370bd493a1130f716954861fd9bab81244da11bee3f5a5ad3fad42e368b7b6219999fdc125b70b2257518c3a7ce657654239d777782b1cd59f1 SHA512 148ab93d88edea7e6fd50ea7fa8a5011d13b4609778f03b61d63ef5457074a7f8a6daf0ab1cc6de402ce6fe0bf4391345b15466d9fa8c466c86ec0a7a70d7b76
-EBUILD speexdsp-1.2_rc3-r2.ebuild 1497 BLAKE2B 4da27d9626851c8fa3beab26c92b7976be0e85331ca484829a7453d5c60c6705bcbe89a78a83f941767ce25161dad0e377d44a478ad11393b9a5d2f5ea611333 SHA512 e71eb48457103800abbc2f768544a410c5eeae9cf301eb504e149682b3134b7f859cd5bb2c260c40dbee852696f1c517de121ae44a6d692e8791cc8499371ff4
+EBUILD speexdsp-1.2_rc3-r2.ebuild 1496 BLAKE2B dd55b007f5d9a7b3fccb32d75d0548a0a619a32357ac4a47729b8b3dfebd1c4593da66afd47ab5240b54c8c4302e9bce985923019226b8697952ce085a12f2c5 SHA512 a5b4a09814a072fd4a94d5568777e7b545f669ec841f6b19fe3285a295569cb93be83b8bd1b29b3788339e63f09c6a605b317e26c0f38110122a9f3a9abbabf2
EBUILD speexdsp-1.2_rc3.ebuild 1422 BLAKE2B 3e2720efc4fa740ba5ba18c0dcbcff580f4b572baf2c5840aece7cad18464862394c25db7a0fff2f9be996cf3d18f85feb6d393d31be6975b35fc9712e78d129 SHA512 16cb6141e84d413af8be8652c60398612bead1a95f9bfb6e26c2ec9260885a2bd9db910a35ff34123f6095c6502946859623169e364daf86935530b972e98f53
MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
index a4e5e97a8add..c71476efa368 100644
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2_rc3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon static-libs"
RDEPEND="!<media-libs/speex-1.2.0"