summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-09-06 10:28:05 +0100
committerV3n3RiX <venerix@redcorelinux.org>2019-09-06 10:28:05 +0100
commitf1af93971b7490792d8541bc790e0d8c6d787059 (patch)
treea38046712bbc3a3844d77452d16c84e716caa3d4 /media-libs
parentfc637fb28da700da71ec2064d65ca5a7a31b9c6c (diff)
gentoo resync : 06.08.2019
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin66621 -> 66455 bytes
-rw-r--r--media-libs/alsa-lib/Manifest2
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.1.8.ebuild2
-rw-r--r--media-libs/alsa-oss/Manifest2
-rw-r--r--media-libs/alsa-oss/alsa-oss-1.1.8.ebuild2
-rw-r--r--media-libs/assimp/Manifest5
-rw-r--r--media-libs/assimp/assimp-4.0.1-r1.ebuild67
-rw-r--r--media-libs/assimp/assimp-4.1.0.ebuild65
-rw-r--r--media-libs/assimp/files/assimp-4.1.0-disabletest.patch10
-rw-r--r--media-libs/assimp/files/assimp-4.1.0-unzip-of.patch11
-rw-r--r--media-libs/avidemux-core/Manifest4
-rw-r--r--media-libs/avidemux-core/avidemux-core-2.7.4.ebuild (renamed from media-libs/avidemux-core/avidemux-core-2.7.0.ebuild)43
-rw-r--r--media-libs/avidemux-plugins/Manifest5
-rw-r--r--media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild (renamed from media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild)103
-rw-r--r--media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch48
-rw-r--r--media-libs/cimg/Manifest2
-rw-r--r--media-libs/cimg/cimg-2.7.0.ebuild26
-rw-r--r--media-libs/dav1d/Manifest4
-rw-r--r--media-libs/dav1d/dav1d-0.4.0.ebuild58
-rw-r--r--media-libs/dav1d/dav1d-9999.ebuild2
-rw-r--r--media-libs/devil/Manifest2
-rw-r--r--media-libs/devil/devil-1.7.8-r2.ebuild5
-rw-r--r--media-libs/exiftool/Manifest10
-rw-r--r--media-libs/exiftool/exiftool-11.60.ebuild2
-rw-r--r--media-libs/exiftool/exiftool-11.63.ebuild (renamed from media-libs/exiftool/exiftool-11.61.ebuild)0
-rw-r--r--media-libs/exiftool/exiftool-11.65.ebuild (renamed from media-libs/exiftool/exiftool-11.54.ebuild)2
-rw-r--r--media-libs/gegl/Manifest20
-rw-r--r--media-libs/gegl/gegl-0.2.0-r2.ebuild7
-rw-r--r--media-libs/gegl/gegl-0.2.0-r5.ebuild7
-rw-r--r--media-libs/gegl/gegl-0.2.0-r6.ebuild5
-rw-r--r--media-libs/gegl/gegl-0.3.0-r1.ebuild7
-rw-r--r--media-libs/gegl/gegl-0.3.0.ebuild7
-rw-r--r--media-libs/gegl/gegl-0.3.26.ebuild7
-rw-r--r--media-libs/gegl/gegl-0.3.34.ebuild5
-rw-r--r--media-libs/gegl/gegl-0.4.14.ebuild5
-rw-r--r--media-libs/gegl/gegl-0.4.16.ebuild5
-rw-r--r--media-libs/gegl/gegl-9999.ebuild5
-rw-r--r--media-libs/grilo/Manifest2
-rw-r--r--media-libs/grilo/grilo-0.3.9.ebuild75
-rw-r--r--media-libs/gst-plugins-bad/Manifest2
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild91
-rw-r--r--media-libs/gst-plugins-base/Manifest3
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild181
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild181
-rw-r--r--media-libs/gst-plugins-good/Manifest2
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild50
-rw-r--r--media-libs/gst-rtsp-server/Manifest2
-rw-r--r--media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild69
-rw-r--r--media-libs/gstreamer-editing-services/Manifest2
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild55
-rw-r--r--media-libs/gstreamer/Manifest5
-rw-r--r--media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch56
-rw-r--r--media-libs/gstreamer/gstreamer-1.14.4.ebuild4
-rw-r--r--media-libs/gstreamer/gstreamer-1.14.5.ebuild115
-rw-r--r--media-libs/harfbuzz/Manifest2
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.6.1.ebuild110
-rw-r--r--media-libs/jasper/Manifest7
-rw-r--r--media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch28
-rw-r--r--media-libs/jasper/jasper-2.0.14.ebuild67
-rw-r--r--media-libs/jasper/jasper-2.0.16.ebuild65
-rw-r--r--media-libs/jasper/jasper-9999.ebuild65
-rw-r--r--media-libs/jasper/metadata.xml11
-rw-r--r--media-libs/kodi-platform/Manifest2
-rw-r--r--media-libs/kodi-platform/kodi-platform-17.1.0.1.ebuild32
-rw-r--r--media-libs/libextractor/Manifest2
-rw-r--r--media-libs/libextractor/metadata.xml1
-rw-r--r--media-libs/libglvnd/Manifest4
-rw-r--r--media-libs/libglvnd/libglvnd-1.1.1.ebuild51
-rw-r--r--media-libs/libglvnd/libglvnd-9999.ebuild7
-rw-r--r--media-libs/libinsane/Manifest4
-rw-r--r--media-libs/libinsane/files/libinsane-1.0.1-meson_options.patch39
-rw-r--r--media-libs/libinsane/libinsane-1.0.1.ebuild46
-rw-r--r--media-libs/libinsane/metadata.xml20
-rw-r--r--media-libs/libmediainfo/Manifest4
-rw-r--r--media-libs/libmediainfo/libmediainfo-19.04.ebuild83
-rw-r--r--media-libs/libmediainfo/libmediainfo-19.07.ebuild2
-rw-r--r--media-libs/libogg/Manifest2
-rw-r--r--media-libs/libogg/libogg-1.3.4.ebuild33
-rw-r--r--media-libs/libraw/Manifest6
-rw-r--r--media-libs/libraw/libraw-0.19.3.ebuild5
-rw-r--r--media-libs/libraw/libraw-0.19.4.ebuild5
-rw-r--r--media-libs/libraw/libraw-0.19.5.ebuild60
-rw-r--r--media-libs/libv4l/Manifest2
-rw-r--r--media-libs/libv4l/libv4l-1.16.6.ebuild2
-rw-r--r--media-libs/libvpx/Manifest2
-rw-r--r--media-libs/libvpx/libvpx-1.7.0.ebuild4
-rw-r--r--media-libs/mesa/Manifest10
-rw-r--r--media-libs/mesa/mesa-19.1.5.ebuild540
-rw-r--r--media-libs/mesa/mesa-19.1.6.ebuild540
-rw-r--r--media-libs/mesa/mesa-19.2.0_rc1.ebuild543
-rw-r--r--media-libs/mesa/mesa-19.2.0_rc2.ebuild543
-rw-r--r--media-libs/mesa/mesa-9999.ebuild5
-rw-r--r--media-libs/ming/Manifest3
-rw-r--r--media-libs/ming/metadata.xml12
-rw-r--r--media-libs/ming/ming-0.20181112.ebuild97
-rw-r--r--media-libs/mlt/Manifest4
-rw-r--r--media-libs/mlt/mlt-6.16.0-r1.ebuild9
-rw-r--r--media-libs/mlt/mlt-6.16.0-r2.ebuild11
-rw-r--r--media-libs/netpbm/Manifest6
-rw-r--r--media-libs/netpbm/netpbm-10.66.00.ebuild9
-rw-r--r--media-libs/netpbm/netpbm-10.70.00.ebuild9
-rw-r--r--media-libs/netpbm/netpbm-10.76.00.ebuild5
-rw-r--r--media-libs/opencv/Manifest6
-rw-r--r--media-libs/opencv/opencv-2.4.13-r3.ebuild7
-rw-r--r--media-libs/opencv/opencv-3.4.1-r5.ebuild5
-rw-r--r--media-libs/opencv/opencv-3.4.1-r6.ebuild5
-rw-r--r--media-libs/phonon-gstreamer/Manifest5
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild (renamed from media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild)5
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild57
-rw-r--r--media-libs/phonon-vlc/Manifest5
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild40
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild (renamed from media-libs/phonon-vlc/phonon-vlc-9999.ebuild)5
-rw-r--r--media-libs/phonon/Manifest7
-rw-r--r--media-libs/phonon/metadata.xml1
-rw-r--r--media-libs/phonon/phonon-4.10.3.ebuild57
-rw-r--r--media-libs/phonon/phonon-4.11.0.ebuild (renamed from media-libs/phonon/phonon-9999.ebuild)15
-rw-r--r--media-libs/portaudio/Manifest2
-rw-r--r--media-libs/portaudio/portaudio-19.06.00-r1.ebuild2
-rw-r--r--media-libs/simage/Manifest4
-rw-r--r--media-libs/simage/simage-1.7.0-r1.ebuild7
-rw-r--r--media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild7
-rw-r--r--media-libs/tiff/Manifest2
-rw-r--r--media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch395
-rw-r--r--media-libs/tiff/tiff-4.0.10-r2.ebuild85
-rw-r--r--media-libs/x264/Manifest2
-rw-r--r--media-libs/x264/x264-0.0.20190903.ebuild58
-rw-r--r--media-libs/x265/Manifest2
-rw-r--r--media-libs/x265/x265-3.1.2.ebuild195
-rw-r--r--media-libs/zita-convolver/Manifest2
-rw-r--r--media-libs/zita-convolver/zita-convolver-4.0.3.ebuild2
130 files changed, 4623 insertions, 938 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 51a99f259c29..131186d254db 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index 4ef585c13358..233fed1ca70e 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -5,6 +5,6 @@ DIST alsa-lib-1.1.8.tar.bz2 1002562 BLAKE2B a531ab501943924d007f7ae0e4489deea805
DIST alsa-lib-1.1.9.tar.bz2 1058187 BLAKE2B 60454be162a0f36334602586762f8ce657d2883636bcb65ae91dedce62297bd40f3dbdc6213ef773542708b367f8796e143b1fc987c40de6d5d5a69a648f6b18 SHA512 402e39cca82d17555e3e52ef06b8ed9dcf58531da393809a7b5cf18658299fa90ee8a60bfc5213482d7a02b13140c441f1333b144556f44ab4adb786a2fb3c49
EBUILD alsa-lib-1.1.2.ebuild 2105 BLAKE2B 2be4af40e69e4b3e06ce8ea954848c143090ed275f19dcbfd49b867d1edd03e497a248a2f16f5ed9181ea409be5ca46864445f729d634174e8376b256b877b8f SHA512 6f02e3234a638ebf9e88f5c6db7f6edca4f6f76acb1e7c09bc120825a6d1c994f83baa22d5c9b6c2f07fc6717a4e32714d7cab13ccddbc653e57ea489b17fdde
EBUILD alsa-lib-1.1.6-r1.ebuild 2047 BLAKE2B 106e4eec3488a7f76a505f8afb0ed4687f11893aadec2afc393a2c198f387d848052954a110617cbbc451fc446a3a166b445eed101db544bfb9c44859ef92d05 SHA512 8c95080b33d5360f66e586544223f94bae816bcc94115c3f3a6b03c065ef9f54354ccdefcebd6f306facc05f258a89a80cf48465db9369492a88234ee17723ed
-EBUILD alsa-lib-1.1.8.ebuild 2056 BLAKE2B 9ce599763ab63174ccbca4951590517b56ed44c76ca0ac3c823ad57cb270fc1dbab55c6fc7c6c2d7565506c8b3e95e3060b51747f812ae995eb7f6d78d89ed2a SHA512 bf38eaaf66b1970dedc03f767e7e5f75da365fac7b724b3487b93169c9edf9c897db2cfedd2c01c275cc76e870c54565794cd318d6468ed1413286664e590683
+EBUILD alsa-lib-1.1.8.ebuild 2054 BLAKE2B ef917bf820c98222c6261d119ff8ca6ab4c456835d72d696a17e7ffe2acfa58cff6011c1b28b06c0e75b53f48ffde12858b3149ac3c296ea1d0995e62f878e8c SHA512 fd96a3e11f9dc9978ffbc81b0ffcad643da78f8d8fc74d22fbe2207461e113b2a0836acc092b674c24003102563b6ea7fb41690ad2a463d82953debf2fb0667c
EBUILD alsa-lib-1.1.9.ebuild 2060 BLAKE2B 862171dadddc859c404a2f7fbd795b72d64f9e76bdf44900eca9827fdcddb91bafde3120089dbe47d76c063aa94d1bf3b1b742f66a5e2dca11b9a9a2c69f8668 SHA512 7db838e58d526853a13174e92ee54f5250be04edd352facd471208d752cba2937069191669a4efbc416ac70a13f10e82d5377e6ed1366f2d86e554d6fc6673c7
MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
index 61f20eec56ab..80efa633f902 100644
--- a/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://alsaproject/lib/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ~ppc ~ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-linux ~x86-linux"
IUSE="alisp debug doc elibc_uclibc python +thread-safety"
RDEPEND="python? ( ${PYTHON_DEPS} )"
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index dc83b08ac94b..7f7a53f3cd3a 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -4,5 +4,5 @@ DIST alsa-oss-1.1.6.tar.bz2 291588 BLAKE2B 2db4b6d80a17518aeadff8a8f12a40eb4f9e5
DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
EBUILD alsa-oss-1.0.28.ebuild 876 BLAKE2B e322d42d78583a296b49e32e316d4f7e0bc41fd4cc40bbc8873e5bfe0cc47a46c84af4813cfe9f916da8d5cf30a0577e0fe9030f2387f62b99cc8ac2a2a675c5 SHA512 519092dd88cb74fdb8a2fb9e87de716dcbbf9e19c0c75f82245535c2827467f9a1f429f4477f68f23a9804026b90e265fef20b31db48db41396fcfaaf37a417a
EBUILD alsa-oss-1.1.6.ebuild 914 BLAKE2B f4d40c1a5ba78451221491f5eb7da72cc3e228cf306dd0bd82097ba3a1b6e34a9896c34e903da06486752b893d116a243e89cca6fdc1b99dbe47b5ac2759fba0 SHA512 a05bfc6a2ee9e964c79f831a3854c4183781124250ca70110fe91ce03a2f3955a89417623c7798d89304e4431fd4fde670f31b5e82cc426515bf3a65589904da
-EBUILD alsa-oss-1.1.8.ebuild 1019 BLAKE2B 887d47483c9be353c15d590c9432e92dfd0e42966f1ef3627e88cb93024bed4965553a3335082e9e50678e7b38def54a457a5714c6a48d826097aba17d2e9d24 SHA512 1016e23ada908d18062b5fda3453a2a69b496d4c203b05f12a512b2930412a9178769627b06c8cc12d2a066ca7d5a59654e26b830f5af6c2a12a00b8900fd5a3
+EBUILD alsa-oss-1.1.8.ebuild 1017 BLAKE2B 5573474b04d9cb1db0356cc877599ff6d2d0b2f259bac78b67e461e1760e1ee9a04a2bdd05087a8758dfd6ca06d1ca17957d20c5bcdb1679f4bf8e51529bc304 SHA512 c956b8a1fa829550caed1960ff0b5001f8712440dc29b161c3fcba93aa17cce5b19826c73f13e60e290b73267b77c3dd51454ef3385ffd95bb163bb7afbf7fc8
MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index d48c49881f0e..ae4797fb418d 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://alsaproject/oss-lib/${MY_P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 sparc x86"
IUSE="static-libs"
RDEPEND=">=media-libs/alsa-lib-${PV}[${MULTILIB_USEDEP}]"
diff --git a/media-libs/assimp/Manifest b/media-libs/assimp/Manifest
index 842793072946..c1c7188e2017 100644
--- a/media-libs/assimp/Manifest
+++ b/media-libs/assimp/Manifest
@@ -1,6 +1,11 @@
AUX assimp-4.0.1-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
AUX assimp-4.0.1-qt-5.11.0.patch 2230 BLAKE2B e99a1e8dcd5f3c5d8f2b5f116ccd2b5f9a7377e3c17f9d7fc6d4962c4a573c5fa68fced8a714c94cdc1e0bdeb7f2a0b2c4fb714f7c54bbe776efc68911ad5455 SHA512 44bd08a59de45bd6431e97c8165ab7d9c08fccc2bcf704fbf063db143152f9e4aa1e9f5ff7c104bd312a643a42259af6e370caaac92f40d369972b21e692c928
+AUX assimp-4.1.0-disabletest.patch 298 BLAKE2B 49444fb1fdd3cb2aafd9b29de7a454ce8720707bb6f569d9697cd82303df7edf08d909ef8d8926b17203ad1126f13a6445080191649a96af837d1d7e02fa7667 SHA512 320f2f76ffbebf3a5d3064faa3bc16e0cb597ad994c35b1344aa3a60a07839e67a9d68b80f8723b663d491c6a37b6c95510e987acd04dd519d489a82e3d7e729
+AUX assimp-4.1.0-unzip-of.patch 242 BLAKE2B c977c94d4ef44d9e185738e7f3c2e5bda59ea52e11c5900387f9e590201f4ffff3aa6dc9a60452f8f782ce37a510cb85cecd1f8df8b23b331688b75f69ea3890 SHA512 e8908f0c44afc4969b9fe670de418ae9df592cab47b0c9a67958c37414740c527a7ee1ef6d61de19c926f08bf20663be66dc54fc6e3d9164e6ecf34360dff37b
AUX findassimp-3.3.1.patch 624 BLAKE2B 6e1df31dc55739e01807eacf90558be6af791c4054b438f765cd733639c5c6fb34046871577ddbc7194284f81228000e48218a5a890d21390976778928362d94 SHA512 5f8f7e061da89e7fb4705148b171e631e16a3b7ba7156b1cd3a4b8987adc066f0b4a36f7d70a9b174f3bb27ebe13353435d81cbe85a1166c75148e8419311be1
DIST assimp-4.0.1.tar.gz 44625148 BLAKE2B 50cbb6096e89fa311a67cf4f526be57a19f41fe48d59bcdd8d6fd309a988cb19c0f1a4c175301e4c299cb644882a6e8042b0d9281319424faf7504688764e97e SHA512 260b4c7e738f857d8364c4878ea4e789ca676180821943f6d9bff8f56e5f9377ea29660dca4e130c681a8aa12fc32f155adb1d78ca260ba242e68b8afa6cc1bb
+DIST assimp-4.1.0.tar.gz 45417293 BLAKE2B 74170ab48b64ab357ddd9da58f1218d0c3c0a4039345dcd7ae396aca3bb47c2f5ea2ee8b61b7d81c68c2e1237cd3ba516b816038400e9960b6c0cfe031a41e54 SHA512 5f1292de873ae16c9921d1d44f2871474d74c0ddfd76cc928a7d9b3e03aa6eca4cc72af0513da20a86d09c55d48646e610fd4a4f2b05364f08ad09cf27cbc67a
+EBUILD assimp-4.0.1-r1.ebuild 1385 BLAKE2B c658a4892def26404509ced1538aa9635da5b5dda3ba00b53d5bfcc14efce0803e045aa687bb116dcdda93ad933fdaeea655dbb6f9c25160ded30d90638338db SHA512 8e003f3e6bb196f1085a7903add296153119d1fbb948f87c00332f3c970853f429406d037eed52449126fdc5566cc19b6650a518ba8fc9a6129735dda0ecfede
EBUILD assimp-4.0.1.ebuild 1334 BLAKE2B 69cba811c5f5b0957c36b257c1bc52c30b15c58ade44c5cff8a1e3697eeda607d8ed5885362a5ad8e1b8ba1c982dd8155f325ae3798a982a39a8d0132e68cd4d SHA512 c47fddb39ed30f9c8cdd9fcdf5b43703c07134a8e7dd187518eaec8392792614716252d39f19262278b8cfe832cf92df602b08855d1d0724b74796f851068d7a
+EBUILD assimp-4.1.0.ebuild 1298 BLAKE2B 19052951f2e7af644bc6987b0960bbf778e265d6e3daa1db6531c0a84086d47f09e21cd15ba339882ae3a2506291048924ef8b416af3ebe9f43c192c8802df4f SHA512 1792c1643fe99b57c3a9ba5619a5e318b1533e405aa78eb6572bb35364cc1e8a18173bded6b1932d94e442794f83bbf6a52ec635b46843449ca8f39af0e39567
MISC metadata.xml 463 BLAKE2B e8815466468672f2ebf597e0155adf205234f603ae9287a5743005d26ec240429ea5b98d006554abc69e08251613257130a258fe6cd5e1a79865005d98475eb5 SHA512 8daf9f83564ce1357b6a99441fc733b9d7a00db2071cb2fc47f1a0c6a1842cea57a1ec4aa628b86271abbdaaf5c17c60092f1e2de42e9604a5165e81b2f4bf2a
diff --git a/media-libs/assimp/assimp-4.0.1-r1.ebuild b/media-libs/assimp/assimp-4.0.1-r1.ebuild
new file mode 100644
index 000000000000..0e4e53c35722
--- /dev/null
+++ b/media-libs/assimp/assimp-4.0.1-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-libs/zlib:=[minizip]
+ samples? (
+ media-libs/freeglut
+ virtual/opengl
+ x11-libs/libX11
+ )
+ tools? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-libs/devil
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/findassimp-3.3.1.patch"
+ "${FILESDIR}/${P}-qt-5.11.0.patch"
+ "${FILESDIR}/${P}-disabletest.patch" # bug 659122
+)
+
+src_configure() {
+ append-flags -fno-strict-aliasing
+ local mycmakeargs=(
+ -DASSIMP_BUILD_SAMPLES=$(usex samples)
+ -DASSIMP_BUILD_STATIC_LIB=$(usex static)
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
+ -DCMAKE_DEBUG_POSTFIX=""
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+ "${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/assimp-4.1.0.ebuild b/media-libs/assimp/assimp-4.1.0.ebuild
new file mode 100644
index 000000000000..050200305045
--- /dev/null
+++ b/media-libs/assimp/assimp-4.1.0.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Importer library to import assets from 3D files"
+HOMEPAGE="https://github.com/assimp/assimp"
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="samples static test tools"
+SLOT="0"
+
+RDEPEND="
+ dev-libs/boost:=
+ sys-libs/zlib:=[minizip]
+ samples? (
+ media-libs/freeglut
+ virtual/opengl
+ x11-libs/libX11
+ )
+ tools? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtopengl:5
+ dev-qt/qtwidgets:5
+ media-libs/devil
+ virtual/opengl
+ )
+"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/gtest )
+"
+
+PATCHES=(
+ "${FILESDIR}/${P}-disabletest.patch" # bug 659122
+ "${FILESDIR}/${P}-unzip-of.patch"
+)
+
+src_configure() {
+ local mycmakeargs=(
+ -DASSIMP_BUILD_SAMPLES=$(usex samples)
+ -DASSIMP_BUILD_STATIC_LIB=$(usex static)
+ -DASSIMP_BUILD_TESTS=$(usex test)
+ -DASSIMP_BUILD_ASSIMP_TOOLS=$(usex tools)
+ -DCMAKE_DEBUG_POSTFIX=""
+ -DASSIMP_LIB_INSTALL_DIR="${EPREFIX}/usr/$(get_libdir)/"
+ )
+
+ cmake-utils_src_configure
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ insinto /usr/share/cmake/Modules
+ doins cmake-modules/Findassimp.cmake
+}
+
+src_test() {
+ "${BUILD_DIR}/test/unit" || die
+}
diff --git a/media-libs/assimp/files/assimp-4.1.0-disabletest.patch b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
new file mode 100644
index 000000000000..4afe5bbd26ba
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-disabletest.patch
@@ -0,0 +1,10 @@
+--- a/test/unit/utVersion.cpp 2017-07-28 22:33:41.000000000 +0200
++++ b/test/unit/utVersion.cpp 2018-08-26 01:48:54.935116440 +0200
+@@ -65,7 +65,3 @@
+ EXPECT_NE( aiGetCompileFlags(), 0U );
+ }
+
+-TEST_F( utVersion, aiGetVersionRevisionTest ) {
+- EXPECT_NE( aiGetVersionRevision(), 0U );
+-}
+-
diff --git a/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
new file mode 100644
index 000000000000..e75b47a1af4b
--- /dev/null
+++ b/media-libs/assimp/files/assimp-4.1.0-unzip-of.patch
@@ -0,0 +1,11 @@
+--- a/contrib/unzip/unzip.h 2019-08-21 21:38:10.991542891 +0200
++++ b/contrib/unzip/unzip.h 2019-08-21 21:38:24.507543226 +0200
+@@ -45,6 +45,8 @@
+ #ifndef _unz_H
+ #define _unz_H
+
++#define OF _Z_OF
++
+ #ifdef __cplusplus
+ extern "C" {
+ #endif
diff --git a/media-libs/avidemux-core/Manifest b/media-libs/avidemux-core/Manifest
index 0722d0810566..c988bbf140ea 100644
--- a/media-libs/avidemux-core/Manifest
+++ b/media-libs/avidemux-core/Manifest
@@ -1,6 +1,6 @@
AUX avidemux-core-2.7.3-permissions.patch 1079 BLAKE2B 64e4b1718ef91051253b0d09a69acbd11fb2467d48a62443b4ccd2ca89feee454d1ed35542c49fbf94c217397bd363e6aefc6a3bf13498af9a57eb6fdf32b5ba SHA512 d9c316b76cedd2119a3fdae1810846358f7addf21258021ba896f0e1dd7d68d27db5f7e97b53e284806482334ccd016833a2f8b24f50cddd28ac6cfdf28dfce3
DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
-EBUILD avidemux-core-2.7.0.ebuild 2527 BLAKE2B 549e0e7a6d68296215452e813468dcf511c5b46115c0e51e9e369fe3f119fa11542ed28dd2a336123776b773bcbc83ff95896a24b7769aeb1e4249cfddbd0f78 SHA512 f20b5c6c6956998f6164e4d72d40e1acd54d8a926c03158dd7131733eab421170deb356bef16f6fa7e0311bb2e21d0598120fe526870114c63db872fdba8d8e5
+DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
EBUILD avidemux-core-2.7.3.ebuild 2291 BLAKE2B 913b26cac99698593a555fe360896f0c158bc8e17e4658694525eea6f37570c4aa39e6465cf4a3a1394a42d4762eb570b7771cf926649ea1523648d36810a634 SHA512 432d8cf723d97a360b7a1a702e61bcb64760edd7391a23cea1e3784133514538b31283716049b1cc9de1addc187bddb4f0a7c07a48f84287467551db5d6b9d50
+EBUILD avidemux-core-2.7.4.ebuild 2228 BLAKE2B 7fb455e6abbc8d444be1b90d30ff40a245955d2f6e58210f3c6813f5ae6baf0e9c99929867c88330b905ed00d5073051511a085f8dbb4a21befa7d28ee79c538 SHA512 5182e13e491f401d9e53c9cbd898088d17459fac291fb6e08bb9e3303a585fb954ba283dc11813794c35a00e638a5d03fa322907335bbc1c7b3d755af2bd1c19
MISC metadata.xml 569 BLAKE2B 19e9f892bf6e5c63f2054dfd44beef6b394fcdeecbb2e91edf01e7e9370b7a32c21529ad566921d46992f14d00943ac69e5f0f55cff8406d48ee84dc6515619c SHA512 58e100ccdc3e1145703d4feef2776bdf4ccfcc44dc9e04f1e79f5ea1b89f6ae59c386794028328f27d8715cd00abb410cb6970f1b72c1646750babf742fe3270
diff --git a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
index d1169d3d75ce..b47c3bc01646 100644
--- a/media-libs/avidemux-core/avidemux-core-2.7.0.ebuild
+++ b/media-libs/avidemux-core/avidemux-core-2.7.4.ebuild
@@ -1,31 +1,24 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}
- inherit git-r3
-else
- MY_PN="${PN/-core/}"
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+
inherit cmake-utils
DESCRIPTION="Core libraries for simple video cutting, filtering and encoding tasks"
HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
SLOT="2.7"
+KEYWORDS="~amd64 ~x86"
IUSE="debug nls nvenc sdl system-ffmpeg vaapi vdpau xv"
# Trying to use virtual; ffmpeg misses aac,cpudetection USE flags now though, are they needed?
-COMMON_DEPEND="
- dev-db/sqlite:3
+DEPEND="dev-db/sqlite:3
nvenc? ( media-video/nvidia_video_sdk )
sdl? ( media-libs/libsdl:0 )
system-ffmpeg? ( >=virtual/ffmpeg-9:0[mp3,theora] )
@@ -33,18 +26,17 @@ COMMON_DEPEND="
vdpau? ( x11-libs/libvdpau:0 )
xv? ( x11-libs/libXv:0 )
"
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
!<media-libs/avidemux-core-${PV}
!<media-video/avidemux-${PV}
nls? ( virtual/libintl:0 )
"
-DEPEND="${COMMON_DEPEND}
- virtual/pkgconfig
+BDEPEND="virtual/pkgconfig
nls? ( sys-devel/gettext )
!system-ffmpeg? ( dev-lang/yasm[nls=] )
"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/avidemux2-${PV}"
CMAKE_USE_DIR="${S}/${PN/-/_}"
src_prepare() {
@@ -65,11 +57,6 @@ src_prepare() {
}
src_configure() {
- # Add lax vector typing for PowerPC.
- if use ppc || use ppc64 ; then
- append-cflags -flax-vector-conversions
- fi
-
# See bug 432322.
use x86 && replace-flags -O0 -O1
@@ -83,17 +70,15 @@ src_configure() {
-DXVIDEO="$(usex xv)"
)
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
cmake-utils_src_configure
}
src_compile() {
- cmake-utils_src_compile -j1
+ cmake-utils_src_compile
}
src_install() {
- cmake-utils_src_install -j1
+ cmake-utils_src_install
}
diff --git a/media-libs/avidemux-plugins/Manifest b/media-libs/avidemux-plugins/Manifest
index d50777dc1a24..fb487b504620 100644
--- a/media-libs/avidemux-plugins/Manifest
+++ b/media-libs/avidemux-plugins/Manifest
@@ -1,7 +1,6 @@
AUX avidemux-plugins-2.6.20-optional-pulse.patch 743 BLAKE2B e60a7433e539d49d5bff7dea62bfda984866dd72b93158827ee5ed785d77174db3fbde9e67c9c3fdc8d652485d8e704c075811c65848ef48f78490c6a3061b7f SHA512 dcec29c63aa7eb828fc1aaf4b54edb76290e3c7655b00002efa8036f0572b1c0111c30e873b925bb606e8e672e177ba8d103100b1fb55dcc830b83e4a5556710
-AUX avidemux-plugins-2.7.0-qt-5.11.patch 1664 BLAKE2B 080497a678e869e143eb350ecdca2b77d5e5906a8a469e24f16fc58853665791dbbd94880418b492df6816b8f420d54ee7ecd06c805b0aab16e8d05ab43f545d SHA512 49186e7648db60e081f78e1257ea788313cac6e991c995249701189ab344744f0c410203b39b49e5530a8dd33de937582099eb8b615d19fe7d0e3731254d535c
DIST avidemux-2.7.3.tar.gz 23772654 BLAKE2B f946c267140bc8aebda2ce027ed8cb7c84a98a401255d3e0cdaf7498680e8bd9c78a33c122cb177d397ed2dd6bc3c29d7508578028c2964c2897279bf860b62d SHA512 d7761de1c40de1b824efbcf24173ea738a2e0ba7fa41cefa09e7bac3ec97f3af4b04201e36f9de50ade2b09e394aa99ed1d4907f90bb132f9896e8f1b5e82d7a
-DIST avidemux_2.7.0.tar.gz 21474504 BLAKE2B c6e55a0b5220d6d3746fa06162bf11253145fd28f2f6f744702d5e0342fba85e546a28883eb847139eadd34c94037ebc7d68f5576e7505a85288556468d14b96 SHA512 7c92213d3bd2849dbdb5a1aff2acd6da231fd76c561b756fbf4a1d5a41e9705d609d7a35b6ca6b77ceb3bf5138f861cd24ed16d8fcec4fd713f09a2ff07e9015
-EBUILD avidemux-plugins-2.7.0.ebuild 4871 BLAKE2B ba2b03b69c02011be5930397b2229e4d51d3f8b350a31a12f923d50f11ba1008ce7d6ccac62d25d787fed704c1af2c08a4847c5fad8faa9fce14787bb09bb359 SHA512 99945e92b65aa422c701818763aee164fba1e3ab0b345f29266b8151d159d9b636ae8e0b23393fb6cba7fa5f81bed6e6e413e9da56ece76d94d641b73078cf18
+DIST avidemux-2.7.4.tar.gz 23815808 BLAKE2B 3a7206f04f568f28dd4d5116c580dd780b057a59e94dd61a2abe5dadfa557291a0c50f917ad1926f9f9a82d01af065c06138f954320e2d9c174fda7583a6b265 SHA512 36d857837cd6a74039a414df16367cd8cbf615173bcc531e57dc0dbfc2e002b1c0c4a80cef73a0d8f25d305deca809af0b5cbcdbad8c311324fa2e64381fd10b
EBUILD avidemux-plugins-2.7.3.ebuild 4351 BLAKE2B 04bdb03c46a5856ff9ba97d71f89c1d6c1caa7387696875169124420e69cb93538791e6249d8e9362f1f84a04d9600e947f430f736bac0bf6889357528d64cc4 SHA512 1b1e071e03002acf313dabfde1da4a367b78892a215ec98f7d8b27e1259870e3ca40748bd7b45c0b51333b3fbe8f1956f77158ca298b5e49542f0f65d11e6edd
+EBUILD avidemux-plugins-2.7.4.ebuild 4267 BLAKE2B 8575dac5383482f1560e627cdef936d1ce34411103adc74b45ae80826bcab3aab782f2540e6f7d1b0571207cbb9c9715f80561abba7a36148c02bf70218eb6f6 SHA512 04c83316ac5252303ff346c150eb3935c753b7827c3d084c0725f3710e1ad0dc22aa2f7a82f54cbf8d88f77083d296c2445bcfc2770729fa81cbeaef8614cfcb
MISC metadata.xml 1313 BLAKE2B 931af633c34ab1bf1f45705ac5b6e2fd6ea3b3fa86dc870c404d29e7fbdb723f1f3d1bf60f051fd9ab30ac8ee83142c1082d0ca3994019d527c3b2f66884ed20 SHA512 26aa4c4bb69ea3d2b41c2f6b8147019b79d8b740690ac7381f28abbc51232e9340b007a53562e4b74ff8a46cbbdb6d9091b2d1981720f4bfe89656cbde28fb3d
diff --git a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
index a2730251a4a4..2a7b0e7ee510 100644
--- a/media-libs/avidemux-plugins/avidemux-plugins-2.7.0.ebuild
+++ b/media-libs/avidemux-plugins/avidemux-plugins-2.7.4.ebuild
@@ -1,92 +1,84 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
-
-if [[ ${PV} == *9999* ]] ; then
- EGIT_REPO_URI="https://github.com/mean00/avidemux2.git"
- EGIT_CHECKOUT_DIR=${WORKDIR}
- inherit git-r3
-else
- MY_PN="${PN/-plugins/}"
- MY_P="${MY_PN}_${PV}"
- SRC_URI="mirror://sourceforge/${MY_PN}/${MY_PN}/${PV}/${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
-fi
-PYTHON_COMPAT=( python2_7 )
+EAPI=7
+
+CMAKE_MAKEFILE_GENERATOR="emake"
+PYTHON_COMPAT=( python{2_7,3_6} )
+
inherit cmake-utils python-single-r1
DESCRIPTION="Plugins for the video editor media-video/avidemux"
HOMEPAGE="http://fixounet.free.fr/avidemux"
+SRC_URI="https://github.com/mean00/avidemux2/archive/${PV}.tar.gz -> avidemux-${PV}.tar.gz"
# Multiple licenses because of all the bundled stuff.
LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain"
SLOT="2.7"
IUSE="a52 aac aften alsa amr dcaenc debug dts fdk fontconfig fribidi jack lame libsamplerate cpu_flags_x86_mmx nvenc opengl opus oss pulseaudio qt5 truetype twolame vdpau vorbis vpx x264 x265 xv xvid"
+KEYWORDS="~amd64 ~x86"
+
REQUIRED_USE="${PYTHON_REQUIRED_USE}"
COMMON_DEPEND="${PYTHON_DEPS}
~media-libs/avidemux-core-${PV}:${SLOT}[vdpau?]
~media-video/avidemux-${PV}:${SLOT}[opengl?,qt5?]
- >=dev-lang/spidermonkey-1.5-r2:0=
+ dev-lang/spidermonkey:0=
dev-libs/libxml2:2
- media-libs/a52dec:0
+ media-libs/a52dec
media-libs/libass:0=
- media-libs/libmad:0
- media-libs/libmp4v2:0
+ media-libs/libmad
+ media-libs/libmp4v2
media-libs/libpng:0=
- virtual/libiconv:0
+ virtual/libiconv
aac? (
- >=media-libs/faac-1.29.9.2:0
- media-libs/faad2:0
+ media-libs/faac
+ media-libs/faad2
)
- aften? ( media-libs/aften:0 )
- alsa? ( >=media-libs/alsa-lib-1.0.3b-r2:0 )
- amr? ( media-libs/opencore-amr:0 )
- dcaenc? ( media-sound/dcaenc:0 )
- dts? ( media-libs/libdca:0 )
+ aften? ( media-libs/aften )
+ alsa? ( media-libs/alsa-lib )
+ amr? ( media-libs/opencore-amr )
+ dcaenc? ( media-sound/dcaenc )
+ dts? ( media-libs/libdca )
fdk? ( media-libs/fdk-aac:0= )
fontconfig? ( media-libs/fontconfig:1.0 )
- fribidi? ( dev-libs/fribidi:0 )
+ fribidi? ( dev-libs/fribidi )
jack? (
- media-sound/jack-audio-connection-kit:0
- libsamplerate? ( media-libs/libsamplerate:0 )
+ media-sound/jack-audio-connection-kit
+ libsamplerate? ( media-libs/libsamplerate )
)
- lame? ( media-sound/lame:0 )
- nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) )
- opus? ( media-libs/opus:0 )
- pulseaudio? ( media-sound/pulseaudio:0 )
+ lame? ( media-sound/lame )
+ nvenc? ( amd64? ( media-video/nvidia_video_sdk ) )
+ opus? ( media-libs/opus )
+ pulseaudio? ( media-sound/pulseaudio )
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
)
truetype? ( media-libs/freetype:2 )
- twolame? ( media-sound/twolame:0 )
- vorbis? ( media-libs/libvorbis:0 )
+ twolame? ( media-sound/twolame )
+ vorbis? ( media-libs/libvorbis )
vpx? ( media-libs/libvpx:0= )
x264? ( media-libs/x264:0= )
x265? ( media-libs/x265:0= )
xv? (
- x11-libs/libX11:0
- x11-libs/libXext:0
- x11-libs/libXv:0
+ x11-libs/libX11
+ x11-libs/libXext
+ x11-libs/libXv
)
- xvid? ( media-libs/xvid:0 )
+ xvid? ( media-libs/xvid )
"
DEPEND="${COMMON_DEPEND}
- oss? ( virtual/os-headers:0 )
+ oss? ( virtual/os-headers )
"
RDEPEND="${COMMON_DEPEND}
!<media-libs/avidemux-plugins-${PV}
"
-S="${WORKDIR}/${MY_P}"
+S="${WORKDIR}/avidemux2-${PV}"
-PATCHES=(
- "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch
- "${FILESDIR}"/${P}-qt-5.11.patch
-)
+PATCHES=( "${FILESDIR}"/${PN}-2.6.20-optional-pulse.patch )
src_prepare() {
default
@@ -104,11 +96,6 @@ src_prepare() {
}
src_configure() {
- # Add lax vector typing for PowerPC.
- if use ppc || use ppc64 ; then
- append-cflags -flax-vector-conversions
- fi
-
# See bug 432322.
use x86 && replace-flags -O0 -O1
@@ -131,6 +118,7 @@ src_configure() {
-DJACK="$(usex jack)"
-DLAME="$(usex lame)"
-DNVENC="$(usex nvenc)"
+ -DOPENGL="$(usex opengl)"
-DOPUS="$(usex opus)"
-DOSS="$(usex oss)"
-DPULSEAUDIOSIMPLE="$(usex pulseaudio)"
@@ -151,13 +139,8 @@ src_configure() {
-DUSE_EXTERNAL_LIBMP4V2=yes
)
- if use qt5 ; then
- mycmakeargs+=( -DENABLE_QT5=True )
- fi
-
- if use debug ; then
- mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
- fi
+ use qt5 && mycmakeargs+=( -DENABLE_QT5=True )
+ use debug && mycmakeargs+=( -DVERBOSE=1 -DADM_DEBUG=1 )
CMAKE_USE_DIR="${S}"/${process#*:} BUILD_DIR="${build}" cmake-utils_src_configure
done
@@ -172,11 +155,7 @@ src_compile() {
src_install() {
for process in ${processes} ; do
- # cmake-utils_src_install doesn't respect BUILD_DIR
- # and there sometimes is a preinstall phase present.
- pushd "${WORKDIR}/${P}_build/${process%%:*}" > /dev/null || die
- grep '^preinstall/fast' Makefile && emake DESTDIR="${D}" preinstall/fast
- grep '^install/fast' Makefile && emake DESTDIR="${D}" install/fast
- popd > /dev/null || die
+ local build="${WORKDIR}/${P}_build/${process%%:*}"
+ BUILD_DIR="${build}" cmake-utils_src_install
done
}
diff --git a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch b/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
deleted file mode 100644
index 8ac9bbc3b4ac..000000000000
--- a/media-libs/avidemux-plugins/files/avidemux-plugins-2.7.0-qt-5.11.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-From ba667da44fcb88ee660339e52859bb90dc1b00d3 Mon Sep 17 00:00:00 2001
-From: mean <fixounet@free.fr>
-Date: Wed, 30 May 2018 07:31:03 +0200
-Subject: [PATCH] [Qt] Compatibilty patch with newer qt (>=5.11), patch by
- Chris Clayton
-
----
- avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp | 1 +
- avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp | 1 +
- avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp | 1 +
- 3 files changed, 3 insertions(+)
-
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-index 256f69d5e..54b0ac639 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobControl.cpp
-@@ -17,6 +17,7 @@
- #include "ADM_coreJobs.h"
- #include "DIA_coreToolkit.h"
- #include <QtCore/QDir>
-+#include <QAction>
-
- extern void loadTranslator(void);
- extern void initTranslator(void);
-diff --git a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-index 85cec5f9a..f537995ca 100644
---- a/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-+++ b/avidemux/qt4/ADM_jobs/src/ADM_jobs.cpp
-@@ -21,6 +21,7 @@
- #include "ADM_memsupport.h"
- #include "ADM_crashdump.h"
- #include "ADM_win32.h"
-+#include <QAction>
-
- void onexit( void );
-
-diff --git a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-index 94bdd577e..b2a01e54b 100644
---- a/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-+++ b/avidemux_plugins/ADM_videoFilters6/eq2/qt4/Q_eq2.cpp
-@@ -17,6 +17,7 @@
- #include "Q_eq2.h"
- #include "ADM_toolkitQt.h"
- #include <QSignalMapper>
-+#include <QAction>
-
- //
- // Video is in YV12 Colorspace \ No newline at end of file
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index aad9dccd6d40..36f70deea6dc 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,5 +1,7 @@
DIST cimg-2.6.5.tar.gz 11071672 BLAKE2B 61fa37c2f78e09d6aba0eb867c3797f86ed5a685a114dae779e439c76f4cc9768fada70affd2b14139c7fe7b2e79b61e653165abc47833e3a5cf857af0eb4ca4 SHA512 d8c1e10f702b47f6788fedf27681fe8e7ab3994c8018f96d4964694edda6acb1ca040244d7d1436a5381ec5a12e7a2b991ede6d9ea6d961ae6c4842feb2bf141
DIST cimg-2.6.7.tar.gz 11072149 BLAKE2B 0695215eb57375ed216ab1b148bb09316af8f6e0191589e4a9a91b25355857a75d2f351d2e52584e626c8ff1f2aad940df4f8f0ee4c331ded62582804c3ce765 SHA512 9dadc0b7b1017ba19fb36232a32278c30628930b7c76a646ca343751754e10e1a1eb8a0c670ab308c437738ec28ceb324f6511ffb9c3bceabede01eb34b8a2e6
+DIST cimg-2.7.0.tar.gz 11076642 BLAKE2B db2c8715f25ec160cdf41ac2cc1bee366ef49dbd0b3e5bd5bf6b4b8a0ba4c880f6af4cbd78d843abf0edd99ca45337fd1bd5dc25779b94984a64f5217c3430a5 SHA512 b1b12f4b36d7d799da330bb2854732e6207aa73b4d28bf9a13408154664c2d518652065738d1964da00a022449a3b618b25b72ec17deec6df463ff6811c21b21
EBUILD cimg-2.6.5.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
EBUILD cimg-2.6.7.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+EBUILD cimg-2.7.0.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.7.0.ebuild b/media-libs/cimg/cimg-2.7.0.ebuild
new file mode 100644
index 000000000000..a3f01bc9ba22
--- /dev/null
+++ b/media-libs/cimg/cimg-2.7.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="C++ template image processing toolkit"
+HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
+SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="CeCILL-2 CeCILL-C"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples"
+
+S=${WORKDIR}/CImg-v.${PV}
+
+src_install() {
+ doheader CImg.h
+ dodoc README.txt
+
+ use doc && dodoc -r html
+ if use examples; then
+ dodoc -r examples
+ docompress -x /usr/share/doc/${PF}/examples
+ fi
+}
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index 99a5c146c383..1be2a5ad5271 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -3,10 +3,12 @@ DIST dav1d-0.2.0.tar.bz2 408361 BLAKE2B 2c5f4d7777d85ab1453a744335ee5047b2e108a7
DIST dav1d-0.2.1.tar.bz2 412003 BLAKE2B 51520f355f51f7fdc8c6e7981fd29f8d5339c2c72058ea05dff6bf0c3b191cf3c077fee1b46813f229d1bee16d1b884e834a5d61bf78459d83113aafe63bca89 SHA512 38d0a9e639579bf2046d3afd7ba0d4205081d8e26955be0216acc84ee2adcc81c790c858932009965b61a66fc3df66ed6b14da9d0e61e2505418c17bc4b75004
DIST dav1d-0.3.0.tar.bz2 435690 BLAKE2B 57124b2a5bcde8a2de8e4ee8155ec736d2f4c13dc7347029c517d70495de1943feef7f0c7ce1d1051304fe9f3141775fbe07ceec0733fdca3dca166cbab6c417 SHA512 bc0933bbc7064555e8973c82390e414aca8f52a14c5de7ee3ff92c263722d5c9cc472ba5f1f8d1dd60c4ce9ab0ed880c8b4a53b3d33d3aff24bc8e7fb18b0b84
DIST dav1d-0.3.1.tar.bz2 438676 BLAKE2B f51c997fb95abc5b2721d67feb2023daf6bdab8d725b2b52b6c25440dcfab637b8543b8622c18da678eff20bbed155e86da9c9040a98160e5b9381ba7ab5ecf8 SHA512 b810c993a2a262f75ea0d4404428bc5660ac0d4c4d41aa311bc2180abecc40b36e73858f436b27372f4a1a0b7c700df4f8cc535130c663d6bfba2206d549e0f2
+DIST dav1d-0.4.0.tar.bz2 493854 BLAKE2B 8ae022054ab9827306f6e8501e0bfbc03a04e280a3e155c12ae2dfef474eab976097ce3ed990bd5cdbc3ac79018138a156f0701973ac40357224feb75149332a SHA512 7d2ad9959649321e86f9d0dcf44b274251c103fce9f02964d898b6d9da69e38e93bbed86a7ea217c93e0ee89e1ad43bc31dc217535c4b1cc37761191a6585fc1
EBUILD dav1d-0.1.0.ebuild 1128 BLAKE2B 20202e1f79289bf576003933bfae0e417974df92f810c2a6ed873e1143af297c2af37918fed3ead030206a4d96fe22722a943b11f2b66a8e1dce210256f7f2c1 SHA512 d25a735d98e03391640d290669a69fe225d28ec3a8a3a1137919d4cd47e97e11f03e1c30f0f2123153b4c0a34f6e8539da94b100a05c0c42e98247b1aabb2d38
EBUILD dav1d-0.2.0-r1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
EBUILD dav1d-0.2.1.ebuild 1135 BLAKE2B 081253071832f93fd96b216169ea0a1f29a2608ec058eebb41c1eb47922ae64134c3c027005abb56549d7b8e66d0831defc07eb95d963c37de07e730384c42d6 SHA512 35a638950d61cb3a79391f959fc8da3240dbf191f6db0ec55b8d80f08287a8ec1eefc9a611196e70449a89b0ec87aca4f304cd4ed46d6911d72e9343ec612ed4
EBUILD dav1d-0.3.0.ebuild 1147 BLAKE2B fbceacf787e296094352daa0382eba35447e6c09aa5fa087cc25102a846537f08852fb86f1592fb06aa23a36acfab93ac6b40fd0af86f305663322076d4b1016 SHA512 50524008230f23b520ae3401af3ce65822b238c3300a4a3715034ac5f584bf76a3f1fd4e1591a539ca07f4f3005564b22bcbe07c30b4ce809ef928bfa00d6a82
EBUILD dav1d-0.3.1.ebuild 1154 BLAKE2B 344aa8b94ac7f54d056ecc0f43089618f55067e957c5337854759183668174a435d0cfa893320983cf57556020e568854890efa255ada5ff7ead5c5af357d6b6 SHA512 c0904a26810c5efbb493f6f43344047c26777bed07210861b2776f5fca6cf566d544c6b56206cb6112d28e58412cf47df1c31b52c06410e286e36cedd8487823
-EBUILD dav1d-9999.ebuild 1159 BLAKE2B 029caf1d3950e395f7b3a8c9e144992c730d4a7a44f73794b08e0e028989c439137b8a23a42045102796b89c958b8bbdb4c8de63129c989363a9b63c512f9608 SHA512 88eeb6a6cc54b4bdc1305fc73d3c4b6f4ba40963fcf40bbc485d658d205ed30368e455cf2c74214342c2fb2a4ce37b38abef040da0a423939262fdec9291487a
+EBUILD dav1d-0.4.0.ebuild 1159 BLAKE2B 6e4c9ecdb5482e1cd1537b713d7914b539d97e17f9f002f4f3201a7d299547a722509f5a16ba7e477d3a00b3151d7a9aab3c6dd3a87d8e79000fc9219c9fad6f SHA512 8ed036c471e654901a0b6a9d9780e90ecbde36d01390e752a08805c77b2df1632f0503d17d66dc621f12385ec3883b6c6e8f92cdb573f5b93c47665d172f9cec
+EBUILD dav1d-9999.ebuild 1159 BLAKE2B 6e4c9ecdb5482e1cd1537b713d7914b539d97e17f9f002f4f3201a7d299547a722509f5a16ba7e477d3a00b3151d7a9aab3c6dd3a87d8e79000fc9219c9fad6f SHA512 8ed036c471e654901a0b6a9d9780e90ecbde36d01390e752a08805c77b2df1632f0503d17d66dc621f12385ec3883b6c6e8f92cdb573f5b93c47665d172f9cec
MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.4.0.ebuild b/media-libs/dav1d/dav1d-0.4.0.ebuild
new file mode 100644
index 000000000000..2ac427eee5dc
--- /dev/null
+++ b/media-libs/dav1d/dav1d-0.4.0.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+SCM=""
+if [[ "${PV}" == "9999" ]]; then
+ SCM="git-r3"
+ EGIT_REPO_URI="https://code.videolan.org/videolan/dav1d"
+else
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+ SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
+fi
+
+inherit ${SCM} meson ninja-utils multilib-minimal
+
+DESCRIPTION="dav1d is an AV1 Decoder :)"
+HOMEPAGE="https://code.videolan.org/videolan/dav1d"
+
+LICENSE="BSD-2"
+SLOT="0/2"
+IUSE="+8bit +10bit +asm"
+
+ASM_DEPEND=">=dev-lang/nasm-2.13"
+RDEPEND=""
+DEPEND="${RDEPEND}
+ asm? (
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )
+ )"
+
+DOCS=( README.md doc/PATENTS )
+
+multilib_src_configure() {
+ local -a bits=()
+ use 8bit && bits+=( 8 )
+ use 10bit && bits+=( 16 )
+
+ if [[ ${MULTILIB_ABI_FLAG} == abi_x86_x32 ]]; then
+ build_asm=false
+ else
+ build_asm=$(usex asm true false)
+ fi
+
+ local emesonargs=(
+ -D bitdepths=$(IFS=,; echo "${bits[*]}")
+ -D build_asm=$build_asm
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ eninja
+}
+
+multilib_src_install() {
+ DESTDIR="${D}" eninja install
+}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 3315a0dfa4c3..2ac427eee5dc 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -18,7 +18,7 @@ DESCRIPTION="dav1d is an AV1 Decoder :)"
HOMEPAGE="https://code.videolan.org/videolan/dav1d"
LICENSE="BSD-2"
-SLOT="0/1"
+SLOT="0/2"
IUSE="+8bit +10bit +asm"
ASM_DEPEND=">=dev-lang/nasm-2.13"
diff --git a/media-libs/devil/Manifest b/media-libs/devil/Manifest
index 5e92d8290724..c17688bb2659 100644
--- a/media-libs/devil/Manifest
+++ b/media-libs/devil/Manifest
@@ -6,5 +6,5 @@ AUX devil-1.7.8-libpng14.patch 1221 BLAKE2B 970fa563cbfc333b7529392d52d1cd640ed7
AUX devil-1.7.8-nvtt-glut.patch 2493 BLAKE2B 4f96f75a6a49c1cdd4b3b89101be693ce4aa851c54aed3d09db752cece3c909085a53ef26e530dad70c70c00b522656ee4b2d6f5c3f83a22244d7eb4999d6566 SHA512 c9adacd0b2c2c1d8980ee87b69b27f0bd3f7f3285ef695499ee90bf4aff55cd8f65c990590478a45d02257c8bb9f01ccc463afe9313efe31a02ee67e15b3207f
AUX devil-1.7.8-restrict.patch 587 BLAKE2B 265496bb262c945812182764903497d3b4b851eb48980d32197a7d732337ded032272544f7aef1cd725a796093ed274bf38b43bb4138b3bf199de2601a9c5732 SHA512 9370a94406e98979266d027857d7dd04069eefb6e2ccfb52d254b9eb658d932e5e7e9bd3a38aad57099b870c54aaa0a2d8b337f9bad42d06f6521c10d0a6f8db
DIST DevIL-1.7.8.tar.gz 2051993 BLAKE2B 7c06549f7d90965fe6dcd7c6b460119a8491ca50f3103c745195fa5483885878717e9ae417eda51f25cbb60c0a96be180b12727115212709199ded13156ecb3e SHA512 a67e1488d6cb366431d9fcb460b8fe5b8a1dd79426ac77f8abd0db4a5aad7512697f72ef0c49ddb0e806469cc37ba1319e10ccd2ebd73942332df2c3c507458e
-EBUILD devil-1.7.8-r2.ebuild 2179 BLAKE2B bebf9505ef4a83d834503cb4e6adf9ec0c79ebfb06256d4fb30bf3de847ad7247dd5cded55f2fe928df18b95a1bb63403f95c5873edd8244d63a52c9dd076056 SHA512 aaed7e62676e65f3d18fc98bc7740bded30e9e32e60911e71cdbfb9518e568d23cdc867c454952812fe74074780418fb84ada8d12880c318c41db86977f81690
+EBUILD devil-1.7.8-r2.ebuild 2127 BLAKE2B 2182ec8999f3ec83b93dc1e247a61f5ed2f383d54b8901f40ec1c11e933916235d725e60f8a8423a6f7cc4eb131f225014c015187dcd3fa28d1a600b3372c570 SHA512 e98887fbb86ee933bba86c1b3538e34a3ebb0b6361b4e49b554a85a69feeb1dd652233565c13043c5763781a6a63330c12f0d3b15ff91951b23b7a46fab9778f
MISC metadata.xml 499 BLAKE2B 44a05534504849bd393e8b60ca5d7ce0e1b7862fea7bf120ca7f1d4f38d21e9d4566b3037fc9dc9d403f7b8732c175693d3594fb1603d53642354f3a07cf8951 SHA512 68440791a1c641a6983d297e924bee78038905b1ee383592b220f0ef51980d8f9eb237a6d70b0d848781d08e72fe02f4b4f36691d37a72b4003ea59fe3764cfc
diff --git a/media-libs/devil/devil-1.7.8-r2.ebuild b/media-libs/devil/devil-1.7.8-r2.ebuild
index 15e294645407..fad8f814c325 100644
--- a/media-libs/devil/devil-1.7.8-r2.ebuild
+++ b/media-libs/devil/devil-1.7.8-r2.ebuild
@@ -14,14 +14,13 @@ SRC_URI="mirror://sourceforge/openil/${MY_P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
KEYWORDS="amd64 ~arm arm64 ~hppa ~mips ppc ppc64 x86"
-IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg jpeg2k mng nvtt openexr opengl png sdl static-libs tiff X xpm"
+IUSE="allegro cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 gif glut jpeg mng nvtt openexr opengl png sdl static-libs tiff X xpm"
RDEPEND="
allegro? ( media-libs/allegro:0 )
gif? ( media-libs/giflib:= )
glut? ( media-libs/freeglut )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
mng? ( media-libs/libmng:= )
nvtt? ( media-gfx/nvidia-texture-tools )
openexr? ( media-libs/openexr:= )
@@ -65,7 +64,7 @@ src_configure() {
$(use_enable openexr exr) \
$(use_enable gif) \
$(use_enable jpeg) \
- $(use_enable jpeg2k jp2) \
+ --enable-jp2 \
$(use_enable mng) \
$(use_enable png) \
$(use_enable tiff) \
diff --git a/media-libs/exiftool/Manifest b/media-libs/exiftool/Manifest
index 8e54e7662e93..ca1d388fa7b4 100644
--- a/media-libs/exiftool/Manifest
+++ b/media-libs/exiftool/Manifest
@@ -1,7 +1,7 @@
-DIST Image-ExifTool-11.54.tar.gz 4598312 BLAKE2B 2543f56a9d7b59d085bf147a51f90be3764093853a66f522cc8ea96caefa0389a64cc1c2ae18d9eb1d79dd97f406c13a561c495a249c025b5cb6bd3af3acd5c6 SHA512 3d21ac6208b2410b9e39afc21738da14528fa891a4115472b66a489345bcc9580c922924c6060c413cef30671a7508bc5ec1ce9ec6c3645838210f025059d37f
DIST Image-ExifTool-11.60.tar.gz 4610485 BLAKE2B 25cd45b20a1089be4894ccc645cee81b55099f46eed55b8d67f624bbac8618f46e1bb78ad19dc88c330231fa974a1a96311d305e09bd13f0dce2d69cf1acbb21 SHA512 e5d104a4b849af903f721bd9cc2898d84f4e7ea6d7a1e3619ba99626ac29ec8e0c02e7a63347787385af3262e77e6da7dbaec06d63c33a931ad1ffce059613fc
-DIST Image-ExifTool-11.61.tar.gz 4611695 BLAKE2B 560d9512a2d89f5e959d44088fa340a53b26c57cef729aab2f5975d85b8415fc0c4d160657d98b20aa4d03b144f274ce67458cc48dcbe969aacdf9f75073e0b1 SHA512 b0a39cf2afee0fec4e8f881a7a8e2660527bf92e97078fb456a4798c3f8091830ee46366c1d3ad106eed529967ed078179ac1e37220facf3319a186582f83d2f
-EBUILD exiftool-11.54.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
-EBUILD exiftool-11.60.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
-EBUILD exiftool-11.61.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+DIST Image-ExifTool-11.63.tar.gz 4616559 BLAKE2B 343d3b19f18d1fc1b0c4073bd24bf596bea35ed3ef4c98899df89d8cc0ce24f07571333208a98b274a50726a051e84d7d1e02f25ed65201a7798320970afb0c6 SHA512 ba58e36c5ec55c521e5610bbbf39831cc76e64f3d9cd2179d0540b987dc4f182e39edf76a7ffa4270473f9eb41800390946b3ca567eef38b023b71ceabc48a3b
+DIST Image-ExifTool-11.65.tar.gz 4622048 BLAKE2B ed8359f40c897b9296450b1cbda1f107a2ee7bc40012e4c74e07712e002be29fd73dd6efa8ea1af5ede2ea868ff5ceab0ff375a9be576bf7277414a6b49854e5 SHA512 7e76fddf9e25b80dfa6c0d59c5ef80708261e1d5529d40051e43ebb476bf8ed1716892075d3faaa3ee2239bde236acb46b4a7906fb689707b90080a752f55011
+EBUILD exiftool-11.60.ebuild 605 BLAKE2B 321361a04e5d97128b6d1bfcb845150b287b4a47e57b8a512d7fda58684b67393a1455f6a40eee426c5240dd1160bbd656783c1c4b02966a7808be9b73d40c78 SHA512 88d9ba9249f429d2d36c516298b9461f36bfea90f6025b770fc9012ee4d182f83ffcce76e0010f19eaa1b8bfe5b80de1c7c07d76ff127a044f78e42accc1768a
+EBUILD exiftool-11.63.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
+EBUILD exiftool-11.65.ebuild 610 BLAKE2B e3d631967c3970948f44d2fb65d4bd49e5520cf2bad7e2113db9d9ee699d676eb4e7c7f26fce256169aac4be26eb4d4c7e1ef6d07ce9d7f500a7f1a4d8317e8b SHA512 2f03d0599dc67f567878cdec992a41fa27fb6e137b0ead6efe41b411338d9dd4b6aca397ccdf0a9553f7315f2fbe68e50ece85d0e705fef7c1857b56b3c9f026
MISC metadata.xml 10159 BLAKE2B 3b879f3679b07864e8e32d0223d1512919d56ede4b51bc5a550a83694c8c956c6e6e60a92309ceafef61ed738ccd0b5a6817094b4132be013560d3d7830f6349 SHA512 88662e634877bf2b67144fd37a862626e247f7df5daa82ed8d7a91a00611290d3976687221b5f58b78111a8894d45d55c8999966436f621baebf1bc7b3561484
diff --git a/media-libs/exiftool/exiftool-11.60.ebuild b/media-libs/exiftool/exiftool-11.60.ebuild
index d65975820b77..3afc7ec316dc 100644
--- a/media-libs/exiftool/exiftool-11.60.ebuild
+++ b/media-libs/exiftool/exiftool-11.60.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
+KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
IUSE="doc"
SRC_TEST="do"
diff --git a/media-libs/exiftool/exiftool-11.61.ebuild b/media-libs/exiftool/exiftool-11.63.ebuild
index d65975820b77..d65975820b77 100644
--- a/media-libs/exiftool/exiftool-11.61.ebuild
+++ b/media-libs/exiftool/exiftool-11.63.ebuild
diff --git a/media-libs/exiftool/exiftool-11.54.ebuild b/media-libs/exiftool/exiftool-11.65.ebuild
index 3afc7ec316dc..d65975820b77 100644
--- a/media-libs/exiftool/exiftool-11.54.ebuild
+++ b/media-libs/exiftool/exiftool-11.65.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://www.sno.phy.queensu.ca/~phil/exiftool/ ${HOMEPAGE}"
SRC_URI="https://www.sno.phy.queensu.ca/~phil/exiftool/${DIST_P}.tar.gz"
SLOT="0"
-KEYWORDS="amd64 arm64 ppc ppc64 x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~x86 ~x64-macos"
IUSE="doc"
SRC_TEST="do"
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index a97f6184b67e..45e00a33dbf2 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -17,14 +17,14 @@ DIST gegl-0.3.26.tar.bz2 6530788 BLAKE2B 1cd1a61737ec94cb30fdf16ca8dcb5667ebaa48
DIST gegl-0.3.34.tar.bz2 6707964 BLAKE2B 4424a2c218067bd0a77d79c2334528da393350db3062019f3889b8cdb8d222f6e436ccfc845b61fdf425a1634698a7a6963702a29bb1666f515b1395c50dc99f SHA512 a7a394dcce4137d5224163ca324f1585e64d1cc797e77d452ba444afe2bff39aa2e2d5d040d07b394697b75162bc310bc51490a5af80240b26aac14b6e7abe02
DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66ffed68072add3ea6afc9da3b47c9854eb4e1799c61f451287b244bee4dfc8942365f556a0e820dd7485b9fc305 SHA512 1fcec83a961c0b9c98487de99d26893f98a5401816fa6d7238af4c645672d0eb0474cdb7251b8ebcd344aff589e8979bee0304b50fcfae9513fdbf8a02068e3b
DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
-EBUILD gegl-0.2.0-r2.ebuild 4777 BLAKE2B ed7a2d4ee08e7b0b9ca6f657e7cbec1acb5a1269f0eec3cd3cb6861f585c3be38381a3f754e16ab5243b4bc0c05f3db7912dd204b31fe1c9439c7050b1c941c9 SHA512 ab067c5e98dc06f8de2cf6d3f6e4914485c2c9845a7d7840d7d51ddb0f7875bcd40fdf0a0c1331271f70c1326c95839b10ce1167bc9d86c647e31c212fdbfe80
-EBUILD gegl-0.2.0-r5.ebuild 4984 BLAKE2B 46d4f811b53c6db09ca75f93bb07c68cc9094e4e790e6fbdbcad29680c1e39173577b06474dfaefe1abab0b0e14d6bd836adbfb33dbb9f0907b6ef2fc507990b SHA512 da64b73c555f36830d5e6641eef87008d868c566ed5adaed7de3bad519a1d091c189643859b1b30ee025eadb54a1add9847a67839a5006b207bf558e423f2f32
-EBUILD gegl-0.2.0-r6.ebuild 5028 BLAKE2B 88cc7d5f327c6379555f7b6a6843d72e505b72ce6515b008762e1255298d05d4b11a6e14ac17bc9975e3963d91145b7dd1d0b3b1c63e6de285fc8afd23e766e8 SHA512 4e2a290c7c0c627a8bb9f96ae401fd78522ec1da7281a57583bbf34f3c65096a3706a86ea63e7f2d46ad9df227c83a2c1ed3a17a29436bf49d42523ecb06a4c5
-EBUILD gegl-0.3.0-r1.ebuild 5383 BLAKE2B ed633ea1a6331b918632a11811b248872508891fa40c21cd17d4f0b19f1463d675b5b1b7180acf904ee9f08dfa1420ae881c5c4cc7e7ff7d71e92e1e70e00e98 SHA512 21587a2c02c1d5f96ee346251271f188ea5fe1cd2711e0005c583535cd90e47d4c8ac119c2d95efa6ff5767e1c5e53802c0b25a9e0dd0b8a2124b629305e9c70
-EBUILD gegl-0.3.0.ebuild 5302 BLAKE2B 9af5ed46f899c5b2bc34c8da9763ac0fb777135bfda816b53a29b2a4dbaa67a441d26b27ce9112cc686c11f2b182bde320b46bb0dacb519a365a7083051949d0 SHA512 089ef4ca7d2833248af322062bdc05f3f155fd7cc9aa67c89e0567d0c7b6a08bb2ab2bceb54e8c0bb790f8caab4bd2418f3885f7f7cc288014f05064163eb6af
-EBUILD gegl-0.3.26.ebuild 5233 BLAKE2B 26efbb8ea85b7b55231801f735b689ff0fccc93fa64c9dfaad33b8819c786f16c57cb7af9bc8da1b74ede6ca72e2dd2e67712dc5c5a2fc26bc833177a9e98f93 SHA512 7516b2ceb2c18b90ae48306765154a33405a38cba39c9531a18d7827408f4a0286e72f51e21fea37493df5f143af8fd302d82f2287de296d6e817947ad6f1f10
-EBUILD gegl-0.3.34.ebuild 5366 BLAKE2B 5de40f7719f3e7376c3fca95eefc3f7a45a1312eb7430df7d192771ca48c614995b50340fab56bb70deb489d51f5666817a9c80b646170c34cb52d3f1ac05b5a SHA512 09cafab516cc80478674476c579fedd38a202c6eac0517fe8f9b3078126708b670714bd00145236be819a9c7fe8d959eb6dd2c189383889d9783ec20b3acd104
-EBUILD gegl-0.4.14.ebuild 5034 BLAKE2B ff04f06bfa647db99ea4fc75aa783f003abf31966704139f7b6af679830b1b66d84b32496a19cb85db0b934dacb552ace42f3a07f435d837851a98dbfe5b8a36 SHA512 1e90df3fa07e59a75daec2d4d9eaebb43179b5cd4ffeff74203869288d20c8eeeb6b6cd6462f1f356b51e50a15cf7861e290a5d8c7d5d5848e604fa794748e54
-EBUILD gegl-0.4.16.ebuild 4921 BLAKE2B d2b59d69d4aedf53471cd4a5eef5728a4b2c75f58239f70d4452fe00c22619a28d64df1563a9c4570426f7441bee9bbc6d5652745a472a0d5fc2591b7021e05c SHA512 842175c0de307c8ce8f7ae617ade970ac18f071dd42cf250a9f27d7bd0fd7db38a09a6c1f3a0496b62d45ad2cd1d3516cf8b185b8952225877920a4674954adb
-EBUILD gegl-9999.ebuild 4860 BLAKE2B 9155550f7e4b13980aeb6ea781e817c690c5d0ba79e03adcd8cd3d1e4bc2dbd3d17eaf5e5f6eab5a387d10304376168194696aa43dffd80c777015c6647e1604 SHA512 eaf89e93e24839fb7f2523e10d6a6a714106a4d48d38aca7267d817ece01041f383fe4efddf8bf925ba9d9aab81f0f0fa1444a6d670e382d697afdad7812a043
+EBUILD gegl-0.2.0-r2.ebuild 4715 BLAKE2B 4c6e8445587cff6ad1c44eee4b40bcbf57e5d573242e8794aedeba19b6065a58d02c72a1951f2b31a5601c6b124e30ebb207a06f5aadc5e4b846294f717ec906 SHA512 16048b6ac471d9af936df2285380303012fd538d57b35c67b073ff54ad952417260cbea51403c11844547a4f69c16e65eb460fbfb43ef05bbb9e8dd338102b00
+EBUILD gegl-0.2.0-r5.ebuild 4922 BLAKE2B ede5b2bd0934ab7a5c82ce33532925f8c0b10b30bbc8cb89744cd9603c066398a787a99b308635760315aa231dae4eb35da1db25adb17ccf93c11f0c00b9e79e SHA512 d493f0217dc590c8b1df84fe43b08f44c6f55d6e720edf7a091b36cf7ea6c36ad06b4df2c930d6a7ff9595d15d220c8cf1d4256db2fef90d5bdf1b3ac8bf5a3d
+EBUILD gegl-0.2.0-r6.ebuild 4969 BLAKE2B 495c5c1be600b709fe63af6e20702368a307766f7175c7f5b953bd00c1df6e91c8ffd13f32be27abdc1450f9a548c8f7566543719476028dc92ed51b61d6dbce SHA512 a8fd04a2449fbd2cbbc4227c797aaf0d5dd42167e87b599f0203f24e61516318a242a091180de5956d8a473f76520123bb661c123b20a00cd72102e2e788f2b6
+EBUILD gegl-0.3.0-r1.ebuild 5321 BLAKE2B 917874f80c58690d7053366b5cbf11ebe10fca3d775515d9255b4d966c2d894617d75dc2134af61f497c5d09c4fe05c7b9bb156e3783fbab628ff89adb947257 SHA512 c01caae58f8008909e131ee03fcd92d225703d13a442df9371e77d0dafb3245778a244930b6827c714d66beb297e8829d220ed2a51bd02416ec010bd726aa35a
+EBUILD gegl-0.3.0.ebuild 5240 BLAKE2B 46019ac823a517365f33f28231b6f77b93c4b10eb9378e511a453b795eb5ba9ef08391e6a2687e724357befead82bce42cd4bf3c71962774f0e128c668191782 SHA512 31a7619e95d995f6fc4ae46bd404cd1a526970c4e49869c4b78623528588b708da6c8db60c2bbe010bae0601e3ca387bee520adcd3eea42c21cb02bf290ac9d3
+EBUILD gegl-0.3.26.ebuild 5174 BLAKE2B c7808b15a796bedce4067ab5ba961edad3f370119aedf81b17faf7d70a5a5f3da2f58acbe2f3c41edf59859a822cb07f7684d56db0bbec25f32b39854a4b4f6a SHA512 ff10de4870e4393e38036cd0dc81e2dfafd2ad713ba98f8c3847b96e5aac4e9ea842232f8c2dffe134eb08975dfd8063fc4dc7ec513e80d113916f84411977c6
+EBUILD gegl-0.3.34.ebuild 5307 BLAKE2B 6c03b2f9499b47e8b1986b0196cf4fa7ea8fb0df2c6e82e8508bda61591660e213269bf604d059718f7f9581c2e7661722521ce83c2f88e63bbef68c06966479 SHA512 b1b5c080f80c981b0a5ea2d40567ff283f181e08983401abfad5ec4449ed8509766a509f17b46eb5ddd00566a031d6371139b57c330ef978b6c57d8ce88261cf
+EBUILD gegl-0.4.14.ebuild 4975 BLAKE2B 7b035e9b96710d3dcb30b7d88d18deea3722ac491cdefce7c9b7d3d1611ba7ef30f700202f44d8a558b8f7b7116c6f7b9622e18e6b7df29b4baa8a9155533a5c SHA512 587511473e344d4b4e7b5b78c0830aa2982a1537f8e089a05775aa0b09d299b13e64b0b00fb4fe3ad9fce626442d9c12172eb8ea0705657e6767a844503ad0b0
+EBUILD gegl-0.4.16.ebuild 4862 BLAKE2B 14985dd5ed6c6979bdc62eb0920485b5d71a551c30485836db6996c74de00f215c6a5db1a6f672d127d28495fe69c7e8638f736d3a68c63421a7232016bd6e78 SHA512 10bb8071022ace6d447a5854d142527daf72763cf954a92dcb02a634e39e0fd9b3baadf1f472b50e0eb02706e98bcfebf88fae03e6f2af37a905a11b9c142678
+EBUILD gegl-9999.ebuild 4801 BLAKE2B a503b8a5be5862b6f574a794b77d160780982cae9e70d9a832888a97dc51e954193726e74ee9fa468fcc2fb2376614defb2f8c21766b35cf233c342fa88baf84 SHA512 63d36d57ae51e86b9ad9aca49af8616b4a1b2fd86c5b554aa12ad335a9c077aa32295c5fec0c6fd189744bd4bb8a9a74f4158c3ca96b416cf6041e7bab522ff2
MISC metadata.xml 396 BLAKE2B aeb29a940e3747b4ea2418e3723c549291cbfd49d8152c75fcc9116b46892eac29338b36875b32c7f3968deecf142296b0f9725d02a80a0380dfba6fba17d810 SHA512 7530e0bc7d86a57334d1dc6fc75b6acc1eb3512c2618d1ed47bbc025aa95f72fa1d41b78765ae53721ea794538d22df1be22189dd54e30fa4bf94e7f0cdced1a
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index f0d4ba5afc4a..aad4c1cd8862 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0"
KEYWORDS="alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
RDEPEND="
>=media-libs/babl-0.1.10
@@ -32,7 +32,6 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/jasper-1.900.1:= )
openexr? ( media-libs/openexr )
png? ( media-libs/libpng:0= )
raw? ( =media-libs/libopenraw-0.0.9 )
@@ -125,7 +124,7 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-graphviz \
$(use_with jpeg libjpeg) \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
--without-lua \
$(use_with openexr) \
$(use_with png libpng) \
diff --git a/media-libs/gegl/gegl-0.2.0-r5.ebuild b/media-libs/gegl/gegl-0.2.0-r5.ebuild
index fff2f22ff18a..6f8434819a09 100644
--- a/media-libs/gegl/gegl-0.2.0-r5.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0"
KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
RDEPEND="
>=media-libs/babl-0.1.10
@@ -32,7 +32,6 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/jasper-1.900.1:= )
openexr? ( media-libs/openexr )
png? ( media-libs/libpng:0= )
raw? ( >=media-libs/libopenraw-0.1:0= )
@@ -135,7 +134,7 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-graphviz \
$(use_with jpeg libjpeg) \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
--without-lua \
$(use_with openexr) \
$(use_with png libpng) \
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index cf53c1f3df96..9aeec0f2c2e2 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -18,7 +18,7 @@ LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0"
KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="cairo debug ffmpeg jpeg jpeg2k lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
+IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
RDEPEND="
>=media-libs/babl-0.1.10
@@ -32,7 +32,6 @@ RDEPEND="
!libav? ( >=media-video/ffmpeg-4:0= )
)
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( >=media-libs/jasper-1.900.1:= )
openexr? ( media-libs/openexr )
png? ( media-libs/libpng:0= )
raw? ( >=media-libs/libopenraw-0.1:0= )
@@ -136,7 +135,7 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-graphviz \
$(use_with jpeg libjpeg) \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
--without-lua \
$(use_with openexr) \
$(use_with png libpng) \
diff --git a/media-libs/gegl/gegl-0.3.0-r1.ebuild b/media-libs/gegl/gegl-0.3.0-r1.ebuild
index d3ddca6e6f44..ce9b36b0372a 100644
--- a/media-libs/gegl/gegl-0.3.0-r1.ebuild
+++ b/media-libs/gegl/gegl-0.3.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,7 +26,7 @@ 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 jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
@@ -44,7 +44,6 @@ RDEPEND="
)
introspection? ( >=dev-libs/gobject-introspection-1.32 )
jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( >=media-libs/jasper-1.900.1:= )
lcms? ( >=media-libs/lcms-2.2:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
openexr? ( media-libs/openexr )
@@ -148,7 +147,7 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-graphviz \
$(use_with jpeg libjpeg) \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
$(use_with lcms) \
$(use_with lensfun) \
--without-lua \
diff --git a/media-libs/gegl/gegl-0.3.0.ebuild b/media-libs/gegl/gegl-0.3.0.ebuild
index e106b3ee26bc..b86bd58c0880 100644
--- a/media-libs/gegl/gegl-0.3.0.ebuild
+++ b/media-libs/gegl/gegl-0.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -26,7 +26,7 @@ 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 jpeg jpeg2k lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg lcms lensfun libav openexr png raw sdl svg test umfpack vala v4l webp"
REQUIRED_USE="vala? ( introspection )"
RDEPEND="
@@ -44,7 +44,6 @@ RDEPEND="
)
introspection? ( >=dev-libs/gobject-introspection-1.32 )
jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( >=media-libs/jasper-1.900.1:= )
lcms? ( >=media-libs/lcms-2.2:2 )
lensfun? ( >=media-libs/lensfun-0.2.5 )
openexr? ( media-libs/openexr )
@@ -146,7 +145,7 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-graphviz \
$(use_with jpeg libjpeg) \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
$(use_with lcms) \
$(use_with lensfun) \
--without-lua \
diff --git a/media-libs/gegl/gegl-0.3.26.ebuild b/media-libs/gegl/gegl-0.3.26.ebuild
index f39cb535af1a..2efd65a82028 100644
--- a/media-libs/gegl/gegl-0.3.26.ebuild
+++ b/media-libs/gegl/gegl-0.3.26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -24,7 +24,7 @@ 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"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
REQUIRED_USE="
svg? ( cairo )
vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
)
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:= )
@@ -149,7 +148,7 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-gexiv2 \
--without-graphviz \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
$(use_with lcms) \
$(use_with lensfun) \
--without-lua \
diff --git a/media-libs/gegl/gegl-0.3.34.ebuild b/media-libs/gegl/gegl-0.3.34.ebuild
index f8d856ccf08c..5c8d5871daa0 100644
--- a/media-libs/gegl/gegl-0.3.34.ebuild
+++ b/media-libs/gegl/gegl-0.3.34.ebuild
@@ -24,7 +24,7 @@ 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"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun openexr raw sdl svg test tiff umfpack vala v4l webp"
REQUIRED_USE="
svg? ( cairo )
vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
)
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:= )
@@ -151,7 +150,7 @@ src_configure() {
$(use_with ffmpeg libavformat) \
--without-gexiv2 \
--without-graphviz \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
$(use_with lcms) \
$(use_with lensfun) \
--without-lua \
diff --git a/media-libs/gegl/gegl-0.4.14.ebuild b/media-libs/gegl/gegl-0.4.14.ebuild
index 5bd3966b05ee..aa1e3dfdf967 100644
--- a/media-libs/gegl/gegl-0.4.14.ebuild
+++ b/media-libs/gegl/gegl-0.4.14.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
REQUIRED_USE="
svg? ( cairo )
vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- 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-2.2.0:= )
@@ -136,7 +135,7 @@ src_configure() {
$(use_with cairo)
$(use_with cairo pangocairo)
$(use_with ffmpeg libavformat)
- $(use_with jpeg2k jasper)
+ --without-jasper
$(use_with lcms)
$(use_with lensfun)
$(use_with openexr)
diff --git a/media-libs/gegl/gegl-0.4.16.ebuild b/media-libs/gegl/gegl-0.4.16.ebuild
index c45193011d15..53a84339c68b 100644
--- a/media-libs/gegl/gegl-0.4.16.ebuild
+++ b/media-libs/gegl/gegl-0.4.16.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
REQUIRED_USE="
svg? ( cairo )
vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- 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-2.2.0:= )
@@ -133,7 +132,7 @@ src_configure() {
$(use_with cairo)
$(use_with cairo pangocairo)
$(use_with ffmpeg libavformat)
- $(use_with jpeg2k jasper)
+ --without-jasper
$(use_with lcms)
$(use_with lensfun)
$(use_with openexr)
diff --git a/media-libs/gegl/gegl-9999.ebuild b/media-libs/gegl/gegl-9999.ebuild
index 2a01f502b352..9655bb544e66 100644
--- a/media-libs/gegl/gegl-9999.ebuild
+++ b/media-libs/gegl/gegl-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="http://www.gegl.org/"
LICENSE="|| ( GPL-3+ LGPL-3 )"
SLOT="0.4"
-IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection jpeg2k lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
+IUSE="cairo cpu_flags_x86_mmx cpu_flags_x86_sse debug ffmpeg +introspection lcms lensfun libav openexr pdf raw sdl svg test tiff umfpack vala v4l webp zlib"
REQUIRED_USE="
svg? ( cairo )
vala? ( introspection )
@@ -47,7 +47,6 @@ RDEPEND="
!libav? ( media-video/ffmpeg:0= )
)
introspection? ( >=dev-libs/gobject-introspection-1.32:= )
- 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-2.2.0:= )
@@ -129,7 +128,7 @@ src_configure() {
$(use_with cairo)
$(use_with cairo pangocairo)
$(use_with ffmpeg libavformat)
- $(use_with jpeg2k jasper)
+ --without-jasper
$(use_with lcms)
$(use_with lensfun)
$(use_with openexr)
diff --git a/media-libs/grilo/Manifest b/media-libs/grilo/Manifest
index b1e0b9513837..1a4488ad1954 100644
--- a/media-libs/grilo/Manifest
+++ b/media-libs/grilo/Manifest
@@ -1,3 +1,5 @@
DIST grilo-0.3.7.tar.xz 232544 BLAKE2B 2d1f7942b09808bb5e09040b4a633a6bd354220ba1369d31ff6160c12ab15c1e2642617ae7f35c8320d7a5842736d8714c6e7dc7f3cb0651d841b6513633f5c9 SHA512 82c41d63edc23c056e189a73b0de87db342bba575d42efeda78ed4bf78fb8994111a2e9457e6f2453045b9b7b2d171b9e89d71c3a107cfa06af24644d9cb71df
+DIST grilo-0.3.9.tar.xz 233616 BLAKE2B c22b868d5bcb6731024b212d6bc1502b493950e363127202ded0ed80f3e937bf78062ba6f2803e29f686ff8cfc521147e69b8f4a7b33060d81e30f34a231e37b SHA512 250596f277ea76d8f6a071fb0e48dd7ea735a534f48a4f2e3f69f7c62a2b5b4c995714a8435ffa9107345e86bba5b21fc136cc47b956f461723a00d0e6ede9bf
EBUILD grilo-0.3.7.ebuild 2053 BLAKE2B 13132593347bd779208414302a0268478867e98ac583673bcb71608f9c72c420e9dae73025bbb5e33994e6ef6c0c3d27c53bd2ed46802df80a10661c6255f23e SHA512 3ec448ba94ee9206379ca5f7676e14471a472ae761edd077ec306fb9aa48841ca4e342fb8c141b1056a6d964f5b3c9dcd5bd0ba0c1bdb968b634472ec2cf130f
+EBUILD grilo-0.3.9.ebuild 2193 BLAKE2B 26b2d5b383080e9068ffff02008fd4df78a2a960abd8fdc63006cd6e3ab01c2942f9fb1a90fd56b737d25d16fee0081671785cb8d7000be4fda6d2ee61b47e57 SHA512 e948ffb4f03d4009a3a8c3a264ce9eeaeb01b27649e53b675ac35949b8bd2e83903492bf330d7c9c3ac8651c0c61127b4eeb378bfbabebb1b162aa91454dd56e
MISC metadata.xml 728 BLAKE2B f552b3317894c70912c17e3e46367198f4451940b5029508f83ba3ce904faea24ed3876195f1b062145582dd268064e0c63636ddd5d6033b7032b392e10abba0 SHA512 bbd75a063a5697c257dd9084961d6519fb71409dcd1375d66ff25218deee87841c822edfa66d440cd5c6bfbad70942f01b30f2b7e1a3cc9727beac23ca717b5f
diff --git a/media-libs/grilo/grilo-0.3.9.ebuild b/media-libs/grilo/grilo-0.3.9.ebuild
new file mode 100644
index 000000000000..f07a46d3c8d4
--- /dev/null
+++ b/media-libs/grilo/grilo-0.3.9.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
+VALA_USE_DEPEND="vapigen"
+
+inherit gnome.org meson python-any-r1 vala xdg
+
+DESCRIPTION="A framework for easy media discovery and browsing"
+HOMEPAGE="https://wiki.gnome.org/Projects/Grilo"
+
+LICENSE="LGPL-2.1+"
+SLOT="0.3/0" # subslot is libgrilo-0.3 soname suffix
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="gtk gtk-doc +introspection +network +playlist test vala"
+REQUIRED_USE="vala? ( introspection )"
+RESTRICT="!test? ( test )"
+
+# oauth could be optional if meson is patched - used for flickr oauth in grilo-test-ui tool
+RDEPEND="
+ >=dev-libs/glib-2.44:2
+ dev-libs/libxml2:2
+ network? ( >=net-libs/libsoup-2.41.3:2.4[introspection?] )
+ playlist? ( >=dev-libs/totem-pl-parser-3.4.1 )
+ introspection? ( >=dev-libs/gobject-introspection-1.54:= )
+
+ gtk? (
+ net-libs/liboauth
+ >=x11-libs/gtk+-3.14:3 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+ dev-util/glib-utils
+ >=sys-devel/gettext-0.19.8
+ virtual/pkgconfig
+ gtk-doc? (
+ >=dev-util/gtk-doc-1.10
+ app-text/docbook-xml-dtd:4.3 )
+ ${PYTHON_DEPS}
+ test? ( sys-apps/dbus )
+ vala? ( $(vala_depend) )
+"
+
+src_prepare() {
+ sed -i -e "s:'GETTEXT_PACKAGE', meson.project_name():'GETTEXT_PACKAGE', 'grilo-${SLOT%/*}':" meson.build || die
+ sed -i -e "s:meson.project_name():'grilo-${SLOT%/*}':" po/meson.build || die
+ sed -i -e "s:'grilo':'grilo-${SLOT%/*}':" doc/grilo/meson.build || die
+
+ # Drop explicit unversioned vapigen check
+ sed -i -e "/vapigen.*=.*find_program/d" meson.build || die
+
+ # Don't build examples; they get embedded in gtk-doc, thus we don't install the sources with USE=examples either
+ sed -i -e "/subdir('examples')/d" meson.build || die
+
+ xdg_src_prepare
+ use vala && vala_src_prepare
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use network enable-grl-net)
+ $(meson_use playlist enable-grl-pls)
+ $(meson_use gtk-doc enable-gtk-doc)
+ $(meson_use introspection enable-introspection)
+ $(meson_use gtk enable-test-ui)
+ $(meson_use vala enable-vala)
+ )
+ meson_src_configure
+}
+
+src_test() {
+ dbus-run-session meson test -C "${BUILD_DIR}" || die
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index 197a06acda0f..b385d2e5df09 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -1,3 +1,5 @@
DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
+DIST gst-plugins-bad-1.14.5.tar.xz 4686916 BLAKE2B b22377fbadf54828e86cc4e0bb17fb9b25efe4394c64eeceb228084e58d0db595622670c6c0a2d87fb760fce34974f9e425a2b810460465130ce1a4c2c679e7d SHA512 64d2a9f6203fbeb3db19816f936f4db32dd8bb7d1f4ce1f958ae795f008e72946e8e2e8bcf8c456c33d5567cb66dc34ca95836c52e404835300a3a5f38d52b6b
EBUILD gst-plugins-bad-1.14.3.ebuild 2626 BLAKE2B bb5337c926fb53f010b1f3898c2a85a08ca429c1dff7bcfb7f88a00259a78b803c660948c3ff635b49725333ddd0dabef3b3373b433ef1af30e54489300a7d85 SHA512 7dfa4c012a4dd7b73b31ba59352c90a3a6ec5aebde1cce1b7262d4f2e6cb832e9bacdd90a82a71b8a8080a4c5b774d6f9088c44954e748267dce09c90cd23202
+EBUILD gst-plugins-bad-1.14.5.ebuild 2634 BLAKE2B 2c25a8926cc468bad259672fab60a9028340b2bf31d21cbfd62b7d7e5967decb0d0ed3ab37f60c03278a7cfd89122bf39520079cac4dc1c53461d6f7f5c6d222 SHA512 a6134e8969f7fa8eba3a7f46fa6e19b16c96e561fe8010260823d0d05a840d40719a2e9950b701013b99126963e512df63bd701ebb57d30b9247895f3c8ad6a5
MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
new file mode 100644
index 000000000000..1c39a3a7fbd8
--- /dev/null
+++ b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.5.ebuild
@@ -0,0 +1,91 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-bad"
+
+inherit flag-o-matic gstreamer virtualx
+
+DESCRIPTION="Less plugins for GStreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="LGPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+
+# TODO: egl and gtk IUSE only for transition
+IUSE="X bzip2 +egl gles2 gtk +introspection +opengl +orc vcd vnc wayland" # Keep default IUSE mirrored with gst-plugins-base where relevant
+
+# X11 is automagic for now, upstream #709530 - only used by librfb USE=vnc plugin
+# We mirror opengl/gles2 from -base to ensure no automagic openglmixers plugin (with "opengl?" it'd still get built with USE=-opengl here)
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP},introspection?]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP},egl?,introspection?,gles2=,opengl=]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+
+ bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] )
+ vnc? ( X? ( x11-libs/libX11[${MULTILIB_USEDEP}] ) )
+ wayland? (
+ >=dev-libs/wayland-1.4.0[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.4
+ )
+
+ gtk? ( >=media-plugins/gst-plugins-gtk-${PV}:${SLOT}[${MULTILIB_USEDEP}] )
+ orc? ( >=dev-lang/orc-0.4.17[${MULTILIB_USEDEP}] )
+"
+
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+"
+
+RESTRICT="test"
+
+src_prepare() {
+ default
+ addpredict /dev # Prevent sandbox violations bug #570624
+}
+
+multilib_src_configure() {
+ local myconf=()
+ if use opengl || use gles2; then
+ myconf+=( --enable-gl )
+ else
+ myconf+=( --disable-gl )
+ fi
+
+ # Always enable shm (shm_open) and ipcpipeline (sys/socket.h); no extra deps
+ gstreamer_multilib_src_configure \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable bzip2 bz2) \
+ $(use_enable orc) \
+ $(use_enable vcd) \
+ $(use_enable vnc librfb) \
+ $(use_enable wayland) \
+ --disable-examples \
+ --disable-debug \
+ --without-player-tests \
+ --enable-shm \
+ --enable-ipcpipeline \
+ "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ local x
+ for x in libs plugins; do
+ ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+ done
+ fi
+}
+
+multilib_src_test() {
+ unset DISPLAY
+ # Tests are slower than upstream expects
+ virtx emake check CK_DEFAULT_TIMEOUT=300
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog NEWS README RELEASE"
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-plugins-base/Manifest b/media-libs/gst-plugins-base/Manifest
index b56a78891830..166de97f7166 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -1,4 +1,7 @@
DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
+DIST gst-plugins-base-1.14.5.tar.xz 3717076 BLAKE2B 461e90df614c60d7efce6fabcf8ad7a5cb68b5fc01b05761fa441d838d3155b5a2e7f9b9420b7e48b2eec49e4bcfbd39009a662db03a923f42c6f45c782795cd SHA512 4e81c44a5ea3b910f96d3e9251ba38a79feacead4f96adb92eab5a650695ca8d5313e3ec1df78fec04376cf3152d2eefd4d39f6c11dadc98a11e55bbf8c8ccdc
EBUILD gst-plugins-base-1.14.4-r1.ebuild 5919 BLAKE2B eb497ebed24ba4775e90d05236714a5c65c9576d6c61a7df3ca25b9677a614db7fcdcaf3f6afb61751fee435e0df296b878dd383c142d7d5d3c39e8a6cab7623 SHA512 298e7adb9daa3447aed8d67c9d3d3672c356d20b11b82fbe51bfb970833baa27c8f9be63ebab3913f34c98c2c50872369831177e307750a181b3962190f210f2
EBUILD gst-plugins-base-1.14.4.ebuild 6061 BLAKE2B bf46ef975e9675c8d55bd807e11074cff4b31dc7d308750ceedd43bb67889473183dc1c83109f4783af4564180b23e14b92787bd4ac2ccc75d28917b03dc14e5 SHA512 9493adf3513a16e4f07fe15d9572e60285817396f43a8ec79fba0a3b37f1e35bf845e3edab2e92454d9b59bcaa69c21702e8de62243905cab45427d6a123f9c1
+EBUILD gst-plugins-base-1.14.5-r1.ebuild 5925 BLAKE2B a18cda341f3165e7b07babd24c5da5b79da835577b8df698f0e9e5a63b9356c88040d1c0ab638eb2489a93c9d042062cf3e34c8129f0f450bd2dde763867d804 SHA512 86332c0a762c8c19002245b7df5b2f117696c7f28ce74541d6e11107ef1c006b6e5abdd2022e04f0f97d3247e8a6bbbb397bfa27d32cc0340ae126f273abc900
+EBUILD gst-plugins-base-1.14.5.ebuild 6063 BLAKE2B dcd3142fe16e772125bf4f178b019c40e58c98ef293e9afac8e68d18ec6228a653acf11377f70071f50869b4d1fdbf0594d87ef13c8b816030cdbbd768fc6462 SHA512 77acc4ddcca654ce6bbc21f28038cd2d4b7a1aca8afecfb330d2889d43a9fa0e0ecb2fb86559ac077dc867cb121f316d8e2f36ae520f13f593bbd501b6336ada
MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
new file mode 100644
index 000000000000..9f40a8032600
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5-r1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+DESCRIPTION="Basepack of plugins for gstreamer"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+
+LICENSE="GPL-2+ LGPL-2+"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+# * glx platform requires opengl API
+# * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+# and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+ || ( gbm wayland X )
+ wayland? ( egl )
+ gbm? ( egl )
+"
+REQUIRED_USE="
+ ivorbis? ( ogg )
+ theora? ( ogg )
+ vorbis? ( ogg )
+ opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+ gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+ >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+ egl? (
+ x11-libs/libdrm
+ )
+ gbm? (
+ >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ )
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ )
+
+ >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+ media-libs/libpng:0[${MULTILIB_USEDEP}]
+ virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+
+RDEPEND="
+ app-text/iso-codes
+ >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+ ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+ orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+ pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+ theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+ vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+ )
+
+ gles2? ( ${GL_DEPS} )
+ opengl? ( ${GL_DEPS} )
+
+ !<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+ X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+ # Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+ sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+ default
+}
+
+multilib_src_configure() {
+ filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+ local myconf=()
+ # FIXME: Automagic gbm and x11 wsi
+ if use opengl || use gles2; then
+ myconf+=(
+ --enable-gl
+ $(use_enable egl)
+ $(use_enable gles2)
+ $(use_enable opengl)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ else
+ myconf+=(
+ --disable-gl
+ --disable-egl
+ --disable-gles2
+ --disable-opengl
+ --disable-wayland
+ --disable-x11
+ )
+ fi
+
+ if use opengl && use X; then
+ # GLX requires desktop OpenGL and X
+ myconf+=( --enable-glx )
+ else
+ myconf+=( --disable-glx )
+ fi
+
+ myconf+=(
+ --disable-cocoa
+ --disable-dispmanx
+ --disable-wgl
+ )
+
+ gstreamer_multilib_src_configure \
+ $(use_enable alsa) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable ivorbis) \
+ $(use_enable ogg) \
+ $(use_enable orc) \
+ $(use_enable pango) \
+ $(use_enable theora) \
+ $(use_enable vorbis) \
+ $(use_enable X x) \
+ $(use_enable X xshm) \
+ $(use_enable X xvideo) \
+ --enable-iso-codes \
+ --enable-zlib \
+ --disable-debug \
+ --disable-examples \
+ --disable-static \
+ "${myconf[@]}"
+
+ # bug #366931, flag-o-matic for the whole thing is overkill
+ if [[ ${CHOST} == *86-*-darwin* ]] ; then
+ sed -i \
+ -e '/FLAGS = /s|-O[23]|-O1|g' \
+ gst/audioconvert/Makefile \
+ gst/volume/Makefile || die
+ fi
+
+ if multilib_is_native_abi; then
+ local x
+ for x in libs plugins; do
+ ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS NEWS README RELEASE"
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+ unset GSETTINGS_BACKEND
+ emake check
+}
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
new file mode 100644
index 000000000000..b0288166ffca
--- /dev/null
+++ b/media-libs/gst-plugins-base/gst-plugins-base-1.14.5.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-base"
+
+inherit flag-o-matic gstreamer
+
+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"
+
+# For OpenGL we have three separate concepts, with a list of possibilities in each:
+# * opengl APIs - opengl and/or gles2; USE=opengl and USE=gles2 enable these accordingly; if neither is enabled, OpenGL helper library and elements are not built at all and all the other options aren't relevant
+# * opengl platforms - glx and/or egl; also cgl, wgl, eagl for non-linux; USE="X opengl" enables glx platform; USE="egl" enables egl platform. Rest is up for relevant prefix teams.
+# * opengl windowing system - x11, wayland, win32, cocoa, android, viv_fb, gbm and/or dispmanx; USE=X enables x11 (but for WSI it's automagic - FIXME), USE=wayland enables wayland, USE=gbm enables gbm (automagic upstream - FIXME); rest is up for relevant prefix/arch teams/contributors to test and provide patches
+# With the following limitations:
+# * If opengl and/or gles2 is enabled, a platform has to be enabled - x11 or egl in our case, but x11 (glx) is acceptable only with opengl
+# * If opengl and/or gles2 is enabled, a windowing system has to be enabled - x11, wayland or gbm in our case
+# * glx platform requires opengl API
+# * wayland, gbm and most other non-glx WSIs require egl platform
+# Additionally there is optional dmabuf support with egl for additional dmabuf based upload/download/eglimage options;
+# and optional graphene usage for gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader;
+# and libpng/jpeg are required for gloverlay element;
+
+# Keep default IUSE options for relevant ones mirrored with gst-plugins-gtk and gst-plugins-bad
+IUSE="alsa +egl gbm gles2 +introspection ivorbis +ogg +opengl +orc +pango theora +vorbis wayland +X"
+GL_REQUIRED_USE="
+ || ( gbm wayland X )
+ wayland? ( egl )
+ gbm? ( egl )
+"
+REQUIRED_USE="
+ ivorbis? ( ogg )
+ theora? ( ogg )
+ vorbis? ( ogg )
+ opengl? ( || ( egl X ) ${GL_REQUIRED_USE} )
+ gles2? ( egl ${GL_REQUIRED_USE} )
+"
+
+# Dependencies needed by opengl library and plugin (enabled via USE gles2 and/or opengl)
+# dmabuf automagic from libdrm headers (drm_fourcc.h) and EGL, so ensure it with USE=egl (platform independent header used only, thus no MULTILIB_USEDEP); provides dmabuf based upload/download/eglimage options
+GL_DEPS="
+ >=media-libs/mesa-9.0[egl?,gbm?,gles2?,wayland?,${MULTILIB_USEDEP}]
+ egl? (
+ x11-libs/libdrm
+ )
+ gbm? (
+ >=dev-libs/libgudev-147[${MULTILIB_USEDEP}]
+ >=x11-libs/libdrm-2.4.55[${MULTILIB_USEDEP}]
+ )
+ wayland? (
+ dev-libs/wayland[${MULTILIB_USEDEP}]
+ )
+
+ media-libs/libpng:0[${MULTILIB_USEDEP}]
+ virtual/jpeg:0[${MULTILIB_USEDEP}]
+" # graphene for optional gltransformation and glvideoflip elements and more GLSL Uniforms support in glshader; libpng/jpeg for gloverlay element
+# >=media-libs/graphene-1.4.0[${MULTILIB_USEDEP}]
+
+RDEPEND="
+ app-text/iso-codes
+ >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:1.0[introspection?,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ ivorbis? ( >=media-libs/tremor-0_pre20130223[${MULTILIB_USEDEP}] )
+ ogg? ( >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] )
+ orc? ( >=dev-lang/orc-0.4.24[${MULTILIB_USEDEP}] )
+ pango? ( >=x11-libs/pango-1.36.3[${MULTILIB_USEDEP}] )
+ theora? ( >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] )
+ vorbis? ( >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}]
+ )
+
+ gles2? ( ${GL_DEPS} )
+ opengl? ( ${GL_DEPS} )
+
+ !<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+ X? ( x11-base/xorg-proto )
+"
+
+src_prepare() {
+ # Disable GL tests for now; prone to fail with EGL_NOT_INITIALIZED, etc
+ sed -i -e '/^@USE_GL_TRUE@/d' tests/check/Makefile.in
+ default
+}
+
+multilib_src_configure() {
+ filter-flags -mno-sse -mno-sse2 -mno-sse4.1 #610340
+
+ local myconf=()
+ # FIXME: Automagic gbm and x11 wsi
+ if use opengl || use gles2; then
+ myconf+=(
+ --enable-gl
+ $(use_enable egl)
+ $(use_enable gles2)
+ $(use_enable opengl)
+ $(use_enable wayland)
+ $(use_enable X x11)
+ )
+ else
+ myconf+=(
+ --disable-gl
+ --disable-egl
+ --disable-gles2
+ --disable-opengl
+ --disable-wayland
+ --disable-x11
+ )
+ fi
+
+ if use opengl && use X; then
+ # GLX requires desktop OpenGL and X
+ myconf+=( --enable-glx )
+ else
+ myconf+=( --disable-glx )
+ fi
+
+ myconf+=(
+ --disable-cocoa
+ --disable-dispmanx
+ --disable-wgl
+ )
+
+ gstreamer_multilib_src_configure \
+ $(use_enable alsa) \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable ivorbis) \
+ $(use_enable ogg) \
+ $(use_enable orc) \
+ $(use_enable pango) \
+ $(use_enable theora) \
+ $(use_enable vorbis) \
+ $(use_enable X x) \
+ $(use_enable X xshm) \
+ $(use_enable X xvideo) \
+ --enable-iso-codes \
+ --enable-zlib \
+ --disable-debug \
+ --disable-examples \
+ --disable-static \
+ "${myconf[@]}"
+
+ # bug #366931, flag-o-matic for the whole thing is overkill
+ if [[ ${CHOST} == *86-*-darwin* ]] ; then
+ sed -i \
+ -e '/FLAGS = /s|-O[23]|-O1|g' \
+ gst/audioconvert/Makefile \
+ gst/volume/Makefile || die
+ fi
+
+ if multilib_is_native_abi; then
+ local x
+ for x in libs plugins; do
+ ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+ done
+ fi
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS NEWS README RELEASE"
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+ unset GSETTINGS_BACKEND
+ emake check
+}
diff --git a/media-libs/gst-plugins-good/Manifest b/media-libs/gst-plugins-good/Manifest
index d67ce1110d0f..975106b8634d 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -1,3 +1,5 @@
DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
+DIST gst-plugins-good-1.14.5.tar.xz 3800104 BLAKE2B acb8ba559c8f4d96cb548fa05e88a556dbfd3aed8572d91cee4fc7b652ab1e814a615713f1372a0acdaa723ddf2d9af9c84c599bc4128b8f61d03bfbc096dcce SHA512 11bfadaf39b28a0a6a6c87c4ade8513496e8f13873cb0c2ddc8b8241029b8775d4839f2de441bda664bc67c66c4ca1d6839dd7570f7d79c1f485d5a25cc9d236
EBUILD gst-plugins-good-1.14.4.ebuild 1431 BLAKE2B 7a88c207f331b2893d3ce9e8a245b45a6300d127eccb0b2a4680f8cc9e39d54874a4e24076fe4d990c094ffb79864ec662adb4a7bc009bfdc8f3bac05aec300c SHA512 8a4f1e7c155d1a55f2f93f98aceb1ff56cf2295a409891e6342ba9357d04c4be4d9bd1411447c992530ab98d4afe868bf4883805e11ea39f0e82cc22701d16ed
+EBUILD gst-plugins-good-1.14.5.ebuild 1439 BLAKE2B 0409679b2c37345ec80fe1bf49d40f690c44edee6cc78092d8748fd22ed9b30d292398758e63941ec1c6f90cbb7b34b08ad614c6a3c0e2efd3ec6bc31ee3add8 SHA512 bac683ae56efb8b9ab7dab3badfd457913f32e236f4770fff081ccb4386208c8f9ed677d6660b4f72aed39582e404ee42a7790487681542f6babc896d7f7bb8e
MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
new file mode 100644
index 000000000000..d4b054018540
--- /dev/null
+++ b/media-libs/gst-plugins-good/gst-plugins-good-1.14.5.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+GST_ORG_MODULE="gst-plugins-good"
+
+inherit 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
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/gst-rtsp-server/Manifest b/media-libs/gst-rtsp-server/Manifest
index 81e614273b6e..1d0483155880 100644
--- a/media-libs/gst-rtsp-server/Manifest
+++ b/media-libs/gst-rtsp-server/Manifest
@@ -1,3 +1,5 @@
DIST gst-rtsp-server-1.14.2.tar.xz 665904 BLAKE2B 3f9ab3c1579d34ec8877bcc6da2802cc69aa444ef1fabfe548e2acf3b1c58eb0e29ffb09c250fb6d2ae61e4847bf2098c22874ec43266d46d5b402cbbbcda892 SHA512 81c64c31cef45479ec23d57b11d09950ca8c04820b6cf422af6caabccd71ad648e210a114f9f020136ddfdfc9e942c3eb15f055778d493d54c8770ed4f93634c
+DIST gst-rtsp-server-1.14.5.tar.xz 672180 BLAKE2B 3e67f703c190e46580cf7c08a9437d51e9c1e009dd27cf359ecd5aa301ddda6cd70c0d5567e72c6e5f9443318e899a9b55e6883c71c9fc021f77286afd89bbc9 SHA512 dbfb63fb219808d2a32d710bef33d2b3b9906300d4c527c72534a4cb6db0f5ce4f4fadcedf7f6a3a5f46005f4408717d9aafa1a510c4aed18f5d07d6b3646492
EBUILD gst-rtsp-server-1.14.2.ebuild 1983 BLAKE2B 44bbb19d0691a24c72f5dd0237fbfecfc6aaf89d6dbc3d346e4bf828ee0543427da5df4c443bd2c634a56716ebff70c67c8edac30f586cd5ecbf607854749a1e SHA512 9f3e868ca8b2aff1d64ba01a6747268643c2c98304db63a117c18c9250af699dcbf3854390c320d05e8620807ca08bb4994f8822ceb09a0fdfbfb73077cdde8f
+EBUILD gst-rtsp-server-1.14.5.ebuild 1985 BLAKE2B 385b06fef47504a0b5ee5435d09de826b1594bc9ee1371ca440c4bcebb5e16a4d3d7a285bbc7968c500550e55ac2a5e2d54f77467b549ea25e5f76d240d96674 SHA512 c4f3d1be98944daae9b9251f5a48436cc03eefc886b99935dff42ffd121c5217e465d2e9e016790d8318940341db8c9df5ef0045ea6a668483a8aa986d5fab58
MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild
new file mode 100644
index 000000000000..e31415b887ee
--- /dev/null
+++ b/media-libs/gst-rtsp-server/gst-rtsp-server-1.14.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit gstreamer
+
+DESCRIPTION="A GStreamer based RTSP server"
+HOMEPAGE="https://gstreamer.freedesktop.org/modules/gst-rtsp-server.html"
+
+LICENSE="LGPL-2+"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples +introspection static-libs test"
+
+# gst-plugins-base for many used elements and API
+# gst-plugins-good for rtprtxsend and rtpbin elements, maybe more
+# gst-plugins-srtp for srtpenc and srtpdec elements
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ >=media-libs/gstreamer-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-base-${PV}:${SLOT}[introspection?,${MULTILIB_USEDEP}]
+ >=media-libs/gst-plugins-good-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ >=media-plugins/gst-plugins-srtp-${PV}:${SLOT}[${MULTILIB_USEDEP}]
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.12
+"
+
+# Due to gstreamer src_configure
+QA_CONFIGURE_OPTIONS="--enable-nls"
+
+multilib_src_configure() {
+ # debug: only adds -g to CFLAGS
+ # docbook: nothing behind that switch
+ # libcgroup is automagic and only used in examples
+ gstreamer_multilib_src_configure \
+ --disable-debug \
+ --disable-valgrind \
+ --disable-examples \
+ --disable-docbook \
+ --disable-gtk-doc \
+ $(multilib_native_use_enable introspection) \
+ $(use_enable static-libs static) \
+ $(use_enable test tests) \
+ LIBCGROUP_LIBS= \
+ LIBCGROUP_FLAGS=
+
+ # work-around gtk-doc out-of-source brokedness
+ if multilib_is_native_abi ; then
+ ln -s "${S}"/docs/libs/${d}/html docs/libs/${d}/html || die
+ fi
+}
+
+multilib_src_install() {
+ emake install DESTDIR="${D}"
+ # Handle broken upstream modifications to defaults of gtk-doc
+ emake install -C docs/libs DESTDIR="${D}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+
+ if use examples ; then
+ insinto /usr/share/doc/${PF}/examples
+ doins "${S}"/examples/*.c
+ fi
+}
diff --git a/media-libs/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index a6ba570fab0b..35f06a1c0642 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,3 +1,5 @@
DIST gstreamer-editing-services-1.14.3.tar.xz 1066740 BLAKE2B c5511ca12eccb08d49733540e2d264290a6ca53ec0d5e9007d354e10808568727ed10bfb205c425fd56d334ef12e30324d67b0dcff8115b3c13d1123fe6026b9 SHA512 5dc4fc65c7ce9604b75516774c4481f3214ed703c0d3bb2a6fa348e5a8a09c963ac711e81e5c91f12f57ab3df63a94d7d178fcd4aab4d4d429f32e055c14a205
+DIST gstreamer-editing-services-1.14.5.tar.xz 1069356 BLAKE2B 95ddff56b56b3ae59872a340258af0277d9b5c3619fe25861ce3f65238d3802bdda3c51cf84f0a206f7ccf095ab81ff3f178b7c0322dc7687741626c3b8da947 SHA512 9b3d0336e596004a51069900c61f293eaf213a83655799139373c77cf5637a3511ba4ec6a1c75f53d81643539e32f7d130fd0cd58090b948f81e8e081226b5c3
EBUILD gstreamer-editing-services-1.14.3.ebuild 1539 BLAKE2B 6f6a6a961099c57bea9c0a0c4c9b3b91c88ffdc51ae078657edbb2ff956a7faa2eb392db1e9a71758d2229ae3bc54959f6ca9a90291bbf647ad7660f9630bb57 SHA512 6a06f9007b0383ce3fa5fbd04fc78be2e0bb2389e43817855864688a3d807f8e02818859b6c0948a96e9228e5eeb3656adabf7cea76099bc33bddbc4dd37a45f
+EBUILD gstreamer-editing-services-1.14.5.ebuild 1541 BLAKE2B e620b4f7bacb9b43107a9b48872c8c9d308420fc634b2f4970c67c4fa37bdf563e2276045757b907fecd173a97ff090377a3ebffc210d12e0c797ed3b3fb0e9c SHA512 afd9010114a91001a7113426c6cd36679c46fa59644cc6e6f3095e42c0f08f4b6207c3bea9bcca025b14d2fbfd0002240500c41d85e9c10a0c71ab7abe27f379
MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
new file mode 100644
index 000000000000..5dcedc7b4efe
--- /dev/null
+++ b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.5.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
+GNOME2_LA_PUNT="yes"
+
+inherit bash-completion-r1 gnome2 python-r1
+
+DESCRIPTION="SDK for making video editors and more"
+HOMEPAGE="http://wiki.pitivi.org/wiki/GES"
+SRC_URI="https://gstreamer.freedesktop.org/src/${PN}/${P}.tar.xz"
+
+LICENSE="LGPL-2+"
+SLOT="1.0"
+KEYWORDS="~amd64 ~x86"
+
+IUSE="+introspection"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ >=dev-libs/glib-2.40.0:2
+ dev-libs/libxml2:2
+ dev-python/pygobject:3[${PYTHON_USEDEP}]
+ >=media-libs/gstreamer-${PV}:1.0[introspection?]
+ >=media-libs/gst-plugins-base-${PV}:1.0[introspection?]
+ introspection? ( >=dev-libs/gobject-introspection-0.9.6:= )
+"
+DEPEND="${RDEPEND}
+ >=dev-util/gtk-doc-am-1.3
+ virtual/pkgconfig
+"
+# XXX: tests do pass but need g-e-s to be installed due to missing
+# AM_TEST_ENVIRONMENT setup.
+RESTRICT="test"
+
+src_configure() {
+ # gtk is only used for examples
+ gnome2_src_configure \
+ $(use_enable introspection) \
+ --disable-examples \
+ --without-gtk \
+ --with-bash-completion-dir="$(get_bashcompdir)" \
+ --with-package-name="GStreamer editing services ebuild for Gentoo" \
+ --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer-editing-services"
+}
+
+src_compile() {
+ # Prevent sandbox violations, bug #538888
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744135
+ # https://bugzilla.gnome.org/show_bug.cgi?id=744134
+ addpredict /dev
+ gnome2_src_compile
+}
diff --git a/media-libs/gstreamer/Manifest b/media-libs/gstreamer/Manifest
index f63fcf8acd80..954cd197dac4 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,3 +1,6 @@
+AUX 1.14-glib-2.60-tests-compat.patch 2173 BLAKE2B 1e7e3320d2eb52f968280e8204e5cbdb2d4fe085fcf77bd798cb474216b758bff3a70f6b0e3f93d656a6e41b44be6c3f931ed5543e4ca10b51d19b4f4f153bc9 SHA512 f559150ac5e40a2fe259a8346ed085a20df86d93e5292c9dcc024274f12e0beb90266395538943946ca01a2a5f56be3ab32f1f850e1c8c047848aebc13ab2350
DIST gstreamer-1.14.4.tar.xz 3264324 BLAKE2B d51febcd7c317964a09dadb4d3bd3ee7a60ac38bef28cdd7d42f49a7b710d6f6180ca7edee1765c8d146f7e3e852e93d0d5f69962089a653cfc3e6bd4ab42f89 SHA512 7ece9f01d40df7c8358482eac94536c5e15261e9568962008e2029e1ee1b3ebb220d2e4802ed1c81c40d897576fafe52234065e273724bfb4df3a3ddf2711abe
-EBUILD gstreamer-1.14.4.ebuild 3395 BLAKE2B 49480169ecdbb0a596bb597f13b8de548bab1b4740cbc60b3d7d824151c05ccc744d969ed17a115d10b165ef7dea78d7bb2db0d09c93e0521c75282ee073fbf2 SHA512 c284e281626f657e3c32c3d96e4403c34efc46131455cabd4e0babd4cf3beddb3401654ddf0b78d427b2d6a490573a52ed7e8b381283d91e8b9c7f7e0db86701
+DIST gstreamer-1.14.5.tar.xz 3268756 BLAKE2B 6ef5bdcb103b4d8fd581ae7342d6d467f4c6919610bdd620e4a531755347d8e3276a50f2e637045b9b97cbf7726495608437c180d37a1019ec8a79ab1bc4e4d6 SHA512 1a97ae17f8fff041db5e24d712d33c7116e408be1fabc2abd7b652b067b6ebe6c0943845a33a21335a5b4fa0a1ba178873158659f761f1e3aab04a969029c5d8
+EBUILD gstreamer-1.14.4.ebuild 3457 BLAKE2B 120784600fd144634542473b1e538a9209e0a851374620404160605ecc8922012136d6ce1d762d8600061d3564ef43b498a5671917d13773fff7074c6bb38ffe SHA512 346cf940cf8931f1cb41eda98ff700f5b7bc8aecc462d753af9456ea5f41ae742dac1d3fe20774653ae108b1e8dfe336d10bbbfb9f44ffa1362895a8a5489eed
+EBUILD gstreamer-1.14.5.ebuild 3465 BLAKE2B ac4e74ddcbaac9b30728ba1a4593ae4a20407d3e2d0d413f0b96713cea178ad4dc2bb42b0779bea45ae2e1b8b26ebd80a81f49ef439c14e0c0419bd019715897 SHA512 8e548d5dc6df7b1363652e0d497c6c841a41410feeee095d7e9ac9843efb595b00f47fc7e8d6b4a076dac945b73b0dd08feb4a5a17f0c863928f51589e95a46f
MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
new file mode 100644
index 000000000000..ca74bf0cc2e6
--- /dev/null
+++ b/media-libs/gstreamer/files/1.14-glib-2.60-tests-compat.patch
@@ -0,0 +1,56 @@
+From 4a7739f4b6442814696bbd0706ab9a1ce1462d80 Mon Sep 17 00:00:00 2001
+From: Havard Graff <havard.graff@gmail.com>
+Date: Wed, 31 Oct 2018 10:27:23 +0100
+Subject: [PATCH] tests/uri: fix test after GHashTable changes in GLib 2.59
+
+Maybe the implementation should not be dependent on a "random" hash-table
+ordering, but at least this shows the problem clearly.
+---
+ tests/check/gst/gsturi.c | 16 +++++++++++++++-
+ 1 file changed, 15 insertions(+), 1 deletion(-)
+
+diff --git a/tests/check/gst/gsturi.c b/tests/check/gst/gsturi.c
+index ee623dbcf..fa87c7c77 100644
+--- a/tests/check/gst/gsturi.c
++++ b/tests/check/gst/gsturi.c
+@@ -414,7 +414,11 @@ static const struct URITest url_presenting_tests[] = {
+ {.uri = {"scheme", "user:pass", "host", 1234, "/path/to/dir",
+ {{"query", NULL}, {"key", "value"}}, "fragment"},
+ .str =
++#if GLIB_CHECK_VERSION(2, 59, 0)
++ "scheme://user:pass@host:1234/path/to/dir?key=value&query#fragment"},
++#else
+ "scheme://user:pass@host:1234/path/to/dir?query&key=value#fragment"},
++#endif
+
+ /* IPv6 literal should render in square brackets */
+ {.uri = {"scheme", "user:pass", "12:34:56:78:9a:bc:de:f0", 1234,
+@@ -977,14 +981,24 @@ GST_START_TEST (test_url_get_set)
+
+ fail_unless (gst_uri_set_query_value (url, "key", "value"));
+ tmp_str = gst_uri_to_string (url);
++#if GLIB_CHECK_VERSION(2, 59, 0)
++ fail_unless_equals_string (tmp_str,
++ "//example.com/path/to/file/there/segment?key=value&query#fragment");
++#else
+ fail_unless_equals_string (tmp_str,
+- "//example.com/path/to/file/there/segment?query&key=value#fragment");
++ "//example.com/path/to/file/there/segment?query&key=value#fragment");
++#endif
+ g_free (tmp_str);
+
+ fail_unless (gst_uri_set_query_value (url, "key", NULL));
+ tmp_str = gst_uri_to_string (url);
++#if GLIB_CHECK_VERSION(2, 59, 0)
++ fail_unless_equals_string (tmp_str,
++ "//example.com/path/to/file/there/segment?key&query#fragment");
++#else
+ fail_unless_equals_string (tmp_str,
+ "//example.com/path/to/file/there/segment?query&key#fragment");
++#endif
+ g_free (tmp_str);
+
+ fail_unless (!gst_uri_set_query_value (NULL, "key", "value"));
+--
+2.20.1
+
diff --git a/media-libs/gstreamer/gstreamer-1.14.4.ebuild b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
index 7bb095742b0f..19677ed3d4f0 100644
--- a/media-libs/gstreamer/gstreamer-1.14.4.ebuild
+++ b/media-libs/gstreamer/gstreamer-1.14.4.ebuild
@@ -34,6 +34,10 @@ DEPEND="${RDEPEND}
"
# gtk-doc-am to install API docs
+PATCHES=(
+ "${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
+)
+
src_configure() {
if [[ ${CHOST} == *-interix* ]] ; then
export ac_cv_lib_dl_dladdr=no
diff --git a/media-libs/gstreamer/gstreamer-1.14.5.ebuild b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
new file mode 100644
index 000000000000..c57c39da037f
--- /dev/null
+++ b/media-libs/gstreamer/gstreamer-1.14.5.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 multilib-minimal pax-utils
+
+DESCRIPTION="Open source multimedia framework"
+HOMEPAGE="https://gstreamer.freedesktop.org/"
+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"
+IUSE="+caps +introspection nls +orc test unwind"
+
+RDEPEND="
+ >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
+ caps? ( sys-libs/libcap[${MULTILIB_USEDEP}] )
+ introspection? ( >=dev-libs/gobject-introspection-1.31.1:= )
+ unwind? (
+ >=sys-libs/libunwind-1.2_rc1[${MULTILIB_USEDEP}]
+ dev-libs/elfutils[${MULTILIB_USEDEP}]
+ )
+ !<media-libs/gst-plugins-bad-1.13.1:1.0
+"
+DEPEND="${RDEPEND}
+ dev-util/glib-utils
+ >=dev-util/gtk-doc-am-1.12
+ sys-devel/bison
+ sys-devel/flex
+ >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
+ nls? ( sys-devel/gettext )
+"
+# gtk-doc-am to install API docs
+
+PATCHES=(
+ "${FILESDIR}"/1.14-glib-2.60-tests-compat.patch
+)
+
+src_configure() {
+ if [[ ${CHOST} == *-interix* ]] ; then
+ export ac_cv_lib_dl_dladdr=no
+ export ac_cv_func_poll=no
+ fi
+ if [[ ${CHOST} == powerpc-apple-darwin* ]] ; then
+ # GCC groks this, but then refers to an implementation (___multi3,
+ # ___udivti3) that don't exist (at least I can't find it), so force
+ # this one to be off, such that we use 2x64bit emulation code.
+ export gst_cv_uint128_t=no
+ fi
+
+ multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+ local completiondir=$(get_bashcompdir)
+ # Set 'libexecdir' to ABI-specific location for the library spawns
+ # helpers from there.
+ # Disable static archives and examples to speed up build time
+ # Disable debug, as it only affects -g passing (debugging symbols), this must done through make.conf in gentoo
+ local myconf=(
+ --libexecdir="${EPREFIX}"/usr/$(get_libdir)
+ --disable-benchmarks
+ --disable-debug
+ --disable-examples
+ --disable-static
+ --disable-valgrind
+ --enable-check
+ $(use_with unwind)
+ $(use_with unwind dw)
+ $(multilib_native_use_enable introspection)
+ $(use_enable nls)
+ $(use_enable test tests)
+ --with-bash-completion-dir="${completiondir%/*}"
+ --with-package-name="GStreamer ebuild for Gentoo"
+ --with-package-origin="https://packages.gentoo.org/package/media-libs/gstreamer"
+ )
+
+ if use caps ; then
+ myconf+=( --with-ptp-helper-permissions=capabilities )
+ else
+ myconf+=(
+ --with-ptp-helper-permissions=setuid-root
+ --with-ptp-helper-setuid-user=nobody
+ --with-ptp-helper-setuid-group=nobody
+ )
+ fi
+
+ ECONF_SOURCE="${S}" econf "${myconf[@]}"
+
+ if multilib_is_native_abi; then
+ local x
+ for x in gst libs plugins; do
+ ln -s "${S}"/docs/${x}/html docs/${x}/html || die
+ done
+ fi
+}
+
+multilib_src_install() {
+ # can't do "default", we want to install docs in multilib_src_install_all
+ emake DESTDIR="${D}" install
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}usr/$(get_libdir)/gstreamer-${SLOT}/gst-plugin-scanner"
+}
+
+multilib_src_install_all() {
+ DOCS="AUTHORS ChangeLog NEWS MAINTAINERS README RELEASE"
+ einstalldocs
+ find "${ED}" -name '*.la' -delete || die
+
+ # Needed for orc-using gst plugins on hardened/PaX systems, bug #421579
+ use orc && pax-mark -m "${ED}usr/bin/gst-launch-${SLOT}"
+}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 4a1ce3f3d7ae..496b8988a60c 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,10 @@
DIST harfbuzz-2.3.1.tar.bz2 17942960 BLAKE2B b1a29144b608463fa668bb66572c1530e90338ac1968b0747011637a91bed4030d77e8fa22e5a229374a0bc1976922e2e8de452e9017917f7c09ae94c3a52570 SHA512 78a8f05bfcc95cfe3fc0f1a595bdc7298c9c1456db6c7ef70914051fda43f37aaff15eac75aa6922eca82d2291baeb8385e02e6aacb44ca05b4873c311a662ac
DIST harfbuzz-2.5.3.tar.xz 5685712 BLAKE2B a9d8a46b6a0667c598ea011f020b09d8fd795105483a8b307ee2a9399de2b84bf3b29659f9a3f7500250879bbb412003ee6f68aaba01b68824bd489615f737e6 SHA512 a2e6cedbe0e505fa31b540e0d0bc6c0b07080bd39879c27e04d351103e21201d75a809dd2fad559bf994b82b311f67ad85778cbbfb670d7e2580beafa09e93ff
DIST harfbuzz-2.6.0.tar.xz 5736808 BLAKE2B 3dcdf71cce8cdb4596d6e622f6fbaeae1a36cf17c219a1bafe077a472f9d25f0a8b8ea7eb36a1e20558d982b36479ce5d3e19f022a5b7dadd563a017b5037767 SHA512 ab055183ae248710f7baee7ef45ac1a6cbd3522eb1e26b78248ac7bc9e421f5495b8fbbd19a339a26bd119f33624eb8742c15c2053407fbb74cce8dcf6c4b3a2
+DIST harfbuzz-2.6.1.tar.xz 5741372 BLAKE2B bb763eba23a37bd20d0ddb39824d5a0c655d6e098aea2e44b6943e7bd5cb1f9a5cd94e3de5520d962e3c476defac43af58f98d0a5b80e5c1506d00bc716ec876 SHA512 cea531ab9db0ae1b188ac56c3ea6e0344192c4321b97d4425f4a53e6bb34c88463a7453fd69fcadccb8574506c1fb5505422019e41a7938a04e7823e3f484c06
EBUILD harfbuzz-2.3.1.ebuild 3023 BLAKE2B b9a3d08627e11d8b78a5b1c293e3fb929d5796527d4986796235e3e4a0f6ce54d90096eb931bbd6bfb943a36fca9db2ac207be4fdabbc355be407b89831bd9e3 SHA512 0774d1f803551979890e15ce733f400aeb1343af66bd5569c4ca23b3d90131ce82afb3ade7e516b3e5cbf36af0c7fafdd9b07a465b20654aab76eeaeaa6c2004
EBUILD harfbuzz-2.5.3.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
EBUILD harfbuzz-2.6.0.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
+EBUILD harfbuzz-2.6.1.ebuild 3026 BLAKE2B 742a9ee45486beec33ba97221f397509ef8d92496e6a7252d727656316bf86e0f5f394235a0fc36d5013503b7f31157fe70bb1c5e35b75f73d369cacad3d5086 SHA512 1fee9c8ddc17338fa5610c27da9d42b1b13c2b1533bd602eddd2e4e0d5d360ae1ac717958f7ee3afa4088aa2da18790337a07aea581bf46390a5abb166ce2392
EBUILD harfbuzz-9999.ebuild 3033 BLAKE2B 1d4cdfa1b48bbd9d361db0325b2c2cbe4c4fd52b77ecbcca90975d486d37ae425776b59f855f6e68d0aa55bfe5e190ebd104435401f9789fd28b9ef66acbb88f SHA512 8ddd54e9a526244b6ae82e540c9052df45821a0e98d6a43a75b422e606e4f3bc9280b7963b579a673eb354a45dc2d10d8601f2b53e4e759d6c7b34b3c8b7ab43
MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
new file mode 100644
index 000000000000..993d7a268f8b
--- /dev/null
+++ b/media-libs/harfbuzz/harfbuzz-2.6.1.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit flag-o-matic libtool 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.xz"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-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 +glib +graphite icu +introspection static-libs test +truetype"
+REQUIRED_USE="introspection? ( glib )"
+
+RDEPEND="
+ cairo? ( x11-libs/cairo:= )
+ 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}
+ test? ( ${PYTHON_DEPS} )
+"
+BDEPEND="
+ dev-util/gtk-doc-am
+ virtual/pkgconfig
+"
+# 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
+
+ # bug 618772
+ append-cxxflags -std=c++14
+}
+
+multilib_src_configure() {
+ # harfbuzz-gobject only used for instrospection, bug #535852
+ local myeconfargs=(
+ --without-coretext
+ --without-fontconfig #609300
+ --without-uniscribe
+ $(use_enable static-libs static)
+ $(multilib_native_use_with cairo)
+ $(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
+ find "${ED}" -name "*.la" -delete || die
+}
diff --git a/media-libs/jasper/Manifest b/media-libs/jasper/Manifest
deleted file mode 100644
index 844e3468529f..000000000000
--- a/media-libs/jasper/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX jasper-2.0.14-fix-test-suite.patch 1097 BLAKE2B 050311299ad9e247663b045f87b022d290f30c58595c1f0b163175ef4d755e09aa956a2ec810b2239aeb1a7d9c85eadd3057c9157515e7681e6836389644c4a7 SHA512 667aa54ddd6b76af225b32c9d1cf0bb3f0d8a00c7a83695f12179778d8f08b9c910717ded58f7368384f0d925ae90ac42e91344966d01716d722625b25e90d30
-DIST jasper-2.0.14.tar.gz 1311825 BLAKE2B 0cd2feb5a73aaa2da6f1d105fefe98f57c6a5ecf92f6449891f49eca0b5926bc683a03bf933b920cad95883134cf292405f244f10b3bbe7867a41f2dde80337e SHA512 6b270cb1eb55f777f30016f3258e5e2297627e7d086334814c308464f5a4552c23241b0fdbc81ea715a6f4746294657f96c1cb6ceb320629ce57db7e81d84940
-DIST jasper-2.0.16.tar.gz 1311944 BLAKE2B 7402a3f08911e375ab51d531c8bcc57ccb3266763f2d92f45070e52697b99ca41dab4032a3d795105c05ddccd0641a6de24a6d7b148635efce37cd0be07c3e65 SHA512 b3bca227f833567c9061c4a29c0599784ed6a131b5cceddfd1696542d19add821eda445ce6d83782b454b266723b24d0f028cbc644a25c0e3a75304e615b34ee
-EBUILD jasper-2.0.14.ebuild 1899 BLAKE2B f9f034ecb4e7cb7362957b91ae6712853cefafad55d069adcc893a5094ebb91a7a35aeb75178d5002fa9ff04f41ceb89d9fc36c53c575addb99e9bf0d0142ace SHA512 0f6f272f0428aaebfe568fdc5d898f36c93df54ecb91001b1302344e67f7386fd11694ec652c57d8437436946e0c7bf8bf4203fbe285f978f067036d3fe3224b
-EBUILD jasper-2.0.16.ebuild 1828 BLAKE2B 45da6d7171e35e4eed1d28e79f51e05ce652e54592dcf7553b0dc33eee6a518263557b648a59f3046c393f14e15fe905bb61e9a98dca511abd2a58aa2360164e SHA512 2b4b5c71d9177c96ff1d12cc1855b4128e9517430335584c054754d49828665bba9fbd096544cb79c0d9e65c0911c8161ed4c4ca9435cfd25f277ab0b4ab1579
-EBUILD jasper-9999.ebuild 1828 BLAKE2B 45da6d7171e35e4eed1d28e79f51e05ce652e54592dcf7553b0dc33eee6a518263557b648a59f3046c393f14e15fe905bb61e9a98dca511abd2a58aa2360164e SHA512 2b4b5c71d9177c96ff1d12cc1855b4128e9517430335584c054754d49828665bba9fbd096544cb79c0d9e65c0911c8161ed4c4ca9435cfd25f277ab0b4ab1579
-MISC metadata.xml 342 BLAKE2B 4260ac1403a844c48b72bd62c04073de06da73cecca8bbab9fdd7de36b4a462feabee08d933b0098c451691b17aa3ff7d7e3eb25052461381a37198b12225c55 SHA512 a01344f985dc6b7a24ca568fe859f2a593b55df39ba7b711c4db62eb7df5389007cb6c8dd1ab399f70bf8cb221a22681a9eab279ce8ab1ea6b198fa65f1b8a20
diff --git a/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch b/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
deleted file mode 100644
index 9af83c67c6f6..000000000000
--- a/media-libs/jasper/files/jasper-2.0.14-fix-test-suite.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Disable tests which will require LIBJPEG when Jasper was
-built without LIBJPEG.
-
-Bug: https://bugs.gentoo.org/629898
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -393,12 +393,14 @@ configure_file("${CMAKE_CURRENT_SOURCE_DIR}/test/bin/wrapper.in"
- "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper" @ONLY)
-
- if (BASH_PROGRAM)
-- add_test(run_test_1
-- "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
-- "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
-- add_test(run_test_2
-- "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
-- "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
-+ if (JAS_ENABLE_LIBJPEG)
-+ add_test(run_test_1
-+ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
-+ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_1")
-+ add_test(run_test_2
-+ "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
-+ "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_2")
-+ endif()
- add_test(run_test_3
- "${BASH_PROGRAM}" "${CMAKE_CURRENT_BINARY_DIR}/test/bin/wrapper"
- "${CMAKE_CURRENT_SOURCE_DIR}/test/bin/run_test_3")
diff --git a/media-libs/jasper/jasper-2.0.14.ebuild b/media-libs/jasper/jasper-2.0.14.ebuild
deleted file mode 100644
index 1a72b593b949..000000000000
--- a/media-libs/jasper/jasper-2.0.14.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
- inherit vcs-snapshot
- SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl test"
-
-RDEPEND="
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- opengl? (
- >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
- >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXmu[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}
- doc? ( app-doc/doxygen )"
-
-PATCHES=( "${FILESDIR}"/${PN}-2.0.14-fix-test-suite.patch )
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DALLOW_IN_SOURCE_BUILD=OFF
- -DBASH_PROGRAM="${EPREFIX}"/bin/bash
- -DJAS_ENABLE_ASAN=OFF
- -DJAS_ENABLE_LSAN=OFF
- -DJAS_ENABLE_MSAN=OFF
- -DJAS_ENABLE_SHARED=ON
- -DJAS_ENABLE_STRICT=ON
- -DJAS_ENABLE_USAN=OFF
- -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
- # JPEG
- -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
- # OpenGL
- -DJAS_ENABLE_OPENGL=$(usex opengl)
- -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
- # Doxygen
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
-
- #-DJAS_ENABLE_PROGRAMS=$(usex test)
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/jasper-2.0.16.ebuild b/media-libs/jasper/jasper-2.0.16.ebuild
deleted file mode 100644
index e38d99a4ea70..000000000000
--- a/media-libs/jasper/jasper-2.0.16.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
- SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
- S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl"
-
-RDEPEND="
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- opengl? (
- >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
- >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXmu[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DALLOW_IN_SOURCE_BUILD=OFF
- -DBASH_PROGRAM="${EPREFIX}"/bin/bash
- -DJAS_ENABLE_ASAN=OFF
- -DJAS_ENABLE_LSAN=OFF
- -DJAS_ENABLE_MSAN=OFF
- -DJAS_ENABLE_SHARED=ON
- -DJAS_ENABLE_STRICT=ON
- -DJAS_ENABLE_USAN=OFF
- -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
- # JPEG
- -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
- # OpenGL
- -DJAS_ENABLE_OPENGL=$(usex opengl)
- -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
- # Doxygen
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/jasper-9999.ebuild b/media-libs/jasper/jasper-9999.ebuild
deleted file mode 100644
index e38d99a4ea70..000000000000
--- a/media-libs/jasper/jasper-9999.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake-multilib
-
-DESCRIPTION="Implementation of the codec specified in the JPEG-2000 Part-1 standard"
-HOMEPAGE="https://www.ece.uvic.ca/~mdadams/jasper/"
-
-if [[ ${PV} == *9999* ]]; then
- inherit git-r3
- EGIT_REPO_URI="https://github.com/mdadams/jasper.git"
-else
- SRC_URI="https://github.com/mdadams/${PN}/archive/version-${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
- S="${WORKDIR}/${PN}-version-${PV}"
-fi
-
-# We limit memory usage to 128 MiB by default, specified in bytes
-: ${JASPER_MEM_LIMIT:=134217728}
-
-LICENSE="JasPer2.0"
-SLOT="0/4"
-IUSE="doc jpeg opengl"
-
-RDEPEND="
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- opengl? (
- >=virtual/opengl-7.0-r1:0[${MULTILIB_USEDEP}]
- >=media-libs/freeglut-2.8.1:0[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- x11-libs/libXi[${MULTILIB_USEDEP}]
- x11-libs/libXmu[${MULTILIB_USEDEP}]
- )"
-DEPEND="${RDEPEND}"
-BDEPEND="
- doc? ( app-doc/doxygen )
-"
-
-multilib_src_configure() {
- local mycmakeargs=(
- -DALLOW_IN_SOURCE_BUILD=OFF
- -DBASH_PROGRAM="${EPREFIX}"/bin/bash
- -DJAS_ENABLE_ASAN=OFF
- -DJAS_ENABLE_LSAN=OFF
- -DJAS_ENABLE_MSAN=OFF
- -DJAS_ENABLE_SHARED=ON
- -DJAS_ENABLE_STRICT=ON
- -DJAS_ENABLE_USAN=OFF
- -DCMAKE_INSTALL_DOCDIR=share/doc/${PF}
-
- # JPEG
- -DJAS_ENABLE_LIBJPEG=$(usex jpeg)
- -DCMAKE_DISABLE_FIND_PACKAGE_JPEG=$(usex !jpeg)
-
- # OpenGL
- -DJAS_ENABLE_OPENGL=$(usex opengl)
- -DCMAKE_DISABLE_FIND_PACKAGE_OpenGL=$(usex !opengl)
-
- # Doxygen
- -DCMAKE_DISABLE_FIND_PACKAGE_Doxygen=$(multilib_native_usex doc OFF ON)
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/jasper/metadata.xml b/media-libs/jasper/metadata.xml
deleted file mode 100644
index 2925a2331766..000000000000
--- a/media-libs/jasper/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>sci@gentoo.org</email>
- <name>Gentoo Science Project</name>
- </maintainer>
- <upstream>
- <remote-id type="github">mdadams/jasper</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/kodi-platform/Manifest b/media-libs/kodi-platform/Manifest
index 35a21d78ba25..e7ae3e171ee0 100644
--- a/media-libs/kodi-platform/Manifest
+++ b/media-libs/kodi-platform/Manifest
@@ -1,7 +1,5 @@
-DIST kodi-platform-17.1.0.1.tar.gz 8538 BLAKE2B 3264ef2b480d6b8e0f3c0b7dbf6427a39cdd3b882ccb50d76977e169d49fa46e7716969a15f0de1bdf787f327a2a551027be762c1d16eb0482747531c89e45d1 SHA512 c3501b30d6e643239d1a5726eae79d734392709240b21fd314c97fa8a98b0c4ba912c8a246bd53e7049fadde0f695274ae4d1920442ab9a22337258388f80bcb
DIST kodi-platform-18.0_pre20180301.tar.gz 8605 BLAKE2B 8486c0777373de75c0120b3e62ef1ff43107b36471696a7329f15fc62670f230737ee382695dbcb61ca5215fa2898cf3c6ecdfc0b48043b57f48cf15adc9fbf5 SHA512 35bb8d27db3b1e9debef647e02c2cf4ba7f2b2bdde07cb57eedd5859800d0614426d82f4be9cdeb11dba6576cad93e43095a05047411dcbcb749609d51f53ec7
DIST kodi-platform-18.0_pre20190429.tar.gz 8616 BLAKE2B 424fa1da5f2dda5343ebe8414555382be6391d9467e73a07088a9e46674508bd83aeec59277f5d0b6e4bf0e1a6c56910a338f1774b17ef4ad21ca7b1e4198fef SHA512 acbe478c2167cbd90ef8cd0ba6ea9ac657a4140f5337e840e960358b26cb3d7880e52527c0d7f6d0ae8068b92b3a3cc5719110163ecfa4520469fc64b8e1b9b7
-EBUILD kodi-platform-17.1.0.1.ebuild 631 BLAKE2B 9802aacfb11ba042ade388a72d0edd1072cba7262748f2617a81b91c62496400490bcd2e57a65c9a04a69610c8b83ffa58a0d9e1594352531b5855a93a7741c0 SHA512 ba397a196de116bee6806c9a5b4a2917731c204a0ef12b00bbdede133793806a13087558ee63c1f032614ca29e6cf02864332d507c03fe86357fe304926924e2
EBUILD kodi-platform-18.0_pre20180301.ebuild 628 BLAKE2B 03929d9e7863fc872d5cda7d580a6d91539846f213ef5bbb1e0bd572c9fa9211ec249d8e6fadc3b8b3bd26c7bd206268ebac6c995073d9063c0edca9fcb5e0f2 SHA512 466496d3c19431d76f9760460b36d69219627c9a4af7c3ec79aa53f62ced3c884770f0ce1e82c02b24cf5e72ee073b4421f0f1648ecee9b113c7cda8601d57f2
EBUILD kodi-platform-18.0_pre20190429.ebuild 628 BLAKE2B df78d9e7544b8322f55637615ddc0c7be309616d9f8b39fc03b125b547c9759520c099c8ca8816cd4148f4eca73e3a1f94905f6f6efd95dd4afa38ef9b249996 SHA512 6bece6573b6d767e53ca96f91fb3f0456117321e8660c9521ac25df6a7550f06c65f03670a1031e76de4c76e564c2302da5b2aadc613bff13ebe864b51620c33
EBUILD kodi-platform-9999.ebuild 629 BLAKE2B 3d38ae45b6948b1dc6e8cfbdc408542b48fa34af8e46417aca223042ffcba9ff4cf229044fc030bd50822227611b851d1edc671d771f5cba9feaac0ec5bf52bc SHA512 b0571f8ad5b50694fb1daae48ce34cc58f2e4f1a4884786a53b80625aa2f221cb3a5568c4f6f609ed19baaab80fa877bc4c8fc080fb61ba829293da0265c3c8d
diff --git a/media-libs/kodi-platform/kodi-platform-17.1.0.1.ebuild b/media-libs/kodi-platform/kodi-platform-17.1.0.1.ebuild
deleted file mode 100644
index b70d6dcab99c..000000000000
--- a/media-libs/kodi-platform/kodi-platform-17.1.0.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit cmake-utils
-
-if [[ ${PV} == *9999 ]]; then
- SRC_URI=""
- EGIT_REPO_URI="https://github.com/xbmc/${PN}.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- GIT_COMMIT="c8188d8"
- SRC_URI="https://github.com/xbmc/${PN}/tarball/${GIT_COMMIT} -> ${P}.tar.gz"
- S="${WORKDIR}/xbmc-kodi-platform-${GIT_COMMIT}"
-fi
-
-DESCRIPTION="Kodi platform support library"
-HOMEPAGE="https://kodi.tv"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-DEPEND="
- =media-tv/kodi-17*
- =dev-libs/libplatform-2*
- dev-libs/tinyxml
- "
-
-RDEPEND="${DEPEND}"
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index f62f4b4f98c8..feabad8accfb 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -3,4 +3,4 @@ AUX libextractor-1.8-CVE-2018-20431.patch 998 BLAKE2B 44e77c7f53c8ea2b134af14aa0
AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
DIST libextractor-1.8.tar.gz 8315688 BLAKE2B 2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0 SHA512 770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
EBUILD libextractor-1.8-r1.ebuild 2838 BLAKE2B c3d9688ded6bb3803d3e06d1ba82959e9965b2ff488cebd0c7314428bb042514bddb88c1911170c31faef4e1b7434903e891d57692d7a80af1b92aa1739785de SHA512 fd100d837c2f31f3e87607d9216a05537edaf1f095f83b3948b980bea18e0b80b4bbc4b2477231fa6c012280b0ce6a2e4655dd2ad8be1c5c67de4bb08a93e3b2
-MISC metadata.xml 642 BLAKE2B ca8c76e74d895ac221a98f0c8641c7a4d33a3cb299188da86afc4eb16f0e86994a8d4b5c0d5a825127561fc97a4f05ea0d0a55f08afb2ea161e45c7d63222dc3 SHA512 1dee41e58396433f7031afd2916c8cf1d107d453ebbffff2990843baa05e3abc23569ba535b849173f78ac5608977a2b8d5ade0604999292d515deac401a1b20
+MISC metadata.xml 560 BLAKE2B dc882ee2f4322f67c307f2ed919fd25d64505185f8046d94ca2680b060a01ee81a774aba5a96eb86f2a449c503683a2a92b4668e414149ffd109721d3bb7666c SHA512 9a290ce121dfa7d5a96cc3337e936b4cd21755d7becd2ae8fa0ddac07a536c9c05aa2501c5adf136ae454b4a85ded6e0e523fd4be248feec729bbc09f7f7749b
diff --git a/media-libs/libextractor/metadata.xml b/media-libs/libextractor/metadata.xml
index 110fdbd61259..20d2532512b1 100644
--- a/media-libs/libextractor/metadata.xml
+++ b/media-libs/libextractor/metadata.xml
@@ -6,7 +6,6 @@
<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>
<flag name="midi">Enable MIDI support through <pkg>media-libs/libsmf</pkg></flag>
</use>
</pkgmetadata>
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index e7f54991fb63..5fb2d79c8c9d 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,6 @@
DIST libglvnd-1.1.0.20190213.tar.gz 829094 BLAKE2B cf977846693a5de3485e23fe8b4c8e2bc0472d994dc85530ecd85c685d71abd7aa69e815292141f60fd69a299cf39ac16dda5822128295747bfd42db3408df66 SHA512 772445cbb5574c1900109b3e0d8aab442b8c8d9790c4d91e1400fccdff4a53b653b59120e4fb631a45fc47af02949288924e62a22c3d877d4f741d5596736e37
+DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7
EBUILD libglvnd-1.1.0.20190213.ebuild 1073 BLAKE2B 0d0724d15fd6e1589235e5b1cdb8f39590535ea741c3213b20af42a1572b73e155b72e927cfa4a832b525b568e810a9d3785316d8152dddb61bb8632e06d2f45 SHA512 291b176d21ad08b26b427273ec0827b83e3cc6a660aef187457691c2768299b88175b78da8266b50e38295674b6d91d5540b5fbe98a17f030e3cffa012ee07fb
-EBUILD libglvnd-9999.ebuild 1033 BLAKE2B 3c69ab9bec691b032a39217e45e61a9f76c6bb28624e0829744b84bc4022788fbe923d827d792704743580c0349b5e61a6f5ec314afea79564be5415917f10a5 SHA512 ab87158b8d88c37964dcde6e27228691548d8c6e815d9d35cf1b516163c62106d787f7b5df9c3b8c05faf78f54a924965afa41a4b8668ec1f1c1609d125ed3a6
+EBUILD libglvnd-1.1.1.ebuild 943 BLAKE2B 398dce9c19a9776302b05cec211a2697a4fa44aabfb1e922fa37a6a4a666af4fe1967246bae025025003afb9377f3b4dcab1f1ebe4973ef9a842f96cb2f245a8 SHA512 6a63feb7ac9e92ab15e5cb7e50da5802dc5c8912a1927aa516f1b6e4ad6f2983c11a36301b38451cbe185079a216299cbbbd0e63732ebbf4629a6259bfdbb014
+EBUILD libglvnd-9999.ebuild 987 BLAKE2B 2bfa2707e24c90bb9945715f256a956328a00e981e380670320166e516c9d4820ec2a6d706758e069a2b5c28aa91f374969dd470c8770607bf0970a3ccb67090 SHA512 f8c41a37fa7874d1d3e3a15261d555640c1ce87df8e35dec09f9855c493777fb44af0bfcd510f63c7d5c82aae7f335b8d2781e2e9322d9d3fd27967f5fad66cc
MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.1.1.ebuild b/media-libs/libglvnd/libglvnd-1.1.1.ebuild
new file mode 100644
index 000000000000..89d10684b842
--- /dev/null
+++ b/media-libs/libglvnd/libglvnd-1.1.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2018-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+EGIT_REPO_URI="https://github.com/NVIDIA/${PN}.git"
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+fi
+
+PYTHON_COMPAT=( python2_7 )
+inherit autotools ${GIT_ECLASS} multilib-minimal python-any-r1
+
+DESCRIPTION="The GL Vendor-Neutral Dispatch library"
+HOMEPAGE="https://github.com/NVIDIA/libglvnd"
+if [[ ${PV} = 9999* ]]; then
+ SRC_URI=""
+else
+ KEYWORDS="~amd64"
+ SRC_URI="https://github.com/NVIDIA/${PN}/releases/download/v${PV}/${P}.tar.gz"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE=""
+
+RDEPEND="
+ !media-libs/mesa[-libglvnd(-)]
+ x11-libs/libX11[${MULTILIB_USEDEP}]
+ "
+DEPEND="${PYTHON_DEPS}
+ ${RDEPEND}"
+
+src_prepare() {
+ default
+ [[ $PV = 9999* ]] && eautoreconf
+}
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} econf
+}
+
+multilib_src_install() {
+ default
+ find "${D}" -name '*.la' -delete || die
+}
+
+multilib_src_test() {
+ emake check
+}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index f62514e30584..494820dda945 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -34,14 +34,9 @@ RDEPEND="
DEPEND="${PYTHON_DEPS}
${RDEPEND}"
-src_unpack() {
- default
- [[ $PV = 9999* ]] && git-r3_src_unpack
-}
-
src_prepare() {
default
- eautoreconf
+ [[ $PV = 9999* ]] && eautoreconf
}
multilib_src_configure() {
diff --git a/media-libs/libinsane/Manifest b/media-libs/libinsane/Manifest
new file mode 100644
index 000000000000..d41f5ba02bf2
--- /dev/null
+++ b/media-libs/libinsane/Manifest
@@ -0,0 +1,4 @@
+AUX libinsane-1.0.1-meson_options.patch 2038 BLAKE2B b14ba254604f214c2cd1a15e705ea361b635bac7faae4995811477456ea8a8d8bf969fefb4330b3b6f05cd498cd2f01b8b065c2f8f3c88e21e62ea6ef204de15 SHA512 c0d5d3ce5d763d04327ea500229c9f26d989aa8072dec569adb3766c70e0cab9e00629e3099c5ab8bd4e3c84b86925ad108fe78eeae9066164de1302e2226572
+DIST libinsane-1.0.1.tar.gz 706575 BLAKE2B 32ae63c275e6e9c709aefd0c6ed2237df70ad027626cf6ded2009071c74ce925d50ab730bd36b677915d2bd6e606d6337e890cfcc3e8bf4a1f281e026140537a SHA512 1b7091b207b8ea559f21084aa8231c62f34dfa6043e9f358d55708006989c50ee131011dbe5bd03bcd1212cd0219ae9d65a544e57cf3a71c4c2f65e5d89257bc
+EBUILD libinsane-1.0.1.ebuild 901 BLAKE2B a2f67af896828a3526f5494b508148d16ebef09c42afe67253fa40533bdba236ed0e34d069977994cef1953ff99ce2148ef85accf3498b86fc62481c877a76b9 SHA512 8c10f60d79fa4852442545c5b16ac7c240875dddd7e7ac0b0dda162cf8194976f7c7b2581d817324a32525e0327509b7f0cc0e096104fa786611693f27e0ab9e
+MISC metadata.xml 1015 BLAKE2B 2e8221fd55bcf22db23935d2150a4832c32c8e7b7703b7305797da9f63eda012261a8dbd25a00a92964a2b4e3fc22b9e2252133431582ae27964f091161d1176 SHA512 2de5a23ff82cc957941ac4e21d1261743a7f4f36a13ff6402224989eb613fa3a5138b3a464b79017e1c17cc4b7bd553e16e3cb5d9f575b57a362ab4c7d2d1fc9
diff --git a/media-libs/libinsane/files/libinsane-1.0.1-meson_options.patch b/media-libs/libinsane/files/libinsane-1.0.1-meson_options.patch
new file mode 100644
index 000000000000..a56bba0c16fa
--- /dev/null
+++ b/media-libs/libinsane/files/libinsane-1.0.1-meson_options.patch
@@ -0,0 +1,39 @@
+diff -Naur libinsane-1.0.1.orig/meson_options.txt libinsane-1.0.1/meson_options.txt
+--- libinsane-1.0.1.orig/meson_options.txt 1970-01-01 01:00:00.000000000 +0100
++++ libinsane-1.0.1/meson_options.txt 2019-08-23 15:14:21.374086921 +0200
+@@ -0,0 +1 @@
++option('doc', type: 'boolean', value: true, yield: true)
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane/meson.build libinsane-1.0.1/subprojects/libinsane/meson.build
+--- libinsane-1.0.1.orig/subprojects/libinsane/meson.build 2019-08-18 13:09:37.000000000 +0200
++++ libinsane-1.0.1/subprojects/libinsane/meson.build 2019-08-23 15:16:14.289190985 +0200
+@@ -22,6 +22,8 @@
+ subdir('include')
+ subdir('src')
+
+-subdir('doc')
++if get_option('doc')
++ subdir('doc')
++endif
+ subdir('examples')
+ subdir('tests')
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane/meson_options.txt libinsane-1.0.1/subprojects/libinsane/meson_options.txt
+--- libinsane-1.0.1.orig/subprojects/libinsane/meson_options.txt 1970-01-01 01:00:00.000000000 +0100
++++ libinsane-1.0.1/subprojects/libinsane/meson_options.txt 2019-08-23 15:14:51.290114436 +0200
+@@ -0,0 +1 @@
++option('doc', type: 'boolean', value: true, yield: true)
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson.build libinsane-1.0.1/subprojects/libinsane-gobject/meson.build
+--- libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson.build 2019-08-18 13:09:37.000000000 +0200
++++ libinsane-1.0.1/subprojects/libinsane-gobject/meson.build 2019-08-23 15:15:25.593146036 +0200
+@@ -9,4 +9,6 @@
+
+ subdir('include')
+ subdir('src')
+-subdir('doc')
++if get_option('doc')
++ subdir('doc')
++endif
+diff -Naur libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson_options.txt libinsane-1.0.1/subprojects/libinsane-gobject/meson_options.txt
+--- libinsane-1.0.1.orig/subprojects/libinsane-gobject/meson_options.txt 1970-01-01 01:00:00.000000000 +0100
++++ libinsane-1.0.1/subprojects/libinsane-gobject/meson_options.txt 2019-08-23 15:14:53.859116801 +0200
+@@ -0,0 +1 @@
++option('doc', type: 'boolean', value: true, yield: true)
diff --git a/media-libs/libinsane/libinsane-1.0.1.ebuild b/media-libs/libinsane/libinsane-1.0.1.ebuild
new file mode 100644
index 000000000000..a2d1169ab994
--- /dev/null
+++ b/media-libs/libinsane/libinsane-1.0.1.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit meson vala
+
+DESCRIPTION="Crossplatform access to image scanners"
+HOMEPAGE="https://gitlab.gnome.org/World/OpenPaperwork/libinsane"
+SRC_URI="https://gitlab.gnome.org/World/OpenPaperwork/libinsane/-/archive/${PV}/${P}.tar.gz"
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc gtk-doc test"
+
+RDEPEND="media-gfx/sane-backends"
+DEPEND="${RDEPEND}
+ doc? (
+ app-doc/doxygen
+ dev-util/gtk-doc
+ )
+ test? (
+ dev-util/cunit
+ dev-util/valgrind
+ )"
+
+BDEPEND="virtual/pkgconfig
+ $(vala_depend)"
+
+# Tests require an operational valgrind
+# https://wiki.gentoo.org/wiki/Debugging
+RESTRICT="test"
+:
+PATCHES=( "${FILESDIR}"/${P}-meson_options.patch )
+
+src_prepare() {
+ vala_src_prepare
+ default
+}
+
+src_configure() {
+ local emesonargs=(
+ $(meson_use doc doc)
+ )
+ meson_src_configure
+}
diff --git a/media-libs/libinsane/metadata.xml b/media-libs/libinsane/metadata.xml
new file mode 100644
index 000000000000..2b345ff1a9ab
--- /dev/null
+++ b/media-libs/libinsane/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person">
+ <email>voyageur@gentoo.org</email>
+ <name>Bernard Cafarelli</name>
+ </maintainer>
+ <longdescription lang="en">
+Libinsane is the library to access scanners on both Linux and Windows. It's cross-platform, cross-programming languages, cross-scanners :-). It takes care of all the quirks of all the platforms and scanners
+
+It has however some limitations:
+
+* It is only designed to work with scanners, not webcams, not USB keys, etc (think paper-eaters only)
+* TWAIN API may display some dialogs. Libinsane cannot prevent them.
+* Full bed page scan only: Presence of the option to set the scan area cannot be guaranteed. You may have to crop the image later in your own application (see Paperwork for example).
+* 24 bits color scans only (may be fixed later)
+
+It is the successor of Pyinsane2 but shares no code with it.
+ </longdescription>
+</pkgmetadata>
diff --git a/media-libs/libmediainfo/Manifest b/media-libs/libmediainfo/Manifest
index 9b54025fb198..999551cb0eca 100644
--- a/media-libs/libmediainfo/Manifest
+++ b/media-libs/libmediainfo/Manifest
@@ -1,6 +1,4 @@
AUX libmediainfo-0.7.63-pkgconfig.patch 291 BLAKE2B b13ee095a9f1f322222bb10013ffda778eef68dd2f161553b96bdd24f0c0ba81281185604547c355c14190580fd36cbb019778674e8c72a02ef3e3fda9229f76 SHA512 4cc11f6219a68ad59971a3d85f3184c16ec25e60b96ac56ac73796493c516575e0ccccee814610d5c248ba4c8a0a2a590041464d2aa1ac3f8a717839127c91fb
-DIST libmediainfo_19.04.tar.xz 1684320 BLAKE2B 04c468b74fe0f886ed0a1bd5d0d1ff4b430d5a2fbb8e17ff23bd6bf53143e99cb811220a76c6741b17dbab8917219211c87bff6b20285c5375a6f67cc3dc5bc0 SHA512 7fdacc206f1db57605fc41b717740e6c6ce245d432faef15abb48e646bc05743ce72ee117519464d0341d83e0b306ddab79c9d34fd348897d4b0d15cb2f7db04
DIST libmediainfo_19.07.tar.xz 1685616 BLAKE2B 15f2663557735f50537fbf69d974cd6a21af337540c87de67f03276eb14f14ab72bd235d9f289bb6431792d08a8c7b7063ae37453c83ea043376fa6a4a370d73 SHA512 b16a161be548ae86e5e1fe54f86614f6f3b151b86afb657cf0ea96aa0278b0158309e0382dac0dd0ada5e5af7a2f58369e6fa97bfc7306a3bbc82792c0a29ecc
-EBUILD libmediainfo-19.04.ebuild 1844 BLAKE2B 4e560ddc0e84ed20bccbae4471f713533839e810e66d1ff1f320cd9a2c5694121c2b261ee58d144f47899354b69f89f3306d6c3d5f3817592040c10b86603911 SHA512 47771d8b21dad97f726e4de800d0608d6e55d06958c5255e36e6fb0bbf02d9d71a5a7851996aeaa21bee999dae9007b4347413e697273605a1275389a0c430ae
-EBUILD libmediainfo-19.07.ebuild 1846 BLAKE2B 6fc56ff465cc0fdedba9114959d9b5facabfd4b70bc1c8098724419e04758cd30a3783658a9fd4b843d6038537a5c5363173db1364a4d74c4e4ff8acb96f5cb5 SHA512 6fb8aff87af0f0df3c546feca2cb72840483661cf5b81055837860dc923987a0c3da70f870cfcd4b7d936b7037d3bda4dde5f05d30e8a400910b91d095ceea57
+EBUILD libmediainfo-19.07.ebuild 1844 BLAKE2B 4e560ddc0e84ed20bccbae4471f713533839e810e66d1ff1f320cd9a2c5694121c2b261ee58d144f47899354b69f89f3306d6c3d5f3817592040c10b86603911 SHA512 47771d8b21dad97f726e4de800d0608d6e55d06958c5255e36e6fb0bbf02d9d71a5a7851996aeaa21bee999dae9007b4347413e697273605a1275389a0c430ae
MISC metadata.xml 346 BLAKE2B ace7bcc20d5e1a949db03a632f4f181353c530a0aad6b6839ea4d682bcdde0f3184c1886fd3015ba73f6ad63ace53e07f21bcf7f8383f12bf6ad73374d895c7c SHA512 bc66ca588f3042de05db14d4036fba4637f5dd0d03d3cbdbdf7118b90f5a6f8ad0e86a30d9263e7d283d94f61e54da6c92ff03acf1cf83db376366c0c4f76c93
diff --git a/media-libs/libmediainfo/libmediainfo-19.04.ebuild b/media-libs/libmediainfo/libmediainfo-19.04.ebuild
deleted file mode 100644
index 8272ecf1c95a..000000000000
--- a/media-libs/libmediainfo/libmediainfo-19.04.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic
-
-MY_PN="MediaInfo"
-DESCRIPTION="MediaInfo libraries"
-HOMEPAGE="https://mediaarea.net/mediainfo/ https://github.com/MediaArea/MediaInfoLib"
-SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="curl doc mms static-libs"
-
-RDEPEND="sys-libs/zlib
- dev-libs/tinyxml2:=
- >=media-libs/libzen-0.4.37[static-libs=]
- curl? ( net-misc/curl )
- mms? ( >=media-libs/libmms-0.6.1[static-libs=] )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-# tests try to fetch data from online sources
-RESTRICT="test"
-
-S=${WORKDIR}/${MY_PN}Lib/Project/GNU/Library
-
-src_prepare() {
- eapply -p4 "${FILESDIR}"/${PN}-0.7.63-pkgconfig.patch
- eapply_user
-
- sed -i 's:-O2::' configure.ac || die
- append-cppflags -DMEDIAINFO_LIBMMS_DESCRIBE_SUPPORT=0
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- --enable-shared \
- --with-libtinyxml2 \
- $(use_with curl libcurl) \
- $(use_with mms libmms) \
- $(use_enable static-libs static) \
- $(use_enable static-libs staticlibs)
-}
-
-src_compile() {
- default
-
- if use doc; then
- cd "${WORKDIR}"/${MY_PN}Lib/Source/Doc
- doxygen Doxyfile || die
- fi
-}
-
-src_install() {
- if use doc; then
- local HTML_DOCS=( "${WORKDIR}"/${MY_PN}Lib/Doc/*.html )
- fi
-
- default
-
- edos2unix ${PN}.pc #414545
- insinto /usr/$(get_libdir)/pkgconfig
- doins ${PN}.pc
-
- for x in ./ Archive Audio Duplicate Export Image Multiple Reader Tag Text Video; do
- insinto /usr/include/${MY_PN}/${x}
- doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}/${x}/*.h
- done
-
- insinto /usr/include/${MY_PN}DLL
- doins "${WORKDIR}"/${MY_PN}Lib/Source/${MY_PN}DLL/*.h
-
- dodoc "${WORKDIR}"/${MY_PN}Lib/*.txt
-
- find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libmediainfo/libmediainfo-19.07.ebuild b/media-libs/libmediainfo/libmediainfo-19.07.ebuild
index 66497326e1f1..8272ecf1c95a 100644
--- a/media-libs/libmediainfo/libmediainfo-19.07.ebuild
+++ b/media-libs/libmediainfo/libmediainfo-19.07.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://mediaarea.net/download/source/${PN}/${PV}/${P/-/_}.tar.xz"
LICENSE="BSD-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE="curl doc mms static-libs"
RDEPEND="sys-libs/zlib
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 5761aee28f26..4f479b1f8d01 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,3 +1,5 @@
DIST libogg-1.3.3.tar.xz 417636 BLAKE2B 2fc69580ed94be520c8e6b764e6271ec60e9d83d4265ca0408df4b2e6233a0f1d68e79400bc3871cc130034697ba97cedc453a574b9c6f618c9b819a93a2d3e8 SHA512 37d8e4329bf7a997a95d84a55c325a5a893ec84bb4d5b7ea638e5cb13201a0619e71ecd9710a8371def69f092c62dcc59ec0a607db246028ee8a62678386260b
+DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
EBUILD libogg-1.3.3.ebuild 884 BLAKE2B 16850456835208a7d115e7d8412618fa7dce0133fb3a367828c829c237677f89cdf64b679eeb973174467d3bb22485476907779661cf70dd861db725a570a76e SHA512 23fdda66a88d23f3e11c71368357733abc3065a147b122ee1f9aac640bf9ba1c69c97d389e060aafca6b4562d3663db234a149d0eeb4a059225ecd332b1898cb
+EBUILD libogg-1.3.4.ebuild 899 BLAKE2B d92381ec4a5e39700be5360c656adebc91a0e471e0eb3a38502b41242668df1e260e04e6b98fb2e055aae6524a80c9f79f063d6a08550be1f01d4beb59f05e74 SHA512 e9ef61c0bf92544be27cfad8464673d8c1067c5cce79b287f5ab28afcd1e6a60539b4ec3d5d2db76b36e4152d0b8730d1ac76f419eab529e1f06d5d57c30623f
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.4.ebuild b/media-libs/libogg/libogg-1.3.4.ebuild
new file mode 100644
index 000000000000..87444316d676
--- /dev/null
+++ b/media-libs/libogg/libogg-1.3.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit multilib-minimal
+
+DESCRIPTION="the Ogg media file format library"
+HOMEPAGE="https://xiph.org/ogg/"
+SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
+
+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 ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+DOCS=( AUTHORS CHANGES )
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/ogg/config_types.h
+)
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --htmldir="${EPREFIX}"/usr/share/doc/${PF}/html
+ $(use_enable static-libs static)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libraw/Manifest b/media-libs/libraw/Manifest
index 9e88668784ff..b8d536f82715 100644
--- a/media-libs/libraw/Manifest
+++ b/media-libs/libraw/Manifest
@@ -1,5 +1,7 @@
DIST LibRaw-0.19.3.tar.gz 1302745 BLAKE2B 3db3a07c5535a325c69d65ccc75e6a8c7d04e7b1c1d87506fd1c56a0d8f4a7c581467f6350922a4c62d4bc49372f31c86ae2a26a087c4ec11c3ab69763403a0b SHA512 e025695fb7f0016aeec76c0843a94387633457eee838cc48e65d1e84e703c8530b3fdd1e31d85dc322d3f2f6092b7c313fa6d1c3009fe1257c3d9411128b6fe2
DIST LibRaw-0.19.4.tar.gz 1303047 BLAKE2B daa65c86ca81bee80ced5fcc3a048ef54cc5256b4b80bdda006a2b3d64c8c10436b906a238dd22c8623465288df5a86d65a4d6e2668ba5fc3ef3ad23c7e205d2 SHA512 e9f0b18b8be52119ff504d2645a011eca391a62bf651064dcbec4b6e16b3b09fda49e632453b051d3aae2ac3a8be021e5b71d7202913759ad1d61641d3318c4c
-EBUILD libraw-0.19.3.ebuild 1488 BLAKE2B 1b47f7da7acc3011b7557ab3c724d1dd5fd6195557a3d928dad9885252e5761064f2b03cb4ec746537951cf8d007cbf7af11ca9fa69f56129aeeca8fdb4746db SHA512 e2fc80e686eced406f1bfa55836c645510c84a8fdb9a372e431fc6646fd5e76adb2580189ac3b4cae527ab90fddcf6d43a0e598eaf7a5fa33aa11819d4c7647d
-EBUILD libraw-0.19.4.ebuild 1496 BLAKE2B f9c5512ddbc8264786424136abe8ef82546f79df15b1b1727f59417d06bff1df27d74b5eb89aaa5f133b90489884ba8524e10ba83cacec095b5b026674426052 SHA512 5ad61fc6e0e3e0d3bcf91a2eb2792ca5073a00cad3099b33d8be14759c9679816bf6b813c71ce1092f56fd855f0637bd87c12639bcb0404fd6d76c8945642918
+DIST LibRaw-0.19.5.tar.gz 1303806 BLAKE2B 7ab6e30d88aa4aed2ed6825898f8de02f0d139eedec0756cd184822548a7aa69416f5f599542bb264a791f8b6284d6922a160063496f0e7b682333e847cc9b32 SHA512 4560045f75e6d2ab0d1d8686075f3a0e26a5d7ce693b48508110a2c31d19055d58983c24852da0abb64fa90db5e20f24b87aa7537ed04d958c38c8b265a7e826
+EBUILD libraw-0.19.3.ebuild 1404 BLAKE2B e1d3788d35e44272b2132118a3d76e1614ec1c1846b613ac5ab7ac37b7fa78489a03fa2135d0b3b617d04df9f59c3e8754bde77165ca306f70c65b105ec1bd1c SHA512 0d841a2621039f12e17077ef3969ece028e3d412d9f921fbebbab4a3626858ae346799325499de30e09cb991c797be6d9b2bc091ceb9b23d6d864dea77a610e7
+EBUILD libraw-0.19.4.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
+EBUILD libraw-0.19.5.ebuild 1412 BLAKE2B 06bb6d87b38e4b45f5184bfe5a82beb34562d58d829933508cef9bab6a6434a4b13e3e81146ca2843368020df93ea0909e6f99d8fb0acddaec579dc81dbdfccc SHA512 29b2b405a6f22339afb37cbcd7eff2b99a3c1695873746a189553028d1ecbc20d399d3ef028e34043e7abb7279d949e44397fa17654e9838dabdec26119bbc99
MISC metadata.xml 337 BLAKE2B 895688be926ca12497ac0fa00495cdecb0cbc5547e495bc52b394a3ed8fe6e27dce2e891daa46aa5caff8b710e680d1f54e3035a5cd89af504b2d1005950a434 SHA512 982fc145a755a52aba352b0cac94f6d32caf2b74f86d24da90466955330177f94d2e9135e9bda4a17d9e9a554c7dab9ac6e5b3a8a042434989c5dbf7975c9062
diff --git a/media-libs/libraw/libraw-0.19.3.ebuild b/media-libs/libraw/libraw-0.19.3.ebuild
index dac5a5a9ced5..581803b9face 100644
--- a/media-libs/libraw/libraw-0.19.3.ebuild
+++ b/media-libs/libraw/libraw-0.19.3.ebuild
@@ -16,10 +16,9 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
LICENSE="LGPL-2.1 CDDL"
SLOT="0/19" # subslot = libraw soname version
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux"
-IUSE="examples jpeg jpeg2k +lcms openmp"
+IUSE="examples jpeg +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -44,9 +43,9 @@ src_prepare() {
multilib_src_configure() {
local myeconfargs=(
--disable-static
+ --disable-jasper
$(use_enable examples)
$(use_enable jpeg)
- $(use_enable jpeg2k jasper)
$(use_enable lcms)
$(use_enable openmp)
)
diff --git a/media-libs/libraw/libraw-0.19.4.ebuild b/media-libs/libraw/libraw-0.19.4.ebuild
index 053b22516abf..de9464c5f187 100644
--- a/media-libs/libraw/libraw-0.19.4.ebuild
+++ b/media-libs/libraw/libraw-0.19.4.ebuild
@@ -16,10 +16,9 @@ SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
LICENSE="LGPL-2.1 CDDL"
SLOT="0/19" # subslot = libraw soname version
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples jpeg jpeg2k +lcms openmp"
+IUSE="examples jpeg +lcms openmp"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( >=media-libs/jasper-1.900.1-r6:=[${MULTILIB_USEDEP}] )
lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
virtual/pkgconfig"
@@ -44,9 +43,9 @@ src_prepare() {
multilib_src_configure() {
local myeconfargs=(
--disable-static
+ --disable-jasper
$(use_enable examples)
$(use_enable jpeg)
- $(use_enable jpeg2k jasper)
$(use_enable lcms)
$(use_enable openmp)
)
diff --git a/media-libs/libraw/libraw-0.19.5.ebuild b/media-libs/libraw/libraw-0.19.5.ebuild
new file mode 100644
index 000000000000..de9464c5f187
--- /dev/null
+++ b/media-libs/libraw/libraw-0.19.5.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal toolchain-funcs
+
+MY_PN=LibRaw
+MY_PV="${PV/_b/-B}"
+MY_P="${MY_PN}-${MY_PV}"
+
+DESCRIPTION="LibRaw is a library for reading RAW files obtained from digital photo cameras"
+HOMEPAGE="https://www.libraw.org/ https://github.com/LibRaw/LibRaw"
+SRC_URI="https://www.libraw.org/data/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1 CDDL"
+SLOT="0/19" # subslot = libraw soname version
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="examples jpeg +lcms openmp"
+
+RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
+ lcms? ( >=media-libs/lcms-2.5:2[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ virtual/pkgconfig"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( Changelog.txt README.md )
+
+pkg_pretend() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+ [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+ default
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-static
+ --disable-jasper
+ $(use_enable examples)
+ $(use_enable jpeg)
+ $(use_enable lcms)
+ $(use_enable openmp)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+ einstalldocs
+
+ # package installs .pc files
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/libv4l/Manifest b/media-libs/libv4l/Manifest
index eb0cbdf81090..5227588f8b8e 100644
--- a/media-libs/libv4l/Manifest
+++ b/media-libs/libv4l/Manifest
@@ -6,6 +6,6 @@ DIST v4l-utils-1.16.6.tar.bz2 1893768 BLAKE2B f31cf794f6949fa2c1f45db8bae99a10a5
DIST v4l-utils-1.6.2.tar.bz2 1148309 BLAKE2B 8153a1e3803b9e59eae064f2c88e4b865a56193788a8cb204dc34e9ae50e66794ba7f020ad4b0ff9af995f57d9b9a9e0225e0f8a09eeefae42d063131d7e549a SHA512 e14442e1b3660d0cb0844f1a5a88f855bc8532df9e72e1b2afd348a7c077ad25657f832d0fd47d3f567bfd399fd82c5a749d075ac9ecb911ea462685e31aa0b2
EBUILD libv4l-1.10.1.ebuild 1395 BLAKE2B 602ce585cbee9b33735055789353ff1f2296cb1216095cab81a0b4b015ff0ceb7015b2af933bbc238d0e628afdfa61af9d38080e4b407b649b974f24a7dac059 SHA512 c9f1863b392b2a24aa5e2b8d7941fb5bf3f67c142e36da3999db6a442934d68306b8b45adc73a43cb17e399ea506004a4cbba978b792fd5ba4c70ee393810edf
EBUILD libv4l-1.16.3.ebuild 1360 BLAKE2B 6a8cba7641759011fba00aa6e7d9ea052b33e4537008dec7f6616ddcddceee9040047225dc0ab470c6033f140787b1a4c3ef30c30466b55d0532bc7049480048 SHA512 d3e79e71b17e3d5f020a92962f18446a907acb1e8e19fb87d5b7e076104629c32707bea9afe5b61667f9985ac090c4f0279c39f7cf681081bfa6d1d7edb95400
-EBUILD libv4l-1.16.6.ebuild 1404 BLAKE2B 64d53c95476e04b6ab8af333d063c7fc826234d08a534730811a1c93dda6709683309ddee29fbc967dedf065f61f52b383dd99241f034a1d84c8f585e3d467e4 SHA512 0c8bdf7c6f3c847854d1720527712d254d431b377a49637b5bacf750d4243a905fc6ce369c6951b14c35d0dab990d93d97d9113dc0d6a4c1fe821d13e18e34d6
+EBUILD libv4l-1.16.6.ebuild 1403 BLAKE2B 4f8976c580c1f6ae3058de20eddf1762d3179e4457a5ad17a65ff105cb9f79051a802ceaa08ac0f951bc5c693ffef1d5622f313e8ff52c8392a5e5bf9260d4e2 SHA512 81a1fdc1d60a5e7324717901d9cc5442b1a126c88528b3cea23bd8b0d8b1a2971723d873af415b74d750e532948c99e6a773271d50b6eac8c931ba7a8daf0c3d
EBUILD libv4l-1.6.2.ebuild 1366 BLAKE2B 4b4d13e9e8723e0a846cde04627ea6a4af400633146b3e424b794264f9b6eaa8fec10d0e2d1d12b6572de3e96caaaa80368242cf59d33131c0afda86127e9f37 SHA512 24ae9e13eb1efc7a7e071c8a8102c065f1e9feadf8e02f4477c004403d5b94eeaba13510970bdfe48852e723619ce0579f82dc25b9c2975104fef97d1d3ba8f6
MISC metadata.xml 1120 BLAKE2B b8854ccbfdb3674f5dd2657270945dcea8f9b48e501a07e8589bb04e0b99f927b8499afb979cb34a8d79a04e9813335188853db768dfe774fc5ab2919e9a34ee SHA512 09c21dcc53a675a4e04506dcf8b14b81947806dc761346a4bcb6a6ffdda7b60fb1adf0a778d7e4f060327aea55ec92b7fb700af7a874355d86b64a96541c8c5e
diff --git a/media-libs/libv4l/libv4l-1.16.6.ebuild b/media-libs/libv4l/libv4l-1.16.6.ebuild
index 55507d9ba819..3fafe417aecc 100644
--- a/media-libs/libv4l/libv4l-1.16.6.ebuild
+++ b/media-libs/libv4l/libv4l-1.16.6.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://linuxtv.org/downloads/v4l-utils/${MY_P}.tar.bz2"
LICENSE="LGPL-2.1+"
SLOT="0/0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="jpeg"
RDEPEND="jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 1eff1ab5b753..eb2b32167bd0 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -13,7 +13,7 @@ DIST libvpx-testdata-1.8.0.tar.xz 418337232 BLAKE2B 1336e522f18a8f7812b4e7e4de7b
EBUILD libvpx-1.5.0.ebuild 3954 BLAKE2B f83ffbdd1a1f157f57f28184e1103bc172d6330d6e1146ae6014fe7792a118d8c7a4237ad638af4b4e441c81a6d0dc9e1edb0e430eb5155921c77d6f2c39283a SHA512 ae28b6eafcbb42b447a715236594c0cd72665925cf763c8579a668d0424ec86f6258ec10a8bdd0baa0ce332f792e9cb919223e5e4b1fedd2fcd49dce14b15c1c
EBUILD libvpx-1.6.0-r1.ebuild 3566 BLAKE2B a3d55b41879c3b407bc8fdda418574c4d4a3bb5fc4cd6000af3841c28384f50e8d5f2faf72d33cafa65c6a3037876c471b660e6d48d0de26351c9d038555e1c2 SHA512 8b69bee233977ba30075c2330c0713f9e5615a4bb4c6668af182eb622a1cdb6aeb8318659e1fb397330ebfddb096bd158fddfecf8b6680aabb146a69f173dee6
EBUILD libvpx-1.6.1.ebuild 3920 BLAKE2B e1350052f0e7542d4e5458305eb7b93b8e9f2399894ca52cbdad78145189429b338deafdfd63b5ef42c55a3e0da9d8c6182113e65cdc60f5608e0bf39ada8abe SHA512 fe68cbf448458d1b36434e5ecc5902577d6e557c06a090cb5695360cd32795052d74ffc1994e6e263c896fa463097224d9ec8d6b08f2a187efa6664b2a1f55ad
-EBUILD libvpx-1.7.0.ebuild 3884 BLAKE2B c6dbf1dc57c1a7e667e21ab1f9e95d191b18efc1b25d1dc76960151f5db2c2ce21ad6e150e78c503966956dff17ea95b31126295edd76ed2a1e6277ce644afbe SHA512 2b9c5422a14f74c827742db43e32da8a8d572624be28ed0d6e652fd9416dd5981daa67b4b01790655bc4d965adb5c38613937dca38de11cf851a2472c34b33ed
+EBUILD libvpx-1.7.0.ebuild 3879 BLAKE2B 76860ba6f79982627fc9294783d2fb9b532f2e12465d1ae17ba4e3ee52982a116c21814342e38f1a32de979a12e8f54636aaf4a56a56e235ae9c43ee87bb2ae3 SHA512 25aec6be6cd163592d11a558bb33b7ab1a45824f44c07385f7707748a1403c01accf7b51f9ffc73ca8638bfc362b454ec3c43dbecb060242c789c57fa17f61a8
EBUILD libvpx-1.8.0-r1.ebuild 3352 BLAKE2B 2c43ff1789cdfe7858b17435f7e14db4a32c357d8f63d5c32ade679e088d6e8382552b2238ab84b2d608198bf8b7fa60dc73042ac9df64b83ed346c18fe5cffe SHA512 38e95bac7f2bdf989fcebf4f41c609424d1a27771e105e65ab6daa17639a5e3c0465a3ec5c6821e96e110d47df020e812ef2b5c59520dbd4fb8c46362f4ecdca
EBUILD libvpx-1.8.0.ebuild 3917 BLAKE2B 7519a4bb61ceede17f50345bc1746cd6fef84f4942e8647bf74360ee6c42500351acef6ac0099a6400a902f910fc636db3be03c1fefe1a0f39b9a1ad02c3cdf7 SHA512 798f2eeb93e0e13539c1dea71d34516c31e95d4d3330f5d9e5adbacb26c8eb5be6b421b98a5a1559aba6e600bf7b71031e31e660cf4a77a09c00dd79b214a30d
MISC metadata.xml 575 BLAKE2B f8e5f9a2663a651155da3bde8284ace9c5c9394842c279a83b58e61f5bbdbcb279b71609b1129c7e1ebd61b02ca6d6f7374313815ea33d98d60affda0144c54f SHA512 748b5a315632723c78b1db5eaa0f62e331d28874a9dbc42ebc66089eee1e2e54fc19f33c7188c4b84977b35762c94c2319787cb7528f7c22382bccd715b247a5
diff --git a/media-libs/libvpx/libvpx-1.7.0.ebuild b/media-libs/libvpx/libvpx-1.7.0.ebuild
index 319c2f4e00c0..e37ec4d62fa8 100644
--- a/media-libs/libvpx/libvpx-1.7.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.7.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="BSD"
SLOT="0/5"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~ppc ppc64 ~s390 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="cpu_flags_x86_avx cpu_flags_x86_avx2 doc cpu_flags_x86_mmx postproc cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 +highbitdepth static-libs svc test +threads"
REQUIRED_USE="
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 4262a938e2cb..4768075f8e97 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,16 @@
DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d
DIST mesa-19.1.3.tar.xz 10935604 BLAKE2B 4dfda4b3ef7a2d53b20a7a0c81b08901d6b88431b6b56679b8d97d6f2f57ce18f6dcdbae9b79c5d02b9175f47db629833da6012658295fe456829ef07a5ff087 SHA512 787310c43089142209ff7db298489b0815b630577680d5ce1bc3f796eed3772ba41f03e5e773b77ae084c191ed4e365eac1753166ce60f12b8f5974d55762eeb
DIST mesa-19.1.4.tar.xz 10938008 BLAKE2B 4745fc7e844397378fe1adf61bcd5b54aad11ec0b375ced85fd80ced01227432b491ad8b7ba7d9013190cfbb451bc11cdb7c8af0e1f298dd5d793d3ce43aa92b SHA512 234032d917c9b378c3f6ceb921677b64e549344c3957331810b50fd73e0dccd2f4f62e2bd39e619590f389bc58fdab10fab4b88f7c117557cbeb1dda049b9fc5
+DIST mesa-19.1.5.tar.xz 10938452 BLAKE2B 7d21cad04c8172006e73d84148cfeb785b3d5f90f63d8474e4d0d6ec8658142bc2b6a639415d90b0c8d541f004c374603ae1230dfddd293118ed584c6ca74818 SHA512 4d4b3733c13e5c9b3172127f2565b827dc46aab69bdc86791c457ad137a5571c51e3c3a26d5a99e11fe552829a1220028a3968f3086959e038c615f2d75675a4
+DIST mesa-19.1.6.tar.xz 10939908 BLAKE2B cd7204614898621f3b242788667fc64e0ca00f3a5650e60cb8e74ef2760300245734741355874e05c97d482f3bd06a1755fc5e9cee804a6d5a050f20c8bc70a9 SHA512 399ce97a293769893ef9a4a6af1f77c7d835f5405bdbc03bbf9b73e052e4ff3b43dec5dafd6b9fedaaf2c59531aeccaa0f685a8bfdc5719a26c3815fc7f68024
+DIST mesa-19.2.0-rc1.tar.xz 11452972 BLAKE2B 64a844a06110c64f4badd8d64a63cee4fbb25c6e2bb17062277e54094c8a5342eac7058ae7ba7b0aefc4e0795aac371caac26e54cc3612afaf54d41b94e09b18 SHA512 babafb6ec668834e041a62e966452fe315e4f5afef8e1f7d35e038993c73b32ea6ad9929399edae4686f44cd11704fd9a8801821befc1d1767bc0662d4c39fac
+DIST mesa-19.2.0-rc2.tar.xz 11456920 BLAKE2B 673ff105395731ca65cc99bee1f73c582b40e05983bd08c46f07384e579c8d449e7f5371461542ebbcfc32022382f206adf7dcc43ed8713cb35e37c1cc69e03c SHA512 a42f7add01afd327838bd57ea4086ad4b9de669c6caf443129e325171bc53e3321c898d8d0075c7e50c4e0fdd094d66a60e35a0620e25e6c52648c5ac0008dcc
EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B b828c73a96f85de9c392444fb1a697d86ebc7d98d6b7571757e2900c84f16c62bf82e11fdcf037757ffcd7cf5a560b638da5bc6c51d3086493741fd3f00e286d SHA512 24fbbc005fd0fa7376dc960d6388861c041a5320f6b58f3fd55ffd15d2d09816aff3034154a2047734c0ce9596c1c9187b01973fd45e87a64e04325074463973
EBUILD mesa-19.1.3.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
EBUILD mesa-19.1.4.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
-EBUILD mesa-9999.ebuild 14485 BLAKE2B 4c897388a3e48ba1b7639c7449101e560b4f807af64ca197665485dd445293a79cb1ab4a4176e24d6258c0b1e40a21e18602021f209e92c68b9e7c60ae4e7d85 SHA512 7d71637292295eb2cd9898609458a2a815b15ea90701a0193c24ca94781413b8c32191e36c16af3ac054166b96252c4d7d4435da4b721c0244534d9afe9c7edb
+EBUILD mesa-19.1.5.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
+EBUILD mesa-19.1.6.ebuild 14274 BLAKE2B 91ba79babe477a14635dfe5213ff303d5afdb5aa1263df7b6ec22b16aa27aa57c71d85a84a77a080a7d4cbcf2be558b28ac315636b7949624fb34fc3743c1b7d SHA512 7cfde1a84760a5ba9ba906b61fbc8aedd9433a744485526331cf7bf3bb0e8ba5f5a32acaae03e8b3a07cdb70586e782391492f594748ec039a9896ab702932a2
+EBUILD mesa-19.2.0_rc1.ebuild 14394 BLAKE2B 5ef689540560ea18a770fc323bc2b0db34a592c5852c83f9dac2ddc7f5e0cef0f835f10894d42476f68b06fa7599fcfbadfdbf251e7904e7f915a75b443ccf46 SHA512 730dd456b2ad407e699f38f977d78804f60093f609937b3a2ae56f7014a63421c62d967ba31475df5ecafc76f89749079dce034d4f45f53eb41660e24d7fb32a
+EBUILD mesa-19.2.0_rc2.ebuild 14394 BLAKE2B e74b64fb5cba5b96b954e5c5a85ac751eb33cba282833d59a03466bb48bbafdfe3299c5724380ad8794703ebf7082d04dd429f32572e1dff25f79de19367fa19 SHA512 09d6cab0d1dd2c14934e8e0803528638128b94bb7e1d15516eae7b740aff9ee298e35e270ae8f4b963223efe6c3974117a527c3ec10c0b2dc265f41cacccc06e
+EBUILD mesa-9999.ebuild 14394 BLAKE2B e74b64fb5cba5b96b954e5c5a85ac751eb33cba282833d59a03466bb48bbafdfe3299c5724380ad8794703ebf7082d04dd429f32572e1dff25f79de19367fa19 SHA512 09d6cab0d1dd2c14934e8e0803528638128b94bb7e1d15516eae7b740aff9ee298e35e270ae8f4b963223efe6c3974117a527c3ec10c0b2dc265f41cacccc06e
MISC metadata.xml 1945 BLAKE2B 9661d981c3472b6726f603982e94ba9a00066994bee201fcd0127eb8a7b436ea9112d55097054e079ba98f35f12826230e33f4bbb9ed23e19453bcb70d2140f9 SHA512 849994334f6ff6fa8e737e9b33eac509b21d50b0f71e4c0f1f6d7d1d13c7dfbc47611185562fa91a183b4411e9c10352d172ce065bd76c41bf83ac6929950c45
diff --git a/media-libs/mesa/mesa-19.1.5.ebuild b/media-libs/mesa/mesa-19.1.5.ebuild
new file mode 100644
index 000000000000..0fd4ae716a5f
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.5.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+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
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ EXPERIMENTAL="true"
+ inherit git-r3
+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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+ lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+ vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+ d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ vulkan? ( dri3
+ || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+ !app-eselect/eselect-mesa
+ >=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.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
+ gallium? (
+ 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}]
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${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}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ wayland? (
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${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] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+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. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:9[${MULTILIB_USEDEP}]
+ sys-devel/llvm:8[${MULTILIB_USEDEP}]
+ sys-devel/llvm:7[${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}
+ valgrind? ( dev-util/valgrind )
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_use llvm)
+ $(meson_use lm_sensors lmsensors)
+ $(meson_use unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=false)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_iris iris
+
+ 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
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+ fi
+
+ # on abi_x86_32 hardened we need to have asm disable
+ if [[ ${ABI} == x86* ]] && use pic; then
+ emesonargs+=( -Dasm=false )
+ fi
+
+ if use gallium; then
+ gallium_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+ else
+ dri_driver_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=dri
+ -Dshared-glapi=true
+ $(meson_use dri3)
+ $(meson_use egl)
+ $(meson_use gbm)
+ $(meson_use gles1)
+ $(meson_use gles2)
+ $(meson_use libglvnd glvnd)
+ $(meson_use selinux)
+ -Dvalgrind=$(usex valgrind auto false)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ $(meson_use vulkan-overlay vulkan-overlay-layer)
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
+
+multilib_src_test() {
+ meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-19.1.6.ebuild b/media-libs/mesa/mesa-19.1.6.ebuild
new file mode 100644
index 000000000000..0fd4ae716a5f
--- /dev/null
+++ b/media-libs/mesa/mesa-19.1.6.ebuild
@@ -0,0 +1,540 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+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
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ EXPERIMENTAL="true"
+ inherit git-r3
+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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris nouveau vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+ lm_sensors opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind
+ vdpau vulkan vulkan-overlay wayland xa xvmc"
+
+REQUIRED_USE="
+ d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ vulkan? ( dri3
+ || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.97"
+RDEPEND="
+ !app-eselect/eselect-mesa
+ >=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.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
+ gallium? (
+ 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}]
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${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}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ wayland? (
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${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] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+"
+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. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="9"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:9[${MULTILIB_USEDEP}]
+ sys-devel/llvm:8[${MULTILIB_USEDEP}]
+ sys-devel/llvm:7[${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}
+ valgrind? ( dev-util/valgrind )
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${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.0.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:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ emesonargs+=( -Dplatforms=x11,surfaceless$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_use llvm)
+ $(meson_use lm_sensors lmsensors)
+ $(meson_use unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=false)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_iris iris
+
+ 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
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+ fi
+
+ # on abi_x86_32 hardened we need to have asm disable
+ if [[ ${ABI} == x86* ]] && use pic; then
+ emesonargs+=( -Dasm=false )
+ fi
+
+ if use gallium; then
+ gallium_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+ else
+ dri_driver_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=dri
+ -Dshared-glapi=true
+ $(meson_use dri3)
+ $(meson_use egl)
+ $(meson_use gbm)
+ $(meson_use gles1)
+ $(meson_use gles2)
+ $(meson_use libglvnd glvnd)
+ $(meson_use selinux)
+ -Dvalgrind=$(usex valgrind auto false)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ $(meson_use vulkan-overlay vulkan-overlay-layer)
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
+
+multilib_src_test() {
+ meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-19.2.0_rc1.ebuild b/media-libs/mesa/mesa-19.2.0_rc1.ebuild
new file mode 100644
index 000000000000..f226c4813d78
--- /dev/null
+++ b/media-libs/mesa/mesa-19.2.0_rc1.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+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
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+ lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+ vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+ d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ vulkan? ( dri3
+ || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( 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 )
+ xa? ( X )
+ xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+RDEPEND="
+ !app-eselect/eselect-mesa
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
+ gallium? (
+ 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}]
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${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}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ wayland? (
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${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] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=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.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ )
+"
+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. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:10[${MULTILIB_USEDEP}]
+ sys-devel/llvm:9[${MULTILIB_USEDEP}]
+ sys-devel/llvm:8[${MULTILIB_USEDEP}]
+ sys-devel/llvm:7[${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}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.0.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:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_use llvm)
+ $(meson_use lm_sensors lmsensors)
+ $(meson_use unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=false)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_iris iris
+
+ 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
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+ fi
+
+ if use gallium; then
+ gallium_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+ else
+ dri_driver_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=true
+ $(meson_use dri3)
+ $(meson_use egl)
+ $(meson_use gbm)
+ $(meson_use gles1)
+ $(meson_use gles2)
+ $(meson_use libglvnd glvnd)
+ $(meson_use selinux)
+ -Dvalgrind=$(usex valgrind auto false)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ $(meson_use vulkan-overlay vulkan-overlay-layer)
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
+
+multilib_src_test() {
+ meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-19.2.0_rc2.ebuild b/media-libs/mesa/mesa-19.2.0_rc2.ebuild
new file mode 100644
index 000000000000..631e1efea884
--- /dev/null
+++ b/media-libs/mesa/mesa-19.2.0_rc2.ebuild
@@ -0,0 +1,543 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+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
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+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 ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+ lm_sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+ vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+ d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ vulkan? ( dri3
+ || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( 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 )
+ xa? ( X )
+ xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+RDEPEND="
+ !app-eselect/eselect-mesa
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ libglvnd? (
+ media-libs/libglvnd[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
+ gallium? (
+ 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}]
+ )
+ )
+ lm_sensors? ( sys-apps/lm_sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${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}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ wayland? (
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${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] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=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.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ )
+"
+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. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:10[${MULTILIB_USEDEP}]
+ sys-devel/llvm:9[${MULTILIB_USEDEP}]
+ sys-devel/llvm:8[${MULTILIB_USEDEP}]
+ sys-devel/llvm:7[${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}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ 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:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm_sensors && ewarn "Ignoring USE=lm_sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+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
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_use llvm)
+ $(meson_use lm_sensors lmsensors)
+ $(meson_use unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=false)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_iris iris
+
+ 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
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+ fi
+
+ if use gallium; then
+ gallium_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+ else
+ dri_driver_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=true
+ $(meson_use dri3)
+ $(meson_use egl)
+ $(meson_use gbm)
+ $(meson_use gles1)
+ $(meson_use gles2)
+ $(meson_use libglvnd glvnd)
+ $(meson_use selinux)
+ -Dvalgrind=$(usex valgrind auto false)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ $(meson_use vulkan-overlay vulkan-overlay-layer)
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
+
+multilib_src_test() {
+ meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b28120fdcc83..631e1efea884 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -16,7 +16,6 @@ HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
if [[ ${PV} == 9999 ]]; then
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
- EXPERIMENTAL="true"
inherit git-r3
else
SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
@@ -240,7 +239,7 @@ EGIT_CHECKOUT_DIR=${S}
QA_WX_LOAD="
x86? (
usr/lib*/libglapi.so.0.0.0
- usr/lib*/libGLESv1_CM.so.1.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
@@ -504,8 +503,6 @@ multilib_src_compile() {
multilib_src_install() {
meson_src_install
-
- use libglvnd && rm -f "${D}"/usr/$(get_libdir)/libGLESv{1_CM,2}.so*
}
multilib_src_install_all() {
diff --git a/media-libs/ming/Manifest b/media-libs/ming/Manifest
deleted file mode 100644
index f743c45f24db..000000000000
--- a/media-libs/ming/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST ming-0.20181112.tar.gz 14889061 BLAKE2B a276f7aaf386f0233b9e92a95daf22b7fd192654275e99f70106b7abf2ec3963ae8d70a82addd2690e6c7038a0a52e41a27fbd5c9b38cc96d1ab617a3bfc522d SHA512 a4d3ed04c96ffc6d040ace3451f2d99a3fdda0726b45cee30913ca2dc8d9f24ff156a643eeb888d05eb199dd9f2caf4ce4f84fe40e1b95bf2f6c9e038155fdc3
-EBUILD ming-0.20181112.ebuild 2235 BLAKE2B dd03b461949a5a080c55228e87a4eddef83ff0cf163c5a662aedf47f3005573ed8bd4fe2c622dbdb57619b2ec91bb0730bceea2721217a5102c0b87871b894b1 SHA512 ee714e3fd1aff9c0e453b06f7f219b440e8c6c5464777e0adf7eb0da405478eaf28a99df8fd9db22d2b65b123afaac21d350853b7c6f476269384144cfee57da
-MISC metadata.xml 388 BLAKE2B 7083db03bf7efad4015f4aa3838925123a71bae6d57ed318232622e96c8590ef1f770520da535c9efc94f33b416430dccecc9a81fa81df936d4e15933a1dd041 SHA512 0efbb0ad1eadfd764bdf6e182cf8865994ca8e96ccc6e14845829638730e1ce6ff7ac2777e9ad3d396e7e29d77e034b818c95259eb8aab53a23b3c0815f787d0
diff --git a/media-libs/ming/metadata.xml b/media-libs/ming/metadata.xml
deleted file mode 100644
index e85491fe7d63..000000000000
--- a/media-libs/ming/metadata.xml
+++ /dev/null
@@ -1,12 +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>
- <upstream>
- <remote-id type="sourceforge">ming</remote-id>
- <remote-id type="github">libming/libming</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/ming/ming-0.20181112.ebuild b/media-libs/ming/ming-0.20181112.ebuild
deleted file mode 100644
index b185a867bd79..000000000000
--- a/media-libs/ming/ming-0.20181112.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-PHP_EXT_NAME=ming
-PHP_EXT_OPTIONAL_USE=php
-AUTOTOOLS_AUTORECONF=yes
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools distutils-r1 flag-o-matic multilib perl-module vcs-snapshot
-
-EGIT_COMMIT="50098023446a5412efcfbd40552821a8cba983a6"
-
-DESCRIPTION="An Open Source library for Flash movie generation"
-HOMEPAGE="http://ming.sourceforge.net/"
-SRC_URI="https://github.com/libming/libming/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="+perl php +python static-libs"
-
-RDEPEND="perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- media-libs/freetype:=
- media-libs/libpng:0=
- media-libs/giflib:=
- sys-libs/zlib:=
- !media-libs/libswf"
-DEPEND="${RDEPEND}
- sys-devel/flex
- virtual/pkgconfig
- virtual/yacc"
-PDEPEND="php? ( dev-php/ming-php )"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# Tests only work when the package is tested on a system
-# which does not presently have any version of ming installed.
-RESTRICT="test"
-
-src_prepare() {
- default
-
- # Let's get rid of the TEXTRELS, link dynamic. Use gif.
- sed -i \
- -e 's/libming.a/libming.so/' \
- -e 's/lungif/lgif/' \
- perl_ext/Makefile.PL || die "sed #1 failed"
-
- sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:' configure.ac || die "sed #2 failed"
-
- eautoreconf
-}
-
-src_configure() {
- # build is sensitive to -O3 (bug #297437)
- replace-flags -O3 -O2
-
- # build python via distutils calls, disable here
- # php is done in dev-php/ming-php
- local myconf=(
- --disable-python
- --disable-php
- $(use_enable static-libs static)
- $(use_enable perl)
- )
- econf "${myconf[@]}"
-}
-
-run_distutils() {
- if use python; then
- pushd py_ext > /dev/null || die
- distutils-r1_"${@}"
- popd > /dev/null || die
- fi
-}
-
-src_compile() {
- # some parallel make issues on flex/bison
- emake -C src/actioncompiler -j1
- emake
-
- run_distutils ${FUNCNAME}
-}
-
-src_install() {
- run_distutils ${FUNCNAME}
-
- emake DESTDIR="${D}" INSTALLDIRS="vendor" install
- einstalldocs
-
- perl_delete_localpod
- find "${ED}"usr/lib* -name '*.la' -delete
-}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 985fc08ee167..383c808b7a4f 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -5,6 +5,6 @@ AUX mlt-6.16.0-crop-filter.patch 1420 BLAKE2B 359f02e95c7afd66c412e8b1e8dbd59d67
AUX mlt-6.16.0-mlt_consumer-race-condition.patch 936 BLAKE2B 1ac34744d8bab9cc18c37092bb7f62a92cd297ab7a31b3ce4927f08257bf0fb87bf33c533df6a12c045c6573f5d8d0ce4105c99a740dd75e9b9e4ab3764c8abd SHA512 3bbcd1172263e8e6048e329075a0ea521dab7f27f6f92496f4e39f8ddd48d6c3b65c96f4ea0620aa1ab5dca886aeb5b58ad09b757acd2ad33ea3cb5729e7bc2f
AUX mlt-6.16.0-rotoscoping-interpolation.patch 998 BLAKE2B 22ae634e46fa61cc60113a4d8f35454ecabd73f4f9de0c0a9c385aad44a941610ed075bd278d0b45f9101bb3939b82a0565938d4e3c4f29f320d93334cfad4b0 SHA512 f785df6e7db75018c05f57f49537e57e86fbd0b3cf2aad705c0179f36d2cb1115cd8f20f2b4977db0c32b485fef3ba32283fc68c817db4eddcc161e549a63685
DIST mlt-6.16.0.tar.gz 1414374 BLAKE2B 6c031360721d535e95cbaf890c1f42f5f5dd914e0c6c20992bd3aec4ecbcc0b53370fe6b82b5d11c8242bb0a1f2d94f28bc61b4e5a920e5afb41ca8bb5229433 SHA512 554e8b9baa7a8578cc52315fe0583c61762bf6fbbcdd4a1e4f25753846d92f013e7d74745498625fcc781de993aa0526fd761920450b4314e67105783b9bde26
-EBUILD mlt-6.16.0-r1.ebuild 5754 BLAKE2B 57bb4869541c355e1ba55cb57cfbe584fe7aa411c10fb8ec3851867a239da2be3ad89376980666628b1056a0a051db099f160b64e55be0d9286237b60269c7c0 SHA512 32f956e6c3088152058bced2d37ecb736409a5c2a9e5530c4622df518099a9970f854ca3bce4e4cd4680208f1a4b2294b6d28b352cd138b4253ab9be45f0da08
-EBUILD mlt-6.16.0-r2.ebuild 5757 BLAKE2B c8719b417038fad701b9a8a4f7d0a6298e5cc9ec8ce0d9dbf8d87f1926bab0c2515e103857ac36cc376609eebb78a9bf34ad9ab9ccb101fa70eebb4616c72163 SHA512 7c9c6bd8d79c452b5f1589249a500b814912f790ead14779675ad3128215d9ad0da57445f09490b563ebb4759495a5577789966e3a3a173553ddcded3657db28
+EBUILD mlt-6.16.0-r1.ebuild 5786 BLAKE2B ae4e3dfe044d0152c8a8ccb66537a04cdf0fa08e869363b532de982a043febba7995922c6fe0f2a01b946794c1fcf936dc0120f7e7edc5359b17956cd78a42e8 SHA512 10f48c97e90a2be760c4f720c391f3b399811ba6b0deca9e3035b9d6cb5c5c39c29fc17f6731c620d160709de32031e5bd49f469db7399ee2d834973794ef01c
+EBUILD mlt-6.16.0-r2.ebuild 5786 BLAKE2B 0da11c4a284784930dfd45e5ecb2090db7362b58fb3f30c62fe10f936dd93d672342d4891eb95a852476d31b83f792fdf878dd8a9c7c3685eb77eaa2ecb5115d SHA512 1937fb2777d0b6fedd732d1ae1f14ad2c05d2b6ee045472819882d9bdd5ed73f282421a3a07c2d606e7f7ac03ff03cca1a31ff57630bfb152e8f313b3c74b865
MISC metadata.xml 1595 BLAKE2B 63b95c943ec9860db5c68d7ffcf683381bb0e859afe333263afc51f9e985a9f4263279aded8288ec03511d8d56d12415f5590529a4de0009ff21bb890bc1febe SHA512 7f7005732163a00fcd0ff1d21608c26296f87e0658fad912e35724b61c9072ceb67f1a515b0445159192f4959be87a63a01b717c8fe63a64aa8ceb3081cb11f8
diff --git a/media-libs/mlt/mlt-6.16.0-r1.ebuild b/media-libs/mlt/mlt-6.16.0-r1.ebuild
index 76fc970c2228..dc4435ed3601 100644
--- a/media-libs/mlt/mlt-6.16.0-r1.ebuild
+++ b/media-libs/mlt/mlt-6.16.0-r1.ebuild
@@ -209,17 +209,16 @@ src_install() {
if use python; then
cd "${S}"/src/swig/python || die
- insinto $(python_get_sitedir)
- doins mlt.py
- exeinto $(python_get_sitedir)
- doexe _mlt.so
+ python_domodule mlt.py _mlt.so
+ chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
dodoc play.py
python_optimize
fi
if use ruby; then
cd "${S}"/src/swig/ruby || die
- exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+ local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+ exeinto "${rubydir#${EPREFIX}}"
doexe mlt.so
dodoc play.rb thumbs.rb
fi
diff --git a/media-libs/mlt/mlt-6.16.0-r2.ebuild b/media-libs/mlt/mlt-6.16.0-r2.ebuild
index 31ed25573ff9..2046009e1216 100644
--- a/media-libs/mlt/mlt-6.16.0-r2.ebuild
+++ b/media-libs/mlt/mlt-6.16.0-r2.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 x86 ~amd64-linux ~x86-linux"
IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug ffmpeg
fftw frei0r gtk jack kdenlive kernel_linux libav libsamplerate lua melt opencv opengl python
qt5 rtaudio ruby sdl vdpau vidstab xine xml"
@@ -209,17 +209,16 @@ src_install() {
if use python; then
cd "${S}"/src/swig/python || die
- insinto $(python_get_sitedir)
- doins mlt.py
- exeinto $(python_get_sitedir)
- doexe _mlt.so
+ python_domodule mlt.py _mlt.so
+ chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
dodoc play.py
python_optimize
fi
if use ruby; then
cd "${S}"/src/swig/ruby || die
- exeinto $("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+ local rubydir=$("${EPREFIX}"/usr/bin/${USE_RUBY} -r rbconfig -e 'print RbConfig::CONFIG["sitearchdir"]')
+ exeinto "${rubydir#${EPREFIX}}"
doexe mlt.so
dodoc play.rb thumbs.rb
fi
diff --git a/media-libs/netpbm/Manifest b/media-libs/netpbm/Manifest
index c96965569e87..e8f6b63dea9f 100644
--- a/media-libs/netpbm/Manifest
+++ b/media-libs/netpbm/Manifest
@@ -15,7 +15,7 @@ AUX netpbm-10.76.00-test.patch 6005 BLAKE2B 0c8b0d9b1d7a0c5b139f85eb3a91838cc496
DIST netpbm-10.66.00.tar.xz 2575356 BLAKE2B db6336aaf6051d6b651b57d8d6692792698840546e82e61e4bff6c2dfa55041e8441eb3e4b7f09279181720bcbbaf3676903daf5ae85327b5cf742ec150df61c SHA512 44348eb1155353d5cd5a2ce025bc6d9301cc3239acea6b68418c14432f4bd61fc5a8669bb51b3e86b96abaf5b02cc20115c662e40fa5b41aee202b0c2ae605af
DIST netpbm-10.70.00.tar.xz 2621612 BLAKE2B 2b07d130de0afeb3c1df32c6d267bc6bd13d4f556988cb7784b51941d81de1ad4f3381a0788eec6309bc6c024a21eb273a5f00726f6bb9a8ecb87f547678fc77 SHA512 f70d6dd79ce813f9fc4935d382b50bd3cecdf02c324b0f012056e56e33f24b621e8c1b3d054c6f470d437d0d793593de95eaa9724055d59c342228398a40f0b4
DIST netpbm-10.76.00.tar.xz 2657184 BLAKE2B b8d82268ba50881fab10bca00ea408afa39096f4f9c079b523d8e28ce62301797ee50f55c84f85a6d832b723da7449531e725bf60a4a89975c51382b2cbc4a94 SHA512 234a5616a7631a8eb70817bb88ed509ddddfce93f71739654ef78a2735245b268c391adb49b514ed883569c9fc6ea9c3eeed10aa7898c02b797fee5249b11cf3
-EBUILD netpbm-10.66.00.ebuild 5635 BLAKE2B 67ac7c65d38383dcbb448c4f3d4ebc47e7bc290a1f5c47e394d5946fc15ab6635c2980993472da0a3ecad886414bd4ce17e9b429914fa162b84ff357350a4d99 SHA512 768b550d7dd600b849fd31ce60204c76194eaebca4de61709e1c214d7e13841f701096915d4d1357148d7533a40946598a77799378216242f9da7645113b9a15
-EBUILD netpbm-10.70.00.ebuild 5376 BLAKE2B 0bbf72c60c2c6fd4c843885b2674d3120e48c172a5932cf3d43db0334851a240038ecb3fb14e5ab31c7bbff26dff20021cc1aa429df8897e642dfc6ed3a0448b SHA512 9787fae7edf2669e450896a65c0cd99f23d2d9acefbb108fb6dd12580ce0f87d3fa0de136648c7ba681e06f9f6109d8ad1b8525cb340d01415947df75103cd34
-EBUILD netpbm-10.76.00.ebuild 5269 BLAKE2B aeb0adb71ffec5f6d1d0f3fc3b6adcdad5aaa64c61111b775d68b130314c68de512ae4e997af72d0105c7ada16057891aa98d7fdd30a3b612e226689749b9e54 SHA512 1da8159a4911df0b233632c3a2b955384efb369bd4d4f521203fdef3809ce872ea423721cd2e59ab8d3706886c47be88c6939d5718e2b03d542ae2580e6d4efe
+EBUILD netpbm-10.66.00.ebuild 5574 BLAKE2B 493ee7587d52bd88f2f64e6cd07707f69181aa8043016845fce991553c2c4387a0b46b62878850246a4682f77bf7f1fe787e65605ffd513dd14c49b61597c2a4 SHA512 177862ad6c682bb5ed506abefbdbdc7fe709f4013663c6858fdcd0f4b5aad57fcf1593e504c673062e8c8394a5b2bf05e7c78aa51a5200c27684c1f2ad2635eb
+EBUILD netpbm-10.70.00.ebuild 5315 BLAKE2B bfa0d92288326dd24e7603f52fd0fce2b1da33748c3285670748ebb2db186f0fb4788d2905199081736c526a778c6a681216f43bf5dbf05580b9f50264126e7c SHA512 9f1c6e869297c52d1232cfdbffd7ebb14343d96ab49c620896e0a69fcfac32be0b34731e7a5a67ca60aa981f4aba6787b74cdd3233150957195c84909a2949d4
+EBUILD netpbm-10.76.00.ebuild 5205 BLAKE2B 27bfe092440c6889d3d43c1c31e5ede375ac856d01d602fb3ffde2cc08ea68e52bc5d12cefe486c9155b870fc60be1b74ba9ae7cedfa34267131affa26bb524d SHA512 4d70735e1029fd633d4cbde1c9f768ce71030dd48dc7c0f27045671cb9bff0a288bbb157e2ac123c09090162ca5a73360217f4ed1af46f540327465768181bbe
MISC metadata.xml 434 BLAKE2B 255ab7ddedd5e4558e9303c0c9fe5d1d6e13096e3ef7ba269d68908f1cb74d63af273ef9b2ceb97a7462750fa795a6d6f54dae1e70972b44cfbb749250ed65e6 SHA512 41fe0623d1efe7cff26ed9307756f045bd40f275abd38095affc9394efc2c940e63978c79328e43583d5bb466fad0d5339d158422037587cebd3b1f4c22a459f
diff --git a/media-libs/netpbm/netpbm-10.66.00.ebuild b/media-libs/netpbm/netpbm-10.66.00.ebuild
index 9beba62062d6..82fe3af25620 100644
--- a/media-libs/netpbm/netpbm-10.66.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.66.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
RDEPEND="jbig? ( media-libs/jbigkit )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
png? ( >=media-libs/libpng-1.4:0 )
rle? ( media-libs/urt )
svga? ( media-libs/svgalib )
@@ -81,7 +80,7 @@ src_prepare() {
del=(
pnmtofiasco fiascotopnm # We always disable fiasco
$(usex jbig '' 'jbigtopnm pnmtojbig')
- $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+ jpeg2ktopam pamtojpeg2k # jasper has been removed
$(usex rle '' 'pnmtorle rletopnm')
$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
)
@@ -148,7 +147,7 @@ src_configure() {
XML2_LIBS = $(netpbm_config xml xml2)
JBIGLIB = $(netpbm_config jbig)
JBIGHDR_DIR =
- JASPERLIB = $(netpbm_config jpeg2k jasper)
+ JASPERLIB = NONE
JASPERHDR_DIR =
URTLIB = $(netpbm_config rle)
URTHDR_DIR =
diff --git a/media-libs/netpbm/netpbm-10.70.00.ebuild b/media-libs/netpbm/netpbm-10.70.00.ebuild
index d43ef5f78bfc..97a05287f209 100644
--- a/media-libs/netpbm/netpbm-10.70.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.70.00.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
RDEPEND="jbig? ( media-libs/jbigkit )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
png? ( >=media-libs/libpng-1.4:0 )
rle? ( media-libs/urt )
svga? ( media-libs/svgalib )
@@ -74,7 +73,7 @@ src_prepare() {
pnmtofiasco fiascotopnm # We always disable fiasco
$(usex jpeg '' 'jpegtopnm pnmtojpeg ppmtojpeg')
$(usex jbig '' 'jbigtopnm pnmtojbig')
- $(usex jpeg2k '' 'jpeg2ktopam pamtojpeg2k')
+ jpeg2ktopam pamtojpeg2k # jasper has been removed
$(usex rle '' 'pnmtorle rletopnm')
$(usex tiff '' 'pamtotiff pnmtotiff pnmtotiffcmyk tifftopnm')
)
@@ -141,7 +140,7 @@ src_configure() {
XML2_LIBS = $(netpbm_config xml xml2)
JBIGLIB = $(netpbm_config jbig)
JBIGHDR_DIR =
- JASPERLIB = $(netpbm_config jpeg2k jasper)
+ JASPERLIB = NONE
JASPERHDR_DIR =
URTLIB = $(netpbm_config rle)
URTHDR_DIR =
diff --git a/media-libs/netpbm/netpbm-10.76.00.ebuild b/media-libs/netpbm/netpbm-10.76.00.ebuild
index af7d4100ce2d..10dd2b062d5d 100644
--- a/media-libs/netpbm/netpbm-10.76.00.ebuild
+++ b/media-libs/netpbm/netpbm-10.76.00.ebuild
@@ -12,11 +12,10 @@ SRC_URI="mirror://gentoo/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ~ppc ~ppc64 s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc jbig jpeg jpeg2k png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
+IUSE="doc jbig jpeg png postscript rle cpu_flags_x86_sse2 static-libs svga tiff X xml zlib"
RDEPEND="jbig? ( media-libs/jbigkit )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper )
png? ( >=media-libs/libpng-1.4:0 )
postscript? ( app-text/ghostscript-gpl )
rle? ( media-libs/urt )
@@ -137,7 +136,7 @@ src_configure() {
XML2_LIBS = $(netpbm_config xml xml2)
JBIGLIB = $(netpbm_config jbig)
JBIGHDR_DIR =
- JASPERLIB = $(netpbm_config jpeg2k jasper)
+ JASPERLIB = NONE
JASPERHDR_DIR =
URTLIB = $(netpbm_config rle)
URTHDR_DIR =
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index b53b8922ddbd..b5c029fb4152 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -23,7 +23,7 @@ DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1
DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8f1d4820f3e0e486593d6f64ee8f918ea4362152f050baec16f17904c03a6cdc0abc6e5fb2510308dcbabebe97b29285fbc SHA512 431dfba0f413071d7faa18bc6e6f5e4f015285e2cc730c5dd69b2a4d6aa4250b7e0bcb1814ac6f06f5c76f103aea1f93f72f32aee6bc0cd7ddacdaf1f40075c1
DIST tiny-dnn-1.0.0a3.tar.gz 12885646 BLAKE2B 85c0715ab6c692b77522487775e70b0db645528baed1830c83c9f44d2b67a5207e4f7ea1709b35c6a4217d287199549304e9be19f4a5cec9a1183b0b5dccc562 SHA512 5f2c1a161771efa67e85b1fea395953b7744e29f61187ac5a6c54c912fb195b3aef9a5827135c3668bd0eeea5ae04a33cc433e1f6683e2b7955010a2632d168b
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-2.4.13-r3.ebuild 5972 BLAKE2B e8cf37172bb279877c88e4a25564d58f0cc39e46ea185587033922083ff6f34c774f2d9dd0220831db040b8f3654f95a0cb6e28aef0cf3893392000f45c10bba SHA512 2ee9f1749172d504dafb927b9310c30c92300b9ecc19999421e0e891bc0dfb436871ad7fb35466f84275370877240a222aa71d1f6f47808726d5ba1875606e3b
-EBUILD opencv-3.4.1-r5.ebuild 18715 BLAKE2B 2725dc4ce46a4cbb047c5ea3aea493b3bab516bb5300f75d59859913412f694a138ae0946844ccb09dc202f53a1f558871f4d0e2ec999823daacf2f303138d40 SHA512 3016dd9480077e9b87fcdf8e9dc3fabf729b4b9e1d540173ad761499a79f6a36dd80bbed02d3ac3c101809e9c0c055e1b2752e2e324c0042547ed297563b6b9f
-EBUILD opencv-3.4.1-r6.ebuild 18788 BLAKE2B 5b28c0f355d7bd66f8de7d3dfc12bbd8c3be2a9e8fd065ef44ad69306e74616b86c486f77abc96b36f659c1a5b5960a2dfa43526d7ec6cd553f7cbdd359a9df9 SHA512 66e0a1688e83c64735df8b402ad9d21e074031c89df74d21a8450695b0a52f9d0bd2a5a1ea522866fb52a05507f6545d0cb8f4550add1e10e5fe96b2466f7d9c
+EBUILD opencv-2.4.13-r3.ebuild 5918 BLAKE2B 3ffd92b751e983cddd74e26d48e532973110a8fcd715641ead732bf4a1ed4802ac2c0385769d061f6632e33dfc1bf26758815bf1a896d020ef628de7df28c8d2 SHA512 0fae932f9326429f7c37a698c89b9cbf4da0c2e73640992211d9a8b7a5ce8b61d5e75d30f4f376345a992285fe40395b117c968daaf9e7db9b4cc52ff621bee8
+EBUILD opencv-3.4.1-r5.ebuild 18644 BLAKE2B 51d5bdf871fb91c0b89db7dd33e52d357c26fceb575631abc63d9bbaed98a583d8731c0deb1e0e5d39745d01ab9a32a78aaa6922d231b1ec7b1cff0ec6976557 SHA512 512add3c726f89329d3fda55d541d68ca8099aa537ebed6833d0667bd8304c8f3af7d45bac23991be5b99e6559b771546a6b69e4c6a9a72a108b695d0f93ef36
+EBUILD opencv-3.4.1-r6.ebuild 18717 BLAKE2B 419a8c987559d22076ddd3154172c2ae11c4986dcded798c46da3569f46c3cc78f9a1e602ef5d91c3760ea4ba8ae6e2240bf20d007d77af7d1226794e2da77ef SHA512 510a0a6d6266961d88097c39146fe19488fad8c2539c2ae02440dee8623d17d36c010b5e6305a04e52c68c421e6d2942534d7aa1e652fe7ea09b3a5a5735089c
MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
diff --git a/media-libs/opencv/opencv-2.4.13-r3.ebuild b/media-libs/opencv/opencv-2.4.13-r3.ebuild
index 37b41c40568e..d4379a93e73c 100644
--- a/media-libs/opencv/opencv-2.4.13-r3.ebuild
+++ b/media-libs/opencv/opencv-2.4.13-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/Itseez/opencv/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0/2.4"
KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg jpeg2k libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
+IUSE="cuda +eigen examples ffmpeg gstreamer gtk ieee1394 jpeg libav opencl openexr opengl openmp pch png +python qt5 testprograms threads tiff v4l vtk xine"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@@ -43,7 +43,6 @@ RDEPEND="
)
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0 )
- jpeg2k? ( media-libs/jasper:= )
ieee1394? (
media-libs/libdc1394
sys-libs/libraw1394
@@ -122,7 +121,7 @@ src_configure() {
-DWITH_GTK=$(usex gtk)
-DWITH_IMAGEIO=OFF
-DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
+ -DWITH_JASPER=OFF
-DWITH_JPEG=$(usex jpeg)
-DWITH_OPENEXR=$(usex openexr)
-DWITH_OPENGL=$(usex opengl)
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index d096c1963ffa..662a0e1a266e 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/3.4.1" # subslot = libopencv* soname version
KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# OpenGL needs gtk or Qt installed to activate, otherwise build system
# will silently disable it Wwithout the user knowing, which defeats the
# purpose of the opengl use flag.
@@ -77,7 +77,6 @@ RDEPEND="
)
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
lapack? ( virtual/lapack )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
@@ -293,7 +292,7 @@ multilib_src_configure() {
-DWITH_GTK=$(usex gtk)
-DWITH_GTK_2_X=$(usex gtk)
-DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
+ -DWITH_JASPER=OFF
-DWITH_JPEG=$(usex jpeg)
-DWITH_WEBP=$(usex webp)
-DWITH_OPENEXR=$(usex openexr)
diff --git a/media-libs/opencv/opencv-3.4.1-r6.ebuild b/media-libs/opencv/opencv-3.4.1-r6.ebuild
index 1f5783f96215..92376a497c45 100644
--- a/media-libs/opencv/opencv-3.4.1-r6.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r6.ebuild
@@ -25,7 +25,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD"
SLOT="0/3.4.1" # subslot = libopencv* soname version
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
+IUSE="contrib contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_popcnt cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cuda debug dnn_samples +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# OpenGL needs gtk or Qt installed to activate, otherwise build system
# will silently disable it Wwithout the user knowing, which defeats the
# purpose of the opengl use flag.
@@ -78,7 +78,6 @@ RDEPEND="
)
java? ( >=virtual/jre-1.6:* )
jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
lapack? ( virtual/lapack )
opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
@@ -295,7 +294,7 @@ multilib_src_configure() {
-DWITH_GTK=$(usex gtk)
-DWITH_GTK_2_X=$(usex gtk)
-DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
+ -DWITH_JASPER=OFF
-DWITH_JPEG=$(usex jpeg)
-DWITH_WEBP=$(usex webp)
-DWITH_OPENEXR=$(usex openexr)
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 56ddde0cab75..ff5aa2f1bffb 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,8 +1,7 @@
AUX phonon-gstreamer-4.9.0-no-paused-on-zero-vol.patch 998 BLAKE2B 6f659a6a6aad157ad708934a165f17ca4766dec3baf3cdd03e5b10b41201751f17008b43b6183df9afeba7303603fc9c1fcc413bb16a2e97cd571196ce2e6905 SHA512 c97a88e86ef3f56fdcdb12d3256afce34381ec1072ebbeda7c427db7a9c000feecab5f84a44d9a86fd099b26cda6a8a50a0a4c20139167e4e8b96c96368feddb
AUX phonon-gstreamer-4.9.0-qt-5.11.patch 2144 BLAKE2B a11065fab61037e11f54ab2b3a41f55231ac2175372077b302b033bbf7483030e763e50e8dce00886394ce94feb205b75d3bf5f4ea4b0c11f3e0c0fba42f14f3 SHA512 b13fe80bf493d33ef942babf084f823e9d6314f489496007dd43e9c0efba4c8e354067cba5ccae53806156d631a8bbf115b84e654052086aeb1d5d32f15b6f08
+DIST phonon-backend-gstreamer-4.10.0.tar.xz 98532 BLAKE2B b9182a50810536c46999266bd40996bb59ac982e44d2066c2afd897d3a2feb99e5570e36dcc869098f5b171018f4c339a2e3b8df124eaeb88236073245069859 SHA512 3beaba9ea3a332a6908ebdaa966958e8e8056d79cfb210e82a8edaf08f0a8bacbf8094e91b1b1b936406aa634dabb962e6c1468e4dde3febd9efac1a63ea70a4
DIST phonon-backend-gstreamer-4.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-DIST phonon-backend-gstreamer-4.9.1.tar.xz 88460 BLAKE2B 236a1ecdc5fcb96d041e9e743993c1f613e6a9fde8b2c8a094216f00f5862f1a5617bc87d2a5b6b8dc935de6538233b6c6ee54ca67ae7796f3f6b96be835c2b5 SHA512 c7ad71c4273d3037cb245abffeba679e4920b0797b72cf5876b0b9a5a76be200de317a7d5da5dd9eaf46932030fd8ff9e5c64975d1258319d6c8ad1c17d773e0
+EBUILD phonon-gstreamer-4.10.0.ebuild 964 BLAKE2B 24f9747529e4038e764e5979f03bf7431f755042a12a2fcfaf2dff165533225897e60794af3aa52ed5ceb9be2e3d759f3164e0f7aa31d8f0bd837edb2982b43f SHA512 127701917ba63d4a52fba8d88f692b5a18dd5ce1107750d6f84bb968a3016f27f3cfdbec12a7b1d1fbb6c329591552315cdf1d90c3a28c6a68bb61a71d464133
EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1262 BLAKE2B a3b5ea35d373f02fae13ab3461f31b12a629e3017375de6ec7112686d11b8b87aad215377aa26671fbbbd16a33cfa94d517874101195123a2b1b689fb5f46f80 SHA512 1aa2be3410239b3549cac802f74f61309a6a06cd01bbfcb5e805e8e012ebbb945e1e4a0d24fd0533a8e8cc3395df212a65a7f850f5710b7480e573e3e4d31b1f
-EBUILD phonon-gstreamer-4.9.1.ebuild 1167 BLAKE2B 2573fbb5833c6ae70cefcef07c19e8e500dd23e19ee01cf6bd29bc3b04106470eaac01e6b0e205faa5422976d7928feebec3642c09ef41b2cb4b4d3473f0c77d SHA512 f5c466442aacc222459148efb3d877e623c86314bb7483ea68f0f95aa442e1af5df4519c9131274603f720c787211cb809056b716b0386573338639d1881f306
-EBUILD phonon-gstreamer-9999.ebuild 932 BLAKE2B 058991aa20da444ff1d248a694e24df3bed4a5784119d9c7fb4b3f4b413bd1720faeaa1387cab19e255fafe785570cfa30a7ae54baf05645418bc2a00999b87d SHA512 3dc4437dcaa8f1ba154047feb40284627db0a2273db10d088c4e2338b49e3fc2affd38727b7f69a36d990f104e0b0aafd23dc830e359b7e456fd237d8cd188da
MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
index 777afe2e954d..34230a07d8eb 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-9999.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.10.0.ebuild
@@ -3,13 +3,14 @@
EAPI=7
+MY_PN="phonon-backend-gstreamer"
inherit kde5
DESCRIPTION="GStreamer backend for the Phonon multimedia library"
HOMEPAGE="https://phonon.kde.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/phonon/phonon-backend-gstreamer/${PV}/phonon-backend-gstreamer-${PV}.tar.xz"
+ SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
fi
@@ -37,3 +38,5 @@ DEPEND="
RDEPEND="${DEPEND}
network? ( media-plugins/gst-plugins-soup:1.0 )
"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
deleted file mode 100644
index 84a04fda0ae0..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-gstreamer"
-MY_P=${MY_PN}-${PV}
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
- EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
- inherit git-r3
-fi
-
-inherit cmake-utils xdg-utils
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="alsa debug +network"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/glib:2
- dev-libs/libxml2:2
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtopengl:5
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- =media-libs/phonon-4.10*
- media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup:1.0 )
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
- cmake-utils_src_configure
-}
-
-pkg_postinst() {
- xdg_icon_cache_update
-}
-
-pkg_postrm() {
- xdg_icon_cache_update
-}
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 2731dfa40054..7e34304d91b7 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,6 @@
AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
-DIST phonon-backend-vlc-0.10.3.tar.xz 66488 BLAKE2B d7e50a24f47117a0e00741457e9526e3042c7a2a0492a13a67a23f5dd7e2c9db89f6b9cce71d7bebed41327315e222a4a6b4637731dc15416be002ff47bad3fe SHA512 77f66536b9debc62807ca952173640a40ab9b82e17a2ac85e524c1f5dada16a39c7bb1c72230f3ca14a9c826adaf79b9439aa223be960cded634dbd00e91127f
+DIST phonon-backend-vlc-0.11.0.tar.xz 69824 BLAKE2B 3a206e642f0a2a95ac96f065c5f353a41956786dfdfba5eded3b4d64d26f58df936b893bb77bd16bc0652f42e8eead008dbbfc7b17abd3e77387fff01bd0ed01 SHA512 3f82b0c306ea1fdfbcc7b33a227f360961532b736146c96c2fff8fdf8157fd2f8e5e047f491fd1f4124dbf3bb9fa288265ea5d35d8ae6100214589c70e4d716b
EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
-EBUILD phonon-vlc-0.10.3.ebuild 802 BLAKE2B 6f7fe5759e163a6158ba53037622d7c53878fc55a405c32f6c76f71168adec399fae630ead0075674772b74765ccf24062ae34b9fc18890b6021cc32edfd646e SHA512 8a4513f2058c65bc5826df9e0d025c488a2a05913c88605fb8e2fc5a4e369e77a4c83bcdec448eeba158bf3fa27479948951fb00d35444cf34ee0bf496f69a4a
-EBUILD phonon-vlc-9999.ebuild 642 BLAKE2B f76700a5f6676377a6d06649b83303b21fb75bb6f12dd1932925609579b05feca28b5261cf5e0edfaebe443209812fe1cf11d9afaf83f27a5acf2e13bc9ff24c SHA512 99de38dffed059d4486f6580be528dae63c32ce7d2873f66f7f3fc2d1504eec7d7d8719e715e8c494bc0ace030838bb693a881ef8a7d91578a93c303b560a468
+EBUILD phonon-vlc-0.11.0.ebuild 680 BLAKE2B 8a9f7b3c3cd89677716c66ceae47d85ed2edc8dd039d9bff8b7d62bfb6ca67cf2b616df8027fe12ea61de151f05e87b34c7511c37e624571668deb7c8f694cfa SHA512 8e1b9fa5fbb43a87a30cc61233d702551df09e134506fcf2ff926c48ab74a8c6f013311628fe8208714289331fbe16ff17a9001ea55d3650971c05d8f6653376
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild
deleted file mode 100644
index 1314578be051..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.3.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PN="phonon-backend-vlc"
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-else
- EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
- inherit git-r3
-fi
-
-inherit cmake-utils
-
-DESCRIPTION="Phonon VLC backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug"
-
-BDEPEND="
- virtual/pkgconfig
-"
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- =media-libs/phonon-4.10*
- media-video/vlc:=[dbus,ogg,vorbis]
-"
-RDEPEND="${DEPEND}"
-
-src_configure() {
- local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild
index 890afef5f158..566bc66ad00b 100644
--- a/media-libs/phonon-vlc/phonon-vlc-9999.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild
@@ -3,13 +3,14 @@
EAPI=7
+MY_PN="phonon-backend-vlc"
inherit kde5
DESCRIPTION="VLC backend for the Phonon multimedia library"
HOMEPAGE="https://phonon.kde.org/"
if [[ ${KDE_BUILD_TYPE} = release ]]; then
- SRC_URI="mirror://kde/stable/phonon/phonon-backend-vlc/${PV}/phonon-backend-vlc-${PV}.tar.xz"
+ SRC_URI="mirror://kde/stable/phonon/${MY_PN}/${PV}/${MY_PN}-${PV}.tar.xz"
KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
fi
@@ -27,3 +28,5 @@ DEPEND="
media-video/vlc:=[dbus,ogg,vorbis]
"
RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_PN}-${PV}"
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 8eba8b3784e2..cb24184b65c6 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,5 @@
DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
-DIST phonon-4.10.3.tar.xz 336724 BLAKE2B 33ac87fa15985bb57672da0e29389a396e8f5662ca94d475eaa111a5a1fef16f9fc90cdee696b80d131fc53abd9500fbb7907ecb483d81e422e339660e19900d SHA512 2619ac0d7873205a2773bdb226695b5a9e2deb4f47b1a0bb9dbf9a905e3f82f7834ced1b4b1e7a6dadf50fca289f92a5749e3057546c3e16a41e1d6420b594c6
+DIST phonon-4.11.0.tar.xz 397768 BLAKE2B eeadfb8e080d52a29b0cc3d7fe728376a1580b7c008361ec62fb135738c32812401f797d93a8d87e338affdbb4b0ccefc8de0736d5cff15ee85899269a4c0243 SHA512 d7302aa9d0e9d3a8c408cf2787911b49808f58f5052dbca19e9b93b68a6f829dd31ede0ac10de4a9a3cf11e4ab1986e76e0d4cc02142b2f50ffecf285b3eb897
EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
-EBUILD phonon-4.10.3.ebuild 1331 BLAKE2B fce18c94194e5ad0de090677b1e3690fa9859381e0ac05fefaf1f6f30cc9f2b5148c7ac6951881f8a3827d53b7f7421d628cff9a399f646cedbed3fccae08f7b SHA512 f5605768a9e626fb1334d6b13f0882c136181887948227aa3a8a68b24c17fe1081e17812b1a177035b292fa893db5c14c2567d59f72ad0562e026772e14126a5
-EBUILD phonon-9999.ebuild 1158 BLAKE2B 48544fc9edf14295faf58e68708936ef3c6618319f50a224f94cba044aa5ed9f87933cd4c789b2dc923fd99672c8ee35aff7bc4ca0e63912c0fb6affc9e2c2f2 SHA512 b10e9dc36774d5625571be17354de01a7754dc3a60524788f5f015e4ac355662e9efb184919f7a48833b22b571fd9334e1606a0d0cfa948c03eb53c3a5c5b827
-MISC metadata.xml 472 BLAKE2B a4dd94a8883dceef6cbd2297e395c8e5fb287831d1bd0b69e74ea8c7977508123637177e8df2562ba1b8cfd9459738ab92f981bd926afb109433484d124937ee SHA512 8008de6bbc92f27fa741b915fef5f593aabac9921730d8238dd5f464bf3e54a8061d89107a77cb5d8e6e874479bfba3e013d5b2ba96b6afe17c32673b52d4a58
+EBUILD phonon-4.11.0.ebuild 1255 BLAKE2B 002cd7347317a831560e5619a2e68f538aba2d80b4ab326df66b7906eb5c04755f3d18116efd7028fd756a644fe4958e7f75360cfa0970f4a2c25e417f27de3b SHA512 acd0120942cb22978790babc84aafd913d9845dd230a1ed4f5b394ac0099f531956b2ff66f28a622b1c7541670be3e0e897a927cf30943935724bce699820bff
+MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/metadata.xml b/media-libs/phonon/metadata.xml
index 206f8e058c2c..c965ebc5d239 100644
--- a/media-libs/phonon/metadata.xml
+++ b/media-libs/phonon/metadata.xml
@@ -6,7 +6,6 @@
<name>Gentoo KDE Project</name>
</maintainer>
<use>
- <flag name="gui">Install device preferences and backend settings GUI</flag>
<flag name="designer">Install plugin for <pkg>dev-qt/designer</pkg></flag>
<flag name="vlc">Install VLC Phonon backend</flag>
</use>
diff --git a/media-libs/phonon/phonon-4.10.3.ebuild b/media-libs/phonon/phonon-4.10.3.ebuild
deleted file mode 100644
index b6079f78857f..000000000000
--- a/media-libs/phonon/phonon-4.10.3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} != *9999* ]]; then
- SRC_URI="mirror://kde/stable/phonon/${PV}/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-fbsd"
-else
- EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
- inherit git-r3
-fi
-
-inherit cmake-utils qmake-utils
-
-DESCRIPTION="KDE multimedia API"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="|| ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="debug designer gstreamer pulseaudio +vlc"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig
-"
-DEPEND="
- !!dev-qt/qtphonon:4
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- designer? ( dev-qt/designer:5 )
- pulseaudio? (
- dev-libs/glib:2
- >=media-sound/pulseaudio-0.9.21[glib]
- )
-"
-RDEPEND="${DEPEND}"
-PDEPEND="
- gstreamer? ( =media-libs/phonon-gstreamer-4.9* )
- vlc? ( =media-libs/phonon-vlc-0.10* )
-"
-
-src_configure() {
- local mycmakeargs=(
- -DPHONON_BUILD_PHONON4QT5=ON
- -DPHONON_INSTALL_QT_EXTENSIONS_INTO_SYSTEM_QT=TRUE
- -DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
- -DWITH_GLIB2=$(usex pulseaudio)
- -DWITH_PulseAudio=$(usex pulseaudio)
- -DQT_QMAKE_EXECUTABLE="$(qt5_get_bindir)"/qmake
- )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon/phonon-9999.ebuild b/media-libs/phonon/phonon-4.11.0.ebuild
index cee83b281de2..6edaf832b5a2 100644
--- a/media-libs/phonon/phonon-9999.ebuild
+++ b/media-libs/phonon/phonon-4.11.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit kde5
+inherit desktop kde5
DESCRIPTION="KDE multimedia abstraction library"
HOMEPAGE="https://phonon.kde.org/"
@@ -15,7 +15,7 @@ fi
LICENSE="|| ( LGPL-2.1 LGPL-3 )"
SLOT="0"
-IUSE="debug designer gstreamer gui pulseaudio +vlc"
+IUSE="debug designer gstreamer pulseaudio +vlc"
BDEPEND="
dev-qt/linguist-tools:5
@@ -23,7 +23,6 @@ BDEPEND="
"
DEPEND="
!!dev-qt/qtphonon:4
- dev-qt/qtdbus:5
dev-qt/qtgui:5
dev-qt/qtwidgets:5
designer? ( dev-qt/designer:5 )
@@ -40,11 +39,17 @@ PDEPEND="
src_configure() {
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Qt5Declarative=ON
-DPHONON_BUILD_DESIGNER_PLUGIN=$(usex designer)
-DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=$(usex !pulseaudio)
-DCMAKE_DISABLE_FIND_PACKAGE_PulseAudio=$(usex !pulseaudio)
- -DPHONON_BUILD_SETTINGS=$(usex gui)
+ -DPHONON_BUILD_SETTINGS=$(usex !pulseaudio)
)
kde5_src_configure
}
+
+src_install() {
+ kde5_src_install
+ use pulseaudio || \
+ make_desktop_entry "${PN}settings" \
+ "Phonon Audio and Video" preferences-desktop-sound
+}
diff --git a/media-libs/portaudio/Manifest b/media-libs/portaudio/Manifest
index 1058487a33d4..abc2bbd847b5 100644
--- a/media-libs/portaudio/Manifest
+++ b/media-libs/portaudio/Manifest
@@ -1,5 +1,5 @@
DIST pa_stable_v190600_20161030.tgz 1450572 BLAKE2B 3cd63cca55ff222f452d306a1ab9035739545f48dbc9bc58196052cb51e518d86568059c7528533a6932c39c68d1a5210e06470a16343b92c7e4132b71cc552e SHA512 7ec692cbd8c23878b029fad9d9fd63a021f57e60c4921f602995a2fca070c29f17a280c7f2da5966c4aad29d28434538452f4c822eacf3a60af59a6dc8e9704c
DIST portaudio-19.06.00-audacity-portmixer.patch 8722 BLAKE2B 2b69bcf26e55be46d354dc44756fd03b16031fa86a334b776eb4326a4c64a7e22abd6bf60794847526102391c8e65813b41338cf94c647e3e9b68d82ea5dc5f5 SHA512 f693aef477b516c7a03eb021260cbecb23200422a927a117e3e59a1b4e6c6c2983fbea8ee3a3714ebc55728933654bd7909327a0bab4450ccf4e6a02c86a63b5
-EBUILD portaudio-19.06.00-r1.ebuild 1300 BLAKE2B 4306155bc45797c73ffddf3eb5b0e71d99b4d8184b1d3008fe07206c4aac2f3cae4933847b5c02ae82f4edac09bd5cbb5a0b7b8dee7fff2b5532f7fbbb797ef3 SHA512 6007702b517a2fb73dad8108d4336ef8bbf619dad98768b8b67b2d47d29a1728cbe5ae3b2e79466962d68ce3c7c3ceaa58504adbc9a79b73d3ea16a19ffd0497
+EBUILD portaudio-19.06.00-r1.ebuild 1299 BLAKE2B 65b2ccc4ac4352593fad8e42d7d5ff80b67f9e82f6f0b7f92434dfbaf55ce305fc8c190eccd26f6983b35e0b0c0ad63df7cbb1ece95d945f72804a4b71bc257e SHA512 3413bc83d334aa5092a0365f7e9cf69011736c450041e48f25604cbca2f69457fc91182339899ac964343ed705c51e7675a3b306308bd0f4a78c6c9d381e9d96
EBUILD portaudio-19.06.00-r2.ebuild 1547 BLAKE2B 80c4c05d4039e408ab4ff6f7b331deecbf3c76f2cac2087e26cfae75d80444830310f214696c0c44db5d6eecdca8b9cb89554cbd95e2484a4bd10f4a3b1e4f50 SHA512 e3c4a4f27f3ef9837589b4825a12d55b039884c669564e2919410cba6d64fd25139c297295463185d6471d483adeaa34e6d15bd774ed3ec86b558336252b0868
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
index 0b4f1938c3a8..91a5125e11ac 100644
--- a/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
+++ b/media-libs/portaudio/portaudio-19.06.00-r1.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://www.portaudio.com/archives/pa_stable_v190600_20161030.tgz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 ~sh sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE="alsa +cxx debug doc jack oss static-libs"
RDEPEND="alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
diff --git a/media-libs/simage/Manifest b/media-libs/simage/Manifest
index 30b487c5b493..8b2984f4ef1b 100644
--- a/media-libs/simage/Manifest
+++ b/media-libs/simage/Manifest
@@ -3,6 +3,6 @@ AUX simage-1.7.0-pkgconfig-partial.patch 467 BLAKE2B a2957c1d5fc6939df7ecb1bb157
AUX simage-1.7.1-cmake-automagic-deps.patch 14873 BLAKE2B a65d862adea4d9f8064b0fccec538047820a134155489cb790d0eae095d7a078f4e4593bf56e532dc3ac03bfff7f0a20a2c81658adddde36faa24cb8fec6df94 SHA512 d80f999d57eddd6eea7b92bb421c2b9bf0f577cdffd0574afbfd2b9c1d25a9dea555d64587be8c96fea203486740ce563b35eaf35da16b6abb4f4b0707cc0916
DIST Coin3D-simage-3bd369da8f08.tar.bz2 630229 BLAKE2B 6231dde891c07d8a4a37eebd5f89d9e445c048bf48d1718a5f1e2b12f488ad6c806edd04fd4eb30b5e041f978fbb65ea0b1d3b1263d7006bbda4568f4bef87c6 SHA512 61793a728c66dc4f427b1f853e0dcf38a71dced68814c8438e6653a4a1486d8066ce50a7c088d476cf796b4872c724687b3ca9d51ec0ed74f54d5d7e47c89b34
DIST simage-1.7.0.tar.gz 752602 BLAKE2B feca31f8d41ae67271e43c9c664243d872985068ffc8496d43c9b59a47ae5c3067956acced3ff9abbdc5a360aec662e3972a93d8523a704a72ac9d12dd4cfaa0 SHA512 944ec009dd7041692073ddd9795fdd633fe3bc9101f1c1234e8be3746487a9431aecf52abde01563e719153fbe1ca7d29f9b64042e4a64ea08d6cb14666dd89f
-EBUILD simage-1.7.0-r1.ebuild 1824 BLAKE2B bcfb522e6e0036d1d357e4c5180949fb0c29141c19137e2f2018b7b588490cd676a98fea8552dd1f4db5166981b03586ba2b8d13186c4b5337fd437568802711 SHA512 b660387c2752af77fd04252ee3cc2270a44cbd11f893847a7e74a3eae65542395ddc5a0f3cf53a2c97000c6b097f066ebf1a275239d878dbcfc20c92e75f7aa2
-EBUILD simage-1.7.1a_beta_pre20180312.ebuild 1758 BLAKE2B 6235580fb576b72f1497843d266cff696d589abbe1e48f72a63a4ad2d5ef587289c3bb34aedbb1a8bd02621b5ecb838f429a75eb1d178fc3703a0e4007112219 SHA512 b90b684e4ecef03f88be837d004e0503fef28a2bac26981affc791da52f2a416a77df5d626a42646978104c4ee436e10ffd82056d2be3a7a693c68d82b76f5ad
+EBUILD simage-1.7.0-r1.ebuild 1774 BLAKE2B 672761903a9a91db1c92d6cd0248902b1c9c5612cc95bb8f7b543991672b9dfc761c29ea89f432f02c119170c8c7539830d00fa811dc06675ba19dd2d9cdb0d4 SHA512 609cdd06c38fab358d4f6aaa469dec35e14789a7ec2ab459f80f3065ca9341a9801d7c6e48490fd436d667f71dfda51396474f25fe4481dbadfca27928c3f394
+EBUILD simage-1.7.1a_beta_pre20180312.ebuild 1706 BLAKE2B e95c98f8416c56a04e844bf1ded6cd67b330918f814ad327d6f6659e435375f20c914e4823e75372a2a0e45be5330e1ef7f17a1d5fff928655541cdb41eb2527 SHA512 e0edd930cfad848030c36659cd880da8761a8dc42961912008edaeb7cba6121ac851dba1fd6b4d1c2d5179eabcefb202719ffcba9870b617c4697801ed471321
MISC metadata.xml 298 BLAKE2B 312f7a48552438ce1231a58486f19aca02bbb281b72733645ffad42a3f82df778145bfc66a61c1216e47bd68e54668725fe08274482be7fb3997c99bf3089fdc SHA512 b72572413e5e40d55658049b4624de687dd1011553fc384deb0c837830b6f82d060b6356ad25e803f27d3be697b07a8c3fbc45932d20d89e4d9918ed6fecd84a
diff --git a/media-libs/simage/simage-1.7.0-r1.ebuild b/media-libs/simage/simage-1.7.0-r1.ebuild
index 88bffba3a7b5..f491e59cb38b 100644
--- a/media-libs/simage/simage-1.7.0-r1.ebuild
+++ b/media-libs/simage/simage-1.7.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,13 +10,12 @@ SRC_URI="https://bitbucket.org/Coin3D/coin/downloads/${P}.tar.gz"
LICENSE="public-domain mpeg2enc"
KEYWORDS="amd64 ~arm ~hppa ~ia64 ppc ppc64 ~sparc x86"
SLOT="0"
-IUSE="debug gif jpeg jpeg2k png sndfile static-libs tiff vorbis zlib"
+IUSE="debug gif jpeg png sndfile static-libs tiff vorbis zlib"
RESTRICT="mirror bindist" #465086
RDEPEND="
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( media-libs/jasper )
png? ( media-libs/libpng:0= )
sndfile? ( media-libs/libsndfile )
tiff? ( media-libs/tiff:0= )
@@ -54,7 +53,7 @@ src_configure() {
$(use_enable debug) \
$(use_enable debug symbols) \
$(use_with jpeg) \
- $(use_with jpeg2k jasper) \
+ --without-jasper \
$(use_with png) \
$(use_with sndfile libsndfile) \
$(use_enable static-libs static) \
diff --git a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild b/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild
index 01635618aef0..4ced5ba29613 100644
--- a/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild
+++ b/media-libs/simage/simage-1.7.1a_beta_pre20180312.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -14,12 +14,11 @@ SRC_URI="https://dev.gentoo.org/~reavertm/${MY_P}.tar.bz2"
LICENSE="public-domain mpeg2enc"
KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~x86"
SLOT="0"
-IUSE="debug gif jpeg jpeg2k png qt5 sndfile tiff vorbis"
+IUSE="debug gif jpeg png qt5 sndfile tiff vorbis"
RDEPEND="
gif? ( media-libs/giflib )
jpeg? ( virtual/jpeg:0= )
- jpeg2k? ( media-libs/jasper )
png? ( media-libs/libpng:0= )
qt5? (
dev-qt/qtcore:5
@@ -52,7 +51,7 @@ src_configure() {
-DSIMAGE_EPS_SUPPORT=ON
-DSIMAGE_GDIPLUS_SUPPORT=OFF # Windows only
-DSIMAGE_GIF_SUPPORT=$(usex gif)
- -DSIMAGE_JASPER_SUPPORT=$(usex jpeg2k)
+ -DSIMAGE_JASPER_SUPPORT=OFF
-DSIMAGE_JPEG_SUPPORT=$(usex jpeg)
-DSIMAGE_LIBSNDFILE_SUPPORT=$(usex sndfile)
-DSIMAGE_MPEG2ENC_SUPPORT=ON
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index a3cc5dc282db..0cbacf20a82b 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,9 +1,11 @@
AUX tiff-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch 1301 BLAKE2B 0f4875ff1f4ae06c56018f6ecfe4ce7dc015f9cf77475f61e4b9c898afdfebbeda53ea1cef1d5a7a6237af77dcf8eaa4884ecf8fa9593f2513e84021b47efd02 SHA512 902a01411b8b45bb16757aa34b27cbac9f1f01981a169538b97f3a4cb47fb6597c753c0660182cf4f2cb8a7156049cdf93c5fa8b9c202e89d6cdb44204d94df1
+AUX tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch 12754 BLAKE2B c2f6c8964b493e1d9965a95dea7463b1052809ec9fa529502f976ebe396195010b5cc132318c68b1e8f34695831006f5764ef7f40f42ead031b9263c83e7d395 SHA512 803dc0dfc139dac9e25163dc4b592a6158dfa076788840cbfd1abba85af6571e15cb7f6444d23abb70c738db835fb7412a9b200b2b3cea9ef5a86f4e2b97f9d0
AUX tiff-4.0.10-CVE-2019-6128-pal2rgb-leak.patch 1427 BLAKE2B e2c392cd2bfe6f90dc510403d5cc1c383a8ee77e5ce2c1435acdbb9f9bb4c9010e85f19b9f2329f14fb82d0dab4cacdc2e6a5367ff95f940b5535eefd1b24903 SHA512 0a3103dae94b3362da1c5ebf087926ec82bf4e16ba7b5bc13e998fad1e9a970604dd80554f5b0a45d2d4f55a4b6e68dfb180b032f83b4b1335d011e25eb754b5
AUX tiff-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch 1996 BLAKE2B 1e654cc81d66b050e17a1234016b103332dcfcf03f3d7670d35942efc56fbeff0d66d9b6cc71a059ff6602a7c7cef1a3644ae7ea4ca59e88e9004914bea1be32 SHA512 93d386c62d29715b7e84177c7caaba0a9e284f8b9c730db93cf8fbc76faab2e798c81aab20b1210f0342fa6651e56fcbd07655205957b06bf9236ed0903f00a4
AUX tiff-4.0.7-pdfium-0006-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 930 BLAKE2B 52d77fcdd773ce52232257da2c60f8b90417f102238df2039262e3afa7275908c74817ddd6958e430d7cfcff58d2d04ebd6ddd49f553f0f261883b67f557c599 SHA512 822ccc22304d23b4f50efe1f0fb7890fda8b9edf2075b8add814c0bac0a153fa0ed5d7ee5f47e23799b24f11678c8e0bf9c90ad59c5cc61fd9546b2dca4714a9
AUX tiff-4.0.7-pdfium-0008-HeapBufferOverflow-ChopUpSingleUncompressedStrip.patch 924 BLAKE2B 03160ce33639620b1deb918d358f559b8bc6296d28530b440d0d770438453c25aecc393b8cfcc582ed2d0ec1decd557a212c91f43f7923c9e94387e235680021 SHA512 43973cc5512eb8fe2e0beab1a98ff0d3bd999ed1adbf7c08c344b3442559cc2cdc99a9f2e9c1bb2bffa4be027945b12b120fa27ec6c8006367932039b8d8dd37
DIST tiff-4.0.10.tar.gz 2402867 BLAKE2B 0305453f22150c31d00d2de756736f58c49a288e19b2a66bdd01319ce4688742f6eab4009eaf1817125d41f53a23de17eb6265a3ebae458ec24f5dbb3d49764e SHA512 d213e5db09fd56b8977b187c5a756f60d6e3e998be172550c2892dbdb4b2a8e8c750202bc863fe27d0d1c577ab9de1710d15e9f6ed665aadbfd857525a81eea8
EBUILD tiff-4.0.10-r1.ebuild 2491 BLAKE2B f6be096bf9b99b9dd9626043df11d965e5282b87c6ae48098efa30a565604e16c21fa81a5723925ec8061b332b68fd0da43fb3782b59b446b739234ccfb929f1 SHA512 da78f5770d10676770ab31d8c5fe490a5ba41a49f9ba7db5da6f26f52be988125425168e8ff163692373d35df17f29ba7f1a1c16a12c0b4a750ead111eef840a
+EBUILD tiff-4.0.10-r2.ebuild 2368 BLAKE2B 0aa9495f391255146ea6834142f4030906dd33af9a5540e9eb7365f51c9207bae817cf481a009b83ca3a445d626bca1086f1f6d59e14061e3695b5b030ac0cbe SHA512 bb2735a0051540c8d69a0a0fa6ff98562732b76e8a068f4f4d7e623b5f2c939ec028b01463557b98a9db680a16d27fa6f011795f33ed3d6037d2ae7c06e5d43f
EBUILD tiff-4.0.10.ebuild 2278 BLAKE2B 590019a51d49fe8486427702957bbf51680a69fc4e4158f74fdfde44bc85d7243ff1fbc08cec658287a742f14069a3c231df5d5388b7ad1db7940c3cc3d2cf3f SHA512 3d6285a44f2744091f2e321c96934986fbdfeb81eee94f340fa969a81f462c7c4a2658821827d317f2313319de079dc08217c2f3849701fba391845b1e09b2b1
MISC metadata.xml 565 BLAKE2B 3d487835599974795ba6007439bf1d08756ab1c5dbe191509832b302f3199e4ffc05be64df3e26b4d4a1c11d1292c48cbb59ffa6e412831d16d7415e076f1062 SHA512 289043206dbb512c97e4bb703b32549ac4a77f40e212548b80ea865052b80fed9d4562f9fc94638fda54da9bc3e0c19ba303c027e66e7b75c772aeec91aebe6f
diff --git a/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch
new file mode 100644
index 000000000000..cbcbfd9d7f02
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.0.10-CVE-2019-14973-fix-integer-overflow.patch
@@ -0,0 +1,395 @@
+From 6ebfcac47224d3b8661c501967d495135449883e Mon Sep 17 00:00:00 2001
+From: Even Rouault <even.rouault@spatialys.com>
+Date: Sat, 10 Aug 2019 18:25:03 +0200
+Subject: [PATCH] Fix integer overflow in _TIFFCheckMalloc() and other
+ implementation-defined behaviour (CVE-2019-14973)
+
+_TIFFCheckMalloc()/_TIFFCheckRealloc() used a unsafe way to detect overflow
+in the multiplication of nmemb and elem_size (which are of type tmsize_t, thus
+signed), which was especially easily triggered on 32-bit builds (with recent
+enough compilers that assume that signed multiplication cannot overflow, since
+this is undefined behaviour by the C standard). The original issue which lead to
+this fix was trigged from tif_fax3.c
+
+There were also unsafe (implementation defied), and broken in practice on 64bit
+builds, ways of checking that a uint64 fits of a (signed) tmsize_t by doing
+(uint64)(tmsize_t)uint64_var != uint64_var comparisons. Those have no known
+at that time exploits, but are better to fix in a more bullet-proof way.
+Or similarly use of (int64)uint64_var <= 0.
+
+--- a/libtiff/tif_aux.c
++++ b/libtiff/tif_aux.c
+@@ -57,18 +57,57 @@ _TIFFMultiply64(TIFF* tif, uint64 first, uint64 second, const char* where)
+ return bytes;
+ }
+
++tmsize_t
++_TIFFMultiplySSize(TIFF* tif, tmsize_t first, tmsize_t second, const char* where)
++{
++ if( first <= 0 || second <= 0 )
++ {
++ if( tif != NULL && where != NULL )
++ {
++ TIFFErrorExt(tif->tif_clientdata, where,
++ "Invalid argument to _TIFFMultiplySSize() in %s", where);
++ }
++ return 0;
++ }
++
++ if( first > TIFF_TMSIZE_T_MAX / second )
++ {
++ if( tif != NULL && where != NULL )
++ {
++ TIFFErrorExt(tif->tif_clientdata, where,
++ "Integer overflow in %s", where);
++ }
++ return 0;
++ }
++ return first * second;
++}
++
++tmsize_t _TIFFCastUInt64ToSSize(TIFF* tif, uint64 val, const char* module)
++{
++ if( val > (uint64)TIFF_TMSIZE_T_MAX )
++ {
++ if( tif != NULL && module != NULL )
++ {
++ TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
++ }
++ return 0;
++ }
++ return (tmsize_t)val;
++}
++
+ void*
+ _TIFFCheckRealloc(TIFF* tif, void* buffer,
+ tmsize_t nmemb, tmsize_t elem_size, const char* what)
+ {
+ void* cp = NULL;
+- tmsize_t bytes = nmemb * elem_size;
+-
++ tmsize_t count = _TIFFMultiplySSize(tif, nmemb, elem_size, NULL);
+ /*
+- * XXX: Check for integer overflow.
++ * Check for integer overflow.
+ */
+- if (nmemb && elem_size && bytes / elem_size == nmemb)
+- cp = _TIFFrealloc(buffer, bytes);
++ if (count != 0)
++ {
++ cp = _TIFFrealloc(buffer, count);
++ }
+
+ if (cp == NULL) {
+ TIFFErrorExt(tif->tif_clientdata, tif->tif_name,
+--- a/libtiff/tif_getimage.c
++++ b/libtiff/tif_getimage.c
+@@ -755,9 +755,8 @@ gtTileSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+ uint32 leftmost_tw;
+
+ tilesize = TIFFTileSize(tif);
+- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,tilesize);
++ bufsize = _TIFFMultiplySSize(tif, alpha?4:3,tilesize, "gtTileSeparate");
+ if (bufsize == 0) {
+- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtTileSeparate");
+ return (0);
+ }
+
+@@ -1019,9 +1018,8 @@ gtStripSeparate(TIFFRGBAImage* img, uint32* raster, uint32 w, uint32 h)
+ uint16 colorchannels;
+
+ stripsize = TIFFStripSize(tif);
+- bufsize = TIFFSafeMultiply(tmsize_t,alpha?4:3,stripsize);
++ bufsize = _TIFFMultiplySSize(tif,alpha?4:3,stripsize, "gtStripSeparate");
+ if (bufsize == 0) {
+- TIFFErrorExt(tif->tif_clientdata, TIFFFileName(tif), "Integer overflow in %s", "gtStripSeparate");
+ return (0);
+ }
+
+--- a/libtiff/tif_luv.c
++++ b/libtiff/tif_luv.c
+@@ -1264,16 +1264,10 @@ LogL16GuessDataFmt(TIFFDirectory *td)
+ return (SGILOGDATAFMT_UNKNOWN);
+ }
+
+-
+-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
+-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
+-
+ static tmsize_t
+ multiply_ms(tmsize_t m1, tmsize_t m2)
+ {
+- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
+- return 0;
+- return m1 * m2;
++ return _TIFFMultiplySSize(NULL, m1, m2, NULL);
+ }
+
+ static int
+--- a/libtiff/tif_pixarlog.c
++++ b/libtiff/tif_pixarlog.c
+@@ -634,15 +634,10 @@ PixarLogGuessDataFmt(TIFFDirectory *td)
+ return guess;
+ }
+
+-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
+-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
+-
+ static tmsize_t
+ multiply_ms(tmsize_t m1, tmsize_t m2)
+ {
+- if( m1 == 0 || m2 > TIFF_TMSIZE_T_MAX / m1 )
+- return 0;
+- return m1 * m2;
++ return _TIFFMultiplySSize(NULL, m1, m2, NULL);
+ }
+
+ static tmsize_t
+--- a/libtiff/tif_read.c
++++ b/libtiff/tif_read.c
+@@ -29,9 +29,6 @@
+ #include "tiffiop.h"
+ #include <stdio.h>
+
+-#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
+-#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
+-
+ int TIFFFillStrip(TIFF* tif, uint32 strip);
+ int TIFFFillTile(TIFF* tif, uint32 tile);
+ static int TIFFStartStrip(TIFF* tif, uint32 strip);
+@@ -49,6 +46,8 @@ TIFFReadRawTile1(TIFF* tif, uint32 tile, void* buf, tmsize_t size, const char* m
+ #define THRESHOLD_MULTIPLIER 10
+ #define MAX_THRESHOLD (THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * THRESHOLD_MULTIPLIER * INITIAL_THRESHOLD)
+
++#define TIFF_INT64_MAX ((((int64)0x7FFFFFFF) << 32) | 0xFFFFFFFF)
++
+ /* Read 'size' bytes in tif_rawdata buffer starting at offset 'rawdata_offset'
+ * Returns 1 in case of success, 0 otherwise. */
+ static int TIFFReadAndRealloc( TIFF* tif, tmsize_t size,
+@@ -734,23 +733,8 @@ TIFFReadRawStrip(TIFF* tif, uint32 strip, void* buf, tmsize_t size)
+ return ((tmsize_t)(-1));
+ }
+ bytecount = td->td_stripbytecount[strip];
+- if ((int64)bytecount <= 0) {
+-#if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+- TIFFErrorExt(tif->tif_clientdata, module,
+- "%I64u: Invalid strip byte count, strip %lu",
+- (unsigned __int64) bytecount,
+- (unsigned long) strip);
+-#else
+- TIFFErrorExt(tif->tif_clientdata, module,
+- "%llu: Invalid strip byte count, strip %lu",
+- (unsigned long long) bytecount,
+- (unsigned long) strip);
+-#endif
+- return ((tmsize_t)(-1));
+- }
+- bytecountm = (tmsize_t)bytecount;
+- if ((uint64)bytecountm!=bytecount) {
+- TIFFErrorExt(tif->tif_clientdata, module, "Integer overflow");
++ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount, module);
++ if (bytecountm == 0) {
+ return ((tmsize_t)(-1));
+ }
+ if (size != (tmsize_t)(-1) && size < bytecountm)
+@@ -774,7 +758,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
+ if ((tif->tif_flags&TIFF_NOREADRAW)==0)
+ {
+ uint64 bytecount = td->td_stripbytecount[strip];
+- if ((int64)bytecount <= 0) {
++ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ TIFFErrorExt(tif->tif_clientdata, module,
+ "Invalid strip byte count %I64u, strip %lu",
+@@ -801,7 +785,7 @@ TIFFFillStrip(TIFF* tif, uint32 strip)
+ (bytecount - 4096) / 10 > (uint64)stripsize )
+ {
+ uint64 newbytecount = (uint64)stripsize * 10 + 4096;
+- if( (int64)newbytecount >= 0 )
++ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
+ {
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ TIFFWarningExt(tif->tif_clientdata, module,
+@@ -1196,10 +1180,8 @@ TIFFReadRawTile(TIFF* tif, uint32 tile, void* buf, tmsize_t size)
+ bytecount64 = td->td_stripbytecount[tile];
+ if (size != (tmsize_t)(-1) && (uint64)size < bytecount64)
+ bytecount64 = (uint64)size;
+- bytecountm = (tmsize_t)bytecount64;
+- if ((uint64)bytecountm!=bytecount64)
+- {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
++ bytecountm = _TIFFCastUInt64ToSSize(tif, bytecount64, module);
++ if( bytecountm == 0 ) {
+ return ((tmsize_t)(-1));
+ }
+ return (TIFFReadRawTile1(tif, tile, buf, bytecountm, module));
+@@ -1221,7 +1203,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
+ if ((tif->tif_flags&TIFF_NOREADRAW)==0)
+ {
+ uint64 bytecount = td->td_stripbytecount[tile];
+- if ((int64)bytecount <= 0) {
++ if( bytecount == 0 || bytecount > (uint64)TIFF_INT64_MAX ) {
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ TIFFErrorExt(tif->tif_clientdata, module,
+ "%I64u: Invalid tile byte count, tile %lu",
+@@ -1248,7 +1230,7 @@ TIFFFillTile(TIFF* tif, uint32 tile)
+ (bytecount - 4096) / 10 > (uint64)stripsize )
+ {
+ uint64 newbytecount = (uint64)stripsize * 10 + 4096;
+- if( (int64)newbytecount >= 0 )
++ if( newbytecount == 0 || newbytecount > (uint64)TIFF_INT64_MAX )
+ {
+ #if defined(__WIN32__) && (defined(_MSC_VER) || defined(__MINGW32__))
+ TIFFWarningExt(tif->tif_clientdata, module,
+--- a/libtiff/tif_strip.c
++++ b/libtiff/tif_strip.c
+@@ -129,15 +129,8 @@ TIFFVStripSize(TIFF* tif, uint32 nrows)
+ {
+ static const char module[] = "TIFFVStripSize";
+ uint64 m;
+- tmsize_t n;
+ m=TIFFVStripSize64(tif,nrows);
+- n=(tmsize_t)m;
+- if ((uint64)n!=m)
+- {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+- n=0;
+- }
+- return(n);
++ return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+
+ /*
+@@ -211,15 +204,8 @@ TIFFStripSize(TIFF* tif)
+ {
+ static const char module[] = "TIFFStripSize";
+ uint64 m;
+- tmsize_t n;
+ m=TIFFStripSize64(tif);
+- n=(tmsize_t)m;
+- if ((uint64)n!=m)
+- {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+- n=0;
+- }
+- return(n);
++ return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+
+ /*
+@@ -330,14 +316,8 @@ TIFFScanlineSize(TIFF* tif)
+ {
+ static const char module[] = "TIFFScanlineSize";
+ uint64 m;
+- tmsize_t n;
+ m=TIFFScanlineSize64(tif);
+- n=(tmsize_t)m;
+- if ((uint64)n!=m) {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
+- n=0;
+- }
+- return(n);
++ return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+
+ /*
+@@ -366,15 +346,8 @@ TIFFRasterScanlineSize(TIFF* tif)
+ {
+ static const char module[] = "TIFFRasterScanlineSize";
+ uint64 m;
+- tmsize_t n;
+ m=TIFFRasterScanlineSize64(tif);
+- n=(tmsize_t)m;
+- if ((uint64)n!=m)
+- {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer arithmetic overflow");
+- n=0;
+- }
+- return(n);
++ return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+
+ /* vim: set ts=8 sts=8 sw=8 noet: */
+--- a/libtiff/tif_tile.c
++++ b/libtiff/tif_tile.c
+@@ -181,15 +181,8 @@ TIFFTileRowSize(TIFF* tif)
+ {
+ static const char module[] = "TIFFTileRowSize";
+ uint64 m;
+- tmsize_t n;
+ m=TIFFTileRowSize64(tif);
+- n=(tmsize_t)m;
+- if ((uint64)n!=m)
+- {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+- n=0;
+- }
+- return(n);
++ return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+
+ /*
+@@ -248,15 +241,8 @@ TIFFVTileSize(TIFF* tif, uint32 nrows)
+ {
+ static const char module[] = "TIFFVTileSize";
+ uint64 m;
+- tmsize_t n;
+ m=TIFFVTileSize64(tif,nrows);
+- n=(tmsize_t)m;
+- if ((uint64)n!=m)
+- {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+- n=0;
+- }
+- return(n);
++ return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+
+ /*
+@@ -272,15 +258,8 @@ TIFFTileSize(TIFF* tif)
+ {
+ static const char module[] = "TIFFTileSize";
+ uint64 m;
+- tmsize_t n;
+ m=TIFFTileSize64(tif);
+- n=(tmsize_t)m;
+- if ((uint64)n!=m)
+- {
+- TIFFErrorExt(tif->tif_clientdata,module,"Integer overflow");
+- n=0;
+- }
+- return(n);
++ return _TIFFCastUInt64ToSSize(tif, m, module);
+ }
+
+ /*
+--- a/libtiff/tiffiop.h
++++ b/libtiff/tiffiop.h
+@@ -77,6 +77,9 @@ extern int snprintf(char* str, size_t size, const char* format, ...);
+ #define FALSE 0
+ #endif
+
++#define TIFF_SIZE_T_MAX ((size_t) ~ ((size_t)0))
++#define TIFF_TMSIZE_T_MAX (tmsize_t)(TIFF_SIZE_T_MAX >> 1)
++
+ typedef struct client_info {
+ struct client_info *next;
+ void *data;
+@@ -258,7 +261,7 @@ struct tiff {
+ #define TIFFhowmany8_64(x) (((x)&0x07)?((uint64)(x)>>3)+1:(uint64)(x)>>3)
+ #define TIFFroundup_64(x, y) (TIFFhowmany_64(x,y)*(y))
+
+-/* Safe multiply which returns zero if there is an integer overflow */
++/* Safe multiply which returns zero if there is an *unsigned* integer overflow. This macro is not safe for *signed* integer types */
+ #define TIFFSafeMultiply(t,v,m) ((((t)(m) != (t)0) && (((t)(((v)*(m))/(m))) == (t)(v))) ? (t)((v)*(m)) : (t)0)
+
+ #define TIFFmax(A,B) ((A)>(B)?(A):(B))
+@@ -368,6 +371,8 @@ extern TIFFErrorHandlerExt _TIFFerrorHandlerExt;
+
+ extern uint32 _TIFFMultiply32(TIFF*, uint32, uint32, const char*);
+ extern uint64 _TIFFMultiply64(TIFF*, uint64, uint64, const char*);
++extern tmsize_t _TIFFMultiplySSize(TIFF*, tmsize_t, tmsize_t, const char*);
++extern tmsize_t _TIFFCastUInt64ToSSize(TIFF*, uint64, const char*);
+ extern void* _TIFFCheckMalloc(TIFF*, tmsize_t, tmsize_t, const char*);
+ extern void* _TIFFCheckRealloc(TIFF*, void*, tmsize_t, tmsize_t, const char*);
+
diff --git a/media-libs/tiff/tiff-4.0.10-r2.ebuild b/media-libs/tiff/tiff-4.0.10-r2.ebuild
new file mode 100644
index 000000000000..9f1174ee30f8
--- /dev/null
+++ b/media-libs/tiff/tiff-4.0.10-r2.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools libtool multilib-minimal
+
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
+
+LICENSE="libtiff"
+SLOT="0"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+
+RDEPEND="
+ jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+ jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
+ lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+ zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="test? ( jpeg )" #483132
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.0.10-CVE-2018-17000-tif_dirwrite-null-dereference.patch
+ "${FILESDIR}"/${PN}-4.0.10-CVE-2019-6128-pal2rgb-leak.patch
+ "${FILESDIR}"/${PN}-4.0.10-CVE-2019-7663-tiffcpIntegerOverflow.patch
+ "${FILESDIR}"/${P}-CVE-2019-14973-fix-integer-overflow.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/tiffconf.h
+)
+
+src_prepare() {
+ default
+
+ # tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
+ sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
+
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --without-x
+ --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+ $(use_enable cxx)
+ $(use_enable jbig)
+ $(use_enable jpeg)
+ $(use_enable lzma)
+ $(use_enable static-libs static)
+ $(use_enable webp)
+ $(use_enable zlib)
+ $(use_enable zstd)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+
+ # remove useless subdirs
+ if ! multilib_is_native_abi ; then
+ sed -i \
+ -e 's/ tools//' \
+ -e 's/ contrib//' \
+ -e 's/ man//' \
+ -e 's/ html//' \
+ Makefile || die
+ fi
+}
+
+multilib_src_test() {
+ if ! multilib_is_native_abi ; then
+ emake -C tools
+ fi
+ emake check
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name '*.la' -delete || die
+ rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 4d5b6895271e..2d8329a310d9 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,4 +1,6 @@
DIST x264-snapshot-20190214-2245.tar.bz2 770462 BLAKE2B d90a3bafb88febe12526b225617616a62c32fa3d3eacf410267e1fbd7e0fafaadca7c146172c08fc525bce8791d81c7d87dc27b06d61a6a44bf2ad92f6c1def6 SHA512 c8b1b46d4e6c0ef653dab35083a454c635ebf72c6a5255ce30bbb5d9d6bb8e23fca0e6cc197ea99f3c702fbfec096587df6fa82dec338d8bd45e35fa89c43039
+DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
EBUILD x264-0.0.20190214.ebuild 1815 BLAKE2B ef9a8e82e7859922afc7f496a7a70b5ebdd01442bd11b5990b14b6a5384faf87123529398ed8bdc21f1685eed839aeb5cbd4ad9614c6073d0dd0e0f04651d9b1 SHA512 9d1e2c6ae46dd73d71929e1d46eea7f8e63517653b17aa3d88b884cd59a1b3fb1646560363e52c517eaf33afc11ca9f6b36d094162259faea8b2aee94bbf8f58
+EBUILD x264-0.0.20190903.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
EBUILD x264-9999.ebuild 1824 BLAKE2B dc38712d74f047f47b84e99ad9f2c78c5d452fbc7dd8e503d0f74136559fe5e5b3e858a7edb1dc7210e46935d1af02fd0966b984cd2dcfc8ad20c8c1d6cc5286 SHA512 8b4d908028140b4b592e556a338abbe92143b80381008e34b9a2e822e009537c22a2544d36b9ab5cf1bcbc5d33ad329cf6353c099201cd3365bde9258f6a4cd4
MISC metadata.xml 488 BLAKE2B 3e6982e1bbd45194bb664ddb4b34e307ef4030f4fba9905d0a292c8a5ce73e27bc1c687758cc4fb18d38cc2c93ed21b64dfa35b2aaa63dc6fbd1110b9e1daf1f SHA512 2dc9d360de31770d2e8eebc3bab9662a00ad328ba41380052c3e7502a4da85c7b0ce29cf229670d917c93d7b508282dd9f1694a718da65f1110c785a2bc68394
diff --git a/media-libs/x264/x264-0.0.20190903.ebuild b/media-libs/x264/x264-0.0.20190903.ebuild
new file mode 100644
index 000000000000..ee5e6ace2cd2
--- /dev/null
+++ b/media-libs/x264/x264-0.0.20190903.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="A free library for encoding X264/AVC streams"
+HOMEPAGE="https://www.videolan.org/developers/x264.html"
+if [[ ${PV} == 9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git"
+else
+ MY_P="x264-snapshot-$(ver_cut 3)-2245"
+ SRC_URI="https://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+ S="${WORKDIR}/${MY_P}"
+fi
+
+SLOT="0/157" # SONAME
+
+LICENSE="GPL-2"
+IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"
+
+ASM_DEP=">=dev-lang/nasm-2.13"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+ abi_x86_64? ( ${ASM_DEP} )
+ opencl? ( dev-lang/perl )"
+RDEPEND="opencl? ( >=virtual/opencl-0-r3[${MULTILIB_USEDEP}] )"
+
+DOCS=( AUTHORS doc/{ratecontrol,regression_test,standards,threads,vui}.txt )
+
+multilib_src_configure() {
+ tc-export CC
+ local asm_conf=""
+
+ if [[ ${ABI} == x86* ]] && { use pic || use !cpu_flags_x86_sse ; } || [[ ${ABI} == "x32" ]] || [[ ${CHOST} == armv5* ]] || [[ ${ABI} == ppc* ]] && { use !altivec ; }; then
+ asm_conf=" --disable-asm"
+ fi
+
+ "${S}/configure" \
+ --prefix="${EPREFIX}"/usr \
+ --libdir="${EPREFIX}"/usr/$(get_libdir) \
+ --disable-cli \
+ --disable-avs \
+ --disable-lavf \
+ --disable-swscale \
+ --disable-ffms \
+ --disable-gpac \
+ --enable-pic \
+ --enable-shared \
+ --host="${CHOST}" \
+ $(usex interlaced "" "--disable-interlaced") \
+ $(usex opencl "" "--disable-opencl") \
+ $(usex static-libs "--enable-static" "") \
+ $(usex threads "" "--disable-thread") \
+ ${asm_conf} || die
+}
diff --git a/media-libs/x265/Manifest b/media-libs/x265/Manifest
index 49fb22b37db7..3e512c821843 100644
--- a/media-libs/x265/Manifest
+++ b/media-libs/x265/Manifest
@@ -6,10 +6,12 @@ AUX x265-2.9-detect512.patch 374 BLAKE2B 7123069c19e85ac5953434eb6c4a80135e60178
DIST x265_2.8.tar.gz 1379551 BLAKE2B c124864a08492739cdde89e44d72c84ad94a0b236d2c59d995e53a26d1a5fb9ec1557a03640a3065a727be69bfb0c0633b50351dc875c9706a1550f488c8ee24 SHA512 c2a8eaec64aa022badcbcd2a96304a9abd9d08489300b6a9c4c9d76066f3d9848e6948238c84ae16ea91bff0b2fac528a67ee29950d94dcd0ea7c0e9e7baa714
DIST x265_2.9.tar.gz 1385848 BLAKE2B ff14eba55cea0646ad0ffc12f9032c9033d23c9d805939fc3a049911ebae459eee097349f074dcd224bef97d6140dbc37ee9bd3db54c5473b158e135784d2179 SHA512 270818c7fd84947fde371e32bef225c1880cfb0bcd95378d95b51f50577a134d7cd585fcdfa43b103a24d76c5ad826b09509a07eb9e208e8f2b56f2f77365cf3
DIST x265_3.0.tar.gz 1398519 BLAKE2B e3ac28b01e89ce8a428f294c759644a8177e1b79941aba5e1b53033c236e3445f9afeea96f8adf7e5cdcfff8c790ca9fcadcc8b2de6c31ba3fe9ba87321a8ca8 SHA512 bb7665194ddd4bccbb91c16337463ad4ef32111a1e7779e4cc16964df0992aa99e578cb74fef0edbf41119105e4085574247f60541b0558cc36730ea12d2c6ba
+DIST x265_3.1.2.tar.gz 1419864 BLAKE2B 1eeb210e58d6977f9a048b84e924d690868aa350b6e736f577b5c1a62b9c5b71cfb2b03f004f26839ea44b9db871313bc9888af95999a576dcc167e79d297c61 SHA512 00fc2d8460657c0d2edcc54fd8c4521785c632f8811b74d0cd0a3efa0f06f1fb8cdd6233ad4917c1f40b3c1f1660a6c97ad947e656b7c3e9a51f8ae84afef65a
DIST x265_3.1.tar.gz 1419649 BLAKE2B b9151f136fdc6c0512f481af6c8d4d575ce4c75ef8891b42ca24ddfd1f4802bfe8cd47bb07dfc1834243560a8d36ddd5ca4d79d7b9f140fbd411b5b80ea6b8d4 SHA512 81905b6286a61fada7cb1632d7f8461295a28e8d53ccd53d3c26c60c7d8091df47a1b694de28caa721f632d66940f5ceeb44d3405dc3b079edd17d21c30e7a7d
EBUILD x265-2.8.ebuild 5680 BLAKE2B 0ee62251a5dc184a5cda01be4d0c779e5101b3f90f1d9a5921c5ba300798fac1acb298e7066d715d6923ce4505292ebafdf005b04745b1e3f615f0d8319fd3a3 SHA512 9e75cf8f636fa69550739f0fa56cb94b564a257d97f776df22e9c90a79adbf3ebcf86a0a62e3cec9e672caeb6798e1ffa639d15edd293b7f2e068fdfb3ac8d98
EBUILD x265-2.9.ebuild 5699 BLAKE2B 7ee30b5f06d51afdebf6ee278eb0e7ca8908fc703e2fcdb80c0b7095d9ae9edd83393e61c699343a53bc0d0786f1e558431e826a281d8ebd943ae5825e6bfb20 SHA512 cf9da7ce4f15df6afd31915869f426bde0306a381d8a7f1fb05987ccf2a618123d361c553d24d28681382022223e8775342cb575e387df87c28a327c5237f0d6
EBUILD x265-3.0.ebuild 5657 BLAKE2B eb173bf8779ed016deb3f86abdcf9c9aaa1b82e36676f82f730928f66dc0861ad6e2ada815b9269643ce8f3384429271ebe08bac82720b1cb06304de891c4fa6 SHA512 939fb4ec038b6ce4c226a0ca3e58650a9891d9b1a06f15b5276c649773454d1265c115816b3a98ab894a17363b107407e8fda71004e3f4f408e7a69062292c61
+EBUILD x265-3.1.2.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
EBUILD x265-3.1.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
EBUILD x265-9999.ebuild 5658 BLAKE2B e5e0a591c1e9898bf5b63856b06b6d8798f48e9a8dda35d2d5c9765282496f423488277f6a7cb7daac0836a5ef89e5beb284dc3c793d76be9722bd6538207d34 SHA512 29ccdbc5900a9aede013a39c81f7c7f3a7ddcf7aa8ae619df08e69a112b4df93ae7682eeb39344751bc3504afe4f9a1a9c5934b689e3e736001cb8249d0d8bf8
MISC metadata.xml 703 BLAKE2B c71ecd74be6e4fcdf70dcdc197e6830875f6cae0b1ee4e96b0edc4b16db4e512b2b8e8962fa75c7f4f380d74ff713158fd6124d4a22229b3c213c197124a59c6 SHA512 b9f2ac6ed88fce31fa7459321cc7cc2114caee48066b0ae1773a8711f2d652370d154a6167d8c8eb0dc47f55ca211812b99d11c4a1941a3a2553c62a6f21abf6
diff --git a/media-libs/x265/x265-3.1.2.ebuild b/media-libs/x265/x265-3.1.2.ebuild
new file mode 100644
index 000000000000..599c13412516
--- /dev/null
+++ b/media-libs/x265/x265-3.1.2.ebuild
@@ -0,0 +1,195 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+inherit cmake-utils multilib-minimal multilib multibuild flag-o-matic
+
+if [[ ${PV} = 9999* ]]; then
+ inherit mercurial
+ EHG_REPO_URI="https://bitbucket.org/multicoreware/x265"
+else
+ SRC_URI="https://bitbucket.org/multicoreware/x265/downloads/${PN}_${PV}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Library for encoding video streams into the H.265/HEVC format"
+HOMEPAGE="http://x265.org/"
+
+LICENSE="GPL-2"
+# subslot = libx265 soname
+SLOT="0/176"
+IUSE="+10bit +12bit cpu_flags_arm_neon numa pic power8 test"
+
+ASM_DEPEND=">=dev-lang/yasm-1.2.0"
+RDEPEND="numa? ( >=sys-process/numactl-2.0.10-r1[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}
+ abi_x86_32? ( ${ASM_DEPEND} )
+ abi_x86_64? ( ${ASM_DEPEND} )"
+
+PATCHES=(
+ "${FILESDIR}/arm.patch"
+ "${FILESDIR}/neon.patch"
+ "${FILESDIR}/ppc64.patch"
+)
+
+src_unpack() {
+ if [[ ${PV} = 9999* ]]; then
+ mercurial_src_unpack
+ # Can't set it at global scope due to mercurial.eclass limitations...
+ export S=${WORKDIR}/${P}/source
+ else
+ unpack ${A}
+ export S="$(echo "${WORKDIR}/${PN}_"*"/source")"
+ fi
+}
+
+# By default, the library and the encoder is configured for only one output bit
+# depth. Meaning, one has to rebuild libx265 if (s)he wants to produce HEVC
+# files with a different bit depth, which is annoying. However, upstream
+# supports proper namespacing for 8bits, 10bits & 12bits HEVC and linking all
+# that together so that the resulting library can produce all three of them
+# instead of only one.
+# The API requires the bit depth parameter, so that libx265 can then chose which
+# variant of the encoder to use.
+# To achieve this, we have to build one (static) library for each non-main
+# variant, and link it into the main library.
+# Upstream documents using the 8bit variant as main library, hence we do not
+# allow disabling it: "main" *MUST* come last in the following list.
+
+x265_get_variants() {
+ local variants=""
+ use 12bit && variants+="main12 "
+ use 10bit && variants+="main10 "
+ variants+="main"
+ echo "${variants}"
+}
+
+x265_variant_src_configure() {
+ mkdir -p "${BUILD_DIR}" || die
+ pushd "${BUILD_DIR}" >/dev/null || die
+
+ local mycmakeargs=( "${myabicmakeargs[@]}" )
+ case "${MULTIBUILD_VARIANT}" in
+ "main12")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ -DMAIN12=ON
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main10")
+ mycmakeargs+=(
+ -DHIGH_BIT_DEPTH=ON
+ -DEXPORT_C_API=OFF
+ -DENABLE_SHARED=OFF
+ -DENABLE_CLI=OFF
+ )
+ if [[ ${ABI} = x86 ]] ; then
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = arm ]] ; then
+ # 589674
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ if [[ ${ABI} = ppc64 ]] ; then
+ # https://bugs.gentoo.org/show_bug.cgi?id=607802#c5
+ mycmakeargs+=( -DENABLE_ASSEMBLY=OFF -DENABLE_ALTIVEC=OFF )
+ fi
+ ;;
+ "main")
+ if (( "${#MULTIBUILD_VARIANTS[@]}" > 1 )) ; then
+ local myvariants=( "${MULTIBUILD_VARIANTS[@]}" )
+ unset myvariants[${#MULTIBUILD_VARIANTS[@]}-1]
+ local liblist=""
+ for v in "${myvariants[@]}" ; do
+ ln -s "${BUILD_DIR%-*}-${v}/libx265.a" "libx265_${v}.a" || die
+ liblist+="libx265_${v}.a;"
+ done
+ mycmakeargs+=(
+ -DEXTRA_LIB="${liblist}"
+ -DEXTRA_LINK_FLAGS=-L.
+ -DLINKED_10BIT=$(usex 10bit)
+ -DLINKED_12BIT=$(usex 12bit)
+ )
+ fi
+ ;;
+ *)
+ die "Unknown variant: ${MULTIBUILD_VARIANT}";;
+ esac
+ cmake-utils_src_configure
+ popd >/dev/null || die
+}
+
+multilib_src_configure() {
+ append-cflags -fPIC
+ append-cxxflags -fPIC
+ local myabicmakeargs=(
+ $(cmake-utils_use_enable test TESTS)
+ $(multilib_is_native_abi || echo "-DENABLE_CLI=OFF")
+ -DENABLE_LIBNUMA=$(usex numa ON OFF)
+ -DCPU_POWER8=$(usex power8 ON OFF)
+ -DENABLE_ALTIVEC=$(usex power8 ON OFF)
+ -DLIB_INSTALL_DIR="$(get_libdir)"
+ )
+
+ if [[ ${ABI} = x86 ]] ; then
+ # Bug #528202
+ if use pic ; then
+ ewarn "PIC has been requested but x86 asm is not PIC-safe, disabling it."
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ fi
+ elif [[ ${ABI} = x32 ]] ; then
+ # bug #510890
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=OFF )
+ elif [[ ${ABI} = arm ]] ; then
+ myabicmakeargs+=( -DENABLE_ASSEMBLY=$(usex pic OFF $(usex cpu_flags_arm_neon ON OFF)) )
+ use cpu_flags_arm_neon && use pic && ewarn "PIC has been requested but arm neon asm is not PIC-safe, disabling it."
+ fi
+
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_configure
+}
+
+multilib_src_compile() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant cmake-utils_src_compile
+}
+
+x265_variant_src_test() {
+ if [ -x "${BUILD_DIR}/test/TestBench" ] ; then
+ "${BUILD_DIR}/test/TestBench" || die
+ else
+ einfo "Unit tests check only assembly."
+ einfo "You do not seem to have any for ABI=${ABI}, x265 variant=${MULTIBUILD_VARIANT}"
+ einfo "Skipping tests."
+ fi
+}
+
+multilib_src_test() {
+ local MULTIBUILD_VARIANTS=( $(x265_get_variants) )
+ multibuild_foreach_variant x265_variant_src_test
+}
+
+multilib_src_install() {
+ # Install only "main" variant since the others are already linked into it.
+ local MULTIBUILD_VARIANTS=( "main" )
+ multibuild_foreach_variant cmake-utils_src_install
+}
+
+multilib_src_install_all() {
+ dodoc -r "${S}/../doc/"*
+}
diff --git a/media-libs/zita-convolver/Manifest b/media-libs/zita-convolver/Manifest
index 8db9b9547c9d..79d3f2876f7a 100644
--- a/media-libs/zita-convolver/Manifest
+++ b/media-libs/zita-convolver/Manifest
@@ -6,5 +6,5 @@ DIST zita-convolver-3.1.0.tar.bz2 21485 BLAKE2B 7976bac136bef04091b76b55fd4afd5a
DIST zita-convolver-4.0.3.tar.bz2 19591 BLAKE2B 3bd77cbc46d93c2200329451634dc48b94183aaa17034aa4b3dd03c33ad7982e9bed85e164f5c0e34666a1a6443199afe24222d41477368c4b366335e9767b91 SHA512 62d7841757f10c094e43ed755e187f947c5743f302ed2a1ee6064a850c18921466f4505d8a2a7b3ad23619db7f1ad7307e1dfb2e8a1e7685e60ece2ffff4f6ca
EBUILD zita-convolver-2.0.0-r1.ebuild 958 BLAKE2B 29d71ecce58a60f5ccd52484fdaa6908a7bd0c65f5bb6e6c4b817f713fc49238847e43483e9e614141795626f8d64c0903e22e8cb1934e0cbab299d580cb8d00 SHA512 9a5d86ff5ebac7b440541e5d314c7ee0a87bc17c3a9b2f9c5b454203064cf15d0b4bedac91b1d50211285536391c866bf648f2f4f753557c5aa91ec49b74cbb4
EBUILD zita-convolver-3.1.0.ebuild 1004 BLAKE2B 323f97cf35298f0803d54ca880f1ea9579d7ecd5bc5ce691f211188d0ce6405490f24a900c2038f4e6b1a1678e4c592c70965270f7678c2dd739f52331f6c8bf SHA512 8a56f6073c521e046299cb73b9fb6a91e8f4588e7f2b2d55160be83c4f55a09733c86ab847e111d794bc4d960e89e2dc608f206619b972bd9115f0ff72e0e525
-EBUILD zita-convolver-4.0.3.ebuild 742 BLAKE2B 110b973c34b9d47d279d17c08edfa4bb8f6c210824340a9ab4bb74df4d0342fe7ffbcfac0b8068b4aa246564442770a397fecff18ce56de791b7636b1c88faec SHA512 bd0b38930d33cb29b69094e12645a4e680e1c4a9566b6d5f9f510494f0711c12c1d7f5f44e9fa426259cefca9cb2f3a07186a0df1942b61265fc032804ca086e
+EBUILD zita-convolver-4.0.3.ebuild 740 BLAKE2B f4d6f1d4c70924dc799d3d7891b95bf8c2aa7330b7a998f57997140b0e172ba863a34a9a98c3be6c7761d975457fec35c0186f24635d2b333cf0dcfedb7e18b5 SHA512 b6788a671a26e322dd205996fb0d211e4e9e139167d93008224dd8c4291641dfca490983c45610b94119a0f4bc9c446ae607d42c23456e7954a977676c4a5bf0
MISC metadata.xml 255 BLAKE2B 7a492321189530430d5c71d5598f8a99b548e020d8ace46bb200f1f18abb3a59c4d0dff84c8dc1f78297137c25684d42386d793b84a02e2363fab4d6dcedd4fa SHA512 9e74b875aa129f5b8108121402291772fde4ac18a157dc60f7b3e19c318ee54cd1be54e283a68bc61562f2dc3f5b338b161028d673ff7baa267192ff3b7e8dc8
diff --git a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
index 000640840e9c..391c6bbf3478 100644
--- a/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
+++ b/media-libs/zita-convolver/zita-convolver-4.0.3.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://kokkinizita.linuxaudio.org/linuxaudio/downloads/${P}.tar.bz2"
LICENSE="GPL-3+"
SLOT="0/4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
RDEPEND="sci-libs/fftw:3.0="
DEPEND="${RDEPEND}"