summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
committerV3n3RiX <venerix@redcorelinux.org>2021-06-15 14:57:03 +0100
commitd18bf1e01b65ee4bf0c804e2843b282d3d4e5d7c (patch)
tree4a95cbc6ffdf13bad6ecbc7f8d5af99631984123 /media-libs
parente748ba9741f6540f4675c23e3e37b73e822c13a4 (diff)
gentoo resync : 15.06.2021
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/Manifest.gzbin64606 -> 64772 bytes
-rw-r--r--media-libs/SoXt/Manifest2
-rw-r--r--media-libs/SoXt/SoXt-1.4.0.ebuild4
-rw-r--r--media-libs/alsa-lib/Manifest10
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild2
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild2
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.4.ebuild4
-rw-r--r--media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild (renamed from media-libs/alsa-lib/alsa-lib-1.2.5.ebuild)23
-rw-r--r--media-libs/alsa-oss/Manifest2
-rw-r--r--media-libs/alsa-oss/alsa-oss-1.1.8.ebuild2
-rw-r--r--media-libs/alsa-topology-conf/Manifest8
-rw-r--r--media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild2
-rw-r--r--media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild2
-rw-r--r--media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild4
-rw-r--r--media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild2
-rw-r--r--media-libs/alsa-ucm-conf/Manifest9
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild2
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild2
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild4
-rw-r--r--media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild (renamed from media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild)4
-rw-r--r--media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch20
-rw-r--r--media-libs/dav1d/Manifest8
-rw-r--r--media-libs/dav1d/dav1d-0.8.0.ebuild10
-rw-r--r--media-libs/dav1d/dav1d-0.8.2.ebuild10
-rw-r--r--media-libs/dav1d/dav1d-0.9.0.ebuild10
-rw-r--r--media-libs/dav1d/dav1d-9999.ebuild10
-rw-r--r--media-libs/embree/Manifest3
-rw-r--r--media-libs/embree/embree-3.13.0.ebuild107
-rw-r--r--media-libs/embree/metadata.xml42
-rw-r--r--media-libs/fdk-aac/Manifest2
-rw-r--r--media-libs/fdk-aac/fdk-aac-2.0.1.ebuild56
-rw-r--r--media-libs/freetype/Manifest4
-rw-r--r--media-libs/freetype/freetype-2.10.4.ebuild3
-rw-r--r--media-libs/freetype/freetype-9999.ebuild3
-rw-r--r--media-libs/gegl/Manifest8
-rw-r--r--media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch24
-rw-r--r--media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch22
-rw-r--r--media-libs/gegl/gegl-0.4.26-r1.ebuild4
-rw-r--r--media-libs/gegl/gegl-0.4.28.ebuild6
-rw-r--r--media-libs/gegl/gegl-0.4.30.ebuild6
-rw-r--r--media-libs/glfw/Manifest2
-rw-r--r--media-libs/glfw/glfw-3.3.4.ebuild2
-rw-r--r--media-libs/graphene/Manifest2
-rw-r--r--media-libs/graphene/graphene-1.10.6.ebuild18
-rw-r--r--media-libs/harfbuzz/Manifest8
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.7.4.ebuild113
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.8.0.ebuild113
-rw-r--r--media-libs/harfbuzz/harfbuzz-2.8.1.ebuild30
-rw-r--r--media-libs/harfbuzz/harfbuzz-9999.ebuild30
-rw-r--r--media-libs/ilmbase/Manifest2
-rw-r--r--media-libs/ilmbase/ilmbase-2.5.6.ebuild41
-rw-r--r--media-libs/leptonica/Manifest6
-rw-r--r--media-libs/leptonica/leptonica-1.81.0.ebuild77
-rw-r--r--media-libs/leptonica/leptonica-1.81.1.ebuild77
-rw-r--r--media-libs/leptonica/metadata.xml3
-rw-r--r--media-libs/libao/Manifest4
-rw-r--r--media-libs/libao/files/libao-1.2.2-automagic_sndio_oss.patch43
-rw-r--r--media-libs/libao/libao-1.2.2-r2.ebuild62
-rw-r--r--media-libs/libao/metadata.xml3
-rw-r--r--media-libs/libass/Manifest2
-rw-r--r--media-libs/libass/libass-0.15.1-r1.ebuild2
-rw-r--r--media-libs/libbluray/Manifest2
-rw-r--r--media-libs/libbluray/libbluray-1.3.0-r1.ebuild2
-rw-r--r--media-libs/libcaca/Manifest2
-rw-r--r--media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild2
-rw-r--r--media-libs/libcdr/Manifest5
-rw-r--r--media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch27
-rw-r--r--media-libs/libcdr/libcdr-0.1.6.ebuild59
-rw-r--r--media-libs/libcdr/libcdr-0.1.7.ebuild2
-rw-r--r--media-libs/libdvbcsa/Manifest3
-rw-r--r--media-libs/libdvbcsa/files/altivec.patch33
-rw-r--r--media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild8
-rw-r--r--media-libs/libdvdnav/Manifest2
-rw-r--r--media-libs/libdvdnav/libdvdnav-6.1.1.ebuild2
-rw-r--r--media-libs/libdvdread/Manifest2
-rw-r--r--media-libs/libdvdread/libdvdread-6.1.2.ebuild2
-rw-r--r--media-libs/libepoxy/Manifest6
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.5.ebuild10
-rw-r--r--media-libs/libepoxy/libepoxy-1.5.8.ebuild12
-rw-r--r--media-libs/libepoxy/libepoxy-9999.ebuild12
-rw-r--r--media-libs/libexif-gtk/Manifest5
-rw-r--r--media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch20
-rw-r--r--media-libs/libexif-gtk/files/libexif-gtk-0.3.5-gtk212.patch24
-rw-r--r--media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild46
-rw-r--r--media-libs/libexif-gtk/metadata.xml8
-rw-r--r--media-libs/libgig/Manifest4
-rw-r--r--media-libs/libgig/libgig-4.2.0.ebuild37
-rw-r--r--media-libs/libgig/libgig-4.3.0.ebuild2
-rw-r--r--media-libs/libglvnd/Manifest4
-rw-r--r--media-libs/libglvnd/libglvnd-1.3.3.ebuild10
-rw-r--r--media-libs/libglvnd/libglvnd-9999.ebuild10
-rw-r--r--media-libs/libheif/Manifest2
-rw-r--r--media-libs/libheif/libheif-1.12.0.ebuild2
-rw-r--r--media-libs/libjpeg-turbo/Manifest3
-rw-r--r--media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild (renamed from media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild)36
-rw-r--r--media-libs/libmodplug/Manifest2
-rw-r--r--media-libs/libmodplug/metadata.xml4
-rw-r--r--media-libs/libogg/Manifest2
-rw-r--r--media-libs/libogg/libogg-1.3.5.ebuild32
-rw-r--r--media-libs/libplacebo/Manifest10
-rw-r--r--media-libs/libplacebo/libplacebo-2.43.0.ebuild10
-rw-r--r--media-libs/libplacebo/libplacebo-2.43.1.ebuild10
-rw-r--r--media-libs/libplacebo/libplacebo-2.72.2.ebuild10
-rw-r--r--media-libs/libplacebo/libplacebo-3.120.3.ebuild10
-rw-r--r--media-libs/libplacebo/libplacebo-9999.ebuild12
-rw-r--r--media-libs/libpqstego/Manifest2
-rw-r--r--media-libs/libpqstego/libpqstego-0.0.1-r1.ebuild (renamed from media-libs/libpqstego/libpqstego-0.0.1.ebuild)5
-rw-r--r--media-libs/libtgvoip/Manifest2
-rw-r--r--media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild2
-rw-r--r--media-libs/libvpx/Manifest2
-rw-r--r--media-libs/libvpx/libvpx-1.10.0.ebuild2
-rw-r--r--media-libs/mesa/Manifest10
-rw-r--r--media-libs/mesa/mesa-20.3.5.ebuild14
-rw-r--r--media-libs/mesa/mesa-21.0.3.ebuild14
-rw-r--r--media-libs/mesa/mesa-21.1.1.ebuild14
-rw-r--r--media-libs/mesa/mesa-21.1.2.ebuild553
-rw-r--r--media-libs/mesa/mesa-9999.ebuild14
-rw-r--r--media-libs/mlt/Manifest4
-rw-r--r--media-libs/mlt/mlt-6.24.0-r1.ebuild231
-rw-r--r--media-libs/mlt/mlt-6.26.1-r1.ebuild2
-rw-r--r--media-libs/munt-mt32emu/Manifest4
-rw-r--r--media-libs/munt-mt32emu/munt-mt32emu-2.5.1.ebuild (renamed from media-libs/munt-mt32emu/munt-mt32emu-2.4.2.ebuild)2
-rw-r--r--media-libs/oidn/Manifest3
-rw-r--r--media-libs/oidn/metadata.xml20
-rw-r--r--media-libs/oidn/oidn-1.3.0.ebuild39
-rw-r--r--media-libs/opencolorio/Manifest5
-rw-r--r--media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch38
-rw-r--r--media-libs/opencolorio/opencolorio-1.1.1.ebuild14
-rw-r--r--media-libs/opencolorio/opencolorio-2.0.0.ebuild100
-rw-r--r--media-libs/opencv/Manifest7
-rw-r--r--media-libs/opencv/files/opencv-3.0.0-gles.patch14
-rw-r--r--media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch11
-rw-r--r--media-libs/opencv/opencv-4.1.2-r3.ebuild498
-rw-r--r--media-libs/opencv/opencv-4.5.1.ebuild2
-rw-r--r--media-libs/openexr/Manifest2
-rw-r--r--media-libs/openexr/openexr-2.5.6.ebuild61
-rw-r--r--media-libs/openimageio/Manifest18
-rw-r--r--media-libs/openimageio/openimageio-2.2.10.1.ebuild155
-rw-r--r--media-libs/openimageio/openimageio-2.2.12.0.ebuild1
-rw-r--r--media-libs/openimageio/openimageio-2.2.13.1.ebuild (renamed from media-libs/openimageio/openimageio-2.2.11.1.ebuild)1
-rw-r--r--media-libs/openimageio/openimageio-2.2.14.0.ebuild (renamed from media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild)3
-rw-r--r--media-libs/openimageio/openimageio-2.2.15.0.ebuild (renamed from media-libs/openimageio/openimageio-2.2.10.0.ebuild)3
-rw-r--r--media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild155
-rw-r--r--media-libs/opus/Manifest3
-rw-r--r--media-libs/opus/opus-1.3.1-r1.ebuild45
-rw-r--r--media-libs/opus/opus-1.3.1-r2.ebuild2
-rw-r--r--media-libs/osl/Manifest4
-rw-r--r--media-libs/osl/files/osl-1.12.0.2-llvm-11.patch29
-rw-r--r--media-libs/osl/files/osl-1.12.0.2-llvm-12.patch240
-rw-r--r--media-libs/osl/osl-1.12.0.2.ebuild88
-rw-r--r--media-libs/qtav/Manifest2
-rw-r--r--media-libs/qtav/metadata.xml5
-rw-r--r--media-libs/rlottie/Manifest2
-rw-r--r--media-libs/rlottie/rlottie-0.2_p20210405.ebuild2
-rw-r--r--media-libs/rubberband/Manifest5
-rw-r--r--media-libs/rubberband/files/rubberband-1.9.2-build.patch180
-rw-r--r--media-libs/rubberband/rubberband-1.9.1-r1.ebuild13
-rw-r--r--media-libs/rubberband/rubberband-1.9.2.ebuild54
-rw-r--r--media-libs/speexdsp/Manifest7
-rw-r--r--media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch61
-rw-r--r--media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch44
-rw-r--r--media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch66
-rw-r--r--media-libs/speexdsp/speexdsp-1.2.0.ebuild2
-rw-r--r--media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild59
-rw-r--r--media-libs/tg_owt/Manifest2
-rw-r--r--media-libs/tg_owt/tg_owt-0_pre20210422.ebuild2
-rw-r--r--media-libs/tiff/Manifest4
-rw-r--r--media-libs/tiff/tiff-4.2.0.ebuild79
-rw-r--r--media-libs/tiff/tiff-4.3.0.ebuild2
-rw-r--r--media-libs/vulkan-layers/Manifest2
-rw-r--r--media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild2
-rw-r--r--media-libs/vulkan-loader/Manifest2
-rw-r--r--media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild2
-rw-r--r--media-libs/waffle/Manifest4
-rw-r--r--media-libs/waffle/waffle-1.7.0.ebuild8
-rw-r--r--media-libs/waffle/waffle-9999.ebuild8
176 files changed, 2266 insertions, 2387 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 7e2fc3f7b6bb..02659d1e7025 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
Binary files differ
diff --git a/media-libs/SoXt/Manifest b/media-libs/SoXt/Manifest
index 31ad75be76d6..62112a85ab86 100644
--- a/media-libs/SoXt/Manifest
+++ b/media-libs/SoXt/Manifest
@@ -1,3 +1,3 @@
DIST SoXt-1.4.0-src.tar.gz 1369725 BLAKE2B 727c56644878e9d52441ca905558524ccd369de123e8018d7fef4d949aa4e96007fa3a1e9782490b4dc9d50a916686a118d37ec7094dc6a3522ede032b30b6ea SHA512 9c661396ec18c2cba8984be8c0875f51554c8845e1a85d9b202f9a0f4de8203566a46d9b276e20039861dbf7ff3a0ffa474d098866f8a7692b53a01e3f62977d
-EBUILD SoXt-1.4.0.ebuild 950 BLAKE2B e555ffb3b935e245ef6986324ea6bae7228fd1a7b11dc7cc9ebc6cbf3e7c36147acec9dce08cb3e4a56ffdc335c96b0b7868ac1d574ff4f8b73c1865a643e6b8 SHA512 20d8adde382b2e5a63bb6a9b77e885d02bd46104e1107f6583c91e617234005f8b4614f6d10e203344313113d631576de36378bca6f1a6b5e2d5433411c1fa9c
+EBUILD SoXt-1.4.0.ebuild 948 BLAKE2B 439c5b9628d3fc9651a881ffab34682aa4fa94edc9e01a2e825e8ba563606a70de25167c1068401f6afd85a2abaf1fed1c91a12e36d8a44121d0788a4c2d70ba SHA512 8fd543f0b2cb02e37068b0be9eb325c7be02bb4aa2ef3a3fee8050cdad98c668989b5811757f3aaec492320d0c3a1d1d429fbc0c2ed29df4d716fd60aeba6d41
MISC metadata.xml 658 BLAKE2B af9655bc4c38124b85e5745164c0ace9fd469a33f067ec598b17196f159f98e295362baef0af6a5b5eba3c76e0fc2a86c06899a461b83b601f2d633f55edbb22 SHA512 07dc1b45ca384e039b2e7efa7ed26eb63172602a6e2fdae40016469b122709161719764d933b6777245385d0d02ccd4a23c6ed821c5b0433eb27ecd2a19af94d
diff --git a/media-libs/SoXt/SoXt-1.4.0.ebuild b/media-libs/SoXt/SoXt-1.4.0.ebuild
index 0915565de4dd..5ab58c8ede88 100644
--- a/media-libs/SoXt/SoXt-1.4.0.ebuild
+++ b/media-libs/SoXt/SoXt-1.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -12,7 +12,7 @@ DESCRIPTION="GUI binding for using Coin/Open Inventor with Xt/Motif"
SRC_URI="https://github.com/coin3d/soxt/releases/download/${MY_P}/${P}-src.tar.gz"
LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
SLOT="0"
IUSE="debug doc"
diff --git a/media-libs/alsa-lib/Manifest b/media-libs/alsa-lib/Manifest
index f23510264441..2f4fefedd09f 100644
--- a/media-libs/alsa-lib/Manifest
+++ b/media-libs/alsa-lib/Manifest
@@ -5,9 +5,9 @@ AUX alsa-lib-1.2.4-musl.patch 1082 BLAKE2B f905b0b020afcc8124a128c29da015ce0629d
DIST alsa-lib-1.2.2.tar.bz2 1030747 BLAKE2B 176054c7783452fcd0b30482f4d85fb88a1364a97f79830f2c22cd578275280fa64537d00a08f3e3b1420e4aeb4e4269c7523cb4296db3ed095bcf078b452726 SHA512 d21adb3ff998918c7d1820f9ce2aaf4202dd45ccb87cb092d49da8b2402b6ddaad06325be0fd59f17393a5d9958e3743bfccb4b14bdb947a42e7d791d73c7033
DIST alsa-lib-1.2.3.2.tar.bz2 1038591 BLAKE2B 70ba972953f71fc6ac20f6f3e91361b5aed72c8c7887252331a01334ec4cc154c1bfea02dfaf0f76f8244b8cf73426d83577dcf55aa0033f80ee303d23386df6 SHA512 1fbc6360fda841bd9ca488739bdc9f4142c1b4a07ff767f48f1e160e3d4dff914aed422c97088e238b5e77d7e30aa79ff72569c3348a4cf4a412e1e4bce0bf2a
DIST alsa-lib-1.2.4.tar.bz2 1044405 BLAKE2B e1d5d9afe21dac693645274ae4ec8a607c9fcc9915ba4ebccfdb539d44b9353ba07529e2c8eaca119884b926d4467285313c945c9015a788101fe532064442db SHA512 12086952dc8f16f1cb6946517858e17b1c3276aeda9ff5703a84bb38aa78eb4c4e9cb4485c5b3f21f174fdbd976b3bcbbc481e85cb2460652858490df51ae844
-DIST alsa-lib-1.2.5.tar.bz2 1068496 BLAKE2B 84fe4e22d4316bfc84f15f2493f40f113eb3db7722f230550586533e80daf214140164e8ddc1a399b82a3fd0fb21125ff225cfeb45eaa19320c2e2aa3997c662 SHA512 d9b53484737a3684aac7e08b4b18400aac10fec1a78a8bf9101944bea2c50710bc7355e9bb0012541b067e2d5ee7b1b818bf1bdbffbb2b2d7ad0eb15efe49725
-EBUILD alsa-lib-1.2.2-r1.ebuild 2166 BLAKE2B 58967742d15b0a540b7e2fe327c99380904d7ac04937896c0720965a9fd35e170a53f8549355e5b96c498ae0b9f1fdb21a3085aa1eb02a9a93daa8f0a63968fb SHA512 bc1f41efe336615cbd10d236aacbcbdd1b65a6ffeccd1f20cb4107153e7ceb1d1f3bffd0bc2ef9c39a320dc7bfafbc54c2078aa5288e9f6a50d6f720478aa55b
-EBUILD alsa-lib-1.2.3.2-r1.ebuild 2103 BLAKE2B 124b90973277ca6e2c491a9cecdd5431eefac44f945735d2beeb237b9085194aab6e9b9cbc4c2218f922f387bae104557f8d9e0c9dd4aaf9ca7f2150dc9c37e7 SHA512 35f88e0b6228c8ea9aa87c10b2cca397f5d03a679cbaf61f080a43d633bc789bea3abe7efdb52c80188b8a5af36929378abea999a5bc8c4fc81d63368ad30160
-EBUILD alsa-lib-1.2.4.ebuild 2171 BLAKE2B f6bb453b17e2f8e0bbdf955c361f61d485eaffba4b62363ce0454fb3c915f1721bdc03e946660d4b790d7991d3e625772b85f7622aef5d26374ebd639938864d SHA512 d56d4ec475ad8f400a96aa06e82b029c85162e5b68f4806a835d6f05d5bb8b5c1854719b98f9cff6f26ac53f4323757c8e33c6c2b005be5a5330fe1f89a08c2c
-EBUILD alsa-lib-1.2.5.ebuild 2125 BLAKE2B 30d8d6573061912979ebe2f8e8b4b2c64e01de20d52e1e8a54d02e17d2dac7ed23ff12ef86c44adb6b047c876eea37ac7ad24ede14ea4a1bfd4fd0babc650d35 SHA512 c9b53f2a8da72d1255ce967447773f52f8f3ce8c33ccf13604f2dec4da9adcc6f0d028e1cb23c46eb648f57511f6126e6114268bef0f70a9bfb2894fd686d60f
+DIST alsa-lib-1.2.5_p20210604.tar.gz 814186 BLAKE2B d3bc2f42a0266c1af33953026eecb97d9d4f2cc845924b762b7f6777d15e2a3f60347bd3d6184a8b431ebe703c3b06bcbfbef67345064fbcd14b223e5e4d0e4e SHA512 e04ac38ae6f4b97ac75584c36562ad620820be5156206dc6466b8bfac0d50d1c8e588fac7d5e9d8716c9c89b82ebd9ae9cbc8137080a433a5ddde8177c102a99
+EBUILD alsa-lib-1.2.2-r1.ebuild 2180 BLAKE2B aa741e7e53d443b27d520ccf0a525384085844c64d5289ed22067b65ec0ee4cc9a4a75d68891fc6c830513b95de0ad6cac8280aa6cf7a5d37c9c6acc6aa27c82 SHA512 37fcd87e520494e1f0797cd5b023d9eac4dd78ed894588f85d223bb2a4b49da824381254cfd79905bb686a2751d22299d199df4eca5989b09ca8ac08786f4c8b
+EBUILD alsa-lib-1.2.3.2-r1.ebuild 2117 BLAKE2B 9e6c389cd0915a78ab9b6b6ddb6ae82a1bef79f5f316c3bc26481ab38ee1eb88f32f059cec764e0e127eba7978322c516aece84bf784250e958df7d93fe98dc0 SHA512 12f9735f278467a883b189c74d03cf8c78940dc18d21175a5938565db3acc7b2a17a7aca927055728dbd965510387fdbcf4b2158a1f8f1af6542d54258fec8cf
+EBUILD alsa-lib-1.2.4.ebuild 2184 BLAKE2B ec54b9d6096709fffee836715f2eda6539091ee7dca58a9b131fff6301c54e5069204569082f1ef8d99f5c832eed7e216233e7add1bf8050cb029431940f3018 SHA512 9267b26b819bc407c21986c60086d0503b108395c1ef238302956ea7a55fdd41ec72963e4fb30617f79a9981e3232be51517913fe0158bf91027b551d6cdcc4c
+EBUILD alsa-lib-1.2.5_p20210604.ebuild 2977 BLAKE2B e0434a80ecf3694f1d5d483f55e6983db087e804027f2896cd98ca1f11f429f4cf29c6caa80ac1f937f6c26e86e23a13acc2dac48b4103935d077adb19c8288c SHA512 349716f1956ad1a37de3283347d83808232fe7bdd2dcdf13a6105c5d5901a4d54ef298684d4efada4b7c90cb7ca707b8e3c7c6466add7fc59716ae17390752a7
MISC metadata.xml 502 BLAKE2B 06ee247fafa9de0b13dc4723279d82367bf580e8ad5216b301e23e1abf2a4ea464febaf456c31a91d223bec81603c1b65c2de0fb5fe491d464cfae754ecc6ad5 SHA512 0ca6ff20c3eda2f898d20df9e8a572b9a8d0504bf3a79bc1ef14026ea8b72e13638cbd3ef63ce2bf19efea80729ca25c27ca131d965edad4a4d3d23ac1352085
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
index 05f90764647c..1a2b04a4cebf 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
inherit autotools multilib-minimal python-single-r1
DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="LGPL-2.1"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
index 726c108f049b..af903f22501a 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.3.2-r1.ebuild
@@ -7,7 +7,7 @@ PYTHON_COMPAT=( python3_{7,8} )
inherit autotools multilib-minimal python-single-r1
DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="LGPL-2.1"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
index b784b7409239..4932c2e1dc7b 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.4.ebuild
@@ -7,12 +7,12 @@ PYTHON_COMPAT=( python3_{7,8,9} )
inherit autotools multilib-minimal python-single-r1
DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="alisp debug doc elibc_uclibc python +thread-safety"
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
index 8183119b95e5..88c9ad860cf8 100644
--- a/media-libs/alsa-lib/alsa-lib-1.2.5.ebuild
+++ b/media-libs/alsa-lib/alsa-lib-1.2.5_p20210604.ebuild
@@ -6,9 +6,20 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
inherit autotools multilib-minimal python-single-r1
+# When COMMIT is defined, this ebuild turns from a release into a snapshot ebuild:
+COMMIT="abe805ed6c7f38e48002e575535afd1f673b9bcd"
+# Also set SNAPSHOT_PV to match the correct PV, so that the ebuild can detect a naive rename:
+SNAPSHOT_PV="1.2.5_p20210604"
+
DESCRIPTION="Advanced Linux Sound Architecture Library"
-HOMEPAGE="https://alsa-project.org/"
-SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
+if [[ -n ${COMMIT} ]]; then
+ SRC_URI="https://git.alsa-project.org/?p=${PN}.git;a=snapshot;h=${COMMIT};sf=tgz -> ${P}.tar.gz"
+ S="${WORKDIR}"/${PN}-${COMMIT:0:7}
+else
+ # TODO: Upstream does publish .sig files, so someone could implement verify-sig ;)
+ SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
+fi
LICENSE="LGPL-2.1"
SLOT="0"
@@ -28,6 +39,14 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.6-missing_files.patch" # bug #652422
)
+pkg_pretend() {
+ if [[ -n ${COMMIT} && -z ${SNAPSHOT_PV} || -z ${COMMIT} && -n ${SNAPSHOT_PV} ]]; then
+ eerror "Please either set both COMMIT and SNAPSHOT_PV or neither!"
+ elif [[ -n ${SNAPSHOT_PV} && ${PV} != ${SNAPSHOT_PV} ]]; then
+ eerror "Rename of snapshot ebuild detected - please check COMMIT & SNAPSHOT_PV!"
+ fi
+}
+
pkg_setup() {
use python && python-single-r1_pkg_setup
}
diff --git a/media-libs/alsa-oss/Manifest b/media-libs/alsa-oss/Manifest
index 3092f65a12f4..379972fcd26f 100644
--- a/media-libs/alsa-oss/Manifest
+++ b/media-libs/alsa-oss/Manifest
@@ -1,4 +1,4 @@
AUX alsa-oss-1.0.12-hardened.patch 370 BLAKE2B ed779e5565ece8412880faa806d7b595bf6a0fcea7809090872639e7928f1c58acb000e8f965b5f06a8c5c14e5a46f9c3f4078a5ddb2d907f5cdcceb49c7fb6c SHA512 126bd73800844c0b9e4c2af05b3754bbbacf9e380288cdde7fef666621fcb0b1775bead7fd932c23375efea594ec9f1d3eccf009a90a7994d18b101ba21f1ee2
DIST alsa-oss-1.1.8.tar.bz2 291800 BLAKE2B 47124c4edd14878b202e6ff6866b5441ffa0991ac3011a3db1efcd1dd2a0c27c9f2b8b38c2a51e8b46cb5714a97393a462154cdfaf89f1238244f7b2635a7740 SHA512 42966af0ca1be33b4ab1e20b2e3320056ad6caf6ecc5ecde3ae19571809a2fa924dd91d9b2a5d5b6f345b29d937b079400d2a165dbe2b8a33b857cd406c4ac7c
-EBUILD alsa-oss-1.1.8.ebuild 1034 BLAKE2B f2aacb25b617553d2710a501717b2ad8a7990a3f4f706fbb9c58b3b81bf258c336687babb1f26600061e7888ed83818152c73d840c9897ed982ec88d5fb8b618 SHA512 1acad998b4c323e392f5522a997718768a10028faeb2506d270dc0a7d451d6566340935da6b202e37c29fdda0a40d5c59da52ef29c012f6d2c1651c41f31e7df
+EBUILD alsa-oss-1.1.8.ebuild 1048 BLAKE2B f4199707657e3702dc7ace1f4d795cbc3ade403a59589ff1a5ea6df49e689753dfe1fe5a8cb89f3fa6359c4bfcc018fc214608796dbf830d9880e35318950699 SHA512 f05077db85038f1444c22282865433119a7e434d1640d190c0409174eb82a1987bc686c86d50d258089ccce10b4da69e9569ab5f94fff3d77bb3111265b72bf4
MISC metadata.xml 217 BLAKE2B ee5131ede673a41d69ab787db1d05f6d64afc4d625294c8314d0db362124dddca5b31ff6d29cc41ebb3f464f4665e2bc9bccfac84f69231ebe819d262e8ed7c7 SHA512 783364e33af22e28ba41661e2380968c95f6464ae9ebb300d542ca159a54c4e53cf5e8b1053a72e75902f433e90fa26f6456fa127fca6daa44542bda57779e5a
diff --git a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
index d82463055d1c..c2914d837c64 100644
--- a/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
+++ b/media-libs/alsa-oss/alsa-oss-1.1.8.ebuild
@@ -9,7 +9,7 @@ MY_P="${P/_rc/rc}"
S="${WORKDIR}/${MY_P}"
DESCRIPTION="Advanced Linux Sound Architecture OSS compatibility layer"
-HOMEPAGE="https://alsa-project.org/"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/oss-lib/${MY_P}.tar.bz2"
LICENSE="GPL-2"
diff --git a/media-libs/alsa-topology-conf/Manifest b/media-libs/alsa-topology-conf/Manifest
index 34471f52cae9..7a1788bf60cf 100644
--- a/media-libs/alsa-topology-conf/Manifest
+++ b/media-libs/alsa-topology-conf/Manifest
@@ -2,8 +2,8 @@ DIST alsa-topology-conf-1.2.2.tar.bz2 6346 BLAKE2B 6aea93139e85de3d28ce193194293
DIST alsa-topology-conf-1.2.3.tar.bz2 11787 BLAKE2B 8dbeafd6a6800e826e76c0305caa01f6d7af4d32eadb49feb6fcab23041e3b3bc4c2bb9286e41b2e1a123ee363d621c46a8c96459ce4af03f8a45f834b83c6c7 SHA512 e57439212fd76d1d0c1677654ae7cecef0f89c01a6c57f5f00a02ecd2f6d9f22dc31ed4f301cf82464d98ac32c01f2015a91a5b51d08268ddfeb4265e9b951b9
DIST alsa-topology-conf-1.2.4.tar.bz2 11631 BLAKE2B 57df107b255e598e2fb79b56dc34d84130a023050db42e7925082ce5efb7048658ed6a8cd1854d2d9e23e8a833dbe90d7aa11ca7c1874f39caf392b292147ab7 SHA512 e5b367a23f42ed2c2a83f3dd9df264b4e054f5ba7c4be98520418598f0b06a11627498a8a6ef943522b209951645f83bbbbfb32db7c9c8260aa5db08358970cb
DIST alsa-topology-conf-1.2.5.tar.bz2 11657 BLAKE2B 0870aa5db05d7b82e5312ac5bd3c2d887f0cafc25a317cbc416ce0ac6982ce296620833c4459ccb357b4b014d300329fc3d0028d3ec2024495cc21f9cc122e1f SHA512 2eb4d8baf2dcbf0b631dd11dbf15bffc51694d9cc6931619e51787f3ba58d1a091d266e6721a3b737c040ec74a28270b93f39fb97f30a3227cf340dd646e5d51
-EBUILD alsa-topology-conf-1.2.2.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
-EBUILD alsa-topology-conf-1.2.3.ebuild 493 BLAKE2B dc5e4d77fc16226e2deffb2b5781f34ac177f86c9e9adbeb10115e5c14e56c77d1bb7576fe2810c94ffeb93ab6268c29ad19a731d5521669cd1a2364e08af290 SHA512 dd230cad08a4b612a163b3729aa8d0fb6bf6f27ceb850d0cfbf74c827e698ee600625b2105f7f0245014b7f240c47fe172546093d2b4bf79d7ff235847244e9a
-EBUILD alsa-topology-conf-1.2.4.ebuild 501 BLAKE2B d365eefaa426de5d0fb3af996e4bfccb41cb55f93c8c6e5dbc75437855aa18327cd141dd3c6950752a2fbb68502156cfb611b801766e9789564de68d4d673641 SHA512 3254160b67078063e9101b8acc064de321f41ada4c32719825e3e36bb1ed35d6390408743e150fd8b0487755e5bd0d5b78914a36a0d06f50a472d3f8a5a58f6a
-EBUILD alsa-topology-conf-1.2.5.ebuild 558 BLAKE2B aea238864b62e8ba0f9b890a594a2db0a1734b85ef0eb9c487f2acbedd0b89522c67b75ba6147d4db6650ee19c8a1d578d10f3f217872f64bfbc355b05d37abf SHA512 44b7671b62ec0c1e3117cd8c2bd429f3201ad1828851efef866043702f81bd9bccfbafdae604d60132b48e73ae82f87b05cfb4c26e289e17884550c3f9b0523b
+EBUILD alsa-topology-conf-1.2.2.ebuild 504 BLAKE2B 7ae0989b47cc763201860307402eaceb1b68bb5a63cc7bef1a9aabe085dd4e23751728007e69806e497d291252ba4298594a957ab9d9b8367686f4db62775a6c SHA512 f94b3fa1e52ce9e38521fb946b89c724323ca0012ba7857cd851972811830b667d022255b3dfecc90783ce14b6a9c2e794fa52dc55b1f52b754847680b57c02b
+EBUILD alsa-topology-conf-1.2.3.ebuild 504 BLAKE2B 7ae0989b47cc763201860307402eaceb1b68bb5a63cc7bef1a9aabe085dd4e23751728007e69806e497d291252ba4298594a957ab9d9b8367686f4db62775a6c SHA512 f94b3fa1e52ce9e38521fb946b89c724323ca0012ba7857cd851972811830b667d022255b3dfecc90783ce14b6a9c2e794fa52dc55b1f52b754847680b57c02b
+EBUILD alsa-topology-conf-1.2.4.ebuild 511 BLAKE2B 3f2b857f3e199c575363bdfe68c2041f56a7b0a9fe1a49ba03206d30470f3a44f1da9175a90877c2ff7098726a274e9549136c9e675857933494b72d41b607c9 SHA512 b3c0b066e83ff53c70183a74b65a4646784591c9d5c10ec72c2205be647b372acad38b0edfdf975de82c95b65e13072b6e8a1abcdd8bb92297fd84c3c9286bac
+EBUILD alsa-topology-conf-1.2.5.ebuild 569 BLAKE2B 031df6bdb91155682e5fcf7b7ccc0dc5280850b5db1d6e37a9abb9dd68c570b176a3479e11a782ced1c0d38758d720c11c18d42545b83b30c50b3318f43653f0 SHA512 e187ed4d6ce42d5be288cfd94d19915245063096ffc1ea36814f2403460292f1ece6ee2bec2e937dfc39a4eff8b30b34f0dad542cd5aa4739cfcf05454a52400
MISC metadata.xml 329 BLAKE2B 05575ce410f512de7fb1849f45c1bf4825ddcd8185e4c8a37c0dae08428baec9e909e4c7891558acec9a49397d5322444853d1382b8e5a5e3d849c56553efd78 SHA512 2ae6177fd9279fbf5167b90741750f4b2ad83f762dc385eef8af6c009d69d6a775a2d56c0767100187a6d64b5eee7df4495cc4d218b510e530507fc8bcb83611
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
index f912f7fefcca..1a1d090cf8c7 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
index f912f7fefcca..1a1d090cf8c7 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.3.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
index d7ed7caa0c1e..6e3a2eaf2d62 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.4.ebuild
@@ -4,12 +4,12 @@
EAPI=7
DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE=""
RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
index 259b34980290..421ef5520192 100644
--- a/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
+++ b/media-libs/alsa-topology-conf/alsa-topology-conf-1.2.5.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="ALSA topology configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
diff --git a/media-libs/alsa-ucm-conf/Manifest b/media-libs/alsa-ucm-conf/Manifest
index f7063d218513..00c491063318 100644
--- a/media-libs/alsa-ucm-conf/Manifest
+++ b/media-libs/alsa-ucm-conf/Manifest
@@ -1,9 +1,10 @@
+AUX alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch 646 BLAKE2B 271b720dbcfe5d32794b38125c0d947b62623a8f24b9cbe8a215281cd0586c65de805be2c5192f855f46744fda9b21a5fd463df7d540bf42f9c3035aedcda374 SHA512 aea5277bd5aa68680e31ffb09cd8853e13b9417bf8070480d450873f2864eb4037eabc8c23fafaa7fc482b5b2605ad1b9e45ff13b2b15ad8cb504b2d940d8bfa
DIST alsa-ucm-conf-1.2.2.tar.bz2 14608 BLAKE2B ce850415a115f673267f6ab32f176c2ab73aad8bd7cf2be244bfbb7342756c6de2212044cb92b3524dc4189955c8144b134af144b6a15aabf33c06cbcfe1fdf6 SHA512 25e3f341c110772c7cffc8c7745b320f2ddd12fe6460380c088939b5dc67b99ae4ad92e69375179574e0e1c40d14ff49961e86494e223fde009e51590f00ca8f
DIST alsa-ucm-conf-1.2.3.tar.bz2 17482 BLAKE2B d280ebb530c58df706d9b01c169472af8a88ec87735a8c5639981a2fddee31add0d78a2e47b43abf5bd13ef051dbb25749c701174aa0ea1b7255f771856e3e12 SHA512 1bdb024170f1dc18170c1d3699798c14d9cc7bbaccfe6eaef1fac0ec8c28074d08ed722bf47996682d4a0737138112b7eb4d45e224f00b027b3331da728e47cd
DIST alsa-ucm-conf-1.2.4.tar.bz2 20141 BLAKE2B 545f3bfb36c6c41e48a5d6c2a98b936b2e71d8aab99227faecfcb1dd1dec9a03eb25f1664ca9aad3f9371f140b548258bba5a3904f5a3ec83513eb72abe7c7c2 SHA512 9043460e92b2ed44757b08b9faca888e8bfae40d84e4ad7e7df44df2bb3b0617e86ef23783973accd62fb6681788262e67212e2bf67178d75781e57a0fa346d2
DIST alsa-ucm-conf-1.2.5.tar.bz2 23992 BLAKE2B 8ecd5adee6c9f429ab2791dfd57b0f9b1d58272b04d2c6cd3ad9aba36b53b380cfe626cae1e5c40f703eb7f891fb53b0bf70a78f9e5d2d8ae6b2dfb30fd6f659 SHA512 f16e8f04018c65de5e24f2a3eb0b3edff26cbce78cc1820c42c46907c903913c571797b59e803ae36b8ec3136487d0a5aacd034e2a8df3e15ed998b7a70152b7
-EBUILD alsa-ucm-conf-1.2.2.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
-EBUILD alsa-ucm-conf-1.2.3.ebuild 487 BLAKE2B dee942c9912f55e5379cb80fdcec2aafdd6892e5d4ab7638c81fe4270c29dd7a1775e15ad9d49eec97f5033111b98c49e08b54ae35a00b9efbc176a3b3e90ef5 SHA512 6b45cb1b367b442a565aea32e3635193405c59ed519aea1a3bae8507f69eeba60d989360cd6683436dbbb79f4e9746e052efa17fee9b4b0b9998138f296e5def
-EBUILD alsa-ucm-conf-1.2.4.ebuild 495 BLAKE2B 5a7fad73d0723cfd71638c6a3a1e3bca99daf6c37accbbfed4fee49eef8a683f5cbd75ad375034d48416bd560a5738e9b43078abc62c917534a4f709365a33cf SHA512 8c9a2c4d69e2b9e23b9c5eba95b065aa83fe82c1b306484923362241ce04e07c4db4c4a812db1fe80dff641c2f473998ed912bf8dec9ab37054ed688f7758e47
-EBUILD alsa-ucm-conf-1.2.5.ebuild 553 BLAKE2B 7a3244a22de8962e5fcc2bede58f28638a2e474f15a3b4c4596bee02c9536ce73c21197e984e7ebba053603237f68d036093be9c859b6d871d61f1e0cdfdb164 SHA512 bcdc43a3170a910718f6861adbecc64aa514aa6389b75817252334112c226d0bd736b870ebee28c9a2add6ffcff99c7c5928f416876d208169ab686080a326c6
+EBUILD alsa-ucm-conf-1.2.2.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
+EBUILD alsa-ucm-conf-1.2.3.ebuild 498 BLAKE2B 69b771656e59b7d0931db204557d74b863416df222db6417470dc5918407013ef691f99809556d1b31a61b8996500518c23438bacc9b8f5eee60d29069552870 SHA512 23513e4e794dff21c134690c325333dd9f839fc44c5b6795b988786b435dd7ea72bd193ef7d169218b59274265cfaa58bb916fe3a1aa6b38e720a73dc7fd2f48
+EBUILD alsa-ucm-conf-1.2.4.ebuild 505 BLAKE2B 8877c4840182eb78b2359c503599aed365024c0954cc3d2dca5c0e21802010acb3f0c05f694404b3d4a281e76d2d15a4fa7d7906d9147e4fb7e6484e53bfde9e SHA512 f8ce73bcf18ac0237386fb9fc097ccba571d377a10ba588013660ce38389ce6355314d540ec2c4ef2b5b7032e1911619d79d481902aaf82a7436db77d565b3c9
+EBUILD alsa-ucm-conf-1.2.5-r1.ebuild 673 BLAKE2B 1e2b6c7a59bb27e2a0c97a4fea11250a2d51c5c3ad927fb6ac9a1b7229ef892fb8aa1d023cd215387a7446db873ba88d1be37794a40f1692066683298784f164 SHA512 ee6e0d1ee59f3f83bcfe4c7b815c408753bef852a0370d42f01b1c0f5bf44c02cac46a4c53d30256df08e79db14d52e94dd92446ee61196384b8eb4bd7c775dc
MISC metadata.xml 324 BLAKE2B 8c9dd8aec6c9ed94966ecbce2a5db369f6d9c76751a77c70ca425d2a8d5cf54f15c6a211c553b9159d798e812e59b6f98505951290edc75ce92fe9e48aeae50d SHA512 84d140218362decc45a6474ac04c5e461730718051b8b0c608165a1ba2263cc91bd700fb25f98f76015949fcd5917822876dce13c17d89410ee7f5a648456c4b
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
index d85f2a03a32a..a89cadbba436 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.2.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
index d85f2a03a32a..a89cadbba436 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.3.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
index 6c74519bf103..555b0339b236 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.4.ebuild
@@ -4,12 +4,12 @@
EAPI=7
DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86"
IUSE=""
RDEPEND="!<media-libs/alsa-lib-1.2.1"
diff --git a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
index 2b01161620d6..444cc259d28b 100644
--- a/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5.ebuild
+++ b/media-libs/alsa-ucm-conf/alsa-ucm-conf-1.2.5-r1.ebuild
@@ -4,7 +4,7 @@
EAPI=7
DESCRIPTION="ALSA ucm configuration files"
-HOMEPAGE="https://www.alsa-project.org"
+HOMEPAGE="https://alsa-project.org/wiki/Main_Page"
SRC_URI="https://www.alsa-project.org/files/pub/lib/${P}.tar.bz2"
LICENSE="BSD"
SLOT="0"
@@ -17,6 +17,8 @@ DEPEND="${RDEPEND}"
MY_P="${PN}-1.2.4.81.g4884e"
S="${WORKDIR}/${MY_P}"
+PATCHES=( "${FILESDIR}/${PN}-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch" ) # bug #793410
+
src_install() {
insinto /usr/share/alsa
doins -r ucm{,2}
diff --git a/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
new file mode 100644
index 000000000000..6564be8977c1
--- /dev/null
+++ b/media-libs/alsa-ucm-conf/files/alsa-ucm-conf-1.2.5-hda-Intel-the-lookups-are-supported-from-syntax-4.patch
@@ -0,0 +1,20 @@
+From 3f34021beffba4e39f064a14c5faceeaa224b766 Mon Sep 17 00:00:00 2001
+From: Jaroslav Kysela <perex@perex.cz>
+Date: Tue, 1 Jun 2021 21:08:53 +0200
+Subject: [PATCH] HDA-Intel: the lookups are supported from syntax 4
+
+Signed-off-by: Jaroslav Kysela <perex@perex.cz>
+---
+ ucm2/HDA-Intel/HDA-Intel.conf | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/ucm2/HDA-Intel/HDA-Intel.conf b/ucm2/HDA-Intel/HDA-Intel.conf
+index 5794e72..8a8e0e7 100644
+--- a/ucm2/HDA-Intel/HDA-Intel.conf
++++ b/ucm2/HDA-Intel/HDA-Intel.conf
+@@ -1,4 +1,4 @@
+-Syntax 3
++Syntax 4
+
+ Define.Use "" # a non-empty string to use UCM configuration for HDA devices
+
diff --git a/media-libs/dav1d/Manifest b/media-libs/dav1d/Manifest
index e6f2afe5ff31..ddf3d15e18f2 100644
--- a/media-libs/dav1d/Manifest
+++ b/media-libs/dav1d/Manifest
@@ -1,8 +1,8 @@
DIST dav1d-0.8.0.tar.bz2 668627 BLAKE2B 6f45c6b0011acb74bb26fa201e667b16dbf8b691a2bc5d2043517381ca58132fa29ee828841609762737ac8637948b2bd4bac9e2c1d2ca23b1d3ad23f5883875 SHA512 906481ce5b9ce99cef2723c4c2466ba762095b9f88caccd42dcabfd4800964d7cd142736de1bf2ef25b631ee01eb26f7f1ac1754fc161b8fb7192e104df10e28
DIST dav1d-0.8.2.tar.bz2 695931 BLAKE2B cfe7667e583e05f8fd84b226a26ea23a901336fd8cf62900b47cd6b3bf92f8fe58d14224d1e063cc3bf7abdb17da437d291dc3f604cb68e99fc0615619f76880 SHA512 73335594950b08596356a1950213abf57c6d48060da37149e700565f9689ca82b7427e320040bf43b2e97eff7b6da7116a6aca77cb717f7ce140039ebdae5595
DIST dav1d-0.9.0.tar.bz2 771739 BLAKE2B 9cf24b142a1148200766a1a20010ff14d1baec507a7ecb477117826784b668178ba753049abf316aacbe1b957340c157f960f748ab8e6f74caf567edba2be3a9 SHA512 cfbfa4cb4508e1b975d7247bf0fa09d3b7adfd224adcf181153365677237b98a6d53b0b7bb91055a26e5668d58b3dcda5f675f68aceb1b020d14b53c4488575e
-EBUILD dav1d-0.8.0.ebuild 1175 BLAKE2B 043f3cac61cba7b31b92c3a4c7f0b6722444c66d3e0e6d82acf27841b1ca0003a816839e6a67eaf3cfa94f4795dd8e466d36c1d3681fdaed85a6de9615fbf779 SHA512 4624d5b50cb6fcb27dd7168efe7ada23f431ce7d575edc81e111488df7da4beae7d8f098332b26a19ed6a911e6b3891f10c4cd294a97fb244d24c271574936c8
-EBUILD dav1d-0.8.2.ebuild 1255 BLAKE2B 4ddaa8cf4cad0ea61d18fcc22b9140f4abc188feb7aafc6f0ad1ba4afd507cfdbe2ae930f335af61f585209b490c4298aaa11d997606474611fdfe4332740e6f SHA512 4e352a5e7d77bb95c168b12ee6963737b84b7be8b052cd296ebada29f658de914747b7f4372ec97d165922ffa81f61200b659a046ac1d2439fbd3be9cdbd6361
-EBUILD dav1d-0.9.0.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
-EBUILD dav1d-9999.ebuild 1261 BLAKE2B c638bed21ad66263281ae7772ddb146ba774fc02b9c45aedf98d411f4b8ae23304b2c04445f69def2e68fb2c4ef05c74f8e037b6be94678a9b14370269b05a8f SHA512 a514ba781229c5c39c8fd378cd4f077d68d20db36030b243c170c6f1dc09ef8f7f5c0011c68ce30dbeb8883b6d3d814281565a8452cec71e0d408eaded6f49f9
+EBUILD dav1d-0.8.0.ebuild 1060 BLAKE2B 9aab861019f4d4b7ab09d3f67a40ecfa3305a3f6057e60ff607b295572fa147e1dbae99f15b748cab8eb5ce668e0b36353e56f2003c816d4c4a4f86db999f6d4 SHA512 1930d6aa4218d5940ed0483d27accae81f94ff9aa18a7f3a5ed4f50fe2e3b6042332faba9dfcbb61883e7489ef44807a9d85b5abd4e9d87bc41d70d6677af936
+EBUILD dav1d-0.8.2.ebuild 1140 BLAKE2B dc06909be0c6b8b10dcf967ab561e0b463433c21e342c629738023ef59f225f7e212c751eebfc0eddf21c25c1af50f87083bbc23c5dafd57468bd36b1b73509b SHA512 314b53ee0a37c017aa0d16507148a8935f2aa2a505cb87c12c8a69d3d849cbe39860cfd36d6863d61d585a0584c47436a2a06edb5fcdcb3fa00dc07b5d7dcb4c
+EBUILD dav1d-0.9.0.ebuild 1146 BLAKE2B b9992fd8921597ba6bb3a70234ea0474340a1b364b205580b818fc1842945f9f0302976c70b568701b8bb5d90d47b5cbf1a8ff684a8e727f15ccc34af4309e45 SHA512 d7550556ce6aeedb98224500a86b1129dad0ab080be2f9d1b381b83fb1d5767734d93d0ddca2af3beca7b1a94ad5f91878ebf10a33de0ccd0d532ad6e8f4c5c4
+EBUILD dav1d-9999.ebuild 1146 BLAKE2B b9992fd8921597ba6bb3a70234ea0474340a1b364b205580b818fc1842945f9f0302976c70b568701b8bb5d90d47b5cbf1a8ff684a8e727f15ccc34af4309e45 SHA512 d7550556ce6aeedb98224500a86b1129dad0ab080be2f9d1b381b83fb1d5767734d93d0ddca2af3beca7b1a94ad5f91878ebf10a33de0ccd0d532ad6e8f4c5c4
MISC metadata.xml 536 BLAKE2B 40ec2224aed078ad4748d3182defb6813cdd34a614d40db2fbbbeb8b63e24a59ba1cbe9d458fec17516c328a89f77927d9fbeb9a1e4a2b8c296b7de7235b1af4 SHA512 74e6595ce441bb313364f375a8afa9b2a0179f350e30d075ecf99e058874450e15f4005a0712e20a4feb047d57799dffacb3903af00a3c5a8d059f7025e49de6
diff --git a/media-libs/dav1d/dav1d-0.8.0.ebuild b/media-libs/dav1d/dav1d-0.8.0.ebuild
index 3c9afa7958b7..68aff46355e3 100644
--- a/media-libs/dav1d/dav1d-0.8.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.0.ebuild
@@ -12,7 +12,7 @@ else
SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
fi
-inherit ${SCM} meson ninja-utils multilib-minimal
+inherit ${SCM} meson-multilib
DESCRIPTION="dav1d is an AV1 Decoder :)"
HOMEPAGE="https://code.videolan.org/videolan/dav1d"
@@ -47,11 +47,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- eninja
-}
-
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.8.2.ebuild b/media-libs/dav1d/dav1d-0.8.2.ebuild
index 8cb72bbfcc98..69f483748337 100644
--- a/media-libs/dav1d/dav1d-0.8.2.ebuild
+++ b/media-libs/dav1d/dav1d-0.8.2.ebuild
@@ -12,7 +12,7 @@ else
SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
fi
-inherit ${SCM} meson ninja-utils multilib-minimal
+inherit ${SCM} meson-multilib
DESCRIPTION="dav1d is an AV1 Decoder :)"
HOMEPAGE="https://code.videolan.org/videolan/dav1d"
@@ -48,16 +48,8 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- eninja
-}
-
multilib_src_test() {
if multilib_is_native_abi ; then
meson_src_test
fi
}
-
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-0.9.0.ebuild b/media-libs/dav1d/dav1d-0.9.0.ebuild
index 38fc32f1023f..e8fc5114e038 100644
--- a/media-libs/dav1d/dav1d-0.9.0.ebuild
+++ b/media-libs/dav1d/dav1d-0.9.0.ebuild
@@ -12,7 +12,7 @@ else
SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
fi
-inherit ${SCM} meson ninja-utils multilib-minimal
+inherit ${SCM} meson-multilib
DESCRIPTION="dav1d is an AV1 Decoder :)"
HOMEPAGE="https://code.videolan.org/videolan/dav1d"
@@ -48,16 +48,8 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- eninja
-}
-
multilib_src_test() {
if multilib_is_native_abi ; then
meson_src_test
fi
}
-
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/dav1d/dav1d-9999.ebuild b/media-libs/dav1d/dav1d-9999.ebuild
index 38fc32f1023f..e8fc5114e038 100644
--- a/media-libs/dav1d/dav1d-9999.ebuild
+++ b/media-libs/dav1d/dav1d-9999.ebuild
@@ -12,7 +12,7 @@ else
SRC_URI="https://code.videolan.org/videolan/dav1d/-/archive/${PV}/${P}.tar.bz2"
fi
-inherit ${SCM} meson ninja-utils multilib-minimal
+inherit ${SCM} meson-multilib
DESCRIPTION="dav1d is an AV1 Decoder :)"
HOMEPAGE="https://code.videolan.org/videolan/dav1d"
@@ -48,16 +48,8 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- eninja
-}
-
multilib_src_test() {
if multilib_is_native_abi ; then
meson_src_test
fi
}
-
-multilib_src_install() {
- DESTDIR="${D}" eninja install
-}
diff --git a/media-libs/embree/Manifest b/media-libs/embree/Manifest
new file mode 100644
index 000000000000..1e82bbc6dba3
--- /dev/null
+++ b/media-libs/embree/Manifest
@@ -0,0 +1,3 @@
+DIST embree-3.13.0.tar.gz 13708421 BLAKE2B bace1866d9d6907308d38370347d23b4edb3fe287d093acf35367be1d4548d1df064ed9d46ef928f17af99e335d5fcd7b7285a2bd95707361440547544782080 SHA512 3fc4f00151cb9558810c643bf77f3135465d65c4523e08d5289a0fdcb18d4c63a8e805647e4ce208556c4679d44373d817761c1003b1e9dc65a39d5ebf17926f
+EBUILD embree-3.13.0.ebuild 3465 BLAKE2B b5e4e31760538f51c50ba1526ee29eebdab8c5ee720267ec65457d31112ac481c45fc76413460bb327975a79e7c89023b8d3c40bd14855e994d6bf3aabbeba11 SHA512 a9fee50a34340c78b0c21c6128fcb53f1f59e351557ede13bea0e9f2b54641b639911b2850c707f2248357bbcc54bb00b712af07263f17f7f2276a9bbe4d42a2
+MISC metadata.xml 1613 BLAKE2B 916b6146240c4615a8baa634e74b5548bc9bb3951754e29fcc1c7bbde5e0bf149b78aa188ae90f96e6f5635c849bdcddb53c71207f5404f3b13f919824026129 SHA512 0b12bb93ffa005da30ee1c7106d2adffd82fafe66d5fded8b199ab77392773db03cd88e380a2b861bcf502275deb1e2467c7637b7548356c8487387b532cb7e1
diff --git a/media-libs/embree/embree-3.13.0.ebuild b/media-libs/embree/embree-3.13.0.ebuild
new file mode 100644
index 000000000000..7fb5564741fa
--- /dev/null
+++ b/media-libs/embree/embree-3.13.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake flag-o-matic linux-info toolchain-funcs
+
+DESCRIPTION="Collection of high-performance ray tracing kernels"
+HOMEPAGE="https://github.com/embree/embree"
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64 ~x86"
+SRC_URI="https://github.com/embree/embree/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SLOT="3"
+X86_CPU_FLAGS=( sse2:sse2 sse4_2:sse4_2 avx:avx avx2:avx2 avx512dq:avx512dq )
+CPU_FLAGS=( ${X86_CPU_FLAGS[@]/#/cpu_flags_x86_} )
+IUSE="+compact-polys ispc +raymask ssp +tbb tutorial static-libs ${CPU_FLAGS[@]%:*}"
+BDEPEND="
+ virtual/pkgconfig
+"
+RDEPEND="
+ ispc? ( dev-lang/ispc )
+ >=media-libs/glfw-3.2.1
+ tbb? ( dev-cpp/tbb )
+ tutorial? (
+ >=media-libs/libpng-1.6.34:0=
+ >=media-libs/openimageio-1.8.7
+ virtual/jpeg:0
+ )
+ virtual/opengl
+"
+DEPEND="${RDEPEND}"
+RESTRICT="mirror"
+DOCS=( CHANGELOG.md README.md readme.pdf )
+
+pkg_setup() {
+ CONFIG_CHECK="~TRANSPARENT_HUGEPAGE"
+ WARNING_TRANSPARENT_HUGEPAGE="Not enabling Transparent Hugepages (CONFIG_TRANSPARENT_HUGEPAGE) will impact rendering performance."
+ linux-info_pkg_setup
+
+ if ! ( cat /proc/cpuinfo | grep sse2 > /dev/null ) ; then
+ die "You need a CPU with at least sse2 support"
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # disable RPM package building
+ sed -e 's|CPACK_RPM_PACKAGE_RELEASE 1|CPACK_RPM_PACKAGE_RELEASE 0|' \
+ -i CMakeLists.txt || die
+}
+
+src_configure() {
+ # NOTE: You can make embree accept custom CXXFLAGS by turning off
+ # EMBREE_IGNORE_CMAKE_CXX_FLAGS. However, the linking will fail if you use
+ # any "march" compile flags. This is because embree builds modules for the
+ # different supported ISAs and picks the correct one at runtime.
+ # "march" will pull in cpu instructions that shouldn't be in specific modules
+ # and it fails to link properly.
+ # https://github.com/embree/embree/issues/115
+
+ filter-flags -march=*
+
+ local mycmakeargs=(
+ -DBUILD_TESTING:BOOL=OFF
+ -DCMAKE_SKIP_INSTALL_RPATH:BOOL=ON
+ -DEMBREE_BACKFACE_CULLING=OFF # default
+ -DEMBREE_COMPACT_POLYS=$(usex compact-polys)
+ -DEMBREE_FILTER_FUNCTION=ON # default
+ -DEMBREE_GEOMETRY_CURVE=ON # default
+ -DEMBREE_GEOMETRY_GRID=ON # default
+ -DEMBREE_GEOMETRY_INSTANCE=ON # default
+ -DEMBREE_GEOMETRY_POINT=ON # default
+ -DEMBREE_GEOMETRY_QUAD=ON # default
+ -DEMBREE_GEOMETRY_SUBDIVISION=ON # default
+ -DEMBREE_GEOMETRY_TRIANGLE=ON # default
+ -DEMBREE_GEOMETRY_USER=ON # default
+ -DEMBREE_IGNORE_CMAKE_CXX_FLAGS=OFF
+ -DEMBREE_IGNORE_INVALID_RAYS=OFF # default
+ -DEMBREE_MAX_ISA:STRING="NONE" # Set to NONE so we can manually switch on ISAs below
+ -DEMBREE_ISA_AVX=$(usex cpu_flags_x86_avx)
+ -DEMBREE_ISA_AVX2=$(usex cpu_flags_x86_avx2)
+ -DEMBREE_ISA_AVX512=$(usex cpu_flags_x86_avx512dq)
+ -DEMBREE_ISA_SSE2=$(usex cpu_flags_x86_sse2)
+ -DEMBREE_ISA_SSE42=$(usex cpu_flags_x86_sse4_2)
+ -DEMBREE_ISPC_SUPPORT=$(usex ispc)
+ -DEMBREE_RAY_MASK=$(usex raymask)
+ -DEMBREE_RAY_PACKETS=ON # default
+ -DEMBREE_STACK_PROTECTOR=$(usex ssp)
+ -DEMBREE_STATIC_LIB=$(usex static-libs)
+ -DEMBREE_STAT_COUNTERS=OFF
+ -DEMBREE_TASKING_SYSTEM:STRING=$(usex tbb "TBB" "INTERNAL")
+ -DEMBREE_TUTORIALS=$(usex tutorial) )
+
+ # Disable asserts
+ append-flags -DNDEBUG
+
+ if use tutorial; then
+ mycmakeargs+=(
+ -DEMBREE_ISPC_ADDRESSING:STRING="64"
+ -DEMBREE_TUTORIALS_LIBJPEG=ON
+ -DEMBREE_TUTORIALS_LIBPNG=ON
+ -DEMBREE_TUTORIALS_OPENIMAGEIO=ON )
+ fi
+
+ cmake_src_configure
+}
diff --git a/media-libs/embree/metadata.xml b/media-libs/embree/metadata.xml
new file mode 100644
index 000000000000..9fb89375a782
--- /dev/null
+++ b/media-libs/embree/metadata.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>darkdefende@gmail.com</email>
+ <name>Sebastian Parborg</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Intel® Embree is a collection of high-performance ray tracing kernels,
+ developed at Intel. The target users of Intel® Embree are graphics
+ application engineers who want to improve the performance of their
+ photo-realistic rendering application by leveraging Embree's
+ performance-optimized ray tracing kernels.
+ </longdescription>
+ <use>
+ <flag restrict="&gt;=media-libs/embree-3.12.2" name="compact-polys">
+ Enables double indexed poly layout.
+ </flag>
+ <flag restrict="&gt;=media-libs/embree-3.12.2" name="ssp">
+ When enabled, Embree compiles with stack protection against return address overrides.
+ </flag>
+ <flag restrict="&gt;=media-libs/embree-3.12.2" name="ispc">
+ Build Embree with support for ISPC applications.
+ </flag>
+ <flag restrict="&gt;=media-libs/embree-3.12.2" name="raymask">
+ Enables ray mask support.
+ </flag>
+ <flag restrict="&gt;=media-libs/embree-3.12.2" name="tbb">
+ Use TBB instead of the built-in Embree tasking system.
+ </flag>
+ <flag restrict="&gt;=media-libs/embree-3.12.2" name="tutorial">
+ Enable to build Embree tutorials programs.
+ </flag>
+ </use>
+ <upstream>
+ <remote-id type="github">embree/embree</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 1b250e792148..c7f32332faca 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,5 +1,3 @@
-DIST fdk-aac-2.0.1.tar.gz 2865456 BLAKE2B 79c66956b3c43138fb34448398cf104a021757332b2af6d4493bce8c4f9dfdf97a38d1f00c3f1a3f91ffb3b2ce2bb0bdc982e3f92a1ffe7e5f0d1c2f0ef8ca99 SHA512 08209bbd060edafe7b607c9e1394cd03df4f98df6f32b4be21d34d1ab491a7447ed592785546c040126767bd31980121ca6a31aba06eaf90558b14228e302d82
DIST fdk-aac-2.0.2.tar.gz 2886434 BLAKE2B f9917cf8ded3e4165048b27211c5985b4fe174d1ac815a7bc4afad88e059f3a89a24f88ad20633becdba9cb91717b9d4bf44781368c436e35002061b1644eb64 SHA512 8e5a7992869a7e649bee6d41bf7c6e408cec7ba1931a6cd7a9ad8a01e6ac49bd299ddd147b18823e8ee379ce7c6373d7f5a94f0f859ed973a30c61eccd53fa7e
-EBUILD fdk-aac-2.0.1.ebuild 1328 BLAKE2B c4da80c35ec53c1c0a2bba5fd0dce0c766baed5bc7ce7b2f66b751ba512d21fbcb795a251c35dd4021f7479975253d5959cf8c49f133a0d5b4ca566f8c84c0d5 SHA512 eef06746f316d6e4e4e50ec17c242ce0eebdc04458747810fcb543749587e96e8534916998a8060f5c07d132c0c10d3d3647355d75431590708ab1cd563c5b34
EBUILD fdk-aac-2.0.2.ebuild 1328 BLAKE2B 53645e3a1085a5a9ac932600bf744b5a2c6964e51dc45fab1c2cefe50e101ace619deb7cc5cd1c55148611362e7290527d925ad03d0b7766beb476a85f6c089b SHA512 959b4333e726e664005cd5ed920eab51de7966197eaf0e02361c3498ebdb4a90f7ce48a092b8c24a75c3202fac61372cbbbbd133a6351ea80f0063900da6e362
MISC metadata.xml 335 BLAKE2B 62ac5499e6bf0ca4ebb5cef78982a734cbc068fad39764b545089233f2c611937c4d8cddfa7f042705c7f7849a44f1e971431667eae02e7622d45f5b5ccdfb14 SHA512 25f894f204476ffe7bf81e7e81b16f569b34ac57572cba903bf447a53699f0e4cf5448fa27689b4baf60753e7f605f47c4a7d60f19616446b0c1f871d9b866e3
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.1.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.1.ebuild
deleted file mode 100644
index a505bf33937c..000000000000
--- a/media-libs/fdk-aac/fdk-aac-2.0.1.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="https://github.com/mstorsjo/${PN}.git"
- [[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
- inherit autotools git-r3
-else
- KEYWORDS="amd64 arm arm64 ppc ppc64 x86 ~x64-macos"
- if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
- SRC_URI="mirror://gentoo/${P}.tar.xz"
- else # Official release
- SRC_URI="mirror://sourceforge/opencore-amr/${P}.tar.gz"
- fi
-fi
-
-DESCRIPTION="Fraunhofer AAC codec library"
-HOMEPAGE="https://sourceforge.net/projects/opencore-amr/"
-LICENSE="FraunhoferFDK"
-# subslot == N where N is libfdk-aac.so.N
-SLOT="0/2"
-
-IUSE="static-libs examples"
-
-src_prepare() {
- default
- [[ ${PV} == *9999* ]] && eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --enable-shared
- $(use_enable static-libs static)
- $(use_enable examples example)
- )
- ECONF_SOURCE=${S} econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
-
- if use examples; then
- mv "${ED}/usr/bin/"{,fdk-}aac-enc || die
- fi
-
- # package provides .pc files
- find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
- use examples && einfo "aac-enc was renamed to fdk-aac-enc to prevent file collision with other packages"
-}
diff --git a/media-libs/freetype/Manifest b/media-libs/freetype/Manifest
index ab227dd1de89..3d88e09937fd 100644
--- a/media-libs/freetype/Manifest
+++ b/media-libs/freetype/Manifest
@@ -5,6 +5,6 @@ AUX ft2demos-2.10.4-install_target.patch 1647 BLAKE2B 4409123fbb089c1312ff90ebbb
DIST freetype-2.10.4.tar.xz 2416620 BLAKE2B 9852378536e873514baae3c024b9b30dcd78a36c2189dcbdb0562c56ccf871a5795896950ea129f2e0f12181095c92715216747e8a8396d6d03efac82a5a10ea SHA512 827cda734aa6b537a8bcb247549b72bc1e082a5b32ab8d3cccb7cc26d5f6ee087c19ce34544fa388a1eb4ecaf97600dbabc3e10e950f2ba692617fee7081518f
DIST freetype-doc-2.10.4.tar.xz 2079084 BLAKE2B a051c425250f8af1cd0e83b15d6e5692b1ee5ff00317467cef648dcc7ea1f88ad6cde0fe2d53e5c45220723bb935e6527dbba124ef8739e6ebe372bc06ec78b7 SHA512 171da6c6a172869e9bec0da67cb1abdb0fdb124870f13b751b4e9b1b5e342fb2af38cb606db1c3dcf18076a077e694b7b8dd055dd7f4ab49afe7e1d61b4f9ba8
DIST ft2demos-2.10.4.tar.xz 236712 BLAKE2B 76883bfc09c42b6092b0b512aff66b4585ac83793da787e688ad8446fceac1ce315014bde03d4271fc5a1b7bd1d3250255f5faced92beade6e4ed78c896db80d SHA512 d2afc19e5fabbee5205fcc992f6c19bab03485b7af4f55bb2d2dd0a4a9492a3f593540862ca116b54cf161b240d7966cb31a9793578d164fc418449e339e2fa8
-EBUILD freetype-2.10.4.ebuild 6819 BLAKE2B bd401c75e986dbc8c15228e058ff104d3b1de5cc7c49350e41169f29efaef88c7e4b6f54106d795b35a8e80292bd66097eef9d33e46366f96eb3e21e4c0b62f3 SHA512 4455927d94a4ecc45b4aef2bc3e779582b560371679b2538a6a2fd491c8f1e64fe12cc85d70d5bc0a2f138e4ce0ba2eba87b63eff0badf38cb115d392e0a988c
-EBUILD freetype-9999.ebuild 7287 BLAKE2B 7f0fb25254f4486369dca71433f0d35070bc892cf7c814ad52c641c9ce795016520082a2924e2950b759fe397897165987bf3919f0199313d595973d69ae38aa SHA512 476e1c68c8c5808ac6630e1bc40a4343688f6dc0015e1c7f447ca3442b81f196afa812c5e7949fdaed7a9fb05c3b635a13fd145b2bb22eda5d4fc84d92c1144a
+EBUILD freetype-2.10.4.ebuild 6744 BLAKE2B 0ca789f56a698d01a7de9d0a285d8d09568ee50d66ce044963fa1c8cf6c8a601d8d042d09b82c2c3c2918ad35149d590cff81051b750eabd0e7979b25e9d64f9 SHA512 517942a03670269d1184fad384cb2ee77b84d2192ecbcb3fa28deee9e7148eef965b0a55c941994cf54e971034ad20367a1d8c69852fdc04f6eb924fdfe7893b
+EBUILD freetype-9999.ebuild 7204 BLAKE2B 8fddb4b9232c960abb584841ca406c43820b994f6ed19d8c238dd8770b9afa4b151ead08c28539314de18f8f0818c19b7caf8e02f29ca0697b8b48d2c9ad6eb7 SHA512 d22668dc29e767cff3545c9e41bf132d9637fbcc55a0ffaed696432e24914f9901d169e1422084e294815eb09990ee97da217efbddf24397834f259e5af91e54
MISC metadata.xml 1613 BLAKE2B 93afe7641d11f06f2b6c87348498fe292b50f1b6240019532bc8639bf2b70c0511014c720e3fc7fe0e0f033bb4449745df0a489597750e4d99695798bbbdf2b1 SHA512 ee0c14554af76884f8efced54d2dd7b0dcb90c3aeb8e6ed638956a79d840bc825c32af49230f56e7659bdfc4cfe761068c0ebf31ee3cd28f79078cd5738e052e
diff --git a/media-libs/freetype/freetype-2.10.4.ebuild b/media-libs/freetype/freetype-2.10.4.ebuild
index 0575eaa7fb6e..828493a8d241 100644
--- a/media-libs/freetype/freetype-2.10.4.ebuild
+++ b/media-libs/freetype/freetype-2.10.4.ebuild
@@ -235,7 +235,4 @@ multilib_src_install_all() {
fi
find "${ED}" -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -name '*.a' -delete || die
- fi
}
diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild
index 3cc2445891fa..1caabaa6c63d 100644
--- a/media-libs/freetype/freetype-9999.ebuild
+++ b/media-libs/freetype/freetype-9999.ebuild
@@ -244,7 +244,4 @@ multilib_src_install_all() {
fi
find "${ED}" -type f -name '*.la' -delete || die
- if ! use static-libs ; then
- find "${ED}" -type f -name '*.a' -delete || die
- fi
}
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 58ef53593801..3c2d5617d3e5 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -1,10 +1,12 @@
AUX gegl-0.4.18-drop-failing-tests.patch 1040 BLAKE2B 5f747ad8bffa2a11a2275a2773d4835f13d8ff0d271fe83ca5da93ad83da7f5e808b8be3858b6812b4e102d0086fcb55270157b6fd3a568882537d4ddf33d298 SHA512 efeb64b100e2e5d548fdcfe49be3ee5fe208e90b8655b16f0dcfe08821d1ea792501ad372d7ae0029552ffe762bb5408543e573f9d7977d238afb8f261f521f5
AUX gegl-0.4.18-program-suffix.patch 1071 BLAKE2B c529fe0cea80688201dfd4064fc54ca66ff26a322c877bb1cf9d83a436f8a455bf05e68a33cd6415f76337d98997e5e0ed38aba1db4c5ae3c84eb0905c5ccef2 SHA512 e47f32c9f3c82b50320759dca08dbc31c5db838252d4fc43be10a75eee469a17f91c92aefcfd01711d9628fac16ed2d612f037fc9509e7fc823ed77086edc417
+AUX gegl-0.4.26-fix-build-glib-2.67.3.patch 765 BLAKE2B cd9a629e1dc6aa8751b06c950ee0340464e8110c042663c3f94ae6ba347047bd5bef3d39db590d3c3d0e8d0388b7e86e2e4478226c4e85e01faa91e7eec9fcb9 SHA512 9b7bccc4f7b555e95c8e2858879c5056278b439c79b586aadf0ad343f3fc210afcfee766b9902c8f6868bf9e246cb61ee66e828e50ed44d64a1c51cbf61e28f5
+AUX gegl-0.4.30-fix-build-openexr-3.patch 694 BLAKE2B 45bfdc9ebb8bb651e84a5e7038e878fbd022083de1a92adc020212e6903faced42a12c68ba0643e2699795a71fa9a703871af4d1a280e612dfda74b50c216179 SHA512 4ccad50d0789a95f599b62b4e8801e417214615775cd44f201bd101635316ed7d763f8a84365dc09d62503859558791d0c0d4871866fde84ed42ecdb091d013e
DIST gegl-0.4.26.tar.xz 4942492 BLAKE2B 656a9c0d339d136f3f2efbb1484fbfea27deab241821503b31d74b015fe8766ee8d931ea0bf1a354200581bc54fea307a2cfb9b469e73a211a77d109d33707f3 SHA512 634778df0060ffe630121c24044a6ddcc7f2de0ff61b02be24db4054c6f3def24373b28dd1152d62882d58383a3aa7a1f74cd5b743a299fd0719a2a2ff992d24
DIST gegl-0.4.28.tar.xz 4966580 BLAKE2B fcf4fb0e4fac0357d25987348c6abe2434db17bd974ab39f15c3e11a6a6ee8630469d0b53fe2cc76a3af90c9b3a6ba88972301d6fac8df693f5fa12919e0bfa0 SHA512 ad02dc4e4ff7c5beddb3cc8e1c05b6f858e7164dfd239bada70cc138a541a36f82c0e415c6fb81d4799ae8acdcb95ddb607c6b24481a73c5ae0d6e87c73fdbb7
DIST gegl-0.4.30.tar.xz 5398052 BLAKE2B c57b34ed64d3b9305d3e639b872c283bd4c9c798d13f7bde49b991044139bb4e433a3adb0a9e991b78b2905985496ca3bf4ed116333ceaaccc043b8a66426131 SHA512 73db2d18260ba061fbbc2adb3256ea9d5b822b57f5654cc3aefb59e7afeeb2e4f0fd7e95ac14603c0a549935df04d5744001089efb378511c914c68664dbd378
-EBUILD gegl-0.4.26-r1.ebuild 4918 BLAKE2B fed1558637b7204e42276acce1686e082c30872da393ceb587fb65fa5799868e6a3e547fd053cdfdb4d03944e13e739f6e7d0f612b145a20275a94c851fa3330 SHA512 be8f2fc4138d83fe1d302ae195a31d5da438be83daad88c729bf1bdec28a31c8677a469143e1a8f59de8ad48a8032405c04396ff6b05f2b9e5a726232752c395
-EBUILD gegl-0.4.28.ebuild 4922 BLAKE2B d8ea7a1ca2ed1370330ec03d1cb8650ad45a7b7172322c567ec50aec302b453f434aecfc30bfe6242096d92d9eeaa6a53223c79b2fbe894840be8f3582026d5a SHA512 0d195fb4b3dc1b9d496a7701d26c7f508c3177eaa5ce9d180777b89bb99e1dea79289ef8deacd9cbb3de62c98b7e83b3b21068adbca7a228e1dca83008cbebf4
-EBUILD gegl-0.4.30.ebuild 4762 BLAKE2B 340be5f6e2bd80c2b683f414521c9c158d238e5457e85f841f58de3011874d1901b4cd1918bb6c1a4afe5b1cc753af1c4a0a587d9728e22f24f91a5576da6584 SHA512 779fb12362ad509f8f91042e031937a5e82fd35d582a9f424b6795d2216c6bc42a00aa4c877a07ec20902d0793e33e50aa4a5286d7307cf53273b37a9b96ad24
+EBUILD gegl-0.4.26-r1.ebuild 5022 BLAKE2B d76955b962ac995d1648152318607f4ebc4f74680e95e357eaf2ff0391800212c9cf0ba2bb7445ce89031ff0d0fc1c5c14046903de32bb4e49a6adc3267fb49e SHA512 14bf294c9c1b073d7c3dce07b61b0b02d298ed3fe9d53825c91c4ed6b10d28fdfebc73dcb63fff9dbd272d0278b688a64236ca0ddce5ca15722af2b17d009912
+EBUILD gegl-0.4.28.ebuild 5034 BLAKE2B aa7b52183ed7cf1047dc19be3343fd06efda464eb03aecd93959bbecde260a4d7aaf172bb91194d672fa8ae2512ef698e0b77492a8bc6307eda9c4f093271f73 SHA512 bb2ab17cfbab58b420bad3b957a2b84563d7294631a7b188fef6a5dc530b742da96b6dee5d0fc8103ee419e9ef2b587ee1011e02cb96bac372df7f68404fab8d
+EBUILD gegl-0.4.30.ebuild 4823 BLAKE2B 785a20a11914410fe117ea409a66c6d030651eaf96a4b5e0aa272d0986ce8b163761567e54d3bdd3e3092d2a5025767a21ad3aed4b395ba282be8524e5c39239 SHA512 baf13b20f7b3404321d700d4d9a3edfb4f60aacbddf7ed0906403769dd72c4eae4af0d1f761bd61d77fc15554bb53c4b866b1bb2f403615b85fa6e01b7165e54
EBUILD gegl-9999.ebuild 4493 BLAKE2B ef40bd142f0f50c7a762a68071ceaadaa0eadb0d15ff2da97a7b42b72aa9782bd37b6bc5b1162f1cd986b08cb24169000c4db69fdfcced450dcb281f3714ff0b SHA512 b33c2c4cfb749a836e53802f96e9000dbb6b68a6fb3f4863737f5d4e3550cefd17ef8a4610c04014fa7d696b0efc637b3437e145961bd567c1393f3be7caee4a
MISC metadata.xml 580 BLAKE2B 604088ef1ce307cb04f44e6c204355569136168f6f574a3b58a5ce374b9e9d4e41476107f11cd5990d0ae39ace5db5420e372c7c88d409b38930cc8b6030b3c0 SHA512 a59cd50a65117f265616e2b595ec3cc95a59f9caac46218fb137af2f62067c5563a4dc53930188b6adf13b0548f02b637bb8312863ee1976ace90ec509e4a2f1
diff --git a/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
new file mode 100644
index 000000000000..00e1b8ab4845
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.26-fix-build-glib-2.67.3.patch
@@ -0,0 +1,24 @@
+From 130cd583530dc41adfdec76d6662302f833e6033 Mon Sep 17 00:00:00 2001
+From: Olivier Tilloy <olivier.tilloy@canonical.com>
+Date: Fri, 5 Mar 2021 12:58:18 +0100
+Subject: [PATCH] Fix build with glib 2.67.3 (see
+ https://gitlab.gnome.org/GNOME/glib/-/issues/2331).
+
+---
+ operations/external/exr-load.cpp | 2 --
+ 1 file changed, 2 deletions(-)
+
+diff --git a/operations/external/exr-load.cpp b/operations/external/exr-load.cpp
+index e864f7e3e..28403639c 100644
+--- a/operations/external/exr-load.cpp
++++ b/operations/external/exr-load.cpp
+@@ -29,9 +29,7 @@ property_file_path (path, "File", "")
+ #define GEGL_OP_NAME exr_load
+ #define GEGL_OP_C_FILE "exr-load.cpp"
+
+-extern "C" {
+ #include "gegl-op.h"
+-}
+
+ #include <ImfInputFile.h>
+ #include <ImfChannelList.h>
diff --git a/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
new file mode 100644
index 000000000000..e0e938acc22e
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.4.30-fix-build-openexr-3.patch
@@ -0,0 +1,22 @@
+From 499a239d158fadb3a04499255b5b282a8a6023bb Mon Sep 17 00:00:00 2001
+From: Antonio Rojas <arojas@archlinux.org>
+Date: Sat, 24 Apr 2021 10:51:09 +0000
+Subject: [PATCH] Fix build with OpenEXR 3
+
+Add a header that is no longer transitively included
+---
+ operations/external/exr-save.cc | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/operations/external/exr-save.cc b/operations/external/exr-save.cc
+index 1e8c09d96..87abed511 100644
+--- a/operations/external/exr-save.cc
++++ b/operations/external/exr-save.cc
+@@ -45,6 +45,7 @@ extern "C" {
+ #include <ImfChromaticities.h>
+ #include <ImfStandardAttributes.h>
+ #include <ImfArray.h>
++#include <ImfFrameBuffer.h>
+ #include "ImathRandom.h"
+
+
diff --git a/media-libs/gegl/gegl-0.4.26-r1.ebuild b/media-libs/gegl/gegl-0.4.26-r1.ebuild
index 5185fcb9f8e9..71107e34e87e 100644
--- a/media-libs/gegl/gegl-0.4.26-r1.ebuild
+++ b/media-libs/gegl/gegl-0.4.26-r1.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
- >=dev-libs/glib-2.44:2
+ >=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.78[introspection?,lcms?,vala?]
media-libs/libnsgif
@@ -78,6 +78,8 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+ "${FILESDIR}"/${P}-fix-build-glib-2.67.3.patch
+ "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.28.ebuild b/media-libs/gegl/gegl-0.4.28.ebuild
index 6efb79792de8..6952d3f4fa8c 100644
--- a/media-libs/gegl/gegl-0.4.28.ebuild
+++ b/media-libs/gegl/gegl-0.4.28.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
- >=dev-libs/glib-2.44:2
+ >=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
media-libs/libnsgif
@@ -78,6 +78,8 @@ DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
PATCHES=(
"${FILESDIR}"/${PN}-0.4.18-drop-failing-tests.patch
"${FILESDIR}"/${PN}-0.4.18-program-suffix.patch
+ "${FILESDIR}"/${PN}-0.4.26-fix-build-glib-2.67.3.patch
+ "${FILESDIR}"/${PN}-0.4.30-fix-build-openexr-3.patch
)
python_check_deps() {
diff --git a/media-libs/gegl/gegl-0.4.30.ebuild b/media-libs/gegl/gegl-0.4.30.ebuild
index db958e5516ed..0f6d0b738252 100644
--- a/media-libs/gegl/gegl-0.4.30.ebuild
+++ b/media-libs/gegl/gegl-0.4.30.ebuild
@@ -37,7 +37,7 @@ RESTRICT="!test? ( test )"
# so there is no chance to support libav right now (Gentoo bug #567638)
# If it returns, please check prior GEGL ebuilds for how libav was integrated. Thanks!
RDEPEND="
- >=dev-libs/glib-2.44:2
+ >=dev-libs/glib-2.68.2:2
>=dev-libs/json-glib-1.2.6
>=media-libs/babl-0.1.84[introspection?,lcms?,vala?]
media-libs/libnsgif
@@ -75,6 +75,10 @@ BDEPEND="
DOCS=( AUTHORS docs/ChangeLog docs/NEWS.txt )
+PATCHES=(
+ "${FILESDIR}"/${P}-fix-build-openexr-3.patch
+)
+
python_check_deps() {
use test || return 0
has_version -b ">=dev-python/pygobject-3.2:3[${PYTHON_USEDEP}]"
diff --git a/media-libs/glfw/Manifest b/media-libs/glfw/Manifest
index e749ddd7bb3b..c60392567c21 100644
--- a/media-libs/glfw/Manifest
+++ b/media-libs/glfw/Manifest
@@ -3,5 +3,5 @@ DIST glfw-3.3.3.tar.gz 763713 BLAKE2B bd6202877a3462d717a6d77b6381de704da854df01
DIST glfw-3.3.4.tar.gz 762885 BLAKE2B b88f80ec8cfb1607a8c5ce5e6eabfe5c9813235c6225629ef8001ba5f46cdbed1d726aeed170a8749bbd048f1517cb614f9fc5ad7604ae1698b83b5e995b8cd6 SHA512 2b45ab72da7a2c007c0f42ccd56205f9684cfb980e2b1df127850cd057bb2b02ce02c7c64acd54cd433778e7017148f214afedf09badff9d2edf5f9b8d9d2701
EBUILD glfw-3.3.2.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
EBUILD glfw-3.3.3.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
-EBUILD glfw-3.3.4.ebuild 919 BLAKE2B c4e4a3053fe56de47352674c8ac7834b1e45935ed64fa72515e4692e274916d04abc4aaf99a7ca9aaf6ad0d431e71a9f108ea4e78d59ef970e07127dde66e001 SHA512 6923cfb6d28c261e2a0cdb99d330b9266a49a45f57779befd9c74cbd261a0877b0281ed5c72ddc802b707080e32db5ee8563bd4a690cef8b0226a0255e9d3b24
+EBUILD glfw-3.3.4.ebuild 917 BLAKE2B 201613d30143c1145aaf264198be05a0f87e17b5a261174bb397241c8fafdfc38a40dc268cd6f269b10dc41c6b74c65a51ddfdc8121ec5e67b5df3ff0a8e5a5c SHA512 7555c1164fe1fca8fc860e52cafc492fe580a1f1a3456d68209f03adfeeaa377de0217570aa563f95345a9070afadf3358d117efbff2ac70b15879ab54d2d7ca
MISC metadata.xml 388 BLAKE2B 6f83bc48ed7a722cf0b64e450ac3839543db9713d3252c40eab395a54d53b9782e163a3238e6d443c2f8f6c8fd747a273ca018e08918fe084b048821665a8bbe SHA512 47ef3b02e4c8b3a12f328bc227f3ed2196c82e05970a9af12d1988a4466d5b614e0b788914dc03b4325a5cd2d63d93a677b6d093cdd50455c78b3d79c64a5171
diff --git a/media-libs/glfw/glfw-3.3.4.ebuild b/media-libs/glfw/glfw-3.3.4.ebuild
index ea8df33cd67c..126bde0fc027 100644
--- a/media-libs/glfw/glfw-3.3.4.ebuild
+++ b/media-libs/glfw/glfw-3.3.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/glfw/glfw/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="ZLIB"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc64 x86"
IUSE="wayland"
RDEPEND="
diff --git a/media-libs/graphene/Manifest b/media-libs/graphene/Manifest
index 6a96c0f93b12..75631071de0f 100644
--- a/media-libs/graphene/Manifest
+++ b/media-libs/graphene/Manifest
@@ -1,3 +1,3 @@
DIST graphene-1.10.6.tar.xz 333332 BLAKE2B d353efb22510b78c7360b748b7e83237309b88c170909e521d50e95618e907bd8b2424c3583a5db3ff2ca57954bf793646a69251bbb31caac55155c15981ed3a SHA512 075e8c712509655d0614258a7fd2943e67a9642334cdabdc15d2489a88c961e278f7464a513080cd287f5371c7ece8ceb7565d1718a8b71fea4a4977f82aeb72
-EBUILD graphene-1.10.6.ebuild 1716 BLAKE2B f92409d3e8b8af44476171b046e325bfade4e8808b349206dee1cc4374d3604afc0532ba7e0a4830a146ceede305bde2a58607522c96dcb292054cc436fde449 SHA512 b5eac806ceaecb9c13499456fae92be0d4a48ddd8941de973972bb4d32b3711e6ebe2d5ae643531f6f0671433fabe7ede95c4596e3e14292a906da46395425d5
+EBUILD graphene-1.10.6.ebuild 1532 BLAKE2B bc1d794250843f3ac67302da2917f55504535cd17b68009a4d51490aee949b2bddfd031be478877b06509f078e28a89c3ce65b11979979f2b34990ba403715da SHA512 a7bad13274a2301cfed78892acaa7771ff8ec40b6fe0d61db0fba755175317137739f13da240f79bd9368b3b651eca8b4d4973da093c531908126749e94bf9fd
MISC metadata.xml 333 BLAKE2B 3d34baf2b84e2ca8cc20638b381fdb4771e94f07df133f5d997b5d7bdf3704f8b8f77d2c79815f70246affa2e399d1118e03eae7c7cf8e419fec3dae89ef0405 SHA512 aef6b787ac7f14b56e4eacd746c91671b9a115cb40b312b415c7302d4339f5d3b3a887bd52a2b30ba31b3e0f027360a9fa55f6d3065cf7baedc4bd28dbbcd056
diff --git a/media-libs/graphene/graphene-1.10.6.ebuild b/media-libs/graphene/graphene-1.10.6.ebuild
index 50207695d8cd..ab7fb554651e 100644
--- a/media-libs/graphene/graphene-1.10.6.ebuild
+++ b/media-libs/graphene/graphene-1.10.6.ebuild
@@ -4,7 +4,7 @@
EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit xdg-utils meson multilib-minimal python-any-r1
+inherit xdg-utils meson-multilib python-any-r1
DESCRIPTION="A thin layer of types for graphic libraries"
HOMEPAGE="https://ebassi.github.io/graphene/"
@@ -34,9 +34,9 @@ BDEPEND="
multilib_src_configure() {
# TODO: Do we want G_DISABLE_ASSERT as buildtype=release would do upstream?
local emesonargs=(
- -Dgtk_doc=$(multilib_native_usex doc true false)
+ $(meson_native_use_bool doc gtk_doc)
-Dgobject_types=true
- -Dintrospection=$(multilib_native_usex introspection enabled disabled)
+ $(meson_native_use_feature introspection)
-Dgcc_vector=true # if built-in support tests fail, it'll just not enable vector intrinsics; unfortunately this probably means disabled on clang too, due to it claiming to be <gcc-4.9
$(meson_use cpu_flags_x86_sse2 sse2)
$(meson_use cpu_flags_arm_neon arm_neon)
@@ -45,15 +45,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_test() {
- meson_src_test
-}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/harfbuzz/Manifest b/media-libs/harfbuzz/Manifest
index 6ab12a4b9886..595b69aa9cc0 100644
--- a/media-libs/harfbuzz/Manifest
+++ b/media-libs/harfbuzz/Manifest
@@ -1,8 +1,4 @@
-DIST harfbuzz-2.7.4.tar.gz 16703694 BLAKE2B 9932c039bb27ee53179e500c80ae8bd24d4cb77d4fcd01c10b8b5f0fd55de6af3c265196aa80653835f464c5431f89a870a7112eaf2c715f05e1e084011fa240 SHA512 5b412e0f6d1c9142a0ef2713826cb8d6ebf348c5b64054a0676d3ce084bcff1de375dadf90e87dbbf6d0ec8e4a99339cb64b514d5464efb7e27037551e494099
-DIST harfbuzz-2.8.0.tar.gz 17000989 BLAKE2B a2b29bccf394ad8836fb534af42aaa193addc02745ffe8a82294e571483b2eb1f7ece300dbae60a0c1b9e70235109e764ded16518ab2b17e4d3d319b43404faa SHA512 736e6829fd470d1647df2c7116b4e9e6186676bc33140b3913130a9f1818f7bef2415958cab8c6bf9c5b660f43e4924d3ca220970a5c48c0c1525f601e26fd48
DIST harfbuzz-2.8.1.tar.gz 17939717 BLAKE2B 4e6eeb0beb45e88386d994eb219479a2ed68bd1b78af3becb4ef1c89152e21924319b415e194f57c7aa4acf8031ab4ae35725b873f36b6f816aaa33a7bbb86d9 SHA512 16e43b9182d3ebd2394c2c0e0df815ca9e715d55dc7e46de4eafcde49ddf59cccae69a5340e05c8aa2ee6bc2ba46d1cffae8252d1b2a004ffe9d70c62628cf73
-EBUILD harfbuzz-2.7.4.ebuild 2830 BLAKE2B d73705a7cdc51bc7a3162ec94894e91269b070d5b19e467e4d6d123281120793e7cba62b20b5aa06e304285a97cb5aba64adca31213b3534a77ad52367f223aa SHA512 b9eb722d9ead132cb2bc01029b9a3fe6e91d731c2543fbfa4b6ca2b96e21500a26801f30cc1f6561a55d71befc60940d813cc6c901c790909a7c17613b817459
-EBUILD harfbuzz-2.8.0.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
-EBUILD harfbuzz-2.8.1.ebuild 2830 BLAKE2B d73705a7cdc51bc7a3162ec94894e91269b070d5b19e467e4d6d123281120793e7cba62b20b5aa06e304285a97cb5aba64adca31213b3534a77ad52367f223aa SHA512 b9eb722d9ead132cb2bc01029b9a3fe6e91d731c2543fbfa4b6ca2b96e21500a26801f30cc1f6561a55d71befc60940d813cc6c901c790909a7c17613b817459
-EBUILD harfbuzz-9999.ebuild 2838 BLAKE2B 0388c4fa0d71c09d0299437d3335d7f0a6dffdca8310a67db597227c04672964fcd33914a081d45084749210358db7f505f968ea07af1ade0843df92b1706952 SHA512 6341f907d560396b101de4530aa08624428b5d16a30441c91bcc6cf509c55164e079a94475bebf03cda5fb24cbaecd294a611e63b2eda57e519419f39258aef4
+EBUILD harfbuzz-2.8.1.ebuild 2492 BLAKE2B fa89daa0b745c7b5035bcb4e94dfee1e8d7bcdaac1a59e2f394a5f705254fe463922251d95e87868c78e8d4123fda3bb946757a18054cd86337de1484a6a679d SHA512 582d14b536c6a9bddfe6a74b00e0e30672d5e4fc86786cf7dfa5d6fb52432b2fc31ad081c44f7b1a4c07d8f2b5362a0448ef04bc28827e836a1b648e0254f20b
+EBUILD harfbuzz-9999.ebuild 2500 BLAKE2B 93be2b3189be9c9b6506e0741743c0c76231aaccf619d1021cccd00bafc2c8506f8e3209d849a8762b2c12e9f4accb9bd9492de81228cb99d7da1c510e682a15 SHA512 a0d35c7158d698fe597be089897aaeeb22ed2f1a61e0f2d72fd42562d8466482e04736f46ca493f07cb10d88a39e70bfd36bf4d7346a359bc54bb1ac0f5aea2d
MISC metadata.xml 739 BLAKE2B df7724d5cef26b569f76d41c808f99a1ecf44631f0bae96fbc2a9b4f5981061b55c60d69b1b64d966897f223a3d3b5cc4325a3ac780599ed76591fc2044b4988 SHA512 192f7abc191044f267bddb4db7d91f9b78926f4a361802f607bfe4635d7cf63398c289bc52009ad4d3bc6f92684cafd8b40e48f1e0f8cdaef9a4e27f538e7dbd
diff --git a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild b/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
deleted file mode 100644
index faa0655ca207..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.7.4.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:= )
- glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
- graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.34:= )
- truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if ! use debug ; then
- append-cppflags -DHB_NDEBUG
- fi
-}
-
-src_prepare() {
- default
-
- xdg_environment_reset
-
- sed -i \
- -e 's:tests/macos.tests::' \
- test/shaping/data/in-house/Makefile.sources \
- || die # bug 726120
-
- # bug 618772
- append-cxxflags -std=c++14
-
- # bug 790359
- filter-flags -fexceptions -fthreadsafe-statics
-
- # bug 762415
- local pyscript
- for pyscript in $(find -type f -name "*.py") ; do
- python_fix_shebang -q "${pyscript}"
- done
-}
-
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
-multilib_src_configure() {
- # harfbuzz-gobject only used for instrospection, bug #535852
- local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
- -Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
- -Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
- $(meson_feature glib)
- $(meson_feature graphite)
- $(meson_feature icu)
- $(meson_feature introspection gobject)
- $(meson_feature test tests)
- $(meson_feature truetype freetype)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
deleted file mode 100644
index 48efc9f4fcbc..000000000000
--- a/media-libs/harfbuzz/harfbuzz-2.8.0.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..9} )
-
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
-
-DESCRIPTION="An OpenType text shaping engine"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
-
-if [[ ${PV} = 9999 ]] ; then
- EGIT_REPO_URI="https://github.com/harfbuzz/harfbuzz.git"
- inherit git-r3
-else
- SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-LICENSE="Old-MIT ISC icu"
-SLOT="0/0.9.18" # 0.9.18 introduced the harfbuzz-icu split; bug #472416
-
-IUSE="+cairo debug doc +glib +graphite icu +introspection static-libs test +truetype"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="introspection? ( glib )"
-
-RDEPEND="
- cairo? ( x11-libs/cairo:= )
- glib? ( >=dev-libs/glib-2.38:2[${MULTILIB_USEDEP}] )
- graphite? ( >=media-gfx/graphite2-1.2.1:=[${MULTILIB_USEDEP}] )
- icu? ( >=dev-libs/icu-51.2-r1:=[${MULTILIB_USEDEP}] )
- introspection? ( >=dev-libs/gobject-introspection-1.34:= )
- truetype? ( >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
- >=dev-libs/gobject-introspection-common-1.34
-"
-BDEPEND="
- ${PYTHON_DEPS}
- virtual/pkgconfig
- doc? ( dev-util/gtk-doc )
- introspection? ( dev-util/glib-utils )
-"
-
-pkg_setup() {
- python-any-r1_pkg_setup
- if ! use debug ; then
- append-cppflags -DHB_NDEBUG
- fi
-}
-
-src_prepare() {
- default
-
- xdg_environment_reset
-
- sed -i \
- -e 's:tests/macos.tests::' \
- test/shaping/data/in-house/Makefile.sources \
- || die # bug 726120
-
- # bug 618772
- append-cxxflags -std=c++14
-
- # bug 790359
- filter-flags -fexceptions -fthreadsafe-statics
-
- # bug 762415
- local pyscript
- for pyscript in $(find -type f -name "*.py") ; do
- python_fix_shebang -q "${pyscript}"
- done
-}
-
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
-multilib_src_configure() {
- # harfbuzz-gobject only used for instrospection, bug #535852
- local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
- -Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
- -Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
- $(meson_feature glib)
- $(meson_feature graphite)
- $(meson_feature icu)
- $(meson_feature introspection gobject)
- $(meson_feature test tests)
- $(meson_feature truetype freetype)
- )
- meson_src_configure
-}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
index faa0655ca207..453389b63317 100644
--- a/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-2.8.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -73,23 +73,15 @@ src_prepare() {
done
}
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
multilib_src_configure() {
# harfbuzz-gobject only used for instrospection, bug #535852
local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
+ $(meson_native_use_feature cairo)
-Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
+ $(meson_native_use_feature doc)
-Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
+ $(meson_native_use_feature introspection)
+ $(meson_use static-libs static)
$(meson_feature glib)
$(meson_feature graphite)
$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/harfbuzz/harfbuzz-9999.ebuild b/media-libs/harfbuzz/harfbuzz-9999.ebuild
index 48efc9f4fcbc..9f52c19d3421 100644
--- a/media-libs/harfbuzz/harfbuzz-9999.ebuild
+++ b/media-libs/harfbuzz/harfbuzz-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7..9} )
-inherit flag-o-matic meson multilib-minimal python-any-r1 xdg-utils
+inherit flag-o-matic meson-multilib python-any-r1 xdg-utils
DESCRIPTION="An OpenType text shaping engine"
HOMEPAGE="https://www.freedesktop.org/wiki/Software/HarfBuzz"
@@ -73,23 +73,15 @@ src_prepare() {
done
}
-meson_multilib_native_feature() {
- if multilib_is_native_abi && use "$1" ; then
- echo "enabled"
- else
- echo "disabled"
- fi
-}
-
multilib_src_configure() {
# harfbuzz-gobject only used for instrospection, bug #535852
local emesonargs=(
- -Dcairo="$(meson_multilib_native_feature cairo)"
+ $(meson_native_use_feature cairo)
-Dcoretext="disabled"
- -Ddocs="$(meson_multilib_native_feature doc)"
+ $(meson_native_use_feature doc)
-Dfontconfig="disabled" #609300
- -Dintrospection="$(meson_multilib_native_feature introspection)"
- -Dstatic="$(usex static-libs true false)"
+ $(meson_native_use_feature introspection)
+ $(meson_use static-libs static)
$(meson_feature glib)
$(meson_feature graphite)
$(meson_feature icu)
@@ -99,15 +91,3 @@ multilib_src_configure() {
)
meson_src_configure
}
-
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
-multilib_src_install_all() {
- einstalldocs
-}
diff --git a/media-libs/ilmbase/Manifest b/media-libs/ilmbase/Manifest
index 3e4e53978a2c..41ffd4ca923a 100644
--- a/media-libs/ilmbase/Manifest
+++ b/media-libs/ilmbase/Manifest
@@ -1,4 +1,6 @@
AUX ilmbase-2.5.4-0001-disable-failing-test-on-x86_32.patch 623 BLAKE2B 578335e554fa65342c4c364ba51f13717c3c96806417cc7ae814a34a59137da3a93c442cc436bfe7f4330f0a537ba7ed9579a45a4b8c986b443fdfab3fcb42f2 SHA512 06318e4c019fd02c49f7e3c2cf0ecbf0701ee625607763709b010984fa96f2681e19955ad0538397ac9ee3c1a514840f84423b0fe98bafad5e399c43e619175b
DIST ilmbase-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
+DIST ilmbase-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
EBUILD ilmbase-2.5.5.ebuild 1069 BLAKE2B ac5419454146e4df6f7d22c3ef83765261e0638951f76e8f9928010be9a6c1e6b142ff4761afefc2a665d50d5f981aa55839410a627b4b1bcf4c6a5ca4612d9c SHA512 1a5ca247caa34c8d0551be377e3bef91d4ec8fa5c02aeea0102ea8d867f396211f6d23b4598a9064042f9a42f26f6c01f9dc9e130de3b3ab283ad425faa43001
+EBUILD ilmbase-2.5.6.ebuild 1083 BLAKE2B 8fa4ae20ed86dcd0cabef3a7d61e2a8b63b47a2c7951da60ed585f03fc97ad16f0eb560ae728cce9002e5b606b94aa63279dcda8ba27d9c23751fe068338fc1c SHA512 66542d6d72105d250a394bee7cfd6b847c2b9e7a3b3f517e107320a693178f339fb7c25b82c98e547f006f03f9e7da9673e448aedd606368a9e83e0ee365e500
MISC metadata.xml 691 BLAKE2B 9c6c8f6eb00b3959cbae60225c3d094b9abcb55b0c755dff4906a4d81c1b87bc38fff9e5d306a20a82c8fbd8419e203e0c89889f3be7b1486594527183ab5143 SHA512 2adb19e5ae0e25184c26b0787aa7275e8707dd79609f5d4b6f6723cc2f64e64fec4954296d2bfefd3edff341b3c0a22b60da6069ddb636a422110b157af353c6
diff --git a/media-libs/ilmbase/ilmbase-2.5.6.ebuild b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
new file mode 100644
index 000000000000..24718e290866
--- /dev/null
+++ b/media-libs/ilmbase/ilmbase-2.5.6.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="OpenEXR ILM Base libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/openexr-${PV}/IlmBase"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="large-stack static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( README.md )
+
+src_prepare() {
+ if use abi_x86_32 && use test; then
+ eapply "${FILESDIR}"/${PN}-2.5.4-0001-disable-failing-test-on-x86_32.patch
+ fi
+
+ multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DILMBASE_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+ -DILMBASE_ENABLE_LARGE_STACK=$(usex large-stack)
+ -DILMBASE_INSTALL_PKG_CONFIG=ON
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/leptonica/Manifest b/media-libs/leptonica/Manifest
index 3ed90f329bcd..e2318ae5d247 100644
--- a/media-libs/leptonica/Manifest
+++ b/media-libs/leptonica/Manifest
@@ -1,3 +1,7 @@
DIST leptonica-1.80.0.tar.gz 13926793 BLAKE2B 1c8916acbea7411038c27ad422f7ac8d5769680ae0554a50da332676de4abdd3c6dfab69dfa4abc3525f3aa298062f4f2315548bda9d120e91abf6ffb5b41e1c SHA512 f8062a169b7ac558c8818615e534c0dcb5db48924af4d3106d0e0929e9b2f03347bdeaae45f80bded0b2aed135bb133f775244c8c752891ca4948b5d6b21e147
+DIST leptonica-1.81.0.tar.gz 14056128 BLAKE2B 21a6be10d8579746855b6c12785ecd75ce475cc24601ddd2b71ac79aee1a82dd96d26a0b779feae6b0a4028fca4556accd6a208525999c457250a6fcd0e0a5cf SHA512 e6e530a490337941018393ffc69ca45a92fecdee290c6de63f7656207228c19e474ec2e9291591cee85c782edbc46d51d69692871e425ed2367a7dd679dc7771
+DIST leptonica-1.81.1.tar.gz 14056320 BLAKE2B 09a3859d8d2bbef4ea5d450c81dd5af1c95752501e4b40779a57d099eb30934fbfe4099ab2d7abadf518af25cbd3c36269261c9c6d3850a44a2b16c2eb795801 SHA512 3c24e30eab21b634094543a722172553e35d928b3a50bfe78e9b0123cd16d710b4be8714acaac87344b22292b460d6ffb06b05a8e7f3df060544a2bbf3f8a7d2
EBUILD leptonica-1.80.0.ebuild 2037 BLAKE2B 118a97e20f0951c04290529e17865b3e527b717dad7686b098dd92cbae65d05cf306c781e0b0328e49145740804f81ccc3e9b5a45ed4bf2db37b949484feb7a0 SHA512 697d321bc53a898e0ce098a76c6b124f20745df63263ce75c11a9d113cc1074ec00961012deaee93010b966924e0418e8c04efc1669816897937b40d8f9805e7
-MISC metadata.xml 518 BLAKE2B 59db99ac81e5c10275950d5c67e1c85c61c48f9eef84d533606a26beb1f3b6b3c1eb844a163687376a74dcd9561dfc91f6b85df4202a20ecf3c58f8e1201b88e SHA512 2a34197102a9d9d90faa90aa2f19e78e8a848e779ad3ad0f1bdb7d3d9d91572749ce2351c402403a0281019af1b59e0fd19c4e1809bd00836cede17647391773
+EBUILD leptonica-1.81.0.ebuild 2043 BLAKE2B e1369630fd7ff85619ab25ed5a17435358165fd23a9f3dd488e4d2f5fd786fc0d9360b2032738c4bda57d48b39465cdf4cb83bec6d62ad91573f7b5167a041f4 SHA512 e2c8a8912cc0ebbdd51ff9f459be8c697988ce6f64f529c8652b0ad3da1cd101860e6da91af4d2b0e3de649cf7597f7543209e1abfe9d31b7b2b4defbe78420a
+EBUILD leptonica-1.81.1.ebuild 2043 BLAKE2B e1369630fd7ff85619ab25ed5a17435358165fd23a9f3dd488e4d2f5fd786fc0d9360b2032738c4bda57d48b39465cdf4cb83bec6d62ad91573f7b5167a041f4 SHA512 e2c8a8912cc0ebbdd51ff9f459be8c697988ce6f64f529c8652b0ad3da1cd101860e6da91af4d2b0e3de649cf7597f7543209e1abfe9d31b7b2b4defbe78420a
+MISC metadata.xml 605 BLAKE2B 3c47d84994e9f22d37cfcb6a44497f2ceff828f8f130dce86038f1452c21403349636474aa78c39283d7d5a47183018e2d1f39546f0ecccb12ab7e169f15608c SHA512 0b78929d92cca2ee68c6174088e7c8abaa11dfde1af747fa52a9d1833e6319d8e5df0b060f627b6f6ef6707ac1440eb124091ac1eb05d47d35f7d9eb1cc7a893
diff --git a/media-libs/leptonica/leptonica-1.81.0.ebuild b/media-libs/leptonica/leptonica-1.81.0.ebuild
new file mode 100644
index 000000000000..cc3881a79ba7
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.81.0.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool 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 )"
+RESTRICT="!test? ( test )"
+
+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] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+ default
+ elibtoolize
+
+ # 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_SOURCE="${S}" 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 webp libwebpmux) \
+ $(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() {
+ einstalldocs
+
+ # libtool archives covered by pkg-config
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/leptonica/leptonica-1.81.1.ebuild b/media-libs/leptonica/leptonica-1.81.1.ebuild
new file mode 100644
index 000000000000..cc3881a79ba7
--- /dev/null
+++ b/media-libs/leptonica/leptonica-1.81.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit libtool 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 )"
+RESTRICT="!test? ( test )"
+
+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] )"
+
+DOCS=( README version-notes )
+
+src_prepare() {
+ default
+ elibtoolize
+
+ # 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_SOURCE="${S}" 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 webp libwebpmux) \
+ $(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() {
+ einstalldocs
+
+ # libtool archives covered by pkg-config
+ find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/leptonica/metadata.xml b/media-libs/leptonica/metadata.xml
index 78be582d1df7..b5b2f1a097eb 100644
--- a/media-libs/leptonica/metadata.xml
+++ b/media-libs/leptonica/metadata.xml
@@ -13,4 +13,7 @@
containing software that is broadly useful for image
processing and image analysis applications.
</longdescription>
+ <upstream>
+ <remote-id type="github">danbloomberg/leptonica</remote-id>
+ </upstream>
</pkgmetadata>
diff --git a/media-libs/libao/Manifest b/media-libs/libao/Manifest
index f89a01f6162f..2a2edae30e67 100644
--- a/media-libs/libao/Manifest
+++ b/media-libs/libao/Manifest
@@ -1,4 +1,6 @@
+AUX libao-1.2.2-automagic_sndio_oss.patch 1407 BLAKE2B 8a67faac3b2d4a617683af689bb66b7abcd93552a6a87aed0a8677c5d1352944071f3621b6298d27bcad0e02dfe54c2abf386396e71fae2b923747dae5999684 SHA512 8aae4dc353f6299e7790743694d7c67ddaba1cc02a8cba81a36962112f3a0ecbf4e078ef27d5d3c28bf779fbfdc6e5c3935ca5437ccfcf84b3e2e5ed5cba1f63
AUX libao-1.2.2-implicit.patch 530 BLAKE2B 085b0782f7ba13088cac1d063183d6c0a6b5bf784e9ba90d1e2d1587579d78a6d58b5754733e2e2749815562513b0be0898f0709719eb6f7f55d5389040165bb SHA512 fac9d6628ad132215935190ba0d55f5837c638572988426996e3fb91053fed06739dbd57bea2518e11459af4f6e941e45d46bc3094aa2919318386dd93a448c8
DIST libao-1.2.2.tar.gz 96134 BLAKE2B e5b5d87c4357ee113769732cb6a7e0afa28b2bc4923be8dacd1fa39ac5fb96d8a5e19bc45137ffc8ec63eef0382130ab9b311aad3a66be4566e0cb9761417b23 SHA512 d2736d25b60862e7d7469611ce31b1df40a4366ab160e2ff1b46919ae91692d1596c8468e4f016303b306fc3ac1bddc7b727f535a362f403c3fe7c6532e9045a
EBUILD libao-1.2.2-r1.ebuild 1523 BLAKE2B c5234b18ee4fee0d71c12f22fb6143b0426dea17282d2b6fae84550a6707101316080d2cf8fdcd89f55e7bd40d88e6a50ff5d508da30bfdee62a371fa6720ff7 SHA512 c1823efe1bebe94ff7c5ee1352db03b1f07aaa47d849db9bc4a089679115c8e8f75ade6e6ff07a64db9ab192d0be2655b35e7eb3881efdb4fcc6f79566f63780
-MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
+EBUILD libao-1.2.2-r2.ebuild 1679 BLAKE2B d139b11c2bf71a9ac4899a148d167d537f471ab34ab5f87e576888700d781fe9ddf8822492bc8cd0b707c00f7a020433a05ca3faa81f1878e535e52a405ec15a SHA512 21b1fdba34f3a1ea88a52e8687df9053a549985f2366897c1c5a04951701a15a72ac52a9e2e46328d13efae4b52aba6d3504328adc1a9d42e191188bf5edc8a8
+MISC metadata.xml 334 BLAKE2B 31591836828157d48ba8a49c8b44fee8a42b0a78f0c95c451fa0dc347c36b1508115bbc14abb0b84246edda5da8b733d9d126fdf2850cc35c54620e105e76e8d SHA512 f3d4066c208ef45f754e0fc0c30e895c7cb06ee8a2fa21265d09d90b3937917d0ed156e88f7d75b9441361282677171980112c3e1a088442abf20bf66fb3d813
diff --git a/media-libs/libao/files/libao-1.2.2-automagic_sndio_oss.patch b/media-libs/libao/files/libao-1.2.2-automagic_sndio_oss.patch
new file mode 100644
index 000000000000..7c1e6895fc2b
--- /dev/null
+++ b/media-libs/libao/files/libao-1.2.2-automagic_sndio_oss.patch
@@ -0,0 +1,43 @@
+From f1ef6b4b11080a98d622b6a6c657be5a3a9aae2f Mon Sep 17 00:00:00 2001
+From: "Haelwenn (lanodan) Monnier" <contact@hacktivis.me>
+Date: Tue, 15 Jun 2021 08:41:08 +0200
+Subject: [PATCH] configure.ac: Put sndio and OSS behind AC_ARG_ENABLE
+
+This allows to avoid automagic dependencies
+---
+ configure.ac | 12 +++++++++---
+ 1 file changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 0e53752..2f34123 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -266,8 +266,11 @@ AM_CONDITIONAL(HAVE_ESD,test "x$have_esd" = xyes)
+ dnl Check for OSS
+
+ have_oss="no";
+-AC_CHECK_HEADERS(sys/soundcard.h, have_oss=yes)
+-AC_CHECK_HEADERS(machine/soundcard.h, have_oss=yes)
++AC_ARG_ENABLE(oss, [ --disable-oss disable OSS output plugin ])
++if test "x$enable_oss" != "xno"; then
++ AC_CHECK_HEADERS(sys/soundcard.h, have_oss=yes)
++ AC_CHECK_HEADERS(machine/soundcard.h, have_oss=yes)
++fi
+ AM_CONDITIONAL(HAVE_OSS,test "${have_oss}" = "yes")
+
+
+@@ -321,7 +324,10 @@ AM_CONDITIONAL(HAVE_SUN_AUDIO,test "${have_sun}" = yes)
+ dnl Check for libsndio audio
+
+ have_sndio="no";
+-AC_CHECK_HEADERS(sndio.h, have_sndio=yes)
++AC_ARG_ENABLE(sndio, [ --disable-sndio disable sndio output plugin ])
++if test "x$enable_sndio" != "xno"; then
++ AC_CHECK_HEADERS(sndio.h, have_sndio=yes)
++fi
+ AM_CONDITIONAL(HAVE_SNDIO_AUDIO,test "${have_sndio}" = yes)
+
+ dnl Check for roaraudio
+--
+2.31.1
+
diff --git a/media-libs/libao/libao-1.2.2-r2.ebuild b/media-libs/libao/libao-1.2.2-r2.ebuild
new file mode 100644
index 000000000000..b3bfad6d156f
--- /dev/null
+++ b/media-libs/libao/libao-1.2.2-r2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib multilib-minimal
+
+DESCRIPTION="The Audio Output library"
+HOMEPAGE="https://www.xiph.org/ao/"
+#SRC_URI="https://downloads.xiph.org/releases/ao/${P}.tar.gz"
+#SRC_URI="https://git.xiph.org/?p=libao.git;a=snapshot;h=refs/tags/${PV};sf=tgz -> ${P}.tar.gz"
+SRC_URI="https://github.com/xiph/libao/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos ~x86-solaris"
+IUSE="alsa nas mmap pulseaudio sndio"
+
+RDEPEND="
+ alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] )
+ nas? ( >=media-libs/nas-1.9.4[${MULTILIB_USEDEP}] )
+ pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] )
+ sndio? ( media-sound/sndio:= )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ "${FILESDIR}"/${P}-implicit.patch
+ "${FILESDIR}"/${P}-automagic_sndio_oss.patch
+)
+
+src_prepare() {
+ default
+ sed -i "s:/lib:/$(get_libdir):g" ao.m4 || die
+ eautoreconf
+}
+
+multilib_src_configure() {
+ local myeconfargs=(
+ --disable-arts
+ --disable-esd
+ --disable-static
+ $(use_enable alsa alsa)
+ $(use_enable mmap alsa-mmap)
+ $(use_enable nas)
+ $(use_enable pulseaudio pulse)
+ $(use_enable sndio)
+ --disable-oss # present only in overlays
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+ emake DESTDIR="${D}" docdir="${EPREFIX}/usr/share/doc/${PF}/html" install
+}
+
+multilib_src_install_all() {
+ dodoc AUTHORS CHANGES README TODO
+
+ find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+}
diff --git a/media-libs/libao/metadata.xml b/media-libs/libao/metadata.xml
index c870d0eef0ab..ea193e38f4d1 100644
--- a/media-libs/libao/metadata.xml
+++ b/media-libs/libao/metadata.xml
@@ -5,4 +5,7 @@
<email>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
</maintainer>
+<use>
+ <flag name="sndio">Add support for <pkg>media-sound/sndio</pkg></flag>
+</use>
</pkgmetadata>
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index e28eb8bb2db9..c350671495ae 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -1,5 +1,5 @@
DIST libass-0.15.0.tar.xz 367848 BLAKE2B 1ba444d9d718eb364cf0d3ee743404adda36384432dcdfb350db59c1769042b7bbedf1610ecc1b89c2a6c98921710d71ceeac9888371e0774c30f4701746096a SHA512 067ed519e64da7e2e45436bb09e390f1a77d966aeb9420729f36c9725d89491655ead69eb61b43f3220b8ff8f9de3891911b62757466f843ab13ee7149d88459
DIST libass-0.15.1.tar.xz 369884 BLAKE2B d5b7a4e474aa847ace6ba36085b7c2ef6de3e70fe00e3ea99be0f6c54d807969d90bb08d651357445e2158b01058f4c2995e1bb1d5f895479cdc0fb67fa3495e SHA512 e5a1cca7a72b21de7da2f83fc46db6b35e822593b67fa16563451f4121965e16e825a1665996a0e6022992e6b0365fc2b9b898932dd8086d2ee87b48851ef307
EBUILD libass-0.15.0.ebuild 1182 BLAKE2B b38bf831d8aa357eff1c91603fc84b426b69d49ff04f94b2153927754e76d6df5e6db4e8ecac2497ecd3ac227f15ce1b30aa493483779044c15a142ec62eec04 SHA512 e68d3dcd3d020126d68d9d502d3c6f027825e4b39d4389761404b7474d394f6bf68ff2640ed2f44bef301e5c0cd67b75cbb39b34ae30617911a7b5e7ce162b55
-EBUILD libass-0.15.1-r1.ebuild 1189 BLAKE2B d1a9181b36ffb3ecbfb6c11e432cc1b17c8deb1f559740daacba17dc16faf5b445d255e5a291956ef414d2d007519733d89b3255f3a130b6d39faf159228f2ff SHA512 1b2be62a754cd04d8f1bf562475f15f5476b6b6a1e5911849708e528a422dca62162815f2b2e3119740f70c09f6a117d433a352b75b26c0f2c00206fbb1da3ac
+EBUILD libass-0.15.1-r1.ebuild 1186 BLAKE2B ededb2a935f443c11705938b7e0350a64ef8cee214d0b88d383b0684e4df2572a5ca73ce06f5cbf19f1cd605c376aae0de9fcbcc13630d6a7d986c5a367a598f SHA512 f7f52e04045f1ee5887357937d1a16764df9cf542b4f8b00f18ed4724c97f84a4151f64986fc019c73391e426c251e19cc89f9c67d69335a9c39b482070765f2
MISC metadata.xml 309 BLAKE2B a2a606460c51302aa57936da38c4e15105eeaa9615c700f0df4a5454124a719377e4bf3d47a40ba876791e2d2c8aa92fa042eb9309ad2390963fd6014db5507a SHA512 d8e6dd073dd6334784f165bca935396edf8ce217f5f3495b0ed9d80ae84b784b16ab252a7ed18af23b4ea8ec9190d42b2c75aeb9467ef7c5a387d042e9d7676c
diff --git a/media-libs/libass/libass-0.15.1-r1.ebuild b/media-libs/libass/libass-0.15.1-r1.ebuild
index fc711566166f..44532a0ef118 100644
--- a/media-libs/libass/libass-0.15.1-r1.ebuild
+++ b/media-libs/libass/libass-0.15.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libass/libass/releases/download/${PV}/${P}.tar.xz"
LICENSE="ISC"
SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
IUSE="+fontconfig"
BDEPEND="
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index f2731dc401a6..1b427f1f44bb 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -4,6 +4,6 @@ DIST libbluray-1.2.1.tar.bz2 751063 BLAKE2B af353e03a70b0202776c2190d927506225bb
DIST libbluray-1.3.0.tar.bz2 754069 BLAKE2B d4c699ce28d2e5b1d4dda461a1359d3a446afe72368e9d76066ca4d5c49d1f24b4bcec307608d96913d0c668168a86267416b9db37ad942628c2926b79ec47d9 SHA512 3d5145e6fd7de099c07f937282112c7abb12a5590b7c0b965b00bddee3837ddfd1a30076aaa6d6278d07a5beee3856f602125983ae075ab30eceb6ac1bd9bcdc
EBUILD libbluray-1.2.0.ebuild 2056 BLAKE2B 812ebe0d1aaab6226efa607b79bf8c04f792f7261900b5dcb0a4024b3bfa16d5fe688422bfd3503cd7dc79364bfcad3342d5aaed7bfdbe6abcd429f85607aca9 SHA512 de7cb76efd10b6a5ef3e906bb17c78fbec7bff47d11bf20073b8316e70d6938b8dd87f9aac1f7c7433fe0689c4ea5122848e22901fbe3a46bc9b48c3295ad05d
EBUILD libbluray-1.2.1.ebuild 2022 BLAKE2B 8c0219e09ebd99b7184e13c36530721479c996c213cebe6990cad3172f152365c141c3e6046d31c6315e97313c1486732f8c855001353a6493aff52ac3e0b57e SHA512 682887926431df5790ef7c1a01a7a91a47100852184ce4d98b80bb9396a268fcb5918ff47b67906d94cdba83463bf73bba95e5a149a33408423546e36c5a59fe
-EBUILD libbluray-1.3.0-r1.ebuild 2021 BLAKE2B c72fa1e94e150105af1cdfae38a2366f8062e214fcdb55a042673e12d5ccedd37e5bf220988a0d67d6633d4f13941a20cf337247f1de901193e4991583d4b2f4 SHA512 481d8c4178a2b0e510ac14bc9a9cc073aa7446991916ce5cb75320781dfc2fe25af56afa0ef957c293147bd15cad1f4d84142976bb9d696d57e7d806bfaabe7c
+EBUILD libbluray-1.3.0-r1.ebuild 2019 BLAKE2B 06823f8b06e46dd512a0230e05bd3b3402924fd5e3546405c806d844ed8c2ec99a0fe7531c49852bd692c92ec3a86aa03af983daa232f18af9958afed47d8dfb SHA512 8f9f9d43a6523edfc1ef9bc64443466ae6aa70fca498228de05a8d907db15895aee88a3e9c88489eb1d5c71103e7ac97c8b69bd7ef0654167265060628780d3b
EBUILD libbluray-9999.ebuild 2007 BLAKE2B 478fd75959be666b511ca485c1bceea124b70282273dcdb687c9ae1e6b98d0bc6c7e92fa0ccbb020a29370202c248dc7ec1a0b2b5eaf4269714db18cae12344f SHA512 5a168560da9a4db8f929596176889e3ac7d6ea34c9c9ca2f39f37550909e45502976933d08456dcfe67c815a41564105321aa5f3bfde5e4f52680814b45590f6
MISC metadata.xml 540 BLAKE2B 1385b09e4a4a1a2ffe572ca02cc50ae5808a2d283841128258a906742ab8fd67d48b1a677d601990d84a587cc18e9ae68409bf6e9af40e084c05da6f73988aef SHA512 181c79234a6c7a88d6df5b8e2de071fd7746505b153a1f2d92c4d6bffb95cbfaa3f276656b95786e02bc7c097d1fdce65afcc953c569bd82639707c843b1e575
diff --git a/media-libs/libbluray/libbluray-1.3.0-r1.ebuild b/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
index febd0814ef3d..2c79ebcdf3c1 100644
--- a/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.0-r1.ebuild
@@ -7,7 +7,7 @@ if [[ "${PV#9999}" != "${PV}" ]] ; then
inherit git-r3
EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
else
- KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 sparc x86"
+ KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
fi
diff --git a/media-libs/libcaca/Manifest b/media-libs/libcaca/Manifest
index 3968566050c2..6020fee2612a 100644
--- a/media-libs/libcaca/Manifest
+++ b/media-libs/libcaca/Manifest
@@ -10,5 +10,5 @@ AUX libcaca-0.99_beta18-latex_hacks.patch 645 BLAKE2B 8b72799bdb19accf044c590a14
DIST libcaca-0.99.beta19.tar.gz 1203495 BLAKE2B 65462090fc503d640d91753ff21b55ad1bac360fb6e5aae8f46d8162e62f8834f791a1db6e2045a63deaa7c409c3455b484750294cfb01e1027f0ca8dc2f2798 SHA512 780fc7684d40207cc10df3f87d6d8f1d47ddfffa0e76e41a5ce671b82d5c7f090facb054c3d49ca7c4ea1a619625bb9085ce52f837f50792b4a2d776a4c68e15
EBUILD libcaca-0.99_beta19-r1.ebuild 4017 BLAKE2B 09e3b339beb9a45a816779ce2b0394601b4bd687e6606bbe70ce09dcf0d91e8b82388909f657cb3de11ec4210bd06cd7bee5fe6379cae83ea023a49d38b5f84d SHA512 5c5356db2d1e3d4e0cd083d29be5261698677989c59941b1b632ce2164a23a829bcd249e4178e33589dd81ba40447b0b9fce1125cceb6bca4109cd0257c73038
EBUILD libcaca-0.99_beta19-r3.ebuild 4162 BLAKE2B 721115dcd52859816b62ad09c2ca11e0083154fabd5cf5298b9f1ca28f908e64fb8521c5f507ef9995a8a84b3cbdaa28573b3bce777ef2ef20d5eb40c07d14fc SHA512 b2a5edc036c7b92b75a9bef4a7007ad71afb24d068adc405b11e70076a35b3bba3a0993bee9b1ed2627284c7df59aeb6e373faeca17969738aa73f57b594574f
-EBUILD libcaca-0.99_beta19-r4.ebuild 4490 BLAKE2B 47664ad6a48d3da5ad6d51e1a02f6f8339a0783510001b9105265691a043a06c662a5824bdcf6b576e1735d0214fd03184b6383af0abad7593483ec6b157ebfa SHA512 f3a531b9683a5d957001696b0984312afda4abeb1fe24389c518d296e3c407e42294d6c59fdcb9dce491484799aae83c9f88276606ad9ee6cd5475f22d882498
+EBUILD libcaca-0.99_beta19-r4.ebuild 4489 BLAKE2B 59bc7b32f8ace89d2a36c302bb77ec25977262a3f590d8935bf822830e554840a5808785949054796234fec56bc29875c870031ecb477ea6190fc81ba95a8c71 SHA512 e33a1880f941d63668e4cb7546cd362e3193e3045f41ea6de5c47213ebc6d3946631cec2306ff993d30883e50113724a0763f48ff746d004f7927b8f2c0b7a17
MISC metadata.xml 219 BLAKE2B bca5749b6f2d3541ba2d2635b59056f9ecdc46553991dec3ee5a7bc9f26393bdae62755418850d3cbda0eeb65b7f72029ddf09d4f088b21c84d407d0e6eaa098 SHA512 24793c7fd0e2cef8fa5a0efd9bd55fed1e62ff6810199a969d4c0b869bac9b9ec79b288105b73b1b99734320bb13569a8ee00516b5452dd67d91d14dd17038e2
diff --git a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
index 7fe4815820c6..f0eece5142c7 100644
--- a/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
+++ b/media-libs/libcaca/libcaca-0.99_beta19-r4.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="GPL-2 ISC LGPL-2.1 WTFPL-2"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
IUSE="cxx doc imlib java mono ncurses opengl ruby slang static-libs test truetype X"
RESTRICT="!test? ( test )"
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index c3e4102b37be..4f02be99acfc 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,7 +1,4 @@
-AUX libcdr-0.1.6-icu-68.patch 977 BLAKE2B ef4fa0e61607847aa0f7d1105775224f7ebed349d163cf0dd2d190f719aef041415ec87833d39fdc90c8a128b1aa052d1b7b8dda7c1cfeed962506d6556a04ec SHA512 fd0d109a48208596a86ba6df3a022bf60a02295af686a5fe924a866e808ef00023e92b40c9dceed701dac9c4243e61c017cf04b1ced9e73903e870ca379cd1e6
-DIST libcdr-0.1.6.tar.xz 612068 BLAKE2B ec5226a28f101472ea3044e9e5b87dba57b584fc813dfda29e00281182d067126bf8a5740c32bc5cb545f230f6f96163aac2fdf08879ec64379b7845839bc88a SHA512 629d55da71c7333f41f60a32e2880deffcf80088096af1bbc8c572b80ef21d851102fdebce56f77245ed60822ca98e02c0867b192abef496a2313fde54a97bb6
DIST libcdr-0.1.7.tar.xz 618528 BLAKE2B 7e74b1936f80078f4b0a07e2e37f9d59489ad27acee66175032ba7250ab492310e4042c7b6d7995b1ffffee7da1c7562f5c2fc24457c3efe0b19fe7e00d8e42b SHA512 9af327fcf9f3f3ef1c446e92f4d2ff06ebaccb54d4c65b021960a212bf416f7098006324625f3e1c00500597eaa9da39832cc27b83a6cd593e97b76b1eb63d38
-EBUILD libcdr-0.1.6.ebuild 1152 BLAKE2B a59172d3b3950e253f94c167f6398ff1587bc268d528b05b1f8d3c112369c1c04ba7413600b5a3d897b5d287909ae721707ccca17da7c5c003acd902b4e46e90 SHA512 8ae02a13f6ab9e0acc47821afc731c6a7d04991b99248c9cb1740f46753601d6977805ce339e5d64cb3638a4bf93f8c1695bc3b602b8f802ea9672fab67efba3
-EBUILD libcdr-0.1.7.ebuild 1099 BLAKE2B ec4c040ff08e55e36a99ee0aabc127164cd2c461c53f7583fe3b09995f3712fb2c3dada933a380572d852aed9edd0fdaa2f670e2f878d8f1d5f2ed47ef406f2d SHA512 74abfd3de4d90dd85d43216d92f2f3b537244e9c875eeb54c005eb74540adc189900988d08086e9dddf0b890df2f53f6d5dfc54494499a0145a0652300af75ab
+EBUILD libcdr-0.1.7.ebuild 1094 BLAKE2B 053e77cc0eb6c077b10f47049a1c077785e465f79df2dd88ec6733b810e005bb1e2478310c3967f8ed66a2332ce7dcde7e4ba93d422bb8ef43ef09ae95b0aa7b SHA512 1683e1184785b8ae244c597030081c5c1a253c75700e2be0b19310018d8219f9dd235b9265e62d28b2b345a5b006041c334a7d517309611b3dfadb3e6f4743fd
EBUILD libcdr-9999.ebuild 1099 BLAKE2B c0ca8298f6f3d222a9d94bee445be4f079bfe381db7b334a5dd3146096938b637e454383eee00f8dcdcf3257264e2be022f87f4693e864cb50489c669c771498 SHA512 2f505734658a48e57552aebf7d216a737443712da0178500a21bb6408212adb55e4c20c914b4b8e1cc4f739c90b1fb1655bc6d17b5cf056ca05bd2dcf6169545
MISC metadata.xml 255 BLAKE2B 9b8486730bea2158e8be5cbbe0552c5460d1b18e2236a68e3f11d85ce4eeb96eb0e746f44a10cb7cdcf1bf498190a512ef42f47852c6843b9a3c937ceabc338d SHA512 ac646e8ac676faf0aac283e4be31c5f2b29e98ccf07327073ed05e688ce696caf639bdfea63e4aed141a90e84c0a86892bc717a52b95cdf1739aaa15240013c3
diff --git a/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch b/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch
deleted file mode 100644
index b8e7ba919a96..000000000000
--- a/media-libs/libcdr/files/libcdr-0.1.6-icu-68.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 0dc41f8f6bd099813acb3972f75e4bbb2a5cdb2d Mon Sep 17 00:00:00 2001
-From: Lars Wendler <polynomial-c@gentoo.org>
-Date: Fri, 30 Oct 2020 14:28:08 +0100
-Subject: [PATCH] Fix build with icu-68.1
-
-icu-68.1 removed public macro definitions for TRUE and FALSE
-
-Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
----
- src/lib/libcdr_utils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/lib/libcdr_utils.cpp b/src/lib/libcdr_utils.cpp
-index 09ab42e..250f0a0 100644
---- a/src/lib/libcdr_utils.cpp
-+++ b/src/lib/libcdr_utils.cpp
-@@ -108,7 +108,7 @@ static unsigned short getEncoding(const unsigned char *buffer, unsigned bufferLe
- csd = ucsdet_open(&status);
- if (U_FAILURE(status) || !csd)
- return 0;
-- ucsdet_enableInputFilter(csd, TRUE);
-+ ucsdet_enableInputFilter(csd, true);
- ucsdet_setText(csd, (const char *)buffer, bufferLength, &status);
- if (U_FAILURE(status))
- throw libcdr::EncodingException();
---
-2.29.2
diff --git a/media-libs/libcdr/libcdr-0.1.6.ebuild b/media-libs/libcdr/libcdr-0.1.6.ebuild
deleted file mode 100644
index 1e277da8ed11..000000000000
--- a/media-libs/libcdr/libcdr-0.1.6.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} = 9999 ]]; then
- EGIT_REPO_URI="https://anongit.freedesktop.org/git/libreoffice/libcdr.git"
- inherit autotools git-r3
-else
- SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
- KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
-fi
-
-DESCRIPTION="Library parsing the Corel cdr documents"
-HOMEPAGE="https://wiki.documentfoundation.org/DLP/Libraries/libcdr"
-
-LICENSE="MPL-2.0"
-SLOT="0"
-IUSE="doc test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- dev-libs/icu:=
- dev-libs/librevenge
- media-libs/lcms:2
- sys-libs/zlib
-"
-DEPEND="${RDEPEND}
- dev-libs/boost
-"
-BDEPEND="
- sys-devel/libtool
- virtual/pkgconfig
- doc? ( app-doc/doxygen )
- test? ( dev-util/cppunit )
-"
-
-PATCHES=( "${FILESDIR}/${P}-icu-68.patch" ) # bug 751934
-
-src_prepare() {
- default
- [[ -d m4 ]] || mkdir "m4"
- [[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
- local myeconfargs=(
- --disable-static
- $(use_with doc docs)
- $(use_enable test tests)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- default
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libcdr/libcdr-0.1.7.ebuild b/media-libs/libcdr/libcdr-0.1.7.ebuild
index fb7137dfd9bc..25594ca8356f 100644
--- a/media-libs/libcdr/libcdr-0.1.7.ebuild
+++ b/media-libs/libcdr/libcdr-0.1.7.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = 9999 ]]; then
inherit autotools git-r3
else
SRC_URI="https://dev-www.libreoffice.org/src/libcdr/${P}.tar.xz"
- KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
+ KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~sparc x86"
fi
DESCRIPTION="Library parsing the Corel cdr documents"
diff --git a/media-libs/libdvbcsa/Manifest b/media-libs/libdvbcsa/Manifest
index a2292244bedb..9e485bcb3dcb 100644
--- a/media-libs/libdvbcsa/Manifest
+++ b/media-libs/libdvbcsa/Manifest
@@ -1,4 +1,5 @@
+AUX altivec.patch 1627 BLAKE2B 306742b8fea3fcbf21bf7839c05252284c4d05f33022f1f5655a633b421b1e3ae5db165dc870d4c1f2706620d6c0618bae8ca7a730da453332d4641610a4dbeb SHA512 290ac3aa86a932923c3332b7bcc910907e07dfc5a401d28ca8918b3b90b3d40a24724d8ffc18ead1ed6c5b9fa4cc2c886bcbea78f4528fb2e18fc7cf113ee6f2
DIST libdvbcsa-1.1.0.tar.gz 345487 BLAKE2B ff5d9347f4255ca2c4e62477771715a7d8fcfca6eeb3a2e6cfdfcd903c9927a35d9049d18ec5a9d458328d6a3712d6cf81633e7ddc7c67d1a8099b8d56b2fd68 SHA512 f336bc90711261bb86bb42f897d5207a71da5a384bfb7d641de7e1fb3a43d20aeec250e9a5ceaf0b20f1e4335ccda70055675256c6889873bf1bfff55005a015
-EBUILD libdvbcsa-1.1.0-r1.ebuild 929 BLAKE2B 1ae4d5ca06732c7f4a26ea5971a2f9ca45c9fa97246952e57886e28d810406253cea97cbd2b3e5efaddfd91f800cfd617dc4efe09bb0cc3418148b8252b1756b SHA512 a11adb8e18b6394337517cc05f71aef069b7b075594df3664eb01b29d5be5846a03173167764de1ce3b2b68dee115d977b0726c6e278cabd04d35513e04cb910
+EBUILD libdvbcsa-1.1.0-r1.ebuild 1174 BLAKE2B f0f20496b3eaf1cab744f9aa8825194881f84c58e3123aea957a528a1549a8ea974464a767c7a3e905b8325dcf680d9fc228938d0d6d9fe0dee30a049e2fde48 SHA512 182d76d45d559fd7c5fe64771270249da3fa701cfa1d05026f475d3ccd93821dfa0013da62c55e8d3ba491931b32389580bcfc8eb1876cd0f7ca0bfc4d27c8d5
EBUILD libdvbcsa-1.1.0.ebuild 806 BLAKE2B cb24d42c44474bc57e207a5e7736303be510ecf33bb33f9d8d733e4eb580def21e132b4d7b15865000e81a610317b51a5177c3bbd81332fd037fa6e883abb15c SHA512 5c12338d1abaa400e3eaac194d7d3263af90cf9beb87daddbefb5a692107cd67492ee3b1a653713a52358c2629ce7520c7599de77229585a2d25759ecf86255c
MISC metadata.xml 247 BLAKE2B 158fa8dff063e01e64b4835fa1f199518ecf7d81282ee8c893efc0d4d73454e16adb3189ee8cd1272bbada6fb5ffc2b5aadbd796490c829cba1a4b8e3e20f29f SHA512 8bffd29ab89c8dc401ad49655e30a6bd3a953bf8f6c9309b318f3b03ed7bcf2e5c10533ac70967e549edcd512f6be13b9bce3e36175286370ba499dcb119f6fc
diff --git a/media-libs/libdvbcsa/files/altivec.patch b/media-libs/libdvbcsa/files/altivec.patch
new file mode 100644
index 000000000000..3605c146a794
--- /dev/null
+++ b/media-libs/libdvbcsa/files/altivec.patch
@@ -0,0 +1,33 @@
+Fix compile on powerpc64/powerpc64le w/ altivec
+
+Correct the type of some vectors passed to vec_slo() or vec_sro(), which only
+takes a char vector.
+
+Signed-off-by: Sam Bobroff <sam.bobroff@au1.ibm.com>
+
+--- a/src/dvbcsa_bs_altivec.h 2016-11-28 14:33:34.410021500 +1100
++++ b/src/dvbcsa_bs_altivec.h 2016-11-28 14:34:25.442238715 +1100
+@@ -64,7 +64,7 @@
+ }
+ case 0x29: {
+ dvbcsa_bs_word_t x = vec_splat_u8(10);
+- return (dvbcsa_bs_word_t)vec_add(vec_splat_u8(0x1),vec_rl(x,x));
++ return (dvbcsa_bs_word_t)vec_add((dvbcsa_bs_word_t)vec_splat_u8(0x1),vec_rl(x,x));
+ }
+ case 0x40: {
+ dvbcsa_bs_word_t x = vec_splat_u8(4);
+@@ -99,10 +99,10 @@
+ #define SHVAL_14 BS_VAL8(0e)
+ #define SHVAL_7 BS_VAL8(07)
+
+-#define BS_SHL(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_sll(vec_slo((a), x), x); })
+-#define BS_SHR(a, n) ({ dvbcsa_bs_word_t x = SHVAL_##n; vec_srl(vec_sro((a), x), x); })
+-#define BS_SHL8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); })
+-#define BS_SHR8(a, n) ({ dvbcsa_bs_word_t x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); })
++#define BS_SHL(a, n) ({ vector unsigned char x = SHVAL_##n; vec_sll(vec_slo((a), x), x); })
++#define BS_SHR(a, n) ({ vector unsigned char x = SHVAL_##n; vec_srl(vec_sro((a), x), x); })
++#define BS_SHL8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_slo((a), x); })
++#define BS_SHR8(a, n) ({ vector unsigned char x = vec_splat_u8(n*2); x = vec_add(x,x); x = vec_add(x,x); vec_sro((a), x); })
+
+ #define BS_EXTRACT8(a, n) ((uint8_t*)&(a))[15 - (n)]
+
diff --git a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
index 7b7b9c47a784..f57c4314130e 100644
--- a/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
+++ b/media-libs/libdvbcsa/libdvbcsa-1.1.0-r1.ebuild
@@ -3,16 +3,22 @@
EAPI=7
+inherit flag-o-matic
+
DESCRIPTION="Free implementation of the DVB Common Scrambling Algorithm - DVB/CSA"
HOMEPAGE="https://www.videolan.org/developers/libdvbcsa.html"
SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
IUSE="cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse2 debug"
+# https://github.com/buildroot/buildroot/blob/master/package/libdvbcsa/
+PATCHES=( "${FILESDIR}/altivec.patch" )
+
src_configure() {
+ use cpu_flags_ppc_altivec && append-cflags '-flax-vector-conversions' # needed for altivec.patch
local myeconfargs=(
--disable-static
$(use_enable cpu_flags_ppc_altivec altivec)
diff --git a/media-libs/libdvdnav/Manifest b/media-libs/libdvdnav/Manifest
index 7a090c7c1152..5970d8e9930e 100644
--- a/media-libs/libdvdnav/Manifest
+++ b/media-libs/libdvdnav/Manifest
@@ -1,6 +1,6 @@
DIST libdvdnav-6.1.0.tar.bz2 370145 BLAKE2B c0bd54d94e58eeddcc422e24ef1b400775f28c0eff516db3cd13a5dfcfe103a122fca59734d73e83784b4f0b7ebebddaacf89709991f1485b55f897bf8de7fc7 SHA512 40ea50d818067a3178b4b09e4b95b0cc67d5ff88dbff2cbeee943d086c5f59a71a7aecc425ba35d7dbe5285d8b1ea099a439c0c80c5dca280687ac0cbdc57c71
DIST libdvdnav-6.1.1.tar.bz2 367606 BLAKE2B 680e9636d407b0fb1eceb2c435d91fb5f7480b65e3c272f2750b3c9957ab5b85815ff12715fb98a5a91e5c0e4b2b2d488823525455c5ec2acd92b8dab197d518 SHA512 889bc987113189bfdfc1ebf603b256e5b228be37196455dcfdc7f66debe18e7298b82b807e86ff18a8925e491395ed4007c87cf18ba1ff1ccc213d86f5342a10
EBUILD libdvdnav-6.1.0.ebuild 1161 BLAKE2B 09537c986127ac91b5a1814c3f7bb08dd2e11f31ce70b65c8f4886d679ed69d5c46aa75fe022764a4a4114b1a5703d09cda4a52588284acbfc45d85019ba10f2 SHA512 ccc8df9101b8f19790c143cdd9c27b1b7d7f65b29ffe9d463df799868f254846a430f8491e839d2e6d448dcf5d7b257656bc40b0e44e61fadc1d6280063bcd46
-EBUILD libdvdnav-6.1.1.ebuild 1163 BLAKE2B eff26f90024125955321d8c1d4f8db2138639f41a2681453187c0b580a593dbb0a92c1a6df007b59903af38ff7aad816f623b7f78bff1eb4994d96d5e6a34c6f SHA512 ac87420c5f9b82371c3a4ccc60f64e3f961aec626fc3090204939ce7183d2be03948370367ff821525552cb80253b01fa57dea954bca7de843c6390fef12b1db
+EBUILD libdvdnav-6.1.1.ebuild 1161 BLAKE2B 09537c986127ac91b5a1814c3f7bb08dd2e11f31ce70b65c8f4886d679ed69d5c46aa75fe022764a4a4114b1a5703d09cda4a52588284acbfc45d85019ba10f2 SHA512 ccc8df9101b8f19790c143cdd9c27b1b7d7f65b29ffe9d463df799868f254846a430f8491e839d2e6d448dcf5d7b257656bc40b0e44e61fadc1d6280063bcd46
EBUILD libdvdnav-9999.ebuild 1168 BLAKE2B 629811112d595ae73b3c54386d9e5861f577394bca82c2918726938d59c3104ad7dffe221bc35d0abc6871e5f5659be13f878eff694265c90a2ff2dc5bd01c62 SHA512 dbb0a6742fb2a6a5c27ce359722f92e94e7b1213e576006050e44335658004059a0f0838fd7f879fd1066045f783e1da836ff3b1c161dda3a354e37469d12b12
MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild b/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
index a507dfaadae4..8eb352aae945 100644
--- a/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
+++ b/media-libs/libdvdnav/libdvdnav-6.1.1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdnav.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdnav/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libdvdread/Manifest b/media-libs/libdvdread/Manifest
index 69d911951d8f..c727b58c5a8c 100644
--- a/media-libs/libdvdread/Manifest
+++ b/media-libs/libdvdread/Manifest
@@ -1,6 +1,6 @@
DIST libdvdread-6.1.1.tar.bz2 392134 BLAKE2B 42c7eb2f83b215714e24a7d4748b60fd9eee9fbf7a09b3a9f28974fb5f2a3bb44c80c865348b051f099421159ad87ac3359a299c1d259a79cc51063b9d957bb3 SHA512 f02c2d33ec3e79a4efd0b4ed9172935b092c9f827eb6810ed354328c34b5206ee4ffd646239ce50b9401cab1758f1a746113e004461b20df4f44bc7fa6bc2278
DIST libdvdread-6.1.2.tar.bz2 391536 BLAKE2B 870f8c2bba7f1a1c0f6a010c0a75517b488a466186f76f752c67e16f87b55d8fc9450aeaa69d044b42b6a26a2fc51297290be301f5a449b4b8269f6c812f35cd SHA512 5cbee11ec701b7625d71184fd712de48a129f235b08797b499d0f5b06a1c73bfec1d0e52e897585017ab63b1d81b042257eab5ab1f19fb340b05b3e8d794f86c
EBUILD libdvdread-6.1.1.ebuild 1152 BLAKE2B 6231fdf23f33d7138d9c7b3f7c256989476cd6856f5a678cce8d9651a9575ad44cd9b592545e58dc5b8c9423dd114a44e4c19b853a028df7e23488c536c8e897 SHA512 6417d7e0c59cac471a53a1963b4aa698c1817dd59c4e67a0c6e81e62c36e2486e486e735cc882f6bd7840fa8246b4498cf06c1e1e9534241d846d27df9ddf1ac
-EBUILD libdvdread-6.1.2.ebuild 1154 BLAKE2B a959108455903faab9cc93bd00fe6a670a1ac23fd742e5115747e517200c029fc0497350320a8d54d4a1266618e40c91ed4e76ca7491cc158a3a2b5ec0d31e13 SHA512 edcc95f6f105612524f02e9b0098032921e69cafb450c445a328e2c8a7f00aa5532020cb5ecaba4a455de976c7b4177f7f23218997f49f7511af6ef1259407e2
+EBUILD libdvdread-6.1.2.ebuild 1152 BLAKE2B 6231fdf23f33d7138d9c7b3f7c256989476cd6856f5a678cce8d9651a9575ad44cd9b592545e58dc5b8c9423dd114a44e4c19b853a028df7e23488c536c8e897 SHA512 6417d7e0c59cac471a53a1963b4aa698c1817dd59c4e67a0c6e81e62c36e2486e486e735cc882f6bd7840fa8246b4498cf06c1e1e9534241d846d27df9ddf1ac
EBUILD libdvdread-9999.ebuild 1159 BLAKE2B c20416ea4b21ca2bea20b563ed49cb9f2a0697b30d21b79576950274d77618ad6ce29d36a33e444af94d5f55e042130e129939abc34979b25b8905b01d991fee SHA512 d63372b5c05eaa80efa1faf8f5f811a35ba1de3bb05d744003c8cb62938fa8cbea7f2a2a4e63ed10ddf3a72545bc2564d59f2dac98fc8b5bf876ad99b414ec7e
MISC metadata.xml 221 BLAKE2B dbd3c4ca4e95a1ad33f79e707799593ad704252f4f1c17e08c7e42ede0e4ad153eb659fc130717823dad18cab485c7b941a7089d2d964b96d2e2f7c5f1ba8df2 SHA512 e5a88aac41d38b1bdf0becef8d0a08d1875eb803fac3f791524a7810c8068cfd2239a42717bddf9835daf6c0b2c5d5592b12669882bbc2abaab39955d7de7fb4
diff --git a/media-libs/libdvdread/libdvdread-6.1.2.ebuild b/media-libs/libdvdread/libdvdread-6.1.2.ebuild
index d08066207fe9..1ceaffdb4e64 100644
--- a/media-libs/libdvdread/libdvdread-6.1.2.ebuild
+++ b/media-libs/libdvdread/libdvdread-6.1.2.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
EGIT_REPO_URI="https://code.videolan.org/videolan/libdvdread.git"
else
SRC_URI="https://downloads.videolan.org/pub/videolan/libdvdread/${PV}/${P}.tar.bz2"
- KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
fi
LICENSE="GPL-2"
diff --git a/media-libs/libepoxy/Manifest b/media-libs/libepoxy/Manifest
index c83eb9874f80..6675fecd7b41 100644
--- a/media-libs/libepoxy/Manifest
+++ b/media-libs/libepoxy/Manifest
@@ -1,6 +1,6 @@
DIST libepoxy-1.5.5.tar.gz 332057 BLAKE2B bf9a1e089c620e710caa7d4b7d5d0ec0cef186c7881b1a61aa22f58d8e023706087c766ad970ea8950752d87d2f32d12e2ded3137502f35991afb5b4fb3648cd SHA512 9056840d887f06c6422f61e65ea02511ed37b866a234d49bf78dc5f2f46e8dd9f029405387da14dced639e6a5740b5c56ab6d88ca23ea3270fc6db6a570b0c45
DIST libepoxy-1.5.8.tar.gz 331848 BLAKE2B 0c4bca1a551a2c5908b4edc0176809cb9aebc22c688604c372a067d93347751dbe47354de8a8b8139cd02d8f0a444fe5a3f0b88759d75e1e85f17a6ba860a00b SHA512 352ad43014841d0b03a6da968b08d98aeb0332b9c6d1357650d83ef143db1194ae0fa68d274e4f160c76bae2fb4d2230599e9d9f6cae58f36f4b7f065e9277f0
-EBUILD libepoxy-1.5.5.ebuild 1156 BLAKE2B 2bd43d9cc3e7f034d71776be9e495df858d65ada04936c042c9d228d28cdb03a56245005fdd1e6b3360c9dd21e78e6497cd5b4e97d3ad5737247bfc2daff4ffd SHA512 329b484e9f948a65845ee642c986ce5a2601e3344145a479c67e386c64dab8464dbc8efe4c20815fbd814fc8e92bb49cd5183506c8c12a10318aefea33b5271f
-EBUILD libepoxy-1.5.8.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
-EBUILD libepoxy-9999.ebuild 1163 BLAKE2B 78abc721431b4c827905c43beb28d28977b4c934bd2725469b758ec2d5a7f56ad9bb7f1f5c769695a58ad0a7f57d9ecc2fefaca39be03f5e6aa8ec8061d39a67 SHA512 9f5bfce5549c057eb5688b593c16d410d8ee2708f597fedfb0d16aa42e6741a3a9d60c4f4386a51a7acb1c090965678198a2add521bcd6a7b8e336227893aaa3
+EBUILD libepoxy-1.5.5.ebuild 1054 BLAKE2B d47f035a9eac0fbb939306ee3b84bd726f7b3e1ed3788abe1b566c93a637369ab5927fd3d2e50ce4ef02537561e7bc25f0ef495be5887568de1e44deba779fbd SHA512 5bcd11e40aae7f70d96e7c1ad040e78b1c08c54f8b99935896e8a118a3d28669d2cb409a534832062371e4c41c0a8fd11611fccf4128e91010a884073ab74129
+EBUILD libepoxy-1.5.8.ebuild 1061 BLAKE2B 35c6e71c656e114d8f003497ac94dde8ec1e33608e30fd555b121192969bd069b669652da624c506667281d12db0bd24c2878c581ac909134224a3919ba67b40 SHA512 6ff5fbf97a6917dcec1296be99a80feb01ef369c5ef68a0e9514d1fa498e1f0fe32f5dc4d04e67448aff0bcab8197df9a7f57b56a66cace2bf7f50a0a428d370
+EBUILD libepoxy-9999.ebuild 1061 BLAKE2B 35c6e71c656e114d8f003497ac94dde8ec1e33608e30fd555b121192969bd069b669652da624c506667281d12db0bd24c2878c581ac909134224a3919ba67b40 SHA512 6ff5fbf97a6917dcec1296be99a80feb01ef369c5ef68a0e9514d1fa498e1f0fe32f5dc4d04e67448aff0bcab8197df9a7f57b56a66cace2bf7f50a0a428d370
MISC metadata.xml 375 BLAKE2B 09993b726e54558d32b0dfb2a221bdd8928b85f55bdaaeb2faf30a0711ed58b05022a9fb669ec43806aff223860e47db53226a0f8f34d7b35edf0a842ab45923 SHA512 fec0ce8c99534083afc197c156a7fbaf2e83b2e22887ef134984ea7a4e6226f2714db399a118cd96f22b20012e7b7572156fc13aa72516e2557880c716140ad6
diff --git a/media-libs/libepoxy/libepoxy-1.5.5.ebuild b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
index 5204c05212a2..62036c1ad5b9 100644
--- a/media-libs/libepoxy/libepoxy-1.5.5.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
@@ -41,14 +41,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
virtx meson_src_test
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libepoxy/libepoxy-1.5.8.ebuild b/media-libs/libepoxy/libepoxy-1.5.8.ebuild
index 9b903d1590db..8557aa03d5cc 100644
--- a/media-libs/libepoxy/libepoxy-1.5.8.ebuild
+++ b/media-libs/libepoxy/libepoxy-1.5.8.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
@@ -41,14 +41,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
virtx meson_src_test
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libepoxy/libepoxy-9999.ebuild b/media-libs/libepoxy/libepoxy-9999.ebuild
index 9b903d1590db..8557aa03d5cc 100644
--- a/media-libs/libepoxy/libepoxy-9999.ebuild
+++ b/media-libs/libepoxy/libepoxy-9999.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
PYTHON_REQ_USE='xml(+)'
-inherit meson multilib-minimal python-any-r1 virtualx
+inherit meson-multilib python-any-r1 virtualx
if [[ ${PV} = 9999* ]]; then
EGIT_REPO_URI="https://github.com/anholt/${PN}.git"
@@ -41,14 +41,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
virtx meson_src_test
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libexif-gtk/Manifest b/media-libs/libexif-gtk/Manifest
deleted file mode 100644
index b8688ce4c8c6..000000000000
--- a/media-libs/libexif-gtk/Manifest
+++ /dev/null
@@ -1,5 +0,0 @@
-AUX libexif-gtk-0.3.5-confcheck.patch 647 BLAKE2B 75bb71eb2e4b2678cf6b5e0ca8badca8c5e840230cc038ea4adf93a54ef3706e2fd858cb44d62cbd86a504670543e2f5a5cef97ddbf5058e37505415428fdced SHA512 b3cbef32167ce10845a6983ab648794d40c83f6f049493b18703f31148c91654a4362215a5d9ae554e9a88bd25875a067e41bda00a2f3ec41b8795e304c8947a
-AUX libexif-gtk-0.3.5-gtk212.patch 954 BLAKE2B 2312a0faa54ae07653f9b50265770137ff519ea2bfdb2ebf98956ec2f282b9f3b0bd4af51ed445ced57c0f5487645d5f784e9aa7120675fcef1f954888842cd6 SHA512 db07e9350c469129440adfed75fbb697589493a0dea2386c6e31bd8cc9c282f9c0f2de99e1a141a50651e816aabbda5da6aa54957d0d21d95fe882a9df87e0d3
-DIST libexif-gtk-0.3.5.tar.gz 396534 BLAKE2B 7ec81dee28893e42a80541b8d3c4129375c9fad2fa8c0a2c2b416eaebb0885d82cde51c2a7844b541c9c55e0f7d16380befcaee83fd0782e37a03289c76fc0c3 SHA512 c4df800f7bcc04fb27638ba56d8bda3ea27afadc94fae792a59673cef867f29976376f1ca00da899a7b2176ddb6f3e53bfe770a86171428cebe68bd413861baf
-EBUILD libexif-gtk-0.3.5-r2.ebuild 871 BLAKE2B 085daa0a547318d0e71d09e4a1af44f27ca88f824eb8a1b5ee68f99ca7dfe91bfbee96769200484a14611c868ba058239928bb0f7c91c2d823cfd2b5d285c054 SHA512 c3ab5bc410f098d6a1b993e4cadb83ba0ddcc3e08d61f9798cfd59e0e18f063530f23a128a9a2dbdab392c5035b4179102fb848d37817df9448be499116d17b1
-MISC metadata.xml 249 BLAKE2B d224cb8e5d2c5fce97a3b2e5ddd58eaf63652fbd198148263043184bb34e3ecfa58af4a54fcb3e8c388ba4a8c71f6882b9ff214f3f366d5333093e1e6b0d8394 SHA512 7721d48e6ecfe8212f06808ec8cb7cc6f9d3db63c71a3c348f9f1d7db9cc18d74ad70c474861631c08df354c7a57d37bd0cee1e4a0ee62e83296a35c90af0b7f
diff --git a/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch b/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch
deleted file mode 100644
index 33d130884a4a..000000000000
--- a/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-confcheck.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- a/configure.in
-+++ b/configure.in
-@@ -52,7 +52,7 @@
- dnl ---------------------------------------------------------------------------
- CPPFLAGS_save="$CPPFLAGS"
- CPPFLAGS=$LIBEXIF_GTK_CFLAGS
--AC_CHECK_HEADER([exif-mem.h], [
-+PKG_CHECK_MODULES(HAVE_EXIF_0_6_12, libexif >= 0.6.12, [
- exif_msg=">= 0.6.12"
- AC_DEFINE(HAVE_EXIF_0_6_12,1,[whether we use a version of libexif greater than 0.6.12])],[
- exif_msg="< 0.6.12 (think about upgrading)"])
-@@ -73,7 +73,7 @@
-
- Configuration (${PACKAGE}):
-
-- Source code location: $(srcdir)
-+ Source code location: ${srcdir}
- Version: ${VERSION}
- Compiler: ${CC}
-
diff --git a/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-gtk212.patch b/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-gtk212.patch
deleted file mode 100644
index 1d5e581d1624..000000000000
--- a/media-libs/libexif-gtk/files/libexif-gtk-0.3.5-gtk212.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -ur libexif-gtk-0.3.5.orig/gtk-extensions/Makefile.am libexif-gtk-0.3.5/gtk-extensions/Makefile.am
---- libexif-gtk-0.3.5.orig/gtk-extensions/Makefile.am 2004-10-17 17:57:31.000000000 +0300
-+++ libexif-gtk-0.3.5/gtk-extensions/Makefile.am 2007-10-04 17:39:01.000000000 +0300
-@@ -1,7 +1,6 @@
- INCLUDES = \
- -I$(top_srcdir) \
- -I$(top_srcdir)/intl \
-- -DGTK_DISABLE_DEPRECATED \
- $(GTK_CFLAGS)
-
- noinst_LTLIBRARIES = libgtk-extensions.la
-diff -ur libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.am libexif-gtk-0.3.5/libexif-gtk/Makefile.am
---- libexif-gtk-0.3.5.orig/libexif-gtk/Makefile.am 2004-10-17 16:48:35.000000000 +0300
-+++ libexif-gtk-0.3.5/libexif-gtk/Makefile.am 2007-10-04 17:39:32.000000000 +0300
-@@ -3,8 +3,7 @@
- -I$(top_srcdir)/intl \
- -I$(top_srcdir)/gtk-extensions \
- $(LIBEXIF_GTK_CFLAGS) \
-- -DG_LOG_DOMAIN=\"libexif\" \
-- -DGTK_DISABLE_DEPRECATED
-+ -DG_LOG_DOMAIN=\"libexif\"
-
- lib_LTLIBRARIES = libexif-gtk.la
-
diff --git a/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild b/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
deleted file mode 100644
index 280f117da0e9..000000000000
--- a/media-libs/libexif-gtk/libexif-gtk-0.3.5-r2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="GTK+ frontend to the libexif library (parsing, editing, and saving EXIF data)"
-HOMEPAGE="http://libexif.sf.net"
-SRC_URI="mirror://sourceforge/libexif/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~ia64 ppc sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="nls"
-
-RDEPEND="
- dev-libs/glib:2
- x11-libs/gtk+:2
- media-libs/libexif:="
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- "${FILESDIR}"/${P}-confcheck.patch
- "${FILESDIR}"/${P}-gtk212.patch
-)
-
-src_prepare() {
- default
- mv configure.{in,ac} || die
- AT_M4DIR="m4" eautoreconf
-}
-
-src_configure() {
- econf \
- --disable-static \
- $(use_enable nls)
-}
-
-src_install() {
- default
-
- # no static archives
- find "${D}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libexif-gtk/metadata.xml b/media-libs/libexif-gtk/metadata.xml
deleted file mode 100644
index 7f099d1061b8..000000000000
--- a/media-libs/libexif-gtk/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <!-- maintainer-needed -->
- <upstream>
- <remote-id type="sourceforge">libexif</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/media-libs/libgig/Manifest b/media-libs/libgig/Manifest
index f6a82c3c8284..10eadb5193bc 100644
--- a/media-libs/libgig/Manifest
+++ b/media-libs/libgig/Manifest
@@ -1,6 +1,4 @@
-DIST libgig-4.2.0.tar.bz2 746637 BLAKE2B a1ee9a0e77a662395c21995c465b8c4e57331de1ba0ae6636015eefc846698341980e908d7aa30cb607bfe6fb48f84999ea88995b0a254fea2465d21b2b9919b SHA512 52c8c749c7852e229c76c17211398dbf5dd5891a1ee9d8e8bc61d55b825c5676595b20b26014e739b9bfd387db36895152b380519609a928a8fa68f4a20279f6
DIST libgig-4.3.0.tar.bz2 761973 BLAKE2B 9d1482b4e704dc96bdc44b2b95ed1479f27488567e5f5216dfdf84e7eb51a07a9f8b9550ce6208156e9f2bc43a3495ab6a77c2672e564e2f36fd9734cb4a88fd SHA512 683c09b1d17acf69020c631452b7dfb25ac54c3701db5e97471d4e7973e9a06267667bf19bfe4eb00d2964223e8446f248d93b4cf29c062dec2588758b4dfba2
-EBUILD libgig-4.2.0.ebuild 774 BLAKE2B 807d558a753bb569dde2c5efd1e8f938f0ca980ef131762c5debea120fa6566e8589beb2026db4d2973af4d6fa61d23b61c5acf90de60b1d4e9288680140b534 SHA512 e43d9b1637a59a3e98d7f251275a60cf470ca7a2672c18c073f23bdab2c55e362606326cfbe675f0f204cbe6a9152ca6e9992079daf6e9b1bbfcd3dae36ad2a2
-EBUILD libgig-4.3.0.ebuild 783 BLAKE2B 7b9e5270dce8a64e064118741fb6960b98dac5df7c9132536357ae831ad83250cbe318296d3ca90657feb47da4f37bfae8b651bf47e5a0b290629bef743b7043 SHA512 a37ce392f33d433c84aae653ca5aaeb53f8ee80511e1a7d1a6f50e6b03153670bed96b7b5e0136e4eb817f48b6ee158c781d3f3b289c3f323aee033c6cd28247
+EBUILD libgig-4.3.0.ebuild 781 BLAKE2B 3d09971c142786abfbf4c7468d9c932ea60882820d9cc680bc8de83f7237d89154edf742675a12c09951421c91860c235516adb30b9eec283a1d92b7d32f44ad SHA512 8d2ece34b1bf0d8f7455c00c07ca1aaa90305d932b54c92c80c55d669683ce213efa031db2045398bca4d2d9a6375cde86e36aca3ff452e1894cb32fe4fb1acd
EBUILD libgig-9999.ebuild 858 BLAKE2B 7face0e502a5a58ae95c7edc677858fb2cef9ea0e4eec90d04059e40c984a7180fba13d6faad77c622acd9b87db220f17dd95ebe7b7cd28c3c08051a19dddb46 SHA512 ed568450278a9b7fb5c807dc31ca4f054239c867afc796d0439ff41057c348f5ca55d4f0ff2661a6fd7fdd94012006f984a1098a3937ea9047670ff3fa387671
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libgig/libgig-4.2.0.ebuild b/media-libs/libgig/libgig-4.2.0.ebuild
deleted file mode 100644
index d79cf9a5d5f3..000000000000
--- a/media-libs/libgig/libgig-4.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ library for loading Gigasampler and DLS level 1/2 files"
-HOMEPAGE="https://www.linuxsampler.org/libgig/"
-SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="doc"
-
-RDEPEND="
- media-libs/audiofile
- media-libs/libsndfile"
-DEPEND="${RDEPEND}"
-BDEPEND="
- virtual/pkgconfig
- doc? ( app-doc/doxygen )"
-
-src_compile() {
- emake
- use doc && emake docs
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- use doc && HTML_DOCS=( doc/html/. )
- einstalldocs
-
- # For libgig.so to be found at runtime
- printf "LDPATH=\"${EPREFIX}/usr/$(get_libdir)/libgig/\"" > 99${PN}
- doenvd "99${PN}"
-}
diff --git a/media-libs/libgig/libgig-4.3.0.ebuild b/media-libs/libgig/libgig-4.3.0.ebuild
index 28e971ce67c9..a6e3a623a254 100644
--- a/media-libs/libgig/libgig-4.3.0.ebuild
+++ b/media-libs/libgig/libgig-4.3.0.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://download.linuxsampler.org/packages/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
IUSE="doc"
RDEPEND="
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index 399b1d9a94ef..2080ccf7eef7 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,4 +1,4 @@
DIST libglvnd-1.3.3.tar.bz2 715179 BLAKE2B 781550cbda489dca31596115c78edd1d4f1fe66062218c83ccf6cb34707501fce839b649c2b0aee3621c283397acca8fb40ad16c0388551ce7caa7fd79b7dbf5 SHA512 7da9e12c010a8f109cd24ca4c2ffc846dd7d23f82157e1e39b8ae69575fabcc9592c0b639b23d2112fe2026b679f1536f1b705a5c948fefea105418803e1b629
-EBUILD libglvnd-1.3.3.ebuild 1523 BLAKE2B 18d55e6ccb70cfbd64630a25c31774d27fdbe8d452f7b31951f90798c259975ebdf9836460862ca22ba5f1d34fd96b5839d120c746bcc6601a87b34657e4e45d SHA512 3c8a6f808b8e7e55811f9d8d8e80324495273c88d971aea91b57e0e38f83c294e54a160301961c45137369bef7da63d6c061bce93d724dd829d31e5fe1ba8553
-EBUILD libglvnd-9999.ebuild 1530 BLAKE2B 4c0bbb2f24a0a70cafe5a101cda3c953468a5b3e72999a001735ac32152649fd9ca4abcc072606f3cef24f7d426a67e63eebdfe4fc601c09df8691f464fa5d6e SHA512 ec1d543fa0525065623a86abc7b950418f601b5346257f70d603a32f3213b8fb1e4fd939405757e73f62486b0f4359a665babf7f5aefed5968937c28eb2a082f
+EBUILD libglvnd-1.3.3.ebuild 1421 BLAKE2B 57e539198bac90ce3aae81b68c211fa6a31e707078d524a19cd02707eee3fb7ce7bce4cb4f2c7a8d6be3605a45a2580704ca035445a1b588ca7e0c5508644ae0 SHA512 d9a6a3a57915fa03117c5b9d252478718e818adbfe2663bf045858980b98191c7fd77358caf8b8fecf989501e24cabfdf55428464079eec08f99f8b11e3d89ec
+EBUILD libglvnd-9999.ebuild 1428 BLAKE2B 35ad17719893213a5a0b18d75df985a5bb45415240c2dde7eca37e5f37c6b8787d9797b6aecbbdbf0c1fac4815524977425acf72d78e71f6fee68a48511064be SHA512 6931b29a79a836234703201b4e377940f110db26567d1da8e78a2b3402c2747cc0b106341e1bb48b8c00b6cc38b2c88b2cde298fd6daccfa97ef74cb889635a8
MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/libglvnd/libglvnd-1.3.3.ebuild b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
index b995f4c6c6ae..d7d545a2ab89 100644
--- a/media-libs/libglvnd/libglvnd-1.3.3.ebuild
+++ b/media-libs/libglvnd/libglvnd-1.3.3.ebuild
@@ -12,7 +12,7 @@ fi
PYTHON_COMPAT=( python3_{7..9} )
VIRTUALX_REQUIRED=manual
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
+inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
DESCRIPTION="The GL Vendor-Neutral Dispatch library"
HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
@@ -56,10 +56,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
if use X; then
virtx meson_src_test
@@ -67,7 +63,3 @@ multilib_src_test() {
meson_src_test
fi
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libglvnd/libglvnd-9999.ebuild b/media-libs/libglvnd/libglvnd-9999.ebuild
index 00a568b16f98..430500414962 100644
--- a/media-libs/libglvnd/libglvnd-9999.ebuild
+++ b/media-libs/libglvnd/libglvnd-9999.ebuild
@@ -12,7 +12,7 @@ fi
PYTHON_COMPAT=( python3_{7..9} )
VIRTUALX_REQUIRED=manual
-inherit ${GIT_ECLASS} meson multilib-minimal python-any-r1 virtualx
+inherit ${GIT_ECLASS} meson-multilib python-any-r1 virtualx
DESCRIPTION="The GL Vendor-Neutral Dispatch library"
HOMEPAGE="https://gitlab.freedesktop.org/glvnd/libglvnd"
@@ -56,10 +56,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
if use X; then
virtx meson_src_test
@@ -67,7 +63,3 @@ multilib_src_test() {
meson_src_test
fi
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libheif/Manifest b/media-libs/libheif/Manifest
index 202d5bd5fb1a..4278c7df6c7a 100644
--- a/media-libs/libheif/Manifest
+++ b/media-libs/libheif/Manifest
@@ -1,6 +1,6 @@
DIST libheif-1.11.0.tar.gz 1680855 BLAKE2B a85ed643bd05cd59a34e9e42c0b8690fc779c06d01aa4925b177c1a36e7a4d11c9dfa798295c9b8215f45802e80119f2a8f5c3876103818c5436358416d97dd8 SHA512 1a5d54a09a5dc581a054052bac4299f7c96ca121650e9238312c426d5261247ce6af1840088b8717c5a53d212b7ec17bfaa109b9245abfaebf1603eaeb77b0ed
DIST libheif-1.12.0.tar.gz 1684355 BLAKE2B 6d84678b39476f2d797d586c6dcaabc9a82351fe3bad536cd90edab16dabf91cbdcdb291195ff45061c7b0ad164748c53f87cbb2dc1e318b2cd458fcba74f644 SHA512 9e6f74dd52841a33b6021a1581ab28c56123d927caa7972acd284444e90888bbdae983b6d847d20eac7651dacea2193d27eb8df45928cb0774229ef8eea23294
EBUILD libheif-1.11.0.ebuild 1829 BLAKE2B 79717765460165bad32b30e4e6ad000cc5436b516c62415e1b4d8d885fa03f894394f5b2e9e60114f2b0d3edfed335ee5c5de1ceb01f09bd2fbeb2cc3e29bc5e SHA512 cec879361ba3869c151da18a27059055d17466fb49bcb3d88121c8aa940b36bcd08e4ad2c9c684cfcb87db1800af23b61dbaca3d02ecdbf39a1843056c96a496
-EBUILD libheif-1.12.0.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
+EBUILD libheif-1.12.0.ebuild 1832 BLAKE2B c356d6900836f2be4a67be40684ffaf0546195d24c0387e1b140b5b2ffdb9d46f860af7350b6013a799ca783a37f981ca79e6e392d77b2b6f41d84e88a7a7ba5 SHA512 eedc2d6763d9a7d7116ba536f08c70c87e3255b2bcca2086eedff96109a94270ebbb424b6c87d88be58767259de1cf64ed7a63daf707143b51b563f37d6baadb
EBUILD libheif-9999.ebuild 1833 BLAKE2B 2049ab3555555fe927b1ebdaf5d9bb2bc29d160c836be1f346814b05f861a5c60ee8e9dad3077c59e689156dc61db57f90b2455f6ac1593aa59e11ddc155b28d SHA512 164ed6c60d44737d6915770a728e87a4bb53e58c4a6b7cd648661b6b406754aa909011066b8ba7c6a785f7f20884798c516b4c3a767f12fad015586d1f2a87b7
MISC metadata.xml 1038 BLAKE2B c04c4e8ef4df16a22ab34e87ab9142f00243aec2e471a17645ae74b9159ab7092c396cb65131c762ab5b102bf510b3859f4a9e36870cb10d254614ba8fcdce95 SHA512 fad35ef040ebf936350bf75195aae4a8ceb42472f5243b5e3e6afa170a5a9d4c4f2e6fb93d6674c13e27051261f210f24b155f6f666f3a9af896726906280d31
diff --git a/media-libs/libheif/libheif-1.12.0.ebuild b/media-libs/libheif/libheif-1.12.0.ebuild
index 05d7c5f68ed0..1a9f7ed19924 100644
--- a/media-libs/libheif/libheif-1.12.0.ebuild
+++ b/media-libs/libheif/libheif-1.12.0.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
inherit git-r3
else
SRC_URI="https://github.com/strukturag/libheif/releases/download/v${PV}/${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+ KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86"
fi
DESCRIPTION="ISO/IEC 23008-12:2017 HEIF file format decoder and encoder"
diff --git a/media-libs/libjpeg-turbo/Manifest b/media-libs/libjpeg-turbo/Manifest
index e7f82a1c5fcc..d463afac2856 100644
--- a/media-libs/libjpeg-turbo/Manifest
+++ b/media-libs/libjpeg-turbo/Manifest
@@ -3,10 +3,9 @@ AUX libjpeg-turbo-1.5.3-CVE-2020-13790.patch 1744 BLAKE2B 7cfd68e3f29b530ad573c5
AUX libjpeg-turbo-1.5.3-cve-2018-11813.patch 1240 BLAKE2B 469eefb5673f48ca8892050507bc7566cacb0b7ff2d2914428971a994bb41d9d717be7fe0a4908cee2ee57a74f6ca8112bee53cb021f4fadbef201536ebee979 SHA512 2542833a6afdbf1f2112695c524197bf5a319ef99c1c6ecea0fe0436681c45321bb6eb59e25fa97d8fa923717452f609e3f85d25547751fa4f8fe99f4ee789c9
AUX libjpeg-turbo-1.5.3-divzero_fix.patch 792 BLAKE2B 31d3617155ac639ebd49a5db9c3898fdd6b20dc04776003121d6c906a96a8963984405b674ad6bee81c6de97304da78fa1de249cca7000fa7eed42f011e5a918 SHA512 b8ba793319e1f8c658f550fe6427625b2053486d784133c6b9e6778fac74c4eedadb6b9c208c6725a27cf585b4857c719ae03efaf602e181c4b782d55cb9b47a
DIST libjpeg-turbo-1.5.3.tar.gz 1658672 BLAKE2B 4d2182802aa9963fa57ec2c4fb5cf0a586847d43803e4c2d2e12cf1144c4da0ede7fdbace5965c77cd6df4547090165615960ebb65c964fd2fac823c021f50b7 SHA512 b611b1cc3d1ddedddad871854b42449d053a5f910ed1bdfa45c98e0270f4ecc110fde3a10111d2b876d847a826fa634f09c0bb8c357056c9c3a91c9065eb5202
-DIST libjpeg-turbo-2.0.6.tar.gz 2192315 BLAKE2B 1e003b147bf5bc1fed59df1eb42c8bd83f6548f267033969a6a26830afb24ae96c8ebba8407e4d2ded76da66a535ed59e249f64ed61218055771e5db9491514f SHA512 504062778224f2ed2ddb64c988fbf466a14247952aab0cf1d35d281942b6f0874eafd34b45914d2208e087f05ddd896c5ba87a67c944e8bb80323e187413038c
DIST libjpeg-turbo-2.1.0.tar.gz 2255497 BLAKE2B 693eccd00e8e1574e60ceb7464552ce9c4fd370c5ec4fc0dc3696ead7b4cd031228aaaf0eef3ceba194bb96bac6134b9c951162c0b81e88637edd6e71f4577f7 SHA512 6632a2a71cb3a350fe4f850fe84e51e361755c373babf2b47fb164c3a9fc3fd66705639bebedd8c1b40cf6c15fd702e814425b0be5919048987bbec357828605
DIST libjpeg8_8d-2.debian.tar.gz 14764 BLAKE2B e93d12afa062da28b717b540492221f70e8d9ccf3885371647cf85a2937f938ca723d4a27d5e1c5d79c26aa25dddf69b38754558851a1704172e8b52baf8e17c SHA512 8c5959fb7583a2d61e9442187f67b91b45e72d9dd30db3360d583a3b5d8e1a908db5659f760bdd455b3056e6ae3535b2fd3b847df3d58b140a1816b754003675
EBUILD libjpeg-turbo-1.5.3-r4.ebuild 2978 BLAKE2B 50575c65e6fd694e2a9b3a124294f72974a2996ed3d8434ef7cc60ca00c59bec617f0ee5472bc5fbf8a0afa6bb4bb3d2c0e5fff6087c287ba9818133d8a79eb1 SHA512 50937ee99535fe2d4aa9da3b403f9dc412a39ea15551f216845645ac8cdcb711570553ed444c9154bfd980c8019da230c0d1b2089abea34f40aa00f9b3d89866
-EBUILD libjpeg-turbo-2.0.6.ebuild 3051 BLAKE2B b85cb9cb4ad088928d5c8e81535c58e47948df44a0c3bcc887303fbe68e053aa2cf5c7a66c1812a4fbb60c6067f98c6b233203c6d7f5ec00ca5df53f708c6d19 SHA512 f072c13c9ad72b532b09ee3ec415a189491bb9eb0dee6f50f2b0a601cd24c952c62f8a947ec3af4e2f669c6a7353dbc8d9a5d6814e9aed45e14088e64e7e6df7
EBUILD libjpeg-turbo-2.1.0-r1.ebuild 3114 BLAKE2B 5da60b00e56b11581e85273e73252842d52833eab960ad6e9240c64d5311908fcaea885dd014f05e48ac7cee525a23b4e3932f5becc26079194c535253991788 SHA512 9766f9cd99a23bdc83e1cc27a04a8eb704a79ac1454dcf67e2ce107469071ab581b275b1d70de18376c95f99e03cb90a189ac1ac50068e1b61a5bdc32666de0c
+EBUILD libjpeg-turbo-2.1.0-r2.ebuild 3232 BLAKE2B 789ebf33027f218a795226880ccc4d0c64055a1c8ec6fa0f0556b26affcae2b3db4469090acdf2462cb14f908562af77d3850b001aa6099cc79dcb9cc899f06a SHA512 ff846c4d7a91de095a2af7ef38d66041aaae616776c0b0e46f2a33a924c711424717fbd67ad91be99a4b45452d19a03acdc226d00f621774aba0f116265a2c16
MISC metadata.xml 566 BLAKE2B 57882cb0d2f18155c76966075cc2e39de863edd42a161077cf98fe070b045e95181851609b9b2e79134919b7c88504ffcaf6a43f1cfa913fd68a728c64dde514 SHA512 33c2184b17b1c3ace640fc94a2aca554fa3dcbdee1dd2f1546e2340f6490c89e5f2c35dc60c3b3410be80fb66abc015846c311f1f0722431345214262ca8d900
diff --git a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
index 321276ccaa99..78714e29ba7e 100644
--- a/media-libs/libjpeg-turbo/libjpeg-turbo-2.0.6.ebuild
+++ b/media-libs/libjpeg-turbo/libjpeg-turbo-2.1.0-r2.ebuild
@@ -14,9 +14,9 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz
LICENSE="BSD IJG ZLIB"
SLOT="0/0.2"
if [[ "$(ver_cut 3)" -lt 90 ]] ; then
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris ~x86-solaris"
fi
-IUSE="java static-libs"
+IUSE="cpu_flags_arm_neon java static-libs"
ASM_DEPEND="|| ( dev-lang/nasm dev-lang/yasm )"
@@ -34,10 +34,10 @@ BDEPEND=">=dev-util/cmake-3.16.5
x64-cygwin? ( ${ASM_DEPEND} )"
DEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jdk-1.5 )"
+ java? ( >=virtual/jdk-1.8:* )"
RDEPEND="${COMMON_DEPEND}
- java? ( >=virtual/jre-1.5 )"
+ java? ( >=virtual/jre-1.8:* )"
MULTILIB_WRAPPED_HEADERS=( /usr/include/jconfig.h )
@@ -65,8 +65,6 @@ install(FILES \${CMAKE_CURRENT_SOURCE_DIR}/${FILE} DESTINATION \${CMAKE_INSTALL_
EOF
done
- #default
-
cmake_src_prepare
java-pkg-opt-2_src_prepare
}
@@ -84,13 +82,20 @@ multilib_src_configure() {
-DWITH_MEM_SRCDST=ON
)
- # bug #420239, bug #723800
- [[ ${ABI} == "x32" ]] && mycmakeargs+=( -DWITH_SIMD=OFF )
+ # Avoid ARM ABI issues by disabling SIMD for CPUs without NEON. #792810
+ if use arm; then
+ mycmakeargs+=(
+ -DWITH_SIMD:BOOL=$(usex cpu_flags_arm_neon ON OFF)
+ )
+ fi
# mostly for Prefix, ensure that we use our yasm if installed and
# not pick up host-provided nasm
- has_version dev-lang/yasm && ! has_version dev-lang/nasm && \
- mycmakeargs+=( -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm) )
+ if has_version -b dev-lang/yasm && ! has_version -b dev-lang/nasm; then
+ mycmakeargs+=(
+ -DCMAKE_ASM_NASM_COMPILER=$(type -P yasm)
+ )
+ fi
cmake_src_configure
}
@@ -107,12 +112,17 @@ multilib_src_install() {
multilib_src_install_all() {
find "${ED}" -type f -name '*.la' -delete || die
- docinto html
- dodoc -r "${S}"/doc/html/*
+ local -a DOCS=( README.md ChangeLog.md )
+ einstalldocs
+
newdoc "${WORKDIR}"/debian/changelog changelog.debian
+
+ docinto html
+ dodoc -r "${S}"/doc/html/.
+
if use java; then
docinto html/java
- dodoc -r "${S}"/java/doc/*
+ dodoc -r "${S}"/java/doc/.
newdoc "${S}"/java/README README.java
fi
}
diff --git a/media-libs/libmodplug/Manifest b/media-libs/libmodplug/Manifest
index 4aa9d0c4a2a4..bb01595fdd65 100644
--- a/media-libs/libmodplug/Manifest
+++ b/media-libs/libmodplug/Manifest
@@ -2,4 +2,4 @@ AUX libmodplug-0.8.4-timidity-patches.patch 557 BLAKE2B 4c26c285bb2f23057dae320a
AUX libmodplug-0.8.9.0-no-fast-math.patch 437 BLAKE2B 7b4f449d4906480b392b2ea93260c816a2418678a6f5209c6d00939830c977161c6d481a34830e0e0b39400adcf7af8665df63091580bd3db84841f7ee8158f1 SHA512 f07f8e3efdb4d15dc8916c5f62429f2d51a0342743a2bc881b44fcc8cb689fe973f9089815c2eb3ba469e622e9c4f86a7c4f5b6e5bd78d506aa7c69b80426653
DIST libmodplug-0.8.9.0.tar.gz 576566 BLAKE2B 534ce23f37ae60593fcbf0b8984140badcf7d868a7559ea6aef282a4d14dc6ad05847dc128a0221772e1dc2abb8c870ff8d6d46da0c04232169f905468a3ba19 SHA512 880e10154fd367ee24ace53ca7e32a5c1fee7dfff1f934e6499944c12779427da63e2f55f8d6ce25db0a42a5b4424053bf64305b31dbfc4ef6a8909924d655fd
EBUILD libmodplug-0.8.9.0-r1.ebuild 828 BLAKE2B e069061a34376f674a2ac2fd727c732dca6f893028e120dc5122c62cc22369cbdb4f4d84548e3988d61dbc295f94a9ac59a57f6f72bf8b3c3af93bf2caaba6ef SHA512 7cb9eca3dfa7ba49da79d1ca6f49b7e6d8ef5c905fa724ae61c9b72558e1ccea1f35e2545c26fac07c27d2c22088e3cc51f0920b2680f59b81bc48600337f5b0
-MISC metadata.xml 457 BLAKE2B 2aa3262e69e5eb85c8ee24f912b126c38554bb324652b7a2b91620236a72b1717ce0ada193193d9655883f8ce48be622e85934a8acb69f35e78bc59616d051af SHA512 6b4cb6e098ed3d743e76d98da648ef475288ec82273b7fbdd73bd60cd14e58d98f0798244bbd4432e504402655557aa0ffb5a4104261c5916261e8040430e46d
+MISC metadata.xml 345 BLAKE2B c7d5254874585501a5cac4c20d25b39d41573c30798f2702dcfd33fa5f931070bf8976fb7850858ba558e04835d239e70fea5672a709a2508333c6631e91100b SHA512 1970078c553d89329dd3cf6f4e5238acb059a08e59d4c46ff5829a3cdab9dde3fed43fa2fb2876ea627a0587d7a411c317c57389f1afe30be6cbfb6adf48fe3b
diff --git a/media-libs/libmodplug/metadata.xml b/media-libs/libmodplug/metadata.xml
index 72aaf93ce01c..9d1be1789d8e 100644
--- a/media-libs/libmodplug/metadata.xml
+++ b/media-libs/libmodplug/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>chainsaw@gentoo.org</email>
- <name>Tony Vroon</name>
- </maintainer>
<maintainer type="project">
<email>sound@gentoo.org</email>
<name>Gentoo Sound project</name>
diff --git a/media-libs/libogg/Manifest b/media-libs/libogg/Manifest
index 8c37556c0ae7..f6177c2e035c 100644
--- a/media-libs/libogg/Manifest
+++ b/media-libs/libogg/Manifest
@@ -1,4 +1,6 @@
AUX libogg-1.3.4-libdir-m4.patch 409 BLAKE2B 68ff8990afa20d42cd527ef9b46ddf0861f167648bba14661e00fc453d8b9df33e4feb94050c13d33bd6da38e68b44e0e179e4c7049582765b3d1e4b3bbf8c84 SHA512 f285cea745d8eb5c2f3356b007b9bd686a9a0331e1a0c96f85da48b258e6544de0c3cf8ba9cd8f0caaf7c0cccc9ea033162c7b4e9fa18c93463bc43d176e8316
DIST libogg-1.3.4.tar.xz 428696 BLAKE2B 21814db2d45e32be56da1b56afacce4b906b34c7b71e7915ceb7b4a240b9a1c271085a4d19362c97c5bb825569094bd2940a92140204f0449eeeadaa40cc6b30 SHA512 09ffb72c3cbde5c05140f5879bd457106ed4070bd7aa5ea7720cf8910167f1d0fa6312f1f71625d51f21e3033219da858e1a8a2701bfd768b35061f7586f976c
+DIST libogg-1.3.5.tar.xz 429076 BLAKE2B 464cf767902bd8bd463d3faaae01fecbe33d4cc87dabf38388ac961bfbe24e6d113f4ee88542e6bed6fd7eaaf0709c7f5cb7a306ee910527f79810054ccdbae7 SHA512 5d1cbc2a3a1fcf5543f5729bd5eb560cfc740c5d17a2492ead137970c45e6203ec1f5de536d77c4b73ece9e3b0046eaa9181c02a09de72ac7ae51b1fca1e1ee7
EBUILD libogg-1.3.4-r1.ebuild 796 BLAKE2B 08a72998e40a302156f66999b90e2677834b50c9ed289453fdeb33c95ecaa15056d9171e93b177811e989a0449049ea15a9d1be7d8f8187c1c0dec1999717132 SHA512 1e06f19cbb3d33d1ea9abc7632e9ba6dff1df2d2c9b4269841932075f58896fad1e39cb1f96c4eff0440a6491c74ef61af778ca6cf5829baa6b1d355c0af3ebd
+EBUILD libogg-1.3.5.ebuild 803 BLAKE2B dab16ab6c46e9395723d4b53d2cde5c2f0c5788cdcc8a2b1d0d6e1fd230b5268876bbfc6507c3a3890e5874e1421de7b96927faa13e757f0474fcf7855879cc1 SHA512 43272ccdbd28c3c386a74c108dbe6eb0b92d5cdb6f289e8715878356b3b8d203d6c668e9c36d354bbc6032f498ffb42e5b44f93fd518714e5ddd1a95f06c494e
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/libogg/libogg-1.3.5.ebuild b/media-libs/libogg/libogg-1.3.5.ebuild
new file mode 100644
index 000000000000..420164577697
--- /dev/null
+++ b/media-libs/libogg/libogg-1.3.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal
+
+DESCRIPTION="The Ogg media file format library"
+HOMEPAGE="https://xiph.org/ogg/"
+SRC_URI="https://downloads.xiph.org/releases/ogg/${P}.tar.xz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="static-libs"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-1.3.4-libdir-m4.patch
+)
+
+MULTILIB_WRAPPED_HEADERS=(
+ /usr/include/ogg/config_types.h
+)
+
+multilib_src_configure() {
+ ECONF_SOURCE="${S}" econf $(use_enable static-libs static)
+}
+
+multilib_src_install_all() {
+ einstalldocs
+ find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/media-libs/libplacebo/Manifest b/media-libs/libplacebo/Manifest
index cd919822f719..370e5ed91df3 100644
--- a/media-libs/libplacebo/Manifest
+++ b/media-libs/libplacebo/Manifest
@@ -4,9 +4,9 @@ DIST libplacebo-v2.43.0.tar.gz 356219 BLAKE2B b5f36dc4b7a0b35a47efc64064d0d7e9cf
DIST libplacebo-v2.43.1.tar.gz 356913 BLAKE2B 1fbda35bcdaf96ebfb20a05bcec35fc03168def2a5fbf3aa4861187a67409d3b9ae28169de2cb6fa9a78e40a1d073982e58c7e36ac9468b5c7c227ef0bb0f96c SHA512 62463dfee6e6fd450395e42d7af2b6e0caa0b183c0d00f5ba0c5ddc893a47cdd0371d37fc72a7361228324b0dc9c55dd0309a5a7210cf753618fde18a094abcb
DIST libplacebo-v2.72.2.tar.gz 398314 BLAKE2B 59ce83d23c22fa1bc10d82b01b531ee82e3e40bf062adf7ea1d276a65c683c448797348a7a9ce234f92e0fd6c699903ae70f15df5d2e2779bec32db6b0b769e6 SHA512 0cb100350dbc81566a8363b0265bf89de8569b0313d1f1aa8ba621e39d7ee43a47ec9ab7827d01fdd2133c357983002412e67c2b2ba3616bd570f16e8e3ba135
DIST libplacebo-v3.120.3.tar.gz 523749 BLAKE2B 6192570dba8de6e0bb98ccf3f0e4f13c01a27c5f97873ff0e5e3212d9b7cdebd98cce3d5ee5364ca8a585ec2a16d0bafc5a863ed35f6f225d86a4410b92edfd3 SHA512 6a2d3c6c053edc3a912a46f9c16d226d83c6f8880714f0b20a8b9417889616e4c1d4d41b8935b898cc580dc3b480ce974bb3921162165f0774ea91be1dfff520
-EBUILD libplacebo-2.43.0.ebuild 1564 BLAKE2B 6ad120ec3ff0fadb1619cfe39a9495e03c3dfce8b2aac9b06b18331355b16ff0a4f98708d337746fde1911947c1d61e55d5ff2358f8757be12c29eeee7607aa3 SHA512 b2ee3a9eaf533fe5d284ec3243d06c9871b526e8f82c11f58de412662703966e014cdeba3294b22a328355348fcac839a68f04c1d8da004a64b18c0af423487f
-EBUILD libplacebo-2.43.1.ebuild 1580 BLAKE2B 1422e2a236e6f296a00108eb9fa1516289607f30f443c56b905157e112608c9bdae8a4a6451200a579c413e08c08eac986f91481eeaed14a0774dde0ca1df3ad SHA512 2cfef936484d384e9917f0330ee2af8ec439c2e7af9771e7e0ae5086a4cb7a8dad3fd6844d72b787d6dcd976b988c2be96965c64988aa11f593b26f01c3b82ba
-EBUILD libplacebo-2.72.2.ebuild 1956 BLAKE2B 6a0d3212b34738bd105298d61d85a914fbb823a02a5b83e6f3af3fd379f564d1e94b1744059880eb5011eaf34dbcabf06fff0900862952b0ef8ab7c2624e65fd SHA512 3e75fd49e50863a615e6b92c7ef0fe6212960ec4e9565eac5e95fa7223311a421582ab4d0e8f237dc6cbd57a12bb71603a66859838830c297ec1afdbb44535a9
-EBUILD libplacebo-3.120.3.ebuild 1887 BLAKE2B 918c0f6525ff7dbe46422e59f33f8d7339abb01668b7ea83f0aa0a366775a404c3b13704886de7aed923342b8bb974aa77c28ca8a3c26e3e0dda55292d8a3e09 SHA512 0afaf40e5e57d766d1aba53bfddd8affc48d064e56d82a0c27a6023a8111c1427b065452b6fe543fdec8f9c6eaefe85880b6bbf8ac8723ae7c07cc1ffecba689
-EBUILD libplacebo-9999.ebuild 1922 BLAKE2B 62d626bcc7f770dba9c265ccadcebae2bd4151985fcb3536c5926ef480efc9d9c414b22276cb0467149921eef0acc7ee42457de39c54acc17b520bf55306769f SHA512 9a372a4099483519cac4d63a4a9146fe201660ab11002242cd03e2499c7f219d726f2fff940c4096c9e5b7d61af6d9aebd64a322461ca7389d82fd0413990147
+EBUILD libplacebo-2.43.0.ebuild 1462 BLAKE2B f040787c2e5848e5be23c77af1af76e68e2ac0e85bd178e00621e6c9fde8a69b01ba681e350d3d783a5812188ede1ea58e209be899b7a6b19c876fc7f5822118 SHA512 990a0551961a89f335e437ce984ffc0047816d655a7ba6be8202c6d791b840840aba63352ff6fd2af5d4cc41a36eb7ace63e51bb03019621768602154c5486b8
+EBUILD libplacebo-2.43.1.ebuild 1478 BLAKE2B 5184f42cdda1740d9b2fb33e05406517d076ad7d557da6c74b580200863fdc340cf208f716da38b172a4f06f9fb74fcc461afcd25ac886a10b398816f96f0689 SHA512 bddeac21c3635c87c7079477c02df39586e6a9604ac65a69b12714bbcf72373b1a9999a3b8bd1cdccff4f42a2c1c62757714162a97cc381419a481626834114d
+EBUILD libplacebo-2.72.2.ebuild 1854 BLAKE2B 707afa5008705ac6e26a4773b8af28e774ce1d43c3d5c6490d51ca01cec05b034dc0429dbb82a5bd14c7fad05e6633031bac645464afa29edf093d444368448f SHA512 3e2c29c2a24db7cdfa43c38c71e399774886359adfaa52ac8988334a3844c6ee519248a945ba9ebd39a93c045d4e3e8cd9e139b37fc299ca93ed3828587ad842
+EBUILD libplacebo-3.120.3.ebuild 1785 BLAKE2B d8b2f28674fe881a2c7e7ef9509146fc1ca004af2416dc40196a692505e910cf0f7ef8bbaa6643e1be2ea7e17af9e5e137a46eebe2794ff4ab34bfd72c5d0737 SHA512 92bb395234eb9cfac4954709ba1ea6b4e923b911a646c9cb399740d752af0f0b70fca1b9a94d3ccd2532385a24e008fca0073aaf0b5770a797d636a01f000b36
+EBUILD libplacebo-9999.ebuild 1820 BLAKE2B 7c8d8ca524b7b621e82ab66f9c303d09dfeb8371c1dcdde8101799026ff24e339a38b983fd6372caa3911fa7786c05008cb5d3e5a092323b5cefe640132b8c9c SHA512 590c110adbefe8362b9fb19a1ec148927d261d347ee5f0cb8c70fd2156b6d7eb85263e4c96255f6894463aa21cc97d455e914e7f5fc53455a4a4ddb2821ebf9d
MISC metadata.xml 599 BLAKE2B 1eaf6838d56d66603411785c54a4f7aad9152cc06e57152639bfb8cb0e29f55f68a0d6df01958cc67ecef9dd1ae84cbb33f83952820f8864f63e7e31975c8911 SHA512 ec68741bb3770de0166d12a3717d97a4ddce3b6cd811ed7b7074a78ee80b8984b5c59f4807c0f984d0d3fd6a5501b482c7c351b9a9541ff1e37fbf99c718ce6b
diff --git a/media-libs/libplacebo/libplacebo-2.43.0.ebuild b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
index d16eba18f617..0ef9eee6c8ad 100644
--- a/media-libs/libplacebo/libplacebo-2.43.0.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.43.0.ebuild
@@ -12,7 +12,7 @@ else
S="${WORKDIR}/${PN}-v${PV}"
fi
-inherit meson multilib-minimal
+inherit meson-multilib
DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
@@ -51,14 +51,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
meson_src_test -t 10
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libplacebo/libplacebo-2.43.1.ebuild b/media-libs/libplacebo/libplacebo-2.43.1.ebuild
index ee21a12eceb4..df1374e028b6 100644
--- a/media-libs/libplacebo/libplacebo-2.43.1.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.43.1.ebuild
@@ -12,7 +12,7 @@ else
S="${WORKDIR}/${PN}-v${PV}"
fi
-inherit meson multilib-minimal
+inherit meson-multilib
DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
@@ -51,14 +51,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
meson_src_test -t 10
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libplacebo/libplacebo-2.72.2.ebuild b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
index 145c4fe558dc..3aee3073d9fc 100644
--- a/media-libs/libplacebo/libplacebo-2.72.2.ebuild
+++ b/media-libs/libplacebo/libplacebo-2.72.2.ebuild
@@ -15,7 +15,7 @@ else
S="${WORKDIR}/${PN}-v${PV}"
fi
-inherit meson multilib-minimal python-any-r1
+inherit meson-multilib python-any-r1
DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
@@ -68,14 +68,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
meson_src_test -t 10
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libplacebo/libplacebo-3.120.3.ebuild b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
index 5167c014b94a..3fac521ec400 100644
--- a/media-libs/libplacebo/libplacebo-3.120.3.ebuild
+++ b/media-libs/libplacebo/libplacebo-3.120.3.ebuild
@@ -15,7 +15,7 @@ else
S="${WORKDIR}/${PN}-v${PV}"
fi
-inherit meson multilib-minimal python-any-r1
+inherit meson-multilib python-any-r1
DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
@@ -64,14 +64,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
meson_src_test -t 10
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libplacebo/libplacebo-9999.ebuild b/media-libs/libplacebo/libplacebo-9999.ebuild
index 9bebe61dc663..4f01a5f6b836 100644
--- a/media-libs/libplacebo/libplacebo-9999.ebuild
+++ b/media-libs/libplacebo/libplacebo-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -15,7 +15,7 @@ else
S="${WORKDIR}/${PN}-v${PV}"
fi
-inherit meson multilib-minimal python-any-r1
+inherit meson-multilib python-any-r1
DESCRIPTION="Reusable library for GPU-accelerated image processing primitives"
HOMEPAGE="https://code.videolan.org/videolan/libplacebo"
@@ -65,14 +65,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_test() {
meson_src_test -t 10
}
-
-multilib_src_install() {
- meson_src_install
-}
diff --git a/media-libs/libpqstego/Manifest b/media-libs/libpqstego/Manifest
index e6b5e91aa690..f6401995b931 100644
--- a/media-libs/libpqstego/Manifest
+++ b/media-libs/libpqstego/Manifest
@@ -1,3 +1,3 @@
DIST libpqstego-0.0.1.tar.gz 360725 BLAKE2B b1ea4559f424205bcc08310b0e49f24cdaaa2b049b42f9c89ca5a4197cef054aabb6ef5e0c610605b1e4757a217be4dbb1dc1b7e90beb69029c79669fcafaca7 SHA512 bad57743da674be597b6d648821190b6bddb9463e6665751def1a3dead88279ffbc71b0f05b362e61a25f67112f5a49de80ac4691dc3670792097b4830895c44
-EBUILD libpqstego-0.0.1.ebuild 516 BLAKE2B 5a53474652dcab8de65f4cdcc3e795f9b29081c2ce02ed0cb64bacc353d439de29ce502c548f2a07e7f114ce5a6f5357df75cae07857cc731701222cfea8c4a4 SHA512 11ac05dae5444118e805df5972f1280b5e8928191cc6a64fff27f79dd03d88ff6e995426980d9b63e06a07037e4a484aa6718f92b6bff7bfba0f28738626f832
+EBUILD libpqstego-0.0.1-r1.ebuild 507 BLAKE2B 4d79c7c36466f009c98c59afb0de9c968afc208e16cd4067ddced473981d9cfd091da762b3d1559bdde7861954e2eaee647a8deb902b2160713679452a77aca2 SHA512 690c941fd343ead25fb69356250852d1fccf30a53f2dece30e307dd73bf7a34b8c110ce51d34dd8dea33f94dc94d5879545fcbcef81c2e7ee7aaccf8d4a5bade
MISC metadata.xml 249 BLAKE2B 8898fdd295c177d9bb7f8528a9bbafd98b2af32934a1e3779740e449c78dc278264dcdc7984694b7d4be0cb8adbc6e5c500de5b9ba75c079ba78b8416664d8c6 SHA512 8456e089d75a69f5eb955f4de3133c8507ff9fdffefa27c6de41c588857c8f94a10c4dc1e49673c97c2893df52e7d586d180a2efce3e181f9b8e18648f819d11
diff --git a/media-libs/libpqstego/libpqstego-0.0.1.ebuild b/media-libs/libpqstego/libpqstego-0.0.1-r1.ebuild
index 8546dad6caee..343ed550a6c4 100644
--- a/media-libs/libpqstego/libpqstego-0.0.1.ebuild
+++ b/media-libs/libpqstego/libpqstego-0.0.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -10,9 +10,8 @@ SRC_URI="mirror://sourceforge/${PN/lib}/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE=""
-DEPEND="sci-libs/gsl[cblas-external]"
+DEPEND="sci-libs/gsl:=[cblas-external]"
src_configure() {
econf \
diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest
index 5d48ce42a842..b5c9443af47f 100644
--- a/media-libs/libtgvoip/Manifest
+++ b/media-libs/libtgvoip/Manifest
@@ -1,4 +1,4 @@
DIST libtgvoip-2.4.4_p20210302.tar.gz 1097895 BLAKE2B 36551fb915ee5b5895d8ea68196be5a910739e46886c879bd9f932fa2294a94c22ec3215a94d9bad05a5d24519291676a686c594b74f513f594eb063c83de012 SHA512 d8e27be18e521f367a30c63665300496dbd8fe250261fddf5576325afc27d855e280ee31e46d5fcc2294d79a91c4003732e22f2bfb6db0472e357508b5053d29
-EBUILD libtgvoip-2.4.4_p20210302-r1.ebuild 1437 BLAKE2B 806ce3ddd3a3bf23548f93caec64b32371d4780ca044dfb92838c40d25524bca5ac90bb74c75ded1cfd98533959f5e9f70e1ed469668ec1edc3c8ac51c2cb185 SHA512 32384f8f0149c754c773bb74a5a7c6ad9cd348729981f48c2c55e545d484a33bc978c0df152ea12c0ba4d4da1ba90f661f2a8970866d037a80ef7cf23d90e84b
+EBUILD libtgvoip-2.4.4_p20210302-r1.ebuild 1436 BLAKE2B c1f235d61390dadda14abf70a615591b1d9bb8a0dd913fad5557062191062e963e292244f328cf1a5db8401046573251d826aec61876cf7eb2dd6ac75d1e58f6 SHA512 59cf755a6e123466c8379c00623dada86d0cca48de15f6e89ac212c4e0be593fef6e45b7e5be3223315e5f89ed6f33476a2171b45c8f10ccb47571e12f4413ed
EBUILD libtgvoip-2.4.4_p20210302.ebuild 1449 BLAKE2B 856046ffa58f3f0064b381b35da7ef356641d0b8212737d9939d2c8e4c3490b85b0297f01dcc475a5e14bec2253590383ec8205686ffcb1294ae7c5a9c96f346 SHA512 594e3ca3432dbd336b03a9c630be73d5e8c7a9256927f8c0cccfb4a148d1f5ab88fa500c9a221576dc4b7e427086e7cf8c94f725f416baf38d8756c482395c3e
MISC metadata.xml 542 BLAKE2B ddf38189857cb4216e85e9a958daa176e8d030b907735f9d57e25ce5b71d0a6179300bb9064960e4a82532dedf329fc85ee98025faf0494b17b74a00fcb8d056 SHA512 e455e7c38f6171064d6c3923fa04373bd6e902e40d6e2c63f7a1ca8adc8245b93ef5b67051ee3fd3986a3efd0868c3c631b7ae36613f7978eba7441322711c72
diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
index 61e1244e5dd3..63e5f5b38f12 100644
--- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
+++ b/media-libs/libtgvoip/libtgvoip-2.4.4_p20210302-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT
LICENSE="Unlicense"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
IUSE="+dsp +alsa pulseaudio"
DEPEND="
diff --git a/media-libs/libvpx/Manifest b/media-libs/libvpx/Manifest
index 3fad92346d47..a81daa4a718a 100644
--- a/media-libs/libvpx/Manifest
+++ b/media-libs/libvpx/Manifest
@@ -6,7 +6,7 @@ DIST libvpx-1.9.0.tar.gz 5326239 BLAKE2B 6403a5d8326235a8d27ca3727f45398556cbe72
DIST libvpx-testdata-1.10.0.tar.xz 448090752 BLAKE2B 88391427d35c538d114df188a899f8de7247dcd861d8438a32530909430feceef48c2c35a53c5a57268dccd85bcd40ec92bb053cfc2b4588bde6447747e10803 SHA512 6d4f0d08f32b34e95c1a75a4340e0340c83b26008852fac4293f1f3c4b9e9ce0f8e2290de678e2f2c9e1309f6995857add4e98796e1a3f474ce1402c9cc862f4
DIST libvpx-testdata-1.7.0.tar.xz 238790100 BLAKE2B 1d14e794341d35402eaf54d398ebed56b0983908e397ae677737e0f313ea0bfc9c4a39be91765b02a07a8eb9b55529d5f998efcc87b1b493b0e326e02193d982 SHA512 1556345e41674f0846a7419828972ec27c3c37fe270fa1deb45e03665f60ec088d79134aee0d2e27003b130636eeed4a15ea3f701c9d7014f3ca2785467767a8
DIST libvpx-testdata-1.9.0.tar.xz 450868860 BLAKE2B aaed7f2ef4f70ff352e39be2630e3a5cd803e8d2408c4fd5c3e06e040a75d2f593a10bc267a497aa91eaceb64286e81f69e86ca0940160e4f34b62c08e91df7b SHA512 bcc89062a436d652d15d5852a842cb4985c4783855b943ab11667c022b5082887129fd9579b8da3af209a3031f95ff8dc625c380f79559db160501cd676736ea
-EBUILD libvpx-1.10.0.ebuild 3594 BLAKE2B ff9c50bb3ca408ff17cdc813a4d0b0f05f2c3f8d8bcef257a99aa9db583fd56a00bb5b1d0d1aec28577ac7f1810fb17418b742b673df1948738e4bc0925e9d24 SHA512 50595c881659c1fce76a7675590262901b41f34fb33202e9944b7f7c9fb6983212622967d1df84a8bbc25430772fa58805c4e2fd7a7d430233fe3c3d3d9ebd54
+EBUILD libvpx-1.10.0.ebuild 3591 BLAKE2B 29d7ae344f4f92bc575ab3b07e8cb674201e211fa31bbf21026611515aaa8f159502af37595ba602c9f4c243489e3218d5508d8f4fcfbca9b1898341c6511a84 SHA512 5e38fa6f862785c1eea5d8c639ae93b5f81e30b19a05e2ae2cdfa58fd20276932fdcdfb0a448e6985ba05a3f630f9ad359a1e54087d3e6994dd200f7867ec524
EBUILD libvpx-1.7.0-r1.ebuild 4053 BLAKE2B 3787d0620c70a248d22aa66f951eb4b39a86e5ac89af8e76e5e708185695c2aca818050027f5ff4e2e00f51d370ac90246a8c92bcf334e47d7c564273b63f2f9 SHA512 fe8d16a9ba74e96f9017b5b58113c8af86688d5600112382a23f809388590f3c39d7cdffe57c57358e67e2be01fa98ac870a31ef7d797b865b089cf20330a440
EBUILD libvpx-1.9.0.ebuild 3586 BLAKE2B b0a71cdc777a7b32dd39010d9c4319501b67ea289812ff8afc5e5f61aec9b4c14cb4c8fedacca57539f99f95d9dab24f7e8872c058feb44cfeac158f9e0b9b70 SHA512 61638b63c87ccbd7a8b14b89de3c327dfd8c17b064ab346ace2bf876ecdf40624bc519ece1923d3fa05285b307227eed7a1dd1b1c9e56a3afe79b754e3723fd4
MISC metadata.xml 664 BLAKE2B 78c866b8ee8a4b266156652bd6352d1ad0b7f28c88922dd31868623b1eca6530aab0a391c7264e5f1dffb9c1379adeb3b115846e99e1ab8a2ae1e58f527234ca SHA512 96644cef2185474da831eb928645cb7607216242097e8d1f1b887071817e282e22ae5646583208bfacf4467029b9dc2d3cfb888bba085bbf5b493dc98c3a7ef9
diff --git a/media-libs/libvpx/libvpx-1.10.0.ebuild b/media-libs/libvpx/libvpx-1.10.0.ebuild
index d2b86f688fb4..bc07570ec1e1 100644
--- a/media-libs/libvpx/libvpx-1.10.0.ebuild
+++ b/media-libs/libvpx/libvpx-1.10.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/webmproject/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.
LICENSE="BSD"
SLOT="0/6"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
IUSE="doc +highbitdepth postproc static-libs svc test +threads"
REQUIRED_USE="test? ( threads )"
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 49912c2cf232..e73004f1557a 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,10 @@
DIST mesa-20.3.5.tar.xz 14367412 BLAKE2B 7bad876ce702158e727a752eda6722e7165b497fd3a485dae4e989f22b13288a93f51bcd5e6a69b979f0bbe41599fa237c08f3bbb81cb9c6dc4c06827f8ad5f4 SHA512 481e710ed80d8f215a8d541cfe51b960862c2403c2b9e7e6932c8236b8decb5d478871d6c73559d6d795ada143803764f3a93b2329588c80f62e2e5ec98c78a9
DIST mesa-21.0.3.tar.xz 14710004 BLAKE2B f2165da4487824931d8ff90e4f13624546a297b0d3577d69b7cfd6078a965282b4a732cb720cbb08ea83a3a987603cfe67876fb18022fa444b011fcc9b7df352 SHA512 4a8aee48a8ea7f32e8aa3bbbd91db26c6053b9a43e62ff88256929e6bc147884f0fef988726b5a3d59d7008663f017c746a0352fd3fcc1c476b8190af4a2531f
DIST mesa-21.1.1.tar.xz 15169732 BLAKE2B b2c2f2fa14ebf78baeb64ca976dde2920a594bcea02b3a17820135afc169c8489f37a2869b140d637b11b618c96e37834c255ca7a92d17f70003a11e8fffd401 SHA512 79d0e2b0e1e590e7f36a082df3584010a553af0b3060bd2d3a7ace700ac7a8d1b7734ba67f2e193dd441434eeec74a16e0dbcbf8c15061b5dd5d6a1feca73d62
-EBUILD mesa-20.3.5.ebuild 15063 BLAKE2B cbf593097a3b3a98f9e658f4e5e1d2bb29e7d7f977dffbb130dfd84afbfea76e10b997ec119a65450e687c101da1de199fff987f6aacfb995f4cf7551868050a SHA512 5399d4cffa57c5b1c6b089a6a0187c1aea2ee6334e8b560a8e1a7724c636538351d8d649f84fdd0d929b6c4f47c5b58cb5ebbb413a72577ca1d46db141242e47
-EBUILD mesa-21.0.3.ebuild 14974 BLAKE2B 9e1b0d0fe9b2f0449fcd1a083bc8a01302d0cda7919fb78aa71ac2424dc06b57a1b276f51286a81a08bac86b8c6f4383cfdeb73f1fc10ac196623477d1d30487 SHA512 eeae6ca3aad46f11bea1a5d94f2d54652f5c90864b3fde1ef92fdbc379ee0c094ac197f6ac25a07235a68179d561d8794519681940c34d8d7cb165efcbc347d5
-EBUILD mesa-21.1.1.ebuild 15021 BLAKE2B 6b8ef24e6e5d64b5c22edc76157924c8189bd7be957d06bf81011ab4b8d701c1393d22ad7a5301fe280f453af6aa1191563b798e6a8ded2c67b477a1ff7532af SHA512 d57fbefed59d1328bc915fb8435457a9c09e917a86fc6c1225e7ea942ee2a41ef093965b386b8a3aa5fb1baa466162683c39ef319380e5e7c27425b958c92907
-EBUILD mesa-9999.ebuild 14981 BLAKE2B df68d9a7fa62672d81582f8a43c3ff125abdd134b83683bc5bd24c2b9c457b3fc1b925102c33777d7ba121e2be6d507febec0d7ac1a32f17b738bd1785623540 SHA512 d0385e88dd4c47e499a353beeb891fb3dad9c8008642ca325402af53bb5da42243e771fcfb8088dead4c08d6ba590cef67fa6d4b86a80e383c4fbd9a25877c40
+DIST mesa-21.1.2.tar.xz 15199892 BLAKE2B 1e1d9e0bee2eec95a38379047c050ba7e4a9ada47bb8d4f1d3faf355ec6f71ad8e792cfaf72234a3c86f254c33618883f772c0f3f7f7f97085a8c7b5a1ad90d0 SHA512 a7907fa29fdb4e137015ee5405b9c8c0769ef9354bbe963c1af80318b398c05c79db6129b583106d620c42a5e9b625611b648fd5207334eb9b588d7963defc70
+EBUILD mesa-20.3.5.ebuild 14915 BLAKE2B 73f85b8bbbbbbfba3be499ba55ffa2bcdb5e6f860049819502957e803c2760edf3e45ada1f103f58752e77177065ad12d81ea72c36f96c19c6ebc87d1fe03ab9 SHA512 0b1dd3fad90392be514da0d347efe19b35fe82d13ca02d959f56e625d00a9beb917c83c678e7d6ad419dc81b6fc32e0dd8ca6f95f5fd77484872af464f9ae52b
+EBUILD mesa-21.0.3.ebuild 14826 BLAKE2B 1c9793f1dc8b7769406d49d02fcf152c2b21a446972fb754871ec5103ddab1eb93bfc52aed895bbc74b9c7a6743c360d5cbcbc0d1ede2cd28307eb243803a77b SHA512 3b5db1497b6b99412353134139bfd2abac642989d1570d4c8d2172dd82e63aeed6ef1bc1d7ce0c2653288a6c7bd8a6315494ed152deb627fc3eb304a6d5f9be7
+EBUILD mesa-21.1.1.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
+EBUILD mesa-21.1.2.ebuild 14873 BLAKE2B 04fc1df71cb1520fedbfdd73a4042b4871f1bd69b7b89f7152c84de4e3d2a7da6002861ab13d9a6a40130def670d31fdfe1a577175f5916bddd95ea392e3581c SHA512 330970c7a8396a1f938e9ee395cd58425fb62b0a05e4c464e2f0963ee23c218ca7fb012b75d59aac4426c9104682c948f782ad1ba4c1704b0dcc6ff70803127a
+EBUILD mesa-9999.ebuild 14833 BLAKE2B 114e3b670f928a2745a6affa18ec5ad29fc929f5397453f2b276e1a8f7448fc0664aa4057e15cf248a9ad723e48f523619cbe2b1dd39692f273971f1a8e95e1c SHA512 b00131e879ceac909e558ee182fbd50ace215db5a27849707ead338c6199b3878cef066440a51752dc4f481e87a8f87666ddbce46c383c3f46df1032dad2f3bf
MISC metadata.xml 1895 BLAKE2B abf62dda9b9eba657e310c68fdd86aaa49c550dc34ef624e8feb038e0412f0da786e1120dc16631399cb2c83961b88e78571347c3e6d464c2cf3a343bc0f1483 SHA512 7758641386100e07c1112afe04a8613de8ae1e35a8e940f0eefcfc7daa829789c42b903320339b04b44c2400f0857c180740407abd171e9773a9f51e3dd9468a
diff --git a/media-libs/mesa/mesa-20.3.5.ebuild b/media-libs/mesa/mesa-20.3.5.ebuild
index b77317562fe9..db637e1abb46 100644
--- a/media-libs/mesa/mesa-20.3.5.ebuild
+++ b/media-libs/mesa/mesa-20.3.5.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit llvm meson multilib-minimal python-any-r1 linux-info
+inherit llvm meson-multilib python-any-r1 linux-info
OPENGL_DIR="xorg-x11"
@@ -526,18 +526,6 @@ multilib_src_configure() {
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 -t 100
}
diff --git a/media-libs/mesa/mesa-21.0.3.ebuild b/media-libs/mesa/mesa-21.0.3.ebuild
index cc7b3d9f036a..9d8170f4f79f 100644
--- a/media-libs/mesa/mesa-21.0.3.ebuild
+++ b/media-libs/mesa/mesa-21.0.3.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit llvm meson multilib-minimal python-any-r1 linux-info
+inherit llvm meson-multilib python-any-r1 linux-info
OPENGL_DIR="xorg-x11"
@@ -524,18 +524,6 @@ multilib_src_configure() {
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 -t 100
}
diff --git a/media-libs/mesa/mesa-21.1.1.ebuild b/media-libs/mesa/mesa-21.1.1.ebuild
index c15b166a9280..b67e6c7e47f0 100644
--- a/media-libs/mesa/mesa-21.1.1.ebuild
+++ b/media-libs/mesa/mesa-21.1.1.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit llvm meson multilib-minimal python-any-r1 linux-info
+inherit llvm meson-multilib python-any-r1 linux-info
OPENGL_DIR="xorg-x11"
@@ -525,18 +525,6 @@ multilib_src_configure() {
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 -t 100
}
diff --git a/media-libs/mesa/mesa-21.1.2.ebuild b/media-libs/mesa/mesa-21.1.2.ebuild
new file mode 100644
index 000000000000..b67e6c7e47f0
--- /dev/null
+++ b/media-libs/mesa/mesa-21.1.2.ebuild
@@ -0,0 +1,553 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7,8,9} )
+
+inherit llvm meson-multilib python-any-r1 linux-info
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+else
+ SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost v3d 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 selinux test unwind vaapi valgrind vdpau vulkan
+ vulkan-overlay wayland +X xa xvmc zink +zstd"
+
+REQUIRED_USE="
+ d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ osmesa? ( gallium )
+ vulkan? ( dri3
+ video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( gallium )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_v3d? ( gallium )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+ xa? ( X )
+ xvmc? ( X )
+ zink? ( gallium vulkan )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.105"
+RDEPEND="
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${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? (
+ >=virtual/opencl-3[${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
+ wayland? (
+ >=dev-libs/wayland-1.18.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/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}]
+ )
+ zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] )
+ zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="12"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:12[${MULTILIB_USEDEP}]
+ sys-devel/llvm:11[${MULTILIB_USEDEP}]
+ sys-devel/llvm:10[${MULTILIB_USEDEP}]
+ )
+ <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${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}
+ gallium? (
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+ wayland? ( dev-util/wayland-scanner[${MULTILIB_USEDEP}] )
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ usr/lib/libGLX_mesa.so.0.0.0
+)"
+
+llvm_check_deps() {
+ local flags=${MULTILIB_USEDEP}
+ if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi
+ then
+ flags+=",llvm_targets_AMDGPU(-)"
+ fi
+
+ if use opencl; then
+ has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1
+ fi
+ has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]"
+}
+
+pkg_pretend() {
+ if use vulkan; then
+ if ! use video_cards_i965 &&
+ ! use video_cards_iris &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_v3d; then
+ ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain i965, iris, radeonsi, or v3d"
+ fi
+ fi
+
+ 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
+
+ if use osmesa && ! use llvm; then
+ ewarn "OSMesa will be slow without enabling USE=llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use video_cards_i965 ||
+ use video_cards_iris ||
+ use video_cards_radeonsi; then
+ if kernel_is -ge 5 11 3; then
+ CONFIG_CHECK="~KCMP"
+ elif kernel_is -ge 5 11; then
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ elif kernel_is -ge 5 10 20; then
+ CONFIG_CHECK="~KCMP"
+ else
+ CONFIG_CHECK="~CHECKPOINT_RESTORE"
+ fi
+ linux-info_pkg_setup
+ fi
+
+ if use gallium && 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
+
+ local platforms
+ use X && platforms+="x11"
+ use wayland && platforms+=",wayland"
+ emesonargs+=(-Dplatforms=${platforms#,})
+
+ if use X || use egl; then
+ emesonargs+=(-Dglvnd=true)
+ else
+ emesonargs+=(-Dglvnd=false)
+ fi
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_feature llvm)
+ $(meson_feature lm-sensors lmsensors)
+ $(meson_feature unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=disabled)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_feature xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=disabled)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_feature xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=disabled)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_v3d ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable -- swrast
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_v3d v3d
+ 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 zink zink
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_iris iris
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ vulkan_enable video_cards_v3d broadcom
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=enabled
+ $(meson_feature dri3)
+ $(meson_feature egl)
+ $(meson_feature gbm)
+ $(meson_feature gles1)
+ $(meson_feature gles2)
+ $(meson_use osmesa)
+ $(meson_use selinux)
+ $(meson_feature zstd)
+ -Dvalgrind=$(usex valgrind auto false)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ $(meson_use vulkan vulkan-device-select-layer)
+ $(meson_use vulkan-overlay vulkan-overlay-layer)
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_test() {
+ meson_src_test -t 100
+}
+
+# $1 - VIDEO_CARDS flag (check skipped for "--")
+# other args - names of DRI drivers to enable
+dri_driver_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ DRI_DRIVERS+=("$@")
+ fi
+}
+
+gallium_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ GALLIUM_DRIVERS+=("$@")
+ fi
+}
+
+vulkan_enable() {
+ if [[ $1 == -- ]] || use $1; then
+ shift
+ VULKAN_DRIVERS+=("$@")
+ fi
+}
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index b57fb6ce0dfe..dd671cef87a0 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=7
PYTHON_COMPAT=( python3_{7,8,9} )
-inherit llvm meson multilib-minimal python-any-r1 linux-info
+inherit llvm meson-multilib python-any-r1 linux-info
OPENGL_DIR="xorg-x11"
@@ -524,18 +524,6 @@ multilib_src_configure() {
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 -t 100
}
diff --git a/media-libs/mlt/Manifest b/media-libs/mlt/Manifest
index b7b2ddc08b05..a2700ace775a 100644
--- a/media-libs/mlt/Manifest
+++ b/media-libs/mlt/Manifest
@@ -1,8 +1,6 @@
AUX mlt-6.10.0-swig-underlinking.patch 596 BLAKE2B b51670d051ae2bd016da65f560ed861518845d11e46aa5b4971a68f196452b86af3e00cb9af02bf23b32028731eb5352214aa63a047ebe12386c9f749df1236c SHA512 95cf9339b88979eb19cda3698474fc386c0c2d01333435e95b5a7662dbc5c359f5c78e05a0d78836023191c07a97e0dbf20c354e10cf6d1ad59d64fa9a203160
AUX mlt-6.22.1-no_lua_bdepend.patch 153 BLAKE2B 3ea31c570e7bef81bda0905549baedee8b9eed2bc14c535abff02985d573e4606f4f8f42213bcbc86fa68af905ba6c39dddcbf63efa20172c608659153d79073 SHA512 b382ee68f2815b4aa62ce7708a7452536f2bc0287dc4d59f557c08fbf51d6bef7607f63e11e991b4f52eb7e06afbde06d53aac3d42b4a0c96f59332ec17d48cd
AUX mlt-6.26.1-fix-crash-w-ogg-album-art.patch 2476 BLAKE2B f11ae9637e014313499691431863cffd4b87aa9ee06b21a557b63cef3166d73b977acb9818267b0b21335929aa72c2444ec52b935faffe44e31f043cc2fc6acc SHA512 0961298be7798af4a4618224ed9b7d36d3ab0e5f976d087c01c455fce3220e282e03bef53cdb7532ff84ca64fab1d23cb1c4c2179c85d0a1475f4597ac963426
-DIST mlt-6.24.0.tar.gz 1351427 BLAKE2B ea645f0fc6822c0fe3012ac4833062dcddff9859e35fc41aacd929c2dc0c80b49bb83b7714d234e0bcad9a4e300534e8637b1e6927c99cb84e9ce2959e619a7b SHA512 c9533191aad7be894152e305a4ce3f8c1dbd652ea887774866c74aed4794eae90bd15b0b9a070e6fc22f2979e210af6ca1a2c937adcc3b0be5d39ba900df6229
DIST mlt-6.26.1.tar.gz 1366022 BLAKE2B f5b7e733090ae60cb55556893775ab4a68847705e215b85c90d901d72022f5b57c08122cd8c08c1ba51b71eedc5341adaaad2ad002af76724a2d2cf6a7379974 SHA512 6a3ef572cddee48c3089b19b2920de84936aa913a3f35b6f06e4bece2dc7a5a168daecfbaa8111c799b5316f967c37b09d485c000a4eba69af4f7ee3dc8db9e4
-EBUILD mlt-6.24.0-r1.ebuild 5347 BLAKE2B bda27b1eaa0ab139b06b029790b9528f3978b188eab9c75307c1128b60f0fa21ab34bae69e6f0efb0dec654f552fc8fc60fcf88d13a85ec85982465f907d8d3e SHA512 04e4f83c6efbb5a9d5fd7f307904f0473b82d385575332687b1c4ef87e69914605f75daa1ce116f913fdd6bf5ef7d8109c5bc469c39a566ec9cde110c7db8029
-EBUILD mlt-6.26.1-r1.ebuild 5388 BLAKE2B c73bc8330d74a81dcb3228c05bc91b5524574e6605e66e894037237326d4d087253e293d94477c3817442f8d5b72c9785d20b122a91532671702b56781c0acce SHA512 eacd7c3367987f15a4af95f003710286829fcd858c976cdf144049199c1f266fe4bb69da9f2204b5bf771c26e0f328f9848f1c5c8eac0df3396353d8e11e5f4b
+EBUILD mlt-6.26.1-r1.ebuild 5385 BLAKE2B 64c6779bf90e459905f1b93c28d7f21b4974a1fa8d7b0df205fb6ffe32d57b8516cf43968fc9af140cfdeafa9dce1a85d1b93411ad2f83587a7e837383af6579 SHA512 3f33ed0fd4d22fe7df7a53ed8810f296c1b4829410b7ddde3424bc55e6a321597dc80537488541490bc3536bf8f3de6d995a740f1adb7b65a99c3af74a701a84
MISC metadata.xml 1536 BLAKE2B eeec58dc42f229c4dfbb41841d82d2b3035bee6a07f42a08b0a396b2f4dfd498d85bfaf34a73d6b3d03c7109033b9158f930a0da531466ca81a0bb03dbc2a475 SHA512 34236fad3d304e6798f50f9bdbc7e2d6bb261ededa9fbde09ba535850ec908f6fefde2e4c717187d7b50fe195f2c8795f7d0ac8ccff1fabb70943a594e7348a1
diff --git a/media-libs/mlt/mlt-6.24.0-r1.ebuild b/media-libs/mlt/mlt-6.24.0-r1.ebuild
deleted file mode 100644
index ae45ba932470..000000000000
--- a/media-libs/mlt/mlt-6.24.0-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-LUA_COMPAT=( lua5-{1..4} luajit )
-PYTHON_COMPAT=( python3_{7,8,9} )
-inherit lua python-single-r1 qmake-utils toolchain-funcs
-
-DESCRIPTION="Open source multimedia framework for television broadcasting"
-HOMEPAGE="https://www.mltframework.org/"
-SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
-ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
-qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
-# java perl php tcl
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )"
-
-SWIG_DEPEND=">=dev-lang/swig-2.0"
-# java? ( ${SWIG_DEPEND} >=virtual/jdk-1.5 )
-# perl? ( ${SWIG_DEPEND} )
-# php? ( ${SWIG_DEPEND} )
-# tcl? ( ${SWIG_DEPEND} )
-# ruby? ( ${SWIG_DEPEND} )
-BDEPEND="
- virtual/pkgconfig
- compressed-lumas? ( virtual/imagemagick-tools[png] )
- lua? ( ${SWIG_DEPEND} virtual/pkgconfig )
- python? ( ${SWIG_DEPEND} )
-"
-#rtaudio will use OSS on non linux OSes
-DEPEND="
- >=media-libs/libebur128-1.2.2:=
- ffmpeg? ( media-video/ffmpeg:0=[vdpau?,-flite] )
- fftw? ( sci-libs/fftw:3.0= )
- frei0r? ( media-plugins/frei0r-plugins )
- gtk? (
- media-libs/libexif
- x11-libs/pango
- )
- jack? (
- >=dev-libs/libxml2-2.5
- media-libs/ladspa-sdk
- virtual/jack
- )
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- lua? ( ${LUA_DEPS} )
- opencv? ( >=media-libs/opencv-3.2.0:= <media-libs/opencv-4.5.1:= )
- opengl? ( media-video/movit )
- python? ( ${PYTHON_DEPS} )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- media-libs/libexif
- x11-libs/libX11
- )
- rtaudio? (
- >=media-libs/rtaudio-4.1.2
- kernel_linux? ( media-libs/alsa-lib )
- )
- rubberband? ( media-libs/rubberband )
- sdl? (
- media-libs/libsdl2[X,opengl,video]
- media-libs/sdl2-image
- )
- vidstab? ( media-libs/vidstab )
- xine? ( >=media-libs/xine-lib-1.1.2_pre20060328-r7 )
- xml? ( >=dev-libs/libxml2-2.5 )"
-# java? ( >=virtual/jre-1.5 )
-# perl? ( dev-lang/perl )
-# php? ( dev-lang/php )
-# ruby? ( ${RUBY_DEPS} )
-# sox? ( media-sound/sox )
-# tcl? ( dev-lang/tcl:0= )
-RDEPEND="${DEPEND}"
-
-DOCS=( AUTHORS NEWS README docs/{framework,melt,mlt{++,-xml}}.txt )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-6.10.0-swig-underlinking.patch
- "${FILESDIR}"/${PN}-6.22.1-no_lua_bdepend.patch
-)
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- default
-
- # respect CFLAGS LDFLAGS when building shared libraries. Bug #308873
- for x in python lua; do
- sed -i "/mlt.so/s/ -lmlt++ /& ${CFLAGS} ${LDFLAGS} /" src/swig/$x/build || die
- done
-
- use python && python_fix_shebang src/swig/python
-}
-
-src_configure() {
- tc-export CC CXX
-
- local myconf=(
- --enable-gpl
- --enable-gpl3
- --enable-kdenlive
- --enable-melt
- --enable-motion-est
- --target-arch=$(tc-arch)
- --disable-gtk2
- --disable-kde
- --disable-sdl
- --disable-swfdec
- $(use_enable debug)
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable cpu_flags_x86_sse2 sse2)
- $(use_enable ffmpeg avformat)
- $(use_enable fftw plus)
- $(use_enable frei0r)
- $(use_enable gtk gdk)
- $(use_enable jack jackrack)
- $(use_enable libsamplerate resample)
- $(use_enable opencv)
- $(use_enable opengl)
- $(use_enable qt5 qt)
- $(use_enable rtaudio)
- $(use_enable rubberband)
- $(use_enable sdl sdl2)
- $(use_enable vidstab vid.stab)
- $(use_enable xine)
- $(use_enable xml)
- --disable-sox
- )
- #$(use_enable sox) FIXME
-
- use compressed-lumas && myconf+=( --luma-compress )
- use ffmpeg && myconf+=( --avformat-swscale )
- use vdpau && myconf+=( --avformat-vdpau )
-
- if use qt5 ; then
- myconf+=(
- --qt-includedir=$(qt5_get_headerdir)
- --qt-libdir=$(qt5_get_libdir)
- )
- fi
-
- if use amd64 || use x86 ; then
- myconf+=( $(use_enable cpu_flags_x86_mmx mmx) )
- else
- myconf+=( --disable-mmx )
- fi
-
- # TODO: add swig language bindings
- # see also https://www.mltframework.org/twiki/bin/view/MLT/ExtremeMakeover
-
- local swig_lang=()
- # not done: java perl php ruby tcl
- # handled separately: lua
- for i in python; do
- use $i && swig_lang+=( $i )
- done
- [[ -z "${swig_lang}" ]] && swig_lang=( none )
-
- econf "${myconf[@]}" --swig-languages="${swig_lang[*]}"
-
- sed -i -e s/^OPT/#OPT/ config.mak || die
-}
-
-src_compile() {
- default
-
- if use lua; then
- # Only copy sources now to avoid unnecessary rebuilds
- lua_copy_sources
-
- lua_compile() {
- pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
- sed -i -e "s| mlt_wrap.cxx| $(lua_get_CFLAGS) mlt_wrap.cxx|" build || die
- ./build
-
- popd > /dev/null || die
- }
- lua_foreach_impl lua_compile
- fi
-}
-
-src_install() {
- default
-
- insinto /usr/share/${PN}
- doins -r demo
-
- #
- # Install SWIG bindings
- #
-
- docinto swig
-
- if use lua; then
- lua_install() {
- pushd "${BUILD_DIR}"/src/swig/lua > /dev/null || die
-
- exeinto "$(lua_get_cmod_dir)"
- doexe mlt.so
-
- popd > /dev/null || die
- }
- lua_foreach_impl lua_install
-
- dodoc "${S}"/src/swig/lua/play.lua
- fi
-
- if use python; then
- cd "${S}"/src/swig/python || die
- python_domodule mlt.py _mlt.so
- chmod +x "${D}$(python_get_sitedir)/_mlt.so" || die
- dodoc play.py
- python_optimize
- fi
-
- # not done: java perl php ruby tcl
-}
diff --git a/media-libs/mlt/mlt-6.26.1-r1.ebuild b/media-libs/mlt/mlt-6.26.1-r1.ebuild
index b04aa302aa90..b811f88b94bf 100644
--- a/media-libs/mlt/mlt-6.26.1-r1.ebuild
+++ b/media-libs/mlt/mlt-6.26.1-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/mltframework/${PN}/releases/download/v${PV}/${P}.tar
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
IUSE="compressed-lumas cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 debug
ffmpeg fftw frei0r gtk jack kernel_linux libsamplerate lua opencv opengl python
qt5 rtaudio rubberband sdl vdpau vidstab xine xml"
diff --git a/media-libs/munt-mt32emu/Manifest b/media-libs/munt-mt32emu/Manifest
index 10cd82c61749..5d822589e6f0 100644
--- a/media-libs/munt-mt32emu/Manifest
+++ b/media-libs/munt-mt32emu/Manifest
@@ -1,6 +1,6 @@
AUX munt-mt32emu-2.4.2-docs.patch 518 BLAKE2B 15ed5513d3ef11dbfdd9304a1295d82b3e54f223dcf448285392c9cdc24635c5823a8b5ad4b0954908627ba2ebd450e2f849a9cd725fd78b70e578d0a3d68c43 SHA512 2a1ba4731a13c2f54d5eccad6971b0544b75787df922d31ab2ae68471f078e0585d2c386f09461b89db38fa2bf57b2e402ad98c07f6d5773fbd93856d1c27d6d
-DIST libmt32emu_2_4_2.tar.gz 458962 BLAKE2B 43bd794fbb8e6483f4dd8384f375af3145f0297e974e7bc374764c40d90f0af971622004e052dff2e4235931d08e5ba3c154a45ad0f344c26811f92dc7a6d699 SHA512 6e567260bce4a7ba7f4696d08fde78a05402d8b3087d7720bf86cdbe8c6c392036ce4a5c0ec5951c547d2a98218145fa155d4730404e98ad2dcc573d3cca8da4
DIST libmt32emu_2_5_0.tar.gz 526300 BLAKE2B a458e402a094e0ea6a42a408f0422c9d12a23126d5c6e5c2b69a15b5264463a436c02a963aaf2c30e3198df1dfb01845b279bc0b4e5f5680b372e98a706c866e SHA512 e86733bb26714a2a5f54a1b443db1e6f320bc3373dde6bbbe6662ecfb5b36c8ba0811919f2ddd54a11f264551add76e7032cd51f5803c502bfd4b1020fafb86b
-EBUILD munt-mt32emu-2.4.2.ebuild 588 BLAKE2B 92e1eba74b079a4e5f4d22d561a5db31bb42e959d81293c7b194c3968e79f16983430a207036b5e35e75128327398eddf12455d47506529e4ac144a347b888d9 SHA512 fa1d01b48107ae52a913d2da2f587c2161bea7c28d311dfee9ab10045532b4e84170c74204570cf0426987e3659f662c38e045fe2644ea2330b63fc4beab3f57
+DIST libmt32emu_2_5_1.tar.gz 526351 BLAKE2B 34af97107f54e22513e31cd36d35c155acb2f83cfc5dd670ace9d888a3f5bb5a9af1b5424379b3904253073f2b7fe736099c08b17bd7cfc24406d118b81a9b6c SHA512 8775f095c6a759db6d62b5f0693b64b13408806549349760f703553f6eae5e0face7b84577cf2511f25da9f87eb2bd14d4df6153fb53ff5109510ff1876f1978
EBUILD munt-mt32emu-2.5.0.ebuild 595 BLAKE2B 0cd8c1168845910ecdcc3a7bc60753ef5dd5efb152ddbe0ff0e602f2c17ca52f9e2a32415f8d5851a58f4dd12dba1f179dc1d524743af344a6b6b84b7ad393d3 SHA512 27fb007e9682f3657a2d03e60189e7a2c515ddf091e3c7de2e616e71e03fed47c61724b34617c6750cd55e1b679ddebe77adbcb0df438fc65142f9ffaf795dc0
+EBUILD munt-mt32emu-2.5.1.ebuild 595 BLAKE2B 0cd8c1168845910ecdcc3a7bc60753ef5dd5efb152ddbe0ff0e602f2c17ca52f9e2a32415f8d5851a58f4dd12dba1f179dc1d524743af344a6b6b84b7ad393d3 SHA512 27fb007e9682f3657a2d03e60189e7a2c515ddf091e3c7de2e616e71e03fed47c61724b34617c6750cd55e1b679ddebe77adbcb0df438fc65142f9ffaf795dc0
MISC metadata.xml 620 BLAKE2B be9835ba92d5c8d4cf03c2a716886e422e2539ae773a8e281f4e804192caae29c185e8bac79a5b3a0ca9f7e639f9c5aa099c1ee8f496e1a508b096d4216bc1a9 SHA512 80cde499938128dc44148fdce298a26a49a8cd2660508cd5c6b0e5a9ed8c07eb9d067561d96f8fa94798edff7aa439d9d9269b9ee19a2f83759f574e08e192b3
diff --git a/media-libs/munt-mt32emu/munt-mt32emu-2.4.2.ebuild b/media-libs/munt-mt32emu/munt-mt32emu-2.5.1.ebuild
index 93254801331a..f1a27e25b8c9 100644
--- a/media-libs/munt-mt32emu/munt-mt32emu-2.4.2.ebuild
+++ b/media-libs/munt-mt32emu/munt-mt32emu-2.5.1.ebuild
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86"
S="${WORKDIR}/munt-${MY_P}/mt32emu"
PATCHES=(
- "${FILESDIR}"/${P}-docs.patch
+ "${FILESDIR}"/${PN}-2.4.2-docs.patch
)
src_configure() {
diff --git a/media-libs/oidn/Manifest b/media-libs/oidn/Manifest
new file mode 100644
index 000000000000..eeb37748ee7d
--- /dev/null
+++ b/media-libs/oidn/Manifest
@@ -0,0 +1,3 @@
+DIST oidn-1.3.0.tar.gz 36763571 BLAKE2B 395d7aafd87babf7d2414ed940dd85adf4a488df2138e0e63cc82ac06088dd969879de73d79bead4b35bba0045081ee637b72f2a98770dbfc928ffe7c25da78a SHA512 19de3cf11b9d436ee6f33ff020187a4cdc05da5f43c47509f715ca99e4276bfb64425d0a48f3a6f0569c8c6701b46a7e35378f371fdbacc0b6d488e113ffe17c
+EBUILD oidn-1.3.0.ebuild 806 BLAKE2B ebc2a40fc86bd432593cf1ab6e28b6d4584b00b87a14dec3a2c2e132800d75acae8532869328f4193d9a4fcf294875d94fbb8099ea84dbf52390114db4a59548 SHA512 a5922175efeb4c0c187ffaee4c78ea924cc4ae57cb503bccc62433369510d5ae3099dcdd4ce10dbadbe3323927cccc43df9b062a19777119bb28dbd517f8ca75
+MISC metadata.xml 753 BLAKE2B f1cc053407f788b1e08043ad1e652658d946423a749811d007d1256bedb7a462ece80444967881d5951d7fd343f33de7ca5d23f7c1ee69f1c5ad9ec8e8cc174f SHA512 311f6dfa3d7815e03ff72dbe76d9be6de3247f7de5652fb9b03c1c10ac75a8c30c76f20c9e8e34d5b478fe1fcc287511773d1104b5c4c268b4778ad331cb8123
diff --git a/media-libs/oidn/metadata.xml b/media-libs/oidn/metadata.xml
new file mode 100644
index 000000000000..1787e6d6af0d
--- /dev/null
+++ b/media-libs/oidn/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+ <maintainer type="person" proxied="yes">
+ <email>darkdefende@gmail.com</email>
+ <name>Sebastian Parborg</name>
+ </maintainer>
+ <maintainer type="project" proxied="proxy">
+ <email>proxy-maint@gentoo.org</email>
+ <name>Proxy Maintainers</name>
+ </maintainer>
+ <longdescription>
+ Intel Open Image Denoise is an open source library of high-performance,
+ high-quality denoising filters for images rendered with ray tracing. Intel
+ Open Image Denoise is part of the Intel® oneAPI Rendering Toolkit and is
+ </longdescription>
+ <upstream>
+ <remote-id type="github">OpenImageDenoise/oidn</remote-id>
+ </upstream>
+</pkgmetadata>
diff --git a/media-libs/oidn/oidn-1.3.0.ebuild b/media-libs/oidn/oidn-1.3.0.ebuild
new file mode 100644
index 000000000000..7e79c737d50f
--- /dev/null
+++ b/media-libs/oidn/oidn-1.3.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{6,7,8,9} )
+
+inherit cmake python-single-r1 eutils
+
+DESCRIPTION="Intel(R) Open Image Denoise library"
+HOMEPAGE="http://www.openimagedenoise.org/"
+
+if [[ ${PV} = *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/OpenImageDenoise/oidn.git"
+ EGIT_BRANCH="master"
+else
+ SRC_URI="https://github.com/OpenImageDenoise/${PN}/releases/download/v${PV}/${P}.src.tar.gz -> ${P}.tar.gz"
+ KEYWORDS="~amd64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+ ${PYTHON_DEPS}
+ dev-cpp/tbb
+ dev-lang/ispc"
+DEPEND="
+ ${RDEPEND}
+ dev-util/cmake"
+
+CMAKE_BUILD_TYPE=Release
+
+pkg_setup() {
+ python-single-r1_pkg_setup
+}
diff --git a/media-libs/opencolorio/Manifest b/media-libs/opencolorio/Manifest
index 0df101f7a00e..2f110b0a32b7 100644
--- a/media-libs/opencolorio/Manifest
+++ b/media-libs/opencolorio/Manifest
@@ -2,9 +2,12 @@ AUX opencolorio-1.1.0-remove-Werror.patch 473 BLAKE2B add95a92f243df8abe26f51dbd
AUX opencolorio-1.1.0-remove-building-of-bundled-programs.patch 6108 BLAKE2B dfd13c22cdcf23e7af75b0c92dd1b85f86e9046c76eadb22b0c1b2bad06f1937bc0d2220a4e2c9a85c0b1b5e6d356b9257fd149ba503944d1bd1356b3d0d51bf SHA512 e14370a15e3e6fc5e3dc70fa52d4e11cf7ac35c2dbc8635e94c52cb02a47f10936e57b1b713f8ee2ca8481ed467e2e6835bf392468bd82d1236a50289df6584e
AUX opencolorio-1.1.0-use-GNUInstallDirs-and-fix-cmake-install-location.patch 4002 BLAKE2B 8cadf37f7e4ccc2f14268ef71c5765fa43493f6c93ce651d1d2a7a2d5859238ba77802907ee84b0d5efcd6bd75f4ccd13d585f7822a4c8d285be586207e58752 SHA512 37f852d4f0620dd799a7aa09f0c651c72a311656c6ecb72429a440563ca936852a1227a92dca01afd97632f401babf875796f222a82362727ff7074bbe251ac5
AUX opencolorio-1.1.0-yaml-cpp-0.6.patch 2315 BLAKE2B eaaa69e7bd76a1c40ad823eb1be9cec93d69c0b024521e31d17aa6f5b2c1e29607cf3d238cac1aba19cec3149450b1ab15d1236332ff807bdb872db62f00b3b7 SHA512 2436a404581b26db6416b013ce9de8302c20878d1c956f5ddb40c2d590c0df7a2a8c3108590330598441db51f4aae9b6d485af8b7034b22316fa42ccdc801fa5
+AUX opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch 1512 BLAKE2B edb19e9e7249bcbec38d459ce9cf95d1577058665b95a9588242128d698c4cce8ac4a5f3f87fa1c06326e0ca9b50a2593ae0d060e0cbb4f3dd696831e515cc36 SHA512 a69a9a1d9dece47d388a9b20c24a1a9b55b4d2e6781bb38dafe26ab742e117d568abf89b933c584b5713999713b67719215b4fc355cadaa4093727b1a81e6ef7
AUX opencolorio-1.1.1-fix-self-assign-clang.patch 493 BLAKE2B fbe85fc4385556deacd173ab44f5a5cbe32c2cd5b4541f1aaf20037840d5d8c7a61d5c314176cde7d0f08c80b6436b0b937c9fef10c3841948b6881601073df5 SHA512 8132a8352a36994550dd089a4858e11459fcbe0495bd07b6bc599a4b8bb7191da8ca6ae061cd1c04f52f586ac993e3656e8c03c6665f7160fa50b4a117f0cb22
AUX opencolorio-1.1.1-no-werror.patch 349 BLAKE2B 79788a964466a884754dbdead8e252ff2422a52b56f3da8b0f256a52c714120fd2538b16e476271766a6130b97ec5025859e1320ca0a90c3ef5502fb0005f630 SHA512 d80fc47d8c4a768100cae38edcbf6741583507119d8cd8e2b6620cdc727599e5a1c170380cc25c711279b59c3432782c30315c7ffacbb78fcd1536dc12e3481a
AUX opencolorio-1.1.1-yaml-cpp-boost-check.patch 1891 BLAKE2B 01331aeef0cde9cf4420f13dc1a2ec2bddf46e519e736a6fb653792074b412ab5d6cca364e4e4619b7b868891eee0786bc0c75df748eb8ac724410e61aa6c52a SHA512 4ddb466a56a27db82f5b83dbb96e42f6b6cf0749168459dd32e922345d6011f09961592f7d5611253cbad5d78952d52f1cdabfed011b4c376faafc0becc7422b
DIST opencolorio-1.1.1.tar.gz 13828483 BLAKE2B f5642f08db84f2b8da44d0dbf58313c78263496fc6f1f209b93fd303bbf9477033317b44eb8bb2b13a70afa19422f4fa312d52a3fa6598031a2aa50b33bbfccf SHA512 bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33
-EBUILD opencolorio-1.1.1.ebuild 2444 BLAKE2B 7903ebaa327e75a41b630a4d959b0227286bd8a861c50cf9a836bf9c9bc77bd874db079c2ee04ab70d8590f9f2e01222180c5832d19d9eb44757c79c8a8287b6 SHA512 e5d52b606b4a1b0c86c2bb8431b643ac186547ddaf8e57c9a6784453006f8a0006b1e0ba363dc306ea11c6deb6f9e8a834304770e1d39d436b490cd121b42366
+DIST opencolorio-2.0.0.tar.gz 9892414 BLAKE2B fdff2e144eadb444624f059f7582ea99d4e2dbd53cad5b89f92d19c7ca9dda2ff9ec4f8c8d00e6ac083da21134f9bc783b297c553a8e7d11936c936e5c41a2f3 SHA512 7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0
+EBUILD opencolorio-1.1.1.ebuild 2624 BLAKE2B 46b336fa43c481d6170d8c2f5d95607d9967a7a8190f759371f9941a7c360de5bcbdc933797e9b7176c4abe5011dbe8f28d9683c12d573e308427bc9ee851018 SHA512 c7c6818dd52502fdfc5ed8e4c472ad4734e0f3ff3f733320e531ba586fd253de1bca13ed15588ceb379c7bdd7cc0416758aac10249e2841b956545cdbb80f67e
+EBUILD opencolorio-2.0.0.ebuild 2773 BLAKE2B f1469f1917fa14f9cec3a9e5bb799a8c4a38b670a5fae43f9468fe7f97f0e49fdffd49f77958e0dee2d2b8367492fa61642b8177bc06290bd37e256cf72d49e4 SHA512 e527cc50a8d148ddb36ebb9d2e661e2be3c5b0558b7d8b8eaa4b2fc935a835954cffab1fb17f60a985b193818f3951d3e305398885ea329713fa7acfb3048650
MISC metadata.xml 459 BLAKE2B bc35128a9a20ab016e973d569c001276541d90d4a1872e6cf27877847d8b7e66c28439afcc220dc9bbf31aeae64a14e6f31b8a3683bc0fdee88d4b03781fc537 SHA512 2dda915dd0266e50dc8308eeef37e84287f9caa9d34c4027fe15793f788d1dc354e79e3f46514f15dfd89c40da40da0424af6fec22bce07b638add76ef61b5c9
diff --git a/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch b/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch
new file mode 100644
index 000000000000..0f0fb4e649d6
--- /dev/null
+++ b/media-libs/opencolorio/files/opencolorio-1.1.1-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch
@@ -0,0 +1,38 @@
+From 80c08e5bee5bd9fc37a6aeff4b7b7bb8edb3c831 Mon Sep 17 00:00:00 2001
+From: Bernd Waibel <waebbl-gentoo@posteo.net>
+Date: Sun, 6 Jun 2021 20:42:48 +0200
+Subject: [PATCH] [Gentoo specific]OCIOMacros.cmake: remove LIB_SUFFIX
+
+We don't use LIB_SUFFIX for python's site-packages dir, so remove it
+from the PYTHON_VARIANT_PATH to ensure, python modules are installed
+to the correct location.
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+---
+ share/cmake/OCIOMacros.cmake | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/share/cmake/OCIOMacros.cmake b/share/cmake/OCIOMacros.cmake
+index b9fb239..0ce9e62 100644
+--- a/share/cmake/OCIOMacros.cmake
++++ b/share/cmake/OCIOMacros.cmake
+@@ -241,14 +241,14 @@ MACRO(OCIOFindPython)
+ if(WIN32)
+ set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/${PYTHON_UCS}/site-packages")
+ else()
+- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
++ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/${PYTHON_UCS}/site-packages")
+ endif()
+ else()
+ # Ignore UCS value and install into lib/python2.6/site-packages dir
+ if(WIN32)
+ set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/site-packages")
+ else()
+- set(PYTHON_VARIANT_PATH "lib${LIB_SUFFIX}/python${PYTHON_VERSION}/site-packages")
++ set(PYTHON_VARIANT_PATH "lib/python${PYTHON_VERSION}/site-packages")
+ endif()
+ endif()
+
+--
+2.31.1
+
diff --git a/media-libs/opencolorio/opencolorio-1.1.1.ebuild b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
index a20bb6f44aef..8fb845a03b70 100644
--- a/media-libs/opencolorio/opencolorio-1.1.1.ebuild
+++ b/media-libs/opencolorio/opencolorio-1.1.1.ebuild
@@ -3,11 +3,11 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7,8,9} )
-inherit cmake flag-o-matic python-single-r1
+inherit cmake python-single-r1
-DESCRIPTION="A color management framework for visual effects and animation"
+DESCRIPTION="color management framework for visual effects and animation"
HOMEPAGE="https://opencolorio.org/"
SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/OpenColorIO-${PV}"
@@ -54,6 +54,7 @@ PATCHES=(
"${FILESDIR}/${PN}-1.1.1-yaml-cpp-boost-check.patch"
"${FILESDIR}/${P}-fix-self-assign-clang.patch"
"${FILESDIR}/${P}-no-werror.patch"
+ "${FILESDIR}/${P}-Gentoo-specific-OCIOMacros.cmake-remove-LIB_SUFFIX.patch"
)
pkg_setup() {
@@ -90,6 +91,13 @@ src_configure() {
-DOCIO_BUILD_TESTS=$(usex test)
)
+ if use python; then
+ mycmakeargs+=(
+ -DPYTHON=${PYTHON}
+ -DPYTHON_LIBRARY=$(python_get_library_path)
+ )
+ fi
+
use doc && mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON ) # broken
cmake_src_configure
}
diff --git a/media-libs/opencolorio/opencolorio-2.0.0.ebuild b/media-libs/opencolorio/opencolorio-2.0.0.ebuild
new file mode 100644
index 000000000000..b5898ec2ed44
--- /dev/null
+++ b/media-libs/opencolorio/opencolorio-2.0.0.ebuild
@@ -0,0 +1,100 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{7..9} )
+
+inherit cmake flag-o-matic python-single-r1
+
+DESCRIPTION="A color management framework for visual effects and animation"
+HOMEPAGE="https://opencolorio.org/"
+
+if [[ ${PV} = *9999 ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/AcademySoftwareFoundation/OpenColorIO.git"
+else
+ SRC_URI="https://github.com/imageworks/OpenColorIO/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+ S="${WORKDIR}/OpenColorIO-${PV}"
+ KEYWORDS="~amd64"
+fi
+
+LICENSE="BSD"
+SLOT="0"
+IUSE="cpu_flags_x86_sse2 doc opengl python static-libs test"
+REQUIRED_USE="
+ doc? ( python )
+ python? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="
+ dev-cpp/pystring
+ dev-python/pybind11
+ media-libs/ilmbase
+ >=dev-cpp/yaml-cpp-0.5
+ dev-libs/tinyxml
+ opengl? (
+ media-libs/lcms:2
+ >=media-libs/openimageio-2.2.13.0
+ media-libs/glew:=
+ media-libs/freeglut
+ virtual/opengl
+ )
+ python? ( ${PYTHON_DEPS} )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ >=dev-util/cmake-3.16.2-r1
+ virtual/pkgconfig
+ doc? (
+ $(python_gen_cond_dep '
+ dev-python/sphinx[${PYTHON_USEDEP}]
+ dev-python/testresources[${PYTHON_USEDEP}]
+ ')
+ )
+"
+
+# Restricting tests, bugs #439790 and #447908
+RESTRICT="mirror test"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+pkg_setup() {
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ sed -i -e "s|LIBRARY DESTINATION lib|LIBRARY DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+ sed -i -e "s|ARCHIVE DESTINATION lib|ARCHIVE DESTINATION $(get_libdir)|g" {,src/bindings/python/,src/OpenColorIO/,src/libutils/oiiohelpers/,src/libutils/oglapphelpers/}CMakeLists.txt || die
+}
+
+src_configure() {
+ # Missing features:
+ # - Truelight and Nuke are not in portage for now, so their support are disabled
+ # - Java bindings was not tested, so disabled
+ # Notes:
+ # - OpenImageIO is required for building ociodisplay and ocioconvert (USE opengl)
+ # - OpenGL, GLUT and GLEW is required for building ociodisplay (USE opengl)
+ local mycmakeargs=(
+ -DOCIO_BUILD_NUKE=OFF
+ -DBUILD_SHARED_LIBS=ON
+ -DOCIO_BUILD_STATIC=$(usex static-libs)
+ -DOCIO_BUILD_DOCS=$(usex doc)
+ -DOCIO_BUILD_APPS=$(usex opengl)
+ -DOCIO_BUILD_PYTHON=$(usex python)
+ -DOCIO_BUILD_JAVA=OFF
+ -DOCIO_USE_SSE=$(usex cpu_flags_x86_sse2)
+ -DOCIO_BUILD_TESTS=$(usex test)
+ -DOCIO_BUILD_GPU_TESTS=$(usex test)
+ -DOCIO_BUILD_FROZEN_DOCS=$(usex doc)
+ -DOCIO_INSTALL_EXT_PACKAGES=NONE
+ )
+
+ # We need this to work around asserts that can trigger even in proper use cases.
+ # See https://github.com/AcademySoftwareFoundation/OpenColorIO/issues/1235
+ append-flags -DNDEBUG
+
+ cmake_src_configure
+}
diff --git a/media-libs/opencv/Manifest b/media-libs/opencv/Manifest
index 10c27070d181..f2968976dff1 100644
--- a/media-libs/opencv/Manifest
+++ b/media-libs/opencv/Manifest
@@ -1,14 +1,10 @@
-AUX opencv-3.0.0-gles.patch 481 BLAKE2B 3eecd8c754abd9fdbfc2878b8b5a8b5ac3c6410342eb0756162ac901fe0903f7e1236bf2cc6e2ec5c7eeb638037f0dfad2b5aa9ebc905c485c4084936daed24e SHA512 37cac226bc39b91a87e4891e1d58169a0c2723240215670ebaecbfaf9b066b571296041fc5140aff7274cc44ca132b6f1b3bd4cf6d6dd23b950cac6eca548ad9
AUX opencv-3.4.0-disable-download.patch 1050 BLAKE2B 6f39f61588d9231cc8d877624538a49654ec8cf63091f8d0251cd01cc14684f2f5264c295a149c4a5754a9336e1ad4d1760cc26471fd85a6f571404f7c8d540d SHA512 95f2043c286a7de33fb4718fc1e2ded1fd943b20a5c4cc0c3d7af84fc317e53e3aa6358a33e4781195f8a80904d6bc615171142cde5d30a83d16045d36f85826
AUX opencv-3.4.1-cuda-add-relaxed-constexpr.patch 707 BLAKE2B 743a9c259c59fc4e3017539faef0723e0a80fb9c4bbde94811f32b3e6ae271b3db39fd35487d75078cfbe9e596604c4e37fb5c6c18619ed524c52683219dd8af SHA512 b37ce78495a3bbc439f203d9db81d9bff3e7f980c01ef5187dee537dd9c1025c5163ec3760b48d91a099a2fafb60526c9fe83f7183fc605fb3cc0f5c7a65f6bf
AUX opencv-4.1.2-opencl-license.patch 519 BLAKE2B 6dcdf809c3c75a39d0e44f02e157a0c0ee074fd15144565ed51ade7e7849cb313c084100f499cc1240424f4647a2ff73c8d5e61cbdf6d0499846db61b8a30729 SHA512 2874a5140ef5028eb6c64f36325904000edd722560cf876fc49d63b040633bcfea01cae27c156b18191564805cafd2986f26eea322b1376af4f2982d66ed7653
-AUX opencv-4.1.2-pkg-config-file.patch 345 BLAKE2B ba3968a5dbdcc981cc513055ca99b8726ba2fe993cb8c128d574688a748dbd6fc287089bc0c04af89f6b9b62b37cae9663a81c329b6a2dab4919470450b9f6c7 SHA512 0fa66ca24c0fa72dc9e13c0c40592cf5ca5aa5856d1747613f9c4528f0b00f05dd224662c022563db994f7e43879b97d1ba1f0afa2703c30e4a3efc520dc332d
AUX opencv-4.4.0-disable-native-cpuflag-detect.patch 1218 BLAKE2B 06569f6b7d33eccb11cae74624a2cc7d7e1eb788145813509220dc8436d2380892392be8c4af03fec845f3eade74b6277985cf80e38785317b15f17890bcaa4c SHA512 3be60f7ee28e3b001ef0c791e3ce1c849ff6fa9fdb70731716668b2698eed9abb24ee3aead1dbc857ed68fc46a645c70a1e3831e8a3e5a5b1791aa06bd2f9ee1
AUX opencv-4.5.0-link-with-cblas-for-lapack.patch 726 BLAKE2B adbffd961c88229bf810e13fe20705352ff506a653c1d55bb0687c03d8daf9e05aed0f2ba9cd6e306c625837d6ddf64eeb99dc6cbf2b15fae833f4a7eea6aad0 SHA512 4c3108e304721c2cd78eb82f5d7bccc18831db5f47bc628a98ae6a37da389deef30e7e9b6dc5644e3bc0e0fafdd907dc37822a58a25555999698527d2ac364b0
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-4.1.2.tar.gz 87468598 BLAKE2B 9e0fbd8499f783cd1a2b5ffddf557aef424b0a446f71f826522ffd4526d04742e0c408b99810fe6b39753d40c475922d2e273732fdc0a0b4ee0bc56052a7a26c SHA512 d18d2cc35dc1c95c8870d35feb14459db27ebf6d09ff89a185918b1faff1b36dedacc18f268a6483570c404aca19b83ba627ce7af2265af7195a029cb766c09f
-DIST opencv-4.1.2_contrib.tar.gz 60881937 BLAKE2B c461aaa62306b226bde9211e2d611dcf705510e32c8598458737eb09c510cfdb49c33e11f1a7c591090d8243590e915b779fdb55955550fe44dab7545e4cc308 SHA512 1e14f94f9228c5d6a598493eed265aab1d8a740d5bfa00639afb05287732220eb71f88bb374de47dcd440f4376486f9db0e8b338e90e5dc4f6af8d355340b622
DIST opencv-4.4.0_extdep.tar.gz 65334871 BLAKE2B 89fa0083da428e986bb4287295bdbff626d0f84866377413649c1d7ca77338288141f22d2a3c0b64d6d0fc1db98f918c8b33a665274cee4c4aefb44359e4333d SHA512 7b758099ce4abef151051e3e9e1e45b73e4054669d3aa53051e4d4c5f43d9373c9bda5ecbce51f6b024562cb566bd1117505af29ab5f3c36a493f185111a3b4e
DIST opencv-4.5.0.tar.gz 90116240 BLAKE2B bcd6ccc4ff0cb1b66923c17c9d9e4ced711527b5d92abd2a5330f791fb07ff93dafa7a3f3095e6d96cb6cea877ac170bb2533f563fa843f284501019263daff3 SHA512 c34100f3f3fe45f2115975350d23288a3badb32864ba0cbd32512387416d1cf10d16d3ef5f3d089d6a1c2be587d788d33997513fc015dbf7d774a622f2d3811f
DIST opencv-4.5.0_contrib.tar.gz 60115063 BLAKE2B 4068905c9f5f308f30f15ad383ae459cbb421d1871344c3548a6c11647ac9da7af8c46798e860bdd1fcbacccda0fb03f6c1cf07b458ddfa5a0c311511627af52 SHA512 b2ae72e920c78472fd677281b8dd6f25872399d8ade97b0d3b0fc50bbabea8c00ea849d87bfb311ac148cef663481d0c89c0f6875578c052c1cc7ddcd70e6e17
@@ -17,8 +13,7 @@ DIST opencv-4.5.1_contrib.tar.gz 60602431 BLAKE2B 629e820e74147f442f8264c6102288
DIST opencv-4.5.2.tar.gz 88925795 BLAKE2B 625d3e1d98d4438ebfa165e595fc661658ae1f218d3c50c0b8dfedf936019093c1e61ead86b19c643205f0d77e40c69ea15c3d95454129a23a2c4e17885b65f3 SHA512 07788ec49801bdab963a057871e81fc2b081149c75764810197766d987e54db0d6fd142d2397bbbacefcea6a8be100235ea886ee7e5d5c07ed1156e76249dfec
DIST opencv-4.5.2_contrib.tar.gz 60800680 BLAKE2B d96b3c440090d3ab26f99a3822d1d85581e370dc0fde7cf3a0ff89e79cd598942be7d9bc9f892510f2d66474ceb59c645483a94131ccbbe09f1cf4eeaaa44879 SHA512 72ce91dfefc1c3e12cc8e965d90392cfed6c236daafb512aafc14cdad83242bfa0fc1adea308cd07a5483e010633e2996c3b239b2ce12cea47e6e21c36ed398b
DIST vgg_boostdesc-3.2.0.tar.gz 1867770 BLAKE2B 1fa5b58e73b6fa56ecf8d19af22298f729942ee1369082e173445d09d3de767bf844bad3d2b462efc1199c392f37c88ba49a9996ba8bfd84b4abeba7de94db63 SHA512 4a046aedd639c8eb4b295b0f499e756deb66210ca083f0124c75531e540663367cb58f6d175f66c4713324177036cd89a8869bdab2de8d1736dafc7f00ef9f44
-EBUILD opencv-4.1.2-r3.ebuild 18312 BLAKE2B 39fb4c39c4635128d31dcd5954136316eddbeb442c7331818a12d8cbe1615df0f0c2413be84ae32eb4e24b07a87fcfc7664c490b3b70049ae26fdc63d77bb268 SHA512 7d33490fefc27f8a565e714f686635902a4dcb2b99072da88c58e1ebb9d39e76b328345e035d2171b5a21ceeed7e3fafe81911273a0b090aaa7a3a6020d1bea6
EBUILD opencv-4.5.0.ebuild 20509 BLAKE2B f0c9cdab62f516faf0b992bc7feb508c2889f552bbc520cc93f564782f54583ad6816ef9db9b1ad812dd84f75dd99a3d8fe5412b27fb3b659f6aa141abc4c4a3 SHA512 78ca91218694de32ba693650225e0fd84ba0ebe9451be348dde52bac27972d87449b49633f318333dda838e31a5d043351493531e88ff88945a41460f50011a5
-EBUILD opencv-4.5.1.ebuild 20597 BLAKE2B 16df762ec0679f647f727b284038fdc8bbb45979f5b6c6711de9c05f9fd33b2b4d7a2c386c53c38ae3c5a35bda1028ad701eb982bdc58b15f29dc91aa9bc280c SHA512 bba66694474b3be717af472567d26e9d1c164315dd360f24ebff34e95aac9ad7dc10463776154c82d7d50c44795a23f7fef9a39e4aa9b88107e33ab0bb1802ec
+EBUILD opencv-4.5.1.ebuild 20596 BLAKE2B d371a3b93a3efd2db319aa547f1384b77d43483f1538d981ec091f2699a4798e54035a7ee89c9462af857d8109f04da9a5d5fa0903b2a7d103f78ecfd746994e SHA512 deb18e47fb7c9a003701aecc2343b8735fc0d437e415b77a04b40231c4270ece20beed4e5e49f2698a41fae086eeb53a0bf897082e64f858bddc214b40201a17
EBUILD opencv-4.5.2.ebuild 20601 BLAKE2B f065985f61e9519b12a9900fc115358f1769dd8dffbb57dd3a3d1aecaf4352df18d647d0d4525266e9ac75dc838d6a45bc7f879f024d2bbdb45fbefa86033604 SHA512 8af05e9ea0ed6795f9259eb1d5b83d2bb0462ee3e7c608d4aea207058ec6c1e5ef15689dd851ad0ac33f1c77dbbf77a0d3962d10f73e92a77b10579a3f925985
MISC metadata.xml 3185 BLAKE2B 107d18573676738a6ca8bec19250a4fdc2f839fb183757c19d042effe46825326346cf9090c86bc4e382bfefd05c81735886ad15b91539b1fca7896deb22a8de SHA512 51cf777192755265ed3d5fb4e7a83ba3c5e36c6e40165b770cba1a6b91183bd9e59360cd0130a2e159534c6fed90d8270787c5d204a6066e84d7a1b93e3e4f14
diff --git a/media-libs/opencv/files/opencv-3.0.0-gles.patch b/media-libs/opencv/files/opencv-3.0.0-gles.patch
deleted file mode 100644
index a2629d928e82..000000000000
--- a/media-libs/opencv/files/opencv-3.0.0-gles.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Index: opencv-2.4.11/modules/highgui/src/window_QT.cpp
-===================================================================
---- opencv-2.4.11.orig/modules/highgui/src/window_QT.cpp
-+++ opencv-2.4.11/modules/highgui/src/window_QT.cpp
-@@ -3118,7 +3118,9 @@ void OpenGlViewPort::updateGl()
-
- void OpenGlViewPort::initializeGL()
- {
-+#ifdef GL_PERSPECTIVE_CORRECTION_HINT
- glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
-+#endif
- }
-
- void OpenGlViewPort::resizeGL(int w, int h)
diff --git a/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch b/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
deleted file mode 100644
index 496216186af3..000000000000
--- a/media-libs/opencv/files/opencv-4.1.2-pkg-config-file.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/cmake/templates/opencv-XXX.pc.in 2019-12-04 21:28:09.686525699 +0100
-+++ b/cmake/templates/opencv-XXX.pc.in 2019-12-04 21:29:21.319265154 +0100
-@@ -3,7 +3,7 @@
- prefix=@prefix@
- exec_prefix=@exec_prefix@
- libdir=@libdir@
--includedir_old=@includedir@/opencv
-+includedir_old=@includedir@/opencv2
- includedir_new=@includedir@
-
- Name: OpenCV
diff --git a/media-libs/opencv/opencv-4.1.2-r3.ebuild b/media-libs/opencv/opencv-4.1.2-r3.ebuild
deleted file mode 100644
index de4bb53e8daf..000000000000
--- a/media-libs/opencv/opencv-4.1.2-r3.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_7 )
-
-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
- dnnsamples? ( 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
- contribdnn? ( https://dev.gentoo.org/~amynka/snap/${PN}-3.4.0-face_landmark_model.tar.gz )
- contribxfeatures2d? ( https://dev.gentoo.org/~amynka/snap/vgg_boostdesc-3.2.0.tar.gz )
- )"
-
-LICENSE="BSD"
-SLOT="0/4.1.2" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86 ~amd64-linux"
-IUSE="contrib contribcvv contribdnn contribhdf contribsfm contribxfeatures2d 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 dnnsamples -download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack opencl openexr opengl openmp opencvapps 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 ) )
- dnnsamples? ( examples )
- gflags? ( contrib )
- glog? ( contrib )
- contribcvv? ( contrib qt5 )
- contribdnn? ( contrib )
- contribhdf? ( contrib )
- contribsfm? ( contrib eigen gflags glog )
- contribxfeatures2d? ( contrib download )
- java? ( python )
- opengl? ( qt5 )
- python? ( ${PYTHON_REQUIRED_USE} )
- tesseract? ( contrib )
- ?? ( gtk3 qt5 )"
-
-# The following logic is intrinsic in the build system, but we do not enforce
-# it on the useflags since this just blocks emerging pointlessly:
-# 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= )
- contribhdf? ( sci-libs/hdf5:= )
- ffmpeg? ( 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}]
- )
- gtk3? (
- dev-libs/glib:2[${MULTILIB_USEDEP}]
- x11-libs/gtk+:3[${MULTILIB_USEDEP}]
- )
- ieee1394? (
- media-libs/libdc1394[${MULTILIB_USEDEP}]
- sys-libs/libraw1394[${MULTILIB_USEDEP}]
- )
- java? ( >=virtual/jre-1.6:* )
- jpeg? ( virtual/jpeg:0[${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}
- eigen? ( dev-cpp/eigen:3 )
- java? ( >=virtual/jdk-1.6 )
- vaapi? ( x11-libs/libva )"
-BDEPEND="
- java? ( >=virtual/jdk-1.6 )
- virtual/pkgconfig"
-
-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
- # [opencv4]
- /usr/include/opencv4/opencv2/core/cv_cpu_dispatch.h
- /usr/include/opencv4/opencv2/core/cvdef.h
- /usr/include/opencv4/opencv2/dnn.hpp
- /usr/include/opencv4/opencv2/core/cuda/transform.hpp
- /usr/include/opencv4/opencv2/core/opencl/runtime/opencl_core.hpp
- /usr/include/opencv4/opencv2/cvconfig.h
- /usr/include/opencv4/opencv2/core/utils/allocator_stats.impl.hpp
- /usr/include/opencv4/opencv2/video/tracking.hpp
- /usr/include/opencv4/opencv2/objdetect.hpp
-)
-
-PATCHES=(
- "${FILESDIR}"/${PN}-3.0.0-gles.patch
- "${FILESDIR}"/${PN}-3.4.0-disable-download.patch
- "${FILESDIR}"/${PN}-3.4.1-cuda-add-relaxed-constexpr.patch
- "${FILESDIR}"/${P}-pkg-config-file.patch
- "${FILESDIR}"/${P}-opencl-license.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 dnnsamples; 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
- if use contribxfeatures2d; 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=$(usex download)
- -DWITH_QUIRC=OFF # Do not have dependencies
- -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 gtk3)
- -DWITH_GTK_2_X=OFF # only want gtk3 nowadays
- -DWITH_IPP=OFF
- -DWITH_JASPER=OFF
- -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=$(usex opencvapps ON OFF)
- -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=OFF
- # -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
- -DOPENCV_GENERATE_PKGCONFIG=ON
- # 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
- #===================================================
- -DOPENCV_CPU_OPT_IMPLIES_IGNORE=ON
- -DCPU_BASELINE=$(printf "%s," "${cpu_flags[@]}")
- -DCPU_DISPATCH=
- -DBUILD_opencv_features2d=$(usex features2d ON OFF)
- )
-
- # ===================================================
- # OpenCV Contrib Modules
- # ===================================================
- if use contrib; then
- GLOBALCMAKEARGS+=(
- -DBUILD_opencv_dnn=$(usex contribdnn ON OFF)
- -DTINYDNN_ROOT="${WORKDIR}/tiny-dnn-${TINY_DNN_PV}"
- -DBUILD_opencv_dnns_easily_fooled=OFF
- -DBUILD_opencv_xfeatures2d=$(usex contribxfeatures2d ON OFF)
- -DBUILD_opencv_cvv=$(usex contribcvv ON OFF)
- -DBUILD_opencv_hdf=$(multilib_native_usex contribhdf ON OFF)
- -DBUILD_opencv_sfm=$(usex contribsfm 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
- -DBUILD_opencv_python2=OFF
- -DBUILD_opencv_python3=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 contribdnn; 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+=(
- # python_setup alters PATH and sets this as wrapper
- # to the correct interpreter we are building for
- -DPYTHON_DEFAULT_EXECUTABLE=python
- -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"
-
- python_optimize "${D}"/$(python_get_sitedir)
-}
-
-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-4.5.1.ebuild b/media-libs/opencv/opencv-4.5.1.ebuild
index 077c53780285..05513b4f1742 100644
--- a/media-libs/opencv/opencv-4.5.1.ebuild
+++ b/media-libs/opencv/opencv-4.5.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
LICENSE="Apache-2.0"
SLOT="0/${PV}" # subslot = libopencv* soname version
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc ~ppc64 x86"
IUSE="contrib contribcvv contribdnn contribfreetype contribhdf contribovis contribsfm contribxfeatures2d cuda debug dnnsamples download +eigen examples +features2d ffmpeg gdal gflags glog gphoto2 gstreamer gtk3 ieee1394 jpeg jpeg2k lapack lto opencl openexr opengl openmp opencvapps png +python qt5 tesseract testprograms threads tiff vaapi v4l vtk webp xine"
# The following lines are shamelessly stolen from ffmpeg-9999.ebuild with modifications
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index ee05a6e4f27a..3d8585a6cb72 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -1,6 +1,8 @@
AUX openexr-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch 1357 BLAKE2B f236a339d6b35878c9a63a8468e7be6652447646fe0f2567223b20087b2d64d144c95ad71ee218a4542f61bf9c7a65ea8f0e10b02f75d85ee2d3e6b4addc8052 SHA512 6c9c10ab74a24e7213c565eb357683949193b45d0475c529f8cc24dc73deb9392db36f80d38757eee54eded1c260049339f575f96217c733243c4c6a863d5857
DIST openexr-2.5.5.tar.gz 27536865 BLAKE2B d0c0b2fd39b2cfafb60b6d0de3960063ff62341cf22be519f874c0c83f05cb604c5d503bb8b88514c71c5a54a79afa80a7fd00c2df15ec2193f6b3cffdc117c6 SHA512 e511af26a8fe2175a641fd25d2dcc6ef807e00bee2aff06a4784125f916ffd47fe376fe0621d385b604180a239bbfee063f8ceee3f7b731fde3c38558e9fdcdf
+DIST openexr-2.5.6.tar.gz 27540385 BLAKE2B eea64c6ae4500de31673f3127da6ac98272e85a2c93e2aed96494cc24c397edbce508f0721387be5bbabc4dde596dccf61212709173b7cebd4212dbfbd1e4b65 SHA512 8d4582a5f2adcd5eb1486cabe033f9ecaa0292000bf7fa484a94e1d9ec908678a5a903fc6a1beba22bcd9c7f06ac51236834f448ea8aaf4462a338de886f0412
DIST openexr-3.0.1.tar.gz 25059445 BLAKE2B 76bce1ff830b5e32362bfaf91d39945add171c5c1f453968b2fa8ba41e0996064d3a104eb7759cea87477e96e8a52d548743c7d83f5c6131dd38aecdd47bd6dd SHA512 e450c55d150e4c0a8a9147f78fe1c73ea9134976444f8c77c832d0671d4c3796f96fee74d23f26cdb9383e658a33d6d57c989e9207d1edfc8556ad688ff25a5b
EBUILD openexr-2.5.5.ebuild 1691 BLAKE2B ddaa5c3bca30159e1c1349a8d3ec8b79e670c0739f98abe62dac2286b8207352361f15461ec06577a9c90ab566bc0081372d2fd6f305e6a91fe7083eece97b9a SHA512 840e4a1652df0f5968b015dfcb14ea35f6587338f8b22e3e4b78dc4358dd33108cf7edf01c1406163f8e9a11e3b7c4e7582855d1784c8c4adb1f7d85f8c28015
+EBUILD openexr-2.5.6.ebuild 1693 BLAKE2B a422c9edba74894aea74071a44c1bfd4208d28042bee923c6096260f7ea699d4b35a15f5409507b2c7b970b76fb427fb799c8c411db6b180650e5dd3148cde5b SHA512 a24a022533124096014a2126ee24d54aadd8d68cf66fd5f5c89624acd660ef943e2e684dac350fc6b9f59f3b768f2eec17a7a6cb8752b43fdf6318c53c1dcbc4
EBUILD openexr-3.0.1.ebuild 1913 BLAKE2B cc37bc00d13d64d5eb0787c165f051572b92ecb23798e6e753e5a723143ad4e93081b04877bbe2232b4480564b751b6be4b584d535bea5e303c703482fbe1684 SHA512 147d8abb4af8ba2f56ffc17632436e42621da0289fe0b0585299da55c16e7055d454e13db0da8011f25ccac878034e741d1f5b227013388a67d28b6ffa18c5a3
MISC metadata.xml 796 BLAKE2B dacf5230d89550bae31517f5babc9cf7ea99ef94ab223e4acf1abb39d1042d146e71352f4b55a6bebff88689f32efc3d098f5d7ac04a207211f784a9b5e2ed30 SHA512 3deb6a5e83a03fabbbfce2845529a7c2f1aacdc6038ffb4a35ed16bd3f93521ea490ff0fc1576291b5e1d84d19dc4d4123aecf228e270e6b55b01c09ea2a6b56
diff --git a/media-libs/openexr/openexr-2.5.6.ebuild b/media-libs/openexr/openexr-2.5.6.ebuild
new file mode 100644
index 000000000000..45229f8154f5
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.6.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CMAKE_ECLASS=cmake
+inherit cmake-multilib flag-o-matic toolchain-funcs
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/OpenEXR"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+ ~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
+ sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( PATENTS README.md )
+
+src_prepare() {
+ # Fix path for testsuite
+ sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+ if use abi_x86_32 && use test; then
+ eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
+ fi
+
+ multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+ local mycmakeargs=(
+ -DBUILD_TESTING=$(usex test)
+ -DINSTALL_OPENEXR_DOCS=$(usex doc)
+ -DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+ -DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+ -DOPENEXR_BUILD_UTILS=$(usex utils)
+ -DOPENEXR_INSTALL_PKG_CONFIG=ON
+ -DOPENEXR_USE_CLANG_TIDY=OFF # don't look for clang-tidy
+ )
+
+ cmake_src_configure
+}
+
+multilib_src_install_all() {
+ if use doc; then
+ DOCS+=( doc/*.pdf )
+ fi
+ einstalldocs
+
+ use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/media-libs/openimageio/Manifest b/media-libs/openimageio/Manifest
index 0a87a2ef2b62..ff7ab53df5ec 100644
--- a/media-libs/openimageio/Manifest
+++ b/media-libs/openimageio/Manifest
@@ -1,13 +1,9 @@
-DIST openimageio-2.2.10.0.tar.gz 29215970 BLAKE2B e35e1bf19dce23c9b1067ace21c2878c58ca005eef5fdc4a0c60825ba5c29dd37a543551e9427fda99d859d3cf3cab9cb8c459b47e2b8935e8b7730a09e19de1 SHA512 79f412bd3f7ad4cf6cb57d99293c02fa71478ece102478a6b93a8c5b8c4c56d1313595d24753f9ae1714039ac6aa1be4ae37461233203bac217fe6c0667fbf3b
-DIST openimageio-2.2.10.1.tar.gz 29215445 BLAKE2B ac45bcbd89f023aac7ae063ebbcf9d26375af2d370d18569cd0b4571640d446ceb639b871c107c6727aa92ad05ebea662bc8c34231bfd99a1c18215920ad3089 SHA512 6178a0c7acd870e22bffc8749282f0d1bd7475602bc63dd022b859a9ba3862b9925685a2765ea3604ba9c1ec4c0d8c3961a789862f82077ff261a7ae4e1d166a
-DIST openimageio-2.2.11.1.tar.gz 29250377 BLAKE2B 90184bbc8db97b4486f4af076ad6c37f235b2b8cfd463ee6290fe73fb267771325c6cc3db40b9bcedb56926b79f61587f11766c9eca00c6feccfb2526a4477b3 SHA512 73809587dd405e64e593d6223ef37d4b94c4f1e1d9682fd1bf09e8e4ee8bc9928ed500b7dcc03036e138e45e65ea1f43c11c53d1cb6436a34eb8d15b2415ada5
DIST openimageio-2.2.12.0.tar.gz 29251419 BLAKE2B 7ab1b611f9354d4a8d3fc33bc30acfbc193d6fda012945af2e3b41343419755a211df1a051fc5e6f00149a78db0896ec0f8c59d559e06294dc2626401e66df87 SHA512 14c7ce8b5f71622ca5ffbcae36044a02ae760f6f0173d5efb90472c40970f1bbf355059ca06a47aba895e365892fdf91aa2fdb0f38a7ba04d148ed33f51db80d
-DIST openimageio-2.2.8.0.tar.gz 29201949 BLAKE2B b77e42dddfaa6a8dff174b89e43c7de158efcae0e851037a97f1f46127f5cda458bdc7b64172c1fe64236d5ace351c9a432c2e857467c7f83b59dc9f6670fbeb SHA512 7bb94832734b4354d961003ec7f85fa30e4a69d7f825c5668a0230d857f8c137dd522730ec5089db012f0d843fc67368c731458a3d6de9ae41dabfb4cc30592e
-DIST openimageio-2.2.9.0.tar.gz 29216767 BLAKE2B 92c17de4687d3d7390602a02dedc5afc1258018cef98e671977fb706c3fe1e80c30416fff89ff1b9936f0f1426eab0136e130efb4a41d7378d3f1eb77eab193a SHA512 d03500c5a9f4f1417c5629098254d1bbf032a17228898e5f087e4a5d0988f806537d3ab538366e64c51172568c3688389ab29b641fdaaf7208bf939cb859e06d
-EBUILD openimageio-2.2.10.0.ebuild 3688 BLAKE2B d5a87f880c41031f38540db419869546471b0bed383a198c05df6af55c4b21b087f9756be98ac3095b6c0fa1b9ba9cd0658821ff0442c0f4894b6deaf4ccba43 SHA512 8161c32a21d0f5b1b288b02884ce80a2f1d95a4ebd7bd76cd7e087d4435df51b66653d57b7ee081b13425fbe3640c44e46eeadb901228c8d513a9e3c0fd62be0
-EBUILD openimageio-2.2.10.1.ebuild 3687 BLAKE2B 64cd8906e6e79cd53a0d2684ed345806aeee012a0183662ab8219b1869fe3c12ec7a26c2d2a3c3f616f443b368e634297a59c8ef7650de4f68c4fca90f78a08a SHA512 3c6e9072d34eefbfd3f575d48386babe65cc1b7a0700545ae6a8dafa1d195903c39209af98d2ae6537e6d85ec7850b3a34ba1874084f67db442843e66613492d
-EBUILD openimageio-2.2.11.1.ebuild 3691 BLAKE2B 7e640ab4c09cf10203da1e9bf05bbacdfde49d38f0f59210968c1514491d585ec45540215e7c0178bd4a737c007af1312f74aefc46d376079ebb82ea3301c1bf SHA512 c1c838fd9444071a9b9c083ca6c25d6c0e7b9cda6e7344b1d81463102386595fc2eabd91f3537ea57d778ee55cfccb3fe5a1d8c31519947276b9b170413fd3f9
-EBUILD openimageio-2.2.12.0.ebuild 3691 BLAKE2B 7e640ab4c09cf10203da1e9bf05bbacdfde49d38f0f59210968c1514491d585ec45540215e7c0178bd4a737c007af1312f74aefc46d376079ebb82ea3301c1bf SHA512 c1c838fd9444071a9b9c083ca6c25d6c0e7b9cda6e7344b1d81463102386595fc2eabd91f3537ea57d778ee55cfccb3fe5a1d8c31519947276b9b170413fd3f9
-EBUILD openimageio-2.2.8.0-r1.ebuild 3679 BLAKE2B 90500e5e8bd4c94ac24506b2049a1f875961834f1822aec9cda7067b425a6f2f55df02be32c8e6694a5986c11edd4789aa04bf0622dd66f7e5193706e2d0682f SHA512 6fc5f91ef2eef33934dd7a151383fc2fc165ee97fb77133308641031309bfb96871b2ef5a8b5cbc9baa563b21c3de834378d651ded46cecdda4d11d72eaa53a8
-EBUILD openimageio-2.2.9.0-r1.ebuild 3686 BLAKE2B 95bcd6666bba47874bb02eec536c1dd6d22b821cba96106916276fb9dbaad5ed592d78363bd44bf39e146cc9c753b0dc7b7a333fd0cfc5572404d3e3861b6c39 SHA512 ee932fd014b3ecc44e0cc208613b3e9e2ce9df9bc4b0fbd516232ff52ea94239da42fc057a42caee8c6e546a19b12c49a64c6286b96ca6b3407781b11462825e
+DIST openimageio-2.2.13.1.tar.gz 29265740 BLAKE2B 98403db440410d391ff150a988ac5cb970e0f8d30758c73200d54f07594b458d1f6a8bee58dc92bd254338da678fc4494555df94d8f865b09bd9c13bac7f8f6c SHA512 911e3671557df3c8bdbada00b83b7631750f5bf4dfc0568a4978c91d28a6e408c69dbe0e4e113b13702eab27176d3c84043d73778a0213eac0b2ac94d2e942d6
+DIST openimageio-2.2.14.0.tar.gz 29226972 BLAKE2B 29daaf4fb987b77dffdd8cb29c5f67a80c20c49cd5dc369e68a5588a61fae7119aeb22814886e68eb055f2a66e02e75afba25991f8edc14752ccacf6599d889f SHA512 063291c0bd742b79a7b6065a41856b84732af2e2e404265262aa9ba91d07209fb308ecf0403a139d7021b8062f9c3e1b92a725a7cad091af1bcf45499ae47a82
+DIST openimageio-2.2.15.0.tar.gz 29238071 BLAKE2B f74f779635b7ff068f87ab6231756cb22acb80185c717c556750d964025aa343f8b3a30b9e73acf6237328b8bdd3fcb6588321d37a3752a6f1d0dd1e3a976363 SHA512 7ade071ae8a78427fb51d75f81e6fcc2d9a3632f0854aea70b985794a53a386072fb171dc8179fa762de19067d402c7ab9f2ea1a44bd3196d3a201ea2cb9ec22
+EBUILD openimageio-2.2.12.0.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
+EBUILD openimageio-2.2.13.1.ebuild 3710 BLAKE2B 2076161c441805358fc03c4ed31a283a6851d59486c2cce1b4eed6a5f14171ce10f2e3c72916d00418d03488b7d38b6a777e5907a9414570428f597fb63be5a8 SHA512 d5a4a577c06d712ed7c6f55af24bdaa5be2bba5f9da838348f418da5c3d5958d5b36bffc5e33e72a02efa415d60e0f263c8e0db67f5b653e46d0ea1e8bdb0171
+EBUILD openimageio-2.2.14.0.ebuild 3712 BLAKE2B cf5acaa0f25cd75a85e3de9d33ffa72b393fc2a9fdbf2c673b43b9d882d92c9055285d10d1bfdfc354e7728514e23fbc85f2c415791faf50593ee3a7b03309c7 SHA512 38010387ab746b6345b84ca9207c6c79c896543222cb40569ba94340a81bc5cdcc50e942ba5a256d7c531424cda86803632ce9b046470b6f97ef7c2db4524e83
+EBUILD openimageio-2.2.15.0.ebuild 3712 BLAKE2B cf5acaa0f25cd75a85e3de9d33ffa72b393fc2a9fdbf2c673b43b9d882d92c9055285d10d1bfdfc354e7728514e23fbc85f2c415791faf50593ee3a7b03309c7 SHA512 38010387ab746b6345b84ca9207c6c79c896543222cb40569ba94340a81bc5cdcc50e942ba5a256d7c531424cda86803632ce9b046470b6f97ef7c2db4524e83
MISC metadata.xml 936 BLAKE2B 0ba7d5d9c77d481d876a273f479cc33f7b4233be522a6722aa4762ff682166eebf93645a5c042591c7495e4954bc0c61fa89083fd2b4ee76a5ccbdb5299dfcba SHA512 732d0ad35c7176710ac7a5362a4a6ac03c01d11d8df016654b13490e84b6d56801714158536abaccafccbc14b55234a78095e8a1d9550419bf0a67fe3d4cab5c
diff --git a/media-libs/openimageio/openimageio-2.2.10.1.ebuild b/media-libs/openimageio/openimageio-2.2.10.1.ebuild
deleted file mode 100644
index 820face3e394..000000000000
--- a/media-libs/openimageio/openimageio-2.2.10.1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-RDEPEND="
- >=dev-libs/boost-1.62:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DOIIO_BUILD_TESTS=OFF
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-libs/openimageio/openimageio-2.2.12.0.ebuild b/media-libs/openimageio/openimageio-2.2.12.0.ebuild
index b6868ab8609f..278bed688e98 100644
--- a/media-libs/openimageio/openimageio-2.2.12.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.12.0.ebuild
@@ -117,6 +117,7 @@ src_configure() {
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
-DSTOP_ON_WARNING=OFF
+ -DUSE_CCACHE=OFF
-DUSE_DCMTK=$(usex dicom)
-DUSE_EXTERNAL_PUGIXML=ON
-DUSE_JPEGTURBO=ON
diff --git a/media-libs/openimageio/openimageio-2.2.11.1.ebuild b/media-libs/openimageio/openimageio-2.2.13.1.ebuild
index b6868ab8609f..278bed688e98 100644
--- a/media-libs/openimageio/openimageio-2.2.11.1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.13.1.ebuild
@@ -117,6 +117,7 @@ src_configure() {
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
-DSTOP_ON_WARNING=OFF
+ -DUSE_CCACHE=OFF
-DUSE_DCMTK=$(usex dicom)
-DUSE_EXTERNAL_PUGIXML=ON
-DUSE_JPEGTURBO=ON
diff --git a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.14.0.ebuild
index 11b549d06b27..a5b480aec5c5 100644
--- a/media-libs/openimageio/openimageio-2.2.9.0-r1.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.14.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
LICENSE="BSD"
SLOT="0/2.2"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
@@ -117,6 +117,7 @@ src_configure() {
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
-DSTOP_ON_WARNING=OFF
+ -DUSE_CCACHE=OFF
-DUSE_DCMTK=$(usex dicom)
-DUSE_EXTERNAL_PUGIXML=ON
-DUSE_JPEGTURBO=ON
diff --git a/media-libs/openimageio/openimageio-2.2.10.0.ebuild b/media-libs/openimageio/openimageio-2.2.15.0.ebuild
index ceb522b9b67a..a5b480aec5c5 100644
--- a/media-libs/openimageio/openimageio-2.2.10.0.ebuild
+++ b/media-libs/openimageio/openimageio-2.2.15.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/oiio-Release-${PV}"
LICENSE="BSD"
SLOT="0/2.2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
X86_CPU_FEATURES=(
aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
@@ -117,6 +117,7 @@ src_configure() {
-DBUILD_DOCS=$(usex doc)
-DINSTALL_DOCS=$(usex doc)
-DSTOP_ON_WARNING=OFF
+ -DUSE_CCACHE=OFF
-DUSE_DCMTK=$(usex dicom)
-DUSE_EXTERNAL_PUGIXML=ON
-DUSE_JPEGTURBO=ON
diff --git a/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild b/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
deleted file mode 100644
index 0ceba2dd92ec..000000000000
--- a/media-libs/openimageio/openimageio-2.2.8.0-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-FONT_PN=OpenImageIO
-PYTHON_COMPAT=( python3_{7..9} )
-inherit cmake font python-single-r1
-
-DESCRIPTION="A library for reading and writing images"
-HOMEPAGE="https://sites.google.com/site/openimageio/ https://github.com/OpenImageIO"
-SRC_URI="https://github.com/OpenImageIO/oiio/archive/Release-${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/oiio-Release-${PV}"
-
-LICENSE="BSD"
-SLOT="0/2.2"
-KEYWORDS="amd64 ~ppc64 x86"
-
-X86_CPU_FEATURES=(
- aes:aes sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
- avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
-)
-CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
-
-IUSE="dicom doc ffmpeg field3d gif jpeg2k opencv opengl openvdb ptex python qt5 raw +truetype ${CPU_FEATURES[@]%:*}"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-# test data in separate repo
-# second repo has no structure whatsoever
-RESTRICT="test"
-
-BDEPEND="
- doc? (
- app-doc/doxygen
- dev-texlive/texlive-bibtexextra
- dev-texlive/texlive-fontsextra
- dev-texlive/texlive-fontutils
- dev-texlive/texlive-latex
- dev-texlive/texlive-latexextra
- )
-"
-RDEPEND="
- >=dev-libs/boost-1.62:=
- dev-cpp/robin-map
- dev-libs/libfmt:=
- dev-libs/pugixml:=
- >=media-libs/ilmbase-2.2.0-r1:=
- >=media-libs/libheif-1.7.0:=
- media-libs/libpng:0=
- >=media-libs/libwebp-0.2.1:=
- media-libs/opencolorio:=
- >=media-libs/openexr-2.2.0-r2:=
- media-libs/tiff:0=
- sys-libs/zlib:=
- virtual/jpeg:0
- dicom? ( sci-libs/dcmtk )
- ffmpeg? ( media-video/ffmpeg:= )
- field3d? ( media-libs/Field3D:= )
- gif? ( media-libs/giflib:0= )
- jpeg2k? ( >=media-libs/openjpeg-2.0:2= )
- opencv? ( media-libs/opencv:= )
- opengl? (
- media-libs/glew:=
- virtual/glu
- virtual/opengl
- )
- openvdb? (
- dev-cpp/tbb:=
- media-gfx/openvdb:=
- )
- ptex? ( media-libs/ptex:= )
- python? (
- ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-libs/boost:=[python,${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pybind11[${PYTHON_USEDEP}]
- ')
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
- opengl? ( dev-qt/qtopengl:5 )
- )
- raw? ( media-libs/libraw:= )
- truetype? ( media-libs/freetype:2= )
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGES.md CREDITS.md README.md )
-
-pkg_setup() {
- use python && python-single-r1_pkg_setup
-}
-
-src_prepare() {
- cmake_src_prepare
- cmake_comment_add_subdirectory src/fonts
-}
-
-src_configure() {
- # Build with SIMD support
- local cpufeature
- local mysimd=()
- for cpufeature in "${CPU_FEATURES[@]}"; do
- use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
- done
-
- # If no CPU SIMDs were used, completely disable them
- [[ -z ${mysimd} ]] && mysimd=("0")
-
- local mycmakeargs=(
- -DVERBOSE=ON
- -DOIIO_BUILD_TESTS=OFF
- -DINSTALL_FONTS=OFF
- -DBUILD_DOCS=$(usex doc)
- -DINSTALL_DOCS=$(usex doc)
- -DSTOP_ON_WARNING=OFF
- -DUSE_DCMTK=$(usex dicom)
- -DUSE_EXTERNAL_PUGIXML=ON
- -DUSE_JPEGTURBO=ON
- -DUSE_NUKE=OFF # not in Gentoo
- -DUSE_FFMPEG=$(usex ffmpeg)
- -DUSE_FIELD3D=$(usex field3d)
- -DUSE_GIF=$(usex gif)
- -DUSE_OPENJPEG=$(usex jpeg2k)
- -DUSE_OPENCV=$(usex opencv)
- -DUSE_OPENGL=$(usex opengl)
- -DUSE_OPENVDB=$(usex openvdb)
- -DUSE_PTEX=$(usex ptex)
- -DUSE_PYTHON=$(usex python)
- -DUSE_QT=$(usex qt5)
- -DUSE_LIBRAW=$(usex raw)
- -DUSE_FREETYPE=$(usex truetype)
- -DUSE_SIMD=$(local IFS=','; echo "${mysimd[*]}")
- )
-
- cmake_src_configure
-}
-
-src_install() {
- cmake_src_install
- # can't use font_src_install
- # it does directory hierarchy recreation
- FONT_S=(
- "${S}/src/fonts/Droid_Sans"
- "${S}/src/fonts/Droid_Sans_Mono"
- "${S}/src/fonts/Droid_Serif"
- )
- insinto ${FONTDIR}
- for dir in "${FONT_S[@]}"; do
- doins "${dir}"/*.ttf
- done
-}
diff --git a/media-libs/opus/Manifest b/media-libs/opus/Manifest
index 8efbc03a050c..049baac46ac7 100644
--- a/media-libs/opus/Manifest
+++ b/media-libs/opus/Manifest
@@ -1,5 +1,4 @@
AUX opus-1.3.1-libdir-macro.patch 359 BLAKE2B 901a1f09417bb962b3268a1d9a85cfc356df9c67b05452e31599c37cf9c0a2267c50e6b9bd820af2445d54a290d4170492bff692566c01e9b1841ed755b9c020 SHA512 ec9643035203e70589eeed1079cf4da7af548fc1e2f8f30645217042e6adb3f9e0f874dcbd96ad49c07637abb3abca94c201cfc7dd41ad1d687ecbc00320eb2c
DIST opus-1.3.1.tar.gz 1040054 BLAKE2B e0aab38518938157a6ef27307f52d9d3f9c12a2fef4c7e5b4168c2f6fc04d79e333ebe477059b3e6a0518fcf6aa089b5eb1c8de68d83474e237c0f73e5a221cb SHA512 6cd5e4d8a0551ed5fb59488c07a5cc18a241d1fde5f9eb9f16cd4e77abcdb4134dd51ad1d737be1e6039bfa56912510b8648152f2478a1f21c7c1d9ce32933cd
-EBUILD opus-1.3.1-r1.ebuild 1074 BLAKE2B 4d6be4549fe213a1b4b96459e5d857ba914dcaf6ddfdc8d75cdd76aa0d1263dbc4a22c0fbe1c58429ad0ca6be90c73d0fa942efce2b4b208225fa9c78294410a SHA512 af67ca539e73422a6b9e0d96e6a0cc3dcca168214409a4f9711e737a6bade78786594f2284807718a54b659e9d90e2d3507f9c3f69306173fa7819acc9f07a2c
-EBUILD opus-1.3.1-r2.ebuild 1311 BLAKE2B 68e5e037c067e594dffb053e58492549a2d0c41239c69e0956a8e10bb8d9e2e7e30d8dab251982dfe450dcf78a55ddb13f3b9080f7e52e07353ebe7785d7ad3b SHA512 98a45aeba77ed536c3e43197910e64763820a43e53a13662ce784aca590f7a6784767a76193dff5dd8cb5a04a7e6c89cb1bde197c4fd2d223e46c3b78ab7226c
+EBUILD opus-1.3.1-r2.ebuild 1304 BLAKE2B f71a6bef7d72f01784023a939d056e4183d2ee2ab69c227f52b256655646a124db198164f4b0068e1efa3b248fc043d59bcdda02fdb36cf737e67419a16a7795 SHA512 7cf5995c556ff4b56e6a2b182cde0f4f5d09ff77fa4026bf3b7eba1fd607245b6fad26462b2c49e22c66eac06a70da5d8d903c33644cf91cd98257a29fc685f9
MISC metadata.xml 463 BLAKE2B 6ca3d25d23b9fdea5d785b95c46939cd5f2c4e8a46b4cbaa15952ada640111f1be6b2c428d65b76aa784ca52fa2e8a99857f56b530f58cadaec04665478bcd26 SHA512 f3eb519adc1044337a1c2bc2cd3659ac57c3ee96bba83e5904d1edf0ca3a3dfa7ab03bd3d1b12b695c066dd6c63142cd3c1b0e39343025c43091a4bf33e8f387
diff --git a/media-libs/opus/opus-1.3.1-r1.ebuild b/media-libs/opus/opus-1.3.1-r1.ebuild
deleted file mode 100644
index 9f336ce55ee1..000000000000
--- a/media-libs/opus/opus-1.3.1-r1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib-minimal
-
-DESCRIPTION="Open codec for interactive speech and music transmission over the Internet"
-HOMEPAGE="https://opus-codec.org/"
-SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
-INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
-IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
-
-BDEPEND="doc? (
- app-doc/doxygen
- media-gfx/graphviz
- )"
-
-multilib_src_configure() {
- local myeconfargs=(
- $(use_enable custom-modes)
- $(use_enable doc)
- $(use_enable static-libs static)
- )
-
- local i
- for i in ${INTRINSIC_FLAGS} ; do
- use ${i} && myeconfargs+=( --enable-intrinsics )
- done
-
- if is-flagq -ffast-math || is-flagq -Ofast; then
- myeconfargs+=( "--enable-float-approx" )
- fi
-
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name "*.la" -delete || die
-}
diff --git a/media-libs/opus/opus-1.3.1-r2.ebuild b/media-libs/opus/opus-1.3.1-r2.ebuild
index 137c39a1d91e..8f28b5956956 100644
--- a/media-libs/opus/opus-1.3.1-r2.ebuild
+++ b/media-libs/opus/opus-1.3.1-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.mozilla.org/pub/opus/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86"
INTRINSIC_FLAGS="cpu_flags_x86_sse cpu_flags_arm_neon"
IUSE="custom-modes doc static-libs ${INTRINSIC_FLAGS}"
diff --git a/media-libs/osl/Manifest b/media-libs/osl/Manifest
index f3498cd61031..e61a318364fc 100644
--- a/media-libs/osl/Manifest
+++ b/media-libs/osl/Manifest
@@ -1,6 +1,10 @@
AUX osl-1.10.5-fix-install-shaders.patch 1333 BLAKE2B daf7970a05ccc2b08139c385caf9c2a9291d2f7db30b2ed1dab99d1d8da25ad5487edc7961a62809811eca45066eaa4bfa0524d0e9c9daa25489fb84be2965b2 SHA512 bc7d5e2c1306fa540d51f425d4b1303c5ad9ab624ba7f44d03ed9d8df77f36a71c334b05049d0a880cabe068947f7936258e3e52479334987b7ae68f55631cc4
+AUX osl-1.12.0.2-llvm-11.patch 1405 BLAKE2B 9e6e162591d4450609c6759d3e9aa45acee0addf5be60bcd21067fa861e6e77fdac83656a3542b3d977987dad4da0627074e36b80b85e1af5e73ae5a7ade9a4b SHA512 a3986d9c458338d1002e119b2c16372fced00a10ddf734b790774f533500f4e3c2cf8fae88431f14a8709d916f9eae4f3f5bdff573e38a1808bc39b0a015ffbf
+AUX osl-1.12.0.2-llvm-12.patch 10828 BLAKE2B b172c99210b6874033a157ea4d98d902f9bf4a1d348619ba3180f08cd1a97dd945bd17b5af2f5a87ff8a0240ec82aeac498aeb448861f8f1de5623e80ac39570 SHA512 547254e9eb2bffacd43dbdebf4aa1929475132f42433b4df9b5535e720578af44ae2b08a01a51d80e539fcc22f424291dece51ee6ea55821a821fd0efd76d619
DIST osl-1.10.13.tar.gz 13551733 BLAKE2B 63b687ec46bd5334a7d0c00cfa5bf5243003e16adf2637fba648a75f98c10103c7c4b5fa1d091ab43b0929f85523b0fa79589eca56686490ee61c48069593767 SHA512 bc39fcf80878160807e35c52654a2993a7d33b3ab2fbf567ec50d0b23636a19064830afab5734f1e39276c77e843bbfe1d6b10a64fd4ebe69b17c8faa5378201
DIST osl-1.11.9.0.tar.gz 14137334 BLAKE2B db68cb77d6af56e711b897371a4fe9386bf1a62625f9fa04012e9ec22346933fe3b0112301a8ad17ac6dd9c01c2a8e00c6d6e557d947870fd39bb3dec1443fd8 SHA512 f93bce0b29ff2da022372d81f2709c7db68e011c07c346b679c4b5ce05425f7eda8904779d7ea460817639e6be78a8c77272d71a3ffa8b068cfaab7572eb2e65
+DIST osl-1.12.0.2.tar.gz 16205315 BLAKE2B 543d120e981f093c121b4abb4c36d7d8c127555c8986df931a3040136e3ae3d84d602d73395604cd492f8d192e408f585cd6579fe6283c974778f0b99092985d SHA512 cdcd1fb348f6f2f1f889ed1895bac545e10b73e700959bc09b1df2a40cd86e69ba43a1dfaf26dedaec9c23aa17b74428d4bccc9cf7f4d27ae2fc5152adb6c010
EBUILD osl-1.10.13.ebuild 1982 BLAKE2B ba5db5bb799f094356b034d82a322a7f189b671b4b04f8e0573ff3f5b6478d1787ac4e9a91cfff3ad3444ca95f6e678b4b9f2829b425b84fc348057363e7089e SHA512 0b198ebc63420aad4adb20b29640d2a00d8b4b3cf8e62f68e454aefed2e60c5f7af977b9762a1d26074bac8e5016c6703ccf9d7a038cfa2649a701eda24045fd
EBUILD osl-1.11.9.0.ebuild 2144 BLAKE2B 74b8721250769b65c88f9f73441262414390c0d7d3ade2ebc9e15be7d7b14d6a58e578b11949ed1fc0f76373fd3ffe26b2fd1168f44e73d9fe029f07dd024ddf SHA512 2f1f7510283d594ac97e295e3201c5dc4470a0002a4f8067cb153e210e1145c96aa47755a3f6b57b2690b6ee2b300fa6cd0875fb438912f58303106c2ce3a952
+EBUILD osl-1.12.0.2.ebuild 1953 BLAKE2B 4b28ea43245f16be814cf4fea8862f935bc739a8b8a70d3c8a4ccab7770f4fac906a666db4f6be01a3d7a09b8e8b67f94b777c93f8f17721792ecdc539d05f26 SHA512 b6f1362e3014030cd8fc74a6aac0c817950f1f531fc87f9326a1105989b95a80cbab9b9bfa783b2472f07638bf67b1d82e566e6a54d304b066101f36b667f37b
MISC metadata.xml 840 BLAKE2B b0294327cc49b976989b7d718882aee135eeffff27a7d3bfbfd005f3c40ffbecd231aa627877b2dedf993c571b1502ccca033c3f857cadfd0ce0c4f09c18ea65 SHA512 0492eb77870d7c6a4fc120d0f53b72568e87483ef48c8954e5d3bf21941448917f0a541c71be413500b5782a8eb255dc3a7cde61b003561a697a52b8222ce9f4
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
new file mode 100644
index 000000000000..a47bcd4e47da
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-11.patch
@@ -0,0 +1,29 @@
+From 84c26c0baab8f071270d0fef23175c24d738c73c Mon Sep 17 00:00:00 2001
+From: Brecht Van Lommel <brecht@blender.org>
+Date: Mon, 19 Apr 2021 13:49:22 +0200
+Subject: [PATCH] Fix crash generating closure functions calls with LLVM 11
+
+Generating code for prepare_closure and gen_closure was crashing.
+The code now matches the implementation of the removed LLVM function.
+
+Signed-off-by: Brecht Van Lommel <brecht@blender.org>
+---
+ src/liboslexec/llvm_util.cpp | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index 445f64000..3d468de27 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -3430,8 +3430,9 @@ LLVM_Util::call_function (llvm::Value *func, cspan<llvm::Value *> args)
+ #endif
+ //llvm_gen_debug_printf (std::string("start ") + std::string(name));
+ #if OSL_LLVM_VERSION >= 110
+- OSL_DASSERT(llvm::isa<llvm::Function>(func));
+- llvm::Value *r = builder().CreateCall(llvm::cast<llvm::Function>(func), llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
++ llvm::Value* r = builder().CreateCall(
++ llvm::cast<llvm::FunctionType>(func->getType()->getPointerElementType()), func,
++ llvm::ArrayRef<llvm::Value*>(args.data(), args.size()));
+ #else
+ llvm::Value *r = builder().CreateCall (func, llvm::ArrayRef<llvm::Value *>(args.data(), args.size()));
+ #endif
diff --git a/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
new file mode 100644
index 000000000000..dcf9ac863f73
--- /dev/null
+++ b/media-libs/osl/files/osl-1.12.0.2-llvm-12.patch
@@ -0,0 +1,240 @@
+commit f76ea6220a5f0d59f5f43d3d6d526f1fd09b90f7
+Author: Euan Haahr <euanhaahrmail2@gmail.com>
+Date: Fri Feb 5 22:51:14 2021 +0000
+
+ Various fixes for LLVM 12 compatibility (1351)
+
+ Removed use of options.PrintMachineCode since this has been removed as
+ of llvm 12. Converted uses of DebugLoc::get to DILocation::get since
+ it has been deprecated and removed as of llvm 12.
+
+ PrintMachine code will only be used if llvm is lower than version 12.
+ TODO: Needs to be re-added in the new way for LLVM12. (LG just doesn't
+ have time to figure this out right now.)
+
+ Pass adjustment as various things have been deprecated or changed
+ names. (LG)
+
+ Signed-off-by: Euan Haahr <euanhaahrmail2@gmail.com>
+ Signed-off-by: Larry Gritz <lg@larrygritz.com>
+
+diff --git a/src/liboslexec/llvm_passes.h b/src/liboslexec/llvm_passes.h
+index 4ec3489c..7c14fc76 100644
+--- a/src/liboslexec/llvm_passes.h
++++ b/src/liboslexec/llvm_passes.h
+@@ -73,9 +73,14 @@ public:
+ // 16 bit and 32 bit native mask representation to be passed as a
+ // livein.
+ m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, WidthT);
++# if OSL_LLVM_VERSION >= 112
++ m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
++ llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
++# else
+ m_wide_zero_initializer = llvm::ConstantVector::getSplat(
+ llvm::ElementCount(WidthT, false),
+ llvm::ConstantInt::get (M.getContext(), llvm::APInt(32,0)));
++# endif
+ #else
+ m_llvm_mask_type = llvm::VectorType::get(llvm_type_bool, WidthT);
+ m_native_mask_type = llvm::VectorType::get(llvm_type_int32, WidthT);
+@@ -341,9 +346,8 @@ public:
+ // of the mask promotion will always be correct here. Should 16 bit
+ // support be needed, this pass could be extended.
+ m_native_mask_type = llvm::FixedVectorType::get(llvm_type_int32, WidthT);
+- m_wide_zero_initializer = llvm::ConstantVector::getSplat(
+- llvm::ElementCount(WidthT, false),
+- llvm::ConstantInt::get (M.getContext(), llvm::APInt(32,0)));
++ m_wide_zero_initializer = llvm::ConstantDataVector::getSplat(WidthT,
++ llvm::ConstantInt::get(M.getContext(), llvm::APInt(32,0)));
+ #else
+ m_llvm_mask_type = llvm::VectorType::get(llvm_type_bool, WidthT);
+ m_native_mask_type = llvm::VectorType::get(llvm_type_int32, WidthT);
+diff --git a/src/liboslexec/llvm_util.cpp b/src/liboslexec/llvm_util.cpp
+index fed8c5ec..b2a02f61 100644
+--- a/src/liboslexec/llvm_util.cpp
++++ b/src/liboslexec/llvm_util.cpp
+@@ -20,6 +20,7 @@
+ #include "llvm_passes.h"
+
+ #include <llvm/InitializePasses.h>
++#include <llvm/Pass.h>
+ #include <llvm/IR/Constant.h>
+ #include <llvm/IR/Constants.h>
+ #include <llvm/IR/DebugInfo.h>
+@@ -59,6 +60,7 @@
+ #include <llvm/Analysis/BasicAliasAnalysis.h>
+ #include <llvm/Analysis/TypeBasedAliasAnalysis.h>
+ #include <llvm/Analysis/TargetTransformInfo.h>
++#include <llvm/IR/Function.h>
+ #include <llvm/IR/Verifier.h>
+ #include <llvm/Target/TargetMachine.h>
+ #include <llvm/Target/TargetOptions.h>
+@@ -74,10 +76,9 @@
+ #include <llvm/Transforms/Scalar/GVN.h>
+ #include <llvm/Transforms/Utils.h>
+
+-
+-#include <llvm/Pass.h>
+-#include <llvm/IR/Function.h>
+-#include <llvm/Support/raw_ostream.h>
++#if OSL_LLVM_VERSION >= 120
++#include <llvm/CodeGen/Passes.h>
++#endif
+
+ // additional includes for PTX generation
+ #include <llvm/Transforms/Utils/SymbolRewriter.h>
+@@ -129,6 +130,11 @@ static bool setup_done = false;
+ static std::unique_ptr<std::vector<std::shared_ptr<LLVMMemoryManager> >> jitmm_hold;
+ static int jit_mem_hold_users = 0;
+
++
++#if OSL_LLVM_VERSION >= 120
++llvm::raw_os_ostream raw_cout(std::cout);
++#endif
++
+ }; // end anon namespace
+
+
+@@ -701,7 +707,8 @@ LLVM_Util::debug_pop_function()
+ // that has been finalized, point it back to the compilation unit
+ OSL_ASSERT(m_builder);
+ OSL_ASSERT(m_builder->getCurrentDebugLocation().get() != nullptr);
+- m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast<unsigned int>(1),
++ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
++ static_cast<unsigned int>(1),
+ static_cast<unsigned int>(0), /* column? we don't know it, may be worth tracking through osl->oso*/
+ getCurrentDebugScope()));
+
+@@ -776,7 +783,8 @@ LLVM_Util::debug_set_location(ustring sourcefile, int sourceline)
+ }
+ if (newDebugLocation) {
+ llvm::DebugLoc debug_location =
+- llvm::DebugLoc::get(static_cast<unsigned int>(sourceline),
++ llvm::DILocation::get(sp->getContext(),
++ static_cast<unsigned int>(sourceline),
+ static_cast<unsigned int>(0), /* column? we don't know it, may be worth tracking through osl->oso*/
+ sp,
+ inlineSite);
+@@ -958,7 +966,8 @@ LLVM_Util::new_builder (llvm::BasicBlock *block)
+ m_builder = new IRBuilder (block);
+ if (this->debug_is_enabled()) {
+ OSL_ASSERT(getCurrentDebugScope());
+- m_builder->SetCurrentDebugLocation(llvm::DebugLoc::get(static_cast<unsigned int>(1),
++ m_builder->SetCurrentDebugLocation(llvm::DILocation::get(getCurrentDebugScope()->getContext(),
++ static_cast<unsigned int>(1),
+ static_cast<unsigned int>(0), /* column? we don't know it, may be worth tracking through osl->oso*/
+ getCurrentDebugScope()));
+ }
+@@ -1386,7 +1395,13 @@ LLVM_Util::make_jit_execengine (std::string *err,
+ options.RelaxELFRelocations = false;
+ //options.DebuggerTuning = llvm::DebuggerKind::GDB;
+
++ // TODO: Find equivalent function for PrintMachineCode post LLVM 12
++#if OSL_LLVM_VERSION < 120
++ // This option disappeared from the TargetOptions struct in LLVM 12.
++ // It is instead accomplished with a MachineFunctionPrinterPass.
+ options.PrintMachineCode = dumpasm();
++#endif
++
+ engine_builder.setTargetOptions(options);
+
+ detect_cpu_features(requestedISA, !jit_fma());
+@@ -1715,14 +1730,14 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+
+ mpm.add(llvm::createReassociatePass());
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+ mpm.add(llvm::createAggressiveDCEPass());
+
+ mpm.add(llvm::createInstructionCombiningPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+
+ mpm.add(llvm::createJumpThreadingPass());
+ mpm.add(llvm::createSROAPass());
+@@ -1746,8 +1761,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+
+ // Eliminate and remove as much as possible up front
+ mpm.add(llvm::createReassociatePass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++#endif
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+@@ -1784,7 +1801,7 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createInstructionCombiningPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+
+ mpm.add(llvm::createGlobalDCEPass());
+ mpm.add(llvm::createConstantMergePass());
+@@ -1803,8 +1820,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createLowerExpectIntrinsicPass());
+
+ mpm.add(llvm::createReassociatePass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++#endif
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+@@ -1814,7 +1833,7 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ // optimizations, should attempt to reduce the number of times it is
+ // executed, if at all
+ mpm.add(llvm::createInstructionCombiningPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++ mpm.add(llvm::createDeadCodeEliminationPass());
+
+ mpm.add(llvm::createSROAPass());
+ mpm.add(llvm::createInstructionCombiningPass());
+@@ -1822,7 +1841,16 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createPromoteMemoryToRegisterPass());
+ mpm.add(llvm::createGlobalOptimizerPass());
+ mpm.add(llvm::createReassociatePass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createIPConstantPropagationPass());
++#else
++ // createIPConstantPropagationPass disappeared with LLVM 12.
++ // Comments in their PR indicate that IPSCCP is better, but I don't
++ // know if that means such a pass should be *right here*. I leave it
++ // to others who use opt==13 to continue to curate this particular
++ // list of passes.
++ mpm.add(llvm::createIPSCCPPass());
++#endif
+
+ mpm.add(llvm::createDeadArgEliminationPass());
+ mpm.add(llvm::createInstructionCombiningPass());
+@@ -1831,8 +1859,10 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createPostOrderFunctionAttrsLegacyPass());
+ mpm.add(llvm::createReversePostOrderFunctionAttrsPass());
+ mpm.add(llvm::createFunctionInliningPass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+- mpm.add(llvm::createDeadInstEliminationPass());
++#endif
++ mpm.add(llvm::createDeadCodeEliminationPass());
+ mpm.add(llvm::createCFGSimplificationPass());
+
+ mpm.add(llvm::createArgumentPromotionPass());
+@@ -1845,8 +1875,9 @@ LLVM_Util::setup_optimization_passes (int optlevel, bool target_host)
+ mpm.add(llvm::createTailCallEliminationPass());
+
+ mpm.add(llvm::createFunctionInliningPass());
++#if OSL_LLVM_VERSION < 120
+ mpm.add(llvm::createConstantPropagationPass());
+-
++#endif
+
+ mpm.add(llvm::createIPSCCPPass());
+ mpm.add(llvm::createDeadArgEliminationPass());
diff --git a/media-libs/osl/osl-1.12.0.2.ebuild b/media-libs/osl/osl-1.12.0.2.ebuild
new file mode 100644
index 000000000000..a312fa3bc86e
--- /dev/null
+++ b/media-libs/osl/osl-1.12.0.2.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit cmake llvm toolchain-funcs
+
+# check this on updates
+LLVM_MAX_SLOT=12
+
+DESCRIPTION="Advanced shading language for production GI renderers"
+HOMEPAGE="http://opensource.imageworks.com/?p=osl"
+SRC_URI="https://github.com/imageworks/OpenShadingLanguage/archive/Release-${PV}-dev.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+X86_CPU_FEATURES=(
+ sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4.1 sse4_2:sse4.2
+ avx:avx avx2:avx2 avx512f:avx512f f16c:f16c
+)
+CPU_FEATURES=( ${X86_CPU_FEATURES[@]/#/cpu_flags_x86_} )
+
+IUSE="doc partio qt5 test ${CPU_FEATURES[@]%:*}"
+
+RDEPEND="
+ dev-libs/boost:=
+ dev-libs/pugixml
+ media-libs/openexr:=
+ media-libs/openimageio:=
+ <=sys-devel/clang-13:=
+ sys-libs/zlib:=
+ dev-python/pybind11
+ partio? ( media-libs/partio )
+ qt5? (
+ dev-qt/qtcore:5
+ dev-qt/qtgui:5
+ dev-qt/qtwidgets:5
+ )
+"
+
+DEPEND="${RDEPEND}"
+BDEPEND="
+ sys-devel/bison
+ sys-devel/flex
+ virtual/pkgconfig
+"
+
+PATCHES=(
+ ${FILESDIR}/${P}-llvm-11.patch
+ ${FILESDIR}/${P}-llvm-12.patch
+)
+
+# Restricting tests as Make file handles them differently
+RESTRICT="test"
+
+S="${WORKDIR}/OpenShadingLanguage-Release-${PV}-dev"
+
+llvm_check_deps() {
+ has_version -r "sys-devel/clang:${LLVM_SLOT}"
+}
+
+src_configure() {
+ local cpufeature
+ local mysimd=()
+ for cpufeature in "${CPU_FEATURES[@]}"; do
+ use "${cpufeature%:*}" && mysimd+=("${cpufeature#*:}")
+ done
+
+ # If no CPU SIMDs were used, completely disable them
+ [[ -z ${mysimd} ]] && mysimd=("0")
+
+ local gcc=$(tc-getCC)
+ # LLVM needs CPP11. Do not disable.
+ local mycmakeargs=(
+ -DCMAKE_CXX_STANDARD=14
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+ -DINSTALL_DOCS=$(usex doc)
+ -DLLVM_STATIC=OFF
+ -DOSL_BUILD_TESTS=$(usex test)
+ -DSTOP_ON_WARNING=OFF
+ -DUSE_PARTIO=$(usex partio)
+ -DUSE_QT=$(usex qt5)
+ -DUSE_SIMD="$(IFS=","; echo "${mysimd[*]}")"
+ )
+
+ cmake_src_configure
+}
diff --git a/media-libs/qtav/Manifest b/media-libs/qtav/Manifest
index 593e77318f3c..52d3ded52a78 100644
--- a/media-libs/qtav/Manifest
+++ b/media-libs/qtav/Manifest
@@ -6,4 +6,4 @@ AUX qtav-1.12.0-qt5.15.patch 650 BLAKE2B cf5d5d5b4a30a1eb32ee38cd3f87c9df3a813ec
DIST qtav-1.12.0-capi.h-b43aa93.xz 6120 BLAKE2B b2aca6c4ae70e227728bf908a7b5b9ad9fcb4ba52a254362eaaefaa9480c6a1c551bf47f02f8a44273952bf2816d2dbc7dc92142264892547d4fe602184b5fba SHA512 f5e458b157a5f343bc5d4133cfe45ffefb5c6cbb902b41ae6b9d9349e31ca7ac5a2746addc4fef89fb74856f5db7691cf174d82e88b51cc0b7a356c4fdab5aa7
DIST qtav-1.12.0.tar.gz 998117 BLAKE2B 85f8a470333e683353c305b06cec10f65b553c26b05fad4824d8f05f6aeb1fc2622ab8b60ba42a35260402a950bf41458e90342be6c53cbdb8400642c2d09741 SHA512 f273d10a4fe9126cd7d7b1293c087527bf898513e8add7958d905b6039b0c9c3891ea751c40e4c13ba683febff73912322953b151a131726ef8b44db199e0f32
EBUILD qtav-1.12.0-r3.ebuild 1560 BLAKE2B 855361a6efc04b0819ad199fa7e1bc7d1a343eefeb4e6609c97e6a72944dc341bdf5047094f05f8c7034cc858fabb5bd58ea947a38cbfed942a879097bb78103 SHA512 722a498d686f1ef798259cb0b6f00484823f05bca80ef39d4449355a486c9a95a5031018df44896f01dfb45c7b5a3d446909550b93e5432fe921f746d64fb8f2
-MISC metadata.xml 389 BLAKE2B 6f4c10122acf9e5b30236f531b433ffc9cc46f9ddd6e6322bb5e17c70f60ba6ad0966eb93af1946a1df67e03cde1921ef24bad93fc115d5af84be848cbb04585 SHA512 145488dd0015ae2b014509610c33cf28e4e46e966bd37073d1199230297e66df520f3ac0afedd63c8eac20a7aa02ee492e5ad0658aa3b6fd660bd685b984161c
+MISC metadata.xml 311 BLAKE2B 98edecb53a2efd5496b05b0ce9438783bfdad95ea65a08d2efb3cab977c0944b513782422321cf5a2370d63f893ff2c486e8b3714168cd336665e54d3aa4a2fd SHA512 107b6b50d7d3e5f4f649a2c4a5201351e56b289272a895c41d1e5e10d555826d5e494d9739dbde57353c8318b2ff56abf2c686d450957d804b1cd4a482bf7f31
diff --git a/media-libs/qtav/metadata.xml b/media-libs/qtav/metadata.xml
index 396b8768424a..4128b9ccb89d 100644
--- a/media-libs/qtav/metadata.xml
+++ b/media-libs/qtav/metadata.xml
@@ -1,10 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
- <maintainer type="person">
- <email>johu@gentoo.org</email>
- <name>Johannes Huber</name>
- </maintainer>
+ <!-- maintainer-needed -->
<use>
<flag name="gui">Build a video player gui</flag>
</use>
diff --git a/media-libs/rlottie/Manifest b/media-libs/rlottie/Manifest
index 25bea1164f33..46fbaf0f0a16 100644
--- a/media-libs/rlottie/Manifest
+++ b/media-libs/rlottie/Manifest
@@ -1,5 +1,5 @@
DIST rlottie-0.2-1.tar.gz 3516947 BLAKE2B d5f6b643c910e0b831be223be4fcff3d42cde8239b01d413f2805eeccf2665abfbd209ee6877358c2434d3bc82ea7c5b3849f4dca1d0796436e47ffa6bcfed64 SHA512 1f645ae998ddbe83e4911addf28ec24ae3ff33f6439a9fb6c1e56986b46ac17dba155773ab02a59712e781febb31709a99075a3fbcda6136a0cb43dbd7c753de
DIST rlottie-0.2_p20210405.tar.gz 4048368 BLAKE2B 46875135de630b8cae164bf9714abbfad389853aabf7e642c612b54ce50a3a0c105b57a314f0731aa69b4fd023e3638c122f0335a7ae886253a7bea0a5b3d51e SHA512 a0382bd9561cc47daafc0742db24c55efa25ec1c8e0d865ea49cf11d8f082b9f860dd673f4d0fbf95e02da708da164bc9a87c66b76cd58becf983c968e7aeb81
EBUILD rlottie-0.2.ebuild 879 BLAKE2B b4a7951db369fff6b8a6cb4925903d2d59e7adaaf1a5ad4ce90299f2671f22a59ae0b918113d9f2038358fab2341d5a40c9db37a143e0b6e96e661ed4348ebb9 SHA512 4d2850e75042f6d0ed8438425025a8280703295062f8482e24cc44202953e37c48a0b278645d7c124d47e3580a170975b7d23d36393fdc510a683c020ef9f4ac
-EBUILD rlottie-0.2_p20210405.ebuild 967 BLAKE2B 25e1149299260958007e592ccf4ffddc9c8b180df6e60b8dea9e862687ec0cae8ac2d58999d03267bd5e6e2707dfea95455fa1c8bb7d3949b0ee96fa68e0e73d SHA512 41c9a7201b7cc376f110df4de970819e9c0b6a78570d4c6e8f65a6a3af0e80a9a12a01fbb90db35a0a7fc86981448a35e882db51280705ae4505bb0e344355c0
+EBUILD rlottie-0.2_p20210405.ebuild 965 BLAKE2B 10681cdd2f72094792f771c82d4388061af8afb4427eefe937ad409803cf3742a40ad7821ba0a42cef00bb3fde5bfdad714d44510749e424efc75a41013abb9e SHA512 30307056a1104f493b765cc63e466269b3d0bafbdd4151f04b665c862ddb3a229dd79ac2eac1eaa3853466e97d974b0d1938632eb5a041576b529bff5c3fd692
MISC metadata.xml 901 BLAKE2B 0f2b146bafcbff57e44a91a21176114d15c9d81a076cc42f3d57e3849d1b3af3d46eb45bc74cf6e524679677b5394f440dc762c87ddc3652d0b754ebd62907b5 SHA512 f7e80a3946b2462a3718f508be57cdbbc3c85c632778b58393f467cfa5c4e80b96f3f264251d9fbb9ce4cf26e4907e534ee758c77661504f05f73577c4c06fab
diff --git a/media-libs/rlottie/rlottie-0.2_p20210405.ebuild b/media-libs/rlottie/rlottie-0.2_p20210405.ebuild
index 6e7414259752..4ad3ba5a17f9 100644
--- a/media-libs/rlottie/rlottie-0.2_p20210405.ebuild
+++ b/media-libs/rlottie/rlottie-0.2_p20210405.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/Samsung/rlottie/archive/${MY_COMMIT}.tar.gz -> ${P}.
LICENSE="BSD FTL JSON MIT"
SLOT="0/0.2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="debug test"
RESTRICT="!test? ( test )"
diff --git a/media-libs/rubberband/Manifest b/media-libs/rubberband/Manifest
index 8e69137f1036..0ccf5c12d221 100644
--- a/media-libs/rubberband/Manifest
+++ b/media-libs/rubberband/Manifest
@@ -1,4 +1,7 @@
AUX rubberband-1.9.1-build.patch 6538 BLAKE2B 9387ebba5a8a06f6ea11dfa16c9b37fb2bc607a4982a6b77ad62e59fce597e7d4c358c0795c471a5e8b74cb553da31239cff50b2ac367e702e04262a66c462a0 SHA512 64677e108c17e35739a2e86a473c08b3d1e575daee14db124bec013e348120538e29e9a6829f7ec905998f7ba8f4386e8aea8591642bf45cf3be0f6e657b828f
+AUX rubberband-1.9.2-build.patch 6707 BLAKE2B a88eb8a5c647f4d8006f51fc627dca0ab02d1712b920a3c6c41b8981aa13ac5d7155bfd11e33577cb7b1e49a079ca5ea9840d37aaf477deffa0dea609b03fed7 SHA512 035f5549c902c1517ad5e09ee472eca578eed7d7f87f7ee20166dc46f495d5abaebc32902472b9ac6a3a367176c130bfa6fc743159b9efa3227873a16d8b4877
DIST rubberband-1.9.1.tar.bz2 164644 BLAKE2B 1bbbd0056b2131ac16bf427db93e19bdd6adb5433733e62523f4a04c8a74d1a48e82dbace09e7ffe6dddfeec699e3aeee8e84344c9e7cbe75067316dde6268d6 SHA512 cb20ef8fb717a9e6b5b0b921541bd701e94326e12cdb20d50bed344d12fa1b4fd731335c3a0a7f2d2a5ce96031d965b209e7667c4d55fd8494b8e20d3409f0d3
-EBUILD rubberband-1.9.1-r1.ebuild 1444 BLAKE2B 19ae91edaa90e5b586d5d21b03f7c86667790a152542e19fe8d95c8fd5ecb662718b46a41d4292db1b4ae156c6fc91fb9b8e04994b8cd585989447ac5b8c5fa9 SHA512 0b85d47949f7fa42e4f301faf9ae022e10cf1fa3b994dc1a390baf85bf7f682cb40366e09df773349d457cbf4f4951bfd8f685f8e34bfe9bb86e6ce28217a306
+DIST rubberband-1.9.2.tar.bz2 164178 BLAKE2B dc8e5b4c773dbb5c556331fa56e6cf4a5dd3f8a0fc7dcfed1fbe53d1a7635f12db6a884e775fbff8022e252d98b4e14a46a2395a5d4cb7645522ddf3e6b5482f SHA512 b1c763ab2a428aa2f1f8e5d0be6e9eb669808059ee5389e94f12de25f1a05cd89022656d98906c90b616773da11ab1f596ae2c5a9d300118e88049e1443121f2
+EBUILD rubberband-1.9.1-r1.ebuild 1320 BLAKE2B a5aed87ad51ebd6db178862b58eaf6dcd783fd18e6b0dc7479a85e67350c433cdf6ea2febf662fdac1920767e5e802e020bde2e6954d11ec726d146352d02642 SHA512 5392bc5bcb1a46696207161b557a78f6b0fcfa12f32bd360ea3d73da0bbe00c0e3c1d5840a3dcae390e9b16eccf106814eec0ae97560646bbb69fbb9b61a76cd
+EBUILD rubberband-1.9.2.ebuild 1326 BLAKE2B 9ab4882838e917285e22e81c4667bdd9ea19b72ef0056a39fb3722d7029abe1e0f3f0fac9e17f1644a0a9773563aadfb08358a26a81d0a7987354113f2dfae1c SHA512 321ba173805d590586840fea7dbf9d101d99ab194540cca1f17f62f86cfec946b94440dbb2d6748feb014168fd1d2bf23d52a67b266e4bf7cc5f20585261bb0f
MISC metadata.xml 490 BLAKE2B 849555ada519e1a558d37977b952b8338d4d19ac3a7e8523a15cc3924b7b7b5faca70df7782597e322c362af7d05b1a35dae64b8cd8f2a998cc5d074ee81f090 SHA512 a1e8673326887e5582aa7a948543341d3061a149e0232a01ef8aa3b6778a499393aae434d5f1c2181910aa309a3cd2f0d80820922dfe668745f75314e0526e31
diff --git a/media-libs/rubberband/files/rubberband-1.9.2-build.patch b/media-libs/rubberband/files/rubberband-1.9.2-build.patch
new file mode 100644
index 000000000000..dea90db4ddb0
--- /dev/null
+++ b/media-libs/rubberband/files/rubberband-1.9.2-build.patch
@@ -0,0 +1,180 @@
+diff --git a/meson.build b/meson.build
+index 3f7218c..3d402de 100644
+--- a/meson.build
++++ b/meson.build
+@@ -97,17 +97,25 @@ endforeach
+
+ fftw3_dep = dependency('fftw3', version: '>= 3.0.0', required: false)
+ samplerate_dep = dependency('samplerate', version: '>= 0.1.8', required: false)
+-sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
+-vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
++if get_option('programs')
++ sndfile_dep = dependency('sndfile', version: '>= 1.0.16', required: false)
++endif
++if get_option('vamp')
++ vamp_dep = dependency('vamp-sdk', version: '>= 2.9', required: false)
++endif
+ thread_dep = dependency('threads')
+-have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
++if get_option('ladspa')
++ have_ladspa = cpp.has_header('ladspa.h', args: extra_include_args)
++endif
+ have_sincos = cpp.has_function('sincos',
+ prefix: '#define _GNU_SOURCE\n#include <math.h>',
+ args: '-lm')
+-have_jni = cpp.has_header('jni.h', args: extra_include_args)
++if get_option('jni')
++ have_jni = cpp.has_header('jni.h', args: extra_include_args)
+
+-javac = find_program('javac', required: false)
+-jar = find_program('jar', required: false)
++ javac = find_program('javac', required: false)
++ jar = find_program('jar', required: false)
++endif
+
+
+ # Check FFT and resampler options and set up dependencies and paths
+@@ -273,37 +281,41 @@ if ipp_needed
+ endif
+ endif # ipp_needed
+
+-if not vamp_dep.found()
+- vamp_dep = cpp.find_library('VampPluginSDK',
+- dirs: get_option('extra_lib_dirs'),
+- has_headers: ['vamp-sdk.h'],
+- header_args: extra_include_args,
+- required: false)
++if get_option('vamp')
+ if not vamp_dep.found()
+- vamp_dep = cpp.find_library('vamp-sdk',
++ vamp_dep = cpp.find_library('VampPluginSDK',
+ dirs: get_option('extra_lib_dirs'),
+ has_headers: ['vamp-sdk.h'],
+ header_args: extra_include_args,
+ required: false)
++ if not vamp_dep.found()
++ vamp_dep = cpp.find_library('vamp-sdk',
++ dirs: get_option('extra_lib_dirs'),
++ has_headers: ['vamp-sdk.h'],
++ header_args: extra_include_args,
++ required: false)
++ endif
+ endif
++ have_vamp = true
+ endif
+-have_vamp = vamp_dep.found()
+-
+-if not sndfile_dep.found()
+- sndfile_dep = cpp.find_library('sndfile',
+- dirs: get_option('extra_lib_dirs'),
+- has_headers: ['sndfile.h'],
+- header_args: extra_include_args,
+- required: false)
++
++if get_option('programs')
+ if not sndfile_dep.found()
+- sndfile_dep = cpp.find_library('sndfile-1',
++ sndfile_dep = cpp.find_library('sndfile',
+ dirs: get_option('extra_lib_dirs'),
+ has_headers: ['sndfile.h'],
+ header_args: extra_include_args,
+ required: false)
++ if not sndfile_dep.found()
++ sndfile_dep = cpp.find_library('sndfile-1',
++ dirs: get_option('extra_lib_dirs'),
++ has_headers: ['sndfile.h'],
++ header_args: extra_include_args,
++ required: false)
++ endif
+ endif
++ have_sndfile = true
+ endif
+-have_sndfile = sndfile_dep.found()
+
+
+ # General platform and compiler expectations
+@@ -404,8 +416,10 @@ endif
+ # And the build targets: Static and dynamic libraries, command-line
+ # utility, LADSPA plugin, Vamp plugin, JNI library
+
+-message('Will build Rubber Band Library static library')
+-target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
++if get_option('static')
++ message('Will build Rubber Band Library static library')
++ target_summary += { 'Static library': [ true, 'Name: ' + rubberband_static_name ] }
++endif
+ rubberband_static = static_library(
+ rubberband_static_name,
+ library_sources,
+@@ -443,7 +457,7 @@ else
+ message('Not building Rubber Band Library dynamic library: no_shared option set')
+ endif
+
+-if have_jni and javac.found() and jar.found()
++if get_option('jni')
+ target_summary += { 'JNI library': [ true, 'Name: ' + rubberband_jni_name ] }
+ message('Will build Java Native Interface')
+ rubberband_jni = shared_library(
+@@ -478,7 +492,7 @@ if have_jni and javac.found() and jar.found()
+ )
+ else
+ target_summary += { 'JNI library': false }
+- if not have_jni
++ if not get_option('jni')
+ message('Not building Java Native Interface: jni.h header not found')
+ else
+ message('Not building Java Native Interface: Java compiler not found')
+@@ -492,7 +506,7 @@ install_headers(
+ subdir: 'rubberband'
+ )
+
+-if have_ladspa
++if get_option('ladspa')
+ target_summary += { 'LADSPA plugin': [ true, 'Name: ' + rubberband_ladspa_name ] }
+ message('Will build LADSPA plugin')
+ rubberband_ladspa = shared_library(
+@@ -527,7 +541,7 @@ else
+ message('Not building LADSPA plugin: ladspa.h header not found')
+ endif
+
+-if have_vamp
++if get_option('vamp')
+ target_summary += { 'Vamp plugin': [ true, 'Name: ' + rubberband_vamp_name ] }
+ message('Will build Vamp plugin')
+ rubberband_vamp = shared_library(
+@@ -559,7 +573,7 @@ else
+ message('Not building Vamp plugin: Vamp dependency not found')
+ endif
+
+-if have_sndfile
++if get_option('programs')
+ target_summary += { 'Command-line utility': [ true, 'Name: ' + rubberband_program_name ] }
+ message('Will build command-line utility')
+ rubberband_program = executable(
+diff --git a/meson_options.txt b/meson_options.txt
+index 86bf686..b99bb38 100644
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -31,3 +31,22 @@ option('no_shared',
+ value: 'false',
+ description: 'Do not build shared libraries. On Windows this will also ensure that the static library is called simply rubberband.lib, not rubberband-static.lib as it is in the default build.')
+
++option('jni',
++ type: 'boolean',
++ value: 'false')
++
++option('ladspa',
++ type: 'boolean',
++ value: 'false')
++
++option('programs',
++ type: 'boolean',
++ value: 'false')
++
++option('static',
++ type: 'boolean',
++ value: 'false')
++
++option('vamp',
++ type: 'boolean',
++ value: 'false')
diff --git a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
index ab6b7eac6dc4..23f485140902 100644
--- a/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
+++ b/media-libs/rubberband/rubberband-1.9.1-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit meson multilib-minimal
+inherit meson-multilib
DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
HOMEPAGE="https://www.breakfastquay.com/rubberband/"
@@ -37,7 +37,7 @@ multilib_src_configure() {
--buildtype=release
-Dfft=fftw
-Dresampler=libsamplerate
- -Dstatic=$(usex static-libs true false)
+ $(meson_use static-libs static)
$(meson_use ladspa)
$(meson_use jni)
$(meson_use programs)
@@ -49,15 +49,6 @@ multilib_src_configure() {
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
-multilib_src_install() {
- meson_src_install
-}
-
multilib_src_install_all() {
! use jni && find "${ED}" -name "*.a" -delete
- einstalldocs
}
diff --git a/media-libs/rubberband/rubberband-1.9.2.ebuild b/media-libs/rubberband/rubberband-1.9.2.ebuild
new file mode 100644
index 000000000000..f390295a8a94
--- /dev/null
+++ b/media-libs/rubberband/rubberband-1.9.2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson-multilib
+
+DESCRIPTION="An audio time-stretching and pitch-shifting library and utility program"
+HOMEPAGE="https://www.breakfastquay.com/rubberband/"
+SRC_URI="https://breakfastquay.com/files/releases/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="ladspa jni static-libs +programs vamp"
+
+BDEPEND="
+ virtual/pkgconfig
+"
+CDEPEND="
+ media-libs/libsamplerate[${MULTILIB_USEDEP}]
+ sci-libs/fftw:3.0[${MULTILIB_USEDEP}]
+ jni? ( >=virtual/jdk-1.8:* )
+ ladspa? ( media-libs/ladspa-sdk )
+ programs? ( media-libs/libsndfile )
+ vamp? ( media-libs/vamp-plugin-sdk[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+PATCHES=(
+ "${FILESDIR}/${P}-build.patch"
+)
+
+multilib_src_configure() {
+ local emesonargs=(
+ --buildtype=release
+ -Dfft=fftw
+ -Dresampler=libsamplerate
+ $(meson_use static-libs static)
+ $(meson_use ladspa)
+ $(meson_use jni)
+ $(meson_use programs)
+ $(meson_use vamp)
+ )
+ use jni && emesonargs+=(
+ -Dextra_include_dirs="$(java-config -g JAVA_HOME)/include,$(java-config -g JAVA_HOME)/include/linux"
+ )
+ meson_src_configure
+}
+
+multilib_src_install_all() {
+ ! use jni && find "${ED}" -name "*.a" -delete
+}
diff --git a/media-libs/speexdsp/Manifest b/media-libs/speexdsp/Manifest
index af589e4cbb1d..1c9ab72d204e 100644
--- a/media-libs/speexdsp/Manifest
+++ b/media-libs/speexdsp/Manifest
@@ -1,9 +1,4 @@
AUX speexdsp-1.2.0-configure.patch 1092 BLAKE2B a4629cb00d1920133db30cf1cbdaade58fe69176515c75f140f9ae9060d3111f8d88b65ce67f3bd6c7d86f60db25d15997182865e6a528a8e20603f3edb6544c SHA512 0c6f1b8ae83e98c8899649e3f108ccaad89286db317e5c3f19bd0d78f71839b92b10125ba09b640453d299b3343bfaec128ae72daff72f37f95cbf38652980dd
-AUX speexdsp-1.2_rc3-config_types.h.patch 2188 BLAKE2B 1e0c25b5e65a5999f5284abf0516aee5bb5ed0906c46d5d1e44b406236404ed00a8f0b0df5e6093a7cbdb10c453d4ab69b8df63ebb127d47a6930d546476099f SHA512 075a88f7f16d4744c95a9208ff4e803bfc28bff99113c3e919a9ce24c8e6bf91eedcbe9d487b668428db357092cc5db455e6256020cec598120c971734258b07
-AUX speexdsp-1.2_rc3-configure.patch 1506 BLAKE2B 76276ba7cc0c7143da55d90be9a60ea697dc13f9ad65d7d24a83606b14c543700788e9213d1562371203ace9d45131cb52103d7f045ddf17adc0e30fd3876013 SHA512 95a95e5ca052b6ab3091ce9c461e7356f029e65b47a0a0f291448325acceb23c5cb12d81dbdecec13945b70fa8161e479bc6767de484c2c2f13a5299a3b9304c
-AUX speexdsp-1.2_rc3-overflow.patch 2211 BLAKE2B 36a5aaedd730d8847046ce8cb9453678cf7aa503e060b25fb24e57516bbaaa7b987d3abb93fab741933c3fd43c490a090ac9fd64a6fbb2496f3a0364029c6b50 SHA512 f948be7513ed33a133a19bf571b8b1395f37b86715e2426a59105494d16c269c54c3a32c916f89af7e5b4b1d4aff90839e2b1ed2b13de482e54ac05bef449b31
DIST speexdsp-1.2.0.tar.gz 919621 BLAKE2B 70c7d07f4b23abbb70cfb212a6541288c71f57fffd5fe22ddd94901a7d01fa403a69b7884e3a4a2267ffd45a7e053b1ae7c7fd662e57053a06d4a7efb7889610 SHA512 e357cd5377415ea66c862302c7cf8bf6a10063cacd903f0846478975b87974cf5bdf00e2c6759d8f4f453c4c869cf284e9dc948a84a83d7b2ab96bd5405c05ec
-DIST speexdsp-1.2rc3.tar.gz 901771 BLAKE2B 85d047df82fc06906598da39ae653aa245c246bfea75c02d25f7811983babdab6a8499c9b563e0d7d2145fa490674df2cf0a05989884ffb3c2c2a183415ce841 SHA512 29dfa8345df025eeb076561648a9b5c0485692be699b6da3c2a3734b4329187a1c2eb181252f4df12b21f1309ecdf59797437dfb123d160fd723491ab216e858
-EBUILD speexdsp-1.2.0.ebuild 1383 BLAKE2B 7a64c619b06b26293b7c77f9c06ef884a0445807c8f96967f907a1aaf4089fa8c260297f43525d776bc2d1ca1245046603a501137d7f7ba18d355956031ad765 SHA512 12d253f8c2c073f99e21a1f908c08744f7fbaeb004273f08ef6e91ffdf7b4eed3422b08b4a8f3e14ea1f7ea0cf3db680384cb01068c7a796f4cfb92f0068ef90
-EBUILD speexdsp-1.2_rc3-r3.ebuild 1452 BLAKE2B fb1c74522d2ede3f6c2e85c31259beb4fa6f62173f57a2e457ba2b31a7602501094c15616d025d18262710cc9890d3190951e37dfd26d9f5f3ef6b2d3825abb5 SHA512 e830cc39bbacf1af828553f4beb987055975de1574bb0089662232d82a469046750977d271958b6119ade46528b3518892845dbfa23cc6e9f90b3904c0f75b6d
+EBUILD speexdsp-1.2.0.ebuild 1376 BLAKE2B 9f44b14947abecb3b893c1ab049d52c0a1b04d45c5b9edb169f3f789e3bae5452c33fd97b512abe38759097328e3c12fd21ca20da06c15cf3ec8d0441a89bc59 SHA512 23faeb35901be800a1bd79352288ba425c8f417aa9e52faff4e5fb7ba1439380e57d466b0b9d8912535ba76d00d0b69f8c70dfa85f18b47660b324d219296eb4
MISC metadata.xml 342 BLAKE2B 5b793ea5060e3e8359d6b50ebd5211471de0d72608086d1d0a67c655cc30c15e0b0db4545a578882144f9f1f4913779037ff76aeeb94002db2b162db78a6364e SHA512 32081e424d3f4ad3fd0ef4979c339d1139cb2298e6703210ff741b77a8b3bf2e1d4b550b0d76a1bd0c4dc5ac465b3ebdd1fe86da45d46586cd3560261f73c457
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch
deleted file mode 100644
index 835769dde707..000000000000
--- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-config_types.h.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From c470e2e89a6ca75b507437467692cd684b71a526 Mon Sep 17 00:00:00 2001
-From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
-Date: Sun, 5 Jul 2015 18:10:19 +0300
-Subject: [PATCH] Don't rely on HAVE_STDINT_H et al. being defined
-
-Not everyone who includes speexdsp_config_types.h will have a test
-which defines those, and if we've chosen to use the stdint types at
-configure time then we know exactly which header(s) are available, so
-just choose the best one then and generate the header to use it.
-
-This patch, including the above text, is copied from a commit in the
-speex repository[1]. The original commit for speex was made by Ron
-<ron@debian.org>.
-
-[1] https://git.xiph.org/?p=speex.git;a=commitdiff;h=774c87d6cb7dd8dabdd17677fc6da753ecf4aa87
-
-Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
----
- configure.ac | 6 ++++++
- include/speex/speexdsp_config_types.h.in | 8 +-------
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/configure.ac b/configure.ac
-index 2cd2d1e..1de0c23 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -334,6 +334,12 @@ AC_SUBST([USIZE16])
- AC_SUBST([SIZE32])
- AC_SUBST([USIZE32])
-
-+AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include <stdint.h>"],
-+ [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include <inttypes.h>"],
-+ [test "$ac_cv_header_sys_types_h" = "yes"], [INCLUDE_STDINT="#include <sys/types.h>"])
-+
-+AC_SUBST([INCLUDE_STDINT])
-+
- AC_CONFIG_FILES([
- Makefile libspeexdsp/Makefile doc/Makefile SpeexDSP.spec
- include/Makefile include/speex/Makefile speexdsp.pc
-diff --git a/include/speex/speexdsp_config_types.h.in b/include/speex/speexdsp_config_types.h.in
-index 02b82fd..5ea7b55 100644
---- a/include/speex/speexdsp_config_types.h.in
-+++ b/include/speex/speexdsp_config_types.h.in
-@@ -1,13 +1,7 @@
- #ifndef __SPEEX_TYPES_H__
- #define __SPEEX_TYPES_H__
-
--#if defined HAVE_STDINT_H
--# include <stdint.h>
--#elif defined HAVE_INTTYPES_H
--# include <inttypes.h>
--#elif defined HAVE_SYS_TYPES_H
--# include <sys/types.h>
--#endif
-+@INCLUDE_STDINT@
-
- typedef @SIZE16@ spx_int16_t;
- typedef @USIZE16@ spx_uint16_t;
---
-2.1.4
-
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch
deleted file mode 100644
index ae29da58438b..000000000000
--- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-configure.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-diff -Naur speexdsp-1.2rc3.orig/configure.ac speexdsp-1.2rc3/configure.ac
---- speexdsp-1.2rc3.orig/configure.ac 2016-12-12 20:04:48.710853453 -0800
-+++ speexdsp-1.2rc3/configure.ac 2016-12-12 20:05:07.588052415 -0800
-@@ -151,10 +151,17 @@
- AC_ARG_ENABLE(sse, [ --enable-sse Enable SSE support], [
- if test "x$enableval" != xno; then
- has_sse=yes
--has_sse2=yes
--CFLAGS="$CFLAGS -O3 -msse -msse2"
-+CFLAGS="$CFLAGS -msse"
- else
- has_sse=no
-+fi
-+])
-+
-+AC_ARG_ENABLE(sse2, [ --enable-sse2 Enable SSE2 support], [
-+if test "x$enableval" != xno; then
-+has_sse2=yes
-+CFLAGS="$CFLAGS -msse2"
-+else
- has_sse2=no
- fi
- ])
-@@ -162,7 +169,7 @@
- AC_ARG_ENABLE(neon, [ --enable-neon Enable NEON support], [
- if test "x$enableval" != xno; then
- has_neon=yes
--CFLAGS="$CFLAGS -O3 -march=armv7-a -mfpu=neon"
-+CFLAGS="$CFLAGS -mfpu=neon"
- else
- has_neon=no
- fi
-diff -Naur speexdsp-1.2rc3.orig/libspeexdsp/Makefile.am speexdsp-1.2rc3/libspeexdsp/Makefile.am
---- speexdsp-1.2rc3.orig/libspeexdsp/Makefile.am 2016-12-12 20:04:48.690853242 -0800
-+++ speexdsp-1.2rc3/libspeexdsp/Makefile.am 2016-12-12 20:08:27.740161974 -0800
-@@ -29,7 +29,7 @@
- pseudofloat.h smallft.h vorbis_psy.h resample_sse.h resample_neon.h
-
- libspeexdsp_la_LDFLAGS = -no-undefined -version-info @SPEEXDSP_LT_CURRENT@:@SPEEXDSP_LT_REVISION@:@SPEEXDSP_LT_AGE@
--libspeexdsp_la_LIBADD = $(LIBM)
-+libspeexdsp_la_LIBADD = $(LIBM) $(FFT_LIBS)
-
- if BUILD_EXAMPLES
- noinst_PROGRAMS = testdenoise testecho testjitter testresample
diff --git a/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch b/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch
deleted file mode 100644
index 3a413625085e..000000000000
--- a/media-libs/speexdsp/files/speexdsp-1.2_rc3-overflow.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-From a2133f5904ddb616b6578920bd2199f5accb484d Mon Sep 17 00:00:00 2001
-From: Tristan Matthews <tmatth@videolan.org>
-Date: Fri, 24 Apr 2015 15:55:32 -0400
-Subject: [PATCH] preprocess: prevent rare overflow on overlap-add
-
-Reported-by: Fabian Henze <flyser42@gmx.de>
----
- libspeexdsp/arch.h | 3 +++
- libspeexdsp/preprocess.c | 2 +-
- libspeexdsp/resample.c | 6 ------
- 3 files changed, 4 insertions(+), 7 deletions(-)
-
-diff --git a/libspeexdsp/arch.h b/libspeexdsp/arch.h
-index 6b3bc5d..c2de991 100644
---- a/libspeexdsp/arch.h
-+++ b/libspeexdsp/arch.h
-@@ -101,6 +101,8 @@ typedef spx_word32_t spx_sig_t;
- #define SIG_SHIFT 14
- #define GAIN_SHIFT 6
-
-+#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))
-+
- #define VERY_SMALL 0
- #define VERY_LARGE32 ((spx_word32_t)2147483647)
- #define VERY_LARGE16 ((spx_word16_t)32767)
-@@ -203,6 +205,7 @@ typedef float spx_word32_t;
- #define DIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b))
- #define PDIV32(a,b) (((spx_word32_t)(a))/(spx_word32_t)(b))
-
-+#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x))))
-
- #endif
-
-diff --git a/libspeexdsp/preprocess.c b/libspeexdsp/preprocess.c
-index c080581..3053eb5 100644
---- a/libspeexdsp/preprocess.c
-+++ b/libspeexdsp/preprocess.c
-@@ -980,7 +980,7 @@ EXPORT int speex_preprocess_run(SpeexPreprocessState *st, spx_int16_t *x)
-
- /* Perform overlap and add */
- for (i=0;i<N3;i++)
-- x[i] = st->outbuf[i] + st->frame[i];
-+ x[i] = WORD2INT(ADD32(EXTEND32(st->outbuf[i]), EXTEND32(st->frame[i])));
- for (i=0;i<N4;i++)
- x[N3+i] = st->frame[N3+i];
-
-diff --git a/libspeexdsp/resample.c b/libspeexdsp/resample.c
-index 4940a64..4e47d67 100644
---- a/libspeexdsp/resample.c
-+++ b/libspeexdsp/resample.c
-@@ -83,12 +83,6 @@ static void speex_free (void *ptr) {free(ptr);}
- #define M_PI 3.14159265358979323846
- #endif
-
--#ifdef FIXED_POINT
--#define WORD2INT(x) ((x) < -32767 ? -32768 : ((x) > 32766 ? 32767 : (x)))
--#else
--#define WORD2INT(x) ((x) < -32767.5f ? -32768 : ((x) > 32766.5f ? 32767 : floor(.5+(x))))
--#endif
--
- #define IMAX(a,b) ((a) > (b) ? (a) : (b))
- #define IMIN(a,b) ((a) < (b) ? (a) : (b))
-
---
-2.1.4
-
diff --git a/media-libs/speexdsp/speexdsp-1.2.0.ebuild b/media-libs/speexdsp/speexdsp-1.2.0.ebuild
index 9a9d4e43273a..1f36b74e0d68 100644
--- a/media-libs/speexdsp/speexdsp-1.2.0.ebuild
+++ b/media-libs/speexdsp/speexdsp-1.2.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
RDEPEND="!<media-libs/speex-1.2.0"
diff --git a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild b/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
deleted file mode 100644
index 6d75678b32b3..000000000000
--- a/media-libs/speexdsp/speexdsp-1.2_rc3-r3.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools flag-o-matic multilib-minimal
-
-MY_P=${P/_}
-MY_P=${MY_P/_p/.}
-
-DESCRIPTION="Audio compression format designed for speech -- DSP"
-HOMEPAGE="https://www.speex.org/"
-SRC_URI="https://downloads.xiph.org/releases/speex/${MY_P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-IUSE="cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_arm_neon"
-
-RDEPEND="!<media-libs/speex-1.2.0"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
- "${FILESDIR}"/${P}-configure.patch
- "${FILESDIR}"/${P}-config_types.h.patch
- "${FILESDIR}"/${P}-overflow.patch
-)
-
-src_prepare() {
- default
-
- sed -i \
- -e 's:noinst_PROGRAMS:check_PROGRAMS:' \
- libspeexdsp/Makefile.am || die
-
- eautoreconf
-
- append-lfs-flags
-}
-
-multilib_src_configure() {
- # Can also be configured with one of:
- # --enable-fixed-point (no floating point)
- # --with-fft=proprietary-intel-mkl (mkl)
- # --with-fft=gpl-fftw3 (fftw)
- ECONF_SOURCE="${S}" econf \
- --disable-static \
- $(use_enable cpu_flags_x86_sse sse) \
- $(use_enable cpu_flags_x86_sse2 sse2) \
- $(use_enable cpu_flags_arm_neon neon)
-}
-
-multilib_src_install_all() {
- einstalldocs
- find "${ED}" -name '*.la' -type f -delete || die
-}
diff --git a/media-libs/tg_owt/Manifest b/media-libs/tg_owt/Manifest
index 9391cfceae9e..02ee7b9e7db8 100644
--- a/media-libs/tg_owt/Manifest
+++ b/media-libs/tg_owt/Manifest
@@ -4,5 +4,5 @@ DIST libyuv-ad890067f661dc747a975bc55ba3767fe30d4452.tar.gz 473845 BLAKE2B 664be
DIST tg_owt-0_pre20210309.tar.gz 16159542 BLAKE2B 354992fca17f6217daa7294a8b60aa96f16b1198a07c79599ce676770cde068bf3ebf83c3935613ab181d4f7f23abbf2e4dd3ba41988b7505f27f537ada87fc2 SHA512 eca2c249d4837f8564218ea969390579b7f07c40879a80249310d978ba6d8865b85ec12e324fdba92af2d0b9bd501f2328fad5475028211013239dc35f508bb0
DIST tg_owt-0_pre20210422.tar.gz 16156802 BLAKE2B 823248e31d7abc91402c32aa0f062f1a77a3d8c4ebf63b4e73a8f290a5691e002a6ec09a5b7ffed1087565b9a419646924030dfb3eb3d0d6aec8cfc51cf1bf73 SHA512 24b66840a54d102b96bc32636dc8b85d31f74b344244985be929db4e14b13ee60f1fbc43269526352064cee8066839c886fae1aff95276089ab60d0a14de9ec6
EBUILD tg_owt-0_pre20210309-r1.ebuild 2572 BLAKE2B 1a6fa3110b55b71c5fd5b35c8a2143af554d10b1d76ccdd08f8deaf73f2ad26d48eda46cc54879d0a8e013bb09995c0cde72b520508461de6b8b87208e628e48 SHA512 f3fd874d29fa468266c918d0882168bccae193b4a5cc90ef80488a10de8c83a36003d85c90ab302d9773ef0fc7d5ae6947287d0ecf26fc21cb6d3c98d462f304
-EBUILD tg_owt-0_pre20210422.ebuild 2691 BLAKE2B 693fe275fc65797c2b3a6b96329f6e7d00c3140d85fa18a1a1fc48f3a32308f1c4c7476ededb3a02a33ef771f6388fef226cb78df826ca6a87a4cda52afd7f66 SHA512 377a50ab8f04548de572790e31f642c7be69305d706651a4ff15fa0c0e94c9ec7f39fba3c689960214b9222edc225db2475393df3788e68567bc9fa1cfebb36b
+EBUILD tg_owt-0_pre20210422.ebuild 2690 BLAKE2B 5142fed528e99f63e0ab0fa3f56cc33c0abe29975e7e5814fd40eeb5c9796a2c745b1b2e2a8569309411585907ba383cf3a581514d9dcd802768bf17bb3d4b61 SHA512 d7d4c545b6026f22c5d4bac967837bf630eca7b1c7aa432526571a5d3be470d71f7fde2e33e1eedc996388d8b36f4c037130fad732ccb5548202835b424e16e3
MISC metadata.xml 409 BLAKE2B 1d4ff3a79885150e6c29f8eda10d9ded0bebf9635033a3e76bbda7f223767cac0627599537faeb2827e8424fa3791eae0244ac1033486900c0bfbf3448f14b79 SHA512 cd254c020f0e32e28d91bf1d404ccb631e837962f9fcbfddb0cea4a0e54d82076d90eea987f3bcdcd9e689fbafe069ee671005f8edf6b8acf45d8ba99a18eae2
diff --git a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild
index c7df11e1b9c4..3e8e01ec1d26 100644
--- a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild
+++ b/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
# Bundled libs:
# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it)
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index 4ffa4c941e74..b3950da953e6 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,5 +1,3 @@
-DIST tiff-4.2.0.tar.gz 2809373 BLAKE2B 62178da595e7ff4041f33643a87698580cd3a32d4536b5c60c414c9497616258686cf61514e1d4e0f062cb1333190c39ce86896bf07c01532c07454745d89cd9 SHA512 d7d42e6e6dbda9604c638f28e6cfa4705191a4e8ea276d18031d50dbab0931ac91141e57a2cf294124487f1a2e6dfcb9be62431c1b69de5acf4d0e632f3322e5
DIST tiff-4.3.0.tar.gz 2808254 BLAKE2B 433a087249541f6142dd25b6dc807018639908175b0d73b4af3aa301af2dee3d76184e4689e7b2f1f9b73567ac78d50456ee94fffe00bad6da05375cf2d94d92 SHA512 e04a4a6c542e58a174c1e9516af3908acf1d3d3e1096648c5514f4963f73e7af27387a76b0fbabe43cf867a18874088f963796a7cd6e45deb998692e3e235493
-EBUILD tiff-4.2.0.ebuild 2049 BLAKE2B 3698f96feeafe136a25898946f7b5a003fd40e62eea9463696831d97f12bdfb2ad6e916a9d2adb5e5e59eec6ad8648887b5dd1b26a5f0fe9da28c29d072b1b16 SHA512 3748ebce45e493316c50e99491be799ee9faf78fae345bc5791f6788fdb9a9a2e79bf9ebf801baa2ff6cf0732cc9e70ab3b3a848d73e89d96d1884527d433765
-EBUILD tiff-4.3.0.ebuild 2051 BLAKE2B 7c3633f5676f86d456728bb2d0f3a604e323a09a987f79d932af337bf1b160a6e1dcd7c4b6dd9e68dd01f7e0675e72f1ae7dee8a52428eed44b6706eda2d3ea5 SHA512 2a500fff7bc1e8513d414ec2286cfaba4f6b63ff26fd654ae159cbffa91e60d9aa37fdb50161d5a0ec2cbb2e1890b19725fe952c6b111239870dd4358434eb06
+EBUILD tiff-4.3.0.ebuild 2049 BLAKE2B 3698f96feeafe136a25898946f7b5a003fd40e62eea9463696831d97f12bdfb2ad6e916a9d2adb5e5e59eec6ad8648887b5dd1b26a5f0fe9da28c29d072b1b16 SHA512 3748ebce45e493316c50e99491be799ee9faf78fae345bc5791f6788fdb9a9a2e79bf9ebf801baa2ff6cf0732cc9e70ab3b3a848d73e89d96d1884527d433765
MISC metadata.xml 614 BLAKE2B 65a0c3386b69b69a980f6f6c9d2e18cc2e98c0f5a319af7e61763cea5a584a456715360e2106330b439981e09375701685ddc94f5062c7e206245944282a7b84 SHA512 f7b29a08c37621126390ddb9d8dc42a757da0d228151d725625fe603a26751294895d8795ebfa851ee36863f459c67d04c235a953304d48dca429d24de72761a
diff --git a/media-libs/tiff/tiff-4.2.0.ebuild b/media-libs/tiff/tiff-4.2.0.ebuild
deleted file mode 100644
index 714507392efe..000000000000
--- a/media-libs/tiff/tiff-4.2.0.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="Tag Image File Format (TIFF) library"
-HOMEPAGE="http://libtiff.maptools.org"
-SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
-
-LICENSE="libtiff"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
- jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
- jpeg? ( >=virtual/jpeg-0-r2:0=[${MULTILIB_USEDEP}] )
- lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
- webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
- zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
- zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="test? ( jpeg )" #483132
-
-MULTILIB_WRAPPED_HEADERS=(
- /usr/include/tiffconf.h
-)
-
-src_prepare() {
- default
-
- # tiffcp-thumbnail.sh fails as thumbnail binary doesn't get built anymore since tiff-4.0.7
- sed '/tiffcp-thumbnail\.sh/d' -i test/Makefile.am || die
-
- eautoreconf
-}
-
-multilib_src_configure() {
- local myeconfargs=(
- --without-x
- --with-docdir="${EPREFIX}"/usr/share/doc/${PF}
- $(use_enable cxx)
- $(use_enable jbig)
- $(use_enable jpeg)
- $(use_enable lzma)
- $(use_enable static-libs static)
- $(use_enable webp)
- $(use_enable zlib)
- $(use_enable zstd)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
- # remove useless subdirs
- if ! multilib_is_native_abi ; then
- sed -i \
- -e 's/ tools//' \
- -e 's/ contrib//' \
- -e 's/ man//' \
- -e 's/ html//' \
- Makefile || die
- fi
-}
-
-multilib_src_test() {
- if ! multilib_is_native_abi ; then
- emake -C tools
- fi
- emake check
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name '*.la' -delete || die
- rm "${ED}"/usr/share/doc/${PF}/{COPYRIGHT,README*,RELEASE-DATE,TODO,VERSION} || die
-}
diff --git a/media-libs/tiff/tiff-4.3.0.ebuild b/media-libs/tiff/tiff-4.3.0.ebuild
index 9d512e54335c..714507392efe 100644
--- a/media-libs/tiff/tiff-4.3.0.ebuild
+++ b/media-libs/tiff/tiff-4.3.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://download.osgeo.org/libtiff/${P}.tar.gz"
LICENSE="libtiff"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
RESTRICT="!test? ( test )"
diff --git a/media-libs/vulkan-layers/Manifest b/media-libs/vulkan-layers/Manifest
index c7d7829e6321..0eb22a18fb60 100644
--- a/media-libs/vulkan-layers/Manifest
+++ b/media-libs/vulkan-layers/Manifest
@@ -3,6 +3,6 @@ DIST vulkan-layers-1.2.170.tar.gz 2581751 BLAKE2B 968d17e11a21422003c0c922518b12
DIST vulkan-layers-1.2.179.tar.gz 2771214 BLAKE2B ab9ddde54998ae44f6e3400c721c9b51b347d4424d2118b8b7371e9d1160a76257ca8f8295e9c52dfeba386a09e2b048111f242b7c4b912db1e5748e5dea8762 SHA512 e025c8f36f911bf838ec3a57123aecf44ec8d5ac5d170ef0e6d0ef7bd15789360faa89eb00c19edaa8e60503c4a80300448893d5185cd2880dcd817153e9cc4f
EBUILD vulkan-layers-1.2.162.ebuild 1487 BLAKE2B 39f16295cadbfcd4921db6699ffad0acb9006b11fd6d2b73a4d00ea1bfb3d19586e172656610129af32e01125e8d3f8b0ac9d7434976dd09aa43e217f40da183 SHA512 4d4e14abebaebc304004c7256d4f81ee9522d2f46dfc4450d70f935d1d1ecf87b631d13eb7765be8c8a3570ff2ed6b384971939cd37d33fe698c9a54f0a92781
EBUILD vulkan-layers-1.2.170.ebuild 1484 BLAKE2B a55abcf6025c76230286e85d0ad316695e45273f7200b4d5c85aa9ceb472b3f74345396fd3ca8df2d831733e29406d5d2cb2d671c45a6d9e64bc6859e7fde95d SHA512 a7d29d48fccdad1be28741fe4b788aedfa7c1b948e70b0bea86ad2437de0e351d59e8aa5dcb88e63a096684bc0f292f7151c2c1f6cf93501f1cf9230e025e663
-EBUILD vulkan-layers-1.2.179.ebuild 1501 BLAKE2B 71ff0726d0fee9cb437de7ed4cbe09826bd03c8194ed66e65e48299099d8d53eacc990cbba18b942a2f008666549623f311a7744661c57ade81d044125694003 SHA512 7c7c996f3bbc2751c690f45c0305ffea4077b8c310e9f9f5ad999327f60668613ddf0df531c17ff73cf0222ef2f77524974a769f93b26d888cc0cd85e0ad2070
+EBUILD vulkan-layers-1.2.179.ebuild 1506 BLAKE2B 629d570ffd1689ba3432e9c7b968558ceaa78c03488acb8899c286491425cbd4c22f19177241190828f7720cb9867ef6b1f3a0f53bd9a8460ec85d4486b0e4f6 SHA512 219316065e2dec1b97e2b770da03cf162923adf75eb4c6ee089abe82f51682d9805af2ea7f4e36e8e2fbc9adc2ed7f7e945876483937582a81ccf43048e05f55
EBUILD vulkan-layers-9999.ebuild 1482 BLAKE2B dec0bead5a4c7cbdffc429cfa352f82ba3233c5cb0c94476815dbe6dea75f34a586454c128837ead1f44bc9a12f56c098ff3a22ffa555f4ac6f2d5c3d4358051 SHA512 0fd1f1695bab45ebbdac3868caaf259845f8c11300fa8320c059a6f81389e5ad6f75bf95453272613a72d61558b870dc8b076d36e1fb37e918f7663fdd016126
MISC metadata.xml 440 BLAKE2B 9dd8769693fe4ce6aae2493b4e9f0020da3fec24b35527ccc8a0d2ca014681b3a06019de49d7277286046b23b9b798e84d3c747909e6b7f19eed36d0e2c89012 SHA512 3977758a3f8c9d3648b8a70da5497c4596dfbf28509a84799920c39b6908703353584b01d8264fd39ec2f5fef5d1dba03c239a2848224531f42389de802d14da
diff --git a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
index 2950360f4c72..07c02145ee3c 100644
--- a/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
+++ b/media-libs/vulkan-layers/vulkan-layers-1.2.179.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/media-libs/vulkan-loader/Manifest b/media-libs/vulkan-loader/Manifest
index e5f8546f79ca..58c743bc32cd 100644
--- a/media-libs/vulkan-loader/Manifest
+++ b/media-libs/vulkan-loader/Manifest
@@ -4,6 +4,6 @@ DIST vulkan-loader-1.2.170.tar.gz 1422110 BLAKE2B 8903fceee3172970ee4e9c41df7c9c
DIST vulkan-loader-1.2.179.tar.gz 1430935 BLAKE2B b12fbbac071560ca0542c26cb72379104fdca1973306bf0ed0c1566a4bbc9daf22817f0e8e8389104072188705c8bf3dd6283fcfd396defe2834d2e1565e6be0 SHA512 3186f5d8f93b28a69e731da505ce4e8cd768c8935eda9e6765b834aaa137d249b5cb4c7d0fb1e1e713c3d02b3c9a71ad8554e2ea239dbd5e4def2b96331cd71d
EBUILD vulkan-loader-1.2.162-r1.ebuild 1788 BLAKE2B e6b9dbcb8a6ff5cc1d4f1a445f7505a6dd4749eee774ad500eeeb8e4b966308b842e76ecf2e507c4144f9fa852a66f128ff954ecd4d1bb8917bfbf3b73547bfc SHA512 e2fe1e5a4322c8d7896a55551fe3b059cca82fefbe521846d9e8fdfca237876f6da7a9df1ffba1cef446fcac3a1f3e8adc106349eb0f584a5abb6f744a2f170c
EBUILD vulkan-loader-1.2.170.ebuild 1729 BLAKE2B 85d77609918dc0ad75eea293cfde60a0e9335846f0a830a675494dee107dabf5470aa4433cbd3ec5d1b2103812c606c90a3a026b2e8c140521c130af0d27a572 SHA512 b51620c05c33a040d501a61d09d4d1d4ccbbea20a7f4de0a993a64c8fea360f8843921f195d3eab1e3a03a2af281d2deea2b00faabf7f1d504976ee491d35d90
-EBUILD vulkan-loader-1.2.179.ebuild 1718 BLAKE2B 06a770aff1a8f1687ac393d9cb1f6e18ed4418133eaaf182631f17f9e6fbe53cd9f2b09caf8279c31678b0f8927f29eefe95b5c9f3c7f753e8051de78deb9cc4 SHA512 ef42dc550fd44f131972a10eb223810709b656d403fc853bc9f2f4a4ea9cd80cb71add8474669016f1b271144d6762098816f83b90818c1c736ff34865d94da0
+EBUILD vulkan-loader-1.2.179.ebuild 1723 BLAKE2B cdd03e4754af95391cdd06fcac58361b869974f114f31018322497e4e12d4726f4e991c5cbee62e763ebb65f7058cb8e28b70a5b49f539284f833ca6f00d3fe7 SHA512 9a111e74fb6c6efae372ae29cf0533bd3c5e0ee8dbe3cf04abbc124028c413e875777057b33dd9b57fda90f785cfb21d1eea9a802bd344d04952f267a967ae5b
EBUILD vulkan-loader-9999.ebuild 1729 BLAKE2B e7bf2f7b33ba980cba5bc56e7fe30ad84e80801fe8171222944832f3c2af5afd6736fdc0baed62b77162d75fcbef03a69125febf93adba4af9ac3ea36317b8b2 SHA512 14a7d4da4c473d59203ebe1f8625a62a7aa8a8bf9dd3b55f89b22871fa0e9967c33ca449d768a81412d473cee5be4475c74d15058b989d6c06b15ba22246d061
MISC metadata.xml 414 BLAKE2B 53100d7021d8350e960e2b087bba612ee99f6ce960b63964aa2ba50b1172f5b9fe13fb9addb069ae74cc03292b92fc88838b41eac1083c8779dcb8e0e480d1dc SHA512 6328c52f607ed4ea3ba31430f63df84e942ea3e6726b5107c8840e3869725bd7407b446d4f905765a0c6d6dd04fda643bd2b5e06681f6ac771bbb4fbc8d4c417
diff --git a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
index 79d96bf973de..52680c705249 100644
--- a/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
+++ b/media-libs/vulkan-loader/vulkan-loader-1.2.179.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+ KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
S="${WORKDIR}"/${MY_PN}-${PV}
fi
diff --git a/media-libs/waffle/Manifest b/media-libs/waffle/Manifest
index 71c19ff864a6..0ad22651d44a 100644
--- a/media-libs/waffle/Manifest
+++ b/media-libs/waffle/Manifest
@@ -1,4 +1,4 @@
DIST waffle-v1.7.0.tar.bz2 302120 BLAKE2B 8ebfc78182ff86447d88d92edd6452dae28c1515de5f9639c402203bfb5a135bc493040941420161690a4812a202552266bceb89eee948d0c7aeae55d5b8d3d5 SHA512 ee7b8419e309387fa6d610174ba5dddda97525cef41c9600772b902eddfc4570e940437596d7fb50ee9dc2f5945e723236b61463975d2b9cc0faa150696d24c2
-EBUILD waffle-1.7.0.ebuild 1700 BLAKE2B f26a5b3174fd77e9ab91c271682a2ce258e92d79c562a3e0f6c858830b27ab897e3a67e36e41f8bf85722b267ae7b65dabe496121f82d8eaa15f46480717ffa0 SHA512 749cd982c751bf23d7bb4d8327491f8416bd3ed54e0864b993f02b01a5652185af34453a635b7e51d4e8b9fafb8151a83677a31554c68aa48ec2200f233cdb15
-EBUILD waffle-9999.ebuild 1700 BLAKE2B f26a5b3174fd77e9ab91c271682a2ce258e92d79c562a3e0f6c858830b27ab897e3a67e36e41f8bf85722b267ae7b65dabe496121f82d8eaa15f46480717ffa0 SHA512 749cd982c751bf23d7bb4d8327491f8416bd3ed54e0864b993f02b01a5652185af34453a635b7e51d4e8b9fafb8151a83677a31554c68aa48ec2200f233cdb15
+EBUILD waffle-1.7.0.ebuild 1611 BLAKE2B fceed4dd10256c71ecdbc9df09fccf012aaa561425f151bf9a4d03f6bc4f88c5421adb9b6406e2e453a94a64a48a8e6642305712b0ced440ee6d0bdba74b7eb3 SHA512 1d421acf1d1b71643ddc2feb9801a1841408ae3daf853eae1e3cfcd2461742b73f90dc5013e053ef64b5efa0ee1601dbca138a337427d6d6aa26360fd8a4a143
+EBUILD waffle-9999.ebuild 1611 BLAKE2B fceed4dd10256c71ecdbc9df09fccf012aaa561425f151bf9a4d03f6bc4f88c5421adb9b6406e2e453a94a64a48a8e6642305712b0ced440ee6d0bdba74b7eb3 SHA512 1d421acf1d1b71643ddc2feb9801a1841408ae3daf853eae1e3cfcd2461742b73f90dc5013e053ef64b5efa0ee1601dbca138a337427d6d6aa26360fd8a4a143
MISC metadata.xml 416 BLAKE2B 961afc9a4ed531bd3816c8e7b1c37a9f6be25b912d94b6f79811da67cecd8476964934b9ff943fc98be6177feee1c2eacd3295777a1d873ec1cf3cd58cf20e82 SHA512 850db93f3892afdb36d471b55e911c9cdfc114bcd69b4ce9e59246eb688b145ab5916d9529ded4b913f0cfb6da5fd2d64b7854c9501abec9fd9d860e1953100d
diff --git a/media-libs/waffle/waffle-1.7.0.ebuild b/media-libs/waffle/waffle-1.7.0.ebuild
index 1a2174a6add7..b58cfad30b98 100644
--- a/media-libs/waffle/waffle-1.7.0.ebuild
+++ b/media-libs/waffle/waffle-1.7.0.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
-inherit meson multilib-minimal ${GIT_ECLASS}
+inherit meson-multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
@@ -49,16 +49,12 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false)
+ $(meson_native_true build-manpages)
-Dbuild-tests=false
)
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_install() {
meson_src_install
diff --git a/media-libs/waffle/waffle-9999.ebuild b/media-libs/waffle/waffle-9999.ebuild
index 1a2174a6add7..b58cfad30b98 100644
--- a/media-libs/waffle/waffle-9999.ebuild
+++ b/media-libs/waffle/waffle-9999.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 x86"
S="${WORKDIR}"/${PN}-v${PV}
fi
-inherit meson multilib-minimal ${GIT_ECLASS}
+inherit meson-multilib ${GIT_ECLASS}
DESCRIPTION="Library that allows selection of GL API and of window system at runtime"
HOMEPAGE="http://www.waffle-gl.org/ https://gitlab.freedesktop.org/mesa/waffle"
@@ -49,16 +49,12 @@ multilib_src_configure() {
$(meson_feature X x11_egl)
$(meson_feature gbm)
$(meson_feature egl surfaceless_egl)
- -Dbuild-manpages=$(multilib_is_native_abi && echo true || echo false)
+ $(meson_native_true build-manpages)
-Dbuild-tests=false
)
meson_src_configure
}
-multilib_src_compile() {
- meson_src_compile
-}
-
multilib_src_install() {
meson_src_install