summaryrefslogtreecommitdiff
path: root/media-libs
diff options
context:
space:
mode:
Diffstat (limited to 'media-libs')
-rw-r--r--media-libs/cimg/Manifest6
-rw-r--r--media-libs/cimg/cimg-2.6.7.ebuild26
-rw-r--r--media-libs/cimg/cimg-2.7.2.ebuild (renamed from media-libs/cimg/cimg-2.6.5.ebuild)0
-rw-r--r--media-libs/codec2/Manifest2
-rw-r--r--media-libs/codec2/codec2-0.8.1.ebuild2
-rw-r--r--media-libs/gegl/Manifest2
-rw-r--r--media-libs/gegl/gegl-0.2.0-r6.ebuild2
-rw-r--r--media-libs/libaom/Manifest2
-rw-r--r--media-libs/libaom/libaom-1.0.0-r2.ebuild2
-rw-r--r--media-libs/libglvnd/Manifest4
-rw-r--r--media-libs/mesa/Manifest8
-rw-r--r--media-libs/mesa/mesa-19.2.0.ebuild548
-rw-r--r--media-libs/mesa/mesa-9999.ebuild15
-rw-r--r--media-libs/phonon-vlc/Manifest4
-rw-r--r--media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild (renamed from media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild)0
-rw-r--r--media-libs/phonon/Manifest4
-rw-r--r--media-libs/phonon/phonon-4.11.1.ebuild (renamed from media-libs/phonon/phonon-4.11.0.ebuild)0
-rw-r--r--media-libs/sdl-sound/Manifest2
-rw-r--r--media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild2
19 files changed, 584 insertions, 47 deletions
diff --git a/media-libs/cimg/Manifest b/media-libs/cimg/Manifest
index 36f70deea6dc..38bb340aafbe 100644
--- a/media-libs/cimg/Manifest
+++ b/media-libs/cimg/Manifest
@@ -1,7 +1,5 @@
-DIST cimg-2.6.5.tar.gz 11071672 BLAKE2B 61fa37c2f78e09d6aba0eb867c3797f86ed5a685a114dae779e439c76f4cc9768fada70affd2b14139c7fe7b2e79b61e653165abc47833e3a5cf857af0eb4ca4 SHA512 d8c1e10f702b47f6788fedf27681fe8e7ab3994c8018f96d4964694edda6acb1ca040244d7d1436a5381ec5a12e7a2b991ede6d9ea6d961ae6c4842feb2bf141
-DIST cimg-2.6.7.tar.gz 11072149 BLAKE2B 0695215eb57375ed216ab1b148bb09316af8f6e0191589e4a9a91b25355857a75d2f351d2e52584e626c8ff1f2aad940df4f8f0ee4c331ded62582804c3ce765 SHA512 9dadc0b7b1017ba19fb36232a32278c30628930b7c76a646ca343751754e10e1a1eb8a0c670ab308c437738ec28ceb324f6511ffb9c3bceabede01eb34b8a2e6
DIST cimg-2.7.0.tar.gz 11076642 BLAKE2B db2c8715f25ec160cdf41ac2cc1bee366ef49dbd0b3e5bd5bf6b4b8a0ba4c880f6af4cbd78d843abf0edd99ca45337fd1bd5dc25779b94984a64f5217c3430a5 SHA512 b1b12f4b36d7d799da330bb2854732e6207aa73b4d28bf9a13408154664c2d518652065738d1964da00a022449a3b618b25b72ec17deec6df463ff6811c21b21
-EBUILD cimg-2.6.5.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
-EBUILD cimg-2.6.7.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+DIST cimg-2.7.2.tar.gz 11204962 BLAKE2B dce4198e23d814fc4bd481388ca959cc831927329c5611b057aeb88cb5c3f80facc87433482ee6c1048b8478147db25ca592ecafe18528def156f30f626eef22 SHA512 ad251d2d433497be2fbf812dba7efecfdedc1b38770c34d600f5848fe91c130b8952c8d86fcd58894849175aa31358225e255b1558173ead79c47a985c7b11b2
EBUILD cimg-2.7.0.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
+EBUILD cimg-2.7.2.ebuild 589 BLAKE2B ba27cc3c33dcecbd207d4a656893daa6cfafa4bf745da82a312075db4c23c7379348e1b37194afec9252c17c887cf342406c9fbc25dfd24119ca6f4b3085ba58 SHA512 1e6aba42be7cc3ce84384e49b2a2e59aafd0d0ffae2f07bed0fcdcc0dc9cd164c28b49f03af07ce15a0bbd25cdea4aee24fee4c4d425e58fac03ffa52b6d335e
MISC metadata.xml 386 BLAKE2B f7a15bc91bb1eb327b7a491dcf59b1ebadac6e36560bfbecaa07f7d3b189bfb86df12f1c2214b86cc83e70bce941f44a9424f13865c963ba38e9d992ca89075d SHA512 7273a9131bce0af6a2ae93e4893be6beadf25ed510dd3d32c267ea4400e0524929c49df92627fa3aa83ab539075d3404c7e5a2df77628261253aaced1216d59f
diff --git a/media-libs/cimg/cimg-2.6.7.ebuild b/media-libs/cimg/cimg-2.6.7.ebuild
deleted file mode 100644
index a3f01bc9ba22..000000000000
--- a/media-libs/cimg/cimg-2.6.7.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="C++ template image processing toolkit"
-HOMEPAGE="https://cimg.eu/ https://github.com/dtschump/CImg"
-SRC_URI="https://github.com/dtschump/CImg/archive/v.${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="CeCILL-2 CeCILL-C"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc examples"
-
-S=${WORKDIR}/CImg-v.${PV}
-
-src_install() {
- doheader CImg.h
- dodoc README.txt
-
- use doc && dodoc -r html
- if use examples; then
- dodoc -r examples
- docompress -x /usr/share/doc/${PF}/examples
- fi
-}
diff --git a/media-libs/cimg/cimg-2.6.5.ebuild b/media-libs/cimg/cimg-2.7.2.ebuild
index a3f01bc9ba22..a3f01bc9ba22 100644
--- a/media-libs/cimg/cimg-2.6.5.ebuild
+++ b/media-libs/cimg/cimg-2.7.2.ebuild
diff --git a/media-libs/codec2/Manifest b/media-libs/codec2/Manifest
index de53db4ba74a..10a57e5e41a6 100644
--- a/media-libs/codec2/Manifest
+++ b/media-libs/codec2/Manifest
@@ -1,4 +1,4 @@
AUX codec2-0.8.1-unused-deps.patch 2966 BLAKE2B 886ea88d068b8c6058468c0dffa1071443ab993ff169a9b38b628767ebb866e0e05feba2fdb1a5f108dab15d2f4a06acc228d4fbee7b005ada1185e48ae26f94 SHA512 89c75477ce2ebed216c2239b237c5c9a502753ac55d73808702230b89f81e6a2ce176b0613f258655e6a83e85b5943ccbd7bccecf650117ff61e7d49e386be06
DIST codec2-0.8.1.tar.xz 8868212 BLAKE2B 2c0ba40df02cc6791386243e75f97ce17026842b13384e4a330cf22ea4bef5db75ddbc764dd4045027a6e2bf2eeba9b509b372aeaef81bb235e3d6c2930b01fe SHA512 4f2633d510ab68102b77b15492d87d25fe5fa96d90dc1ca6b3bf7deea04a3765382bfbbde981c9cac70d3e9d091c56b2099544b09b36a84ed62cb9087c9bb819
-EBUILD codec2-0.8.1.ebuild 662 BLAKE2B 09fc9a1d2c39243430d0f5d9cb1047ce8d929214571565e3e6dea80a655f1e1c1dcb981e9ceebc0b664d282eab473d6bfe7306653a76d0c07d827b843bdee765 SHA512 4fd83bd09a13721628c280998626df962fea590d65a9b9c9447cff93752f73e1f89292002c5cbc8d19469da914da413164db6167e8a1a82ffe6c38b5d6167ecc
+EBUILD codec2-0.8.1.ebuild 661 BLAKE2B 15659fe210b53f72e9ef05d38a80f77ba5d10e4057a214041ab895b5f4a55bd7e1c4ee0e0128c80c5327c42a591c32be7cb852a0ae6fd50bfa05d2caa2eb0ffc SHA512 5f32120d19446ba3ee56f166c774700cd258851f08ff93097f561252003b6ab108c1d794e1695096e82b11a86452d320f4f245758c040a62266238dfe071e365
MISC metadata.xml 249 BLAKE2B f7f8f071ecba933f3d39b0b60983281d59299b92de9375a60ab4109d7202800cb790bce0c426227f04b3e2624b1adb20876145741355abc6a4938b8b9698d144 SHA512 9a100fb26586365eda99724330a03a512f4d0be18d39c3a195ba02c2fc841edeee99d22512acf5a058a3b978d3a74f4d963a5aff9aa343b6cb4086cdfefe6343
diff --git a/media-libs/codec2/codec2-0.8.1.ebuild b/media-libs/codec2/codec2-0.8.1.ebuild
index dc8b9ab86479..490849594285 100644
--- a/media-libs/codec2/codec2-0.8.1.ebuild
+++ b/media-libs/codec2/codec2-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://hobbes1069.fedorapeople.org/freetel/codec2/${P}.tar.xz"
LICENSE="LGPL-2.1"
SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
IUSE="examples"
PATCHES=( "${FILESDIR}/${P}-unused-deps.patch" )
diff --git a/media-libs/gegl/Manifest b/media-libs/gegl/Manifest
index 45e00a33dbf2..7409183ed7c8 100644
--- a/media-libs/gegl/Manifest
+++ b/media-libs/gegl/Manifest
@@ -19,7 +19,7 @@ DIST gegl-0.4.14.tar.bz2 7209142 BLAKE2B a056f02c3fa9e075aa62cb8cb0d8183560ac66f
DIST gegl-0.4.16.tar.bz2 7304904 BLAKE2B a3f6021ed7b9d8b784b909057fcdc39e73b6b8b811009adae3c4a6805263e9a887e874ad662d8cd5c673ae324fe39e8f0299651139783fd3ece08675b70896fd SHA512 38eacbd53d9993ca99d061bf6f80553a86ff06bf42d1710403ac5f15629ccc9b1f4395ee7700a04cebc954ed7fe8745c5bef85453c9c56d89681dd53a1552b27
EBUILD gegl-0.2.0-r2.ebuild 4715 BLAKE2B 4c6e8445587cff6ad1c44eee4b40bcbf57e5d573242e8794aedeba19b6065a58d02c72a1951f2b31a5601c6b124e30ebb207a06f5aadc5e4b846294f717ec906 SHA512 16048b6ac471d9af936df2285380303012fd538d57b35c67b073ff54ad952417260cbea51403c11844547a4f69c16e65eb460fbfb43ef05bbb9e8dd338102b00
EBUILD gegl-0.2.0-r5.ebuild 4922 BLAKE2B ede5b2bd0934ab7a5c82ce33532925f8c0b10b30bbc8cb89744cd9603c066398a787a99b308635760315aa231dae4eb35da1db25adb17ccf93c11f0c00b9e79e SHA512 d493f0217dc590c8b1df84fe43b08f44c6f55d6e720edf7a091b36cf7ea6c36ad06b4df2c930d6a7ff9595d15d220c8cf1d4256db2fef90d5bdf1b3ac8bf5a3d
-EBUILD gegl-0.2.0-r6.ebuild 4969 BLAKE2B 495c5c1be600b709fe63af6e20702368a307766f7175c7f5b953bd00c1df6e91c8ffd13f32be27abdc1450f9a548c8f7566543719476028dc92ed51b61d6dbce SHA512 a8fd04a2449fbd2cbbc4227c797aaf0d5dd42167e87b599f0203f24e61516318a242a091180de5956d8a473f76520123bb661c123b20a00cd72102e2e788f2b6
+EBUILD gegl-0.2.0-r6.ebuild 4968 BLAKE2B c60c32f5b1ef68a1908de781b50e39d14dea65a3b01af8f9c63b7ac9ebd08aba7c92dbe55d1d7680a5f76ab44581c425c61eb220b8923c61ceefbecb9255c992 SHA512 93bed4a3686d8b242fc1c6ad7d3f1437e40636be0b450d942cd41a24b4db94ba78a4a376780e4f88df06777a3b7ac074e8f790fe35ffb971ec1d7e35807398f3
EBUILD gegl-0.3.0-r1.ebuild 5321 BLAKE2B 917874f80c58690d7053366b5cbf11ebe10fca3d775515d9255b4d966c2d894617d75dc2134af61f497c5d09c4fe05c7b9bb156e3783fbab628ff89adb947257 SHA512 c01caae58f8008909e131ee03fcd92d225703d13a442df9371e77d0dafb3245778a244930b6827c714d66beb297e8829d220ed2a51bd02416ec010bd726aa35a
EBUILD gegl-0.3.0.ebuild 5240 BLAKE2B 46019ac823a517365f33f28231b6f77b93c4b10eb9378e511a453b795eb5ba9ef08391e6a2687e724357befead82bce42cd4bf3c71962774f0e128c668191782 SHA512 31a7619e95d995f6fc4ae46bd404cd1a526970c4e49869c4b78623528588b708da6c8db60c2bbe010bae0601e3ca387bee520adcd3eea42c21cb02bf290ac9d3
EBUILD gegl-0.3.26.ebuild 5174 BLAKE2B c7808b15a796bedce4067ab5ba961edad3f370119aedf81b17faf7d70a5a5f3da2f58acbe2f3c41edf59859a822cb07f7684d56db0bbec25f32b39854a4b4f6a SHA512 ff10de4870e4393e38036cd0dc81e2dfafd2ad713ba98f8c3847b96e5aac4e9ea842232f8c2dffe134eb08975dfd8063fc4dc7ec513e80d113916f84411977c6
diff --git a/media-libs/gegl/gegl-0.2.0-r6.ebuild b/media-libs/gegl/gegl-0.2.0-r6.ebuild
index 9aeec0f2c2e2..a7573fa095ca 100644
--- a/media-libs/gegl/gegl-0.2.0-r6.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://download.gimp.org/pub/${PN}/${PV:0:3}/${P}.tar.bz2"
LICENSE="|| ( GPL-3 LGPL-3 )"
SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ia64 ~mips ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
IUSE="cairo debug ffmpeg jpeg lensfun libav cpu_flags_x86_mmx openexr png raw sdl cpu_flags_x86_sse svg umfpack" # +introspection vala
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 2b664c677ef9..28d08aaa1f6f 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -4,6 +4,6 @@ AUX libaom-1.0.0-version.patch 403 BLAKE2B 8ab115aecb2251750f964bafea7e74ea8e4ed
AUX libdirpc2.patch 2481 BLAKE2B 6236c31784ebd76884e716857e665824f9b325a97c2cb8e01a38c97b0398141202d7cab0a8d9b69b037ad8ba0b7d5e293bda3e2c491906ac6dd9555f7d4631ec SHA512 ec47d5b026c4b687649a2ce46500376103ae3fef21cba2cb564771c3738dba4e61e51858875516f884ab4604b0c160e6ee07b98e6740643e18f596c624df1ccb
AUX pthread_lib2.patch 535 BLAKE2B 17eabab9e5d7b9d22b4f25ec8006e7e48bc3683b88f560bcb092234a1448ff47ae20d6ba04efb1af5742d7fc253acf9c944322acc8e8ed1acfad0b08df358eda SHA512 be19983342bae014409dd22c2e94ce11a5003a8ded3547a287ff71f53ef63ce1a1cfd6cdfbbfbf36deece2d3c1d9fb3e8e679598698a045229f79ba704976001
DIST libaom-1.0.0.tar.gz 2775454 BLAKE2B 09b891d365804f0c086785a00760af3191b40fc66fc752294e915b54454171fb47d3d1b037fb6d276727772ceec3177d78c14f90a2b01e28250d2de735bf02ec SHA512 131512ef286cb138047bb56dea54196f9a8d2b0d9f3d7689299f185338e5c03ee658b0cfe017a099f1a6be351a3a7157204dea70d2645a1d0a9249fd582c3fa4
-EBUILD libaom-1.0.0-r2.ebuild 2607 BLAKE2B 3502685fc87d1a9f93dc19d4bbd846f58d13f80b509aea1281584e239e4d67aecd9583ffad4035fb60ebbb1ff41dea96a9d98e93616212005afb7b6ac9e6da77 SHA512 7b66dbcfae801b6c644d0fa0d3484b26fc65fb068f7f96edb5f6ae8c1dae8b7d73f88f1a8d5a3c7df8082d96cb938eb0e638d34082706d0ee2ee09011e9529da
+EBUILD libaom-1.0.0-r2.ebuild 2606 BLAKE2B b6dc10df92853a4954f48aa9903c16782d9dab22c1488bac1de4445a4683b2fb5071521e8ba18a08ea9b74a1697649455ecb01b9a2978878f06db0b140ed9330 SHA512 43656049aec79713a710d629b6de2457c5c8cbeb5aaf1b22acb43dab38b1a3f42c698c68df3b1cb757dc9ee8899be41a1efd8a1ecec3019211a2c09eb7976f63
EBUILD libaom-9999.ebuild 2117 BLAKE2B 72780d6b75fd008e7b0693962e811a8dd14afcbfa23d2a25b8e5b63af5c9cffee49e5511645929a80f795d15ddeb015f5e513117034d0a09e39e5500df8209f5 SHA512 6dffb6b857531c56302d91953e09c84414bd8cf07ba0b0631e990c7edc1cdc8765f85f95f86a9bda9fbd4c851bce0f686638b2fb4b4dfddea3eb96ce6bc9ead2
MISC metadata.xml 223 BLAKE2B 1a772bb5add75cb4343b09bb2456adcd5e46896daaab4091ab64b667c5fa1a4adab0940015a3e755df3d6540b456694dc67ef9581d02d40c63b89290f8f83e43 SHA512 27b688917e0b1c4a75ea34c97d2d67d309573941492ab04124de11034f3b2796480f02408d86e2eba77ca2000722ea6606fe12a49622c04f9e2c1fa27b6fc8db
diff --git a/media-libs/libaom/libaom-1.0.0-r2.ebuild b/media-libs/libaom/libaom-1.0.0-r2.ebuild
index 3c693bd5efcc..56a76c5768e5 100644
--- a/media-libs/libaom/libaom-1.0.0-r2.ebuild
+++ b/media-libs/libaom/libaom-1.0.0-r2.ebuild
@@ -16,7 +16,7 @@ else
SRC_URI="mirror://gentoo/${P}.tar.gz"
S="${WORKDIR}"
fi
- KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86"
+ KEYWORDS="~alpha amd64 arm arm64 ~hppa ia64 ~ppc ~ppc64 ~sparc x86"
fi
DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libglvnd/Manifest b/media-libs/libglvnd/Manifest
index d967f76be13d..a08b7a0bbb23 100644
--- a/media-libs/libglvnd/Manifest
+++ b/media-libs/libglvnd/Manifest
@@ -1,7 +1,11 @@
+<<<<<<< HEAD
AUX libglvnd-1.1.1-Add-pkg-config-files-for-EGL-GL-GLES-and-GLX.patch 6596 BLAKE2B 0528a825fbbfe8c7530e841c1542a9a4d3e08159abc379f09df3789ccbde583243c1ed478ab14638ffef7b7949090a24b2a9204cb5b4641f8b9bef4e1540bd3d SHA512 5c3ea6d4f0c683945ff2178fe43cc2ac3876bba5f66dc9291a8129213ba3235a732fe86b53bfeeb5df08134ed782967027b7387c12e9bc1a1be795e0c1400a55
DIST libglvnd-1.1.1.tar.gz 1851222 BLAKE2B 58a6e997b64bd22c4af0136fb37959f45df4a738bfcff205d7efb7ac08e7897a19164cb36f11d556c5a1bd3d46f0f1df3f89a36b7352b8a880c3570b2cf462cf SHA512 9106ae3cd3bdce8f4def3c7e08645f76e1a65f51e184510088e79b834899061d357422376e0efd56e1bc9dc7d3150f74837f43bd3e6c4c44faa3859844ab21b7
DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
EBUILD libglvnd-1.1.1-r1.ebuild 1050 BLAKE2B e01e103c7c4a719cfce84ffd9fe061646cecaac2a3cbdb34fbdf316f373c3f25c3dc398d3437aba41887a08c454f1c6799ff9221bee2d4c31a6f9ee5108d237a SHA512 fb754f35e79185a66351fbe62e82d4613a9c2a218c05354d58d5648e1358a3f29ae3018bfafcaa7487bec3a528c7354f16d57d16733563473138f35a868e034c
+=======
+DIST libglvnd-1.2.0.tar.gz 2030275 BLAKE2B b6b147f431ba9a177be9eada7af0e4ffc05c412e29f3a257746d74ff99078ecf87f7e66a97f7c1ce2779b3224bf3e7d1c4ab57c437074ae754e646c9275dae7f SHA512 f09a3ab3f1ba7397616cf2b0baf4385bd2127abb06817f8b383549cb21f36802be24a29598d7bfdd4c410b9ea95335b4ffc52529824dc88a719af52432c6b74c
+>>>>>>> next
EBUILD libglvnd-1.2.0.ebuild 1155 BLAKE2B 9d48e9c1637a31fb33d99cf674c22c73f7e2b7d8a746d3644c8b6113fe982b9848f3936f4900aa312d30c89dc4b1898da4daba6ccfaab694fee37a728f63ef2f SHA512 40c9c5e70595266c6835bece0765191767b5e3811fe49e86e94821cb44914351f812c7f4e9c7619ec8892f165b669fc9001e29a9c866304a081d81a33313d455
EBUILD libglvnd-9999.ebuild 1199 BLAKE2B 029902c0c826c0ee71314c1a9c24fe022a04327bf5addd80bc937e9007bcd4e043a29dd94de5810b4d385ecbb68229d27ac05aa51d9c7a1417a61076f77dda74 SHA512 9b84a3b424481d5c069444bb76e2d2c9572b058e245ef4145a6833ad891b6aac3e95417e5c844da7ee7ec2fc8471871bba4dc4441f02c2e21308482def70169d
MISC metadata.xml 314 BLAKE2B 34c95a3e321c3059bca39c7beb5b7b15e8085b54affb267947fb3676018fa183040a157716e979c5e0381acdea6e738294b37841e75da308c3632fb3587dec33 SHA512 fa12f7fa880b0721baf2eb40b9fd8a68e51c143dd8ede7a199c5afcd5a208f84c51a80fc1f4bc68b266338bac8bf4137b2443d88567150f2c54b2f11913df89c
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 4bd8157e4135..10d7c3100f14 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,8 +1,16 @@
DIST mesa-19.0.8.tar.xz 11967592 BLAKE2B 91a46b67bdb8cb3ab4c7337be7c2b0dc6ab5ec8cc126afc2d8af8d056bff0392a5b443c26304bf4c68472eb6ba16d29ca248c1fc0c0f2dd6af03d3e10d3ec1b3 SHA512 fbddc3a74f223564343027380af776b3fa5d63fe1af4e34121273235d1c6eced96439f601eb19bf658eb927aff3965b520f0329fcbd4650f3112167303e1746d
DIST mesa-19.1.7.tar.xz 10941152 BLAKE2B 6be14ddac404668bdd8b7b8756388019c3610ac41b65a7723a419b97b7eccbca666ad6d904f4cde186c4b171e056636a8a6a5727e30963c8fa177d7861bd6cfb SHA512 0865b5f91e5daa00e1da2b3d8b65fe5d2ff6332372bf8fec7d671d05d8d64ec5a7abea1858cdfc506c76b7226d2bea0af3426565f156b796d8e0f949ea33dc15
+<<<<<<< HEAD
DIST mesa-19.2.0-rc4.tar.xz 11458940 BLAKE2B e173143f01efbbe98e11d37be4e66ac5d1fb739f15796cd25b6fee3b86cb384803e21d9b65880f7b0ccbd51f956e5cf5c99a2edbf5ec1ff472a90cf26bb7640b SHA512 a00422b4278951e4706671fe1507d5ba323a3badaceb03649dde425216fbb3cd83a21785374c75135e90fc5c6c67963f8aad0c33dac1cedaed3b69f2cd9f1c9b
EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d
EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112
EBUILD mesa-19.2.0_rc4.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d
EBUILD mesa-9999.ebuild 14394 BLAKE2B 2aa8740cce7c6fe3973dba6da9d0223f6263dda594a046c1267f96b799dc8b9429e8cdcfe8968dd57891dd90faeb1c3ab454cdaae00a3a2bee47421905f65055 SHA512 61949a0e14489d8850ab94de369120457be092cd68ee033fb818a0c8ab36462e1d07cfd9c9bcb65bdfa8b382d7404acbc6df7b857813b966b3334c7598055b1d
+=======
+DIST mesa-19.2.0.tar.xz 11464180 BLAKE2B f2f260e9efb928532501ff4f1c0137621f954991ef6d30fbdc61c28fb95e3ddb9e81276d345bc7bff6871e603dcbb29073b788427d0dea565dfa9b7f8b88966d SHA512 7278bbfba9c29fe91d1959ff1a48422e917db85287460523d12ae8c6d7f49f76e9636bf4c0d8d7d89e5569b3c67135f1b23b8f6c9d52d39413d8ec22e3bb40f0
+EBUILD mesa-19.0.8.ebuild 13852 BLAKE2B c005b9103e2bac385a5c4889ab89a5809ea9a989aa657cf9899b94634d49dc4eb1f31a791aa0aa40482b9a0b64a85200006dbfa1758e7d2a73a5029d585ac320 SHA512 3f496e20c5248ca8c4c83ad18db01bd3ad129496d24020621e85ff68e90b89d4ec5c80b7ebe651f6ee106d340e0afe017f6e9b985d27f012c3c770e601cb7a0d
+EBUILD mesa-19.1.7.ebuild 14263 BLAKE2B 3ee726125703fdb9475f26c34640b8af851a0b4364452fd8becb435d2442649d251e4b591756ca6e5e5c2961428be452005b13f4d6754e42a32d58d52b9f35e5 SHA512 3015fd097bebc9b8f299b3bba9b723aae05d037757f118054667f16dfe73c5e003ce790bc1ebe5778c3b196650b2094e0a5b1f572153bdfababe765351bfa112
+EBUILD mesa-19.2.0.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a
+EBUILD mesa-9999.ebuild 14548 BLAKE2B a648da33f288b199cec41d64f360bfdfd3917a0a3935ee22598f5bbfbcb3586d7af124e4053345b1b635202ae856b2906543c3b8cb7b056eed18d284301fcc0d SHA512 66ef9c515e95339cf30cdb36d8e3664aae93584ca5562fcfd113c97faa9e8706baf80af1626cc24b821f80e855baebe3f6338afef142811e80e68c021ac0f33a
+>>>>>>> next
MISC metadata.xml 2000 BLAKE2B c38c6f85a08bdb71f3921847d03c8a2849a43def253c200cb3f21d68142f3a5065cb2e1a2170093d91f3aba34c99fdd9bab840f2bc62ce05f11484b2edb3cb40 SHA512 d55b9c0ff6a97d995a150ee10643c869359370222ab29712da25f69c5671a4e6988e2d508c956082cc7165db96f42289d25daecf230d36efe2240e4f377d1c72
diff --git a/media-libs/mesa/mesa-19.2.0.ebuild b/media-libs/mesa/mesa-19.2.0.ebuild
new file mode 100644
index 000000000000..27301deb54b0
--- /dev/null
+++ b/media-libs/mesa/mesa-19.2.0.ebuild
@@ -0,0 +1,548 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_5 python3_6 python3_7 )
+
+inherit llvm meson multilib-minimal pax-utils python-any-r1
+
+OPENGL_DIR="xorg-x11"
+
+MY_P="${P/_/-}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/"
+
+if [[ ${PV} == 9999 ]]; then
+ EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git"
+ inherit git-r3
+else
+ SRC_URI="https://mesa.freedesktop.org/archive/${MY_P}.tar.xz"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+RESTRICT="
+ !test? ( test )
+"
+
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${RADEON_CARDS} freedreno i915 i965 intel iris lima nouveau panfrost vc4 virgl vivante vmware"
+for card in ${VIDEO_CARDS}; do
+ IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm
+ lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
+ vdpau vulkan vulkan-overlay wayland +X xa xvmc"
+
+REQUIRED_USE="
+ d3d9? ( dri3 || ( video_cards_iris video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) )
+ gles1? ( egl )
+ gles2? ( egl )
+ vulkan? ( dri3
+ || ( video_cards_i965 video_cards_iris video_cards_radeonsi )
+ video_cards_radeonsi? ( llvm ) )
+ vulkan-overlay? ( vulkan )
+ wayland? ( egl gbm )
+ video_cards_freedreno? ( gallium )
+ video_cards_intel? ( classic )
+ video_cards_i915? ( || ( classic gallium ) )
+ video_cards_i965? ( classic )
+ video_cards_iris? ( gallium )
+ video_cards_lima? ( gallium )
+ video_cards_nouveau? ( || ( classic gallium ) )
+ video_cards_panfrost? ( gallium )
+ video_cards_radeon? ( || ( classic gallium )
+ gallium? ( x86? ( llvm ) amd64? ( llvm ) ) )
+ video_cards_r100? ( classic )
+ video_cards_r200? ( classic )
+ video_cards_r300? ( gallium x86? ( llvm ) amd64? ( llvm ) )
+ video_cards_r600? ( gallium )
+ video_cards_radeonsi? ( gallium llvm )
+ video_cards_vc4? ( gallium )
+ video_cards_virgl? ( gallium )
+ video_cards_vivante? ( gallium gbm )
+ video_cards_vmware? ( gallium )
+ xa? ( X )
+ xvmc? ( X )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.99"
+RDEPEND="
+ !app-eselect/eselect-mesa
+ >=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
+ >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
+ libglvnd? (
+ >=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}]
+ !app-eselect/eselect-opengl
+ )
+ !libglvnd? (
+ >=app-eselect/eselect-opengl-1.3.0
+ )
+ gallium? (
+ unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] )
+ llvm? (
+ video_cards_radeonsi? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_r600? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ video_cards_radeon? (
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ )
+ lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] )
+ opencl? (
+ dev-libs/ocl-icd[khronos-headers,${MULTILIB_USEDEP}]
+ dev-libs/libclc
+ virtual/libelf:0=[${MULTILIB_USEDEP}]
+ )
+ vaapi? (
+ >=x11-libs/libva-1.7.3:=[${MULTILIB_USEDEP}]
+ video_cards_nouveau? ( !<=x11-libs/libva-vdpau-driver-0.7.4-r3 )
+ )
+ vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] )
+ xvmc? ( >=x11-libs/libXvMC-1.0.8:=[${MULTILIB_USEDEP}] )
+ )
+ wayland? (
+ >=dev-libs/wayland-1.15.0:=[${MULTILIB_USEDEP}]
+ >=dev-libs/wayland-protocols-1.8
+ )
+ ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}]
+
+ video_cards_intel? (
+ !video_cards_i965? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ )
+ video_cards_i915? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+ vulkan-overlay? ( dev-util/glslang:0=[${MULTILIB_USEDEP}] )
+ X? (
+ >=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxshmfence-1.1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXdamage-1.1.4-r1:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXext-1.3.2:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libXxf86vm-1.1.3:=[${MULTILIB_USEDEP}]
+ >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}]
+ x11-libs/libXfixes:=[${MULTILIB_USEDEP}]
+ )
+"
+for card in ${RADEON_CARDS}; do
+ RDEPEND="${RDEPEND}
+ video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+ "
+done
+RDEPEND="${RDEPEND}
+ video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] )
+"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling one than more slot
+# simultaneously.
+#
+# How to use it:
+# 1. List all the working slots (with min versions) in ||, newest first.
+# 2. Update the := to specify *max* version, e.g. < 10.
+# 3. Specify LLVM_MAX_SLOT, e.g. 9.
+LLVM_MAX_SLOT="10"
+LLVM_DEPSTR="
+ || (
+ sys-devel/llvm:10[${MULTILIB_USEDEP}]
+ sys-devel/llvm:9[${MULTILIB_USEDEP}]
+ sys-devel/llvm:8[${MULTILIB_USEDEP}]
+ sys-devel/llvm:7[${MULTILIB_USEDEP}]
+ )
+ sys-devel/llvm:=[${MULTILIB_USEDEP}]
+"
+LLVM_DEPSTR_AMDGPU=${LLVM_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+CLANG_DEPSTR=${LLVM_DEPSTR//llvm/clang}
+CLANG_DEPSTR_AMDGPU=${CLANG_DEPSTR//]/,llvm_targets_AMDGPU(-)]}
+RDEPEND="${RDEPEND}
+ llvm? (
+ opencl? (
+ video_cards_r600? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${CLANG_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${CLANG_DEPSTR}
+ )
+ )
+ )
+ )
+ !opencl? (
+ video_cards_r600? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ !video_cards_r600? (
+ video_cards_radeonsi? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeonsi? (
+ video_cards_radeon? (
+ ${LLVM_DEPSTR_AMDGPU}
+ )
+ )
+ )
+ !video_cards_r600? (
+ !video_cards_radeon? (
+ !video_cards_radeonsi? (
+ ${LLVM_DEPSTR}
+ )
+ )
+ )
+ )
+ )
+"
+unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
+
+DEPEND="${RDEPEND}
+ valgrind? ( dev-util/valgrind )
+ X? (
+ x11-libs/libXrandr[${MULTILIB_USEDEP}]
+ x11-base/xorg-proto
+ )
+"
+BDEPEND="
+ ${PYTHON_DEPS}
+ opencl? (
+ >=sys-devel/gcc-4.6
+ )
+ sys-devel/bison
+ sys-devel/flex
+ sys-devel/gettext
+ virtual/pkgconfig
+ $(python_gen_any_dep ">=dev-python/mako-0.8.0[\${PYTHON_USEDEP}]")
+"
+
+S="${WORKDIR}/${MY_P}"
+EGIT_CHECKOUT_DIR=${S}
+
+QA_WX_LOAD="
+x86? (
+ usr/lib*/libglapi.so.0.0.0
+ usr/lib*/libGLESv1_CM.so.1.1.0
+ usr/lib*/libGLESv2.so.2.0.0
+ usr/lib*/libGL.so.1.2.0
+ usr/lib*/libOSMesa.so.8.0.0
+ libglvnd? ( 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 opencl; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi; then
+ ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi"
+ fi
+ fi
+
+ if use vaapi; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use vdpau; then
+ if ! use video_cards_r300 &&
+ ! use video_cards_r600 &&
+ ! use video_cards_radeonsi &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+ fi
+ fi
+
+ if use xa; then
+ if ! use video_cards_freedreno &&
+ ! use video_cards_nouveau &&
+ ! use video_cards_vmware; then
+ ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware"
+ fi
+ fi
+
+ if use xvmc; then
+ if ! use video_cards_r600 &&
+ ! use video_cards_nouveau; then
+ ewarn "Ignoring USE=xvmc since VIDEO_CARDS does not contain r600 or nouveau"
+ fi
+ fi
+
+ if ! use gallium; then
+ use lm-sensors && ewarn "Ignoring USE=lm-sensors since USE does not contain gallium"
+ use llvm && ewarn "Ignoring USE=llvm since USE does not contain gallium"
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain gallium"
+ use vaapi && ewarn "Ignoring USE=vaapi since USE does not contain gallium"
+ use vdpau && ewarn "Ignoring USE=vdpau since USE does not contain gallium"
+ use unwind && ewarn "Ignoring USE=unwind since USE does not contain gallium"
+ use xa && ewarn "Ignoring USE=xa since USE does not contain gallium"
+ use xvmc && ewarn "Ignoring USE=xvmc since USE does not contain gallium"
+ fi
+
+ if ! use llvm; then
+ use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm"
+ fi
+}
+
+python_check_deps() {
+ has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+ # warning message for bug 459306
+ if use llvm && has_version sys-devel/llvm[!debug=]; then
+ ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm"
+ ewarn "detected! This can cause problems. For details, see bug 459306."
+ fi
+
+ if use llvm; then
+ llvm_pkg_setup
+ fi
+ python-any-r1_pkg_setup
+}
+
+multilib_src_configure() {
+ local emesonargs=()
+
+ if use classic; then
+ # Intel code
+ dri_driver_enable video_cards_i915 i915
+ dri_driver_enable video_cards_i965 i965
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ dri_driver_enable video_cards_intel i915 i965
+ fi
+
+ # Nouveau code
+ dri_driver_enable video_cards_nouveau nouveau
+
+ # ATI code
+ dri_driver_enable video_cards_r100 r100
+ dri_driver_enable video_cards_r200 r200
+ if ! use video_cards_r100 && \
+ ! use video_cards_r200; then
+ dri_driver_enable video_cards_radeon r100 r200
+ fi
+ fi
+
+ emesonargs+=( -Dplatforms=surfaceless$(use X && echo ",x11")$(use wayland && echo ",wayland")$(use gbm && echo ",drm") )
+
+ if use gallium; then
+ emesonargs+=(
+ $(meson_use llvm)
+ $(meson_use lm-sensors lmsensors)
+ $(meson_use unwind libunwind)
+ )
+
+ if use video_cards_iris ||
+ use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use d3d9 gallium-nine))
+ else
+ emesonargs+=(-Dgallium-nine=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vaapi gallium-va))
+ use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers )
+ else
+ emesonargs+=(-Dgallium-va=false)
+ fi
+
+ if use video_cards_r300 ||
+ use video_cards_r600 ||
+ use video_cards_radeonsi ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use vdpau gallium-vdpau))
+ else
+ emesonargs+=(-Dgallium-vdpau=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_nouveau ||
+ use video_cards_vmware; then
+ emesonargs+=($(meson_use xa gallium-xa))
+ else
+ emesonargs+=(-Dgallium-xa=false)
+ fi
+
+ if use video_cards_r600 ||
+ use video_cards_nouveau; then
+ emesonargs+=($(meson_use xvmc gallium-xvmc))
+ else
+ emesonargs+=(-Dgallium-xvmc=false)
+ fi
+
+ if use video_cards_freedreno ||
+ use video_cards_lima ||
+ use video_cards_panfrost ||
+ use video_cards_vc4 ||
+ use video_cards_vivante; then
+ gallium_enable -- kmsro
+ fi
+
+ gallium_enable video_cards_lima lima
+ gallium_enable video_cards_panfrost panfrost
+ gallium_enable video_cards_vc4 vc4
+ gallium_enable video_cards_vivante etnaviv
+ gallium_enable video_cards_vmware svga
+ gallium_enable video_cards_nouveau nouveau
+
+ # Only one i915 driver (classic vs gallium). Default to classic.
+ if ! use classic; then
+ gallium_enable video_cards_i915 i915
+ if ! use video_cards_i915 && \
+ ! use video_cards_i965; then
+ gallium_enable video_cards_intel i915
+ fi
+ fi
+
+ gallium_enable video_cards_iris iris
+
+ gallium_enable video_cards_r300 r300
+ gallium_enable video_cards_r600 r600
+ gallium_enable video_cards_radeonsi radeonsi
+ if ! use video_cards_r300 && \
+ ! use video_cards_r600; then
+ gallium_enable video_cards_radeon r300 r600
+ fi
+
+ gallium_enable video_cards_freedreno freedreno
+ gallium_enable video_cards_virgl virgl
+
+ # opencl stuff
+ emesonargs+=(
+ -Dgallium-opencl="$(usex opencl icd disabled)"
+ )
+ fi
+
+ if use vulkan; then
+ vulkan_enable video_cards_i965 intel
+ vulkan_enable video_cards_iris intel
+ vulkan_enable video_cards_radeonsi amd
+ fi
+
+ # x86 hardened pax_kernel needs glx-rts, bug 240956
+ if [[ ${ABI} == x86 ]]; then
+ emesonargs+=( $(meson_use pax_kernel glx-read-only-text) )
+ fi
+
+ if use gallium; then
+ gallium_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa gallium none) )
+ else
+ dri_driver_enable -- swrast
+ emesonargs+=( -Dosmesa=$(usex osmesa classic none) )
+ fi
+
+ driver_list() {
+ local drivers="$(sort -u <<< "${1// /$'\n'}")"
+ echo "${drivers//$'\n'/,}"
+ }
+
+ emesonargs+=(
+ $(meson_use test build-tests)
+ -Dglx=$(usex X dri disabled)
+ -Dshared-glapi=true
+ $(meson_use dri3)
+ $(meson_use egl)
+ $(meson_use gbm)
+ $(meson_use gles1)
+ $(meson_use gles2)
+ $(meson_use libglvnd glvnd)
+ $(meson_use selinux)
+ -Dvalgrind=$(usex valgrind auto false)
+ -Ddri-drivers=$(driver_list "${DRI_DRIVERS[*]}")
+ -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
+ -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
+ $(meson_use vulkan-overlay vulkan-overlay-layer)
+ --buildtype $(usex debug debug plain)
+ -Db_ndebug=$(usex debug false true)
+ )
+ meson_src_configure
+}
+
+multilib_src_compile() {
+ meson_src_compile
+}
+
+multilib_src_install() {
+ meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
+}
+
+multilib_src_install_all() {
+ einstalldocs
+}
+
+multilib_src_test() {
+ meson test -v -C "${BUILD_DIR}" -t 100
+}
+
+pkg_postinst() {
+ if ! use libglvnd; then
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+ fi
+}
+
+# $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 b7b3a5803880..27301deb54b0 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -35,7 +35,7 @@ for card in ${VIDEO_CARDS}; do
done
IUSE="${IUSE_VIDEO_CARDS}
- +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 +libglvnd +llvm
+ +classic d3d9 debug +dri3 +egl +gallium +gbm gles1 +gles2 libglvnd +llvm
lm-sensors opencl osmesa pax_kernel selinux test unwind vaapi valgrind
vdpau vulkan vulkan-overlay wayland +X xa xvmc"
@@ -77,7 +77,7 @@ RDEPEND="
>=dev-libs/expat-2.1.0-r3:=[${MULTILIB_USEDEP}]
>=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}]
libglvnd? (
- media-libs/libglvnd[${MULTILIB_USEDEP}]
+ >=media-libs/libglvnd-1.2.0[${MULTILIB_USEDEP}]
!app-eselect/eselect-opengl
)
!libglvnd? (
@@ -243,6 +243,7 @@ x86? (
usr/lib*/libGLESv2.so.2.0.0
usr/lib*/libGL.so.1.2.0
usr/lib*/libOSMesa.so.8.0.0
+ libglvnd? ( usr/lib/libGLX_mesa.so.0.0.0 )
)"
llvm_check_deps() {
@@ -503,6 +504,8 @@ multilib_src_compile() {
multilib_src_install() {
meson_src_install
+
+ use libglvnd && rm -f "${D}"/usr/$(get_libdir)/pkgconfig/{egl,gl}.pc
}
multilib_src_install_all() {
@@ -514,9 +517,11 @@ multilib_src_test() {
}
pkg_postinst() {
- # Switch to the xorg implementation.
- echo
- eselect opengl set --use-old ${OPENGL_DIR}
+ if ! use libglvnd; then
+ # Switch to the xorg implementation.
+ echo
+ eselect opengl set --use-old ${OPENGL_DIR}
+ fi
}
# $1 - VIDEO_CARDS flag (check skipped for "--")
diff --git a/media-libs/phonon-vlc/Manifest b/media-libs/phonon-vlc/Manifest
index 7e34304d91b7..beb21ef9f3ec 100644
--- a/media-libs/phonon-vlc/Manifest
+++ b/media-libs/phonon-vlc/Manifest
@@ -1,6 +1,6 @@
AUX phonon-vlc-0.10.1-qt-5.11.patch 998 BLAKE2B e182ed8a038577c48c8798e6769b992a3099930a8332c0cdf146af699f7ca5020df3e9d2f072cf83f43e5570307f90558b2facdf526d216c423a705fa6121d4b SHA512 2bc6f4e08693ff8d02eab9a1aad9ef1f425ced736b7cb11ebfadbe33c111ec053dc60bd48220130f4a80cc117a08fb53e3fd5789554bd0e57f81a61203d2ba9c
DIST phonon-backend-vlc-0.10.2.tar.xz 60568 BLAKE2B 7ee5ea6cc627ec2bd872b4c60f9c915f383e9b2826b30c4b0db96e8348b1a26ea4f710076b68892c28c73d45dae118f06a315093b6e954d48967891f1e31eec4 SHA512 3c4e7c60582d7871b209f4b38b139f43ab5f97618399164ecc649cd0e077a1d4c7848bc5c5c213d747cf7e5f1252ff53ded745880dfd36247494479840789ba5
-DIST phonon-backend-vlc-0.11.0.tar.xz 69824 BLAKE2B 3a206e642f0a2a95ac96f065c5f353a41956786dfdfba5eded3b4d64d26f58df936b893bb77bd16bc0652f42e8eead008dbbfc7b17abd3e77387fff01bd0ed01 SHA512 3f82b0c306ea1fdfbcc7b33a227f360961532b736146c96c2fff8fdf8157fd2f8e5e047f491fd1f4124dbf3bb9fa288265ea5d35d8ae6100214589c70e4d716b
+DIST phonon-backend-vlc-0.11.1.tar.xz 65064 BLAKE2B 2380d31f574b71e2552b37e5c2a8b22239268aac9c2875417486fd77496c89820b5b4c7e94d39bfebad62a5175a35767945e3f57830e69041ed7c58be4b978cc SHA512 4a068478eb1467477cf5c21813723779742eb15766aee2df8184da8c0b58598c5eff8aecefdcfed8e6136495f3caf7691c99d43e98226ab477c162ff19e1fa4e
EBUILD phonon-vlc-0.10.2.ebuild 887 BLAKE2B 97ac0090629d73ac4c0cdc17540fbeaf4258869ad16934b0277887c8bcf1de1ca4346a35b360089c029d289cd979dd11f6256794e418c0ff7fc3234de1c39c9b SHA512 33d774dc5a0c613d96de315754dc274fe9297eae6e7b08c42e7c6ebd283eb99674ec98b5afc480054265dfb0b5f6d39160b06a8fe101427de68b17e7c4b7b3e4
-EBUILD phonon-vlc-0.11.0.ebuild 680 BLAKE2B 8a9f7b3c3cd89677716c66ceae47d85ed2edc8dd039d9bff8b7d62bfb6ca67cf2b616df8027fe12ea61de151f05e87b34c7511c37e624571668deb7c8f694cfa SHA512 8e1b9fa5fbb43a87a30cc61233d702551df09e134506fcf2ff926c48ab74a8c6f013311628fe8208714289331fbe16ff17a9001ea55d3650971c05d8f6653376
+EBUILD phonon-vlc-0.11.1.ebuild 680 BLAKE2B 8a9f7b3c3cd89677716c66ceae47d85ed2edc8dd039d9bff8b7d62bfb6ca67cf2b616df8027fe12ea61de151f05e87b34c7511c37e624571668deb7c8f694cfa SHA512 8e1b9fa5fbb43a87a30cc61233d702551df09e134506fcf2ff926c48ab74a8c6f013311628fe8208714289331fbe16ff17a9001ea55d3650971c05d8f6653376
MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
index 566bc66ad00b..566bc66ad00b 100644
--- a/media-libs/phonon-vlc/phonon-vlc-0.11.0.ebuild
+++ b/media-libs/phonon-vlc/phonon-vlc-0.11.1.ebuild
diff --git a/media-libs/phonon/Manifest b/media-libs/phonon/Manifest
index cb24184b65c6..39b33ac8cd56 100644
--- a/media-libs/phonon/Manifest
+++ b/media-libs/phonon/Manifest
@@ -1,5 +1,5 @@
DIST phonon-4.10.2.tar.xz 322176 BLAKE2B a73fa78e732ba56745e0791559a1ab195e9a5d867d368935ebc779cc1705a405dfd8302f6b5d92678098da8b6fdb52ec4cc2d553c361c3fefc738d502e3c38b6 SHA512 205c2f41691ed37a2b24aa5e900f7720ba024d2046ea4bf0a9b9c46235ffd72dfb4010287ccf753b13e395f84c2a202cbb76454806de3519faf52c3ac7001c4e
-DIST phonon-4.11.0.tar.xz 397768 BLAKE2B eeadfb8e080d52a29b0cc3d7fe728376a1580b7c008361ec62fb135738c32812401f797d93a8d87e338affdbb4b0ccefc8de0736d5cff15ee85899269a4c0243 SHA512 d7302aa9d0e9d3a8c408cf2787911b49808f58f5052dbca19e9b93b68a6f829dd31ede0ac10de4a9a3cf11e4ab1986e76e0d4cc02142b2f50ffecf285b3eb897
+DIST phonon-4.11.1.tar.xz 314732 BLAKE2B 9be341f8df643b352392a208c7f24d799edcc94146b71c73d93974a7ef02cc75b5baa1e2ddd037e7e2d3afeb52347d96caaa8b3a2319631802261735a3a751df SHA512 858b2b0d7b0336af76d226b30f3acd1914e7297e0879d5a417fa1b87b13c812f9aab7e20adcad33ce1a03624ce78323dd9968b4b277caf85f800ca60aa134f74
EBUILD phonon-4.10.2.ebuild 1323 BLAKE2B 005ac868e7b70caed892e2996cc8f670aac6c1f570d8509a7a82daabae23d59bf5f5165d5ca504fcfe450c802fb6770e1f274ba48c2dc097f3d36d4045dfd6d9 SHA512 cd537e3be7548d6db5d847d35f0ad22a4823772e2f5cd42ae89f0fb90c919752a9a55d5324d29d90aaaf8497b0518b2c5aca373607edf4df3e75b0df6dfeb413
-EBUILD phonon-4.11.0.ebuild 1255 BLAKE2B 002cd7347317a831560e5619a2e68f538aba2d80b4ab326df66b7906eb5c04755f3d18116efd7028fd756a644fe4958e7f75360cfa0970f4a2c25e417f27de3b SHA512 acd0120942cb22978790babc84aafd913d9845dd230a1ed4f5b394ac0099f531956b2ff66f28a622b1c7541670be3e0e897a927cf30943935724bce699820bff
+EBUILD phonon-4.11.1.ebuild 1255 BLAKE2B 002cd7347317a831560e5619a2e68f538aba2d80b4ab326df66b7906eb5c04755f3d18116efd7028fd756a644fe4958e7f75360cfa0970f4a2c25e417f27de3b SHA512 acd0120942cb22978790babc84aafd913d9845dd230a1ed4f5b394ac0099f531956b2ff66f28a622b1c7541670be3e0e897a927cf30943935724bce699820bff
MISC metadata.xml 394 BLAKE2B e551fa12fcce92bd237d1cdb3fcbd496768e012004ace1e08a89f1e0e5f5c997d5b9d1488afce03925337d28a9c431994ce23244ffcb46f7138cde951dc26662 SHA512 963308198d2057bc2869eb21b644c59211f3c4bb04a46de3cca04dc85cdcf67b113555870149b971c8c43a0c64fb88cd141ccf20740f6428d1573485844574a6
diff --git a/media-libs/phonon/phonon-4.11.0.ebuild b/media-libs/phonon/phonon-4.11.1.ebuild
index 6edaf832b5a2..6edaf832b5a2 100644
--- a/media-libs/phonon/phonon-4.11.0.ebuild
+++ b/media-libs/phonon/phonon-4.11.1.ebuild
diff --git a/media-libs/sdl-sound/Manifest b/media-libs/sdl-sound/Manifest
index f0c7907bab7a..d364479e6b60 100644
--- a/media-libs/sdl-sound/Manifest
+++ b/media-libs/sdl-sound/Manifest
@@ -3,5 +3,5 @@ AUX sdl-sound-1.0.3-physfs-3.0.1.patch 1574 BLAKE2B 9829f6429041322c0eaa41d547db
AUX sdl-sound-1.0.3-underlinking.patch 413 BLAKE2B 594339dae9a0230ddc1b821ca90d1650800610b0a7904fc00e33f1e3ff183ece1c8715b1d27b0c80cecbf5bda9e7b15255fba00fdc293f5e0841452efde447ef SHA512 1f67d72313abc44080a47b70c210bd6c03b2a204e85e2f5d1eb95f40367470bab4f14956f0404c5025fb4af7d72731dd1df3196ee316a2c5d9bb775e27d58a8c
DIST SDL_sound-1.0.3.tar.gz 1127100 BLAKE2B 6fff5ea22ae82f9692a51910d5415288d5a1ebc1c463b2c741f9ee9fabeabb385de12f781d4f40aaf0628598824758376c51b442f434d77d96d0376379908ff6 SHA512 3e60671777d804e6104d7d441f4a29866492c9412040eea3fd2283c0914a0a1ebc550260631c2bf500e7d982e05a6f9feeda81e9eeef8257303750c1be582824
EBUILD sdl-sound-1.0.3-r1.ebuild 1859 BLAKE2B 34700a6ec4e72aaa5da68fcf7b6cfaf8be86e3d2d03b6efdd92f09243776972ecdf074b163bb5a84a41959ab850af6e567676915c1bb13d54e62ae8d559019a2 SHA512 65da9213c7657a44ebc0b8d2e54cc095b0338c2e8b9b53071f51cce4dbca096eee15267d5ab5c1377eafb7b7ab7226fb8be2090fed4364d1fbdb6221321a82e5
-EBUILD sdl-sound-1.0.3-r2.ebuild 1986 BLAKE2B fbf90a46bfed1706a5e7b67900b97509d6efe5fae787f93b034fa5d251ac31da3ff87d78a61b36d37d4d0689edc121071b92167f1cb09c31b6bfcc406310a799 SHA512 d85044e17dca33b336d8a80ee6f96524c1124f930a088a246c1623c5d915cae25e28112d2e8136d98e9f47d81e886f422e7ea84bfb4d82a32a4b528ca7ce68a1
+EBUILD sdl-sound-1.0.3-r2.ebuild 1985 BLAKE2B bb8b5b653c96760522be04dd0ab462d9f87fd519767ba1edbca2af48efabf78c6594089c14ae1f3a29461a5ee001aa28b724b1774a264051d47335e471c09a7b SHA512 20c9a225e830b33a4eb2669e14c85ba284c191bc85e6126a038fb6b55d3bc13090dabcdfa59556fc73ec47a4ae4f3270897b29d97adc791724fe06a653564d8a
MISC metadata.xml 443 BLAKE2B 5ca8d53cd8244754cc018b9cc771a6c02d20613a6bcb79adc7a16ff869655dc2a54b7253f8bc16d0675a7536188729f913a03f5c0c5187eb604742a2d7ac4cbc SHA512 522c8dcd761d563136729cca7317ba139e36e85cb7f052113e7317ba0c2b8e8a2d207b1901def3d14b0d57602038d3d32b7091c2175a28709305e7c340de4933
diff --git a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
index 96b514fa29ea..36b7858b9a62 100644
--- a/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
+++ b/media-libs/sdl-sound/sdl-sound-1.0.3-r2.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://icculus.org/${MY_PN}/downloads/${MY_P}.tar.gz"
LICENSE="LGPL-2.1+"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x64-macos"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 sparc ~x86 ~x86-fbsd ~x64-macos"
IUSE="flac mikmod modplug mp3 mpeg physfs speex static-libs vorbis"
RDEPEND="