summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2019-01-22 10:09:44 +0000
committerV3n3RiX <venerix@redcorelinux.org>2019-01-22 10:09:44 +0000
commit09351e78166b5e864197c4456ebae3f89dd0bed9 (patch)
tree41a96399f56ed3aa399006871bfce4430db84aa2 /media-libs
parentc8a77dfe4d3d307c1d5dd2650b7297447d8b609d (diff)
gentoo resync : 22.01.2019
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin66371 -> 66341 bytes
-rw-r--r--media-libs/cimg/Manifest2
-rw-r--r--media-libs/cimg/cimg-2.4.5.ebuild26
-rw-r--r--media-libs/clutter/Manifest2
-rw-r--r--media-libs/clutter/clutter-1.26.2-r1.ebuild3
-rw-r--r--media-libs/gd/Manifest3
-rw-r--r--media-libs/gd/gd-2.2.5-r1.ebuild4
-rw-r--r--media-libs/gd/gd-2.2.5.ebuild62
-rw-r--r--media-libs/gexiv2/Manifest5
-rw-r--r--media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch49
-rw-r--r--media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild (renamed from media-libs/gexiv2/gexiv2-0.10.10.ebuild)1
-rw-r--r--media-libs/gexiv2/gexiv2-9999.ebuild4
-rw-r--r--media-libs/glew/Manifest2
-rw-r--r--media-libs/glew/files/glew-2.1.0-mesa-compat.patch21
-rw-r--r--media-libs/glew/glew-2.1.0-r1.ebuild104
-rw-r--r--media-libs/gst-plugins-bad/Manifest2
-rw-r--r--media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild91
-rw-r--r--media-libs/gst-plugins-base/Manifest6
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild180
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.14.2.ebuild180
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild181
-rw-r--r--media-libs/gst-plugins-base/gst-plugins-base-1.14.3.ebuild181
-rw-r--r--media-libs/gst-plugins-good/Manifest4
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.14.2.ebuild50
-rw-r--r--media-libs/gst-plugins-good/gst-plugins-good-1.14.3.ebuild50
-rw-r--r--media-libs/gst-plugins-ugly/Manifest2
-rw-r--r--media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.2.ebuild37
-rw-r--r--media-libs/gstreamer-editing-services/Manifest2
-rw-r--r--media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.2.ebuild55
-rw-r--r--media-libs/gstreamer/Manifest5
-rw-r--r--media-libs/gstreamer/files/1.14.3-fix-gstsegment-test.patch46
-rw-r--r--media-libs/gstreamer/gstreamer-1.14.2.ebuild111
-rw-r--r--media-libs/gstreamer/gstreamer-1.14.3.ebuild115
-rw-r--r--media-libs/harfbuzz/Manifest8
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-2.0.2.ebuild)7
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-2.2.0.ebuild)7
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-2.1.3.ebuild)7
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild (renamed from media-libs/harfbuzz/harfbuzz-2.3.0.ebuild)7
-rw-r--r--media-libs/kvazaar/Manifest2
-rw-r--r--media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild2
-rw-r--r--media-libs/leptonica/Manifest3
-rw-r--r--media-libs/leptonica/files/1.77.0-gnuplot.patch25
-rw-r--r--media-libs/leptonica/leptonica-1.77.0.ebuild75
-rw-r--r--media-libs/libepoxy/Manifest2
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.3.ebuild4
-rw-r--r--media-libs/libexif/Manifest2
-rw-r--r--media-libs/libexif/libexif-0.6.21-r2.ebuild4
-rw-r--r--media-libs/libextractor/Manifest4
-rw-r--r--media-libs/libextractor/libextractor-1.7.ebuild113
-rw-r--r--media-libs/libextractor/libextractor-1.8-r1.ebuild2
-rw-r--r--media-libs/libgphoto2/Manifest4
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.14.ebuild211
-rw-r--r--media-libs/libgphoto2/libgphoto2-2.5.16.ebuild4
-rw-r--r--media-libs/libldac/Manifest2
-rw-r--r--media-libs/libldac/libldac-2.0.2-r1.ebuild2
-rw-r--r--media-libs/liblscp/Manifest2
-rw-r--r--media-libs/liblscp/liblscp-0.6.0.ebuild4
-rw-r--r--media-libs/libpng/Manifest5
-rw-r--r--media-libs/libpng/libpng-1.6.34.ebuild45
-rw-r--r--media-libs/libpng/libpng-1.6.35-r1.ebuild2
-rw-r--r--media-libs/libsdl2/Manifest2
-rw-r--r--media-libs/libsdl2/libsdl2-2.0.9.ebuild9
-rw-r--r--media-libs/libwebp/Manifest2
-rw-r--r--media-libs/libwebp/libwebp-1.0.2.ebuild70
-rw-r--r--media-libs/mesa/Manifest10
-rw-r--r--media-libs/mesa/mesa-18.2.7.ebuild515
-rw-r--r--media-libs/mesa/mesa-18.2.8.ebuild4
-rw-r--r--media-libs/mesa/mesa-18.3.1.ebuild519
-rw-r--r--media-libs/mesa/mesa-18.3.2.ebuild (renamed from media-libs/mesa/mesa-18.3.0.ebuild)2
-rw-r--r--media-libs/mlt/Manifest2
-rw-r--r--media-libs/mlt/mlt-6.12.0.ebuild2
-rw-r--r--media-libs/opencv/Manifest23
-rw-r--r--media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch48
-rw-r--r--media-libs/opencv/files/opencv-3.1.0-java-magic.patch47
-rw-r--r--media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch10
-rw-r--r--media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch11
-rw-r--r--media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch64
-rw-r--r--media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch11
-rw-r--r--media-libs/opencv/files/opencv-3.2.0-vtk.patch11
-rw-r--r--media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch19
-rw-r--r--media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch87
-rw-r--r--media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch21
-rw-r--r--media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch41
-rw-r--r--media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch26
-rw-r--r--media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch42
-rw-r--r--media-libs/opencv/opencv-3.2.0-r4.ebuild369
-rw-r--r--media-libs/opencv/opencv-3.3.0-r6.ebuild465
-rw-r--r--media-libs/opencv/opencv-3.4.1-r2.ebuild497
-rw-r--r--media-libs/opencv/opencv-3.4.1-r5.ebuild9
-rw-r--r--media-libs/openjpeg/Manifest2
-rw-r--r--media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild2
-rw-r--r--media-libs/phonon-gstreamer/Manifest3
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild50
-rw-r--r--media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild4
-rw-r--r--media-libs/phonon-vlc/Manifest4
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild41
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild2
-rw-r--r--media-libs/phonon/Manifest4
-rw-r--r--media-libs/phonon/phonon-4.10.1.ebuild55
-rw-r--r--media-libs/phonon/phonon-4.10.2.ebuild2
-rw-r--r--media-libs/sbc/Manifest2
-rw-r--r--media-libs/sbc/sbc-1.4.ebuild33
-rw-r--r--media-libs/vidstab/Manifest5
-rw-r--r--media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch33
-rw-r--r--media-libs/vidstab/vidstab-1.1.0-r1.ebuild11
-rw-r--r--media-libs/vidstab/vidstab-9999.ebuild9
-rw-r--r--media-libs/vulkan-layers/Manifest2
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild4
-rw-r--r--media-libs/vulkan-loader/Manifest2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild4
-rw-r--r--media-libs/x264/Manifest2
-rw-r--r--media-libs/x264/x264-9999.ebuild10
112 files changed, 622 insertions, 4743 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 69bd6c8b48be..d2018aaedadb 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 88645ebb2c3a..404222bc54ce 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,3 +1,5 @@
DIST cimg-2.4.3.tar.gz 11074736 BLAKE2B 097da7f5b214470247296265950061acefec19a169139c65eb12b27ed8e1256b97f77d28deb910bb444f38d396e36c204c761437e8991421422e840fd7505a95 SHA512 3409fde40780d293051914ce988193063139f1f805e5b0205e829234944c76b877a2723dd7c616158bbb58238baf653a03f34d55052103286d3ee28a33136d15
+DIST cimg-2.4.5.tar.gz 11075045 BLAKE2B 6e9b9ccb5aa826526e9f9adbb964296a5f298772b696bad400a432bfd68e4b0048bbbb8591ac225393867aa2f00b708ea48c2858799522edcc2b021f3ba7fa7b SHA512 0a306ba4265a0e68d358e1ca54c597e80b43e72205de161d0971cd5837ca7d48322725d6ec129381e708a1d11fb5697884a5901ac753080fd8d8c08b80b28138
EBUILD cimg-2.4.3.ebuild 589 BLAKE2B 91b3c36c716f6e60a9652906cf7ef61bb2aab6ab56d7a40d6bcbccf924aab632886f6acc7d71c6d1ec5c8fc0e1c69d8e4c18258f45eee025f597587f247bb3fd SHA512 a1692a63111073a207c64e7e963af46be35d4b363eaf35f178cbf593391125d53232436a17a1e33426972e135452781887fc74eae68e36b5675c37520018bff3
+EBUILD cimg-2.4.5.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.4.5.ebuild b/media-libs/cimg/cimg-2.4.5.ebuild
new file mode 100644
index 000000000000..a3f01bc9ba22
--- /dev/null
+++ b/media-libs/cimg/cimg-2.4.5.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/clutter/Manifest b/media-libs/clutter/Manifest
index 85a07e5f91f1..2dfa44df8f3f 100644
--- a/media-libs/clutter/Manifest
+++ b/media-libs/clutter/Manifest
@@ -1,3 +1,3 @@
DIST clutter-1.26.2.tar.xz 5353736 BLAKE2B ac30cee3c5a8ed786c38820b7afb86e80929c2a797b737b35650ae6dd856576d72cc7f5407a984f418e255d6ab43c8d3ca9d7efd6f50650b2e0c733ecca19114 SHA512 c8008a1a1f111313d9abaff8d4415f112ddc32a02e08845f3735d33bb25b72b082f133daba06749bb9595eaf1ba83b308d30a413fbbe8dcdc1afdd7077a30937
-EBUILD clutter-1.26.2-r1.ebuild 2872 BLAKE2B 09331e4fd43a46cba083eb17378d7b2e33b17d699f77385504180c8af2fed4d9ac903932badbbebaa362bd640fcc15293d821568643bf5765b517aebf040f705 SHA512 eca64b0eba586bf2b4a6a33d77d4630d1d7d712010c0abd5b3f6beb5f8051de1bbdfa2632bc5479b698f1a5b45dec14ce56f1cb50352597370c17b2fa25dc458
+EBUILD clutter-1.26.2-r1.ebuild 2890 BLAKE2B 0eefb220f318931a44ecd99c25299ac3f9a47dc6e3571461818ec4154b2477373d5c1c02c0e5dc181a727a484431f938e588ea255cb775abc5866d2c05a36f04 SHA512 49a79f799cf375effcb727f15dacfb53f233164af11e0c9931fee48a3aead50baf71311d3c0eecd166fa91e15b3de106d60fdc465d558f32f8d77f80dcc2b15f
MISC metadata.xml 404 BLAKE2B 45f5b28d9e612464ad5f56c016adae7466e549403a3939fddc433f9f428476db7b4e5a2436a436b0f9c46176bf849938c4c8895ae8f464115ea6ffeedac0f19d SHA512 c6e268f9e2fd4400fd0e7c265b6c64b738a22005ea9af7d792c45a8bd1de8fe81ac1d534cbfc2988cf55bd810aa84bdddf45d3ce33c3bf60e5030fc48d467db6
diff --git a/media-libs/clutter/clutter-1.26.2-r1.ebuild b/media-libs/clutter/clutter-1.26.2-r1.ebuild
index 22a03103bd96..19a339b3ea84 100644
--- a/media-libs/clutter/clutter-1.26.2-r1.ebuild
+++ b/media-libs/clutter/clutter-1.26.2-r1.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
@@ -54,6 +54,7 @@ RDEPEND="
x11-libs/gdk-pixbuf:2 )
"
DEPEND="${RDEPEND}
+ dev-util/glib-utils
>=dev-util/gtk-doc-am-1.20
>=sys-devel/gettext-0.17
virtual/pkgconfig
diff --git a/media-libs/gd/Manifest b/media-libs/gd/Manifest
index 4802d6e1ebae..2b22cbe34be8 100644
--- a/media-libs/gd/Manifest
+++ b/media-libs/gd/Manifest
@@ -1,5 +1,4 @@
AUX gd-2.2.5-CVE-2018-1000222.patch 2491 BLAKE2B 492923989fe07fa6993fd9ac7d234d8777b944e45cbce5f92aaf5bc53bd1502039ff75937e829f1ad6bceac8813bf68704a42d3688401a3b55fdfcd19649a533 SHA512 d12462f1b159d50b9032435e9767a5d76e1797a88be950ed33dda7aa17005b7cb60560d04b9520e46d8111e1669d42ce28cb2c508f9c8825d545ac0335d2a10b
DIST libgd-2.2.5.tar.xz 2594092 BLAKE2B 222a7e012fbf9924ac391ee96c7cd3dec96afd78c6d43dfb680b33e7143e7df87fe6be75bbfe8fb93e916302d7daf08271214c84da28712e93a36465566cb2bd SHA512 e4598e17a277a75e02255402182cab139cb3f2cffcd68ec05cc10bbeaf6bc7aa39162c3445cd4a7efc1a26b72b9152bbedb187351e3ed099ea51767319997a6b
-EBUILD gd-2.2.5-r1.ebuild 2099 BLAKE2B e452983301b4479a6af70898b182151ad4668938f9ed6104ccece40ec713e0424cc87c57ff3c7f0ef3e0416501945497ad402a2be7b47e03076f1cd898040dcd SHA512 caac245bf8816428a457b1205938b161b659e48b4e55ef1ff232973f2c1c1f1adf80e0e43e429e9d49013f805d6b59ededc6be9b867c04663687876a9093bb12
-EBUILD gd-2.2.5.ebuild 2036 BLAKE2B 642b02819339f66ece89a28aaaa68d1d07522b3477b36660bfbfe17f922ed67c3f923ae8a13b709f43d317c4ca30d39699482fbf8789408922314c681a9c5ab1 SHA512 88a1002d150a7e4063832ddd1773536355aab8b0f1af8ee3a3d2ec9804fcd6900292d63db467365830d5cded14c7741dce07c04e7038bbfb3712044372a1c02f
+EBUILD gd-2.2.5-r1.ebuild 2098 BLAKE2B 618b894c17512da414cafcb7c483519d115567f64069e0aef6773eee7cdeedc488f328956f7ef58dec5a366d43a6fee969a882a013bb8debd7c8cf9da34279e6 SHA512 a26a8fc9d231d5d2acf7093f415e3b2431e79739f7b96be0067fe36610754357f6ca997c6cf05648ec47919dd7a01e620c77b1d985e1694b2360e1ab89e74671
MISC metadata.xml 1507 BLAKE2B 34dbcbc70165ebe74ea14e6394e2691bda7523e4c848b13a512de8f0707c194a7da3de41a8fe483d7a8b2aa1af8f0d164ea210605ae76480dbf22b976b53d2f5 SHA512 0ac3c1ca25c190333e7f97dbb05e197e62e76abeaa045966fa3024dbeb22d541d78794df08d450e887591909a25dfb6a4fef861ed62f7f055b129e17b1329919
diff --git a/media-libs/gd/gd-2.2.5-r1.ebuild b/media-libs/gd/gd-2.2.5-r1.ebuild
index 869765c3bc46..4e85c3bff54e 100644
--- a/media-libs/gd/gd-2.2.5-r1.ebuild
+++ b/media-libs/gd/gd-2.2.5-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
LICENSE="gd IJG HPND BSD"
SLOT="2/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
# fontconfig has prefixed font paths, details see bug #518970
diff --git a/media-libs/gd/gd-2.2.5.ebuild b/media-libs/gd/gd-2.2.5.ebuild
deleted file mode 100644
index d0b3c15fb3b0..000000000000
--- a/media-libs/gd/gd-2.2.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="A graphics library for fast image creation"
-HOMEPAGE="http://libgd.org/ http://www.boutell.com/gd/"
-SRC_URI="https://github.com/libgd/libgd/releases/download/${P}/lib${P}.tar.xz"
-
-LICENSE="gd IJG HPND BSD"
-SLOT="2/3"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="fontconfig jpeg png static-libs tiff truetype webp xpm zlib"
-
-# fontconfig has prefixed font paths, details see bug #518970
-REQUIRED_USE="prefix? ( fontconfig )"
-
-RDEPEND="fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- truetype? ( >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- xpm? ( >=x11-libs/libXpm-3.5.10-r1[${MULTILIB_USEDEP}] >=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]"
-
-S="${WORKDIR}/lib${P}"
-
-src_prepare() {
- default
- elibtoolize # for shared library on Solaris
-}
-
-multilib_src_configure() {
- # we aren't actually {en,dis}abling X here ... the configure
- # script uses it just to add explicit -I/-L paths which we
- # don't care about on Gentoo systems.
- local myeconfargs=(
- --disable-werror
- --without-x
- --without-liq
- $(use_enable static-libs static)
- $(use_with fontconfig)
- $(use_with png)
- $(use_with tiff)
- $(use_with truetype freetype)
- $(use_with jpeg)
- $(use_with webp)
- $(use_with xpm)
- $(use_with zlib)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- dodoc README.md
- prune_libtool_files
-}
diff --git a/media-libs/gexiv2/Manifest b/media-libs/gexiv2/Manifest
index 39119a3d92b5..5fa8151309b0 100644
--- a/media-libs/gexiv2/Manifest
+++ b/media-libs/gexiv2/Manifest
@@ -1,7 +1,8 @@
AUX gexiv2-0.10.10-meson-fixup.patch 1718 BLAKE2B 0460652424a8314eeba8f0d677b5dff5b0efc9165079c9232824bbfffb2a13a1ca2acef89ae066bc13ec4c40baef4ac4b1c66c02d4365b999fdd4f54858ea7af SHA512 06f7b13502b9397770b0d9ab20dd70d902feb7d70fd42381cda53183859db15102bbf16d0e4ce5f9b124de99c58c8e4cb0ec85ca1c6f60e3e5287cafcdfadd64
+AUX gexiv2-0.10.10-vala-fixup.patch 1785 BLAKE2B d82ec357f2ee7d50b79fa1c82bd9c4b6d0a528561fcacc08e966c73f9d89daf3c2ce2e2712f69e246507e14e0f10a0a5470c830e43aeeb06fdceffc3484cbc0e SHA512 e9708245ddee0fb88939ae26987e4e5859fd5e13efb03f01d276eeb77d4361832eac11b2873e73984ef25dbdcf502f2f3a82a78330f3c7b57b2e186cfb49395f
DIST gexiv2-0.10.10.tar.xz 638168 BLAKE2B ae75a06007dcaca4c22e463661073d796b77921a313a5bb450c488ee963f72c6095d7abc12dedc0d089a28905cf386062221073100ba3513d9fb13eb524365ee SHA512 41e5b4a9d81882ea4b1bc6f3b9ced95ca4d03f836de30ff90b7a43311e5319f7c0f46cbad767bf2b00926c8e5fd2c1e8ca2a2113c308e23b7a4c21205399abf7
DIST gexiv2-0.10.8.tar.xz 634696 BLAKE2B 182cda3bac5b3211e5ef8267628a86cc496c0242f25c5cd94ed9eab81c7460022373f3bb794c976fd0b9a10e49f9ca7109521ac6f99bbe7a4e0306a31db899da SHA512 4c25cf6884495151947a70e62a096f3279223673bece4d4ff02720b2820aaad9e80c8715e02bf46c3f5598f582fdf07b4b3ddabd017d53001245e3381a4cc286
-EBUILD gexiv2-0.10.10.ebuild 1778 BLAKE2B 8c3bdd09c48b1337049a4f971fefa9060ae1b572e884a7911dad8b7bf87ea5cf7fe7afaa0afaa92a3a76df71d16603f6ea1e3f2c93f02cdf6b7e06ce3b77ac75 SHA512 45eaf8081a3d45f7232a284c75a09ab34c4e4ec28fb73ead465a6b1c634999a444c234a5cdb4ccd8e8fcf94b88979ea6827a9f91804f82bb7b9a67ab4957c1b2
+EBUILD gexiv2-0.10.10-r1.ebuild 1824 BLAKE2B 524284f047a6cbbfaede824ed246504f8f979166e007d58bfb82faabaccc11a361364deaa031102652b8864bdc9e8d72070eb3bc45828e03770e52909d900513 SHA512 83dcd434159cccef0002a7a13588b69665a905a9326eecec4f6ccd993b29919c249fa33d4346bff4b9c079f8daef54b486df492cad71e3e86778996dfee39af2
EBUILD gexiv2-0.10.8.ebuild 1527 BLAKE2B 6ddf3a6433cc5d6b566075718011be7ad782186482a3146533fdd1364b5385f2f8977e09a5ec3c73f7624fc929f6f8753d30bacb60ee27f35341c49a68429860 SHA512 2f50314429b7cd4b47bb5172c801490551cae93989a41d919ce7ebf35d6c0005a657507019dbf0356e4ff8f405747492782a95796558e9c4e05e446f043f2ade
-EBUILD gexiv2-9999.ebuild 1621 BLAKE2B fc25baa5039abad251d79ce4ed59ce05eb878604608e833c65e835486f3b6724eff0a90c491eaec438f7405ae1f8401624ef6e7c7f6477c265d180641c08e6c2 SHA512 634213f60b484bbe46395938fc1bf64a13ea01da2b8531de1ea8e0ba0e3328c41b74d6eb945b1af9ad1d4d12bbc77775200963b17d7d765f9b944ca2c056ecd0
+EBUILD gexiv2-9999.ebuild 1621 BLAKE2B 20ec61c95e9cd66dd9a835363a27a439fa7fd70daf50ef79553d17e2e7347913fc7f27755118f109d7f74ea97c9d517e5dab4b30e0f118675d310e8d55771c5b SHA512 48a71d0c0fa913989b741b31810703781a7adbda6031d3030c152d5db25650638ce80de614551f7336b99986d57bfd361a1c743e1063259ffc8ef77eccf0c6ce
MISC metadata.xml 265 BLAKE2B 5e9da641ca1949fb00cecaed654cfc3cad540c14b19043c2032e2c6593d47793d6ad7ee461667575ee51a919890ff1ec63195a43c2a35c8b56c12257668fa2b5 SHA512 65fd64249e8dde8eb2ddcb67c58c05b36b10e51956e2237f60dd3ae50872492f3d5872b64106acb13e453a41960f4f817161be3c8b89e6b9a2367b8f1403ffaf
diff --git a/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
new file mode 100644
index 000000000000..daf72ef3a85b
--- /dev/null
+++ b/media-libs/gexiv2/files/gexiv2-0.10.10-vala-fixup.patch
@@ -0,0 +1,49 @@
+From: "Marty E. Plummer" <hanetzer@startmail.com>
+Date: Sun, 13 Jan 2019 13:33:32 -0600
+Subject: [PATCH] meson.build: improve handling of vapi
+
+As it currently stands the vapi files are not generatable on linux
+distros which do not provide unversioned valac/vapigen. Use instead
+meson's add_languages function to handle detection of existing vala
+toolchain, which will check the VALAC and VAPIGEN env vars.
+
+Signed-off-by: Marty E. Plummer <hanetzer@startmail.com>
+
+--- a/meson.build
++++ b/meson.build
+@@ -6,11 +6,9 @@ exiv2 = dependency('exiv2', version : '>
+ gobject = dependency('gobject-2.0', version : '>= 2.38.0')
+
+ gir = find_program('g-ir-scanner', required: false)
+-vapigen = find_program('vapigen', required: false)
+-vala = find_program('valac', required: false)
+
+ introspection_available = gir.found() and get_option('introspection')
+-vapi_available = introspection_available and vapigen.found() and get_option('vapi')
++vapi_available = introspection_available and add_languages('vala', required: false) and get_option('vapi')
+
+ subdir('gexiv2')
+
+--- a/test/meson.build
++++ b/test/meson.build
+@@ -17,15 +17,11 @@ regression_test = executable('gexiv2-reg
+ test('regression', regression_test, env : test_env)
+
+ if vapi_available
+- valac = find_program('valac')
+- if valac.found()
+- add_languages('vala')
+- executable('gexiv2-dump',
+- 'gexiv2-dump.vala',
+- include_directories : include_directories('..'),
+- dependencies : [gobject, vapi],
+- link_with : gexiv2)
+- endif
++ executable('gexiv2-dump',
++ 'gexiv2-dump.vala',
++ include_directories : include_directories('..'),
++ dependencies : [gobject, vapi],
++ link_with : gexiv2)
+ endif
+
+ if python2_available
diff --git a/media-libs/gexiv2/gexiv2-0.10.10.ebuild b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
index ad4135f9b2a5..d0fea160c649 100644
--- a/media-libs/gexiv2/gexiv2-0.10.10.ebuild
+++ b/media-libs/gexiv2/gexiv2-0.10.10-r1.ebuild
@@ -48,6 +48,7 @@ PATCHES=(
# renames meson options to current git HEAD's names, current naming scheme
# is rather awkward
"${FILESDIR}"/${PN}-0.10.10-meson-fixup.patch
+ "${FILESDIR}"/${PN}-0.10.10-vala-fixup.patch
)
src_prepare() {
diff --git a/media-libs/gexiv2/gexiv2-9999.ebuild b/media-libs/gexiv2/gexiv2-9999.ebuild
index 2547c6a9ca91..1c6c54fc4d10 100644
--- a/media-libs/gexiv2/gexiv2-9999.ebuild
+++ b/media-libs/gexiv2/gexiv2-9999.ebuild
@@ -57,8 +57,8 @@ src_configure() {
$(meson_use gtk-doc gtk_doc)
# prevents installation of python modules (uses install_data from meson
# which does not optimize the modules
- -Dpython2-girdir=no
- -Dpython3-girdir=no
+ -Dpython2_girdir=no
+ -Dpython3_girdir=no
)
meson_src_configure
}
diff --git a/media-libs/glew/Manifest b/media-libs/glew/Manifest
index 914d2fcb4dbb..469c3fbb551b 100644
--- a/media-libs/glew/Manifest
+++ b/media-libs/glew/Manifest
@@ -1,8 +1,10 @@
AUX glew-2.0.0-install-headers.patch 457 BLAKE2B 284563a64b8f7c01fb13f0dda57acd3d9ed410035cf1be7a8bf6dd9eb07dd84d0ce6a725b8a1999123e61a8de3cb676340eb1092db048e898b84ebe745906441 SHA512 a1a46eb47b4ccbde3dd11d97e4b0be6000a5dfba87e4c9d65d142e572beabd6b6efad2ee278062bc4dd57bb001b65300245fc301f36b11b429b760b4ad385346
+AUX glew-2.1.0-mesa-compat.patch 560 BLAKE2B 385adc6854a8b6cece3c1c5fa5452c7cdb5f99cfa13ce4818c500836803c1ed6dc6f4a6ab43f1add19ee76adf8daf076458a5cbd64012f2c1b6a9802bd98d791 SHA512 15117b0e22786311df0fd614ecba5230d5ec083d0d6acd457b7ae301f75a842c56e4ed50cc0187709fa11cdb2b59e3edeed2b5bc8cacc1b23caca4c1b837e520
DIST glew-1.10.0.tgz 567605 BLAKE2B 18e2b3a4d60b69def1e68778554b43b85c69914daa20b8a64adb2e807df391a2eaff9c6cb2a3c46e5bbbf004655561ae4d2cd8a2fb883a2754f23564993a61b2 SHA512 0c998fda9fe01c9296a3453966c0449c9968f4f5f989065ca65f0da3830ae8d805699d0ee0362c3b18765420222ba18842b9db20986212afceb36c971ae1bdca
DIST glew-1.6.0.tgz 494713 BLAKE2B 17e47092e2eefcad79220232b3aeaf856541f5024bdaa65be866dd7d63ef19ad88b389dd13c2ccf9bafd175d00d18ae94185f890a3d12d61b2445f7fa9d6ba58 SHA512 5b8ca9e97d01d49fde591b0c55683620e0a6ddfaf5e93e03536e6217bbb548adfcd4e945a39ed3cfddac3f239b3272be1b3491f4071689d02c4bfb7e0ec44904
DIST glew-2.1.0.tgz 764073 BLAKE2B 081fb49ef286681657409f950fa03b97210dac3f90197b792d9128a2b9fa271181c9e64422a867b531683ab23010cfeb2f519adc32355839b67bf41934578fb3 SHA512 9a9b4d81482ccaac4b476c34ed537585ae754a82ebb51c3efa16d953c25cc3931be46ed2e49e79c730cd8afc6a1b78c97d52cd714044a339c3bc29734cd4d2ab
EBUILD glew-1.10.0-r100.ebuild 1948 BLAKE2B 49358c8d4969c8ed80c551d6a8dc504a2368ddb5a96f6f8a3e41d38bc028e70f88b714913f6b55cf85d101cb4b8f5a1d8eeef0a64803291e3e553dfb3234fb5b SHA512 97b574ef48d5d88bd86299fd6a9cf3fb85440af015e50ecd5ed841b214b0e9fd278c4d9e70b57c3c6224a3105582cbbfd7da1d2fcb48a6165d51a9421d9c797c
EBUILD glew-1.6.0-r100.ebuild 1921 BLAKE2B 634e76c202e3d4b08ef68b0faf4d8c8c88692b32e0b8536c9a3ab617361ad008030994517dc30146171f61d80bc75fafc1cc8e3e51a1ee76563c443ecc7033d7 SHA512 53e816516b5166ec273a9a722694c7aa0961b63144562630979b2db35d0da697f3bf4f8ff0c1cfa44d95a788d0b5304733db3470b6b245b0e2acd952df67a93f
+EBUILD glew-2.1.0-r1.ebuild 2528 BLAKE2B 740ca5b8368eb073dd23a5a13ba44e1093eeefb1118486139e4f1ebf5d7ade4016ee1898e9f2b9ce73a5dc743f6aaa58ec660f4bf1bca9679cecd04d489a07a5 SHA512 846403dba906bfeb499b7f5320cc642f29161082e5ca32c48114bd019447dd971c97005f76791157a52fc62b9b39e2bd2012a8a3c9c6bcedfb911391dc107c05
EBUILD glew-2.1.0.ebuild 2513 BLAKE2B b8c9f8cac57435196d09f9536a6d2dd11c7236922b99d2df76584c1a04f57fcf505fb21589696e7267b1ab4e63834cad1c84f58cc99f35a9961870950eb431a1 SHA512 40be22ce95d3e618803791ff13ecd40554ceb56cbc8a8cdc1a5cb10800f02b00c22b417fd35b70323a27a718ba68f4a56daec0a0ac06d87a8778b774cbc4c0e3
MISC metadata.xml 296 BLAKE2B 14e5921f53872e45c3b43dbe5d95fbb36162ce327eadfc41b34cbee17c11d1de02562152920026592f3dc508faf080e4e8b4150490a815cf7629b1ecfccda758 SHA512 60f31ba192f23a74365955e122ab54aae36c45b9158a2a5201bac68c46c07195025a9978fec01fa6e9804bc731bf1f7b495445bafb9e53d94f895c128075aa3d
diff --git a/media-libs/glew/files/glew-2.1.0-mesa-compat.patch b/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
new file mode 100644
index 000000000000..391420e8138a
--- /dev/null
+++ b/media-libs/glew/files/glew-2.1.0-mesa-compat.patch
@@ -0,0 +1,21 @@
+diff --git a/include/GL/glew.h b/include/GL/glew.h
+index b5b6987..a9f9e4b 100644
+--- a/include/GL/glew.h
++++ b/include/GL/glew.h
+@@ -93,7 +93,7 @@
+ #if defined(__REGAL_H__)
+ #error Regal.h included before glew.h
+ #endif
+-#if defined(__glext_h_) || defined(__GLEXT_H_)
++#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_)
+ #error glext.h included before glew.h
+ #endif
+ #if defined(__gl_ATI_h_)
+@@ -109,6 +109,7 @@
+ #define __X_GL_H
+ #define __glext_h_
+ #define __GLEXT_H_
++#define __gl_glext_h_
+ #define __gl_ATI_h_
+
+ #if defined(_WIN32)
diff --git a/media-libs/glew/glew-2.1.0-r1.ebuild b/media-libs/glew/glew-2.1.0-r1.ebuild
new file mode 100644
index 000000000000..4b13c557e272
--- /dev/null
+++ b/media-libs/glew/glew-2.1.0-r1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+DESCRIPTION="The OpenGL Extension Wrangler Library"
+HOMEPAGE="http://glew.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="doc static-libs"
+
+DEPEND="
+ >=virtual/glu-9.0-r1[${MULTILIB_USEDEP}]
+ >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXi-1.7.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+
+src_prepare() {
+ local PATCHES=(
+ "${FILESDIR}"/${PN}-2.0.0-install-headers.patch
+ "${FILESDIR}"/${P}-mesa-compat.patch
+ )
+
+ sed -i \
+ -e '/INSTALL/s:-s::' \
+ -e '/$(CC) $(CFLAGS) -o/s:$(CFLAGS):$(CFLAGS) $(LDFLAGS):' \
+ -e '/^.PHONY: .*\.pc$/d' \
+ Makefile || die
+
+ if ! use static-libs ; then
+ sed -i \
+ -e '/glew.lib:/s|lib/$(LIB.STATIC) ||' \
+ -e '/glew.lib.mx:/s|lib/$(LIB.STATIC.MX) ||' \
+ -e '/INSTALL.*LIB.STATIC/d' \
+ Makefile || die
+ fi
+
+ # don't do stupid Solaris specific stuff that won't work in Prefix
+ cp config/Makefile.linux config/Makefile.solaris || die
+ # and let freebsd be built as on linux too
+ cp config/Makefile.linux config/Makefile.freebsd || die
+
+ default
+ multilib_copy_sources
+}
+
+glew_system() {
+ # Set the SYSTEM variable instead of probing. #523444 #595280
+ case ${CHOST} in
+ *linux*) echo "linux" ;;
+ *-freebsd*) echo "freebsd" ;;
+ *-darwin*) echo "darwin" ;;
+ *-solaris*) echo "solaris" ;;
+ mingw*|*-mingw*) echo "mingw" ;;
+ *) die "Unknown system ${CHOST}" ;;
+ esac
+}
+
+set_opts() {
+ myglewopts=(
+ AR="$(tc-getAR)"
+ STRIP=true
+ CC="$(tc-getCC)"
+ LD="$(tc-getCC) ${LDFLAGS}"
+ SYSTEM="$(glew_system)"
+ M_ARCH=""
+ LDFLAGS.EXTRA=""
+ POPT="${CFLAGS}"
+ )
+}
+
+multilib_src_compile() {
+ set_opts
+ emake \
+ GLEW_PREFIX="${EPREFIX}/usr" \
+ GLEW_DEST="${EPREFIX}/usr" \
+ LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
+ "${myglewopts[@]}"
+}
+
+multilib_src_install() {
+ set_opts
+ emake \
+ GLEW_DEST="${ED}/usr" \
+ LIBDIR="${ED}/usr/$(get_libdir)" \
+ PKGDIR="${ED}/usr/$(get_libdir)/pkgconfig" \
+ "${myglewopts[@]}" \
+ install.all
+
+ dodoc README.md
+ if use doc; then
+ docinto html
+ dodoc doc/*
+ fi
+}
diff --git a/media-libs/gst-plugins-bad/Manifest b/media-libs/gst-plugins-bad/Manifest
index a6a510fb26c1..dc1ec09fb0b5 100644
--- a/media-libs/gst-plugins-bad/Manifest
+++ b/media-libs/gst-plugins-bad/Manifest
@@ -2,10 +2,8 @@ AUX gst-plugins-bad-0.10.23-CVE-2015-0797.patch 1044 BLAKE2B fe60f1069711c17e8e1
DIST gst-plugins-bad-0.10.23-h264-patches.tar.xz 5284 BLAKE2B 90ad2a742de6d6b3efedb1a2fc16a9f24cf0566fd455a27f113afa0fc2ceff5f2517a31e8db8ed6ed8b4c92595b333a29dbb451077975f3d726808976f4a8671 SHA512 528ed30edb544dd970047fd4b0f05bf75f9f49f07a8118f805430c56c3ec75643013799491aeba70c62cb0343cd3e72758bf5c167d00e90a6a3f13857e4860e1
DIST gst-plugins-bad-0.10.23.tar.xz 3155044 BLAKE2B 86ed955fb5c73f2145b8f8ed2daaeffd9975362e81c3ca911be00d18f6b6d975381651071eb54514ef94a931f1fc89e673dc8c1d68e10de132bbe51accb6d165 SHA512 6437dd12707ef29651f4014b54612cf2a3a42ed4e05a1c5f4a432d80e27efd2abc0df891ebcfdc9e7b2cf9f71a15b88e48b3aa6db24a178ed6de3b1bdf4c3dc4
DIST gst-plugins-bad-1.14.1.tar.xz 4651852 BLAKE2B 915798f9d07e18b445cae818978def1356299034d14ca2cba8f07df93d5dcf5ed257290bf111298c4f8063b32ceee38dd78c02eae508f6e88956b132740bfa36 SHA512 6969b6c91279fb96bc28acde0284ce980b3982ae0c77820284a903beee61dffa863554dcfadb55de1987404b59c3c7c421372e65dc7b4014fe64a0c91d4ce729
-DIST gst-plugins-bad-1.14.2.tar.xz 4664260 BLAKE2B 477c9a864088676ead3170dc11017ad997c4d0ef136845a7ad34d15745d5f1abf4486dda7a226feb5ff6c7c65c8788cd39eb5e9901f3f15a426d79bf2b81e78c SHA512 7282c8941f1eabf7141362bb8e61097b3b26ef39410ae767712c34d7e40779fc22f6ea97a950009fdb6d62175f9a153d435ead8f663cf66cc6af5aac7f2a73db
DIST gst-plugins-bad-1.14.3.tar.xz 4678316 BLAKE2B b37d90e04a6bdb01e4f512df67e00790979e4b71fa6730092b4c16dbaf005cf94e09a454ed6e962faa3aaef02c2b811ad1899c3c8153b4ab3bf6d9b5f62998cf SHA512 3e92b33b43181d76bf206496c2fe0f84042c486f854f4fdba7efedc3489874944cef00eb2fd9fd7056d749be17c2b237caffc32800d7063615b30bac7226fbb7
EBUILD gst-plugins-bad-0.10.23-r4.ebuild 1565 BLAKE2B 8907f6548ae1d077342bf0f35280c9cd59c492bd8a2e23e9c176c1682e32cab561835123af61fc40067f55c43574e401aa16e418ede39a56786744f741f203f7 SHA512 6c68c102487868c23bc177aa65a9a734f7e2cd89bcca5af827d98dcfb61d26a84b09a07d4ec6d7397a17ffa57ab33fdbfc5fc290bb9eb397209150da86ebb492
EBUILD gst-plugins-bad-1.14.1-r1.ebuild 2606 BLAKE2B 4d18489f73c95ae84fb95aa94e81abf98708e8d2188180557488f6f240f5a3940c001198c323ae5a2f6ec92bc24db006a4e44f27c3d02b8a0f7015e0393391a8 SHA512 82cf3f251494733a0b770deb0580c1977cfb84aa08846b9d5655a775cdd917d128522368f369cec6b5fd5fc82c95dfb7b90ad109fc9e08cdb8a4c85556318e36
-EBUILD gst-plugins-bad-1.14.2.ebuild 2637 BLAKE2B f08298066c2e0fb27822a8bf7c810139e942e74f9ccd1444827aa9f1409aa751ca8ba8082282831eb08ea464e236e318b12bde34ad96a7d4c1048948fcfbbd72 SHA512 e9d3a6893c4504d9e7bb6dca857650d289dba80188dbb8e67f68b9b2fe945dc39f2ce3e99042ced83c034ee21998225c03c6acc24cffee9aaaa12968c0361378
EBUILD gst-plugins-bad-1.14.3.ebuild 2630 BLAKE2B 3013de1b53e5a45b45f3234929f331f96a32881c20fc710b5666040a9963a7bd7060e73548da25e5b1f1ac1c2027506c7db3d7dfae4fb0427ce87c6b571b0bb5 SHA512 b15ba68084096ddc8abc2213cf4cda4d1e5eb6a175f44a6aee2654e4c1f6517d85008378ba31f72b4959cdb84ea28806092f059af0c4c5f3eb7f3ed12e77a8c3
MISC metadata.xml 439 BLAKE2B 5a4a36ccf4bd485eaf1fa66650eec8fa592d4c5bbf9fa478f1645e1b39649b7115694bf55dee7aeb4a5c53b2ba3c4614591cdf4e7d745938397c304108e0aa7c SHA512 9bd27a1a513fc2d697f7d0f2ceb7fa0701c446fe21b597256afd4c2c1f44145e875323ed1ef6202bf7b85472ab4aab43a4b6db5795bb1d28ff53a2a7e484055e
diff --git a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild b/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
deleted file mode 100644
index c58d0a23e121..000000000000
--- a/media-libs/gst-plugins-bad/gst-plugins-bad-1.14.2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 03eb894a57b6..53b3af23437d 100644
--- a/media-libs/gst-plugins-base/Manifest
+++ b/media-libs/gst-plugins-base/Manifest
@@ -2,15 +2,9 @@ AUX gst-plugins-base-0.10.36-gcc-4.9.patch 387 BLAKE2B 5ff5d2b0ae4a97240f86ef857
AUX gst-plugins-base-0.10.36-resync-ringbuffer.patch 530 BLAKE2B cbf4d51313e94df62ff3c3e4df859c04a91e22e994587e4ca6baba59294dff572a7ed80cceb3944d4070717fd6f9ce680e42e71a95032d54c8ca6693df29e21f SHA512 fbc252f10f4539f0448eb6f652a945ecf522f6100cb63fb362617a8990818efb1ba4bd5f866b25d439f39e32a41fcab7ef9b176d4be0e6e5bbb6c1853aa2a688
DIST gst-plugins-base-0.10.36.tar.xz 2364108 BLAKE2B a71ef5d5c7462d60937602681c060e85ed086a753b7ef354dad48354d6c3741d809f2c0c6a321ef9ac60fb12d24ec65e1baa63e51211134d2a5e03aae16f73d2 SHA512 ea77778e073515df58229a641b4363df31f0b80204a5a43a8feb31f0b03a5a4b9b79d6e07e1615c773a59927a9b649f1b1d782def1120d581d09a090be8363b8
DIST gst-plugins-base-1.14.1.tar.xz 3689184 BLAKE2B 17abcab2c84b113180de55d6c781ae11feec66c215febfffefe4a22353c56e82a585647688e2078603b6c3ece6f26afa99969091a72886880a2f8549dd9cb379 SHA512 bca9db8780fe24c19a2c4eae9a16dc0856cb38077580e4344bd4f7fa9a7a03079b92556ff35475a574f624a5a721d80ef925790670e4cc809361ed01108a141e
-DIST gst-plugins-base-1.14.2.tar.xz 3693856 BLAKE2B 7ed05718bfd1dcb15e05e5a2c8758ad409c4ad7f331146363f264aaf7123c8a14c1db81f482710d1069d33e5281087f66e2e38504e39b214befba73ffdd9295c SHA512 35e7eb5c42fe265d38c433575f88d3306f15ff927a989eb375ed5399cbf92af2e9bf553d6eee349dc13673540cee00e1f879595f25e58c188ea443d8a969682f
-DIST gst-plugins-base-1.14.3.tar.xz 3702184 BLAKE2B 8b13cdcb912968ed51bba91faf70060cced562f374d2b6987a9b9ff9a261b553836394cc4dc16df299c21cb303fd87bb0becb57225767c3502c8c16359430523 SHA512 3b5f0dc46d148dd9f162c651594be740f798c1d6272ecabced544f09900b6f2909a9fc705d42e4e98130d6f7cb1368458bfeee27444b5c43e62551defbc3838a
DIST gst-plugins-base-1.14.4.tar.xz 3703232 BLAKE2B b22c44b857bc4f1972f03752cc1afb35c8d76e2d0c4a06c574af0ac4f3a91080c584ae4e4fc2a263ee879a53d58505c24a756ebc051d81ec62661c4f9e532f0e SHA512 42c59df9f2d848108f12afa0466acbcfa5ccda64e4d0d44608d4268abed20f2e036713de04e7d71feaed1868ad742c5bcb55ae0eef5dec8e19e053dc8541b8af
EBUILD gst-plugins-base-0.10.36-r2.ebuild 2120 BLAKE2B 5e670a72e651af6a8ef1e4992fc42a7a444e9a77e708b86cdf5d373d96cc549c2953df5da5b001479938f77498eb09de861e89e705ce555618cd45227209a769 SHA512 bc9f491322b473f7ae2a55a7fab8315584b1ef3f71f94ec4968705fb1063d72e6dd2dd80342bd85b7abb29315abb26adbe3002c94c7a7ec27517c8edcf32eafb
EBUILD gst-plugins-base-1.14.1.ebuild 6097 BLAKE2B ffdd010523329417895d7bb0c084ae057085993389c43579e41099f585bac82ce832d2112a8989e7c7bf10a75441aaccaa469bec023552185acbb23ec8c19a91 SHA512 1c4cc400a46d6ae8cd327854aab74b032e6c8ea6eb0110f3e7f8ddc84f7fbae5305d87340a3c5c841c6cc497f7783f0ce67df3a0b17b91fabf055060d1b79cbf
-EBUILD gst-plugins-base-1.14.2-r1.ebuild 5883 BLAKE2B 3231c2ad0d014b9ef9cb0b5d83fa8dffc476aae306b748baa7e192a3f326eba64ec2e8878438d1e06bed2d0a0dbf77499e261189554d5b4ba8c3f70c26756c70 SHA512 74af429382915c4174a37d51c7a3a5187ceb4a67f24a96fc45463f2a799ec5498c28eb40ae321e9915237a5593b61ac80e056b9a3ea7061593803aada923d736
-EBUILD gst-plugins-base-1.14.2.ebuild 6045 BLAKE2B 2b3b0519874526c0780d01380259a0a4986e613af7a4491941e85e504134c505a343812086f128fe251ec912ff528926d96e9f845a524f73162b78b4682e626b SHA512 e88bab789aeedb188724faaa92f39364219b1e512ce1279c2ad617b8302bea1372bea4a1ff57060e12008e81e8627c3d102ed46b2f89b461fa8c01ecd3afcf3b
-EBUILD gst-plugins-base-1.14.3-r1.ebuild 5906 BLAKE2B 4c912c1f88ed151b00539ef601bee22f5aa26994fd7de90086858365d2799fda21438c80a1424bee380d711e7ec54afd724754b313b11dbdbc35e922294f83a0 SHA512 bcd8ab6a7fa00f6f1ae8aad5f8f8b1595de69e89fa005b91cdc2d641166ff99611e781d8c1eb3e95af5b8052a343f4c8146eb4762e43a7036b5a034a530aeb2e
-EBUILD gst-plugins-base-1.14.3.ebuild 6066 BLAKE2B 2d576249fd69de48586c6b7aba76e6d649ecb631e0a3c39defd4537f75588593914fbc2b0c71c50fcfcce0d1bf3a74b7b2c762d7e22251de326bf7ff56eca3ab SHA512 4e055b2f29096ab3db96c5ecdcf2b50fa867c2adc7698e5a00150514ce26044dbba480308c098ffc38f55d881ef09ff50f4932ba185028acb94b541873edbb8e
EBUILD gst-plugins-base-1.14.4-r1.ebuild 5902 BLAKE2B 51fb5a8e65ddc7672a59a1802a3abf936a6729c727cf899dd2b06f116a06a53b77bf4ded550f6d3829fb8638c57922eab54e9b64350fe693d7ccbfba3f0d3869 SHA512 0593dd1ccb735d500c6603f518a20b539fe15d905f8858a766270640cf4013ecab02cba7ae894412f128c6de99fb172fe8ef44128837f0a901a454d9a6806081
EBUILD gst-plugins-base-1.14.4.ebuild 6063 BLAKE2B 62e3e62d940a36da3dca05e9700ffc2a6da8e231eff85360f796e6aaf0e5496234e6755217e7500934689d44009f8b1a5de3383959e755cfd83646f0f2d940a7 SHA512 a0b735fa2538e71355591c79a3427f25eeb1df2a9d40182a7ed98de089db8892c40fd260dfb1ba3967a39fe7ab44a55a4eae32a8ecdae453bb94ddf45c2f07aa
MISC metadata.xml 1065 BLAKE2B 9736df3218c6157e5cc0f14e96a15ec6ab6140e8774c7361dd4fe9378efd37d1a3da593527313a81591818ad48a5585bd4395fbeb85d357449b00bf7e51bbb5c SHA512 520802b59fc6575e16edd765dacab4ff0ff6e51dd162f03fe7e4e07eb472aeb78f3974a32ba613939932e123179106a450c503234ed806a08416dc6b8dd534c2
diff --git a/media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild
deleted file mode 100644
index 6480185d22de..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.2-r1.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 ~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/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.2.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.2.ebuild
deleted file mode 100644
index 0fe6a462492a..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.2.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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/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.3-r1.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild
deleted file mode 100644
index b87fbb291fbe..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.3-r1.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 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 ~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.3.ebuild b/media-libs/gst-plugins-base/gst-plugins-base-1.14.3.ebuild
deleted file mode 100644
index 8ba702826498..000000000000
--- a/media-libs/gst-plugins-base/gst-plugins-base-1.14.3.ebuild
+++ /dev/null
@@ -1,181 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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 e9d57663d287..3d5857710b5a 100644
--- a/media-libs/gst-plugins-good/Manifest
+++ b/media-libs/gst-plugins-good/Manifest
@@ -2,12 +2,8 @@ AUX 1.14.1-fix-32bit-rtpstorage-test.patch 4957 BLAKE2B 2bdd056803ebb1d7f66e7d3e
AUX gst-plugins-good-0.10-clang.patch 662 BLAKE2B 19fd6e7bb5bd66e4414360a4b71b1b7594d91d0d4a0665c0b926dcace76cfe75115849b3b6130a4fde6237bc1b07dd87521919fb8be0af35b1158eb22325864b SHA512 773dee80e639e982e71048bb7cbe1b8be2bc94ad6f95403d5cab2e7df97234ccb7be17f9bdfaadcd61f35a47efc8ef616e219a704ec1abcac07c3b989819ac2a
DIST gst-plugins-good-0.10.31.tar.xz 2738016 BLAKE2B a015ef6993078f1c699badcc9911a835fe1d129b4e0dccb3937d49768d9202549204bbfb0d7ad575bcb77c75f73662a83912936b2664a2b1cd7c331e4d203c4f SHA512 d153dcd5bb846450e9d76fe247f2b2e627e760feaad1bfd4c503a39af2128fad3630788463ea0d50539209236c864df0b2172ab9dac52f49cadff69ac7346809
DIST gst-plugins-good-1.14.1.tar.xz 3776168 BLAKE2B 5b17ac49d5bae423ee887f1516ba8bfb542acb17e3f304f489dddbaa728761ee51a08e67bd10a9981f53b5b8424d8013d1723fcbbf6e06d34a39548868d34f85 SHA512 b52d3214f2d32f263637cb9f0838284483e15b8d20bf36d64c349e99b481095734a4dd2c2421176540dfe5129ecc1acc101b89cc898b4773f0f736e8e962b070
-DIST gst-plugins-good-1.14.2.tar.xz 3779912 BLAKE2B d49f82a6be7423d233ec15660470533d6bfc5da3d2ac5912ce7b3f97739b1540424c02593aff269aae3df7c6f15ca37b2d9d45fe85f3b36b910cdac4ba98f093 SHA512 26ff40d949ab95043ed717350fb344a616c72b049cd52c3e7debd9cc37f73eb9d4704b4f437ba257cecb9dba702ce451647279cb821e9405b36210b46ae9aa05
-DIST gst-plugins-good-1.14.3.tar.xz 3790052 BLAKE2B 14f4116ce3eeb20f1f2cc8e835e46a9444ef82291aad90b74e74d0e79c1974bb6f2373f79543a3a3235773c954bd9def67a9e6c64522035fa65e1541695d34e1 SHA512 1077d4ac7332a4bfd58fe5be53104e1404c3a688769520650c030488a184e64a43b301fc1f1d687de668143f849a23cb0ba2b417cf284d20710b9cf32d792e45
DIST gst-plugins-good-1.14.4.tar.xz 3792524 BLAKE2B 4c7faac73d33bebe1fd53dc4cfed1a5d27b103f9c4cd801672ad52e385f09addb07cd4a0f511dff23815e3421e5202fb3d7866b7dd58fdaf101d0357c4fdc13f SHA512 30aeb3bb74571287cad1598973da38e7a43a0128d35480ded6d280c1373dc4ecd4ea76caaa04a71cdfba2e1850aee5f1b72d96be86ae92d66633e7d32081c504
EBUILD gst-plugins-good-0.10.31-r2.ebuild 1661 BLAKE2B 25c45ebacc5a0a532761dcfdf49cdd4dbd1b61a133dbf1845d293570bdc203b4e9b72b917e5e8833ad9fee0f8595d6371615ae5fb0a2d616ac2f0dc3bf31260e SHA512 a66cb0a552686b588d54a962e9888c29edcf49442aaefa665b753658e31a96b108b07b7fa8033eb4bd7f0535a2fd4b3a6fa8ecc1a91649fd3ab0456e91c01f0c
EBUILD gst-plugins-good-1.14.1.ebuild 1497 BLAKE2B e0f49de376e0f0da5099159b0c8999d5744995cf45fd5b413544062a112f9dd27667069735508b165acfa141fd10a998a9ddc90b909af6ed18339281be1a1223 SHA512 fc772a0d34287d7d3501820158a9c86c52a04863fd06b79f004cfe38d240195fa295cde407c70aefe379fbce7421af1d50f0598a680e7a7362867da6d988cf16
-EBUILD gst-plugins-good-1.14.2.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
-EBUILD gst-plugins-good-1.14.3.ebuild 1442 BLAKE2B b2c006b4f5ea87049b61b3f24ff2c256eff3fd4281c640419e95e3a7745e7d92d7070399f4727fa0ab9f750b7964c2870c4aa5308736d45be241c14dc576bde7 SHA512 271bda64072634995858e6c3af499a77a87df4fa3fc60131b4e305058211686ca5a2516a4231725ed44f3dfc82d800c0992aae7f31061d662f616685b7e6e3d6
EBUILD gst-plugins-good-1.14.4.ebuild 1435 BLAKE2B 0667097700af413430723f546125a0dd28ee3916e6af57b1efde36db574ffb1c5473a659c8036a5d20ac385e32706b38b8b81526c01ad039382bddd2f5051567 SHA512 5f61b5b5ba7a33d5ff4d518e9ffe15e1a1be50a66fc7359b00acca089224bbe153d628caa0a4fe7321ff71eb9ca98a1c5a62b383d94a3b98273dd1c1de5b2ab2
MISC metadata.xml 266 BLAKE2B 3180109d2a1479e9436a76fb478dfb1b23db0daedbf0ef264a469fbbfecd858adf6ec01f3fdc5c56270d0a9e1e150ac947f4a1f893e967d6b1dc1f1b8f6d4ccb SHA512 aa2ce82fa0c848119ff309462722e1d7897da904f9e1dc9ae12dd61582823b69cf5a40faf8da0825ec397d2f01d44e82cb56730d9545abd619a17696091eca75
diff --git a/media-libs/gst-plugins-good/gst-plugins-good-1.14.2.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.2.ebuild
deleted file mode 100644
index daf9c7a0a3b6..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit 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-plugins-good/gst-plugins-good-1.14.3.ebuild b/media-libs/gst-plugins-good/gst-plugins-good-1.14.3.ebuild
deleted file mode 100644
index daf9c7a0a3b6..000000000000
--- a/media-libs/gst-plugins-good/gst-plugins-good-1.14.3.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-good"
-
-inherit 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-plugins-ugly/Manifest b/media-libs/gst-plugins-ugly/Manifest
index fc41a7b19a85..21ffeed4f19b 100644
--- a/media-libs/gst-plugins-ugly/Manifest
+++ b/media-libs/gst-plugins-ugly/Manifest
@@ -1,9 +1,7 @@
DIST gst-plugins-ugly-0.10.19.tar.xz 882452 BLAKE2B df5319481ade22d7acdee6e22ca57a444e104c8540bc4b578cfe7554c79bb4ee33b23a8516940f6504c30d9403c4ced2434e11f3a48548c3721d3d3db2016757 SHA512 16d030998142f698f8ab7dbe55c0c6c8db05ade6b3c007a3aacb5491592e8c60e0a9d62f1a840eab4d57825b1beb9017e3f68f5a90288435216586d67040deda
DIST gst-plugins-ugly-1.14.1.tar.xz 884668 BLAKE2B 8e1cef0ebabac65ad2b1d6ac3fdc04fbb3ae0da0b9f4c0d18f03533ae12dda03d04763bbeab079aebe3637df664dc2e94adc36008cacfb6c00b9ac8b4a228241 SHA512 0eaa9435e93596cb2c2ed1d3540dd3c4f4de1dd18da8359ca5918b0fbdccda9d5b8f33e5aeb54186ed9d70518712aca92e8ffe7884fc13a3ca3174552c10a688
-DIST gst-plugins-ugly-1.14.2.tar.xz 887116 BLAKE2B f1dc5732ef6e9dc7909d1131d36429cf140c6861b07abc97818afbf180a9fc986914c23228328126d4a93f5da234238f95b96ad36e8a4ffdec76554a24ddd213 SHA512 7902a6ef6d207663eebf00d630aac9c20b1ae0c333890f1f6aba8544eff0ef4d349b4d1d0e481d8cbcd5b1800f900ea4e6a0cb6017b0727559ab5c5acc3d0ea5
DIST gst-plugins-ugly-1.14.3.tar.xz 889492 BLAKE2B 0c76ca28e1f062d0eac438f1692d2af33536719913ec10229eb6bc64f1f957bc7f6afe45e1c528ab4015c25dec61b8b9d2c517fee78a8a992c76bd41ff9e75d1 SHA512 0866bbcc3f1d0d668e77b5ef83fa7469dc80c957d2c6526126e761db46e83ff18d941c247833d27336106d8ba043e9ad50cafbddbff241f95bb16f9b1a0fbacc
EBUILD gst-plugins-ugly-0.10.19-r1.ebuild 1058 BLAKE2B 3e51a96a9cec4e7cb9d5ea36620fc7210b0efdf9fb9d4e88984eb492786c441a6bedf87a91133ec24e014a08bbe161e785cab0415bc6e0844d8a0db5d4be5d69 SHA512 32c32c59686f099e1e5a9c2b75aad193fdcff900734d8dee31129a00cbdf84e219ae86c89bc6e35f4c5fb54532183cbe24683c463ce45e92c26041267e5ee1d1
EBUILD gst-plugins-ugly-1.14.1.ebuild 966 BLAKE2B 4a3e01b2b17b00b16dbe8a80da288a653885086b572d15aa3a73013c00866554c2acadee04be48d19edc821c43257f54d3cc8ca060faaf92a4bb5217c98afc67 SHA512 8ea21c6090145be195c6b175e5370b35dc889ab57b55bedc1c621783a012e70ea3ae690cfa69b8a267cb899259d15cad94fe411f9a338bb9111cc21abb868277
-EBUILD gst-plugins-ugly-1.14.2.ebuild 976 BLAKE2B 7096ff1cd28e8ca267d014b6c5444ae3311410de4d2dcb194e008a2d33fb97181f6cf47a9a0f7be414afc2e76ce74abc2ba5bdba5bc1ebb572d71b77abb36c95 SHA512 ce35f48e6ce9378ea81c11b328c6de5c50b5bb3f2bfea435b4c085cb96a8e9612ddaf1de7e63a56be84fb9b19b64edc3ffc2edd49c1ec9e4c935850cacfd8ae3
EBUILD gst-plugins-ugly-1.14.3.ebuild 969 BLAKE2B 0372b1b5fa0118140c970a7a2afd1c5fd390e7f95b8baa1b8e1ab1f2601a7705a609c085c2b4c9a9954d1ac51f718488187577c26f2b76d98e7f7c3383c6127d SHA512 21a427870bfabbbbb8372a4fe48718364f697311f40f4ab6b44ae0c8531aeaadeb643c95100a1d986d96c620a13d48504bcab81b5724ea5ca82480c550259baa
MISC metadata.xml 345 BLAKE2B c8af39d4811da5ca9cad30110ed9b2a090fd27a957bf32f831b4c3f5a22bb87fcc15957151ce9752521d2a92c667568d8ab002c8f4f9ba3363d9b7ca79655ce8 SHA512 c8c693633f2fdbf66f2308a2ee82880bf0cdd58b0c1e42a2d3b2733b3a7411769da60e8beb375def6473fe50303f1a68a0c7712e48abf88935b045f93103b206
diff --git a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.2.ebuild b/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.2.ebuild
deleted file mode 100644
index 1b31266066c2..000000000000
--- a/media-libs/gst-plugins-ugly/gst-plugins-ugly-1.14.2.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-GST_ORG_MODULE="gst-plugins-ugly"
-
-inherit gstreamer
-
-DESCRIPTION="Basepack of plugins for gstreamer"
-HOMEPAGE="https://gstreamer.freedesktop.org/"
-
-LICENSE="LGPL-2+" # some split plugins are LGPL but combining with a GPL library
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd"
-
-RDEPEND="
- >=dev-libs/glib-2.40.0:2[${MULTILIB_USEDEP}]
- >=media-libs/gstreamer-${PV}:${SLOT}[${MULTILIB_USEDEP}]
- >=media-libs/gst-plugins-base-${PV}:${SLOT}[${MULTILIB_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=dev-util/gtk-doc-am-1.12
-"
-
-multilib_src_configure() {
- gstreamer_multilib_src_configure
-
- 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/gstreamer-editing-services/Manifest b/media-libs/gstreamer-editing-services/Manifest
index 5741b31a75e9..783228736e74 100644
--- a/media-libs/gstreamer-editing-services/Manifest
+++ b/media-libs/gstreamer-editing-services/Manifest
@@ -1,7 +1,5 @@
DIST gstreamer-editing-services-1.14.1.tar.xz 1059888 BLAKE2B d176c5d4341df208ee87d71f1838e5bb6c3bce7f072a3214d6907b91e75a81f5cd79cf424266205641281d525dea7e36423ffb98adef3cddd54814ea763a8d00 SHA512 3801769a515f248b923c50ad51961175094a66f2aa55184e82ecb948331c05b6e297a723d5443db11ec3274ee48f56d6dcc8af8a95cf9e701cc4e02615f8e6e4
-DIST gstreamer-editing-services-1.14.2.tar.xz 1063208 BLAKE2B b26db0c944e203026c1be242b80d3d16396d754c1883c07608f73f236d3e96979ef0eb5a7a0230fc360edd34caf22afa3d1e59eb4109ef17e60481b428703539 SHA512 74cd168d1308086e1b4c350eeec1757f790e05a8a762ebb7dd43c7ecdc0e747d7e5cfa2c3b0266eea18d98a369beb1fa544dafb4a1d22fe23af1d4e055322b29
DIST gstreamer-editing-services-1.14.3.tar.xz 1066740 BLAKE2B c5511ca12eccb08d49733540e2d264290a6ca53ec0d5e9007d354e10808568727ed10bfb205c425fd56d334ef12e30324d67b0dcff8115b3c13d1123fe6026b9 SHA512 5dc4fc65c7ce9604b75516774c4481f3214ed703c0d3bb2a6fa348e5a8a09c963ac711e81e5c91f12f57ab3df63a94d7d178fcd4aab4d4d429f32e055c14a205
EBUILD gstreamer-editing-services-1.14.1.ebuild 1521 BLAKE2B b23e91bb494035a3cb02dd6c2d08c0a6677fe335da13d762b858546c6269a25cdc9cbce7ed63ee756636c59ff09275456df9bc54bed37f5db51d899a1bc7a809 SHA512 54c99267dc65545802775d41c321d6a153d100d6e871a7fe0ebe39af22c5424578e7053b408d5d6fbe766db3d00858f9f5b8b29d7c148ae9d980fb4ecf52c920
-EBUILD gstreamer-editing-services-1.14.2.ebuild 1544 BLAKE2B 2365ef8069067e9ca2be479806b2ceab658ffd8cdcf969537030902c04bc312017d60f3e7674729e53ba8ca28f5dbc9b2fed4083c45b69ce16b6fe4e77c00ba6 SHA512 ef6ec043c85673d84a5f34536106b00f14da86027a3da7f53e3f5221ee594249c14704a9b4e53e73b1a61e8dadcfd6d91a53c222be4d7d1f9054b22096184270
EBUILD gstreamer-editing-services-1.14.3.ebuild 1539 BLAKE2B 5c9848103655bbf47f69789a3b38c20ec6ec334469d98e393b736279ebf6368a39ee4de94226b86284041d96f3277c4fe67973d46be132bc783d2a8ca76afbe6 SHA512 ec00de8be9297223728c99f626a383c8b0c6f8105dd80218c23b3b9ce743ed72a2e744bd3c9c459b33701aa1e764f624c490e6c601e95822a5fff8b6c0792d15
MISC metadata.xml 262 BLAKE2B 16a4a230ef5481afde96333e9555bee1771ced412b11eb982c633709dec57b274f78082ba3fe842f7d3406a688662d34792fff304027833286b30652e9982719 SHA512 608f0a17d576a3b23a6921272eb449a6efed76b3c4b3fdf8737b2d499b56d109186c2883c06e5c843799d2fb1606f3066c43759b40f9d7cf58b6a674c38dd0e0
diff --git a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.2.ebuild b/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.2.ebuild
deleted file mode 100644
index 0bb7fc8cf81d..000000000000
--- a/media-libs/gstreamer-editing-services/gstreamer-editing-services-1.14.2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
-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 ea0f834d50b9..b217454d5e2f 100644
--- a/media-libs/gstreamer/Manifest
+++ b/media-libs/gstreamer/Manifest
@@ -1,14 +1,9 @@
-AUX 1.14.3-fix-gstsegment-test.patch 1659 BLAKE2B 432239af51fba7f3e0be9bebdb221923813e5a3a4087aa2878f8ec8bbbfbb87a0ccafb8754a34ee7ad636807583b97a5143b67192e1a4c40e617ed24fc48c749 SHA512 19f56c749162ae320eeff23b0057eb7ab0b443031c82730cc76cfc4f829769fab9399200369b859847e04c55f23689e4f0a37a7ff432e68e37fc4925e9a5b7b3
AUX gstreamer-0.10.36-disable-test_fail_abstract_new.patch 1319 BLAKE2B 6b7fc64688f7b078d5018d0ec9b90dc8aa6c0c48bbdd19873a95fabd4da7ffed5b767ac1756ffa6b802d6dd2f261a9f2170a52c7a029732296d22b45999d5cda SHA512 6d2ef5d837551481c85b75edc9246049ca237d8b7efd462646a39ce5526a9b309a6390f2257930bfc54383c9b13447002b2c61f777d38e717995eee6030f5198
AUX gstreamer-make-grammar.y-work-with-bison-3.patch 820 BLAKE2B 1809d190e37fde67c1e7108315e477ed05a3602e401013c26aff33dd0a74e2db8fc4e3d72d6e0b2d5fd79b3c4390c2ec5d2140fdcdb60530facc5e546c1dbe31 SHA512 8f5e904cc42be918c0a170c7227e22d0a31b5eb613a44294dbc03e5b1d7315d565f29d3de796ffbca822fe53b10b83bea54694b58ff2bf453af4b8859741ee21
DIST gstreamer-0.10.36.tar.xz 3025876 BLAKE2B f0f70f483e8ccb2a294fb3bc8b51aac089f5e76522249b64e3e60e7b488a9e03b9300617e2c137bdcc0e3e61668b7b203e899f270f004e2dfcee0927fa7dfc3c SHA512 7468abb578398681d2adb0e9bbc9ee8ae25aaef72369d45a66ada6c67d1759afdce606cb32e68d9e30ae813196bdfef3d4d33202bc77839cc1fbf5fc436c1bd8
DIST gstreamer-1.14.1.tar.xz 3252440 BLAKE2B c2142621b126926dd9ec886f0478154b3f0d9b7adebc6169200b8bc7e4cd089dfe77cab2b436bf3c74cbcae5f84c95afbd05ba282d0afe3e8e226e6bc0f33e33 SHA512 9cf16d79774293dd7fa10c08f6628b83f4e77f0386bebbfd47ded0498e4abd48eee1aee164af53d59fbea2d395e42eb5a12ef4b8f631bc4fd5d4f69545191f9b
-DIST gstreamer-1.14.2.tar.xz 3255404 BLAKE2B 290e8fec3eb6629a0e6e8f01c7c027fcc085f632afeac1ffe7bd4f1d8a9a3d3b78145334a11c91fcabea40b9f202a3b451ca55db13fd23be66c7167c76614932 SHA512 270dba318d15b54fff6e09d09d77dea13be55bbf82a5bb510efb43f954e234230505366cc6f19f5431e2dd24f5a7734daf5a89d9bd94de8302ed722df0e1eb84
-DIST gstreamer-1.14.3.tar.xz 3263036 BLAKE2B 20170b831064ea49565d7a4529563e4e9273def28d33eda779c7e3f4a60989b64844c271da529bdbbaebf80a8a86c37b97af4a18c4d0aae6182be608f3dcf345 SHA512 bfbf76219b5275b00253797323c4fc7b4edb8513d5441c80a8f778b418837c68e9ff37a72a78ac2431a051e813397fb01464bebddd1522b9e4a225ed505342b7
DIST gstreamer-1.14.4.tar.xz 3264324 BLAKE2B d51febcd7c317964a09dadb4d3bd3ee7a60ac38bef28cdd7d42f49a7b710d6f6180ca7edee1765c8d146f7e3e852e93d0d5f69962089a653cfc3e6bd4ab42f89 SHA512 7ece9f01d40df7c8358482eac94536c5e15261e9568962008e2029e1ee1b3ebb220d2e4802ed1c81c40d897576fafe52234065e273724bfb4df3a3ddf2711abe
EBUILD gstreamer-0.10.36-r2.ebuild 3843 BLAKE2B 5755f04502e3fd6bb5eafbba0710009fd0dba7f402c4a28c20c768ad6290201a900200a33f21b2d97bf6aa7596df06a0001530f001164eb2777a9f3b5cb0adfb SHA512 3a9be6924cb416b173297ff022edffb6a8c496607a4b5f88c1b81fb8489ec045e9f611a88a736fb67a84418d472e37fbdb078e9e9d8593a03418cb6658de6c67
EBUILD gstreamer-1.14.1.ebuild 3375 BLAKE2B 6064b6693e8749608990b0a4ca9e5e5c041c84a85c65ee99ce00a9000f67c93440436690b7553b5dc4538555a0c197d7a4c445b48db2d0536440fb5dc1a8862c SHA512 89e5eeefa7bf8389458998466c3eb278a7b5fd62786834ba59b271abd01eaebed407de1d9292f53d3bf9b26fae9310c05e408dc98fb1045f934719c9cc6b0276
-EBUILD gstreamer-1.14.2.ebuild 3406 BLAKE2B d43a2dbf9c0a707b6c03df95f7eb780246d3da03763f6917ebccc65fe5d05ac25b81be4f141aa4c87a62f375b69bc7460e7156831c00f90d8ec28d1b61f50d5f SHA512 88693dd7201ff60a460ce7f43792dc9118d08cfcb699075e99bfdc254276b7288f2296eb0a8444a75b4d3f55a5f9bc1695e7b7d5323397c99d30e02e0a49a887
-EBUILD gstreamer-1.14.3.ebuild 3466 BLAKE2B fcf6a510d66a0529be30d7d14ebe7d38e128bcd6efafb36d595290c595866ff341338b06602e070bb11bc25b30f36a5b0df7722767400069fc52d5b43a29387c SHA512 e0bc3ed6a303778658a05f0d1daa13da234f78d268ef458612be8799a748f80bd7ed3954da80bb38129e0289cd1236ba23caa94d986ac192eb329197bb85be98
EBUILD gstreamer-1.14.4.ebuild 3399 BLAKE2B 82ec7c3c3cb8af76641b5f5fba19ee3b7a448af91cfb20f5759896338133dbda9d87338d5a633b64bc7e4c799d3a780bf417d2d9d1dfd6fd0c33c8f68989b74a SHA512 9d0346452d3781ec2d49834a8a2e0e11bc5bb8a82e777d65956e6635e13c06e1e11dcd1c374684abfc2724244518f02e7d8f3f958be656bd489afc62dfd70388
MISC metadata.xml 586 BLAKE2B 319df0c2c013f3018bdb31afddcd80b298f9b74d0a581981f30d483b0773339befe4dc62eb78a267b3a0f5a63a7e6462bd0ece4d4285c0ca91a1329c12ba1b93 SHA512 f7de0325f671119a5b787dcba9572d06d58375ba9d815854beffd668da55e4d4695f586365b3455e63cd56f4469fb8e1a92ab6de4e05847668f56c076dfdaf57
diff --git a/media-libs/gstreamer/files/1.14.3-fix-gstsegment-test.patch b/media-libs/gstreamer/files/1.14.3-fix-gstsegment-test.patch
deleted file mode 100644
index 9b2fb2402e1b..000000000000
--- a/media-libs/gstreamer/files/1.14.3-fix-gstsegment-test.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From 0a479c3cdc5d5745b6cc5084d5faf3b0ab8e604a Mon Sep 17 00:00:00 2001
-From: Jan Schmidt <jan@centricular.com>
-Date: Mon, 17 Sep 2018 22:13:22 +1000
-Subject: [PATCH] tests: Use a different rate in a segment test.
-
-Using a rate of 1.1 in the test is causing the test to
-fail on 32-bit because ceil(1.1 * 10) can round to 12.
-
-Instead use a rate 2.0 that can be expressed as floating
-point number and doesn't trigger the problem.
-
-https://bugzilla.gnome.org/show_bug.cgi?id=797154
----
- tests/check/gst/gstsegment.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/tests/check/gst/gstsegment.c b/tests/check/gst/gstsegment.c
-index 17ad18c2f..751469d76 100644
---- a/tests/check/gst/gstsegment.c
-+++ b/tests/check/gst/gstsegment.c
-@@ -888,7 +888,7 @@ GST_START_TEST (segment_full)
- fail_unless_equals_int (pos, 190);
-
- /* Test a non-1.0 rate that lands right before the segment, but still +ve */
-- segment.rate = 1.1;
-+ segment.rate = 2.0;
- segment.start = 100;
- segment.offset = 0;
- segment.stop = 500;
-@@ -897,11 +897,11 @@ GST_START_TEST (segment_full)
- segment.time = 10000;
- fail_unless (gst_segment_position_from_running_time_full (&segment,
- GST_FORMAT_TIME, 140, &pos) == 1);
-- fail_unless (pos == 89);
-+ fail_unless (pos == 80);
- /* And now one that should give a position < 0 */
- fail_unless (gst_segment_position_from_running_time_full (&segment,
- GST_FORMAT_TIME, 0, &pos) == -1);
-- fail_unless (pos == 65);
-+ fail_unless (pos == 200);
-
- /* Test a non-1.0 negative rate that lands right after the (reversed) segment, but still +ve position */
- segment.rate = -2.0;
---
-2.17.0
-
diff --git a/media-libs/gstreamer/gstreamer-1.14.2.ebuild b/media-libs/gstreamer/gstreamer-1.14.2.ebuild
deleted file mode 100644
index fcdb78c174df..000000000000
--- a/media-libs/gstreamer/gstreamer-1.14.2.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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
-
-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/gstreamer/gstreamer-1.14.3.ebuild b/media-libs/gstreamer/gstreamer-1.14.3.ebuild
deleted file mode 100644
index ff1a74c70a22..000000000000
--- a/media-libs/gstreamer/gstreamer-1.14.3.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# 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}"/${PV}-fix-gstsegment-test.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 aeaedde7c32b..0adad81b9d23 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -2,9 +2,9 @@ DIST harfbuzz-2.0.2.tar.bz2 4322171 BLAKE2B c844a623de5c2be7b6fb4a2cf0d38e689a6e
DIST harfbuzz-2.1.3.tar.bz2 4429069 BLAKE2B d00b5e4f83e9e4b8032cd4f0a8c00d3f88176118458026de69a68f1932bf437358dcd0ecea89f40a4f610816b1709f3b0784c9a619141fa459297754d934f42d SHA512 9bf5f7b857424037a3b3ea5c286e6ba8440c265fa663cf6b6c22cc08d36d84badfed8bdc46816ad982fc810677ebecccdb669ea98a021207e1858c8c355dbf19
DIST harfbuzz-2.2.0.tar.bz2 4506619 BLAKE2B e2ff32f4490e408a7f67b4e1dd12f266e31a8b58f4960643be45ac9574ce20da8f26e0d7261a9710114621b7f6928df030fa30c3a7672ab5e2b9d1b5c0369d2d SHA512 5e8f35c0d7634afc6f623a91d56bfde46b2a1030d439e5dec196001d49a58e409a1bf66c7f9c15a04e030dab4fe2fe2c928061839b1e985459d4f8379b8a0818
DIST harfbuzz-2.3.0.tar.bz2 17909479 BLAKE2B 32ea08ac60ca3c6b91a41b17d857bcabfd6f13785b674ceaf7006cd0616e1799d1d5f390f5b8d37e2bb22ac5506f00a6fc5c9a6a5263c23760ffe0e0677fe44e SHA512 830c5b96384554fb6d2502713e9b2eff384dbe6aa3feb08830226944bcb07c8fb55237f389e1e6416d0942e3efba8b1ed54a49ff8c4762fec230f2404095e85a
-EBUILD harfbuzz-2.0.2.ebuild 3035 BLAKE2B 88cd54eb65eae9a9f8706442a575582fdbd5cbea84918b78bc5673a2629424a70e577ca379596374424aad0c64bbc03591cbce2885794a474c84af4c6dc887e5 SHA512 79927e8c424371d6cc76370ab8ce2643b38b6027dd43a57259ebe5b84952a19a266889e65b6e535952bdbd4c173cc6a08010c56133111035eb594e113a807eca
-EBUILD harfbuzz-2.1.3.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
-EBUILD harfbuzz-2.2.0.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
-EBUILD harfbuzz-2.3.0.ebuild 3102 BLAKE2B f89b14e1ee258dac3bc7b244f73b1193d7e79ec83db5658c62ac7e0141a364ff4dccf6ab7d3ae01ab02937d61464775502dbc31e607665490756397b77d21793 SHA512 3783380ca41f356ac40f84c01ce31d1cd484160a868bc32ca14e1bbcd7e6b9ba06a632a1014acebea40ceedf01462f6c5b51e20789777ef8fef6572d2e8d1ad7
+EBUILD harfbuzz-2.0.2-r1.ebuild 2967 BLAKE2B a4521347729a2533a10ef6e28c54d91c93a93198db6f1199fc3534503780a74e6888fb370b59f85df07c057dc4d51983c54fc3cac86e1f18031ad3302fbdf2ea SHA512 6f824127087d1e5dfbc3f13dc23b06292feae1ade55715e5318ce6329ff15f087ac7cb0d69606f77408a3616df5f35ed08f9d2f8faa0beb0a58974519a9ce807
+EBUILD harfbuzz-2.1.3-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
+EBUILD harfbuzz-2.2.0-r1.ebuild 2978 BLAKE2B 28da2f568845f63ec69230c6a986b3c305b81c365ffcb53e3ab372ea70991adc4482a1d797f1e814ac7e444941902a377e1ab72994c0827d2ff1e1cb575ee048 SHA512 e5943083ac65035cb0017f6df360fc0b9b119412aae6ef4a2642cd565c592d90c057b7a5d53f52c1653d2f93375d6687ecb926a4c66844e4430b894fcad7555b
+EBUILD harfbuzz-2.3.0-r1.ebuild 3034 BLAKE2B 83bf6f358e3799d0cdff7e5c7becbdd00c3fb34466552d427c42b9129c379990064b917d0ffa9d7b40d3e68a1730b5b2059052dadc2f1af2607cf841adc03f3c SHA512 158d7bbb98b60a8ce9a860538671a4fa64e1c9620b91da68126b0db0ab19658a668de4f2d436c22056b193e0b2256cba9ae66dfc14f7a71f4e19913b4bfc6063
EBUILD harfbuzz-9999.ebuild 3046 BLAKE2B 1e35dc5058a367f1d6d76d7966957399eb5300447397dcf4e5429e724cad01595765b7f7bdc0723776c422f84e4f701be05d9b3fc8216ef5f7b08e7208001c7e SHA512 6d5c75d516d49de4fb6d201d6a9133b2a00b2cb9ce49c2a2787a52ef0b91f6f98cd93fd7085801ed8a49c2fcf271d25ec602b5f6ec073b3a30eb32c76a10b0f9
MISC metadata.xml 645 BLAKE2B aadcef9412392874d361b5c09e7450bf88db64fa704558553861cf16ffd1a5b5715291fefc0624e3ad0d86a537cdbd2b810fa093b289428e68a19c82049188ef SHA512 645e451768a5dba2e16d18b51ece20fa28172450bf22e29fe73ed29748f712187f997ce2f6f0a24c725f0cb10434b4a65c6de9a5fd1aa7d820e00b7dca8b8b63
diff --git a/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.ebuild
index 1674c2a5bed1..2cfc66808b22 100644
--- a/media-libs/harfbuzz/harfbuzz-2.0.2.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.0.2-r1.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=7
@@ -21,12 +21,11 @@ fi
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
cairo? ( x11-libs/cairo:= )
- fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
@@ -87,10 +86,10 @@ 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 fontconfig)
$(use_with glib)
$(use_with introspection gobject)
$(use_with graphite graphite2)
diff --git a/media-libs/harfbuzz/harfbuzz-2.2.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.ebuild
index 85491d783cd9..9223739ba804 100644
--- a/media-libs/harfbuzz/harfbuzz-2.2.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.1.3-r1.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=7
@@ -21,12 +21,11 @@ fi
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
cairo? ( x11-libs/cairo:= )
- fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
@@ -87,10 +86,10 @@ 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 fontconfig)
$(use_with glib)
$(use_with introspection gobject)
$(use_with graphite graphite2)
diff --git a/media-libs/harfbuzz/harfbuzz-2.1.3.ebuild b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.ebuild
index 85491d783cd9..9223739ba804 100644
--- a/media-libs/harfbuzz/harfbuzz-2.1.3.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.2.0-r1.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=7
@@ -21,12 +21,11 @@ fi
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
cairo? ( x11-libs/cairo:= )
- fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
@@ -87,10 +86,10 @@ 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 fontconfig)
$(use_with glib)
$(use_with introspection gobject)
$(use_with graphite graphite2)
diff --git a/media-libs/harfbuzz/harfbuzz-2.3.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.ebuild
index ab1a514c9752..08348f2ec48e 100644
--- a/media-libs/harfbuzz/harfbuzz-2.3.0.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.3.0-r1.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=7
@@ -21,12 +21,11 @@ fi
LICENSE="Old-MIT ISC icu"
SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-IUSE="+cairo debug fontconfig +glib +graphite icu +introspection static-libs test +truetype"
+IUSE="+cairo debug +glib +graphite icu +introspection static-libs test +truetype"
REQUIRED_USE="introspection? ( glib )"
RDEPEND="
cairo? ( x11-libs/cairo:= )
- fontconfig? ( media-libs/fontconfig:1.0[${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
@@ -87,10 +86,10 @@ 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 fontconfig)
$(use_with glib)
$(use_with introspection gobject)
$(use_with graphite graphite2)
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 1f4dbede14ca..eac01e3238a6 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -3,7 +3,7 @@ DIST greatest-1.2.1.tar.gz 19792 BLAKE2B e6abd20eebf3223311fcd62e341595318dd00f1
DIST kvazaar-1.1.0.tar.gz 484601 BLAKE2B fc35fe5bbd12779d4e14b8cef6fbc6950f188ccffef567c77411bf32f80f2e355f235ad9df4762f8a615415778b322715d09d21a910a256d1bb2054bc13dbdb2 SHA512 72cee44e32c76c0a94acf33347457145d3f88d644fb4703588d0db6bff1c7064c9b623034efe4ba39219150767012544e4f45141b6a6183d41e4a29c6cb258b9
DIST kvazaar-1.2.0.tar.gz 486455 BLAKE2B e7b9ceee4e4edeb051128cfa798e59114cd9175b5ba8a4531c7e872327658c58d22ad21ce40b1b71c632e94cef96b78b77646048629683d24bf69107497f1acd SHA512 5a28c1b21e47d9f45e04ee40a253f478c4ce3c6c41134db8301e843ef0b5d620bce493eacf82ce1ddda88140aa4d2e9401612b63ff592fc2273cf532458d2bb4
EBUILD kvazaar-1.1.0.ebuild 1512 BLAKE2B 4f8f062035d7fb2fb5ecaafa6e76cfc7fae234cabd9cb572db8cb13c7fa505d6b46b8899656d35574af17f15e81bcf051f8d18e1be0faa12b1891209592e3ba5 SHA512 0f973ad261941f971e12a93dff71f9af57083657dbe666245cd11a004041f889d829e6a6af9a83b6ac176e7a285dfcd29fd41eb09eca6d6e2c0de6426ec2420e
-EBUILD kvazaar-1.2.0-r1.ebuild 1838 BLAKE2B 83c1f52cd27eb7ae4c250ce006e2e919ecf82c8b187a968aac5c84ea9d1a7c65d4f9377420d43b8a5e51c6e88b46f7a59332793fe59d0fe3a6364ccfb224a3c4 SHA512 35cf4d84259bf1f46cc1617c3f8569003fd7a7866d591302589ab6b65bab5284092f80bddb97f3a36517a2274f116f20c00ec90ce6a6ab0c6170340290c7f001
+EBUILD kvazaar-1.2.0-r1.ebuild 1836 BLAKE2B 30c6c553c5f822cd41b1f122ea2c4d57cd299612b11cd6ebb079ba5788441aa45ecd851506edb63f965ec1b66826eceaf4a8bb62ad431580a592c7cdb1e0a329 SHA512 0e061dbfd3ee07d2108fac3948a77aa7d9ffbed102bba78615e0e65da01820ca445df6a2bbf77724090b5f9db0cbf7366475ccb603675b5ba01545701aa1c23b
EBUILD kvazaar-1.2.0.ebuild 1512 BLAKE2B 2796d4ddea69e3cf86892691aae9d908855b56a8149bf1684df9ffcd79a91fb00fc1db4c256dd1979255ef583eecbb948d3bf41dd936a95a39f4cfb8f929469a SHA512 f9acf71e411c915d7ef5192a49d0cf54e3a170a1f67e8aefd547e95f376e9465133959aa263a56bffd76aa45f38dfffdf3bcc8a3672fbd424d29f652295fae0a
EBUILD kvazaar-9999.ebuild 1841 BLAKE2B 44b64fd8a475178738c85b5289a04b47a28772a89430c35f928548454967eeb3b4fb07bf14d1e0f9326c75f1ae04e70be4f036c0ad21bc896f2518f26e06d773 SHA512 a1735b9cb301c8a7e6dc5acc07ccbe4ba4c93b6f32799d085699c7a260bbb77b917cd890e37296f895352b0fa7fe3b70214c201feb1bbbb8dad016d63c8a8a75
MISC metadata.xml 306 BLAKE2B 9556e4fbc08c1634b447aa9ebbc78c7b8b55a088e71db8cb7ada5c45645a2ea809f50b956a2b3b54dc1493a59861e9f4c405405edc00a49991e543125017f32b SHA512 8210924e0f6d879f473b353a9806e95ec136ceaef507b1911162c7d2bfbbc4e072f9e59ac105af2771b64ba625f3b4f922b60bba7072d1d87a079c221511d927
diff --git a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
index 224888311fb8..46ab86914897 100644
--- a/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
+++ b/media-libs/kvazaar/kvazaar-1.2.0-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
else
SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~ppc ~ppc64 sparc x86"
fi
inherit autotools flag-o-matic multilib-minimal toolchain-funcs
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index db569490986d..dbf806066055 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,6 +1,9 @@
+AUX 1.77.0-gnuplot.patch 987 BLAKE2B 51f1fa225cb124fd3b078ed895234fb343ea78c06dd5d763dee71f37a0826c5c2dcb2c845cd1b47a2e6a855075ddf806cfa3ea5895077163bce2209acffe5851 SHA512 36d996202de66ffd0b241b813779c62830d688c42bc21670d277f370243636c6c0658067d806b6be3f765aa1527a4ebd4bac3fe6e0188fc5381f599f14239b51
AUX baseline_reg.patch 847 BLAKE2B d45b93ba00abffca157438b6140e329de2cafe95be97fafcfc60272fa821fb847984838179cff186babf8931f79decdccb1bfa0a724abc6de675b1551ff0684e SHA512 a35f518aaf384ed35130cbd509e2ae16efc1878a3528d174156105af6d6259a094d205c47084f068b1f42e07ab87e750d6b82113376e00e041e81fedf90dd541
DIST leptonica-1.74.4.tar.gz 12349877 BLAKE2B 5c4a71c1c4f44b617f16b1b1029455badee268dc1ac459f1c7ffe6af5b8dbe702bdbaa6e5564af6e41d0881c59e1aa43dc40d5164f618f13ca2a563b2aa3bd0e SHA512 e74732c10218430463ca01f15e19d329dceb938e315586ed100c634c4d50809824f1d9bf7eeaf91654caf42ed78a5ae5de7c08e7a1d8884c580c536121627891
DIST leptonica-1.76.0.tar.gz 12436958 BLAKE2B 3cbb581340531762090f009393b21252d6f7ecbe3dd7c30043f42e8a437f6ae16d3e95229fedcf6845ca47e4323a35ab3e72e349c6fae35f0587c21b44461ef8 SHA512 83c77bebbf739cecab997ee08f7c9abf3ca884019c559b8f77c292ea2676c464cbf9b6812d7f12aefceef86c19d04bb3bc85119de298647a641b984dcdf3b111
+DIST leptonica-1.77.0.tar.gz 12888756 BLAKE2B a1de6ff8d886c4e302faa362ad5c18ece727771e5cdbe62b33c34c950d1af9e0e97418e59485568a6386eb2a7e51fd42ffb2fd01f16591c5bc668961640f1f4d SHA512 3cf764c76d5acb6d5982c44e78c02d7a7c3b5e79937c41df193e71dd8a02dbbf965d34a2ecdf0444e907cb73c06bdb8bcae4ceafbf5ee1483c022659e897015b
EBUILD leptonica-1.74.4.ebuild 1714 BLAKE2B 0d6f7f596f2ddda2515ec95966cfdb4e9bc7c059fd88c58700a2c05139529fd550fa7a077b30da8fe0f8abee36a9d5b915ac56b5d86a8573c3e44767c2e13338 SHA512 26fcc48126498ab1d7c80f4aeaa0a263bd443e0fd72ceaefdc00e34543fc9a3a91c7cac6481bd334f58f29b920983b3b175cc9091128ce6a096530a1d808a15e
EBUILD leptonica-1.76.0.ebuild 1912 BLAKE2B a526eae23b91e0f089db992d80280e192462328ad520831d513dcb7e0f5d025de3e0e786dc935552e53b8529ba997d71dff4fd0f5f5e8fb0519ae9947a5f1037 SHA512 ab4f22f918c8c23275b2d5a343bb9952b00a167522722b63c350effaedad0c6ab0cdbc62e5487a4d16d0cc4d2088e050d3fca139219eaa9c1991e929c79dfd6e
+EBUILD leptonica-1.77.0.ebuild 1995 BLAKE2B bc14325f908d06c6cb9d6002849d68b1a7b6844238c88103c16551bf661b45230491d50d1572d05508c1c974c0392a87412fa17100208cbf8b021731ff228fde SHA512 71f006841bbc39526b858ed09705c7835ca6dfe23c756fdaa64a8ccd3ea54e4bc633d60833e39f2277cd7d011872cb2590f2557a55961842ac1cd624420e84f5
MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
diff --git a/media-libs/leptonica/files/1.77.0-gnuplot.patch b/media-libs/leptonica/files/1.77.0-gnuplot.patch
new file mode 100644
index 000000000000..0d6b0e3cb153
--- /dev/null
+++ b/media-libs/leptonica/files/1.77.0-gnuplot.patch
@@ -0,0 +1,25 @@
+From 5204b5453fe8035d77e34add80f8ebb1f36b9350 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@aura-online.co.uk>
+Date: Mon, 14 Jan 2019 20:26:14 +0000
+Subject: [PATCH] Add boxa2_reg and numa[12]_reg to gnuplot-dependent test list
+
+---
+ prog/reg_wrapper.sh | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/prog/reg_wrapper.sh b/prog/reg_wrapper.sh
+index 5568c8e..ff9264d 100755
+--- a/prog/reg_wrapper.sh
++++ b/prog/reg_wrapper.sh
+@@ -31,7 +31,7 @@ TEST_NAME="${TEST##*/}"
+ TEST_NAME="${TEST_NAME%_reg*}"
+
+ case "${TEST_NAME}" in
+- baseline|boxa1|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|projection|rankbin|rankhisto|wordboxes)
++ baseline|boxa[12]|colormask|colorspace|dna|enhance|extrema|fpix1|italic|kernel|nearline|numa[12]|projection|rankbin|rankhisto|wordboxes)
+ GNUPLOT=$(type -P gnuplot || type -P wgnuplot)
+
+ if [ -z "${GNUPLOT}" ] || ! "${GNUPLOT}" -e "set terminal png" 2>/dev/null ; then
+--
+2.19.2
+
diff --git a/media-libs/leptonica/leptonica-1.77.0.ebuild b/media-libs/leptonica/leptonica-1.77.0.ebuild
new file mode 100644
index 000000000000..1e8f7a678d8b
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.77.0.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="C library for image processing and analysis"
+HOMEPAGE="http://www.leptonica.org/"
+SRC_URI="https://github.com/DanBloomberg/${PN}/releases/download/${PV}/${P}.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0/5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~ppc-macos"
+IUSE="gif jpeg jpeg2k png static-libs test tiff utils webp zlib"
+
+# N.B. Tests need some features enabled:
+REQUIRED_USE="test? ( jpeg png tiff zlib )"
+
+RDEPEND="gif? ( >=media-libs/giflib-5.1.3:=[${MULTILIB_USEDEP}] )
+ jpeg? ( virtual/jpeg:0=[${MULTILIB_USEDEP}] )
+ jpeg2k? ( media-libs/openjpeg:2=[${MULTILIB_USEDEP}] )
+ png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}]
+ sys-libs/zlib:=[${MULTILIB_USEDEP}] )
+ tiff? ( media-libs/tiff:0=[${MULTILIB_USEDEP}] )
+ webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+ zlib? ( sys-libs/zlib:=[${MULTILIB_USEDEP}] )"
+
+DEPEND="${RDEPEND}
+ test? ( media-libs/tiff:0[zlib] )"
+
+PATCHES=(
+ "${FILESDIR}"/${PV}-gnuplot.patch
+)
+
+ECONF_SOURCE="${S}"
+DOCS=( README version-notes )
+
+src_prepare() {
+ default
+
+ # unhtmlize docs
+ local X
+ for X in ${DOCS[@]}; do
+ awk '/<\/pre>/{s--} {if (s) print $0} /<pre>/{s++}' \
+ "${X}.html" > "${X}" || die 'awk failed'
+ rm -f -- "${X}.html"
+ done
+}
+
+multilib_src_configure() {
+ econf \
+ --enable-shared \
+ $(use_with gif giflib) \
+ $(use_with jpeg) \
+ $(use_with jpeg2k libopenjpeg) \
+ $(use_with png libpng) \
+ $(use_with tiff libtiff) \
+ $(use_with webp libwebp) \
+ $(use_with zlib) \
+ $(use_enable static-libs static) \
+ $(multilib_native_use_enable utils programs)
+}
+
+multilib_src_test() {
+ default
+
+ # ${TMPDIR} is not respected. It used to be but it lead to issues
+ # and there have been long debates with upstream about it. :(
+ rm -rf /tmp/lept/ || die
+}
+
+multilib_src_install_all() {
+ # libtool archives covered by pkg-config.
+ find "${D}" -name "*.la" -delete || die
+}
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index cb1c40b707e1..775a7166cc9d 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,4 +1,4 @@
DIST libepoxy-1.5.3.tar.gz 326768 BLAKE2B 053665429a249adca4c9b3d57797949e3a0ffd0ed3f1c66cb8becfb884431e44a4cccb6b2fd3788a86ee01268ebad3cc36e67e391d2aa5cdea28837a162be9ad SHA512 e831f4f918f08fd5f799501efc0e23b8d404478651634f5e7b35f8ebcc29d91abc447ab20da062dde5be75e18cb39ffea708688e6534f7ab257b949f9c53ddc8
-EBUILD libepoxy-1.5.3.ebuild 1241 BLAKE2B 89fc34cab08023de4d5cea3b0561894594e6996f5a2d5999f9403419790b1880188c533e815156207283d4fca65bb5a5b302b9cb8aea216aac8636a1b4effd33 SHA512 18b92ddc638a38160a23e9c6ca812d8d0955b8e1444d60557918e8c30f74ef7c122c6ca0f07243f39d923979da2728c0f432ac3c6d5f796385c656f1d75108fb
+EBUILD libepoxy-1.5.3.ebuild 1240 BLAKE2B 3bc839d59f24b38b6687c434063ed0310dc4a28fe2cbd59aba855e6c5c7d68295182bc81977f2295f7d33ea970cd75da0075cbd3f7bf40dcc033b89bedad0aed SHA512 fedd447799c36d5004e799eaaa898d164d9640b42b808e24f464b963e8830077ade12979d24b43fa623dbeb9bdef194a41e4eaa616a946b05410937dfc2a18db
EBUILD libepoxy-9999.ebuild 1250 BLAKE2B 7566df5582dca287763302ad9ecf95810cc803eba09108a699a5739076b883f29ba26086fed4760a89147ae337e3a3181f1781bcdd885547b7a2295d6435c0ce SHA512 0c090d202ee0f329ffdc2b1a7e69eb2d46b559d88046ff88c6bf898d1e260898e9089a3228afa079e611377f78aa4afc25ba3aebf498bd7dea5afd3e5c375cc3
MISC metadata.xml 314 BLAKE2B ff8d671379855f61b90688f26772026f83f00d3e303bcf1fc7e851c9a2e6f410beb7c9dbd115f57d8613df8ffc043b2994cbc1a134eefd160888a0ac21cac154 SHA512 5d63de65f850f14f37ed4998a3d7f7686dcd999fd6f13be9c528be6423940684e709d08042ba5cbeccad2a38f3752df2580913cdbdfbc569f576cc958cf3bc73
diff --git a/media-libs/libepoxy/libepoxy-1.5.3.ebuild b/media-libs/libepoxy/libepoxy-1.5.3.ebuild
index cd5c46ee584a..163ae56825aa 100644
--- a/media-libs/libepoxy/libepoxy-1.5.3.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.3.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
@@ -18,7 +18,7 @@ HOMEPAGE="https://github.com/anholt/libepoxy"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
+ KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 sparc x86 ~amd64-fbsd"
SRC_URI="https://github.com/anholt/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
fi
diff --git a/media-libs/libexif/Manifest b/media-libs/libexif/Manifest
index fa923e007710..005ee4bc24d2 100644
--- a/media-libs/libexif/Manifest
+++ b/media-libs/libexif/Manifest
@@ -1,5 +1,5 @@
AUX libexif-0.6.13-pkgconfig.patch 255 BLAKE2B 397c0e88f951628e697cdd749936b3e4e676bccac2fb2bff2553b12d5978f03719175b9d25fa66bc06dd459e0f6671af48276d449de9b029202dfe7a3622fc85 SHA512 859c6b5bf179f315184f5f34a986761f113786792ff2e13461cf64ccf394dd2d7bd97215db0651d52819533cb918652d7eae9f18b2a913dd9ccf390cdf3adb65
AUX libexif-0.6.21-CVE-2017-7544.patch 1060 BLAKE2B 130b95e5f4f44402385bb6825e8728ad32b328dfe621957edcada1da351d8aa01f221c7de2bcc6242166a65a1edeef2e3babb1735909bc7d59594d379d5e325b SHA512 d529c6c5bd26dc21c0946702574184e1f61c2bfd4fb95b41e314f486a0dd55571963ff2cad566d2fb0804de3c0799bcd956c15a3dc10a520ce207728edad4e2d
DIST libexif-0.6.21.tar.bz2 1368435 BLAKE2B 151e3ddcdd45759fd70be91db27511f48a9b7d5de72c8af510e5a231e2f053f8b5d62d1269a1206e419461b07fb723788492604f1f1142edcb5ab7a0876dd307 SHA512 4e0fe2abe85d1c95b41cb3abe1f6333dc3a9eb69dba106a674a78d74a4d5b9c5a19647118fa1cc2d72b98a29853394f1519eda9e2889eb28d3be26b21c7cfc35
-EBUILD libexif-0.6.21-r2.ebuild 1274 BLAKE2B e6fa22fbb705c7c8492c2c37287f81fbbd3fb3b481cfea9ba3857baa87460aac925800b508b0e5bbef7705da38708aaf9b06666266ec400c19f1e5f2fb06f3de SHA512 1998120c410e70ca42a20fb998bc2db4e931270ae18ef171c4c2df6c9941f08c1eaaca69cff83ea4a1ddcd5dde3e98001a415dd0514ec25ef0502fa116631937
+EBUILD libexif-0.6.21-r2.ebuild 1270 BLAKE2B f8753e55e91ca4e35e390c326c14945a288b81dcb717476594d6299f126455de5fc5e3f1095b340140ecea93453dffff37fdf6f4061d658d28774d67de00ec65 SHA512 f1a6e41ea987e51f36e70e4078deddcbedc28c7c8931c0b8ce6e5e68fc8411a8f23319c05e6dc178d1799990ea42d223ab587452d4329445ab1605fc47ed34f6
MISC metadata.xml 336 BLAKE2B 7f77063db7c0cf51903da446071dff6d4dccf66e552dd1229f01b79ab7716d02adcb146f755971d0fe96c2a04bacbd082f606c4023e6e98f9c502a3f8eda7416 SHA512 8a6e3d7c973692a37f57ce34136c863e6ad14efd064c42ea0be6c14d93beec3c7ae36ed44afd6d2454ab29f4cb633c097a0c3b2ea5c019bf06df4f306dbfced0
diff --git a/media-libs/libexif/libexif-0.6.21-r2.ebuild b/media-libs/libexif/libexif-0.6.21-r2.ebuild
index 46483967018b..6295d63c4a05 100644
--- a/media-libs/libexif/libexif-0.6.21-r2.ebuild
+++ b/media-libs/libexif/libexif-0.6.21-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=7
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-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"
+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"
IUSE="doc nls static-libs"
RDEPEND="nls? ( virtual/libintl )"
diff --git a/media-libs/libextractor/Manifest b/media-libs/libextractor/Manifest
index 4fb1a53af760..3419c4f52b7e 100644
--- a/media-libs/libextractor/Manifest
+++ b/media-libs/libextractor/Manifest
@@ -1,8 +1,6 @@
AUX libextractor-1.8-CVE-2018-20430.patch 1405 BLAKE2B be8819430f6a608fe90a16f928d041399932202feb0e0c39885ed197e2f33728bfbaa05257e0b8dbab06866b9d03f413eff2d539e09d3be58135074fbbe3e167 SHA512 c2a4ef23dc856c03c885631be27f108337aa5e4d74f8aa1d4010ad9959694ae8d30896102b6c4067dc6ac3719177d4a7e453ef84c54bad37c5f988990f39be12
AUX libextractor-1.8-CVE-2018-20431.patch 998 BLAKE2B 44e77c7f53c8ea2b134af14aa0810eb3b2ad1abfd689d1261de4bebd4586b9dd6c7c49f3b51f9d01c0bb6cc5c5bf224f668ed689db1b81fe71a8c144502a309d SHA512 3754ce52998329b70e7220efcdf855ac795010b145278c35c86ae558a50533854c06ad83c8f2b1a3e466a1649ce6a293afbbcbe7fded560cd319158387b1296b
AUX libextractor-1.8-exiv2-0.27.patch 3364 BLAKE2B da55735ccab9a3cf868f274b82951cf548a2f1340ee24c180244f8ba2bbd85c7002c963d06257aac0b0457c2afeda755d0aaacb501280b995001f7bbd49d6de9 SHA512 6411df1498fd3594088b3488e490b25009e9243684b777d35fa26189c20f410b42496b5fb42f762c468df746a9bdcd6a310f645db5ab0bbe3bd121e82aa9d48c
-DIST libextractor-1.7.tar.gz 8075299 BLAKE2B ce738f8839dded4065f8f8d4241c8ad525930f852492605af75c7031b5204c09763c2d4c7a84df6e062512e66509fa308163bcbfd5b655e071c8e43d4fe48f07 SHA512 00340af0987f58c16824f50a18484e76f110fa2b4a43788b950ea4313e6916b94d5e7f16e1f21c8a54509885d9b44dabdc5be7727547549836ddd8ca7251dbff
DIST libextractor-1.8.tar.gz 8315688 BLAKE2B 2c617cfa667f79faef33e5f445f8d1f38dac61a7d1abd064165f0171b2fcdd812b42f1a5ee78def075383ab74b686f5de6864ce9b9a1983262a3d251ea271dc0 SHA512 770a0f1711964657ffb570c0509996b0a109886bfa0652c3a9ca63aa645f495fe5919215cf17da68e8a81a09de54bc937b61c82ec03c9e3998149c780f93451a
-EBUILD libextractor-1.7.ebuild 2752 BLAKE2B 625f3cbb18a025d416c76b2ac4994a4e7ac9ee16b52529c504b00ed6c192b250e128ce0c73fb7e5f5e7d3fff6b24449fa36dd897318d385ed676de9eabf4e12f SHA512 94fbdaae39caabcbd262176f009a7aceac356749b9cd5633f7baecd85b6baaa6017a19a57ee3976d9824d6ba8aed6c5d4fe82fdd99c48b2f388665592ab12232
-EBUILD libextractor-1.8-r1.ebuild 2839 BLAKE2B c65d6023cb795e47182f015fe429dafa6254dcfaabb55404f332626b9fa71ed90421021a1e99df97dd2c8eb6213268697e27bca83b2e9427008710298225da42 SHA512 03571aa84b9747eb139cb5ed55452ae04c3ac9b71eb4354a76a843957b6507a310947a93ffdffe0e1c854e4b82ad5550a44b4a545e4ac27df6765090c345f42a
+EBUILD libextractor-1.8-r1.ebuild 2838 BLAKE2B c3d9688ded6bb3803d3e06d1ba82959e9965b2ff488cebd0c7314428bb042514bddb88c1911170c31faef4e1b7434903e891d57692d7a80af1b92aa1739785de SHA512 fd100d837c2f31f3e87607d9216a05537edaf1f095f83b3948b980bea18e0b80b4bbc4b2477231fa6c012280b0ce6a2e4655dd2ad8be1c5c67de4bb08a93e3b2
MISC metadata.xml 615 BLAKE2B eac56c7364e331eb2a0f0955318cfb0cf7c6fe4a95493899b489f755d18b4c4b1ced0e7f7ea0a7716c996ac7640d04a326cbd2230313e123c4b2de4fefbaccba SHA512 b4a4403dfccc02e61fa15f60a19ed23ce43374cc41d616ebbe385865618ae9392bd663fbdbdf01013f4203de2ee51dcbe1caf0974d720dac1be1f4ea029b4fc0
diff --git a/media-libs/libextractor/libextractor-1.7.ebuild b/media-libs/libextractor/libextractor-1.7.ebuild
deleted file mode 100644
index 02ba88e54be6..000000000000
--- a/media-libs/libextractor/libextractor-1.7.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Library to extract metadata from files of arbitrary type"
-HOMEPAGE="https://www.gnu.org/software/libextractor/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ppc64 x86"
-IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
-
-RESTRICT="test"
-
-DEPEND="
- app-text/iso-codes
- dev-libs/glib:2
- media-gfx/exiv2:=
- sys-devel/libtool
- virtual/libiconv
- virtual/libintl
- apparmor? ( sys-libs/libapparmor )
- archive? ( app-arch/libarchive:= )
- bzip2? ( app-arch/bzip2 )
- ffmpeg? ( virtual/ffmpeg )
- flac? (
- media-libs/flac
- media-libs/libogg
- )
- gif? ( media-libs/giflib:= )
- gsf? ( gnome-extra/libgsf:= )
- gstreamer? (
- media-libs/gstreamer:1.0
- media-libs/gst-plugins-base:1.0
- )
- gtk? ( x11-libs/gtk+:3 )
- jpeg? ( virtual/jpeg:0 )
- magic? ( sys-apps/file )
- midi? ( media-libs/libsmf )
- mp4? ( media-libs/libmp4v2:0 )
- mpeg? ( media-libs/libmpeg2 )
- tidy? ( app-text/htmltidy )
- tiff? ( media-libs/tiff:0 )
- vorbis? (
- media-libs/libogg
- media-libs/libvorbis
- )
- zlib? ( sys-libs/zlib )
-"
-BDEPEND="
- sys-devel/gettext
- virtual/pkgconfig
-"
-# test? ( app-forensics/zzuf )
-RDEPEND="${DEPEND}
- !sci-biology/glimmer
-"
-
-src_prepare() {
- default
-
- # m4/ax_create_pkgconfig_info.m4 is passing environment LDFLAGS to Libs:
- sed -i \
- -e '/^ax_create_pkgconfig_ldflags=/s:$LDFLAGS ::' \
- -e 's:tidy/tidy.h:tidy.h:' \
- -e 's:tidy/tidybuffio.h:buffio.h:' \
- configure src/plugins/html_extractor.c || die
-
- if ! use tidy; then
- sed -i -e 's:tidy.h:dIsAbLe&:' configure || die
- fi
-}
-
-src_configure() {
- e_ac_cv() {
- export ac_cv_"$@"
- }
-
- e_ac_cv {lib_rpm_rpmReadPackageFile,prog_HAVE_ZZUF}=no
-
- e_ac_cv header_FLAC_all_h=$(usex flac)
- e_ac_cv lib_FLAC_FLAC__stream_decoder_init_stream=$(usex flac)
- e_ac_cv lib_FLAC_FLAC__stream_decoder_init_ogg_stream=$(usex flac)
-
- e_ac_cv header_sys_apparmor_h=$(usex apparmor)
- e_ac_cv header_archive_h=$(usex archive)
- e_ac_cv header_bzlib_h=$(usex bzip2)
- e_ac_cv header_gif_lib_h=$(usex gif)
- e_ac_cv header_jpeglib_h=$(usex jpeg)
- e_ac_cv header_magic_h=$(usex magic)
- e_ac_cv header_mpeg2dec_mpeg2_h=$(usex mpeg)
- e_ac_cv header_tiffio_h=$(usex tiff)
- e_ac_cv header_vorbis_vorbisfile_h=$(usex vorbis)
- e_ac_cv header_zlib_h=$(usex zlib)
- e_ac_cv lib_mp4v2_MP4ReadProvider=$(usex mp4)
- e_ac_cv lib_smf_smf_load_from_memory=$(usex midi)
-
- econf \
- --disable-static \
- --enable-experimental \
- --enable-glib \
- --disable-gsf-gnome \
- $(use_enable ffmpeg) \
- $(use_enable gsf) \
- $(use_with gstreamer)
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libextractor/libextractor-1.8-r1.ebuild b/media-libs/libextractor/libextractor-1.8-r1.ebuild
index 7a2375985adb..ef7838245be5 100644
--- a/media-libs/libextractor/libextractor-1.8-r1.ebuild
+++ b/media-libs/libextractor/libextractor-1.8-r1.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ppc ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
IUSE="apparmor +archive +bzip2 ffmpeg flac gif gsf gstreamer gtk jpeg +magic midi mp4 mpeg tidy tiff vorbis +zlib" # test
RESTRICT="test"
diff --git a/media-libs/libgphoto2/Manifest b/media-libs/libgphoto2/Manifest
index fdde75373675..cfe2cc56f517 100644
--- a/media-libs/libgphoto2/Manifest
+++ b/media-libs/libgphoto2/Manifest
@@ -1,7 +1,5 @@
-DIST libgphoto2-2.5.14.tar.bz2 6992238 BLAKE2B 6173ada55f032ae2b630db5324c87ad9bebb3fda485fe9bc89a042d192a136a73596a92b1df3c762ffd7168cf91ca12f1fa2998e154152eb19cfd9b780ee2b2d SHA512 6dd75700e2b2afdf87f7eab4c62fbbe2c42f9154d644edfae25e3d5fbe5ed0894be832cc1367933fc6c113a1cc379d1956fecf108d6ee240935b9d7e2f614688
DIST libgphoto2-2.5.16.tar.bz2 7006551 BLAKE2B 79082e691d4d9061cc35c35cabd7d0d16407764df43f8abbc7ff80f7a2b734da78a2a74a17ec2e014d9050c75235c700f3de90b61ca9fb0d68fdcc7dde64269e SHA512 7863192c2959ffc8d771eca294adc54090192e3207cf8d3a9bf143e50034c3f1248e7fe41cad75f758ab2ad09c9258d50967b921adf3223d7c74370faa110a9e
DIST libgphoto2-2.5.20.tar.bz2 7290524 BLAKE2B 0b616863fa74430f16d96a37955f655620a88fb2df2220fbe9337eb0f61b7babd9d36e1f1d58f45ca617c57feab93e9714228eae54c742385c3e4b0fc3667ff5 SHA512 13364a8fdfe137a21ebf04dfd2b30b20c7fb652e11e1b98cd06176e9a1576ef8f67121523111395100ed39d1d3e6e5d6d458b86d58502f7056a1c06a5623640a
-EBUILD libgphoto2-2.5.14.ebuild 6227 BLAKE2B 8190fdd390cd567388bf0648ce593e50c38778f5006a096bb0f8bcec061b9f1c7b7c7d369dffebb0bb98229c1c588c592f8d9ba2948c81de1b0efb97ed28b037 SHA512 361a169bc125a3833c2c6f795c908a7c3cce8ecc21d3961d4a8e556048be3d588b5776134900bd16eeaaeae032966fc4b20f55f1c3c5d289ced3c7029af391d3
-EBUILD libgphoto2-2.5.16.ebuild 6225 BLAKE2B 84fea70c074baf5e3327ae394b2d63e9198fb7782f5e07a1a7b4cbcd5b38dd7b24f69359665971e6799271bbd65396af6c772eb6bf3847c81ad4c1e4fbc56c37 SHA512 b5ef7e46b153fc0626cfd7623e3d95b721315776be4a26c5e52b4f59fd095ba61b4af16701e1825676509e1f9eccd65a4a19ded9b1f0440ee8c382c9a290f8db
+EBUILD libgphoto2-2.5.16.ebuild 6224 BLAKE2B 1476fe208ddb0d72622e532722173f743aad470b19bf2e7bfc6d0fbd3dfcbe0da994f15297a79f95d457e7d5d48f676cb1a265b75ae5a555554273ca5e2f2bc5 SHA512 4129d67158d3f443a407e979d11fbe563b7c759e5c742e1f6fec79edbadc085e482e54e5c6152ab45e7998149ac4dc8b2c73dd29d697b5d384428403c7924dc3
EBUILD libgphoto2-2.5.20.ebuild 6233 BLAKE2B c87d500b7401ccf5d140eb5fc42deb98a2d6a96d6d4c0c0b777620c03183fb424d82221ce5307574344ed369f155d6aa53cb7c70016a5c69f28176f15cc0ddb9 SHA512 8aa7c58e779b1a4bc548ef2400f707c9e5aca4954232279e6435c79f44f357df8dbee6da906a0f57d806d79a2727cd7a208109ced955d0184ad5b533566165da
MISC metadata.xml 520 BLAKE2B 113ca8821b8ba1d594d64f86facadebf238372742380ce99c6f3172712873d1ebb3d0bf32eb072d7af1771f6099f5bde84114d6e45468a0d33503fbbe393a19b SHA512 905b25e683f85a23323e1205c0492e3b955e11f9d93a9c9c360108ecdd3608fa2f9f4c2572444c0a4be0df3f5e350dd13ca4ebb5ca523c0fd70fed3f40e39ed0
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
deleted file mode 100644
index 85c31936976e..000000000000
--- a/media-libs/libgphoto2/libgphoto2-2.5.14.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO
-# 1. Track upstream bug --disable-docs does not work.
-# https://sourceforge.net/p/gphoto/bugs/643/
-
-EAPI=6
-inherit eutils multilib multilib-minimal udev user
-
-DESCRIPTION="Library that implements support for numerous digital cameras"
-HOMEPAGE="http://www.gphoto.org/"
-SRC_URI="mirror://sourceforge/gphoto/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-
-# FIXME: should we also bump for libgphoto2_port.so soname version?
-SLOT="0/6" # libgphoto2.so soname version
-
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
-IUSE="doc examples exif gd jpeg nls serial"
-
-# By default, drivers for all supported cameras will be compiled.
-# If you want to only compile for specific camera(s), set CAMERAS
-# environment to a space-separated list (no commas) of drivers that
-# you want to build.
-IUSE_CAMERAS="
- adc65 agfa_cl20 aox ax203
- barbie
- canon casio_qv clicksmart310
- digigr8 digita dimagev dimera3500 directory
- enigma13
- fuji
- gsmart300
- hp215
- iclick
- jamcam jd11 jl2005a jl2005c
- kodak_dc120 kodak_dc210 kodak_dc240 kodak_dc3200 kodak_ez200 konica konica_qm150
- largan lg_gsm
- mars mustek
- panasonic_coolshot panasonic_l859 panasonic_dc1000 panasonic_dc1580 pccam300 pccam600 pentax polaroid_pdc320 polaroid_pdc640 polaroid_pdc700 ptp2
- ricoh ricoh_g3
- samsung sierra sipix_blink2 sipix_web2 smal sonix sony_dscf1 sony_dscf55 soundvision spca50x sq905 st2205 stv0674 stv0680 sx330z
- toshiba_pdrm11 topfield tp6801
-"
-
-for camera in ${IUSE_CAMERAS}; do
- IUSE="${IUSE} +cameras_${camera}"
-done
-
-# libgphoto2 actually links to libltdl
-RDEPEND="
- >=dev-libs/libxml2-2.9.1-r4:2[${MULTILIB_USEDEP}]
- dev-libs/libltdl:0[${MULTILIB_USEDEP}]
- >=virtual/libusb-1-r1:1[${MULTILIB_USEDEP}]
- cameras_ax203? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
- cameras_st2205? ( >=media-libs/gd-2.0.35-r4:=[${MULTILIB_USEDEP}] )
- exif? ( >=media-libs/libexif-0.6.21-r1:=[${MULTILIB_USEDEP}] )
- gd? ( >=media-libs/gd-2.0.35-r4:=[jpeg=,${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0[${MULTILIB_USEDEP}] )
- serial? ( >=dev-libs/lockdev-1.0.3.1.2-r2[${MULTILIB_USEDEP}] )
- !<sys-fs/udev-201
-"
-DEPEND="${RDEPEND}
- dev-util/gtk-doc-am
- sys-devel/flex
- >=sys-devel/gettext-0.14.1
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}]
- doc? ( app-doc/doxygen )
-"
-
-MULTILIB_CHOST_TOOLS=(
- /usr/bin/gphoto2-port-config
- /usr/bin/gphoto2-config
-)
-
-pkg_pretend() {
- if ! echo "${USE}" | grep "cameras_" > /dev/null 2>&1; then
- einfo "No camera drivers will be built since you did not specify any."
- fi
-}
-
-pkg_setup() {
- enewgroup plugdev
-}
-
-src_prepare() {
- default
-
- # Handle examples ourselves
- sed 's/^\(SUBDIRS =.*\)examples\(.*\)$/\1\2/' -i Makefile.am Makefile.in \
- || die "examples sed failed"
-
- sed -e 's/sleep 2//' -i configure || die
-}
-
-multilib_src_configure() {
- local myconf
- use doc || myconf=( ac_cv_path_DOXYGEN=false )
-
- # Upstream doesn't default to --enable-option-checking due having another
- # configure in libgphoto2_port/ that also needs to be checked on every bump
- #
- # Serial port uses either lockdev or ttylock, but we don't have ttylock
- # --with-doc-dir needed to prevent duplicate docs installation, bug #586842
- ECONF_SOURCE=${S} \
- econf \
- --with-doc-dir="${EPREFIX}"/usr/share/doc/${PF} \
- --disable-docs \
- --disable-gp2ddb \
- $(use_enable nls) \
- $(use_with exif libexif auto) \
- $(use_with gd) \
- $(use_with jpeg) \
- $(use_enable serial) \
- $(use_enable serial lockdev) \
- --with-libusb=no \
- --with-libusb-1.0=auto \
- --disable-ttylock \
- --with-camlibs=${cameras} \
- --with-hotplug-doc-dir="${EPREFIX}"/usr/share/doc/${PF}/hotplug \
- --with-rpmbuild=$(type -P true) \
- udevscriptdir="$(get_udevdir)" \
- "${myconf[@]}"
-}
-
-src_configure() {
- local cameras
- local cam
- local cam_warn=no
- for cam in ${IUSE_CAMERAS} ; do
- if use "cameras_${cam}"; then
- cameras="${cameras},${cam}"
- else
- cam_warn=yes
- fi
- done
-
- if [ "${cam_warn}" = "yes" ]; then
- [ -z "${cameras}" ] || cameras="${cameras:1}"
- einfo "Enabled camera drivers: ${cameras:-none}"
- einfo "Upstream will not support you if you do not compile all camera drivers first"
- else
- cameras="all"
- einfo "Enabled camera drivers: all"
- fi
-
- multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
- default
-
- if multilib_is_native_abi && use doc; then
- doxygen doc/Doxyfile || die "Documentation generation failed"
- fi
-}
-
-multilib_src_install_all() {
- prune_libtool_files --modules
-
- einstalldocs
- dodoc TESTERS MAINTAINERS HACKING
-
- if use examples; then
- insinto /usr/share/doc/${PF}/examples
- doins examples/README examples/*.c examples/*.h
- fi
-
- # FIXME: fixup autoconf bug #????
- if ! use doc && [ -d "${ED}/usr/share/doc/${PF}/apidocs.html" ]; then
- rm -fr "${ED}/usr/share/doc/${PF}/apidocs.html"
- fi
- # end fixup
-
- local udev_rules cam_list
- udev_rules="$(get_udevdir)/rules.d/70-libgphoto2.rules"
- cam_list="/usr/$(get_libdir)/libgphoto2/print-camera-list"
-
- if [ -x "${ED}"${cam_list} ]; then
- # Let print-camera-list find libgphoto2.so
- export LD_LIBRARY_PATH="${ED}/usr/$(get_libdir)"
- # Let libgphoto2 find its camera-modules
- export CAMLIBS="${ED}/usr/$(get_libdir)/libgphoto2/${PV}"
-
- einfo "Generating UDEV-rules ..."
- mkdir -p "${ED}"/${udev_rules%/*}
- echo -e "# do not edit this file, it will be overwritten on update\n#" \
- > "${ED}"/${udev_rules}
- "${ED}"${cam_list} udev-rules version 201 group plugdev >> "${ED}"/${udev_rules} \
- || die "failed to create udev-rules"
- else
- eerror "Unable to find print-camera-list"
- eerror "and therefore unable to generate hotplug usermap."
- eerror "You will have to manually generate it by running:"
- eerror " ${cam_list} udev-rules version 201 group plugdev > ${udev_rules}"
- fi
-
-}
-
-pkg_postinst() {
- if ! has_version "sys-auth/consolekit[acl]" && ! has_version "sys-apps/systemd[acl]" && ! has_version "sys-auth/elogind[acl]" ; then
- elog "Don't forget to add yourself to the plugdev group "
- elog "if you want to be able to access your camera."
- fi
-
- local old_udev_rules="${EROOT}"etc/udev/rules.d/99-libgphoto2.rules
- if [[ -f ${old_udev_rules} ]]; then
- rm -f "${old_udev_rules}"
- fi
-}
diff --git a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild b/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
index 82b2906c70cd..2575e4781e8c 100644
--- a/media-libs/libgphoto2/libgphoto2-2.5.16.ebuild
+++ b/media-libs/libgphoto2/libgphoto2-2.5.16.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
# TODO
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
# FIXME: should we also bump for libgphoto2_port.so soname version?
SLOT="0/6" # libgphoto2.so soname version
-KEYWORDS="alpha amd64 arm ~arm64 ~hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ppc ppc64 sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="doc examples exif gd jpeg nls serial"
# By default, drivers for all supported cameras will be compiled.
diff --git a/media-libs/libldac/Manifest b/media-libs/libldac/Manifest
index 0bb82658896f..214f1d57c93d 100644
--- a/media-libs/libldac/Manifest
+++ b/media-libs/libldac/Manifest
@@ -1,3 +1,3 @@
DIST libldac-2.0.2-1.1.tar.gz 282323 BLAKE2B f8e4a05130b47e4c46070c3a9f0a085451bf480e3d90579342f66edeb77df665c89bf1c81d65d5366e704c5396335de8263ebd6ac1e1d1350714acb3775511e9 SHA512 f1aedb3edc0421b7a9d49a9d2e347d8ab19d54e37f0e77b3673f92413eaccdbbacb678e2e89a23016b22c768156148a82b7fc996bebc3a4cd4451ffb606dba3e
-EBUILD libldac-2.0.2-r1.ebuild 670 BLAKE2B 7dad2e22f54acfbf8c3b856df0cd0741df9b5ead8a07a89ca030c469cca4196cb42240ed39feb88b5e8f603806c57f77cc2832425a91dd86dbfa327a836fba64 SHA512 dbc94c8d0b043ece01cc330ca764b7806ba8a7b6d56c4d00a37b8ecf1424a55581abfc0af76c7847701e8152a9e3f6c96bd27f321bcca6197de05fa5d49cf65d
+EBUILD libldac-2.0.2-r1.ebuild 758 BLAKE2B 0feb4f0096abbf04876bd5861fac0431e439ca4cba4fdd782221f83e4acd7e5a4f5f39a324da8403accbdad03a6b19022269a510cf4436464fd41aafd28148c5 SHA512 f583b9371b852bcc98bcc93226f3ab2647703d76e6ea1634ae829a082da097067c37201ba88009288ae950f76ac9011b8c23c7c0b7e82e10f1d30768c8e4c50b
MISC metadata.xml 212 BLAKE2B cc81de7077d569b2a0afc40390d2be47ddc84045da2c51b7a2e19fca5a5f28548ec0bbc2010b6936d5ab5c96442011ddd0833b7b594df2c2cf9abab99d99a3ed SHA512 1d2f2ca333bf8a1aba058691921bf03d664a0d4c213c4435a068893b2e50a6e86c01e07a17819600eaee93b72d9deff052fc12b10ee3ae8437e13eb17a40bc08
diff --git a/media-libs/libldac/libldac-2.0.2-r1.ebuild b/media-libs/libldac/libldac-2.0.2-r1.ebuild
index 4efcbfb5ef43..b7c2e612d12e 100644
--- a/media-libs/libldac/libldac-2.0.2-r1.ebuild
+++ b/media-libs/libldac/libldac-2.0.2-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/EHfive/ldacBT/releases/download/${PACKAGING_VERSION}
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sh ~sparc x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
IUSE=""
DEPEND=""
diff --git a/media-libs/liblscp/Manifest b/media-libs/liblscp/Manifest
index c2e12a65d972..93531ec08a34 100644
--- a/media-libs/liblscp/Manifest
+++ b/media-libs/liblscp/Manifest
@@ -1,5 +1,5 @@
DIST liblscp-0.5.8.tar.gz 670237 BLAKE2B 376fcb10b7762fe9dfc5b7bcb69abd63c1e92f5030925c2f7b1bb63b63ba8b7763141c4edf68ea9a1bfa1a89af73e405c43a0d7de68ec74675a9b23fa70a86cb SHA512 e6cdd029d34aa71d4f025725f07ec3f61ecb772ddda18c6050fa2d6603541b3b1e421ce9ebef6e5f69dcbbcf54fa9b14eada0b95ef0591af16d1fc38ef44e29a
DIST liblscp-0.6.0.tar.gz 670650 BLAKE2B 0cb825743fac7b328c32844f834d59e6622fcb9d860e9a13732d5548ce1f6bd0136928ea5be9b1de0a2811878c38b2e714823973c7a340d99de4735d6c46f637 SHA512 64c5cb51ac7821d65a8769415deb68cefa24684e1d4fa592a68c7e45cf2af02ffa41a2f2300ffc98a6d1d6d880279aa1b61499ac0fe59177c60fc0a2075ada15
EBUILD liblscp-0.5.8-r1.ebuild 500 BLAKE2B a2f5c17a6d8b5233377699e6a595f7316d0d80e7d855062277581cc641b8021c300452dae59fb2335b2b394ed068bac5bc15eec81c2471502e2fa6dc03ef23b4 SHA512 c063de31a1a43ed992b9696f44f1becdf4016cf1ea2031122e39474df6660d354386ec6e9207938f2257fa14e1a99fc5cecc331dd97c06f25576f05dd1992a67
-EBUILD liblscp-0.6.0.ebuild 588 BLAKE2B 6bbe2728f0e94764502250c0789ff758e3385e8c1cc6ac7d20bfc2840934f3f1b92db5de32bfdec561da1538daee35c01cf3a5b9c17243235a983c375dfe20cd SHA512 5bcdb9d41701a33724738e723a6b9b3783a7861e2fd9d9df9127b7354195f1a5297612ad712afa57f3de923c6accd426eab586a346ed0c772d8406ac4ae1d5fc
+EBUILD liblscp-0.6.0.ebuild 586 BLAKE2B e3299ff0820b51bdfdef112702dbc72acba12370df85fa74f278dadaea50a75474980de4eb3d57759c47208a8ff1f6618d58eb77f940a5e4d70287f681b0642c SHA512 f4ade6a4ea2b72a6bc0c537088633ca8c188dcdc0e3f4a2c5892a39d82d9442b70f543d2bfb5e4a1c1e2edb14559073227e1214426bed87ff1f70bccb6a55705
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/liblscp/liblscp-0.6.0.ebuild b/media-libs/liblscp/liblscp-0.6.0.ebuild
index 58e1f488e96e..6ae6106ea6da 100644
--- a/media-libs/liblscp/liblscp-0.6.0.ebuild
+++ b/media-libs/liblscp/liblscp-0.6.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=7
@@ -9,7 +9,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.gz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc"
DEPEND="doc? ( app-doc/doxygen )"
diff --git a/media-libs/libpng/Manifest b/media-libs/libpng/Manifest
index c6f15d91ae14..bfd9456eac13 100644
--- a/media-libs/libpng/Manifest
+++ b/media-libs/libpng/Manifest
@@ -1,15 +1,12 @@
DIST libpng-1.2.59.tar.xz 657424 BLAKE2B a64a8e5c914a20b1f16a219b508b06d12ff28903083792cf07dae841ad13b3636b9d715d9bbfc459a134dfdf2a9b37bac1fbcff14a91c214340325ba8266431e SHA512 bfdc51eca72a76697f1396611a08aa4ce6a169837197699c55d845fdef17850e8f7665b7b81ba815c277453737f12eeb41409ff9c7eca1ac0c0d134c44492a6e
DIST libpng-1.5.30-apng.patch.gz 10272 BLAKE2B 335b99e30a476b358483b0ca44d895580bddad05d18ab7f47b4cfa383a04c53c1db7d5773919445c281b0b0921485b946cb67c36db07aad494f051d4db19e4e1 SHA512 1c06e2e1b2420580d4399b7b752df9ed193c81febcc9983351fc72ce3900dc43a433780e7a0184b612b7723d8870a514db7398ec0c081dabe6cb4ea824880236
DIST libpng-1.5.30.tar.xz 756992 BLAKE2B 02813c7cf06e61d429fe963ae2c1e68bfb390b8eeea52147f582729b4a86c73055c2c79eb3d0b533587dd5a16dc0abf7afd986794c01ec59ae0a7dfe3333a989 SHA512 8716c6720c1ddbb38f439df42dbb472d37490fd207efe59bd872ce9adec7359025dc84544efddd19c8e339ecc28389a746e6987ff41ac6e76915c1e1d2c6f20d
-DIST libpng-1.6.34-apng.patch.gz 10411 BLAKE2B 4f6a5f7c2dcdc47e88a4687063958b18ae29c6f5168a339aa1f47abd8859126ea6d658ebc6645a8163b4127a5c0237f4b858fd0979781147fdd5fd23c0bb1098 SHA512 d4088399d2e9a2e2e40d5bd5dfb478dbd11c7065600287734aee7b3bf13a9574d17d3890e705c82705275fd0c11848155fbf960acd2e8eb890a7656b4140340c
-DIST libpng-1.6.34.tar.xz 997968 BLAKE2B 4cd0c46d11097cdeb0e419f1363cb9632ceaf56729a2d11e78361292568dce5c33f8fd24c56a5c5a007f419b8bc14fdaecff6db05ac2acea51b2374a1f57b848 SHA512 89407c5abc1623faaa3992fc1e4a62def671d9a7401108dfceee895d5f16fe7030090bea89b34a36d377d8e6a5d40046886991f663ce075d1a2d31bf9eaf3c51
DIST libpng-1.6.35-apng.patch.gz 10396 BLAKE2B 5f69db106909f690f3fc96dc14db3c7281c3abb0ea9cd119fcf0cb6584eb1eb5f244d57e4ec7198614f3df5f9b302c0de2b447ed0cbacaa7b15821c2e3c23cf7 SHA512 40cda24d003089c31786b70fd581cdd960f338ae89535646a2188bc8e25e603a6ad2080406017bd45edb298442a88dd60ada1ec650b001596d216e8194a3dda1
DIST libpng-1.6.35.tar.xz 1014320 BLAKE2B 2c1d8a4a1af8d5c67c8c18414fc1c32ad41b81e5300b3fe72c2bb89afece764087c7829308243e5eb24e7d685c56ba6c151b66ef64603528ac0406d89dd4cc4d SHA512 b69152bc7869e98536effa8e45e2dac7bffee26aa9e31fc90b37506a702256919bcf4dd9cadc42fa4e45143bc023ffd7c637742367e58707e8c2226b3a09eee0
DIST libpng-1.6.36-apng.patch.gz 10329 BLAKE2B 8c97da493a1eed697d8bbba96dea992b17360f5e4844b8d43c63a73684f09094d28d0032a8311e39f633c449674e7aec7bab0e923d9df8ff2a7e17caaccdef5d SHA512 1c82e2399dd6dea14955a4e8da8d3f50bbcee42676dda5d7abdd36f27d1228924b0107d0174258adeb2eec8ba74b267d8a778b72b72f6dcef176608d5ff7c912
DIST libpng-1.6.36.tar.xz 1012544 BLAKE2B 6b89e39e5a301e9e4d7fe93d97e4b8695a214b5b102cc1b21455baea2608b99003110f6f20beb3464e1cf62762a35917bdc07f31ba5aa041776601cc9651809c SHA512 a86ee977df69748e5039fb0ead883f1d3f88b8a701fa24cf8e62dd77c5871bb46397d794fa33ec1d0be1ac488246832ad79d0e6117ac093bdce1b2a1cfcb2bb0
EBUILD libpng-1.2.59.ebuild 873 BLAKE2B e19aeca3f3b0595193b7b6ae55d0c9d4f8aa63a4475d305f764870ffa45cf7adf2b18c9203794d4516b2acbe1f10b7a1856fd09203078ee922bc60aceb559a61 SHA512 8b178d6afd6588e14225260442d63082aec001ad187e6acc9a8192140b5e8dac321ac3ea18d36f2194c885120b3c5a71a6daaa1d020a270bb1cd5199f918321f
EBUILD libpng-1.5.30.ebuild 1644 BLAKE2B 059c2e421bc2955c6ebe7ca95b173f5e85e1fadd8721eb23d0964f786a5497751ee8c01de67370351e4a0b5ca99fda3dfe157d2489e194e145ed636134ef05b4 SHA512 64e8f007c376d46f9d7314b7d4bc322a9c25ca9e470f52fa607175f95e05e2c00f932a406daeab634710b0825a5a5714b4401d2e1285b3b23f0da1435142eebf
-EBUILD libpng-1.6.34.ebuild 1360 BLAKE2B 11d1403fff7fd1bba30a01824ec30a7753bcfefa033a06836d4002acd282af289b5ffe33e2b38e82f866043080671c965c605e46cc3ed059d3af9adbaf468a3a SHA512 666bb4b039a0c61289d9d2b37de6cfeabda2d44254b0a9a9d3c9a432abedf47371cf543ef9e5781dad8979b5fc77d83a26d36aa6ce15657230230e2307364256
-EBUILD libpng-1.6.35-r1.ebuild 1365 BLAKE2B af5ac1a2d6b23f8d719d10d40f261c6c4e1813a7397fcaecb42b2461d49c6090eb00268afb81e4a602e2826044e2b6c25a5c7db9404318c4f95dfdf7e7baca7f SHA512 a468177bff85f61a1373c508c0001e5a9746d46e17a1a29ea3bf17ec731598d6927c31e42878955ef15becf214e34e4d3258e139c870ec067e59196141f61841
+EBUILD libpng-1.6.35-r1.ebuild 1364 BLAKE2B faddeabf1a0aee8ee88b124800bec19063239e02e78eb159328df92bc2f2f85572ebe9e30a44283f9bbac831a7c1216b4d213c6bb6314813cc469bf2862ca45d SHA512 59f6e5f5761d3d6ebd7070e2e11d6d722522b1aa0daeba61facb045f9c6e420bba5f2e0187d89fb6d5cc4860653524665c02a4d69b06d6e20b52ac7f39fad251
EBUILD libpng-1.6.36.ebuild 1375 BLAKE2B 1e4df515db793d7fc7e7dbecb3a9b07c56a3214ce337573a9f91fd010ce20c52504d0d6367122418cfb2d21fea4f6f289036737b9fad3b52a6a0e1d6113f9788 SHA512 19f546997b31fbd6dbdf4fb4bc2cc113abda654d7c8a933e140acfd33f6627377e75bdfc7897fed5af3466a7c02ca8a63540643c7e1f8f7a655d5c1a06c03583
MISC metadata.xml 843 BLAKE2B e8736137db2c0e06193b3bbc9d933b1b8e2b8609d050a93a5369a8de81acf02af1d7ff6eb3c1e1967d7dbd6fec38373e389011d290cda1577203075f2f679167 SHA512 43cd4bd8981c828f2de943bb5ee90958f6a4f555d824be1325a7663219b0386ebaeb99406697affa8086b5b50f3d185e01ed12ace030557aa66a8e7b9af006b3
diff --git a/media-libs/libpng/libpng-1.6.34.ebuild b/media-libs/libpng/libpng-1.6.34.ebuild
deleted file mode 100644
index 0aab745e74e0..000000000000
--- a/media-libs/libpng/libpng-1.6.34.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit libtool ltprune multilib-minimal
-
-DESCRIPTION="Portable Network Graphics library"
-HOMEPAGE="http://www.libpng.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
- apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-
-LICENSE="libpng"
-SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 ~x86-winnt"
-IUSE="apng cpu_flags_x86_sse neon static-libs"
-
-RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- app-arch/xz-utils"
-
-src_prepare() {
- default
- if use apng; then
- eapply -p0 "${WORKDIR}"/${PN}-*-apng.patch
- # Don't execute symbols check with apng patch wrt #378111
- sed -i -e '/^check/s:scripts/symbols.chk::' Makefile.in || die
- fi
- elibtoolize
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable cpu_flags_x86_sse intel-sse)
- $(use_enable static-libs static)
- --enable-arm-neon=$(usex neon)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- DOCS=( ANNOUNCE CHANGES libpng-manual.txt README TODO )
- einstalldocs
- prune_libtool_files --all
-}
diff --git a/media-libs/libpng/libpng-1.6.35-r1.ebuild b/media-libs/libpng/libpng-1.6.35-r1.ebuild
index f1f841336979..442c01532f55 100644
--- a/media-libs/libpng/libpng-1.6.35-r1.ebuild
+++ b/media-libs/libpng/libpng-1.6.35-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
LICENSE="libpng"
SLOT="0/16"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~ppc-aix ~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 ~x86-winnt"
+KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 s390 ~sh sparc x86 ~ppc-aix ~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 ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
RDEPEND=">=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}]"
diff --git a/media-libs/libsdl2/Manifest b/media-libs/libsdl2/Manifest
index d1a6a1aa4160..116563f375e8 100644
--- a/media-libs/libsdl2/Manifest
+++ b/media-libs/libsdl2/Manifest
@@ -4,5 +4,5 @@ AUX libsdl2-2.0.8-wayland-headers.patch 1014 BLAKE2B 72070a3710635a3402e9fd5f6fd
DIST SDL2-2.0.8.tar.gz 4909017 BLAKE2B f6b365a6033e10ef0c5d56ee5e17cc1caada99a97b7ccc7b0eab4f7ca5fc513b78e71960a41a20319c5de1d9eb9eaeffb06b90d090e14e8d354a9b8315ab12f1 SHA512 673c6058b8692a36b4a3594456b10ef6051efe79e4fb644421fc5c76b11fd68b895840a2c8b72413418c378733e2993d33f19767d0d7ed101eda6310bd70c869
DIST SDL2-2.0.9.tar.gz 5246942 BLAKE2B 901ccb36301d7c9a76bb9f645ff3bc642ff101b969cfb0eff065db9de25a9ed3e80a0392b76dabf414e8f18298485304e45a9501786166709e31014e795bef03 SHA512 a78a4708b2bb5b35a7c7b7501eb3bd60a9aa3bb95a3d84e57763df4a377185e7312a94b66321eef7ca0d17255e4b402fc950e83ef0dbbd08f14ff1194107dc10
EBUILD libsdl2-2.0.8-r2.ebuild 5260 BLAKE2B 14ec9cbb2e0ef3718139dc4c206dd23ade81bca016150f555a937f5e527b4df9576f98c4834d418ab3c90b30dfd429e2cf9ed1152c39103a59b9001af7c3f05f SHA512 6802c880e54e7b5e961ccc996fd09ce3f9501142c4363097ec17b82dd00f400c312d58db34969307256951146d3c4158dd7a67b002f6d39938bf7fbc5cb4d040
-EBUILD libsdl2-2.0.9.ebuild 5317 BLAKE2B 8bfde69137fae2e41168852de7c964f19592ae6d9ff033e78e6e9df8eedd40c5d3c8bf6d8e88d8d68a892d0673c18e0a81a348b02f16f9ce575458076309f8d5 SHA512 b0cefcdf5d3bc0c14c705464cd1858158c2ac466b82e1ee65039ce64313797b6de3a55820761679e6a5942e3b366b1009e2ef9e596acac8a0f7116cc6174e0db
+EBUILD libsdl2-2.0.9.ebuild 5401 BLAKE2B 119b0f185223b09d6541cb5671b17878c0b9dd7f550c6115dd33a8f81bb11dc7a0016f60b334c7d7b5177205b140198af62fc456f5a84cad616eaad316ae08c5 SHA512 ebfbcc8889fbdbf34e99ba516b515568d14183396cc860891a8090788338a38c4b02938e3cd7ece290cfe66fceaf35129f0529e244b973a1af764907078ffaec
MISC metadata.xml 1653 BLAKE2B 37ded083266a7086c89e02ecf5a79ea7c56c85ef50474d200035a96f425345c5882288c594c0d7ede0de4edc0f2b570fcaee60f98e64b45d152af1964486be38 SHA512 9af14f6cbf34ade124c668374929122f37badcbbeec765cda4a68a9475d6eb4e5159e71607d82aa2c664c6049d24077d1ab58f163858104a86367f3ef51a33b3
diff --git a/media-libs/libsdl2/libsdl2-2.0.9.ebuild b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
index 5fe9e8491870..e8b3b92f6ea6 100644
--- a/media-libs/libsdl2/libsdl2-2.0.9.ebuild
+++ b/media-libs/libsdl2/libsdl2-2.0.9.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=6
-inherit autotools flag-o-matic ltprune toolchain-funcs multilib-minimal
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
MY_P="SDL2-${PV}"
DESCRIPTION="Simple Direct Media Layer"
@@ -11,7 +11,7 @@ SRC_URI="http://www.libsdl.org/release/${MY_P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ppc ppc64 ~sparc x86"
IUSE="cpu_flags_x86_3dnow alsa altivec aqua custom-cflags dbus gles haptic libsamplerate +joystick kms cpu_flags_x86_mmx nas opengl oss pulseaudio +sound cpu_flags_x86_sse cpu_flags_x86_sse2 static-libs +threads tslib udev +video video_cards_vc4 vulkan wayland X xinerama xscreensaver"
REQUIRED_USE="
@@ -181,6 +181,9 @@ multilib_src_install() {
}
multilib_src_install_all() {
- prune_libtool_files
+ find "${ED}" -name "*.la" -delete || die
+ if ! use static-libs ; then
+ find "${ED}" -name "*.a" -delete || die
+ fi
dodoc {BUGS,CREDITS,README,README-SDL,TODO,WhatsNew}.txt docs/README*.md
}
diff --git a/media-libs/libwebp/Manifest b/media-libs/libwebp/Manifest
index 67dcfc93b862..975d8060c6a2 100644
--- a/media-libs/libwebp/Manifest
+++ b/media-libs/libwebp/Manifest
@@ -2,8 +2,10 @@ DIST libwebp-0.5.2.tar.gz 1221153 BLAKE2B bf8f20c9dd45f70e68dda4eb1104b511be07b4
DIST libwebp-0.6.1.tar.gz 3990217 BLAKE2B 680dcc56bd10797e93d09dc64ed04fd2ffb0b8131aa0c0f1497054c50f5cff73b7ee2aa96df4f7ca760640b636f6f5265ae26e7874a77a86d39d2c74197c93b7 SHA512 fece551d8fabdd8d7ba6807baa54a69a345f8690be4415dd0c0dea54002d78fe893a5d5aacfc13800300edd462b969d596709ac3213f6bc90f8e3698b2490d5f
DIST libwebp-1.0.0.tar.gz 4023549 BLAKE2B 10286182ddc1f3561d01edf095ba8921b932b950175c45bbc86400318f9a88237c7623b0bcdd0dfecea6efb085e84e029c82a61396cb784d778d59902353d2b4 SHA512 2af7036957722a3f1533fa2da0da15c76d7eb8ac98ec4ad5cf71dd4262f3d7c9897fb6b50befab83b7de22f0abceeb2c0ff52d60927513d40f8a41aa6a9abd99
DIST libwebp-1.0.1.tar.gz 4030276 BLAKE2B 4ea3b31bac14c61fbedad14ed675adb4cc0deaed83f8c58f8d589ab2453a8cff33d7832acba39c673aa31cbb3d5c6b487151173d162f92a3698115833b03b694 SHA512 44e0c278b4569c03c39a1e047bccd7b4270bda12feae0dadc54f8a61fd6a66be011229f1e7e853f64749bcd9ea9e8146989e2b632459b67a4aaea4a8033a1361
+DIST libwebp-1.0.2.tar.gz 4036397 BLAKE2B 708c1083f62bdb3526f8319d9b6ce1e8aeba2bc785105ff7db07c9c7041311cedcfff000de5b8fd8e93550fc86ec149f6dd4a21f576709b80cb6a4b20ddd2863 SHA512 e095b8fdf0096395daf12892b3b74c472868e727f23640ba7aa5922a5a028b778a6a60d8a94f696f6c0ca49577dfc9a0b599ecb74ad831ade48c6db812b71d2e
EBUILD libwebp-0.5.2.ebuild 1770 BLAKE2B 3ad8b99c05e38a51755fd047be8e51339dafff3dbdd829012252427308d1417bd3ddf7d6e7a1d7b039b6de7cdda987913085b7006b499acaa3aba43bdea681e5 SHA512 3d30b059d51b531cc22b2497c955cf3a4752042d2bb9af655932e5ee8e122101d03050823925064e34c2d52a3d9fb8d294413c502938f2eed0cf2af51dd2c2c9
EBUILD libwebp-0.6.1.ebuild 1780 BLAKE2B afaa8d09c4ea4ae4e7c6c9a9f58620518e46b2b9946dbb148291c507c7daa568831063db2ce1dd0e7ae4539114ee3e82ce0a0f4ad1f07a739d8e6409e39c22b7 SHA512 b258c8ab17c12ccf7c5daf68edfb6bbde1fcb32f65949ecdb6ca8df8c48fd437971e4bf4ef6890b4fe4ee5438c7ad96e772fb4f20925f4012b7a6b87d80b5115
EBUILD libwebp-1.0.0.ebuild 1824 BLAKE2B c1d551960e915c4c6984182b1211a007373f32dbc16612a355dd7c53dc0701da7672b1e75d1ea6a1c8d4689c54684047efb553f30d3ad321524aa7ef85b68f47 SHA512 06800280eaefc56b6cb8dd8cafb7531ab24ffcb15b05163b9adc0a5509c1a7fabc5f1dedd3637a1efb0ec1b38b754ec6c4657fdd9acc6aba14cb6739f53f5e5d
EBUILD libwebp-1.0.1.ebuild 1842 BLAKE2B acca7da3a910aac00296c93582ead28869a9e17c5abc6bd2f9b6dc978119e49a3b2dae13bad5ffe9f3dbaabfecb072e2e1bd4b1e0e6dfd777e0c1f4b3c1bcb9c SHA512 82bf2cff0dd2c8da705c0818e6e122334d56b3fbcbe57e708ee29e3d303785afb4ac71b75a9bbdb7fadecb02f69966a4799134305daecb433b905b7fd20c5598
+EBUILD libwebp-1.0.2.ebuild 1842 BLAKE2B 9e4e63d276920879e4032eff45211f25aaa3773555ed21394d1eb2b92c5a6c1d7bff4b76fd8e17f1fcefa2b612c82caca725cecd6258bacc503df22075728329 SHA512 754e71ac0afb5039b20b7e2fd7214cac47ebf66675bff7582aa0081503586c4c6f0c536a077a94188ac8ea722d246f678580f2203dc29ad820f5d2c04a95c048
MISC metadata.xml 626 BLAKE2B b3ca86f5241deb376b10d159d67eb6001b2a3d8700167b0bc512c067a6b7c72e6a53173e6f22a8a8a923097d67eec93642ed92c132743980cbf27af022f15e1a SHA512 b7348f6c830bb9537f97fcc0f3cbf8b55491913ea45020005734088e7c1aa71dfcacab9dd87bf3085e79554a3326f90b6c30543ad41f08d863639732132be78b
diff --git a/media-libs/libwebp/libwebp-1.0.2.ebuild b/media-libs/libwebp/libwebp-1.0.2.ebuild
new file mode 100644
index 000000000000..d561963a322a
--- /dev/null
+++ b/media-libs/libwebp/libwebp-1.0.2.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools libtool multilib-minimal
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="A lossy image compression format"
+HOMEPAGE="https://developers.google.com/speed/webp/download"
+SRC_URI="http://downloads.webmproject.org/releases/webp/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/7" # subslot = libwebp soname version
+[[ "${PV}" = *_rc* ]] || \
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~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="cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 gif +jpeg neon opengl +png static-libs swap-16bit-csp tiff"
+
+# TODO: dev-lang/swig bindings in swig/ subdirectory
+RDEPEND="gif? ( media-libs/giflib:= )
+ jpeg? ( virtual/jpeg:0= )
+ opengl? (
+ media-libs/freeglut
+ virtual/opengl
+ )
+ png? ( media-libs/libpng:0= )
+ tiff? ( media-libs/tiff:0= )"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_prepare() {
+ default
+
+ # Fix libtool relinking, bug 499270.
+ #elibtoolize
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local args=(
+ --enable-libwebpmux
+ --enable-libwebpdemux
+ --enable-libwebpdecoder
+ $(use_enable static-libs static)
+ $(use_enable swap-16bit-csp)
+ $(use_enable jpeg)
+ $(use_enable png)
+ $(use_enable opengl gl)
+ $(use_enable tiff)
+
+ $(use_enable cpu_flags_x86_sse2 sse2)
+ $(use_enable cpu_flags_x86_sse4_1 sse4.1)
+ $(use_enable neon)
+
+ # Only used for gif2webp binary wrt #486646
+ $(multilib_native_use_enable gif)
+ )
+
+ ECONF_SOURCE="${S}" econf "${args[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" install
+}
+
+multilib_src_install_all() {
+ find "${ED}" -name "*.la" -delete || die
+ dodoc AUTHORS ChangeLog doc/*.txt NEWS README{,.mux}
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 8bd5fc61ab54..9e068f633c19 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,10 +1,6 @@
-DIST mesa-18.2.7.tar.xz 11356060 BLAKE2B efad9f46ab1a5d007accce557da717ae69fe49e56f7a4bc90193b91a7d7be22ac899fc37d66fd6e9844091450c999a0288515f3ea39612d3fbe63b426a9690ac SHA512 81f7b7108352cb3d8cf4b600ce2b0db6eb8420df550bf9f7087d83c2ab0f8dc32abe188f8ce5f52066e432fb64d9d17fc0edfbc9d0cb0650d0041f14064d9d77
DIST mesa-18.2.8.tar.xz 11385224 BLAKE2B c6fbf71e2ab6837f91dfa996cf7e89e9cae22e219cac56bd4201f7a62c787ddd2f65e7d162a329971018f0b1a796ee1a5b252ee6b43bb3b27a233d67b6cdf615 SHA512 04d5ada9ba3acea853def3ebcbb53ee76936a4cd4229ae753d2ce1b5cf543bea1e5764f2ef2b19735d47d041ba6b0582841bc89e2c9331fdfbd89386f599a1f7
-DIST mesa-18.3.0.tar.xz 11865356 BLAKE2B e9529a6257b3dd914e9bfe5c88bfbc30d652a045dfd9ed1387b12db9e6a89968b3affc5bc91d4d773035c505f32c3749216ae3666787bf97f1b23dcd8e0f7d3a SHA512 6643d8a100c50efee7178fe950e7cccad24c3a98538d3a13c7c6570add30a56776b4e5f279e2b0a20c4038e682e9461ca5a4fd4ac23a7f60d2f4a0c972525c42
-DIST mesa-18.3.1.tar.xz 11865960 BLAKE2B 6863a6d3891d1d2916139f71a5beefd7d83c81a0753d2c6885126636647cb5f7332dc308a9927f149951b122770ed07bc96ff5361dd23fbe1e07fb31d9c05147 SHA512 a68d39158cf1e868d70730d0641a0cfe4c6e5b3cd1bc0c47f54022402aca03503933084f6ddc722bf88c9b6d1281ba5c847ec4fed8092a9b33f90527d08e12db
-EBUILD mesa-18.2.7.ebuild 13582 BLAKE2B 23767ed855b88bbae877fa5d21c97b17fd79d1648e4c2395204ab4e7b26036949b5014eb71c6d070bc992823c122f132048292f5c304392da66fbceb49960c3f SHA512 529e00bb5a0c01e4abdd7017b46a815d66e82f83eb799bfc071c23a365d5a35e9de1e6b429e796f1233b3433dd45b79b2f027355c91c3b6632386abb2b18950e
-EBUILD mesa-18.2.8.ebuild 13582 BLAKE2B 23767ed855b88bbae877fa5d21c97b17fd79d1648e4c2395204ab4e7b26036949b5014eb71c6d070bc992823c122f132048292f5c304392da66fbceb49960c3f SHA512 529e00bb5a0c01e4abdd7017b46a815d66e82f83eb799bfc071c23a365d5a35e9de1e6b429e796f1233b3433dd45b79b2f027355c91c3b6632386abb2b18950e
-EBUILD mesa-18.3.0.ebuild 13704 BLAKE2B 39d69163bca102707ce713ba577736000e2eabe96c5fbbe4b24a2fce2396ab4554be1ce114e311315b58a9607b7d702bacbe2547f109fa306d009993cd7399f5 SHA512 7bef8c12c120e69aa0f167481a8be1a65ff606be4e254bfde563422e74914e570ceb1bf710bd23edce3b22ede5a5f9f308c8681a2b8f5f9f59979fbb152c1e1b
-EBUILD mesa-18.3.1.ebuild 13704 BLAKE2B 39d69163bca102707ce713ba577736000e2eabe96c5fbbe4b24a2fce2396ab4554be1ce114e311315b58a9607b7d702bacbe2547f109fa306d009993cd7399f5 SHA512 7bef8c12c120e69aa0f167481a8be1a65ff606be4e254bfde563422e74914e570ceb1bf710bd23edce3b22ede5a5f9f308c8681a2b8f5f9f59979fbb152c1e1b
+DIST mesa-18.3.2.tar.xz 11868440 BLAKE2B 49612671fd4187e71441bc88094f2cde2057b8b45ad2546357be715a7c69dd38f5ef03b837369e302509e0b9882ba209e7901b172dc3f7d797804fa4ab383c91 SHA512 34b66520728d720b1f3d3d63f8ba5c255d57b9e8fe427264419e4163b474df662ff6db9ca8b81283866da415e34346a4c39fc37bebe2a0929be14480faf4db45
+EBUILD mesa-18.2.8.ebuild 13581 BLAKE2B d8b0c94bad6f307241ab84b2c589622cf63213a5c35912295c68d6eb165d15563eb24663c1fd5ac50464162a21fb8609893d97aba24e1f15fe712d7fd6564960 SHA512 fc736135a306b36b10f5397853df288b59246cf026a3be4c65499271ccc2b53868b0e9aef76ac62920e3de029846f917a1699c01022b2661f9be4a6f750bce80
+EBUILD mesa-18.3.2.ebuild 13704 BLAKE2B c0ab4b8bf22d733ae4a5e4d9703a83b7c0db3898a68dcfbd102a2f0da657a1345a5775988f2abb8054468ef8293171af84e5a5c383f78a1d67e14904cfbcf30d SHA512 2a8ebc6f054a8fa1a4672425ae7d6c8f26270a3c8af58ef382341e28a5fadc07d50c0dbec21cd0e2ca4b529705f2df393c7c322d29ca39b43267146706a30391
EBUILD mesa-9999.ebuild 13725 BLAKE2B b786f2832136dc5a4973377513d90b1573b065917d971dcce13910cfc2cc1e7b4e329faae108741fd7c23a4c9856e2dc3bd141a80d979e82447312f98739f2eb SHA512 df291492547683d74be6712f180971a0c64e18aa011b7ec69e599a0c54166b63c95c4ec148292c05a13bb7cb58a31b3f8fca45590d2fdd5525d0a2f6b251ffee
MISC metadata.xml 1865 BLAKE2B 5c972239c02d0b4c212306d21326706af866576673802c7e28f28434bf1afe4145e89b7fc26947ba2126ecc9b5e57e41f248c9a23dc3e097efaddee177a4b904 SHA512 11a4e9b63b8d7fa041c76ff39694f138781443f80ae8942f845f6b9c30d560c25de83c62ca53f94f5129e42f2ca11c8478e4b5beae427c8352f7489f66e84795
diff --git a/media-libs/mesa/mesa-18.2.7.ebuild b/media-libs/mesa/mesa-18.2.7.ebuild
deleted file mode 100644
index d0b6f1befec9..000000000000
--- a/media-libs/mesa/mesa-18.2.7.ebuild
+++ /dev/null
@@ -1,515 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_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 imx intel 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 +llvm lm_sensors
- opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
- vulkan wayland xa xvmc"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( 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_radeonsi )
- video_cards_radeonsi? ( llvm ) )
- wayland? ( egl gbm )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_imx? ( gallium video_cards_vivante )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.93"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- 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] )
-"
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:7[${MULTILIB_USEDEP}]
- sys-devel/llvm:6[${MULTILIB_USEDEP}]
- sys-devel/llvm:5[${MULTILIB_USEDEP}]
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
- )
- sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
- llvm? (
- opencl? (
- video_cards_r600? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${CLANG_DEPSTR}
- )
- )
- )
- )
- !opencl? (
- video_cards_r600? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${LLVM_DEPSTR}
- )
- )
- )
- )
- )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- opencl? (
- >=sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- valgrind? ( dev-util/valgrind )
- x11-base/xorg-proto
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- $(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[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm[${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
-}
-
-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_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=/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
-
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_imx imx
-
- # 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_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_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 selinux)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- --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_src_test
-}
-
-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-18.2.8.ebuild b/media-libs/mesa/mesa-18.2.8.ebuild
index d0b6f1befec9..86f334decee6 100644
--- a/media-libs/mesa/mesa-18.2.8.ebuild
+++ b/media-libs/mesa/mesa-18.2.8.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 @@ if [[ ${PV} == 9999 ]]; then
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"
+ 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"
diff --git a/media-libs/mesa/mesa-18.3.1.ebuild b/media-libs/mesa/mesa-18.3.1.ebuild
deleted file mode 100644
index c65792857090..000000000000
--- a/media-libs/mesa/mesa-18.3.1.ebuild
+++ /dev/null
@@ -1,519 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python3_4 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 imx intel 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 +llvm lm_sensors
- opencl osmesa pax_kernel pic selinux test unwind vaapi valgrind vdpau
- vulkan wayland xa xvmc"
-
-REQUIRED_USE="
- d3d9? ( dri3 || ( 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_radeonsi )
- video_cards_radeonsi? ( llvm ) )
- wayland? ( egl gbm )
- video_cards_freedreno? ( gallium )
- video_cards_intel? ( classic )
- video_cards_i915? ( || ( classic gallium ) )
- video_cards_i965? ( classic )
- video_cards_imx? ( gallium video_cards_vivante )
- video_cards_nouveau? ( || ( classic gallium ) )
- video_cards_radeon? ( || ( classic gallium )
- gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
- video_cards_r100? ( classic )
- video_cards_r200? ( classic )
- video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
- video_cards_r600? ( gallium )
- video_cards_radeonsi? ( gallium llvm )
- video_cards_vc4? ( gallium )
- video_cards_virgl? ( gallium )
- video_cards_vivante? ( gallium gbm )
- video_cards_vmware? ( gallium )
-"
-
-LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.96"
-RDEPEND="
- !app-eselect/eselect-mesa
- >=app-eselect/eselect-opengl-1.3.0
- >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
- >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
- >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
- >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
- x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
- 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] )
-"
-for card in ${RADEON_CARDS}; do
- RDEPEND="${RDEPEND}
- video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
- "
-done
-RDEPEND="${RDEPEND}
- video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
-"
-
-# Please keep the LLVM dependency block separate. Since LLVM is slotted,
-# we need to *really* make sure we're not pulling one than more slot
-# simultaneously.
-#
-# How to use it:
-# 1. List all the working slots (with min versions) in ||, newest first.
-# 2. Update the := to specify *max* version, e.g. < 7.
-# 3. Specify LLVM_MAX_SLOT, e.g. 6.
-LLVM_MAX_SLOT="7"
-LLVM_DEPSTR="
- || (
- sys-devel/llvm:7[${MULTILIB_USEDEP}]
- sys-devel/llvm:6[${MULTILIB_USEDEP}]
- sys-devel/llvm:5[${MULTILIB_USEDEP}]
- sys-devel/llvm:4[${MULTILIB_USEDEP}]
- >=sys-devel/llvm-3.9.0:0[${MULTILIB_USEDEP}]
- )
- sys-devel/llvm:=[${MULTILIB_USEDEP}]
-"
-LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
-CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
-RDEPEND="${RDEPEND}
- llvm? (
- opencl? (
- video_cards_r600? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${CLANG_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${CLANG_DEPSTR}
- )
- )
- )
- )
- !opencl? (
- video_cards_r600? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- !video_cards_r600? (
- video_cards_radeonsi? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- !video_cards_r600? (
- !video_cards_radeonsi? (
- video_cards_radeon? (
- ${LLVM_DEPSTR_AMDGPU}
- )
- )
- )
- !video_cards_r600? (
- !video_cards_radeon? (
- !video_cards_radeonsi? (
- ${LLVM_DEPSTR}
- )
- )
- )
- )
- )
-"
-unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- opencl? (
- >=sys-devel/gcc-4.6
- )
- sys-devel/bison
- sys-devel/flex
- sys-devel/gettext
- virtual/pkgconfig
- valgrind? ( dev-util/valgrind )
- x11-base/xorg-proto
- x11-libs/libXrandr[${MULTILIB_USEDEP}]
- $(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[${flags}]" || return 1
- fi
- has_version "sys-devel/llvm[${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 ">=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_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=/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
-
- gallium_enable video_cards_vc4 vc4
- gallium_enable video_cards_vivante etnaviv
- gallium_enable video_cards_vmware svga
- gallium_enable video_cards_nouveau nouveau
- gallium_enable video_cards_imx imx
-
- # 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_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_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 selinux)
- -Dvalgrind=$(usex valgrind auto false)
- -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
- -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
- -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
- --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_src_test
-}
-
-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-18.3.0.ebuild b/media-libs/mesa/mesa-18.3.2.ebuild
index c65792857090..cbfaa1caeb6e 100644
--- a/media-libs/mesa/mesa-18.3.0.ebuild
+++ b/media-libs/mesa/mesa-18.3.2.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
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index 6487dbfe767d..f7df0aeae28c 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -6,5 +6,5 @@ DIST mlt-6.10.0.tar.gz 1384632 BLAKE2B 4bbcf95409df1ea1828d2b34e6d6663cf83f56726
DIST mlt-6.12.0.tar.gz 1395646 BLAKE2B 18dc06c4075d8d51bc7f62d027adda92c359275b9ad2131cc015b4402b1b7a9438fe87b617075017b9fd5e9696b82c4c840fa6dd83188bd0cedb7f01d2158283 SHA512 ed2cc0eeda45558ae6f1ec8780dfd413641953dc12dc32dccf655649f68f8e6088d39fefb7bef7bae042a41096976004446019d82ea162785bc487009cb97680
EBUILD mlt-6.10.0-r1.ebuild 5406 BLAKE2B d6a93ca06b4027aa6a4ab00519e10ab9faada3b5e9339a0591f99079ac7ee023ed34563f124919c690f975427b23edc5207e2f7715418739aa565575a01809cf SHA512 48dfe59716bc90bdc743e07a0ec2dab81d10cb88a169f4fe21f84694de92457b8cfa47716b50b524d4fc5d193af709d3f79885a37b937aa5e02b205f1e44d762
EBUILD mlt-6.12.0-r1.ebuild 5547 BLAKE2B b8d37f7308ba98ee532f1ec436adf80dc96a9ab3de147943d1d4dc135d66690de50a4d4dce664b3f45fb1b5a4fb3a96ae029b1293e86fe4d26508e328adc993f SHA512 200d06b1afed6063f899ae97375ce12f7c1b8dc880bc6b0f546e4c292289cc5671a34c1693a847b23e7ca0213db1dc21e4762d0fffd532ad6c7e8b42be04765f
-EBUILD mlt-6.12.0.ebuild 5547 BLAKE2B 14a15daff94043ab61cdebd7c3630c05a926ed13be5a19162605d2b38e450ba3c3363c45300d896c21461bdaa27ad1a5a22d725a2eb4d8be860f5e9af6449fdd SHA512 048c62a99d34eb8e8a65e06ed1a5b8ceb69502bab00788e27cd702b7dd1d923d3eca132fbe8e566a2d3571fbbc7692e99a3212461c7f18e6f8df5a221a0e84a3
+EBUILD mlt-6.12.0.ebuild 5545 BLAKE2B 0b8e14bc305c14ad7b100d710881ae581c9224bd9af1be0476048f2906342ba543992cf02f6cad61a19a058e93559420be51fc0ba6a6f4b8c4e4dbad41e0be20 SHA512 8822ffe4b895abf16978c06f874d34f800c4f6ef486e415432c3f06c561b5380b8d98ba69e9010487482953cf6817c65cc1c50688fbf49b31167ad73acfb3451
MISC metadata.xml 1501 BLAKE2B 88eb294bb8844bef1c8d6397649ce3d99edf5691e4f048061b9faee4776043233327b4094e8a06998ac648207836965523036a5e5f3e8a937c50dcfce2051330 SHA512 e3afcec0da4ce1e08e77b0c1a43a7dfb082282da02ab3aa694035bd0c229640b7094ceca0cac0834d33e3b49bc22e924fad0e5d167ea961934f03703eb39cca4
diff --git a/media-libs/mlt/mlt-6.12.0.ebuild b/media-libs/mlt/mlt-6.12.0.ebuild
index a9260d4f5504..aeb0b93427bc 100644
--- a/media-libs/mlt/mlt-6.12.0.ebuild
+++ b/media-libs/mlt/mlt-6.12.0.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 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~x86-fbsd ~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 libav libsamplerate lua melt opencv opengl python qt5 rtaudio ruby sdl vdpau xine xml"
# java perl php tcl vidstab
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 5de04b7320f1..51da4019a678 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -6,28 +6,14 @@ AUX opencv-2.4.3-gcc47.patch 835 BLAKE2B 2e0f71fff77a23c2db9747d8bb7f9301de18acd
AUX opencv-2.4.8-javamagic.patch 1165 BLAKE2B 0f12fd471145e1e303a517e5bc704fb5abc5ac5731fb1eadf08ef61e618bd70f9348c9c7a23296eefeb37826fd6701baaab0fc475ad0c441302b20516cf9bb9a SHA512 fd8a0d33997889c9316c0a4474c836b2528b676cd26bbb0e6ee2262377e45c5a0c465534831bd7fec3c0aa9cb198bc792a53f958b05a5217009314b678076d64
AUX opencv-2.4.9-cuda-pkg-config.patch 373 BLAKE2B 389a27607926170c38c69cba955e91e0dfde65a51ee88dd0aec315056ba0f36a303ef2d4b95e226f323e92c59a251b93e9deae5cb3822ad69d257e1cb3cb1f34 SHA512 5b8f931758c6c8edfc3cae35a16d1c8674f17716f13b424ee0510eb313f06ed334b80205262e6bfcce22db235467cad81fddfa96e0cf669972794cc8524f6937
AUX opencv-3.0.0-gles.patch 481 BLAKE2B 3eecd8c754abd9fdbfc2878b8b5a8b5ac3c6410342eb0756162ac901fe0903f7e1236bf2cc6e2ec5c7eeb638037f0dfad2b5aa9ebc905c485c4084936daed24e SHA512 37cac226bc39b91a87e4891e1d58169a0c2723240215670ebaecbfaf9b066b571296041fc5140aff7274cc44ca132b6f1b3bd4cf6d6dd23b950cac6eca548ad9
-AUX opencv-3.1.0-find-libraries-fix.patch 2056 BLAKE2B 5527e02dfe9545b7d3959ef98f1f6402c199115bb337c1f3f3d7228ea5d640a74bb41c1866a60826d689e341b40fcaad56f9fe25ffdeee96f4642b5747d19938 SHA512 3246a866f347f5f9715edf1ae759ef7097bc2fe54dab84838cf1e229bcbcc33d5c97224a13ab20546615cee03d4475b3ec1b44ee894676808b7212f1b4b45bd2
-AUX opencv-3.1.0-java-magic.patch 2302 BLAKE2B c380c7563dff740ff4105a8c50f298939596c5a2d787f2de1c9a9d77d8e2c3acfa971791426138869d8e9dde2b1235d7217e35e78e535d8e43b6d44846d2e391 SHA512 ee10c3fd6897ab1a8c4e006994b15a53d3d3ba7fc40975b67fc0a4104daa4473e4edabe9b7cdf1b82f87b14500d6db29485a1ee197aa7381551f030a7ba23a22
-AUX opencv-3.2.0-contrib_xfeatures2d-autodownload.patch 626 BLAKE2B a505fc9a45cbb783c2eb43b6f54f4be8c00b54a85f8bee7d1294ddbb54b02b34a03185773e24e3d5b4cc9d2ed1f61f65609430b4a205f34a18da6171124d0beb SHA512 74d21eb562a6b1bf28d20bad4221b3d158ed76925a255498f548726b83fa0c9d4e234ba7df8c58deaf662744a5e9da82d2635ea60048ef90f63a97e76fc10a02
-AUX opencv-3.2.0-cpu-mno-sse2.patch 383 BLAKE2B dff2ca26a8c0055afc82e04ed4131baadcbb895519c4d311f8f896e5ffcd2bb4bced791cb7455ad4039ceb3d112df2958e05af07780303ebe73924fb4e53dcad SHA512 139a4e0bad15b3e0a8856716d4621d5e7d49a0ba1338d16bd32e27eb881849a43ed22fdcc6d1502a295e023abc325835677e8683aac35f6d561c4a04ce46e978
-AUX opencv-3.2.0-fix_ussage_cpu_instructions.patch 1931 BLAKE2B 7a4764d8b0a6d5f50042e4435bf046a1d139dd041942fc6064b7758f3c0d6f531ec7b16ecd4099356b6e545bdcc5ce3ed80ddb8b4afafa729321c9572d5d624f SHA512 6d041966540c9fadb98d13cf3c3302bd800268fd03ebdf38e5da79fde604f3839244c78e7989e8e354ff7e265636f27ebcaabed4f9e0d57f46e3ced988182f01
-AUX opencv-3.2.0-gcc-6.0.patch 407 BLAKE2B 41f4f6416f1cf8418a397dd37ba489780ba9488365837a0cc3df945b0392b00ddf3295208d79a413d27ee76a846ffcea1e5f11bb1a46d46c05d2cffd78bd5ee9 SHA512 2615d79b237df196425628838bbfeead2a9410e3c05d83f134e2f5a1ed6d1225236ad7e2e5797e96d4a0d28743e2ac5a441e385461c3b872c726a6a37bedb4b1
-AUX opencv-3.2.0-vtk.patch 857 BLAKE2B 4fcf3ed98bbf1a566d1af1f16e7dd8eef7734ee9dcb33323ae6c1849313df6c7ad404f93bee7d53906ded46d35ac8d90e25297fc9a4abb361f8e9da52b41c09d SHA512 c4c1f232b1814e7bcd93980a886b9c40b84c3ed41864e102f3a13c2272ab45bda8e488f21f5b1e25137a70533c0c24c83a3cb6355285bab5234ee083ff412d5b
-AUX opencv-3.3.0-contrib-xfeatures2d.patch 1038 BLAKE2B 19b304148474a5baab14c23148ef28e7eccfccf524ef5649d6a03452d02647413b681e095d21dc4c010c3aac12f93e67aacf36a78705fecac47b0d9bf081dcbf SHA512 fbcd3fd68203d9bf865528c97aa69d69e41645d3549e6202d369047840d024aec1cf229f0dfb10e71d78b9433014611bf53673d6f36d60c02a643454955a9e8c
-AUX opencv-3.3.0-cuda9-cmake.patch 4676 BLAKE2B 9de3c4b988720a0b5fad1674d3967271def339c9fe45bd733b0843bede6da9ecc24b6f58b41a8f329f7f97a11e6c9ce6eacb33d9819d046d16acf257486fd4c2 SHA512 a526c9b0b248dac465da67adfd2260c9edd24ad3c335e060af134fa8700c7fb4e4a0ca0450b666966f917fb73ef2f168254a31488ce2bb74262f915d67225f90
-AUX opencv-3.3.0-cuda9-compute20.patch 775 BLAKE2B 7a818042ba9c75fd835b7fc8f6c0793aab8fef6f72964e9b57738e164c67ca16f885a8ad362360065b13bd35d4045e9c1a2683b59cc5d2b4162dc7794558a542 SHA512 00468ac115865acaba15efcf3791a927d6434ee54e37af3dd78bae3485868108ce4d1068ce94739a4d92b1673dd2111ebc30831446d69db4c999b95c5454c9cf
-AUX opencv-3.3.0-cuda9-saturate.patch 1075 BLAKE2B 9e7af021924e84d0f12e8f9b764630dbd35e8d732550f2c16d7f812e9cbd4d4a1499182d7239b266985d39061a8a3f3e95b65e876c8dd339de9f1b764e769089 SHA512 e19b95957c282af846d08d2d6a7d8290c32692af165bc9c627a3d2e42319775d5128a832a4f639915b1331f8db979f2b88c1528e6059aeb78159a8f5409e1644
AUX opencv-3.3.0-remove-tiny-dnn-autodownload.patch 1138 BLAKE2B 0bf85ca7a0e3759a4de14a844f2929120a47f9c0c212992d078b19cc7a602e157d5233ebc30d7eb6dcfa8c5a9606e3acea15e5a96717842fa80d2d8b3fa3189c SHA512 6824c3fc193491d0d776a7a904d71515309a5b67b0dfa1790bbd402c40b68e813c9fdfc3037a60f31893341ea78553d97470d152e90f34485004e0e50e6d66f6
AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826
AUX opencv-3.4.1-compilation-C-mode.patch 2077 BLAKE2B 78f55e49bd51ac4377a1db37125da6ca1ddfb9d723243eca7ef3df9d6d7b3922329cdd1c5915d480a9264af623c2953b4edaf81fd53afc950dc19cd49f04ea6f SHA512 203a4376728df6aa3dcaab147654139ebfd296a98d83847ac3ab0184dba828cf2ee298fedf7e7c2c64e1e8965237172fa6f1d5c7a4f6be5165a384d21b6875e7
AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf
+AUX opencv-3.4.1-fix-build-with-va.patch 1459 BLAKE2B 20a65a5bef15fab56d277d78f747b883b5a008508c643ae877717dd0c524aa6c2ba398aff7ac8073d3ccfffdcd284223369c15de36214f62730bc62ca582cf71 SHA512 24186689afe73fd3e63d6d43073a88c65bc7cd5c0719701c8a014e5e85e179765e1b2d2adac5fcc3c8490e92aeaf65642f6d0276581d8311470328b55b74d441
AUX opencv-3.4.1-python-lib-suffix-hack.patch 723 BLAKE2B bc4b1c68f2c73b40d20372ce4e3232b2db3b414ce2da16a8d84710fc53902211f17585c7ce6daf2d54025b53c04aa74f0c3eb3a30f26bfbc9af24e246f56b71a SHA512 54d2c8189fc1ff06ee1cacf5f375ea976faf339563ee804085feb0ec1f55cdbe10eea7335a786706b6a6152b6f9145156b3e74ce802c3d15b5a23014b25044b8
-DIST imgcodecs-opencv-3.3.0.tar.gz 7724 BLAKE2B 0e1c931a6dd796a7fa8e4a958f9a959d3bbba9bfa636a74a22d839b2919a8e1d0843765bcb69c5fbff7156efad0db2e5b3b70a2fc6e1911c0317ba46142cc130 SHA512 9c6fc31830e299e3d15da1cfc3468fe23eecda970a02e5826e0a7cfba34200c557c0e46f940154a26e9916da05859a83376217cbe7452ec8d14e99bc76f63d37
+AUX opencv-3.4.1-remove-git-autodetect.patch 1549 BLAKE2B 0ed44deddea20d5a57dded6a51d40645e5376411d9c055995fdbdbfbf4252817eaa9158925276661e4958f894898122ec273a352491be53511207345a481db52 SHA512 8496677542981c64ba9763f0d494885f71747884ae3e02de0bc8f96c1802356d917dcc7aed84ddfc2af093456c250bf2fafbdd06f7789aae8c720f5a412c07a0
DIST opencv-2.4.13.tar.gz 91669572 BLAKE2B 7f6be39e29c0db5d005cb14215fdf5955fa69c34d72c4f1e1fa8bf8de1e748a0d2fe5febb43296ef529c57e4dec8d1b6739c0c4df9e64657b9550ed382fbc4b9 SHA512 efdc4340fdf557dae44ac604c8c20f61ced89f99274264b61c2640f28741504462c6b57076e207040ca2513e3921275bdfbe6c22fc123bd50df78745e6b7bcd6
-DIST opencv-3.2.0.tar.gz 78861546 BLAKE2B 6d44263792b9cd2d009c7eeaddc2ef87acb01482cc9d36f2fe7717f981ff85a4e5007e4018d3ae15f383f6c3b1a0e009049f319bde0bce98575f04ccd6062cd8 SHA512 a338f4b4cdebfc2dcd763427b9c9632b3a3b0d072117b8e6367c73ea1ac21f7148553a23c7afbb44b01a48be3be95520789c2de1d6ae230b7b414ee713d3606d
-DIST opencv-3.2.0_contrib.tar.gz 54765210 BLAKE2B 6c5bcb1c18da937751f234cc1edaae58416ab9ab5a3407a2ab2c22f4e174ffeb800396d34fe489f424b288fbd608e106cd5f5b458a06a509cea5f7d8e23a67a7 SHA512 eadb6a8a3625235b0c71e29c36d15d9342278aaf9148ef6a7e1aa80f4db0491aaf30b6df16bfd0cd358402b2a3059b6acbce23fb5fe2c0c57150a733ffbbff5a
-DIST opencv-3.3.0.tar.gz 81238534 BLAKE2B 9eac7de8eefbcc9981a249343052c2dcada4e73c3406d545a89b9e6a054a7c7153933537d123f227caf51f23196fcaaed4135229db195e9c4139f2977e034e34 SHA512 13dee5c1c5fec1dccdbb05879d299b93ef8ddeb87f561a6c4178e33a4cf5ae919765119068d0387a3efea0e09a625ca993cffac60a772159690fcbee4e8d70fb
-DIST opencv-3.3.0_contrib.tar.gz 54848519 BLAKE2B 53615af19426bf7a1540a6f23c7803276d6de594260b0d87b06b6b12c9e20326925a275e31e017784e8e876e30df7b8f326e192a75c5300252ae09f50d0d9a8b SHA512 ebe3dbe6c754c6fbaabbf6b0d2a4209964e625fd68e593f30ce043792740c8c1d4440d7870949b5b33f488fd7e2e05f3752287b7f50dd24c29202e268776520e
DIST opencv-3.4.0-face_landmark_model.tar.gz 63299830 BLAKE2B 58f08cd8c030ee1c8b66e76a561fd625e112face427d001185f8d7c0eaace55adbd8474663021841a1382bfe393a210e64c51223441713cdb9156fac866a845c SHA512 2cd29ce42c08b2966db3ef4a2bc217ab3d07051819757ec6de8f3deea29e28f60abab39f101dba03f766f17018598e411bd687a7eaab0c681c113e10a2de2b23
DIST opencv-3.4.0-res10_300x300-caffeemodel.tar.gz 10036604 BLAKE2B 2a2de48fc420f13e7be146ac88f311901c5b4e409c30e466152e33cae1f8afd87dcb6d758af447c268d90bd67989c8798cd80cab172b10499a6ad5224509dbdf SHA512 96fee9f447d5739bc01a5cab37c453cf7237457dfb5d2bf93ac37f8e5aa557ac222316f449cd58e37e856abe4d8e9d4a7820daaba32f0b22cbcde8e340287d4b
DIST opencv-3.4.1.tar.gz 87051748 BLAKE2B 87c83ab9b3d7fb048263f047aa5d6e95b153e1a28f3e34cc885eff7eb080a2258cfa1aa494cd56b32f1098ab158c17c23fc8464fcbe70642a3a1842f2fd1b4ac SHA512 e1fc14285090c6fe9e26e721f2d67d7096650c523147e925567426ef76aa7f4c6f12035d6f6ce3ec7991a75a6828a810fd4f9b75f78ed5fcccecefbadd79944b
@@ -35,8 +21,5 @@ DIST opencv-3.4.1_contrib.tar.gz 57126844 BLAKE2B 63d9d5cb088371754eb132607789c8
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.2.0-r4.ebuild 12121 BLAKE2B 5e51542c1c2111c8fbd42d6fdfcbfbb357043ed7e9f831cf77e04a2b054482ad7d3f361eaf631abf73939ddb0cb364adfd80c8b8577eb036bb51e0bfa30f11ea SHA512 c6b131a0f9e2b241b03525ced8794b9199ce302082601c2ed63031fd6d5c487e65c06a96e27763fae8ae3c69c54da66f071a6b0a2936458e247a7b14b271a773
-EBUILD opencv-3.3.0-r6.ebuild 17046 BLAKE2B e16eed6639efabe26576e172bbd4d6b255dffbc30f3b611b83c62cafb7e63ab00373587def86a6612fd7125d04400343b99a6c1ccefa142b4e8dbea5348cf841 SHA512 381ac07e5a44d53faaa7532e0c2dabea2699a64f14c353b044e1d24cf291f744336803ccd12714ebd32309456adc962883bce1f549911e5517ec12855c95d843
-EBUILD opencv-3.4.1-r2.ebuild 18421 BLAKE2B 1afb2b6c5bd5d473a3d88e0a1af39d57c9154e1d42c79580296c887642ecaa58d7c848b3d5b7f59c1b2ed24d106dc0f08b24e84234e3524d5e9a0b6c86de0f92 SHA512 246feed33adb601adb515b7e121b16186c501c07be5497a6cddf0a8fc859b251aad806502689848185df6472f4b294a3069ff35c565f4ea624f01dffdf732bba
-EBUILD opencv-3.4.1-r5.ebuild 18493 BLAKE2B 539f078242085433160e0c8d99039210ea1e6d360ea17eedb94413f66f97c9cee302026a48c7b9bbf59b29591844bfae7d3e4b8ad6ce19157da9d854dda3c531 SHA512 d85cd897d9fb90e98935591f52cff013a46ad439961dcaddbd029c93edc18c16f81559ea7a83cabab3bb1dc9bd41ae73770f655d5b379a58ba4fbbca815fa0c7
+EBUILD opencv-3.4.1-r5.ebuild 18648 BLAKE2B 9dc086479e43c21b0b271ac3694b6227d3e058ca8f5c81ed82f535c2d7035eb3c92dd0772b77be106b2128750afdf247345bad31d56dfc82f21efa29a6a7d08f SHA512 9c1926d829d7ed3307bf852e77d26e99e9b1cffec59f591e79424effe523df6acc7109074a56f18b741cf33df3617a44879b4c37325976961dc89a7c8dc7970f
MISC metadata.xml 2401 BLAKE2B 3d37ef4879324890e702119fffaaf075021fb22ee0b9393a58df46cf937a60403f0f48f90483bfc078079cb9f1177f866cfcee63d592ba93915fa96a438d064c SHA512 691287c588e60df6158ea070f61100214dc54c267f9f2c7ffbeabb75595e72641ced7cc33f119fed9bbf98df8832f977557fb4a1017eb65d9081ac1350d783b8
diff --git a/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch b/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch
deleted file mode 100644
index 52f4db6b3113..000000000000
--- a/media-libs/opencv/files/opencv-3.1.0-find-libraries-fix.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -purN a/cmake/OpenCVFindLibsGrfmt.cmake b/cmake/OpenCVFindLibsGrfmt.cmake
---- a/cmake/OpenCVFindLibsGrfmt.cmake 2015-12-18 15:02:16.000000000 +0000
-+++ b/cmake/OpenCVFindLibsGrfmt.cmake 2016-11-07 13:18:04.567340791 +0000
-@@ -18,7 +18,7 @@ endif()
- if(NOT ZLIB_FOUND)
- ocv_clear_vars(ZLIB_LIBRARY ZLIB_LIBRARIES ZLIB_INCLUDE_DIRS)
-
-- set(ZLIB_LIBRARY zlib)
-+ set(ZLIB_LIBRARY z)
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/zlib")
- set(ZLIB_INCLUDE_DIRS "${${ZLIB_LIBRARY}_SOURCE_DIR}" "${${ZLIB_LIBRARY}_BINARY_DIR}")
- set(ZLIB_LIBRARIES ${ZLIB_LIBRARY})
-@@ -40,7 +40,7 @@ if(WITH_TIFF)
- if(NOT TIFF_FOUND)
- ocv_clear_vars(TIFF_LIBRARY TIFF_LIBRARIES TIFF_INCLUDE_DIR)
-
-- set(TIFF_LIBRARY libtiff)
-+ set(TIFF_LIBRARY tiff)
- set(TIFF_LIBRARIES ${TIFF_LIBRARY})
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libtiff")
- set(TIFF_INCLUDE_DIR "${${TIFF_LIBRARY}_SOURCE_DIR}" "${${TIFF_LIBRARY}_BINARY_DIR}")
-@@ -79,7 +79,7 @@ if(WITH_JPEG)
- if(NOT JPEG_FOUND)
- ocv_clear_vars(JPEG_LIBRARY JPEG_LIBRARIES JPEG_INCLUDE_DIR)
-
-- set(JPEG_LIBRARY libjpeg)
-+ set(JPEG_LIBRARY jpeg)
- set(JPEG_LIBRARIES ${JPEG_LIBRARY})
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjpeg")
- set(JPEG_INCLUDE_DIR "${${JPEG_LIBRARY}_SOURCE_DIR}")
-@@ -136,7 +136,7 @@ if(WITH_JASPER)
- if(NOT JASPER_FOUND)
- ocv_clear_vars(JASPER_LIBRARY JASPER_LIBRARIES JASPER_INCLUDE_DIR)
-
-- set(JASPER_LIBRARY libjasper)
-+ set(JASPER_LIBRARY jasper)
- set(JASPER_LIBRARIES ${JASPER_LIBRARY})
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libjasper")
- set(JASPER_INCLUDE_DIR "${${JASPER_LIBRARY}_SOURCE_DIR}")
-@@ -169,7 +169,7 @@ if(WITH_PNG)
- if(NOT PNG_FOUND)
- ocv_clear_vars(PNG_LIBRARY PNG_LIBRARIES PNG_INCLUDE_DIR PNG_PNG_INCLUDE_DIR HAVE_LIBPNG_PNG_H PNG_DEFINITIONS)
-
-- set(PNG_LIBRARY libpng)
-+ set(PNG_LIBRARY png)
- set(PNG_LIBRARIES ${PNG_LIBRARY})
- add_subdirectory("${OpenCV_SOURCE_DIR}/3rdparty/libpng")
- set(PNG_INCLUDE_DIR "${${PNG_LIBRARY}_SOURCE_DIR}")
diff --git a/media-libs/opencv/files/opencv-3.1.0-java-magic.patch b/media-libs/opencv/files/opencv-3.1.0-java-magic.patch
deleted file mode 100644
index 96a0e7e7053f..000000000000
--- a/media-libs/opencv/files/opencv-3.1.0-java-magic.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff -purN a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2015-12-18 15:02:16.000000000 +0000
-+++ b/CMakeLists.txt 2016-06-06 17:15:48.006020666 +0100
-@@ -209,6 +209,7 @@ OCV_OPTION(WITH_OPENCLAMDFFT "Include
- OCV_OPTION(WITH_OPENCLAMDBLAS "Include AMD OpenCL BLAS library support" ON IF (NOT ANDROID AND NOT IOS AND NOT WINRT) )
- OCV_OPTION(WITH_DIRECTX "Include DirectX support" ON IF (WIN32 AND NOT WINRT) )
- OCV_OPTION(WITH_INTELPERC "Include Intel Perceptual Computing support" OFF IF (WIN32 AND NOT WINRT) )
-+OCV_OPTION(WITH_JAVA "Include Java support" ON)
- OCV_OPTION(WITH_IPP_A "Include Intel IPP_A support" OFF IF (MSVC OR X86 OR X86_64) )
- OCV_OPTION(WITH_MATLAB "Include Matlab support" ON IF (NOT ANDROID AND NOT IOS AND NOT WINRT))
- OCV_OPTION(WITH_VA "Include VA support" OFF IF (UNIX AND NOT ANDROID) )
-@@ -562,20 +563,25 @@ endif(BUILD_DOCS)
- include(cmake/OpenCVDetectPython.cmake)
-
- # --- Java Support ---
--include(cmake/OpenCVDetectApacheAnt.cmake)
--if(ANDROID)
-- include(cmake/OpenCVDetectAndroidSDK.cmake)
-+If(WITH_JAVA)
-+ include(cmake/OpenCVDetectApacheAnt.cmake)
-+ if(ANDROID)
-+ include(cmake/OpenCVDetectAndroidSDK.cmake)
-
-- if(NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
-- message(WARNING "OpenCV requires Android SDK tools revision 14 or newer. Otherwise tests and samples will no be compiled.")
-+ if(NOT ANDROID_TOOLS_Pkg_Revision GREATER 13)
-+ message(WARNING "OpenCV requires Android SDK tools revision 14 or newer. Otherwise tests and samples will no be compiled.")
-+ endif()
-+ else()
-+ find_package(JNI)
- endif()
--else()
-- find_package(JNI)
--endif()
-
--if(ANDROID AND ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND (ANT_VERSION VERSION_GREATER 1.7) AND (ANDROID_TOOLS_Pkg_Revision GREATER 13))
-- SET(CAN_BUILD_ANDROID_PROJECTS TRUE)
-+ if(ANDROID AND ANDROID_EXECUTABLE AND ANT_EXECUTABLE AND (ANT_VERSION VERSION_GREATER 1.7) AND (ANDROID_TOOLS_Pkg_Revision GREATER 13))
-+ SET(CAN_BUILD_ANDROID_PROJECTS TRUE)
-+ else()
-+ SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
-+ endif()
- else()
-+ SET(ANT_EXECUTABLE "")
- SET(CAN_BUILD_ANDROID_PROJECTS FALSE)
- endif()
-
diff --git a/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch b/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
deleted file mode 100644
index f03c57d425cc..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-contrib_xfeatures2d-autodownload.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/modules/xfeatures2d/CMakeLists.txt 2017-02-28 13:10:56.470000000 +0100
-+++ b/modules/xfeatures2d/CMakeLists.txt 2017-02-28 13:11:03.970000000 +0100
-@@ -1,5 +1,5 @@
- set(the_description "Contributed/Experimental Algorithms for Salient 2D Features Detection")
- ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d opencv_shape opencv_highgui opencv_videoio opencv_ml
- OPTIONAL opencv_cudaarithm WRAP python java)
--include(cmake/download_vgg.cmake)
--include(cmake/download_boostdesc.cmake)
-+#include(cmake/download_vgg.cmake)
-+#include(cmake/download_boostdesc.cmake)
diff --git a/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch b/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch
deleted file mode 100644
index a73456411f27..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-cpu-mno-sse2.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/OpenCVCompilerOptions.cmake 2017-07-22 13:26:51.178960091 +0200
-+++ b/cmake/OpenCVCompilerOptions.cmake 2017-07-22 13:27:47.238961469 +0200
-@@ -176,8 +176,6 @@
- endif()
- if(ENABLE_SSE2)
- add_extra_compiler_option(-msse2)
-- elseif(X86 OR X86_64)
-- add_extra_compiler_option(-mno-sse2)
- endif()
- if(ARM)
- add_extra_compiler_option("-mfp16-format=ieee")
diff --git a/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch b/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch
deleted file mode 100644
index 7b88216f329a..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-fix_ussage_cpu_instructions.patch
+++ /dev/null
@@ -1,64 +0,0 @@
---- a/cmake/OpenCVCompilerOptions.cmake
-+++ b/cmake/OpenCVCompilerOptions.cmake
-@@ -164,8 +164,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- # Other optimizations
- if(ENABLE_OMIT_FRAME_POINTER)
- add_extra_compiler_option(-fomit-frame-pointer)
-- else()
-- add_extra_compiler_option(-fno-omit-frame-pointer)
- endif()
- if(ENABLE_FAST_MATH)
- add_extra_compiler_option(-ffast-math)
-@@ -195,8 +193,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- if(NOT MINGW)
- if(ENABLE_AVX)
- add_extra_compiler_option(-mavx)
-- elseif(X86 OR X86_64)
-- add_extra_compiler_option(-mno-avx)
- endif()
- if(ENABLE_AVX2)
- add_extra_compiler_option(-mavx2)
-@@ -210,26 +206,18 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- if(NOT OPENCV_EXTRA_CXX_FLAGS MATCHES "-mavx")
- if(ENABLE_SSE3)
- add_extra_compiler_option(-msse3)
-- elseif(X86 OR X86_64)
-- add_extra_compiler_option(-mno-sse3)
- endif()
-
- if(ENABLE_SSSE3)
- add_extra_compiler_option(-mssse3)
-- elseif(X86 OR X86_64)
-- add_extra_compiler_option(-mno-ssse3)
- endif()
-
- if(ENABLE_SSE41)
- add_extra_compiler_option(-msse4.1)
-- elseif(X86 OR X86_64)
-- add_extra_compiler_option(-mno-sse4.1)
- endif()
-
- if(ENABLE_SSE42)
- add_extra_compiler_option(-msse4.2)
-- elseif(X86 OR X86_64)
-- add_extra_compiler_option(-mno-sse4.2)
- endif()
-
- if(ENABLE_POPCNT)
-@@ -238,16 +226,6 @@ if(CMAKE_COMPILER_IS_GNUCXX)
- endif()
- endif(NOT MINGW)
-
-- if(X86 OR X86_64)
-- if(NOT APPLE AND CMAKE_SIZEOF_VOID_P EQUAL 4)
-- if(OPENCV_EXTRA_CXX_FLAGS MATCHES "-m(sse2|avx)")
-- add_extra_compiler_option(-mfpmath=sse)# !! important - be on the same wave with x64 compilers
-- else()
-- add_extra_compiler_option(-mfpmath=387)
-- endif()
-- endif()
-- endif()
--
- # Profiling?
- if(ENABLE_PROFILING)
- add_extra_compiler_option("-pg -g"
diff --git a/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch b/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
deleted file mode 100644
index 457d3595e49b..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-gcc-6.0.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/OpenCVPCHSupport.cmake 2017-06-06 15:05:09.180022719 +0200
-+++ b/cmake/OpenCVPCHSupport.cmake 2017-06-06 15:05:50.775022684 +0200
-@@ -14,7 +14,7 @@
-
- IF(CMAKE_COMPILER_IS_GNUCXX)
-
-- IF(NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS "4.2.0")
-+ IF(gcc_compiler_version VERSION_GREATER "4.2.-1" AND gcc_compiler_version VERSION_LESS "6.0.0")
- SET(PCHSupport_FOUND TRUE)
- ENDIF()
-
diff --git a/media-libs/opencv/files/opencv-3.2.0-vtk.patch b/media-libs/opencv/files/opencv-3.2.0-vtk.patch
deleted file mode 100644
index 1e3daec8aa30..000000000000
--- a/media-libs/opencv/files/opencv-3.2.0-vtk.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/OpenCVDetectVTK.cmake 2017-03-20 10:43:28.401962910 +0100
-+++ b/cmake/OpenCVDetectVTK.cmake 2017-03-20 10:43:09.127963906 +0100
-@@ -8,7 +8,7 @@
- IF(VTK_RENDERING_BACKEND) #in vtk 7, the rendering backend is exported as a var.
- find_package(VTK QUIET COMPONENTS vtkRendering${VTK_RENDERING_BACKEND} vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport vtkIOGeometry NO_MODULE)
- ELSE(VTK_RENDERING_BACKEND)
-- find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
-+ find_package(VTK QUIET COMPONENTS vtkRenderingOpenGL2 vtkInteractionStyle vtkRenderingLOD vtkIOPLY vtkFiltersTexture vtkRenderingFreeType vtkIOExport NO_MODULE)
- ENDIF(VTK_RENDERING_BACKEND)
- ENDIF(VTK_FOUND)
-
diff --git a/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch b/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch
deleted file mode 100644
index 26e4ac767c37..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-contrib-xfeatures2d.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- a/modules/xfeatures2d/CMakeLists.txt 2017-09-16 14:28:38.440000000 +0200
-+++ b/modules/xfeatures2d/CMakeLists.txt 2017-09-16 14:27:21.350000000 +0200
-@@ -2,11 +2,11 @@
-
- ocv_define_module(xfeatures2d opencv_core opencv_imgproc opencv_features2d opencv_calib3d OPTIONAL opencv_shape opencv_cudaarithm WRAP python java)
-
-+#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)
-+#include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)
-+#set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d")
-+#download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)
-+#download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)
--include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_vgg.cmake)
--include(${CMAKE_CURRENT_SOURCE_DIR}/cmake/download_boostdesc.cmake)
--set(DOWNLOAD_DIR "${OpenCV_BINARY_DIR}/downloads/xfeatures2d")
--download_boost_descriptors("${DOWNLOAD_DIR}" boost_status)
--download_vgg_descriptors("${DOWNLOAD_DIR}" vgg_status)
- if(NOT boost_status OR NOT vgg_status)
- ocv_module_disable(xfeatures2d)
- endif()
diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch
deleted file mode 100644
index 270c599d708c..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-cuda9-cmake.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-diff --git a/cmake/FindCUDA.cmake b/cmake/FindCUDA.cmake
-index 678b450ab..c2a58bd00 100644
---- a/cmake/FindCUDA.cmake
-+++ b/cmake/FindCUDA.cmake
-@@ -283,7 +283,38 @@
- # CUDA_nppc_LIBRARY -- NVIDIA Performance Primitives lib (core).
- # Only available for CUDA version 5.5+.
- # CUDA_nppi_LIBRARY -- NVIDIA Performance Primitives lib (image processing).
--# Only available for CUDA version 5.5+.
-+# Only available for CUDA version 5.5+ and was split up
-+# in CUDA version 8.0+ and doesn't exist in combined
-+# form in CUDA version 9.0+.
-+# CUDA_nppial_LIBRARY -- NVIDIA Performance Primatives library (arithmetic and
-+# logical operation functions). Only available for CUDA
-+# version 8.0+.
-+# CUDA_nppicc_LIBRARY -- NVIDIA Performance Primatives library (color conversion
-+# and sampling functions). Only available for CUDA version
-+# 8.0+.
-+# CUDA_nppicom_LIBRARY -- NVIDIA Performance Primatives library (JPEG compression
-+# and decompression functions). Only available for CUDA
-+# version 8.0+.
-+# CUDA_nppidei_LIBRARY -- NVIDIA Performance Primatives library (data exchange and
-+# initialization functions). Only available for CUDA
-+# version 8.0+.
-+# CUDA_nppif_LIBRARY -- NVIDIA Performance Primatives library (filtering and
-+# computer vision functions). Only available for CUDA
-+# version 8.0+.
-+# CUDA_nppig_LIBRARY -- NVIDIA Performance Primatives library (geometry
-+# transformation functions). Only available for CUDA
-+# version 8.0+.
-+# CUDA_nppim_LIBRARY -- NVIDIA Performance Primatives library (morphological
-+# operation functions). Only available for CUDA version
-+# 8.0+.
-+# CUDA_nppist_LIBRARY -- NVIDIA Performance Primatives library (statistics and
-+# linear transform). Only available for CUDA version
-+# 8.0+.
-+# CUDA_nppisu_LIBRARY -- NVIDIA Performance Primatives library (memory support
-+# functions). Only available for CUDA version 8.0+.
-+# CUDA_nppitc_LIBRARY -- NVIDIA Performance Primatives library (threshold and
-+# compare operation functions). Only available for CUDA
-+# version 8.0+.
- # CUDA_npps_LIBRARY -- NVIDIA Performance Primitives lib (signal processing).
- # Only available for CUDA version 5.5+.
- # CUDA_nvcuvenc_LIBRARY -- CUDA Video Encoder library.
-@@ -522,6 +553,16 @@ macro(cuda_unset_include_and_libraries)
- unset(CUDA_npp_LIBRARY CACHE)
- unset(CUDA_nppc_LIBRARY CACHE)
- unset(CUDA_nppi_LIBRARY CACHE)
-+ unset(CUDA_nppial_LIBRARY CACHE)
-+ unset(CUDA_nppicc_LIBRARY CACHE)
-+ unset(CUDA_nppicom_LIBRARY CACHE)
-+ unset(CUDA_nppidei_LIBRARY CACHE)
-+ unset(CUDA_nppif_LIBRARY CACHE)
-+ unset(CUDA_nppig_LIBRARY CACHE)
-+ unset(CUDA_nppim_LIBRARY CACHE)
-+ unset(CUDA_nppist_LIBRARY CACHE)
-+ unset(CUDA_nppisu_LIBRARY CACHE)
-+ unset(CUDA_nppitc_LIBRARY CACHE)
- unset(CUDA_npps_LIBRARY CACHE)
- unset(CUDA_nvcuvenc_LIBRARY CACHE)
- unset(CUDA_nvcuvid_LIBRARY CACHE)
-@@ -787,7 +828,22 @@ if(NOT CUDA_VERSION VERSION_LESS "3.2")
- find_cuda_helper_libs(nvcuvid)
- endif()
- endif()
--if(CUDA_VERSION VERSION_GREATER "5.0")
-+if(CUDA_VERSION VERSION_GREATER "7.5")
-+ # In CUDA 8.0 NPP was splitted onto 12 separate libraries.
-+ find_cuda_helper_libs(nppc)
-+ find_cuda_helper_libs(nppial)
-+ find_cuda_helper_libs(nppicc)
-+ find_cuda_helper_libs(nppicom)
-+ find_cuda_helper_libs(nppidei)
-+ find_cuda_helper_libs(nppif)
-+ find_cuda_helper_libs(nppig)
-+ find_cuda_helper_libs(nppim)
-+ find_cuda_helper_libs(nppist)
-+ find_cuda_helper_libs(nppisu)
-+ find_cuda_helper_libs(nppitc)
-+ find_cuda_helper_libs(npps)
-+ set(CUDA_npp_LIBRARY "${CUDA_nppc_LIBRARY};${CUDA_nppial_LIBRARY};${CUDA_nppicc_LIBRARY};${CUDA_nppicom_LIBRARY};${CUDA_nppidei_LIBRARY};${CUDA_nppif_LIBRARY};${CUDA_nppig_LIBRARY};${CUDA_nppim_LIBRARY};${CUDA_nppist_LIBRARY};${CUDA_nppisu_LIBRARY};${CUDA_nppitc_LIBRARY};${CUDA_npps_LIBRARY}")
-+elseif(CUDA_VERSION VERSION_GREATER "5.0")
- # In CUDA 5.5 NPP was splitted onto 3 separate libraries.
- find_cuda_helper_libs(nppc)
- find_cuda_helper_libs(nppi)
-
-
diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch
deleted file mode 100644
index 384630002d98..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-cuda9-compute20.patch
+++ /dev/null
@@ -1,21 +0,0 @@
---- a/cmake/OpenCVDetectCUDA.cmake 2018-01-02 11:57:50.358147518 -0500
-+++ b/cmake/OpenCVDetectCUDA.cmake 2018-01-02 12:48:44.108965500 -0500
-@@ -104,7 +104,7 @@
- if(${CUDA_VERSION} VERSION_LESS "8.0")
- set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2")
- else()
-- set(__cuda_arch_bin "2.0 3.0 3.5 3.7 5.0 5.2 6.0 6.1")
-+ set(__cuda_arch_bin "3.0 3.5 3.7 5.0 5.2 6.0 6.1")
- endif()
- endif()
- endif()
-@@ -209,7 +209,7 @@ if(CUDA_FOUND)
- endif()
-
- if(UNIX OR APPLE)
-- set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC)
-+ set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fPIC --expt-relaxed-constexpr)
- endif()
- if(APPLE)
- set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} -Xcompiler -fno-finite-math-only)
-
diff --git a/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch b/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch
deleted file mode 100644
index 43e2a0833cae..000000000000
--- a/media-libs/opencv/files/opencv-3.3.0-cuda9-saturate.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff --git a/var/tmp/portage/media-libs/opencv-3.3.0-r4/work/opencv-3.3.0/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp b/./saturate_cast.hpp
-index ec9804c..4359d18 100644
---- a/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp
-+++ b/modules/cudev/include/opencv2/cudev/util/saturate_cast.hpp
-@@ -47,6 +47,9 @@
- #define OPENCV_CUDEV_UTIL_SATURATE_CAST_HPP
-
- #include "../common.hpp"
-+#if __CUDACC_VER_MAJOR__ >= 9
-+#include <cuda_fp16.h>
-+#endif
-
- namespace cv { namespace cudev {
-
-@@ -274,15 +277,25 @@ template <typename T, typename D> __device__ __forceinline__ D cast_fp16(T v);
-
- template <> __device__ __forceinline__ float cast_fp16<short, float>(short v)
- {
-+#if __CUDACC_VER_MAJOR__ >= 9
-+ return float(*(__half*)&v);
-+#else
- return __half2float(v);
-+#endif
- }
-
- template <> __device__ __forceinline__ short cast_fp16<float, short>(float v)
- {
-- return (short)__float2half_rn(v);
-+#if __CUDACC_VER_MAJOR__ >= 9
-+ __half h(v);
-+ return *(short*)&v;
-+#else
-+ return (short)__float2half_rn(v);
-+#endif
- }
- //! @}
-
- }}
-
- #endif
-+
diff --git a/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch b/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch
new file mode 100644
index 000000000000..813eb7e4ae65
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-fix-build-with-va.patch
@@ -0,0 +1,26 @@
+From 20f5fa8e3e880bc8b2e5156e9f25f7fb756ed8e4 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?S=C3=A9rgio=20M=2E=20Basto?= <sergio@serjux.com>
+Date: Wed, 28 Feb 2018 19:21:31 +0000
+Subject: [PATCH] Fix build with VA
+
+This commit readd ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES}
+that was missed in commit 2200e13c7193e0fe9db4b9f7c4bee3a7ef043909
+
+ diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
+ - ocv_target_link_libraries(${the_target} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
+ + ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
+---
+ samples/va_intel/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/samples/va_intel/CMakeLists.txt b/samples/va_intel/CMakeLists.txt
+index af51dd32061..04f2ea5fd40 100644
+--- a/samples/va_intel/CMakeLists.txt
++++ b/samples/va_intel/CMakeLists.txt
+@@ -17,5 +17,5 @@ ocv_include_modules_recurse(${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
+ file(GLOB all_samples RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} *.cpp)
+ foreach(sample_filename ${all_samples})
+ ocv_define_sample(tgt ${sample_filename} va_intel)
+- ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS})
++ ocv_target_link_libraries(${tgt} ${OPENCV_LINKER_LIBS} ${OPENCV_VA_INTEL_SAMPLES_REQUIRED_DEPS} ${VA_LIBRARIES} ${VA_INTEL_LIBRARIES})
+ endforeach()
diff --git a/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
new file mode 100644
index 000000000000..94b221ab9a8b
--- /dev/null
+++ b/media-libs/opencv/files/opencv-3.4.1-remove-git-autodetect.patch
@@ -0,0 +1,42 @@
+--- a/CMakeLists.txt 2019-01-10 19:29:06.831367707 +0100
++++ b/CMakeLists.txt 2019-01-10 19:30:11.125364384 +0100
+@@ -522,23 +522,23 @@
+ # ----------------------------------------------------------------------------
+ # Autodetect if we are in a GIT repository
+ # ----------------------------------------------------------------------------
+-find_host_package(Git QUIET)
++# find_host_package(Git QUIET)
+
+-if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND)
+- execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
+- WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
+- OUTPUT_VARIABLE OPENCV_VCSVERSION
+- RESULT_VARIABLE GIT_RESULT
+- ERROR_QUIET
+- OUTPUT_STRIP_TRAILING_WHITESPACE
+- )
+- if(NOT GIT_RESULT EQUAL 0)
+- set(OPENCV_VCSVERSION "unknown")
+- endif()
+-elseif(NOT DEFINED OPENCV_VCSVERSION)
+- # We don't have git:
+- set(OPENCV_VCSVERSION "unknown")
+-endif()
++# if(NOT DEFINED OPENCV_VCSVERSION AND GIT_FOUND)
++# execute_process(COMMAND "${GIT_EXECUTABLE}" describe --tags --always --dirty --match "[0-9].[0-9].[0-9]*"
++# WORKING_DIRECTORY "${OpenCV_SOURCE_DIR}"
++# OUTPUT_VARIABLE OPENCV_VCSVERSION
++# RESULT_VARIABLE GIT_RESULT
++# ERROR_QUIET
++# OUTPUT_STRIP_TRAILING_WHITESPACE
++# )
++# if(NOT GIT_RESULT EQUAL 0)
++# set(OPENCV_VCSVERSION "unknown")
++# endif()
++# elseif(NOT DEFINED OPENCV_VCSVERSION)
++# # We don't have git:
++# set(OPENCV_VCSVERSION "unknown")
++#endif()
+
+
+ # ----------------------------------------------------------------------------
diff --git a/media-libs/opencv/opencv-3.2.0-r4.ebuild b/media-libs/opencv/opencv-3.2.0-r4.ebuild
deleted file mode 100644
index 31102b464abf..000000000000
--- a/media-libs/opencv/opencv-3.2.0-r4.ebuild
+++ /dev/null
@@ -1,369 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5} )
-
-inherit toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 \
- cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-${PV}.tar.gz ) )"
-LICENSE="BSD"
-SLOT="0/3.2" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_hdf contrib_sfm contrib_xfeatures2d"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it without the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
- cuda? ( tesseract? ( opencl ) )
- gflags? ( contrib )
- glog? ( contrib )
- contrib_cvv? ( contrib qt5 )
- contrib_hdf? ( contrib )
- contrib_sfm? ( contrib eigen gflags glog )
- opengl? ( || ( gtk qt5 ) )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# gtk? ( !qt5 )
-# openmp? ( !threads )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contrib_hdf? ( sci-libs/hdf5 )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
- gdal? ( sci-libs/gdal:= )
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- )
- gtk? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
- )
- ieee1394? (
- media-libs/libdc1394[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- lapack? ( virtual/lapack )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qttest:5
- dev-qt/qtconcurrent:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- tesseract? ( app-text/tesseract[opencl=] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/opencv2/cvconfig.h
- /usr/include/opencv2/opencv_modules.hpp
- # [contrib_cvv]
- /usr/include/opencv2/cvv.hpp
- /usr/include/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv2/cvv/cvv.hpp
- /usr/include/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv2/cvv/dmatch.hpp
- /usr/include/opencv2/cvv/filter.hpp
- /usr/include/opencv2/cvv/final_show.hpp
- /usr/include/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv2/hdf.hpp
- /usr/include/opencv2/hdf/hdf5.hpp
- # [vtk]
- /usr/include/opencv2/viz.hpp
- /usr/include/opencv2/viz/types.hpp
- /usr/include/opencv2/viz/viz3d.hpp
- /usr/include/opencv2/viz/vizcore.hpp
- /usr/include/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv2/viz/widgets.hpp
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-gles.patch"
- "${FILESDIR}/${PN}-3.1.0-java-magic.patch"
- "${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
- "${FILESDIR}/${P}-vtk.patch"
- "${FILESDIR}/${P}-gcc-6.0.patch"
- "${FILESDIR}/${PN}-3.2.0-fix_ussage_cpu_instructions.patch"
- "${FILESDIR}/${P}-cpu-mno-sse2.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use contrib && use contrib_xfeatures2d; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- eapply "${FILESDIR}/${P}-contrib_xfeatures2d-autodownload.patch"
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
-
- java-pkg-opt-2_src_prepare
-
- # this really belongs in src_prepare() too
- JAVA_ANT_ENCODING="iso-8859-1"
- # set encoding so even this cmake build will pick it up.
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
- java-ant-2_src_configure
-}
-
-multilib_src_configure() {
- # please dont sort here, order is the same as in CMakeLists.txt
- GLOBALCMAKEARGS=(
- # Optional 3rd party components
- # ===================================================
- -DWITH_1394=$(usex ieee1394)
- # -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_VTK=$(multilib_native_usex vtk)
- -DWITH_EIGEN=$(usex eigen)
- -DWITH_VFW=OFF # Video windows support
- -DWITH_FFMPEG=$(usex ffmpeg)
- -DWITH_GSTREAMER=$(usex gstreamer)
- -DWITH_GSTREAMER_0_10=OFF # Don't want this
- -DWITH_GTK=$(usex gtk)
- -DWITH_GTK_2_X=$(usex gtk)
- -DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_OPENGL=$(usex opengl)
- -DWITH_OPENVX=OFF
- -DWITH_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_GDCM=OFF
- -DWITH_PVAPI=OFF
- -DWITH_GIGEAPI=OFF
- -DWITH_ARAVIS=OFF
- -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- # -DWITH_QUICKTIME=OFF
- # -DWITH_QTKIT=OFF
- -DWITH_TBB=$(usex threads)
- -DWITH_OPENMP=$(usex openmp)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- -DWITH_TIFF=$(usex tiff)
- -DWITH_UNICAP=OFF # Not packaged
- -DWITH_V4L=$(usex v4l)
- -DWITH_LIBV4L=$(usex v4l)
- -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_XIMEA=OFF # Windows only
- -DWITH_XINE=$(multilib_native_usex xine)
- -DWITH_CLP=OFF
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCL_SVM=OFF
- -DWITH_OPENCLAMDFFT=$(usex opencl)
- -DWITH_OPENCLAMDBLAS=$(usex opencl)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=OFF
- -DWITH_VA=$(usex vaapi)
- -DWITH_VA_INTEL=$(usex vaapi)
- -DWITH_GDAL=$(multilib_native_usex gdal)
- -DWITH_GPHOTO2=$(usex gphoto2)
- -DWITH_LAPACK=$(multilib_native_usex lapack)
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
- # ===================================================
- -DWITH_CUDA=$(multilib_native_usex cuda)
- -DWITH_CUBLAS=$(multilib_native_usex cuda)
- -DWITH_CUFFT=$(multilib_native_usex cuda)
- -DWITH_NVCUVID=OFF
-# -DWITH_NVCUVID=$(usex cuda)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_opencv_apps=
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(multilib_native_usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(multilib_native_usex testprograms)
- -DBUILD_WITH_DEBUG_INFO=$(usex debug)
- # -DBUILD_WITH_STATIC_CRT=OFF
- -DBUILD_WITH_DYNAMIC_IPP=OFF
- -DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
- # -DBUILD_ANDROID_SERVICE=OFF
- -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_CREATE_DISTRIB=OFF
- -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
- -DINSTALL_TESTS=$(multilib_native_usex testprograms)
- -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
- # -DINSTALL_ANDROID_EXAMPLES=OFF
- -DINSTALL_TO_MANGLED_PATHS=OFF
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
- -DENABLE_SOLUTION_FOLDERS=OFF
- -DENABLE_PROFILING=OFF
- -DENABLE_COVERAGE=OFF
- -DENABLE_OMIT_FRAME_POINTER=OFF
- -DENABLE_FAST_MATH=OFF
- -DENABLE_SSE=OFF
- -DENABLE_SSE2=OFF
- -DENABLE_SSE3=OFF
- -DENABLE_SSSE3=OFF
- -DENABLE_SSE41=OFF
- -DENABLE_SSE42=OFF
- -DENABLE_POPCNT=OFF
- -DENABLE_AVX=OFF
- -DENABLE_AVX=OFF
- -DENABLE_AVX2=OFF
- -DENABLE_FMA3=OFF
- -DENABLE_NEON=OFF
-
- -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
- -DENABLE_NOISY_WARNINGS=OFF
- -DOPENCV_WARNINGS_ARE_ERRORS=OFF
- -DENABLE_IMPL_COLLECTION=OFF
- -DENABLE_INSTRUMENTATION=OFF
- -DGENERATE_ABI_DESCRIPTOR=OFF
- -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
- # ===================================================
- # things we want to be hard off or not yet figured out
- # ===================================================
- -DBUILD_PACKAGE=OFF
- -DENABLE_PROFILING=OFF
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DCMAKE_SKIP_RPATH=ON
- -DOPENCV_DOC_INSTALL_PATH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=OFF
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
- )
-
- if multilib_is_native_abi; then
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
- )
- else
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
- )
- fi
- fi
-
- # workaround for bug 413429
- tc-export CC CXX
-
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
- -DPYTHON_EXECUTABLE=OFF
- -DINSTALL_PYTHON_EXAMPLES=OFF
- )
-
- cmake-utils_src_configure
-}
-
-python_module_compile() {
- local BUILD_DIR=${orig_BUILD_DIR}
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
- # Set all python variables to load the correct Gentoo paths
- mycmakeargs+=(
- # cheap trick: python_setup sets one of them as a symlink
- # to the correct interpreter, and the other to fail-wrapper
- -DPYTHON2_EXECUTABLE=$(type -P python2)
- -DPYTHON3_EXECUTABLE=$(type -P python3)
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm -rf CMakeCache.txt || die "rm failed"
- cmake-utils_src_configure
- cmake-utils_src_compile
- cmake-utils_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- # Build and install the python modules for all targets
- if multilib_is_native_abi && use python; then
- local orig_BUILD_DIR=${BUILD_DIR}
- python_foreach_impl python_module_compile
- fi
-}
diff --git a/media-libs/opencv/opencv-3.3.0-r6.ebuild b/media-libs/opencv/opencv-3.3.0-r6.ebuild
deleted file mode 100644
index f911f83e57ed..000000000000
--- a/media-libs/opencv/opencv-3.3.0-r6.ebuild
+++ /dev/null
@@ -1,465 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit toolchain-funcs python-r1 java-pkg-opt-2 java-ant-2 cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- https://dev.gentoo.org/~amynka/snap/imgcodecs-${P}.tar.gz
- contrib? ( https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz )
- contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz ) ) "
-LICENSE="BSD"
-SLOT="0/3.3" # subslot = libopencv* soname version
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux"
-IUSE="contrib cuda debug +eigen examples ffmpeg gdal gflags glog gphoto2 gstreamer gtk ieee1394 jpeg jpeg2k lapack libav opencl openexr opengl openmp pch png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine contrib_cvv contrib_dnn contrib_hdf contrib_sfm contrib_xfeatures2d"
-
-# OpenGL needs gtk or Qt installed to activate, otherwise build system
-# will silently disable it without the user knowing, which defeats the
-# purpose of the opengl use flag.
-REQUIRED_USE="
- cuda? ( tesseract? ( opencl ) )
- gflags? ( contrib )
- glog? ( contrib )
- contrib_cvv? ( contrib qt5 )
- contrib_dnn? ( contrib )
- contrib_hdf? ( contrib )
- contrib_sfm? ( contrib eigen gflags glog )
- contrib_xfeatures2d? ( contrib cuda )
- java? ( python )
- opengl? ( || ( gtk qt5 ) )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# gtk? ( !qt5 )
-# openmp? ( !threads )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contrib_hdf? ( sci-libs/hdf5 )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
- gdal? ( sci-libs/gdal:= )
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- )
- gtk? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
- )
- ieee1394? (
- media-libs/libdc1394[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- lapack? ( virtual/lapack )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qttest:5
- dev-qt/qtconcurrent:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- tesseract? ( app-text/tesseract[opencl=] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- contrib_dnn? ( dev-libs/cereal )
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/opencv2/cvconfig.h
- /usr/include/opencv2/opencv_modules.hpp
- # [contrib_cvv]
- /usr/include/opencv2/cvv.hpp
- /usr/include/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv2/cvv/cvv.hpp
- /usr/include/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv2/cvv/dmatch.hpp
- /usr/include/opencv2/cvv/filter.hpp
- /usr/include/opencv2/cvv/final_show.hpp
- /usr/include/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv2/hdf.hpp
- /usr/include/opencv2/hdf/hdf5.hpp
- # [vtk]
- /usr/include/opencv2/viz.hpp
- /usr/include/opencv2/viz/types.hpp
- /usr/include/opencv2/viz/viz3d.hpp
- /usr/include/opencv2/viz/vizcore.hpp
- /usr/include/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv2/viz/widgets.hpp
- # [cudev]
- /usr/include/opencv2/cudaarithm.hpp
- /usr/include/opencv2/cudabgsegm.hpp
- /usr/include/opencv2/cudacodec.hpp
- /usr/include/opencv2/cudafeatures2d.hpp
- /usr/include/opencv2/cudafilters.hpp
- /usr/include/opencv2/cudaimgproc.hpp
- /usr/include/opencv2/cudalegacy.hpp
- /usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv2/cudaobjdetect.hpp
- /usr/include/opencv2/cudaoptflow.hpp
- /usr/include/opencv2/cudastereo.hpp
- /usr/include/opencv2/cudawarping.hpp
- /usr/include/opencv2/cudev/block/block.hpp
- /usr/include/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv2/cudev/block/scan.hpp
- /usr/include/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv2/cudev/common.hpp
- /usr/include/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv2/cudev/expr/color.hpp
- /usr/include/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv2/cudev.hpp
- /usr/include/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv2/cudev/util/limits.hpp
- /usr/include/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv2/cudev/warp/warp.hpp
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-gles.patch"
- "${FILESDIR}/${PN}-3.1.0-java-magic.patch"
- "${FILESDIR}/${PN}-3.1.0-find-libraries-fix.patch"
- "${WORKDIR}/${P}-imgcodecs-gcc.patch" # bug 627958 and https://github.com/opencv/opencv/pull/9376
- "${FILESDIR}/${P}-cuda9-cmake.patch"
- "${FILESDIR}/${P}-cuda9-saturate.patch"
- "${FILESDIR}/${P}-cuda9-compute20.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use contrib && use contrib_dnn; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- eapply "${FILESDIR}/${P}-remove-tiny-dnn-autodownload.patch"
- fi
-
- if use contrib && use contrib_xfeatures2d; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- eapply "${FILESDIR}/${P}-contrib-xfeatures2d.patch"
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
-
- java-pkg-opt-2_src_prepare
-
- # this really belongs in src_prepare() too
- JAVA_ANT_ENCODING="iso-8859-1"
- # set encoding so even this cmake build will pick it up.
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
- java-ant-2_src_configure
-}
-
-multilib_src_configure() {
- # please dont sort here, order is the same as in CMakeLists.txt
- GLOBALCMAKEARGS=(
- # Optional 3rd party components
- # ===================================================
- -DWITH_1394=$(usex ieee1394)
- # -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_VTK=$(multilib_native_usex vtk)
- -DWITH_EIGEN=$(usex eigen)
- -DWITH_VFW=OFF # Video windows support
- -DWITH_FFMPEG=$(usex ffmpeg)
- -DWITH_GSTREAMER=$(usex gstreamer)
- -DWITH_GSTREAMER_0_10=OFF # Don't want this
- -DWITH_GTK=$(usex gtk)
- -DWITH_GTK_2_X=$(usex gtk)
- -DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_OPENGL=$(usex opengl)
- -DWITH_OPENVX=OFF
- -DWITH_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_GDCM=OFF
- -DWITH_PVAPI=OFF
- -DWITH_GIGEAPI=OFF
- -DWITH_ARAVIS=OFF
- -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- # -DWITH_QUICKTIME=OFF
- # -DWITH_QTKIT=OFF
- -DWITH_TBB=$(usex threads)
- -DWITH_OPENMP=$(usex openmp)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- -DWITH_TIFF=$(usex tiff)
- -DWITH_UNICAP=OFF # Not packaged
- -DWITH_V4L=$(usex v4l)
- -DWITH_LIBV4L=$(usex v4l)
- -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_XIMEA=OFF # Windows only
- -DWITH_XINE=$(multilib_native_usex xine)
- -DWITH_CLP=OFF
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCL_SVM=OFF
- -DWITH_OPENCLAMDFFT=$(usex opencl)
- -DWITH_OPENCLAMDBLAS=$(usex opencl)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=OFF
- -DWITH_VA=$(usex vaapi)
- -DWITH_VA_INTEL=$(usex vaapi)
- -DWITH_GDAL=$(multilib_native_usex gdal)
- -DWITH_GPHOTO2=$(usex gphoto2)
- -DWITH_LAPACK=$(multilib_native_usex lapack)
- -DWITH_ITT=OFF # 3dparty libs itt_notify
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
- # ===================================================
- -DWITH_CUDA=$(multilib_native_usex cuda)
- -DWITH_CUBLAS=$(multilib_native_usex cuda)
- -DWITH_CUFFT=$(multilib_native_usex cuda)
- -DWITH_NVCUVID=OFF
-# -DWITH_NVCUVID=$(usex cuda)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_opencv_apps=
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(multilib_native_usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(multilib_native_usex testprograms)
- -DBUILD_WITH_DEBUG_INFO=$(usex debug)
- # -DBUILD_WITH_STATIC_CRT=OFF
- -DBUILD_WITH_DYNAMIC_IPP=OFF
- -DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
- # -DBUILD_ANDROID_SERVICE=OFF
- -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_CREATE_DISTRIB=OFF
- -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
- -DINSTALL_TESTS=$(multilib_native_usex testprograms)
- -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
- # -DINSTALL_ANDROID_EXAMPLES=OFF
- -DINSTALL_TO_MANGLED_PATHS=OFF
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
- -DENABLE_SOLUTION_FOLDERS=OFF
- -DENABLE_PROFILING=OFF
- -DENABLE_COVERAGE=OFF
-
- -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
- -DENABLE_NOISY_WARNINGS=OFF
- -DOPENCV_WARNINGS_ARE_ERRORS=OFF
- -DENABLE_IMPL_COLLECTION=OFF
- -DENABLE_INSTRUMENTATION=OFF
- -DGENERATE_ABI_DESCRIPTOR=OFF
- -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
- # ===================================================
- # things we want to be hard off or not yet figured out
- # ===================================================
- -DBUILD_PACKAGE=OFF
- # ===================================================
- # Not building protobuf but update files bug #631418
- # ===================================================
- -DBUILD_PROTOBUF=OFF
- -DPROTOBUF_UPDATE_FILES=ON
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DCMAKE_SKIP_RPATH=ON
- -DOPENCV_DOC_INSTALL_PATH=
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
- )
-
- if multilib_is_native_abi; then
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
- )
- else
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
- )
- fi
- fi
-
- # workaround for bug 413429
- tc-export CC CXX
-
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
- -DPYTHON_EXECUTABLE=OFF
- -DINSTALL_PYTHON_EXAMPLES=OFF
- )
-
- cmake-utils_src_configure
-}
-
-python_module_compile() {
- local BUILD_DIR=${orig_BUILD_DIR}
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
- # Set all python variables to load the correct Gentoo paths
- mycmakeargs+=(
- # cheap trick: python_setup sets one of them as a symlink
- # to the correct interpreter, and the other to fail-wrapper
- -DPYTHON2_EXECUTABLE=$(type -P python2)
- -DPYTHON3_EXECUTABLE=$(type -P python3)
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm -rf CMakeCache.txt || die "rm failed"
- cmake-utils_src_configure
- cmake-utils_src_compile
- cmake-utils_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- # Build and install the python modules for all targets
- if multilib_is_native_abi && use python; then
- local orig_BUILD_DIR=${BUILD_DIR}
- python_foreach_impl python_module_compile
- fi
-}
diff --git a/media-libs/opencv/opencv-3.4.1-r2.ebuild b/media-libs/opencv/opencv-3.4.1-r2.ebuild
deleted file mode 100644
index 5da1df041fd6..000000000000
--- a/media-libs/opencv/opencv-3.4.1-r2.ebuild
+++ /dev/null
@@ -1,497 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit java-pkg-opt-2 java-ant-2 python-r1 toolchain-funcs cmake-multilib
-
-DESCRIPTION="A collection of algorithms and sample code for various computer vision problems"
-HOMEPAGE="https://opencv.org"
-TINY_DNN_PV="1.0.0a3"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
- dnn_samples? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-res10_300x300-caffeemodel.tar.gz )
- contrib? (
- https://github.com/${PN}/${PN}_contrib/archive/${PV}.tar.gz -> ${P}_contrib.tar.gz
- contrib_dnn? ( https://github.com/tiny-dnn/tiny-dnn/archive/v${TINY_DNN_PV}.tar.gz -> tiny-dnn-${TINY_DNN_PV}.tar.gz
- https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz
- )
- contrib_xfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.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"
-# 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.
-REQUIRED_USE="
- cuda? ( tesseract? ( opencl ) )
- dnn_samples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contrib_cvv? ( contrib qt5 )
- contrib_dnn? ( contrib )
- contrib_hdf? ( contrib )
- contrib_sfm? ( contrib eigen gflags glog )
- contrib_xfeatures2d? ( contrib cuda )
- java? ( python )
- opengl? ( || ( gtk qt5 ) )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# gtk? ( !qt5 )
-# openmp? ( !threads )
-
-RDEPEND="
- app-arch/bzip2[${MULTILIB_USEDEP}]
- dev-libs/protobuf:=[${MULTILIB_USEDEP}]
- sys-libs/zlib[${MULTILIB_USEDEP}]
- cuda? ( dev-util/nvidia-cuda-toolkit:0= )
- contrib_hdf? ( sci-libs/hdf5 )
- ffmpeg? (
- libav? ( media-video/libav:0=[${MULTILIB_USEDEP}] )
- !libav? ( media-video/ffmpeg:0=[${MULTILIB_USEDEP}] )
- )
- gdal? ( sci-libs/gdal:= )
- gflags? ( dev-cpp/gflags[${MULTILIB_USEDEP}] )
- glog? ( dev-cpp/glog[${MULTILIB_USEDEP}] )
- gphoto2? ( media-libs/libgphoto2[${MULTILIB_USEDEP}] )
- gstreamer? (
- media-libs/gstreamer:1.0[${MULTILIB_USEDEP}]
- media-libs/gst-plugins-base:1.0[${MULTILIB_USEDEP}]
- )
- gtk? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:2[${MULTILIB_USEDEP}]
- opengl? ( x11-libs/gtkglext[${MULTILIB_USEDEP}] )
- )
- ieee1394? (
- media-libs/libdc1394[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${MULTILIB_USEDEP}] )
- jpeg2k? ( media-libs/jasper:=[${MULTILIB_USEDEP}] )
- lapack? ( virtual/lapack )
- opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
- openexr? ( media-libs/openexr[${MULTILIB_USEDEP}] )
- opengl? (
- virtual/opengl[${MULTILIB_USEDEP}]
- virtual/glu[${MULTILIB_USEDEP}]
- )
- png? ( media-libs/libpng:0=[${MULTILIB_USEDEP}] )
- python? ( ${PYTHON_DEPS} dev-python/numpy[${PYTHON_USEDEP}] )
- qt5? (
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- dev-qt/qttest:5
- dev-qt/qtconcurrent:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- tesseract? ( app-text/tesseract[opencl=] )
- threads? ( dev-cpp/tbb[${MULTILIB_USEDEP}] )
- tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] )
- v4l? ( >=media-libs/libv4l-0.8.3[${MULTILIB_USEDEP}] )
- vtk? ( sci-libs/vtk[rendering] )
- webp? ( media-libs/libwebp[${MULTILIB_USEDEP}] )
- xine? ( media-libs/xine-lib )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig[${MULTILIB_USEDEP}]
- contrib_dnn? ( dev-libs/cereal )
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )"
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/opencv2/cvconfig.h
- /usr/include/opencv2/opencv_modules.hpp
- # [contrib_cvv]
- /usr/include/opencv2/cvv.hpp
- /usr/include/opencv2/cvv/call_meta_data.hpp
- /usr/include/opencv2/cvv/cvv.hpp
- /usr/include/opencv2/cvv/debug_mode.hpp
- /usr/include/opencv2/cvv/dmatch.hpp
- /usr/include/opencv2/cvv/filter.hpp
- /usr/include/opencv2/cvv/final_show.hpp
- /usr/include/opencv2/cvv/show_image.hpp
- # [contrib_hdf]
- /usr/include/opencv2/hdf.hpp
- /usr/include/opencv2/hdf/hdf5.hpp
- # [vtk]
- /usr/include/opencv2/viz.hpp
- /usr/include/opencv2/viz/types.hpp
- /usr/include/opencv2/viz/viz3d.hpp
- /usr/include/opencv2/viz/vizcore.hpp
- /usr/include/opencv2/viz/widget_accessor.hpp
- /usr/include/opencv2/viz/widgets.hpp
- # [cudev]
- /usr/include/opencv2/cudaarithm.hpp
- /usr/include/opencv2/cudabgsegm.hpp
- /usr/include/opencv2/cudacodec.hpp
- /usr/include/opencv2/cudafeatures2d.hpp
- /usr/include/opencv2/cudafilters.hpp
- /usr/include/opencv2/cudaimgproc.hpp
- /usr/include/opencv2/cudalegacy.hpp
- /usr/include/opencv2/cudalegacy/NCVBroxOpticalFlow.hpp
- /usr/include/opencv2/cudalegacy/NCVHaarObjectDetection.hpp
- /usr/include/opencv2/cudalegacy/NCV.hpp
- /usr/include/opencv2/cudalegacy/NCVPyramid.hpp
- /usr/include/opencv2/cudalegacy/NPP_staging.hpp
- /usr/include/opencv2/cudaobjdetect.hpp
- /usr/include/opencv2/cudaoptflow.hpp
- /usr/include/opencv2/cudastereo.hpp
- /usr/include/opencv2/cudawarping.hpp
- /usr/include/opencv2/cudev/block/block.hpp
- /usr/include/opencv2/cudev/block/detail/reduce.hpp
- /usr/include/opencv2/cudev/block/detail/reduce_key_val.hpp
- /usr/include/opencv2/cudev/block/dynamic_smem.hpp
- /usr/include/opencv2/cudev/block/reduce.hpp
- /usr/include/opencv2/cudev/block/scan.hpp
- /usr/include/opencv2/cudev/block/vec_distance.hpp
- /usr/include/opencv2/cudev/common.hpp
- /usr/include/opencv2/cudev/expr/binary_func.hpp
- /usr/include/opencv2/cudev/expr/binary_op.hpp
- /usr/include/opencv2/cudev/expr/color.hpp
- /usr/include/opencv2/cudev/expr/deriv.hpp
- /usr/include/opencv2/cudev/expr/expr.hpp
- /usr/include/opencv2/cudev/expr/per_element_func.hpp
- /usr/include/opencv2/cudev/expr/reduction.hpp
- /usr/include/opencv2/cudev/expr/unary_func.hpp
- /usr/include/opencv2/cudev/expr/unary_op.hpp
- /usr/include/opencv2/cudev/expr/warping.hpp
- /usr/include/opencv2/cudev/functional/color_cvt.hpp
- /usr/include/opencv2/cudev/functional/detail/color_cvt.hpp
- /usr/include/opencv2/cudev/functional/functional.hpp
- /usr/include/opencv2/cudev/functional/tuple_adapter.hpp
- /usr/include/opencv2/cudev/grid/copy.hpp
- /usr/include/opencv2/cudev/grid/detail/copy.hpp
- /usr/include/opencv2/cudev/grid/detail/histogram.hpp
- /usr/include/opencv2/cudev/grid/detail/integral.hpp
- /usr/include/opencv2/cudev/grid/detail/minmaxloc.hpp
- /usr/include/opencv2/cudev/grid/detail/pyr_down.hpp
- /usr/include/opencv2/cudev/grid/detail/pyr_up.hpp
- /usr/include/opencv2/cudev/grid/detail/reduce.hpp
- /usr/include/opencv2/cudev/grid/detail/reduce_to_column.hpp
- /usr/include/opencv2/cudev/grid/detail/reduce_to_row.hpp
- /usr/include/opencv2/cudev/grid/detail/split_merge.hpp
- /usr/include/opencv2/cudev/grid/detail/transform.hpp
- /usr/include/opencv2/cudev/grid/detail/transpose.hpp
- /usr/include/opencv2/cudev/grid/histogram.hpp
- /usr/include/opencv2/cudev/grid/integral.hpp
- /usr/include/opencv2/cudev/grid/pyramids.hpp
- /usr/include/opencv2/cudev/grid/reduce.hpp
- /usr/include/opencv2/cudev/grid/reduce_to_vec.hpp
- /usr/include/opencv2/cudev/grid/split_merge.hpp
- /usr/include/opencv2/cudev/grid/transform.hpp
- /usr/include/opencv2/cudev/grid/transpose.hpp
- /usr/include/opencv2/cudev.hpp
- /usr/include/opencv2/cudev/ptr2d/constant.hpp
- /usr/include/opencv2/cudev/ptr2d/deriv.hpp
- /usr/include/opencv2/cudev/ptr2d/detail/gpumat.hpp
- /usr/include/opencv2/cudev/ptr2d/extrapolation.hpp
- /usr/include/opencv2/cudev/ptr2d/glob.hpp
- /usr/include/opencv2/cudev/ptr2d/gpumat.hpp
- /usr/include/opencv2/cudev/ptr2d/interpolation.hpp
- /usr/include/opencv2/cudev/ptr2d/lut.hpp
- /usr/include/opencv2/cudev/ptr2d/mask.hpp
- /usr/include/opencv2/cudev/ptr2d/remap.hpp
- /usr/include/opencv2/cudev/ptr2d/resize.hpp
- /usr/include/opencv2/cudev/ptr2d/texture.hpp
- /usr/include/opencv2/cudev/ptr2d/traits.hpp
- /usr/include/opencv2/cudev/ptr2d/transform.hpp
- /usr/include/opencv2/cudev/ptr2d/warping.hpp
- /usr/include/opencv2/cudev/ptr2d/zip.hpp
- /usr/include/opencv2/cudev/util/atomic.hpp
- /usr/include/opencv2/cudev/util/detail/tuple.hpp
- /usr/include/opencv2/cudev/util/detail/type_traits.hpp
- /usr/include/opencv2/cudev/util/limits.hpp
- /usr/include/opencv2/cudev/util/saturate_cast.hpp
- /usr/include/opencv2/cudev/util/simd_functions.hpp
- /usr/include/opencv2/cudev/util/tuple.hpp
- /usr/include/opencv2/cudev/util/type_traits.hpp
- /usr/include/opencv2/cudev/util/vec_math.hpp
- /usr/include/opencv2/cudev/util/vec_traits.hpp
- /usr/include/opencv2/cudev/warp/detail/reduce.hpp
- /usr/include/opencv2/cudev/warp/detail/reduce_key_val.hpp
- /usr/include/opencv2/cudev/warp/reduce.hpp
- /usr/include/opencv2/cudev/warp/scan.hpp
- /usr/include/opencv2/cudev/warp/shuffle.hpp
- /usr/include/opencv2/cudev/warp/warp.hpp
-)
-
-PATCHES=(
- "${FILESDIR}/${PN}-3.0.0-gles.patch"
- "${FILESDIR}/${PN}-3.4.0-disable-download.patch"
- "${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
- "${FILESDIR}/${P}-python-lib-suffix-hack.patch"
- "${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
-)
-
-pkg_pretend() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
- [[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
- java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
- cmake-utils_src_prepare
-
- # remove bundled stuff
- rm -rf 3rdparty || die "Removing 3rd party components failed"
- sed -e '/add_subdirectory(.*3rdparty.*)/ d' \
- -i CMakeLists.txt cmake/*cmake || die
-
- if use dnn_samples; then
- mv "${WORKDIR}/res10_300x300_ssd_iter_140000.caffemodel" "${WORKDIR}/${P}/samples/dnn/" || die
- fi
-
- if use contrib; then
- cd "${WORKDIR}/${PN}_contrib-${PV}" || die
- eapply "${FILESDIR}/${PN}-3.3.0-remove-tiny-dnn-autodownload.patch"
-
- if use contrib_xfeatures2d; then
- mv "${WORKDIR}"/*.i "${WORKDIR}/${PN}_contrib-${PV}"/modules/xfeatures2d/src/ || die
- fi
- fi
-
- java-pkg-opt-2_src_prepare
-
- # this really belongs in src_prepare() too
- JAVA_ANT_ENCODING="iso-8859-1"
- # set encoding so even this cmake build will pick it up.
- export ANT_OPTS+=" -Dfile.encoding=iso-8859-1"
- java-ant-2_src_configure
-}
-
-multilib_src_configure() {
- # please dont sort here, order is the same as in CMakeLists.txt
- GLOBALCMAKEARGS=(
- # Optional 3rd party components
- # ===================================================
- -DENABLE_DOWNLOAD=OFF
- -DWITH_1394=$(usex ieee1394)
- # -DWITH_AVFOUNDATION=OFF # IOS
- -DWITH_VTK=$(multilib_native_usex vtk)
- -DWITH_EIGEN=$(usex eigen)
- -DWITH_VFW=OFF # Video windows support
- -DWITH_FFMPEG=$(usex ffmpeg)
- -DWITH_GSTREAMER=$(usex gstreamer)
- -DWITH_GSTREAMER_0_10=OFF # Don't want this
- -DWITH_GTK=$(usex gtk)
- -DWITH_GTK_2_X=$(usex gtk)
- -DWITH_IPP=OFF
- -DWITH_JASPER=$(usex jpeg2k)
- -DWITH_JPEG=$(usex jpeg)
- -DWITH_WEBP=$(usex webp)
- -DWITH_OPENEXR=$(usex openexr)
- -DWITH_OPENGL=$(usex opengl)
- -DWITH_OPENVX=OFF
- -DWITH_OPENNI=OFF # Not packaged
- -DWITH_OPENNI2=OFF # Not packaged
- -DWITH_PNG=$(usex png)
- -DWITH_GDCM=OFF
- -DWITH_PVAPI=OFF
- -DWITH_GIGEAPI=OFF
- -DWITH_ARAVIS=OFF
- -DWITH_QT=$(multilib_native_usex qt5 5 OFF)
- -DWITH_WIN32UI=OFF # Windows only
- # -DWITH_QUICKTIME=OFF
- # -DWITH_QTKIT=OFF
- -DWITH_TBB=$(usex threads)
- -DWITH_OPENMP=$(usex openmp)
- -DWITH_CSTRIPES=OFF
- -DWITH_PTHREADS_PF=ON
- -DWITH_TIFF=$(usex tiff)
- -DWITH_UNICAP=OFF # Not packaged
- -DWITH_V4L=$(usex v4l)
- -DWITH_LIBV4L=$(usex v4l)
- -DWITH_DSHOW=ON # direct show supp
- -DWITH_MSMF=OFF
- -DWITH_XIMEA=OFF # Windows only
- -DWITH_XINE=$(multilib_native_usex xine)
- -DWITH_CLP=OFF
- -DWITH_OPENCL=$(usex opencl)
- -DWITH_OPENCL_SVM=OFF
- -DWITH_OPENCLAMDFFT=$(usex opencl)
- -DWITH_OPENCLAMDBLAS=$(usex opencl)
- -DWITH_DIRECTX=OFF
- -DWITH_INTELPERC=OFF
- -DWITH_IPP_A=OFF
- -DWITH_MATLAB=OFF
- -DWITH_VA=$(usex vaapi)
- -DWITH_VA_INTEL=$(usex vaapi)
- -DWITH_GDAL=$(multilib_native_usex gdal)
- -DWITH_GPHOTO2=$(usex gphoto2)
- -DWITH_LAPACK=$(multilib_native_usex lapack)
- -DWITH_ITT=OFF # 3dparty libs itt_notify
- # ===================================================
- # CUDA build components: nvidia-cuda-toolkit takes care of GCC version
- # ===================================================
- -DWITH_CUDA=$(multilib_native_usex cuda)
- -DWITH_CUBLAS=$(multilib_native_usex cuda)
- -DWITH_CUFFT=$(multilib_native_usex cuda)
- -DWITH_NVCUVID=OFF
-# -DWITH_NVCUVID=$(usex cuda)
- -DCUDA_NPP_LIBRARY_ROOT_DIR=$(usex cuda "${EPREFIX}/opt/cuda" "")
- # ===================================================
- # OpenCV build components
- # ===================================================
- -DBUILD_SHARED_LIBS=ON
- -DBUILD_JAVA=$(multilib_native_usex java) # Ant needed, no compile flag
- -DBUILD_ANDROID_EXAMPLES=OFF
- -DBUILD_opencv_apps=
- -DBUILD_DOCS=OFF # Doesn't install anyways.
- -DBUILD_EXAMPLES=$(multilib_native_usex examples)
- -DBUILD_PERF_TESTS=OFF
- -DBUILD_TESTS=$(multilib_native_usex testprograms)
- -DBUILD_WITH_DEBUG_INFO=$(usex debug)
- # -DBUILD_WITH_STATIC_CRT=OFF
- -DBUILD_WITH_DYNAMIC_IPP=OFF
- -DBUILD_FAT_JAVA_LIB=$(multilib_native_usex java)
- # -DBUILD_ANDROID_SERVICE=OFF
- -DBUILD_CUDA_STUBS=$(multilib_native_usex cuda)
- -DOPENCV_EXTRA_MODULES_PATH=$(usex contrib "${WORKDIR}/opencv_contrib-${PV}/modules" "")
- # ===================================================
- # OpenCV installation options
- # ===================================================
- -DINSTALL_CREATE_DISTRIB=OFF
- -DINSTALL_C_EXAMPLES=$(multilib_native_usex examples)
- -DINSTALL_TESTS=$(multilib_native_usex testprograms)
- -DINSTALL_PYTHON_EXAMPLES=$(multilib_native_usex examples)
- # -DINSTALL_ANDROID_EXAMPLES=OFF
- -DINSTALL_TO_MANGLED_PATHS=OFF
- # opencv uses both ${CMAKE_INSTALL_LIBDIR} and ${LIB_SUFFIX}
- # to set its destination libdir
- -DLIB_SUFFIX=
- # ===================================================
- # OpenCV build options
- # ===================================================
- -DENABLE_CCACHE=OFF
- -DENABLE_PRECOMPILED_HEADERS=$(usex pch)
- -DENABLE_SOLUTION_FOLDERS=OFF
- -DENABLE_PROFILING=OFF
- -DENABLE_COVERAGE=OFF
-
- -DHAVE_opencv_java=$(multilib_native_usex java YES NO)
- -DENABLE_NOISY_WARNINGS=OFF
- -DOPENCV_WARNINGS_ARE_ERRORS=OFF
- -DENABLE_IMPL_COLLECTION=OFF
- -DENABLE_INSTRUMENTATION=OFF
- -DGENERATE_ABI_DESCRIPTOR=OFF
- -DDOWNLOAD_EXTERNAL_TEST_DATA=OFF
- # ===================================================
- # things we want to be hard off or not yet figured out
- # ===================================================
- -DBUILD_PACKAGE=OFF
- # ===================================================
- # Not building protobuf but update files bug #631418
- # ===================================================
- -DBUILD_PROTOBUF=OFF
- -DPROTOBUF_UPDATE_FILES=ON
- # ===================================================
- # things we want to be hard enabled not worth useflag
- # ===================================================
- -DCMAKE_SKIP_RPATH=ON
- -DOPENCV_DOC_INSTALL_PATH=
- # ==================================================
- # cpu flags, should solve 633900
- #===================================================
- -DCPU_DISPATCH=
- -DENABLE_SSE=$(usex cpu_flags_x86_sse)
- -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
- -DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
- -DENABLE_SSSE3=$(usex cpu_flags_x86_ssse3)
- -DENABLE_SSE41=$(usex cpu_flags_x86_sse4_1)
- -DENABLE_SSE42=$(usex cpu_flags_x86_sse4_2)
- -DENABLE_POPCNT=$(usex cpu_flags_x86_popcnt)
- -DENABLE_AVX=$(usex cpu_flags_x86_avx)
- -DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
- -DENABLE_FMA3=$(usex cpu_flags_x86_fma3)
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contrib_dnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contrib_xfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contrib_cvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contrib_hdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contrib_sfm ON OFF)
- )
-
- if multilib_is_native_abi; then
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=$(usex !tesseract)
- )
- else
- GLOBALCMAKEARGS+=(
- -DCMAKE_DISABLE_FIND_PACKAGE_Tesseract=ON
- )
- fi
- fi
-
- # workaround for bug 413429
- tc-export CC CXX
-
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]}
- -DPYTHON_EXECUTABLE=OFF
- -DINSTALL_PYTHON_EXAMPLES=OFF
- )
-
- cmake-utils_src_configure
-
- # Copy face_land_model to ${CMAKE_BINARY_DIR}/${OPENCV_TEST_DATA_INSTALL_PATH}
- # TODO patch ocv_download to copy files into destination dirs
- if use contrib_dnn; then
- mkdir -p "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
- cp "${WORKDIR}"/face_landmark_model.dat "${BUILD_DIR}"/share/OpenCV/testdata/cv/face/ || die
- fi
-
-}
-
-python_module_compile() {
- local BUILD_DIR=${orig_BUILD_DIR}
- local mycmakeargs=( ${GLOBALCMAKEARGS[@]} )
-
- # Set all python variables to load the correct Gentoo paths
- mycmakeargs+=(
- # cheap trick: python_setup sets one of them as a symlink
- # to the correct interpreter, and the other to fail-wrapper
- -DPYTHON2_EXECUTABLE=$(type -P python2)
- -DPYTHON3_EXECUTABLE=$(type -P python3)
- -DINSTALL_PYTHON_EXAMPLES=$(usex examples)
- -DLIBPY_SUFFIX=64
- )
-
- # Regenerate cache file. Can't use rebuild_cache as it won't
- # have the Gentoo specific options.
- rm -rf CMakeCache.txt || die "rm failed"
- cmake-utils_src_configure
- cmake-utils_src_compile
- cmake-utils_src_install
-
- # Remove compiled binary so new version compiles
- # Avoid conflicts with new module builds as build system doesn't
- # really support it.
- rm -rf modules/python2 || die "rm failed"
-}
-
-multilib_src_install() {
- cmake-utils_src_install
-
- # Build and install the python modules for all targets
- if multilib_is_native_abi && use python; then
- local orig_BUILD_DIR=${BUILD_DIR}
- python_foreach_impl python_module_compile
- fi
-}
diff --git a/media-libs/opencv/opencv-3.4.1-r5.ebuild b/media-libs/opencv/opencv-3.4.1-r5.ebuild
index b03f24a84911..45086698e736 100644
--- a/media-libs/opencv/opencv-3.4.1-r5.ebuild
+++ b/media-libs/opencv/opencv-3.4.1-r5.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
@@ -23,7 +23,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"
+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"
# OpenGL needs gtk or Qt installed to activate, otherwise build system
# will silently disable it Wwithout the user knowing, which defeats the
@@ -105,7 +105,8 @@ DEPEND="${RDEPEND}
virtual/pkgconfig[${MULTILIB_USEDEP}]
contrib_dnn? ( dev-libs/cereal )
eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )"
+ java? ( >=virtual/jdk-1.6 )
+ vaapi? ( x11-libs/libva )"
MULTILIB_WRAPPED_HEADERS=(
/usr/include/opencv2/cvconfig.h
@@ -230,6 +231,8 @@ PATCHES=(
"${FILESDIR}/${P}-compilation-C-mode.patch" # https://bugs.gentoo.org/656530
"${FILESDIR}/${P}-python-lib-suffix-hack.patch"
"${FILESDIR}/${P}-cuda-add-relaxed-constexpr.patch"
+ "${FILESDIR}/${P}-remove-git-autodetect.patch"
+ "${FILESDIR}/${P}-fix-build-with-va.patch" # bug https://bugs.gentoo.org/656576
)
pkg_pretend() {
diff --git a/media-libs/openjpeg/Manifest b/media-libs/openjpeg/Manifest
index e4771b3c889c..59c90acac202 100644
--- a/media-libs/openjpeg/Manifest
+++ b/media-libs/openjpeg/Manifest
@@ -4,6 +4,6 @@ DIST openjpeg-1.5.2.tar.gz 1385702 BLAKE2B 936ab6e0fb48f2839df13113c716c39b9572b
DIST openjpeg-2.3.0.tar.gz 2207329 BLAKE2B b03ddb02127cc85e647cbda11423f63f2caa0abae40d5687a1b191e7857aa9b428da5afc86ce0c08cce1516c290eeac31ae1db841db56ba70afa020f126d2508 SHA512 0a9d427be4a820b1d759fca4b50e293721b45fe4885aa61ca1ae09e099f75ed93520448090c780d62f51076d575cc03618cd6d5181bdb6b34e4fc07b4cfdd568
DIST openjpeg-data_20170814.tar.gz 497454197 BLAKE2B ea27ab763e685724dfd5c2242a93d9b93111a0516ea7a8aef9f37ec31b00cc887d84d4d0bf7f79f3636aa0ea9a0302f43df4596fc967c243a8773ccde6e79fe0 SHA512 a13c941839f0d3f3a71b3f5b36d6c2ddb789e765526ebb6aed99150991bb717363e3ce40f335451a983d44a0b047538e0870d0fe5b37d6a002497eb99a403e24
EBUILD openjpeg-1.5.2-r1.ebuild 1948 BLAKE2B 08ae38cae98a197e1bd980101b9e5938e8d29dc9a37421adb14f421a4df84b5cca4ed216d939d757e519684493b5b58c1f5273922e9fc335ee65a958ee898550 SHA512 8b18759b5eb0ca3e5446453f6f3e550a20519147af5026169b28eae43ff51a94c6522efbc07edc39438e3372b16452fce4f41f32b2ae848ec779a1ea25f6513b
-EBUILD openjpeg-2.3.0-r1.ebuild 4218 BLAKE2B a4215ae39c30b23c280b65d6269c6bbb0235fbdb4051e4906bc141d0aff54e003700504e9270e5272318d892331038cafbdb032e298fc926ada3a5c7822285cd SHA512 afce08f4c53acbc06ac1100563ef43121e9d3de1d8a0e53daf51997a7e19c577bab742221aa36e279fda3bf4b1f01de7b4f2cb5e9d1c42f476999c28ba4b2c77
+EBUILD openjpeg-2.3.0-r1.ebuild 4216 BLAKE2B 42d1a0d8eb060f1534fe121015bd13e4076b6f83aaea3e71dd9f1fa579217aec2abf3347d1aafe233f97c0fe8ccb8ba4dc4dab6a632b9318c52c8e7f794bebd4 SHA512 5cf6873ffd7f679a73faa21cc8bd763232b5c82b9e99eab34221d4fbf8238a055245223f041fc7b5dd95e6d6730a4e6a6fdc1d8eba9c7dd47fa37ca3907f45c4
EBUILD openjpeg-2.3.0.ebuild 4061 BLAKE2B 053eaa5be9d8fea70993aaa213bcd1cb7c295a65f1b0b0d0a486603119c1f68d853e5d54004d99e6b3c73ddb264371aeaa2bb27fd992eb08173d8f8947dd24f9 SHA512 755ce46efd8ea987b1d4cabae47b5d342955454a4a02735e9c504e19b6a0d11324caca8e20e2a97adbaf048c361833991c24cad397e31bb285be237ab2e5e3ff
MISC metadata.xml 455 BLAKE2B ee0da6c575d6fd05b1aa361cb11e09eaffc18f24f57010a66c31127bd1e55073262c1c0789f07779ef864d6cb27670e8653c6b1269681b5b6497185b5d0583aa SHA512 b956f115708b8afff16126117cacfa9bb51fb55660e19cb6b295081d81790c5c6e8858bc28193f3d9a5b0da66189490938c83c32124e33dedb37ea4a8c8ef99d
diff --git a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
index e64e6fcf028a..f292e53179e6 100644
--- a/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
+++ b/media-libs/openjpeg/openjpeg-2.3.0-r1.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/uclouvain/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
LICENSE="BSD-2"
SLOT="2/7" # based on SONAME
-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"
+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"
IUSE="doc static-libs test"
RDEPEND="
diff --git a/media-libs/phonon-gstreamer/Manifest b/media-libs/phonon-gstreamer/Manifest
index 995591957b77..5caf4d338089 100644
--- a/media-libs/phonon-gstreamer/Manifest
+++ b/media-libs/phonon-gstreamer/Manifest
@@ -1,7 +1,6 @@
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.9.0.tar.xz 75960 BLAKE2B 676810dc99f3734a6932bfe355a37df1334c3460eba9a6d96e039442ce2729b61db61798c1f7207aef68a30f79355703c80e6aeb1a2ca7156f22e9fd7e07027b SHA512 9c13d37c6c7070c2bd8fcc562f743ac2f55289bc7cc82147ef0ae990e5d380d541cc1d9ce61e6ad1549ed1935d41faafaeeb0cd5463e4c656ea8fee636ff4dfe
-EBUILD phonon-gstreamer-4.9.0-r2.ebuild 1112 BLAKE2B d89617cbae84c6cfc8aada90399857bb9da793b1eb5e9521c0dbc2bd98c1510b5e1c9a34a013180070898713290b343ed7dffd697a608df7b3a513321882bffc SHA512 d57323dda5dd554e8ac0b6fae3bb3fad57b255b3d4f396eb70765a8088b509f0f34ddf10b3723fb048feb7aa0c1eddc4463e37513ffcd0268e8cf31adfb33599
-EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1171 BLAKE2B 1a8b437bfc5d212095c9512ef4f4fed781272ff71e223276ee59ec0939a8cb09ddb79e16f5673808556f28ff0d4967339085c61a344c3bfc77135e819431fa24 SHA512 18804f0bd1a29e70254eca50599ec809eb30baaf49e6563e2251cf1c49bee3ed6258f970290e1f476d9a1803c692a35cd9c775b98d3522e1149e775e7fc79279
+EBUILD phonon-gstreamer-4.9.0-r3.ebuild 1169 BLAKE2B 7781a9243077c4d290ddd3f62e0400b905ac7f925ec250f920b1d86b53b5de073e40c56056a0bfbfec16315430b008b5ec0c9e8662c57439d6a01405c90b3f91 SHA512 b4329bfe0c963bd91fc9d8a9c682bb5ca14db62454d406fb0535bfb56a4f6007f951d66ef33372862b158d8415fa4c9cf55dd44fe36245c6b82d7eebc681cd82
EBUILD phonon-gstreamer-9999.ebuild 1076 BLAKE2B cc052d97bd49ea217e9cd98c7dd716f34e21088ac9f76c0a1816198a70a3431bec3c9e78de843523e23fa23e5eb947734b38b5958bf99393d54ad05fbe0d43db SHA512 a591c829bbbaa09bddb724956605fcb65528113769837d0232a87feb057a4f15825c7b7a0fdad7e65fd457a756c96ad372aa0ec0baf54b12d7e800c3d25ecb4d
MISC metadata.xml 339 BLAKE2B 2e6fd710b9791c7dd1f8836dac9209a84608dcb54d5ebef458acef6651c03eb55d8733d23df0a6cd0dbe470f00d43e0413b3d18b432f8a38a765af458e5662fc SHA512 c481721ab8e7762b2b951501cc99f7e2d2263ffd682dce3731fb415b677b74f7fbfe7770e9d2b1b1ce496c10254b84bb7489ff971593dac90c151a9ff1623e9a
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
deleted file mode 100644
index ace0c03d2dc7..000000000000
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r2.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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
-
-DESCRIPTION="Phonon GStreamer backend"
-HOMEPAGE="https://phonon.kde.org/"
-
-LICENSE="LGPL-2.1+ || ( LGPL-2.1 LGPL-3 )"
-SLOT="0"
-IUSE="alsa debug +network"
-
-RDEPEND="
- 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.0
- media-plugins/gst-plugins-meta:1.0[alsa?,ogg,vorbis]
- virtual/opengl
- network? ( media-plugins/gst-plugins-soup:1.0 )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
- local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
index cc7a98acb8dd..e2f6469b9c61 100644
--- a/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.ebuild
+++ b/media-libs/phonon-gstreamer/phonon-gstreamer-4.9.0-r3.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=7
@@ -8,7 +8,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
else
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
inherit git-r3
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index e8a1803b18b7..1a5fb6c44ab6 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,7 +1,5 @@
AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
-DIST phonon-backend-vlc-0.10.1.tar.xz 61096 BLAKE2B 5124d43a68af5a1ecac46c591e8b727868096e07156e6bc277c94199b6138433c826febf46cf5ffc7776c936fa6373d5ac2114c7a730a6b89380014c44e581fe SHA512 fa94298a8236c29f792285d3f288140d244e0eacba02511a32ee56b5bace50f92a93a714b5c44dc5bafb15b2a9d5ae792231e78dce8ca1a45ab3a328492911df
DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
-EBUILD phonon-vlc-0.10.1.ebuild 841 BLAKE2B 90482c1985f84edca55bca9dfc488d84472045d44ee4046e7044afd9258a0179c45ed604f4e985b6cdd6bbcc7c9d541d0ec531b917a9bbbe334e3c16ab37bb2a SHA512 8f6e296b8a8eac9b8738cd53a38f30855f84a33b916ca40b2653d631f416ec52eb41dc88e698436f7893ea4701d532f633dd52f81b5aeae797d28ac27b6a9cf9
-EBUILD phonon-vlc-0.10.2.ebuild 890 BLAKE2B 2c561361159c686734344629ceb7bafcf6490e2a94353c623c55bc4b2e98d36df07ade1a01006d2cbb5ef5f657da65a91030c5e04ca594900e3475f89cec7f94 SHA512 71ab1777b188ac593f2e94d293ca33946a39700c23c5ed2b5bfc889c0b1cef8b91b635b13edb547f65fa04dc2310542196c0854313fdf9d17a96f5153c7d1295
+EBUILD phonon-vlc-0.10.2.ebuild 888 BLAKE2B a6886cc21e6937c26ade888dc11bfdc4b01772920e804646f5eebcfcb1bfa8c924dd66da919276574fb07a82809d1669c967d9ea19e0fd6e0a2cd413dd678081 SHA512 ef63ea128df69ac4f75a3b79f445293a3c10f9fc3622debfc0f431b7ccf3dd21128b48e606577609abc8c1952a83d6f91defe3483086353defccd22ad31f42e3
EBUILD phonon-vlc-9999.ebuild 805 BLAKE2B 68dea701bda421326ea0b2fadd1c8b212442855e9c4a4fbd12d43e058dcb823a04b53b13a654102e58df26877dfea82cbed1c6735e78bd1076992ac5d83ff2e9 SHA512 608dbbd83aba883b269ea53ecf7eb816cd5bc9fa482c4bc9759f19cd7f51cde1940c3b9b157323b413eede37a8a1a9c458a0cdac0fd4ad5bd177486e0e23c172
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
deleted file mode 100644
index 13ad0d371f84..000000000000
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-RDEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- >=media-libs/phonon-4.10.0
- media-video/vlc:=[dbus,ogg,vorbis]
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
-
-src_configure() {
- local mycmakeargs=( -DPHONON_BUILD_PHONON4QT5=ON )
- cmake-utils_src_configure
-}
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
index f4ae408d5c77..7e86137ac367 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.10.2.ebuild
@@ -7,7 +7,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"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
else
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
inherit git-r3
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index 590052fc7001..8bc50ff363eb 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,6 +1,4 @@
-DIST phonon-4.10.1.tar.xz 322100 BLAKE2B 0040bcc82e68a52cb8056c29b5008daddfd8b985f95113e17f1c18d1b5bf1f81222a34ae45b2ee5bd3bc0f104614551638642a85e1770fc218cbe7e2209b5a0e SHA512 a1cc0960c587d09a2fb0f43ae82147df133c34cba7bf01f5720b4b27aca4dda1d83444e89e40fb2f25828d152f89ccfff56d2d4649007c57b7df9eca8c64c007
DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
-EBUILD phonon-4.10.1.ebuild 1316 BLAKE2B 4f5bc7ee24bc83bd5a015a95a39b33fd04d5dfd4fc005b9066f66a811e7ebac9cd2342ca8404bb581f78e66f4a4419845ca7462d1cb77a1c163ba45a5fa87d49 SHA512 a74bd9738dc1d27e9d58dce0088fe1c0c6696d0d19a17ac31a38a41c4966a16def6a5f84be108e70c37ecca233fa11d86010ec67f41ec69ff1c255e72b7e61cc
-EBUILD phonon-4.10.2.ebuild 1326 BLAKE2B 80fbd37bddc8762071ada165dce4736a6588d06ed1f1191858076bad55dca1d527a85f530edfcc206f6b7b5b9d937494b65b1c7916604102b11af4700104483e SHA512 65dba06b0217f8fdca06802b50faf359d9edf35bf6dc8b65abcfc506d826e89836878aa18293070721d753482fd3c770264a5b072c91b9b1c0bcc6bf781fcfaf
+EBUILD phonon-4.10.2.ebuild 1324 BLAKE2B 6ef0d20a4dbb85e7a3e79dd79912bd9cf1fadf976299b6da7d5afc99435bc887daa72dc454b7bad35380e616593527e67966bade83b8287781c1484e309064b2 SHA512 d2ec58720805baffc45efd4eb073e2237a04307a3131c87b000421b2f322a315d820b47f3e88c207dcdb6c0e1e107f229490323a16bb93f40c8988f477598d1f
EBUILD phonon-9999.ebuild 1326 BLAKE2B 7c6d2b1dc638e0caaa10c788fcb50a56f2aabbcdf1ce4107713b5aac3b89efdbb49fdaebbd18f8c6e6728751db0387bba79f3df91dbee99d503308d83d97bf97 SHA512 88475f68ad0c6ebee1cea8783990d1bd3d269ac4834495094773dca906bb094e37c37abeb64b300584baa6049d273e73954f7e2009d36c2257e67736807275b0
MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.10.1.ebuild b/media-libs/phonon/phonon-4.10.1.ebuild
deleted file mode 100644
index 58820d1003c0..000000000000
--- a/media-libs/phonon/phonon-4.10.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-RDEPEND="
- !!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]
- )
-"
-DEPEND="${RDEPEND}
- kde-frameworks/extra-cmake-modules:5
- virtual/pkgconfig
-"
-PDEPEND="
- gstreamer? ( >=media-libs/phonon-gstreamer-4.9.0[qt5(+)] )
- vlc? ( >=media-libs/phonon-vlc-0.9.0[qt5(+)] )
-"
-
-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-4.10.2.ebuild b/media-libs/phonon/phonon-4.10.2.ebuild
index 264801e2557e..ba2947c3d6d7 100644
--- a/media-libs/phonon/phonon-4.10.2.ebuild
+++ b/media-libs/phonon/phonon-4.10.2.ebuild
@@ -5,7 +5,7 @@ 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"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86 ~amd64-fbsd"
else
EGIT_REPO_URI=( "git://anongit.kde.org/${PN}" )
inherit git-r3
diff --git a/media-libs/sbc/Manifest b/media-libs/sbc/Manifest
index 5b72d1dd52dd..48052b80a1b1 100644
--- a/media-libs/sbc/Manifest
+++ b/media-libs/sbc/Manifest
@@ -1,3 +1,5 @@
DIST sbc-1.3.tar.xz 246292 BLAKE2B 6d628f4f5fe592b04255a965b08a85736c75d16e4caa3a5fda1dad57a5a47a82accd5e61ae48adfaf9ac1a478e20b5fa02e7a34c87fda0ac79666f616c4356e6 SHA512 c11cb1ede8abdb226d404ce34307d217b716b91cbe550ed90cb5387b062b7b97a6b7a81371de6f462d8c1429cb3299869a1bda347fa175e9d81cfa2bc2056c8b
+DIST sbc-1.4.tar.xz 250656 BLAKE2B a5b59a0ac209b44843af49e63f7b6a6b397b3905f0efc52c18a3b92785d297d39dad80f5b124e97c50a9535f892f1451bf0a2945ba223a522eafbcad46eaad9d SHA512 f35250c202034e93ce4046d29883d76b162164d42fb59e6af8ff5e57f197244238f5f8087309cef2d44755c179e7f0869cf096735c8de510b1ac7e0f6c29d84f
EBUILD sbc-1.3.ebuild 865 BLAKE2B 4f889f142268ddb390da6485a3a2d413a37a2d850f8624bf095b1d4abe57def3754431608b23144ca94b4742b4f11d201f6e3f5d0fac0e366e2a6b6387520adf SHA512 eb366a5d5e5497c5d650c365b31334bd1a528f85d2ec7940d524f0786b92927e2d2f6a2a61bcf61a14b34d8fb54f3facbf64a3637484ad8ff65aace88def2737
+EBUILD sbc-1.4.ebuild 871 BLAKE2B 26ef75f09f29f947967ebd2901ae6ba183eb05035234008ae4906dfdce44660241ba0da2165bc44df5c712112a5751da4bc00e80fa7a72788832a15df76ff1c9 SHA512 664ab105d6b668137a3e75cd359a5300316c06a22ff9384bc1a3ffe2e1f09077225141c00e2c0a000517f66d6574c516baec6e4413814f9f9defbca6f6f6e190
MISC metadata.xml 356 BLAKE2B 37e1eb09d0de357b5f84cc88a36d602c1522fb5e1a80542390297eca08bef82e30a85af697c5bcf1e042b98a63943f49b3e7902ef866207998583ff0c1a96c00 SHA512 c9b1f0a337ecc94fb295f536d18166b9bae68ca96e27f96a17b38b2374203bc6979e9f168e423e2eb87520919ba76c433a6b60c866b82c449b48d84e92165524
diff --git a/media-libs/sbc/sbc-1.4.ebuild b/media-libs/sbc/sbc-1.4.ebuild
new file mode 100644
index 000000000000..5da8220a4970
--- /dev/null
+++ b/media-libs/sbc/sbc-1.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 multilib-minimal
+
+DESCRIPTION="Audio codec to connect bluetooth HQ audio devices as headphones or loudspeakers"
+HOMEPAGE="https://git.kernel.org/?p=bluetooth/sbc.git http://www.bluez.org/sbc-10/"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static-libs"
+
+# --enable-tester is building src/sbctester but the tarball is missing required
+# .wav file to execute it
+RESTRICT="test"
+
+RDEPEND=""
+DEPEND="virtual/pkgconfig"
+
+multilib_src_configure() {
+ ECONF_SOURCE=${S} \
+ econf \
+ $(use_enable static-libs static) \
+ --disable-tester
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${D}" -name '*.la' -delete || die
+}
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index 2c9d660149ed..d772c69c0281 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -1,6 +1,7 @@
AUX vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch 903 BLAKE2B 5eb6f0970a6d3a3ead1f7efbd6746a5de1feb0db57cc03e62d7670633fb0ddf8d810b5913e5c819c6ba57204b566f5592c4d8b86368f7776d1d7bb4eac83d39b SHA512 c8f59b8c954f4207c1c946db88c1af2f1110ed37d68ad7cc1962be9d6b1659b4833ae4257b359b25d5f1ede65ff87447a94d2d39c0028f9a3bbd7cf4a69d5bd7
+AUX vidstab-1.1.0-tests-use-sse2-only-if-available.patch 1047 BLAKE2B 198d481a781186583b0f842f677e540e0f58fbf0f146d32ed1d5c47675f02ef3e7d7457674ef87104e28d0afd5931c9c082569fd86c0e594302e1513f9a9f281 SHA512 a09f845947bc9c22700a998e2fa985f735d42146745de0b6686d61b14ef7aecb4229842b35caab8a79f874c5875241a87e0a9556ca326d54358648b515be5e5d
DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
-EBUILD vidstab-1.1.0-r1.ebuild 1447 BLAKE2B 82d1ae07504a1942c912bdf94bcaf0ceeeec0ad7c89ea0e4785a4ef80418b3e8ecd677fc10b7447d8d34f0c75484111d2fa03d0c66035824eb6376e9ad5f560f SHA512 a042c2292bd3e7eabfaad9fad569b5bdfcf2f90961bb884a4fa82c2f640f3392d05eb2b123cc2b1ee2b18c0be49b2cc6e95ace1996260fa82123c4747e894f66
+EBUILD vidstab-1.1.0-r1.ebuild 1661 BLAKE2B b83149cd32ba47faecfaf266ab56a4f4a248b90ab817227b49e7bea7f3174f5eed32fa1ced6a69c1652a4faa85025523dc9f68d1c6c7439d2a0deb649b2ac965 SHA512 c3fe3cf99546c38a65e3b4a17a56d341aba8bc87bdd6e2d81296936550250c7e09f16d49fb076485d304df57e4887b5623c79f031a706d50eebd641e13e7f4ae
EBUILD vidstab-1.1.0.ebuild 1411 BLAKE2B ed2ee8eeee6a37a3a4ec92aabffa867dfcaee7a55fb9ca9ac3bbdf1d8d199aa8015459e0d1a84ed3e7898d1c3a6ae8189708883d77cedfb9e8088d40cf7463b3 SHA512 da075da882878bfe41f8e156ce1268b87d681d32c15aea74a454727557c6e5985b0974978d1d04e0b473dfd3fe1f035a4413fab4ce4c21bcae9809328701b671
-EBUILD vidstab-9999.ebuild 1360 BLAKE2B fe1915e7b6bd2f22df1d4c91a1bf18ab5d772be6fb95affe32c30bd01437621509655e8758770d257a00e57f0d0ae4c966f6b6f0cd24a455e7c320f0dcdfd58f SHA512 a4e104d78359493e83947900406f5e3904cb132f45a81a2cb613fed4d9c8f932eaaffe0235f878f3b8fef6f07fa9dce39272d3439ef9f848dbbd177e27539c0f
+EBUILD vidstab-9999.ebuild 1487 BLAKE2B 48a7211ee43e3f96a97e9dcf23e9781bebeb5da7f70b814d303d9a3effb053569857530edd326c977915ac13fa5697bbca59b6256b94837cd8e1b24aeda3065b SHA512 d1124e1c93b4d50e60a7b65b6046787baa15c3ff3a37dbe5ff06b4a67a0012ead3f9a709de6ebc370582d45bca6d1f45f51811f1bd627219f65a7030175748fb
MISC metadata.xml 584 BLAKE2B dfcfa874a9ee0f9cbc884646e9ca898a3caa58eeb17b55459c9e591144d124c2e476f65c88e6994a183204e555ead73d9411bc4e663af307a17e967f5f8b7316 SHA512 48868512f6f5ad2c60e7ef6b092682f73df8540c785bef65f75a2777978612d449d83bcdf350887f4da9c9069c3ff13b25050180c5de9698d7a269c232fb1bfb
diff --git a/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch b/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch
new file mode 100644
index 000000000000..fc7deca503e6
--- /dev/null
+++ b/media-libs/vidstab/files/vidstab-1.1.0-tests-use-sse2-only-if-available.patch
@@ -0,0 +1,33 @@
+From 80932fbd1e77d397a7b503697c78fd888ede396a Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Mon, 14 Jan 2019 11:08:30 -0500
+Subject: [PATCH] In tests, use sse2 only if it is available
+
+Use FindSSE and SSE2_FOUND in the same way as done in the main CMakeLists.txt in commit 0f41dfb89ba3fa7d20f45cbeb02cc1ff37c89c27
+---
+ tests/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 9597141..6812916 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -7,6 +7,8 @@ project (vid.stab)
+
+ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/../CMakeModules/")
+
++include (FindSSE)
++
+ option(USE_OMP "use parallelization use OMP" ON)
+
+ # Default to debug builds if no explicit build type specified.
+@@ -23,7 +25,9 @@ else()
+ add_definitions( -DDISABLE_ORC)
+ endif()
+
++if(SSE2_FOUND)
+ add_definitions( -DUSE_SSE2 -msse2 -ffast-math -fno-show-column ) # -DUSE_SSE2_ASM
++endif()
+
+ if(USE_OMP)
+ add_definitions(-fopenmp -DUSE_OMP)
diff --git a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
index 31b7ac658193..3c4dc91eba9a 100644
--- a/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
+++ b/media-libs/vidstab/vidstab-1.1.0-r1.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
S="${WORKDIR}/vid.stab-${PV}"
fi
@@ -24,14 +24,16 @@ SLOT="0"
IUSE="openmp cpu_flags_x86_sse2"
PATCHES=(
"${FILESDIR}/vidstab-1.1.0-tests-should-exit-with-code-0-on-success.patch"
+ "${FILESDIR}/vidstab-1.1.0-tests-use-sse2-only-if-available.patch"
)
src_prepare() {
# USE=cpu_flags_x86_sse2 instead
- sed -E 's#include (FindSSE)##' -i CMakeLists.txt
+ sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
+ sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die
# strip some CFLAGS
for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
- sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
- sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
+ sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
+ sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
done
cmake-utils_src_prepare
}
@@ -48,6 +50,7 @@ src_configure() {
multilib_src_test() {
local mycmakeargs=(
-DUSE_OMP="$(usex openmp)"
+ -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
)
local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
local BUILD_DIR="${BUILD_DIR}/tests"
diff --git a/media-libs/vidstab/vidstab-9999.ebuild b/media-libs/vidstab/vidstab-9999.ebuild
index c694caee1d91..447fa8556869 100644
--- a/media-libs/vidstab/vidstab-9999.ebuild
+++ b/media-libs/vidstab/vidstab-9999.ebuild
@@ -22,14 +22,14 @@ fi
LICENSE="GPL-2+"
SLOT="0"
IUSE="openmp cpu_flags_x86_sse2"
-
src_prepare() {
# USE=cpu_flags_x86_sse2 instead
- sed -E 's#include (FindSSE)##' -i CMakeLists.txt
+ sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
+ sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die
# strip some CFLAGS
for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
- sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH}
- sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH}
+ sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
+ sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
done
cmake-utils_src_prepare
}
@@ -46,6 +46,7 @@ src_configure() {
multilib_src_test() {
local mycmakeargs=(
-DUSE_OMP="$(usex openmp)"
+ -DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
)
local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
local BUILD_DIR="${BUILD_DIR}/tests"
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index 8cf101fa5206..d42209ca5990 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -2,6 +2,6 @@ AUX vulkan-layers-Use-a-file-to-get-the-spirv-tools-commit-ID.patch 1622 BLAKE2B
DIST vulkan-layers-1.1.82.0.tar.gz 962993 BLAKE2B 6fe541116f8d4d4370cb5a0b2a98c07139577edf20653359f9f149b503c3d2e9aa98e95af14582c80033b535cc4cec5cc5f148396f472aaf75a8767579978a61 SHA512 c34b691a340830462b917890c97dd86c66eac097ba284183d8bf148267b1a881c909b89c6f9ab78ddd03a60cc884c982bc578cc67e4fbaf37d044004b006a65a
DIST vulkan-layers-1.1.92.0.tar.gz 955136 BLAKE2B 8a039c17a231cda732aafd947c01a658c72932048307b81777254236eb6a2945e287cd098c2ee1fa264c21477b30e48ba83bfd0af4fb5f5bcb0adc502cc45a03 SHA512 09b32635bf26cdf3c1f18e57f7c7348a72c25de37c7afe03c0508cf5d3c6f39779d4a819eb92b2bf4f9300d80e757e8aaf9ec2164d7fd9f523f2926a497c08f6
EBUILD vulkan-layers-1.1.82.0.ebuild 1499 BLAKE2B 2f2b35c2ea64ea2ed34ab92a191cccf4892d8d5716d9420d09f3a23649d6d2a5007d1fb259abe059512dde226daf76b759c6bf62bd45d408b8d2211d5f38605b SHA512 6425c3c3b6f1caa8acc61b60c2252a9b2860d965e7938321919aed8298146063aedc7ae63acf0c51598948b0fed0d512e83dfa306d79e0f0031a03dd04e6abdb
-EBUILD vulkan-layers-1.1.92.0.ebuild 1382 BLAKE2B 612d1b274013fda74869ad7f3889bb68510fb8e837f0d1be37a03d66de56e6ad3a93ba299addda562e493e0c4cc381bf2542174cdb69a536ad033be3c63373eb SHA512 3d0e10fb745567b45542e7970cf0d6964a4e34e642ab9f370a37069203bfb0d73a67c994bb0a4595c4f8f220d912ba90ba2e9bba9007d53fe4fc347fa0da5f59
+EBUILD vulkan-layers-1.1.92.0.ebuild 1381 BLAKE2B c91d8ec63a26db099e5a251422e786cb816378a99c91ec08947790a34e6ff55d5d00ef4b994b1e81ecec7bd694a37d434b0c82a29eb16f139f8c62eb939c971e SHA512 ed34962e991fbfdb9404e78424818159211e33cd1828631afbb054bdc40b4a06735e1126e30ab9f0a44a54965b986a19658f154dcfdaf645aaa41601c80f1f0c
EBUILD vulkan-layers-9999.ebuild 1382 BLAKE2B 4085c6efe3f7fef3c784ed51818914adf7851a4d0c2b2c1e6b83cb0ce744e1fd89548533141f38d006f5ca455722cd7f2ac588fbfec8f97b7c78902f8457322f SHA512 5721d495b9d79c3aa846fe274fa76122e59c3aa415f8d2544a6570716014ade2bbc940b7a7117d5e10841330b0b5094e512ef12480cb2876fa4903303bbc5a6f
MISC metadata.xml 441 BLAKE2B a617b1a3cace9597f2f0511c097a775a07469de769cf02d25fbbe82c7354f4f8356c046966f2e7cd577ebb8cbcef07580caedf5c6a68e88973af26e0e257eb12 SHA512 eafe2376c7a220e3f84a287df232ce249e2e80d45dd4402d5b58ab5c2e7faaa6f2d8afc982f767dff2ae2d05ab2df31611b637820a56061d61aba10ccb07a4f2
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
index 4d66e6776c6f..648e31fd8100 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.1.92.0.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.1.92.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
@@ -10,7 +10,7 @@ if [[ "${PV}" == "9999" ]]; then
inherit git-r3
else
EGIT_COMMIT="6e6da6ccab8931f7c30815966ef839b1155e5bec"
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
SRC_URI="https://github.com/KhronosGroup/Vulkan-ValidationLayers/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-ValidationLayers-${EGIT_COMMIT}"
fi
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index 1ad32f2735b0..8e7ecbd064ad 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -1,6 +1,6 @@
DIST vulkan-loader-1.1.82.0.tar.gz 1342427 BLAKE2B 4b2c589e2c1edaa29e13e892cc839f2d7af5bbadf7dda3f50eca2543c1877af175e9640545b886ffe3e8b1c51373502ee272829ddb15c07629ea08ece697e5b9 SHA512 624e493454e622e29bc0de5fdf1c425691b3c98f317660847e95aee6bc42dafa0b4d8caa9de52e8f3229b7e743afa475485cd3affbdb295e16ba49d30d1eb19e
DIST vulkan-loader-1.1.92.1.tar.gz 1346712 BLAKE2B 60d29c38e72ff234261a3e75934d44de08c334c475e715066c210844ea672f0e2db3ebc8826df7d72392e3c2a0bbd0604b8770c0b35ddd8f72ed875234bae15d SHA512 c29d1fb43a2bdd0f291860dee0ffe7ec23a34c9431aeb76a46f8df0ec2f70601ccd3e96280f94d881f5550e3c9f07fe478f94eebcfd2aaf123045c7281313aac
EBUILD vulkan-loader-1.1.82.0.ebuild 1579 BLAKE2B 05f92e8a778677a99ae5779bb6081a210502e39040705b5223365d4b6757d4f72de9a79017173181039b2c7dd096fe827b782dfe2cc673b3491f987f06536941 SHA512 a2f86faefe1870778c5232c50451dedf5e4b959f4cf9c1983ffb0a42065fcbd74429a06c12832325ab318cfa3dabd235a5680c6d34d5cdf982e8642826e543ab
-EBUILD vulkan-loader-1.1.92.1.ebuild 1544 BLAKE2B cd565e06eb8c163e34d940ba3dfa9415168347555f6d3f9e58a5f8abcb77d9589c0a5118596b9d8e13972813ee52e3827ee5398214e7b0d0dcdebc36d5f572bc SHA512 8dca894c3896dc593367632e9fbd6757169cec98121caeebf64f603e6f9100bdf1227967f517d34eeccbd4c6ba2a02ec263f2c47685fc7912e499a0af5e4b3b2
+EBUILD vulkan-loader-1.1.92.1.ebuild 1543 BLAKE2B c0d6c78fdf83fad0fe0bd75a873962f2d2121d5bbd8d29b8e8e219928935d26f48ba767e9c2cf236d97faab69c5e6bc39f3adad957c6978b3f809fcd540aaa1e SHA512 258c4fa187f4c86ec3ac8bb75458cfa1ef3f5497ef28db1ab4cffc3250dfb7995fd31b5144174653e372ed69cc490cff3203afa63aa3beed22f8f750e3585f1e
EBUILD vulkan-loader-9999.ebuild 1544 BLAKE2B b1cbf1e197db3080f9c1d2a7c14cd7e68adadd19639148a0e4ba42b17aa9c57cf237a62b659554d5072f8c84d59dd58b15112726c1a521df10e0a6c0f6cb87b9 SHA512 af081aa47ef8fc799e5c558e89d8dfc2c8ca472ede7d167842776e06b8b50b5c325d496a35467c64b84b2785e200ddbb13781d440bf6e63410c893ff35e5f695
MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
index c0dda1e94306..cddf66da355a 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.1.92.1.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
@@ -9,7 +9,7 @@ if [[ "${PV}" == "9999" ]]; then
EGIT_SUBMODULES=()
inherit git-r3
else
- KEYWORDS="~amd64"
+ KEYWORDS="amd64"
EGIT_COMMIT="4cd7e44fc1ca6c4d8361720b43a3588ddf9fc4b6"
SRC_URI="https://github.com/KhronosGroup/Vulkan-Loader/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/Vulkan-Loader-${EGIT_COMMIT}"
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index f494fb2de84c..1d88a8d54708 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -1,4 +1,4 @@
DIST x264-snapshot-20170701-2245.tar.bz2 750527 BLAKE2B ccf276da31383ab4b4a1ac48866bc49b4b2bc5913361c933fa2359de4d6e90cca091dd4aba781f3735a5b28d6ce006aa9d4e149ba48745b80cb971c2952ca867 SHA512 28fc9850c36ac385fced6dec9a0f68a5605a68805e1ef7b8cedcd78917eaa1ad6e47e57fe5a74fee0a6e482f3a33de6011f675e6c77b5db94c8fe01d5c5f3e9f
EBUILD x264-0.0.20170701.ebuild 1908 BLAKE2B 0d707b757a65ca4436f04d5cbdbd11682f61496dfe9e19a73079476452e397928313e1ae030db6cb68d0c8fa857ce925a9b7a9b69846fe6147b659ade30e6469 SHA512 4d6505deffec4108071dbbdb0788a0eb59695703890d168bc641e361af2b6c4d05606b415f0bb8a6dd3e6dd629dd2eb8390d3a2f2847369bf7c5d567dff9b105
-EBUILD x264-9999.ebuild 1872 BLAKE2B 8910e4673e48bd4cd6c503436d28ca1f3f00bf96fa61193fa06761cffd928213c96f8bd21151669784083b29d80604eab4bf57fb9c0740f18d4f57684e7de247 SHA512 89201b028151be9f7758f317cae3bbf81d1f8a3f82dd8e3e20c01abfa97b27a836ec95d4855ec93d208ee4381f17da3bd94c1ec9291ca980ebed210b930119c2
+EBUILD x264-9999.ebuild 1818 BLAKE2B 2f5792963f71ab0041436d84a2ccfc542ff1b020ec43b5933174ca8d79e5f1d7224658bbd6fff89f5e86e077f1eab771207f932704f4e2dedee41563dd9faffe SHA512 d6523f4a919500361cbf4c8f9530de38d9201a903fc8c3b3fc9dbcda22d571b54568a79a0d95b4e88015f44d95987f10aff5d6105bb94ada96b077ff7b13c641
MISC metadata.xml 589 BLAKE2B c7ee19e724c9c449efda7bf1733193d71c547bc3a80efb51d6b562a8d0134bb618d1daad542cc61fc5d0026467a4336ec0754f238e441cad8cfe72296c4eae07 SHA512 7a4acc6f2cf54f66efee1fedb379ea155559ddca1ff8bae88b5a8638b23555515e9cc31dff7ae6bb16e6d716e616dcb4b508870ad78ab1fe461ba8b7056f524e
diff --git a/media-libs/x264/x264-9999.ebuild b/media-libs/x264/x264-9999.ebuild
index a9eca18e63e1..0128bcd158b6 100644
--- a/media-libs/x264/x264-9999.ebuild
+++ b/media-libs/x264/x264-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI=6
+EAPI=7
inherit flag-o-matic multilib-minimal toolchain-funcs
@@ -11,15 +11,13 @@ if [[ ${PV} == 9999 ]]; then
inherit git-r3
EGIT_REPO_URI="https://git.videolan.org/git/x264.git"
else
- inherit versionator
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ 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
-SONAME="155"
-SLOT="0/${SONAME}"
+SLOT="0/157" # SONAME
LICENSE="GPL-2"
IUSE="altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads"