diff options
Diffstat (limited to 'media-libs')
-rw-r--r-- | media-libs/Manifest.gz | bin | 66141 -> 66146 bytes | |||
-rw-r--r-- | media-libs/mesa/Manifest | 8 | ||||
-rw-r--r-- | media-libs/mesa/mesa-22.1.7.ebuild | 2 | ||||
-rw-r--r-- | media-libs/mesa/mesa-22.2.0.ebuild (renamed from media-libs/mesa/mesa-22.1.3.ebuild) | 40 | ||||
-rw-r--r-- | media-libs/mesa/mesa-9999.ebuild | 3 |
5 files changed, 34 insertions, 19 deletions
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz Binary files differindex 061a371a06da..a7830ec72524 100644 --- a/media-libs/Manifest.gz +++ b/media-libs/Manifest.gz diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 76063ad48141..a566262b0985 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,6 +1,6 @@ -DIST mesa-22.1.3.tar.xz 16016520 BLAKE2B 3f9838022914b4ecc8882bc648bdd99a81aab2c6ebd4d9a3ce74655d6ec718d09abc6424bdb4b84a5430dcc51113d67bfd3368af4a3f390d3c574733b8ade4b0 SHA512 e7348839eb37de89c90d21277a7cbb42ee673ad6c656177853f6d35db99556dbac29867712222342d902b4fa67df5687c9d543bad99c81bcd0ecfb7f08f37480 DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120 -EBUILD mesa-22.1.3.ebuild 12075 BLAKE2B fca03cd409af59496d249409f5b7484669e5226fc299da198b71c4d43d626a94006ebac18d2354593e0385e02e7f16514f3603fd96923b719489293856ab2e82 SHA512 cfa5cbf4dfdcdc9d00ba2bada8a3f7e7ecae704f92a0fe63b116f898023977e817c65554adb8d9973899e822eba6d24305e0eafb79f18fc2b38ae419b456c61a -EBUILD mesa-22.1.7.ebuild 12043 BLAKE2B 2c84c59bb325ae48c615f4bcf9383b7e02436221bd1fd189753ca804a7c57a85c54ac99289f52d1fdd01170e17b3301488ad7ebd535f747bc57be86f57c6276d SHA512 d91bfae247e8cf49e0a1a0d4cf821955eef4c5094c595848adbad28ef6127251601e7ccdcef041a4986d8d097094710f530d2244d17a9ea930543e0f2dc4214f -EBUILD mesa-9999.ebuild 12595 BLAKE2B db72258d28521bc716ab1da55de70956fd19fe9827c96ffef27b12279699767ec2673329334fb394289271b4553c8d4dcaf5c3476c19cb3f497d7f532b71bc62 SHA512 4326c6489b152a0d61e1bfb689fc11bdd4f0fcfb7ba2f17bb5ab3ce8b30b41f30c7b6bd657b1ad8c85685b4545c953ae4c195f93787d1a59f5a103eaf7a891b4 +DIST mesa-22.2.0.tar.xz 16298808 BLAKE2B 3f1526626edad49a7d1551283eaab38d905cdd4c70b487538cc2c4de50a4959e396340abe9acb32742ca83fee0a64fcce646c7fcd67d3650eacee8398c289126 SHA512 13a21b9ed6b0a5dfd0293b73df271a929c3155d83e8beb3d958fe18d79277f3611bf5b26a1186d446f4e1479a36bb13d0a13d6ac68937989fe7a0d917e12171e +EBUILD mesa-22.1.7.ebuild 12035 BLAKE2B e24591c2f8efa0678fcb47a29b2f126b807d5beff1e4d7b95a8b2ab66d05c6266dc2e648d1d4ef7d34ef6723d78bc40e8ea836bd442c809c66d52d96dad1f787 SHA512 eb06f57c2c628cb1d76fa6aea618936ccd957cc66b845d2b8fc4c14f68b0dea2595cdcc052e659b27618726b4ceba89ba7f6793d0ed01c0a419a6161108ff4b3 +EBUILD mesa-22.2.0.ebuild 12635 BLAKE2B 24a771be35187dab4f3d6cf72b1454279cdb77bb8bd2081daed5952fa2dc1702663d3167375505cda93c9498ca703cc98a850434a3ab548e6bc9ccfdc37ca663 SHA512 a91a0788612a7d5e49744bb430d4ca77087a27497ab6d1bde4e618d6e56225f57b6443791f7e0958c3b7a19a05ab6524eb5ac36ad23a8b7e2474f42bb0715adb +EBUILD mesa-9999.ebuild 12635 BLAKE2B 24a771be35187dab4f3d6cf72b1454279cdb77bb8bd2081daed5952fa2dc1702663d3167375505cda93c9498ca703cc98a850434a3ab548e6bc9ccfdc37ca663 SHA512 a91a0788612a7d5e49744bb430d4ca77087a27497ab6d1bde4e618d6e56225f57b6443791f7e0958c3b7a19a05ab6524eb5ac36ad23a8b7e2474f42bb0715adb MISC metadata.xml 1649 BLAKE2B dbbaf2c16c29d6b75e272a403f59f943047fc6d19361b289d7a31bffeeed73d7ee6b16acb4a481b8e647b807fd3b4a7354092a52cc55edccb722180eae124370 SHA512 e0f05c43af12b12142eb4fa08b4e5a103bc160554836d614aaa56928b41d5f7160dd1e89e78d54df6ee6e3bb0e4d9d7667402af3dd2e7051e09b17506caf7985 diff --git a/media-libs/mesa/mesa-22.1.7.ebuild b/media-libs/mesa/mesa-22.1.7.ebuild index 97c13b468175..cf4769ac91fa 100644 --- a/media-libs/mesa/mesa-22.1.7.ebuild +++ b/media-libs/mesa/mesa-22.1.7.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="MIT" diff --git a/media-libs/mesa/mesa-22.1.3.ebuild b/media-libs/mesa/mesa-22.2.0.ebuild index c84d6c68b8c4..b67f1493125c 100644 --- a/media-libs/mesa/mesa-22.1.3.ebuild +++ b/media-libs/mesa/mesa-22.2.0.ebuild @@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" - KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" fi LICENSE="MIT" @@ -25,14 +25,15 @@ SLOT="0" RESTRICT="!test? ( test )" RADEON_CARDS="r300 r600 radeon radeonsi" -VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel 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} cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm - lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan + lm-sensors opencl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +zstd" REQUIRED_USE=" @@ -109,12 +110,12 @@ RDEPEND="${RDEPEND} # 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="14" +LLVM_MAX_SLOT="15" LLVM_DEPSTR=" || ( + sys-devel/llvm:15[${MULTILIB_USEDEP}] sys-devel/llvm:14[${MULTILIB_USEDEP}] sys-devel/llvm:13[${MULTILIB_USEDEP}] - sys-devel/llvm:12[${MULTILIB_USEDEP}] ) <sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}] " @@ -176,6 +177,7 @@ RDEPEND="${RDEPEND} unset {LLVM,CLANG}_DEPSTR{,_AMDGPU} DEPEND="${RDEPEND} + video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( @@ -223,11 +225,12 @@ llvm_check_deps() { pkg_pretend() { if use vulkan; then - if ! use video_cards_freedreno && + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && ! use video_cards_intel && ! use video_cards_radeonsi && ! use video_cards_v3d; then - ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d" + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d" fi fi @@ -239,19 +242,21 @@ pkg_pretend() { fi if use vaapi; then - if ! use video_cards_r600 && + if ! use video_cards_d3d12 && + ! 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" + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" fi fi if use vdpau; then - if ! use video_cards_r300 && + if ! use video_cards_d3d12 && + ! 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" + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau" fi fi @@ -329,7 +334,8 @@ multilib_src_configure() { emesonargs+=(-Dgallium-nine=false) fi - if use video_cards_r600 || + if use video_cards_d3d12 || + use video_cards_r600 || use video_cards_radeonsi || use video_cards_nouveau; then emesonargs+=($(meson_feature vaapi gallium-va)) @@ -338,7 +344,12 @@ multilib_src_configure() { emesonargs+=(-Dgallium-va=disabled) fi - if use video_cards_r300 || + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_r300 || use video_cards_r600 || use video_cards_radeonsi || use video_cards_nouveau; then @@ -375,6 +386,7 @@ multilib_src_configure() { gallium_enable video_cards_freedreno freedreno gallium_enable video_cards_intel crocus i915 iris gallium_enable video_cards_lima lima + gallium_enable video_cards_d3d12 d3d12 gallium_enable video_cards_nouveau nouveau gallium_enable video_cards_panfrost panfrost gallium_enable video_cards_v3d v3d @@ -400,6 +412,7 @@ multilib_src_configure() { if use vulkan; then vulkan_enable video_cards_freedreno freedreno vulkan_enable video_cards_intel intel + vulkan_enable video_cards_d3d12 microsoft-experimental vulkan_enable video_cards_radeonsi amd vulkan_enable video_cards_v3d broadcom fi @@ -432,6 +445,7 @@ multilib_src_configure() { $(meson_feature zstd) $(meson_use cpu_flags_x86_sse2 sse2) -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "") -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") --buildtype $(usex debug debug plain) diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index 830e5bfd10f3..b67f1493125c 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -110,9 +110,10 @@ RDEPEND="${RDEPEND} # 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="14" +LLVM_MAX_SLOT="15" LLVM_DEPSTR=" || ( + sys-devel/llvm:15[${MULTILIB_USEDEP}] sys-devel/llvm:14[${MULTILIB_USEDEP}] sys-devel/llvm:13[${MULTILIB_USEDEP}] ) |