diff options
| author | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
|---|---|---|
| committer | V3n3RiX <venerix@redcorelinux.org> | 2021-01-22 20:28:19 +0000 |
| commit | abaa75b10f899ada8dd05b23cc03205064394bc6 (patch) | |
| tree | eca3dd248b73b92013cba00a0fcc1edf2696e19a /x11-libs | |
| parent | 24fd814c326e282c4321965c31f341dad77e270d (diff) | |
gentoo resync : 22.01.2021
Diffstat (limited to 'x11-libs')
40 files changed, 857 insertions, 153 deletions
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz Binary files differindex 66e46c743ee0..c6c1f8b7039a 100644 --- a/x11-libs/Manifest.gz +++ b/x11-libs/Manifest.gz diff --git a/x11-libs/colord-gtk/Manifest b/x11-libs/colord-gtk/Manifest index d94a4c96cbaf..0d7de83f6ff8 100644 --- a/x11-libs/colord-gtk/Manifest +++ b/x11-libs/colord-gtk/Manifest @@ -1,3 +1,6 @@ +AUX colord-gtk-0.2.0-optional-introspection.patch 1471 BLAKE2B 3d4ce65f6241538fc4f8b6114c95ef229654093dabed26ebf1c66aabda2d5039749cce8580a4974c70afdd49e127b791a561a04202338c9b6512870804bce4db SHA512 a49618d773acb377c8015243ac6657e17b65e1f0f54228c391617118ae61199662a6d6398d5c5cd02ceb4cc74dc2b4cedf6488536fbe418768480285c5500773 DIST colord-gtk-0.1.26.tar.xz 280380 BLAKE2B 6ddd52b81726f21a2c376b1ab0c773f7670859882f3e5fe6038bf8728d5a9f3308b469b4e563dc784873b5b9cbed8ca671552e9bcb9cbccfaf28cd8f85e0b5bd SHA512 14f59110e2bc100c542323a68566102e9fb5ab44b679da21bf29101960dae38e646e926d884e14f1838a5991e6ebe15af72d5338723265868eadd5f026545c3d +DIST colord-gtk-0.2.0.tar.xz 20480 BLAKE2B 73bbb349e84e5bfd28358cbe22609de84b86f90eb96a3fedc6e30a1764d9c667cd82408116cdf65591496ab4e2f59f2b415cd1aa8f995fe2162ee4d649c5d496 SHA512 797eebfd4451fcae4cf70835f5de3d9bdc9e8401ddb82a2fef2310002f28bf523b599c587ff35eb89ceff38a245a6311129ad90b107f837ac4f42f268c9aad97 EBUILD colord-gtk-0.1.26.ebuild 1657 BLAKE2B 60f3e47850b590f53ebb2bd6abf4a85625d9ba83178b88abfdaf522415968af32d19e7a540b2aa60ef6657d88bedb56a4d880362422bf352bfa46ed695747378 SHA512 22e5159dfd7c1cf21897ff4a27147cc30db2e77f3bb9287579931b6a8eecbc7c1d51f150a8075e2b052d4f79a09e78b4dcf941922f3d378a7f7067aebe2edd6d +EBUILD colord-gtk-0.2.0.ebuild 1308 BLAKE2B 1eba533efbe58238f331951f51a6dce7a198047066fafd7796c56725b9106e5eac7c5f29ee437fdc2f5ae0982f6f430b5b397900a49278751468c1ed5c53c3b6 SHA512 e9b90314c0ec41b19bee04648a165ebe65c5b4523d3e3d1c680640763d38f87060165ebcb73c8b3d10940895089c5016b095ebe7803d0b527d43dac98ee511f6 MISC metadata.xml 249 BLAKE2B e71e1b95fee768c696704acbf7e3cf0e599ed2bc8de92bae0141d1194ef9e842bdc292798904487a9b90ddfda9b0e84abd3b76b1518576c1d288240e4e46f110 SHA512 c40662134899a5c9f0369a1017806f35adf3280a0b3c91726f7a8ca6012a073a8b471583f5bfb6fe95faac1dcf607e8e2e43f8c91d48ec46f4a8824e2f551506 diff --git a/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild new file mode 100644 index 000000000000..d1ec57ccb2bc --- /dev/null +++ b/x11-libs/colord-gtk/colord-gtk-0.2.0.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +VALA_USE_DEPEND="vapigen" + +inherit meson vala + +DESCRIPTION="GTK support library for colord" +HOMEPAGE="https://www.freedesktop.org/software/colord/" +SRC_URI="https://www.freedesktop.org/software/colord/releases/${P}.tar.xz" + +LICENSE="LGPL-3+" +SLOT="0/1" # subslot = libcolord-gtk soname version +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86" + +IUSE="doc +introspection vala" +REQUIRED_USE="vala? ( introspection )" + +DEPEND=" + >=dev-libs/glib-2.28:2 + x11-libs/gtk+:3[introspection?] + >=x11-misc/colord-0.1.27:=[introspection?,vala?] +" +RDEPEND="${DEPEND}" +BDEPEND=" + dev-libs/libxslt + >=sys-devel/gettext-0.17 + virtual/pkgconfig + doc? ( + app-text/docbook-xml-dtd:4.1.2 + >=dev-util/gtk-doc-1.9 + ) + introspection? ( >=dev-libs/gobject-introspection-0.9.8 ) + vala? ( $(vala_depend) ) +" + +RESTRICT="test" # Tests need a display device with a default color profile set + +PATCHES=( + "${FILESDIR}/${P}-optional-introspection.patch" +) + +src_prepare() { + use vala && vala_src_prepare + default +} + +src_configure() { + local -a emesonargs=( + -Dgtk2=false + -Dman=true + -Dtests=false + $(meson_use doc docs) + $(meson_use introspection) + $(meson_use vala vapi) + ) + meson_src_configure +} diff --git a/x11-libs/colord-gtk/files/colord-gtk-0.2.0-optional-introspection.patch b/x11-libs/colord-gtk/files/colord-gtk-0.2.0-optional-introspection.patch new file mode 100644 index 000000000000..543b443e3aec --- /dev/null +++ b/x11-libs/colord-gtk/files/colord-gtk-0.2.0-optional-introspection.patch @@ -0,0 +1,41 @@ +From 0fb3425873a04ba100b57d59449d27bba6768ff3 Mon Sep 17 00:00:00 2001 +From: David Michael <fedora.dm0@gmail.com> +Date: Sat, 9 Jan 2021 14:42:39 -0500 +Subject: [PATCH] Make introspection optional in meson + +It defaults to enabled to preserve existing behavior. +--- + libcolord-gtk/meson.build | 2 ++ + meson_options.txt | 1 + + 2 files changed, 3 insertions(+) + +diff --git a/libcolord-gtk/meson.build b/libcolord-gtk/meson.build +index c4fe704..18f36a0 100644 +--- a/libcolord-gtk/meson.build ++++ b/libcolord-gtk/meson.build +@@ -61,6 +61,7 @@ pkgg.generate( + description : 'colord-gtk is GTK integration for libcolord', + ) + ++if get_option('introspection') + libcolord_gtk_gir = gnome.generate_gir( + colord_gtk, + sources : [ +@@ -97,6 +98,7 @@ libcolord_gtk_gir = gnome.generate_gir( + ], + install : true + ) ++endif + + if get_option('vapi') + gnome.generate_vapi( +diff --git a/meson_options.txt b/meson_options.txt +index 1c3cecc..a4efa84 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -1,4 +1,5 @@ + option('gtk2', type : 'boolean', value : false, description : 'Build Gtk2 library') ++option('introspection', type : 'boolean', value : true, description : 'Build gobject-introspection typelib files') + option('vapi', type : 'boolean', value : false, description : 'Build vala bindings') + option('tests', type : 'boolean', value : true, description : 'Build self tests') + option('man', type : 'boolean', value : true, description : 'Generate man pages') diff --git a/x11-libs/libXScrnSaver/Manifest b/x11-libs/libXScrnSaver/Manifest index 1013c750fb51..75acc18a2df6 100644 --- a/x11-libs/libXScrnSaver/Manifest +++ b/x11-libs/libXScrnSaver/Manifest @@ -1,3 +1,3 @@ DIST libXScrnSaver-1.2.3.tar.bz2 291465 BLAKE2B 03864811a3bb34521d9e27ec2ce363cb015ee3484a27cce6fed4e6b16499b441dc7336229cc926da7bbbb8366e03780f9f4eba0e725083b8f362ef45c43e8633 SHA512 7ea628324a11b25ee82c7b11c6bf98f37de219354de51c1e29467b5de422669ba1ab121f3b9dc674093c8f3960e93c5d5428122f5539092f79bc8451c768354a -EBUILD libXScrnSaver-1.2.3.ebuild 476 BLAKE2B 56830fa07327b53de437e5bfba7694fe7105e7cc891d2be3c18cd76b2dd1695c585596bf10ad5f2615871bb0021aea5ba46c7b180666e6d38ac2910e661cdae0 SHA512 5b79e635f348eda15203b9396c804fe42faf7e25723ecbf864cb4f46009ce0b8adaf4d7c1927f8ce9d2e8388eb71c9a4f09ba4e4a10e4ad830dae00f9f9c9958 +EBUILD libXScrnSaver-1.2.3.ebuild 484 BLAKE2B 8e7332482c3854fecebef24981c06527232e11a642dac9c583710f4344d8316b0a404ddabac3a8301b1d8cbf1855fee546bb3775d11006995afd09841e60746e SHA512 2311db4a090358bb1d187f9422887a6077c2234d032cd5dd18e445ba67dc90de669fafd0d22dff07cf5fa9116c5289badfb877f11eb6a087c8bf1cef2ad18457 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild index 9ca113c35610..d7591e403978 100644 --- a/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild +++ b/x11-libs/libXScrnSaver/libXScrnSaver-1.2.3.ebuild @@ -1,16 +1,18 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 +XORG_DOC=doc XORG_MULTILIB=yes -inherit xorg-2 +inherit xorg-3 DESCRIPTION="X.Org XScrnSaver library" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris" -IUSE="" -RDEPEND="x11-base/xorg-proto +RDEPEND=" >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libXpresent/Manifest b/x11-libs/libXpresent/Manifest index 61e024a93fe9..09e8b7446b40 100644 --- a/x11-libs/libXpresent/Manifest +++ b/x11-libs/libXpresent/Manifest @@ -1,4 +1,4 @@ AUX libXpresent-1.0.0-add-depends-to-pkgconfig.patch 1021 BLAKE2B c7fd8665f66cffbf33ccbf010d0517c9b697f576fbafd55c57aa2263ca93ad748c8d36c93834323ff9a78b1352b9003ba4b96c3a8b3f4acafae744b7e025bc9c SHA512 fbcbc0a5839a2b1976aad4edf318fa3b47868763d5262ef8537ed6dccf911a2f9fad2b2182a90b4be578eb8850fe29403cbd52cc29ee8f0f09f9c85a7883a9c4 DIST libXpresent-1.0.0.tar.bz2 263461 BLAKE2B bc35477c5f0d8bb3403c00650f94a6625994e857f249b24d59e434dbac9696bc4403d14fc82a8aa2f27c3c3c818ebb0665612305873f1ad49bb3bb1e08e7de5a SHA512 e88b4ec4fcbc0417a0cbecc0ecd73f8085c496dc6d1a4902b6550750a69a1cb8bb76c436c7941ee3bf3c61ffc85bbd8f8327fca30f14815dbef1cd53bb8db16b -EBUILD libXpresent-1.0.0-r1.ebuild 596 BLAKE2B d5185fcb088ace6fb3c207a8e39ad54a91305c1e564b2e478c751dc504736d45c7857516c7c4a18b1aaec9709af3ebf0eedf49a46ace838fc7b663ecde82ac1f SHA512 c3809ac8a54c4d23dfa10fdb5e58a51c99f0484f0302d045b85fc06665df4c61a4d3c3689a2bd76486a2b064e5ebe93ed578aaa3c1d9cbab41767e3d80ba1cc8 +EBUILD libXpresent-1.0.0-r1.ebuild 600 BLAKE2B db7cf276100f5cfdfb3f98839f8edd7aaad67d1e2633a6b5960ce4ef12ef338461257e2b526c9a56f21871775e4db756714dc2ab33adadc0ec817615f98abb58 SHA512 8d68e265fe5cd7b9c3d849f0a470a41ac8419f0636a86cdb131f76c55f65d8b7dd4397a78dd8e8e7592210370c1a0c7bce4fb33a52dab1a0d101394ea6ccc96a MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild index d7974d21867d..f2fffc3694da 100644 --- a/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild +++ b/x11-libs/libXpresent/libXpresent-1.0.0-r1.ebuild @@ -1,23 +1,22 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 +EAPI=7 +XORG_DOC=doc XORG_MULTILIB=yes -inherit xorg-2 +inherit xorg-3 DESCRIPTION="X Present Extension C Library" KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris" -IUSE="" RDEPEND=" - x11-base/xorg-proto x11-libs/libX11[${MULTILIB_USEDEP}] x11-libs/libXext[${MULTILIB_USEDEP}] x11-libs/libXfixes[${MULTILIB_USEDEP}] - x11-libs/libXrandr[${MULTILIB_USEDEP}] -" -DEPEND="${RDEPEND}" + x11-libs/libXrandr[${MULTILIB_USEDEP}]" +DEPEND="${RDEPEND} + x11-base/xorg-proto" PATCHES=( "${FILESDIR}"/${P}-add-depends-to-pkgconfig.patch ) diff --git a/x11-libs/libXres/Manifest b/x11-libs/libXres/Manifest index c712ff481751..b4a6b0ab49cc 100644 --- a/x11-libs/libXres/Manifest +++ b/x11-libs/libXres/Manifest @@ -1,3 +1,3 @@ DIST libXres-1.2.0.tar.bz2 286635 BLAKE2B 0c0813118c7ecd5851b075a4001e0e34fa3df92bd8367717eee42ec20352cab3443d232715c1d40c5df313f6508d2dddc779980d11744a1f897cc7511bfdfdf4 SHA512 8eb5a36b1f030eb4e27e676cc4befcc073da66a7bce2b39089314e1facb629d13b087bb53ca2c95fe5291857da7ff9f80c6ab28fb3e245eeb9e0344937900172 -EBUILD libXres-1.2.0-r1.ebuild 416 BLAKE2B a881dd214364192520c6ba25f0e0132813f7658387850ebd5f389fc021cd5213261747387922a103f7476283b6a69a27f3f416f5dc40686a66b1636533a170a4 SHA512 e318a5a9e89f41c6537260ca49bd1b6aa3f701989a7439a8e7179347e6c6a7c4d65442a498f6be1ffbb0471c95465fa1fc0e824af06008451fb0ec4338fd9e9e +EBUILD libXres-1.2.0-r1.ebuild 422 BLAKE2B 0ce9f9565654dc81073199ece2b5f9e5f5e48f24f132144eeed2356678560eee811275588b0c69e82df8170986dda58c3383f43eadc600833703831724ca8a6f SHA512 61faeee5c79d50c77a61763ded9208625a873dac512710a62b19c7d5ff1d24b3c4c2d80b15a1ce06292feee0b684a485b713f67f18dc9528cd12e50bdac7d963 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libXres/libXres-1.2.0-r1.ebuild b/x11-libs/libXres/libXres-1.2.0-r1.ebuild index 741d09748ffa..326864d2d86f 100644 --- a/x11-libs/libXres/libXres-1.2.0-r1.ebuild +++ b/x11-libs/libXres/libXres-1.2.0-r1.ebuild @@ -1,15 +1,16 @@ # Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit xorg-2 +EAPI=7 + +XORG_DOC=doc +inherit xorg-3 DESCRIPTION="X.Org XRes library" KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris" -IUSE="" -RDEPEND="x11-base/xorg-proto - x11-libs/libX11 +RDEPEND="x11-libs/libX11 x11-libs/libXext" -DEPEND="${RDEPEND}" +DEPEND="${RDEPEND} + x11-base/xorg-proto" diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest index 2e5580527818..ce334661ca41 100644 --- a/x11-libs/libdrm/Manifest +++ b/x11-libs/libdrm/Manifest @@ -1,4 +1,6 @@ DIST libdrm-2.4.103.tar.xz 412796 BLAKE2B 64904bebb923d79b83fbe1949aa24c697cff2a258f415c4633991f938772980e985df19f44df881d10b14268ea414ff99220c8f003ad09ac1decdc6c85249240 SHA512 15b098b962008271400692b6b15ecb7e22676f8698e0220ad969735ac2315ccc737d19558afb6abda82bae15117e5f306c048184a2369f434b85ecaa670ca885 +DIST libdrm-2.4.104.tar.xz 419372 BLAKE2B 4f9c1d88e8e13e12b192b822aaddcbb01716771b85445f7468129600df3214a9dd3559539830eeec4df61f03c187fa88a6d0bb2d5278a5125d2aa11cef6805ea SHA512 0fdbef53e0e7c441c805c95ac55ca2c94f11e8fa18e36b4dc7534c22e2b5bc8eca7283fdf41785da753f98d0b589023111abdba70db7e79837729b1540253d6e EBUILD libdrm-2.4.103.ebuild 1988 BLAKE2B 29c991df7e6d39b70b48b4e6056d944f12f630ab320d788b3e9560cf6e3b5e99b55c8aa100c475149b697a07e42a0fa27c22fa264f8aca5579e24b8c7792d79d SHA512 1247f74f71ed34d8b1cc7f5a1199e4d6f0bf0dfcf387db636c0ca2c0e179dc1e8ac757379bc584f4f489e559e73a92aa26391f38c58a6bd3d21b399be5b53982 +EBUILD libdrm-2.4.104.ebuild 1995 BLAKE2B 48cca4911319a37b520a953c67935dfb49103445b91726876f3391434697aa5526628579b9abfc38c93953f99a08bd8d62136dd1fb9066f670b9576680b9171b SHA512 0f3db3dd331867ad523ba4f783fed48ebc57b48eb9198164573c830ca5cb07d4b1d9f826f7ab526254ecd4a2d9a8f537dec637880bb39197fc96db5ed48b2474 EBUILD libdrm-9999.ebuild 1995 BLAKE2B 48cca4911319a37b520a953c67935dfb49103445b91726876f3391434697aa5526628579b9abfc38c93953f99a08bd8d62136dd1fb9066f670b9576680b9171b SHA512 0f3db3dd331867ad523ba4f783fed48ebc57b48eb9198164573c830ca5cb07d4b1d9f826f7ab526254ecd4a2d9a8f537dec637880bb39197fc96db5ed48b2474 MISC metadata.xml 406 BLAKE2B 2a08dbfc07e8d6ee0f61373821fe6b369130b98d30786ff4559dfd57a9a5189a4d2e0f9faae2ba19cffe023460433a4874d30aa26913ec3ff7263efb10ab0850 SHA512 703594ef462bb5b76a61d53268c043ad5f9b0febc907e48236f425ad047d931ae7fcc0a433d8b30acd8b6f0582eb0263586010bd95a17c4c383e7d703166b9da diff --git a/x11-libs/libdrm/libdrm-2.4.104.ebuild b/x11-libs/libdrm/libdrm-2.4.104.ebuild new file mode 100644 index 000000000000..48e056d6a358 --- /dev/null +++ b/x11-libs/libdrm/libdrm-2.4.104.ebuild @@ -0,0 +1,71 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git" + +if [[ ${PV} = 9999* ]]; then + GIT_ECLASS="git-r3" +fi + +inherit ${GIT_ECLASS} meson multilib-minimal + +DESCRIPTION="X.Org libdrm library" +HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm" +if [[ ${PV} = 9999* ]]; then + SRC_URI="" +else + SRC_URI="https://dri.freedesktop.org/libdrm/${P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" +fi + +VIDEO_CARDS="amdgpu exynos freedreno intel nouveau omap radeon tegra vc4 vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} libkms valgrind" +RESTRICT="test" # see bug #236845 +LICENSE="MIT" +SLOT="0" + +RDEPEND=" + video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )" +DEPEND="${RDEPEND} + valgrind? ( dev-util/valgrind )" + +multilib_src_configure() { + local emesonargs=( + # Udev is only used by tests now. + -Dudev=false + -Dcairo-tests=false + -Damdgpu=$(usex video_cards_amdgpu true false) + -Dexynos=$(usex video_cards_exynos true false) + -Dfreedreno=$(usex video_cards_freedreno true false) + -Dintel=$(usex video_cards_intel true false) + -Dnouveau=$(usex video_cards_nouveau true false) + -Domap=$(usex video_cards_omap true false) + -Dradeon=$(usex video_cards_radeon true false) + -Dtegra=$(usex video_cards_tegra true false) + -Dvc4=$(usex video_cards_vc4 true false) + -Detnaviv=$(usex video_cards_vivante true false) + -Dvmwgfx=$(usex video_cards_vmware true false) + -Dlibkms=$(usex libkms true false) + # valgrind installs its .pc file to the pkgconfig for the primary arch + -Dvalgrind=$(usex valgrind auto false) + ) + meson_src_configure +} + +multilib_src_compile() { + meson_src_compile +} + +multilib_src_test() { + meson_src_test +} + +multilib_src_install() { + meson_src_install +} diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest index b729df9915f2..c9361f1690d9 100644 --- a/x11-libs/libfm-qt/Manifest +++ b/x11-libs/libfm-qt/Manifest @@ -2,5 +2,5 @@ AUX libfm-qt-0.15.1-update-runtime-colours.patch 1921 BLAKE2B 6adc0a2fc8a807adb8 DIST libfm-qt-0.15.1.tar.xz 337396 BLAKE2B 619787039857f0b67245ff86f4c8de1b5305909bbf1dc07f20ab53f07a955d541853066a9011bb76d04a49006732ea23c4100e94fe3c61de77f1edbbbdef5854 SHA512 9bd3f61d830e4f7ba3e72d84e3ff1a07544f6f461d6eea7ecf2b31056020e08d47d83ef920b6e1a481a470dadfb995a6b3e3b57a13574d6abca617a84c71bdf5 DIST libfm-qt-0.16.0.tar.xz 348548 BLAKE2B 41c52efc5b71d924c06d55a5b94e7f9a1c4feda0a664d83b0de906479bdb644260a68136720baeb1958a48b08019b72de34b6066f51c19e5c5fb65afcd9e903c SHA512 5de63408a641b0e77cb319952e428aee9cd35db9ec3e6726a8327ebc53f5641cf66b28dbabd96797c64a253b1e41421dbe05dcb9f4bc7941bd92676bbfa9cc84 EBUILD libfm-qt-0.15.1-r1.ebuild 970 BLAKE2B 842346064e7a6964eaf3fae8cf4b067baf1b70c965b31abc694f6b2c949fef04e57368638ae7a9ca5a7268b6a1861053ad3bb9390aaa0f298edd267b3acb6ce2 SHA512 47189888a0ade9e0ffd7723e9f8065e448e2945ace6aee7e83177df955415209e5ab0ac0c6d777ea9d5b03797f534d7e18cfc844f8c7084d5fc184a08a072822 -EBUILD libfm-qt-0.16.0.ebuild 903 BLAKE2B c68ba5419f82060ca8b8093e61e974700ab44b8ccc892e899ae0cea4c0c3c620da918bc3eae9eff6cb4216e4c21f12a7cac8b88045808d4123963416ecf16c7e SHA512 e77a57211a997bc74deff5561b9b0c0fabe1722f7165504ffa8f295f5df818a51556c9cba321a7a25de19477a17d81a6678ee6140d1935a9625bb29db137853b +EBUILD libfm-qt-0.16.0.ebuild 902 BLAKE2B a1633e7e25fa34347b9cb87148f0f703bdf1d69d0cc27e0aed0f55cc382cba0552f6dbbdf4f1e07f637d48ea74367627096bd962846c07a4e6e0102d19b116e4 SHA512 3bcd0476f7149a847a512c3810f6e866884d67a032ece32d1531e163845e7c46c6bd08db5c7b9b7592a6150d842ed14263627bec2d83ffd928b8b18ebcbb9d98 MISC metadata.xml 314 BLAKE2B a40b71c62066cf524406556206999869edecf714d898236a8f277132e8b3752fec298cf9407e9010a1037bc757fafcbae32abec9b52a68492d414acd529c176a SHA512 edaddf48fd7cef23284164b7046e0e6b5ce1442847d3353ee8175177f00b06973d6588811b166dacbd7a1182942128792858a43e029d6aa874c1b8625b5e78f3 diff --git a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild index 35be3618d54b..39059a8106eb 100644 --- a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild +++ b/x11-libs/libfm-qt/libfm-qt-0.16.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 @@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then EGIT_REPO_URI="https://github.com/lxqt/${PN}.git" else SRC_URI="https://github.com/lxqt/${PN}/releases/download/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" + KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~x86" fi LICENSE="BSD GPL-2+ LGPL-2.1+" diff --git a/x11-libs/libpciaccess/Manifest b/x11-libs/libpciaccess/Manifest index 74dc1f0dbebc..61c1032ee4a4 100644 --- a/x11-libs/libpciaccess/Manifest +++ b/x11-libs/libpciaccess/Manifest @@ -1,3 +1,3 @@ DIST libpciaccess-0.16.tar.bz2 366603 BLAKE2B aab7d49887f7f21e0a6abf1e2aedc50159a47c7aef67eb8605a30e246463a14f9a9993db9cbd2705ef59c93d1ff41080668f8f3723557a927ab4d1edb5dfa4ad SHA512 2f250048a270dfc0823d4bdd613aa272c58a80eaafd922850f56c4b6f7a45a263ed4cf521b52b49f04484ea44ebefb7407d079aa058318a5751ffb181e38fed1 -EBUILD libpciaccess-0.16.ebuild 791 BLAKE2B 70e3b559f3a6ac0e0f7e975836bca1d29cdfe73437fde0125e02bfc116994a9eb34ee30fa1428241782581be579d26fb32b3254fb3dcc4507954b9be3f32d64f SHA512 018b2f13efcd82aea8751b7b844101323d3370c0a38f03bec15c87073add90e6ec4d7fa13eff7e33659717500722ab8a1d883cf8770ace970ecc823b1e2da700 +EBUILD libpciaccess-0.16.ebuild 760 BLAKE2B 1ac85dd8d9d91eb84d4be0b705711af7604ea05abfb10171b066d490124f7778420da2e0ce572e1eaa8820303a000fbf69525b93e42ae3542391aa336d82e35a SHA512 d1b78d2d9de12765cb0db903717f1bc0b4ee2618d7c304bd0b179609c996fde8c0318eda65c13eb5e86a7873981deef79e7bd4e3b70e53dd53e6130afeb48f26 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild index 26d6ad0aa673..958bd5f5f287 100644 --- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild +++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild @@ -1,9 +1,10 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 XORG_MULTILIB=yes +XORG_EAUTORECONF=yes inherit xorg-3 DESCRIPTION="Library providing generic access to the PCI bus and devices" @@ -22,11 +23,8 @@ pkg_setup() { ) } -multilib_src_install() { - default - - if multilib_is_native_abi; then - dodir /usr/bin - /bin/sh libtool --mode=install "$(type -P install)" -c scanpci/scanpci "${ED}"/usr/bin || die - fi +src_prepare() { + # Let autotools install scanpci (#765706) + sed 's@^noinst_@bin_@' -i scanpci/Makefile.am || die + xorg-3_src_prepare } diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest index 6af57a5b4225..01a1784ff602 100644 --- a/x11-libs/libva-intel-media-driver/Manifest +++ b/x11-libs/libva-intel-media-driver/Manifest @@ -1,13 +1,19 @@ AUX libva-intel-media-driver-20.2.0_x11_optional.patch 458 BLAKE2B 22670f925729ab9e02a4b3ef753911f4e12867da2a0bad90c835ba3291ae139c65327dfdf1e236dd47cd66f943380bb20428d587c9fea57265c1287f31015ca7 SHA512 a235a4c18e388e0564c2ffa1fb4bdd86a05ae8622efdc03bd556b51361478e735330182f4310fd44c275d55759a48fc1ebef8384335daf5160d39b46642c3070 +AUX libva-intel-media-driver-20.4.5_custom_cflags.patch 4078 BLAKE2B 59c525f39ce9ab5546c384641fe8aba017a5cdfe0a4f48dd5acd5d48dc7c6469731c81bb8781ae3be77baaf673e3bee1787fa6623e1ded8b2c3578ff41ba1292 SHA512 0b53bc5a809b305eae939b4ee3a173d59eb433ecb66f67f8c168f4c098689f972fab807e9ee227ca9eac2f80855ad048d45ed262063f031d85ff79813500c643 +AUX libva-intel-media-driver-20.4.5_testing_in_src_test.patch 1724 BLAKE2B a4820733470396b42152b8d3863c45946307c3d6e62b16a90a199a29e1564fbb56c044f07c895b2e6d12ecd5ef235db054d87ee49fcf5c2ced2b9242fd11ebe9 SHA512 02edb8803be4dd4608e8ee970c5472c2c6e6c7dfd2ca5c33b2807900cba49f0ef6d65440c7ca7b978abc368b56bfb7a163c3671aead68512b879fbd446475319 DIST intel-media-18.3.0.tar.gz 14422845 BLAKE2B 07da8e78d069de091bd4f29beb0699c97f007ff0f6543baa40d35923488d6152cb0a921cbe16006b045be973d5651ee01dc98ead0b79d4c779ed39e7a8fb38d9 SHA512 96ee85c087994d1e46666b6bbd5fca8e558d9169f8b7c130fdb4571ecd4dcbb31fe4a73607cc1b055918f27e90dbb25843d851bb8a1e2557733b4795e937479d DIST intel-media-18.4.1.tar.gz 14657816 BLAKE2B eb0be7c756e290bf5318987e375e9ad531fb4e318e4bf83f6c5d68106112a06d505ed7f8abc5ecb277b4430883d2153fe6c68ba683241253cb0d32853bb8dab2 SHA512 ed5d4116ab4af36761a0a819105f4ff5551d437e3f1ab8c1b2ea20a89a1792b7558bacd1ea8f082f595fce21d72810f806820b8543e1cbfcd2de7e28e649a536 DIST intel-media-20.1.1.tar.gz 21788401 BLAKE2B 53f2ebf5941c487253d02d0e23229cd408eb3b53ef37cfdefb1a874e5a6c9b051b69ccda513c2d1d9bb9cc03814bc3db40a40241eb3c7a0a78edba3ba7e9bf01 SHA512 696f3b82d155e472285150b476daf9195ec6cbad0526f017fd0c57c1fb02618210b3e96eb13351ee286f3502df4970a22a940c3476877fa1f5c23dc85a646c25 DIST intel-media-20.2.0.tar.gz 21860711 BLAKE2B df5ebb4ec603902dd34aca6915dab5bec4ad6237e5810d0e04349f7269adf62505afaed8456d1ad6a3544525bdb2012294e6b92e68dc3f0338f6fab54aa934bd SHA512 0f4817b66f4e2d752d5a34cc1c8974dd09b4fe4f6d8bf3df896887542c229088edc406a9b2a68a9b353214aa7ffa4cd8917cdb6695dbe2e316af6c444822b15b +DIST intel-media-20.4.5.tar.gz 22437981 BLAKE2B 136be5280b463879e47ce8a1dae1befbe3907a2429b799b972dffbdcb8b21512e3161dc209abf7b4dfb0d3695512963c40cdd85fb6fb2f3158bee12e8e42ddcd SHA512 dfd70dc83eae181830844f9055ad728d91a51a55ea29ea5d272b154f16a92dfba86568d9b4e8f8c56d500582056b73602c999d2e877386fcf46df1633fc5e2ea EBUILD libva-intel-media-driver-18.3.0.ebuild 892 BLAKE2B fd24321a622354cab7622f05b377b284d0ec301fb4a3e223413b991034ae93ff62b9d7d0bcc59d6dc13e9fad17619d5b448114eff8fd002d2595de32cbe19672 SHA512 f921231ce8251b7fc990f3a2ddc666d0a72035e8e9c3e80e632a0298c040872cb30c3e6e556f022e08dd0b75f7eb2e73f88f97e6308f0121a2c6684d6088f555 EBUILD libva-intel-media-driver-18.4.1.ebuild 892 BLAKE2B efb6cbcf1340852a3ca27f5e763be43175e9d6c870877beb4a794f1da03d1e47c8d08668274b9e8dc26f4ef3674581e4bb6518547515c984bff7a6767d011ce1 SHA512 ace25c724f3434ddc08884d7bed8f944e78364d8f72c54b33f1f6f5919596a7a81581b369a0f0b9024858cc274a43df3095a76643a9433fc4a3d54ee1abb1d23 EBUILD libva-intel-media-driver-20.1.1-r1.ebuild 942 BLAKE2B 212f8314c1abff4908c5bfcc25b05998ce54b77eaf9e7aab153cb669e5e8cada42bd3e1d6149d08c1ae09509c3b8f7e4d09eb51b9549678a3f8b809ef2da2093 SHA512 5675870b98ca4e17077f6589d25cec531ac4e7dd6df6854850b6c3c8ec61f604beccfe32a0c190a58750afb43c6024be66a56bb8379a901fac2230994b4d7613 +EBUILD libva-intel-media-driver-20.1.1-r2.ebuild 1182 BLAKE2B e453b09ac58040ab6e0da45768caf70d8cdace4b4683f94f8133904513212652e5fa7effa8392be7e495e00f8d6227163c465d4404f8628f804eebd9c0c3e3b4 SHA512 52b2221c79305305deda5a952314f8de487399f99f5840e0ec9a2d67ebce819cba2d8e31ee9de4e17300e758925d68ab5f3205ecec62631d19b0a1c7f213203c EBUILD libva-intel-media-driver-20.1.1.ebuild 868 BLAKE2B 1925faeccacca0f6d0c3f75ffe081be5d9b140a10d6632468af645fa604b4c802840fe48741298af3a3f1b1657e0236ad7b96adadf7d207c36c62c787d7fd61a SHA512 6ec6ec8361808bb617d8c24a2c1830b644b18861ce463ecedc3c61960e5174644e531718cd8486741aa77353065ed48d630ffa037791188dd7f5c10e21d1f4e6 EBUILD libva-intel-media-driver-20.2.0-r1.ebuild 985 BLAKE2B 9c7d9f19c231c5e3137243915fd2ff55f61bd79fd43ce23d21b1bf12572054d2c99b00e5ad249197501c0f270bcbc51dd589f18b0a6308c88adb028fee08a359 SHA512 72b54d7049baf366ba89782f6c098ec24e3435b81b5e4b592b8ce313b2aa8f4ac7bd4e8f1750ffcd17817c1ffff467385bf0e22118b3804af61e710d02471157 +EBUILD libva-intel-media-driver-20.2.0-r2.ebuild 1225 BLAKE2B 195b1f1db03ad5bf2d42bae05cba99e9726a0ba3c682c993eb73b6cff6bf04b40004d15223d69fbd64fcae4b62bf1137f50911ec2b9c68bd9079d0302d682ba6 SHA512 a46e343c36dc51819c22b601b7eecc62f38c27b75cc4eafba844fdb32ce062047f3408e582b3daff9668a72df26d995d2a4909c7da98cf2fbc4a60682f41151b EBUILD libva-intel-media-driver-20.2.0.ebuild 869 BLAKE2B f060ace5837fa81761fd7a416d2c82647656691e7a356d4d5b1f5f74c06e417cbf8386429762d1a4b9ee63debaaa99efc5a55e6e333f372fe763848040f9e9bd SHA512 65233a25a88643d2d1b6d6d2381ba333a8c28716b178646471b191d691179ddfc45322a25564d189b266f3ee1c5c72ab5014bf374c9f1e6dd6f34b73e7ff8d53 -EBUILD libva-intel-media-driver-9999.ebuild 856 BLAKE2B 99f3e9db35608c12402b7e409dbec04cdb03977bf265f744cb434d278a9b91e6440df62a05a70ce4befb85b9bad8ae97a453f89b78763fbb1374cb1ec493e391 SHA512 af1b610ce1524dbe58501eabeac99a43f953d1809b3b3efa3a145071954b6b422199d9f08f4e1177bf1a6161048d5f8b9d9a8f849473b732ef2cc02d28816039 -MISC metadata.xml 220 BLAKE2B 84f977d8ddafd6841e5bb33f6184f7bbba42eca7a00feae5a214221a0a6b37ddd3dc13d3dac223c8285daba53629fb9ef2f278675d51ce5b3da8dda6f419867b SHA512 33be2ee02959063935caf88639b7b116430ccacd420b40f9aee5708f081a8cec58d82b9bcbef803e6a4e0084d6f2dccd75cfd3144f15dacfbd783a52397765c3 +EBUILD libva-intel-media-driver-20.4.5.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952 +EBUILD libva-intel-media-driver-9999.ebuild 1467 BLAKE2B 3b50832a196d4d1663e0c360fa44cae9ec87ee1aab76908d296e2f0c6bee9176f8300b8896e37039dfc861c9f8361d83a8c750a71efef77d18ccf1220f8516d4 SHA512 d0987b43d750e5544bb20ecb8359fe2055fac3fcc9e3a84950d426e4ff9fa526cbac1a6f90f13f0b742bcd2d8a587d25b8661e79c3dd201d47eddd011d6c7952 +MISC metadata.xml 602 BLAKE2B 9448d1e88775ec7458fab88e284cd0ac184500f3c6d1b1007495e7de30eba245998b10bfef258a34d2b67d5f17438f0afe9f93e3e4001fa197fcffa22f6559dd SHA512 dbc361bd18283a1ca1feb4adea969783afeb7b0a105675b9603d946f8cc1da6d7e959b3c7f74e5bad5c95bb949687563382155a61de985b3fdd70a8cbb2b502f diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch new file mode 100644 index 000000000000..436e2fe892e6 --- /dev/null +++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_custom_cflags.patch @@ -0,0 +1,136 @@ + Prevent overriding of user-define CFLAGS, including -march flag. + + The flag -msse4.1 is required otherwise compile will not be able to inline sse4.1 code. + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -52,6 +52,8 @@ option (BUILD_CMRTLIB "Build and Install cmrtlib together with media driver" ON) + + option (ENABLE_PRODUCTION_KMD "Enable Production KMD header files" OFF) + ++option (OVERRIDE_COMPILER_FLAGS "Override user compiler FLAGS and use lib defaults" ON) ++ + include(GNUInstallDirs) + + if (BUILD_CMRTLIB) + +--- a/cmrtlib/linux/CMakeLists.txt ++++ b/cmrtlib/linux/CMakeLists.txt +@@ -33,15 +33,19 @@ endif() + + # Set up compile options that will be used for the Linux build + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") ++if (OVERRIDE_COMPILER_FLAGS) + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -msse4.1") + endif() ++endif() + set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") + set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${CPP_STANDARD_OPTION} -fPIC -fpermissive -fstack-protector-all -Werror") ++if (OVERRIDE_COMPILER_FLAGS) + if(CMAKE_SIZEOF_VOID_P EQUAL 8) + set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -msse4.1") + endif() ++endif() + set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -fno-strict-aliasing -D_FORTIFY_SOURCE=2") + set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -D_DEBUG -D__DEBUG -O0") + + +--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake ++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake +@@ -36,7 +36,10 @@ set(MEDIA_COMPILER_FLAGS_COMMON + -Werror=format-security + -Werror=non-virtual-dtor + -Werror=return-type ++) + ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON + # General optimization options + -march=${UFO_MARCH} + -mpopcnt +@@ -44,23 +47,33 @@ set(MEDIA_COMPILER_FLAGS_COMMON + -msse2 + -msse3 + -mssse3 +- -msse4.1 + -msse4.2 + -msse4 ++) ++endif(OVERRIDE_COMPILER_FLAGS) ++ ++list (APPEND MEDIA_COMPILER_FLAGS_COMMON ++ -msse4.1 # SSE4.1 support is required to build the library + -mfpmath=sse + -finline-functions + -funswitch-loops + -fno-short-enums + -Wa,--noexecstack + -fno-strict-aliasing ++) + ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON + # Common defines + -DUSE_MMX + -DUSE_SSE + -DUSE_SSE2 + -DUSE_SSE3 + -DUSE_SSSE3 ++) ++endif(OVERRIDE_COMPILER_FLAGS) + ++list (APPEND MEDIA_COMPILER_FLAGS_COMMON + # Other common flags + -fmessage-length=0 + -fvisibility=hidden +@@ -68,16 +81,26 @@ set(MEDIA_COMPILER_FLAGS_COMMON + -fdata-sections + -ffunction-sections + -Wl,--gc-sections ++) + ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON + # -m32 or -m64 + -m${ARCH} ++) ++endif(OVERRIDE_COMPILER_FLAGS) + ++list (APPEND MEDIA_COMPILER_FLAGS_COMMON + # Global defines + -DLINUX=1 + -DLINUX + -DNO_RTTI + -DNO_EXCEPTION_HANDLING + -DINTEL_NOT_PUBLIC ++) ++ ++if (OVERRIDE_COMPILER_FLAGS) ++ list (APPEND MEDIA_COMPILER_FLAGS_COMMON + -g + ) + +@@ -90,6 +113,7 @@ if(${UFO_MARCH} STREQUAL "slm") + -mtune=atom + ) + endif() ++endif(OVERRIDE_COMPILER_FLAGS) + + if(${ARCH} STREQUAL "64") + set(MEDIA_COMPILER_FLAGS_COMMON +@@ -206,9 +230,11 @@ include(${MEDIA_EXT_CMAKE}/ext/linux/media_compile_flags_linux_ext.cmake OPTIONA + if(${PLATFORM} STREQUAL "linux") + #set predefined compiler flags set + add_compile_options("${MEDIA_COMPILER_FLAGS_COMMON}") ++if (OVERRIDE_COMPILER_FLAGS) + add_compile_options("$<$<CONFIG:Debug>:${MEDIA_COMPILER_FLAGS_DEBUG}>") + add_compile_options("$<$<CONFIG:Release>:${MEDIA_COMPILER_FLAGS_RELEASE}>") + add_compile_options("$<$<CONFIG:ReleaseInternal>:${MEDIA_COMPILER_FLAGS_RELEASEINTERNAL}>") ++endif(OVERRIDE_COMPILER_FLAGS) + + foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON}) + SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}") + + diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch new file mode 100644 index 000000000000..3c6d500f2fbf --- /dev/null +++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-20.4.5_testing_in_src_test.patch @@ -0,0 +1,46 @@ +Run tests in src_test() instead of src_compile() and src_install() + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -37,6 +37,8 @@ if("${os_name}" STREQUAL "clear-linux-os") + set(CMAKE_INSTALL_SYSCONFDIR "usr/share/defaults/etc") + endif() + ++include(CTest) ++ + include(CMakeDependentOption) + + option (ENABLE_KERNELS "Build driver with shaders (kernels) support" ON) +--- a/media_driver/linux/ult/CMakeLists.txt ++++ b/media_driver/linux/ult/CMakeLists.txt +@@ -52,9 +52,3 @@ endif () + add_subdirectory(libdrm_mock) + add_subdirectory(ult_app) + +-enable_testing() +-add_test(NAME test_devult COMMAND devult ${UMD_PATH}) +-set_tests_properties(test_devult +- PROPERTIES PASS_REGULAR_EXPRESSION "PASS") +-set_tests_properties(test_devult +- PROPERTIES FAIL_REGULAR_EXPRESSION "FAIL") +--- a/media_driver/linux/ult/ult_app/CMakeLists.txt ++++ b/media_driver/linux/ult/ult_app/CMakeLists.txt +@@ -68,13 +68,11 @@ if (DEFINED BYPASS_MEDIA_ULT AND "${BYPASS_MEDIA_ULT}" STREQUAL "yes") + message("-- media -- BYPASS_MEDIA_ULT = ${BYPASS_MEDIA_ULT}") + else () + if (ENABLE_NONFREE_KERNELS) +- add_custom_target(RunULT ALL DEPENDS ${LIB_NAME} devult) + +- add_custom_command( +- TARGET RunULT +- POST_BUILD +- COMMAND LD_PRELOAD=../libdrm_mock/libdrm_mock.so ./devult ../../../${LIB_NAME}.so ++ add_test( ++ NAME RunULT ++ COMMAND "${CMAKE_COMMAND}" -E env "LD_PRELOAD=${CMAKE_CURRENT_BINARY_DIR}/../libdrm_mock/libdrm_mock.so" "${CMAKE_CURRENT_BINARY_DIR}/devult" "${CMAKE_CURRENT_BINARY_DIR}/../../../${LIB_NAME}.so" + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} +- COMMENT "Running devult...") ++ ) + endif () + endif () + diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild new file mode 100644 index 000000000000..91a9328035e4 --- /dev/null +++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" + S="${WORKDIR}/media-driver-intel-media-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Intel Media Driver for VAAPI (iHD)" +HOMEPAGE="https://github.com/intel/media-driver" + +LICENSE="MIT BSD" +SLOT="0" +IUSE="X set-as-default" + +PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch ) + +DEPEND=">=media-libs/gmmlib-${PV} + >=x11-libs/libva-2.7.1[X?] + >=x11-libs/libpciaccess-0.13.1-r1:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=OFF + -DUSE_X11=$(usex X) + -DINSTALL_DRIVER_SYSCONF=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use 'set-as-default' ; then + echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die + doenvd "${T}/55libva-intel-media-driver" + fi +} diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild new file mode 100644 index 000000000000..45e9262fd45c --- /dev/null +++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" + S="${WORKDIR}/media-driver-intel-media-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Intel Media Driver for VAAPI (iHD)" +HOMEPAGE="https://github.com/intel/media-driver" + +LICENSE="MIT BSD" +SLOT="0" +IUSE="X set-as-default" + +PATCHES=( "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch ) + +DEPEND=">=media-libs/gmmlib-20.2.2 + >=x11-libs/libva-2.8.0[X?] + >=x11-libs/libpciaccess-0.13.1-r1:= +" +RDEPEND="${DEPEND}" + +src_configure() { + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=OFF + -DBUILD_TYPE=release + -DPLATFORM=linux + -DUSE_X11=$(usex X) + -DINSTALL_DRIVER_SYSCONF=OFF + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use 'set-as-default' ; then + echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die + doenvd "${T}/55libva-intel-media-driver" + fi +} diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild new file mode 100644 index 000000000000..33551ed4938f --- /dev/null +++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.4.5.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit cmake + +if [[ ${PV} == *9999 ]] ; then + : ${EGIT_REPO_URI:="https://github.com/intel/media-driver"} + if [[ ${PV%9999} != "" ]] ; then + : ${EGIT_BRANCH:="release/${PV%.9999}"} + fi + inherit git-r3 +else + SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${PV}.tar.gz" + S="${WORKDIR}/media-driver-intel-media-${PV}" + KEYWORDS="~amd64" +fi + +DESCRIPTION="Intel Media Driver for VAAPI (iHD)" +HOMEPAGE="https://github.com/intel/media-driver" + +LICENSE="MIT BSD" +SLOT="0" +IUSE="+custom-cflags set-as-default test X" + +RESTRICT="!test? ( test )" + +DEPEND=">=media-libs/gmmlib-20.4.1 + >=x11-libs/libva-2.10.0[X?] + >=x11-libs/libpciaccess-0.13.1-r1:= +" +RDEPEND="${DEPEND}" + +PATCHES=( + "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch + "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch + "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch +) + +src_configure() { + local mycmakeargs=( + -DMEDIA_BUILD_FATAL_WARNINGS=OFF + -DMEDIA_RUN_TEST_SUITE=$(usex test) + -DBUILD_TYPE=Release + -DPLATFORM=linux + -DUSE_X11=$(usex X) + -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now + -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags) + ) + + cmake_src_configure +} + +src_install() { + cmake_src_install + + if use set-as-default ; then + echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die + doenvd "${T}/55libva-intel-media-driver" + fi +} diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild index 534fcd8c095f..33551ed4938f 100644 --- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild +++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild @@ -22,19 +22,41 @@ HOMEPAGE="https://github.com/intel/media-driver" LICENSE="MIT BSD" SLOT="0" -IUSE="" +IUSE="+custom-cflags set-as-default test X" -DEPEND=">=media-libs/gmmlib-${PV} - >=x11-libs/libva-2.8.0 +RESTRICT="!test? ( test )" + +DEPEND=">=media-libs/gmmlib-20.4.1 + >=x11-libs/libva-2.10.0[X?] >=x11-libs/libpciaccess-0.13.1-r1:= " RDEPEND="${DEPEND}" +PATCHES=( + "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch + "${FILESDIR}"/${PN}-20.4.5_custom_cflags.patch + "${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch +) + src_configure() { local mycmakeargs=( -DMEDIA_BUILD_FATAL_WARNINGS=OFF - -DMEDIA_RUN_TEST_SUITE=OFF + -DMEDIA_RUN_TEST_SUITE=$(usex test) + -DBUILD_TYPE=Release + -DPLATFORM=linux + -DUSE_X11=$(usex X) + -DLATEST_CPP_NEEDED=ON # Seems to be the best option for now + -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags) ) cmake_src_configure } + +src_install() { + cmake_src_install + + if use set-as-default ; then + echo 'LIBVA_DRIVER_NAME="iHD"' > "${T}/55libva-intel-media-driver" || die + doenvd "${T}/55libva-intel-media-driver" + fi +} diff --git a/x11-libs/libva-intel-media-driver/metadata.xml b/x11-libs/libva-intel-media-driver/metadata.xml index 80088c21d0ab..dfe0d9d8141b 100644 --- a/x11-libs/libva-intel-media-driver/metadata.xml +++ b/x11-libs/libva-intel-media-driver/metadata.xml @@ -1,7 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<maintainer type="project"> - <email>media-video@gentoo.org</email> -</maintainer> + <maintainer type="project"> + <email>media-video@gentoo.org</email> + </maintainer> + <maintainer type="person"> + <email>k2k@narod.ru</email> + <name>Evgeny Grin</name> + </maintainer> + <use> + <flag name="set-as-default">Override libva automatic driver selection and set this (iHD) driver as default one.</flag> + <flag name="custom-cflags">Do not override user CFLAGS like -02, -march, -msse and similar with lib defaults. Not tested by upstream.</flag> + </use> </pkgmetadata> diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest index efc1cc63bf22..f3b95a054705 100644 --- a/x11-libs/libva/Manifest +++ b/x11-libs/libva/Manifest @@ -1,12 +1,17 @@ +AUX libva-2.10.0-unbreak_gnu_sed.patch 1029 BLAKE2B 205fdb43e85631f8213da70f136e5c6cc2ca3b31a02c829141cc6080455ad98b946438e345e147403e0e0f545e0e0915605fb2fb52108f70b9e4133663b0b376 SHA512 7c1cfed2dba5adb8c38fb9b95d824531ea18b74fd6b7d23bce6012285fa56ecaff3baa977461a1ccc41e4e858af02fe4a00628ddcd3e33c43829d6199a3e1b56 +DIST libva-2.10.0.tar.bz2 484741 BLAKE2B 9c3912d5337d3624af9ffc537a972479385285413712948159641d10b60a39b60754b3bc6467a0508a878df29be23c0e2bace488bdf9047f3e162ca0b573fa5f SHA512 9225120f17e0d935927cb0046c3a6086c776beac71a8ef7fd800d2c6a721d0e28a13be89221c5ef3cca1634317aaa2a513554ccf25a54f25b2a339603c4a11a1 DIST libva-2.5.0.tar.bz2 459677 BLAKE2B d6e5bf94bcbda0a724634164bd8cf91efbdbe36120e62e7e7eefcd749afffec1950d8904318b472c81ae07490c559c68b0853725c654a08592457118cd5d6a83 SHA512 ffaeb9cf8ed1f93073c1cb3e58f5b3d3612e81622d02f8e428c089f625d4370b496b7681ac2fc2823c48670c9fd3da50893b1db51de768cf0f5d866e2ee78106 DIST libva-2.6.1.tar.bz2 466497 BLAKE2B d4ea6e6d0102722206d94725932f0b3cf650bab3f02235f4c627dc83e5417b786f9524430d793f1067d002a0c9d7cbc92a7c740383c698d225a14946e1bb90ba SHA512 b57f0c0dda5ebadc92f56bc7fb835c2931cafffca9413fb4d244ea1dd47b603376323e6bebf144ccb2d2cf3499c64b101f8e03ff1809bd81242718d224d2d17d DIST libva-2.7.1.tar.bz2 477933 BLAKE2B 261e608af3f1427bed0244d4ebbc0d3ffe5681669ecb3583a8910568bc96817b8da079ffe80915ecf1002f9ac247eea5e44f8f7ce305313719fc1a4f1c5892b3 SHA512 f4b88ca0216f0ea4d934edcd322b8f741833b5a50ee2f34a3ecf60d635082b29e2dd032734c2f9d2a680e3b9c98e61a8b9432ea639a9fd5389761e04782c1126 DIST libva-2.8.0.tar.bz2 478734 BLAKE2B b11393a9b9ec7ef4cf91d20d4005d42ad3d0e6a4a8e4d8cda67816bc5b9d3b23900754b5e8af92386dcf99a11e53af70fc4723ffecc715328c8fbf3d40486098 SHA512 329c5fc2262a6f4fddfcb13bd9644589248be6ae18fa1481cccc6b33874b91b60ad3f16a1777712f7a4817ba576db984834aa8735e6ad13d99b2f5aa13e9ddfa DIST libva-2.9.0.tar.bz2 481556 BLAKE2B 5509f3d7df11a11602331a3b6bb78d3a5d3dfbeff024eaa77594918c49cd48ec9e8ee017d8ac7b4aa1dbd3252a23caecce9a10a8a9e12ef4c483a8a34e028b20 SHA512 496358b73cd525d8c9dc1fcf3dbf992ec997ecc8f7be31f0e226ded173aecf29d8d4b60cc7cc5ee7beac538061659841145f67f449a03a04236a6ee7ae6f8323 +DIST libva-2.9.1.tar.gz 240934 BLAKE2B 76333a9ce78783c3d94798a19ea6a52d95768ca7e5a547094290313d4f5c610841787d4420d19e0553174933beaf5fbf68e7e849ad38682173f670de0d9a76e5 SHA512 79fd0b41795ac5de68bdd6470389fad6caf016fa4a44f2cd775c0a65d6d8f270a7e237d3b2e42a90376c103d2d2e2c010fe47835c7a15d79b94beaced02a2884 +EBUILD libva-2.10.0.ebuild 2234 BLAKE2B 482b441d1e3da0f051b8b5f75540a151dc11b77bc8fb85085f53eba0420399b85135618f96efe075aaab0fcbd8b8233dff8416ffd24b5b07c3caacd75c2d3584 SHA512 134a84329f891f8e3f84930ba62c2ad0b7f9d74a712878a5233ffb6ec570ecbe699dd7967a2f1eabf2af9872c82e1406f0f4b47c26b82737b8101a2e5dfcc175 EBUILD libva-2.5.0-r1.ebuild 2186 BLAKE2B 7c9a9dc3f979909e02812398551197938bce437f0092940361853613fff9813e2d06af44f4e09130cb27ac4313722eba8b869ec0a8681532f07c6449ee4c0078 SHA512 2d8f8705c68d3a1bda268a18e8e65dc3e8d8f0d73fdcea6f6e8e5908028598f1a0e3865818ef37643bc6843af9dcb3f4fa9a167d021dbf67772937af2df721ed EBUILD libva-2.6.1.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1 EBUILD libva-2.7.1.ebuild 2193 BLAKE2B 331542be784f71417c51fda406846e3613976a5639492e3715f02dbcd1ffb2e1236700c164cc519fec7b14112c5aa150905a2b680d5810a9211897a4ed854a43 SHA512 bb0aa7dfac518d3b1c60fa99315de482840d8b5840652576977d10065f41cab3df44db4e78a33c65ac932e4a3e4317896abcb2ccbaefcaaab31feccc6978c57b EBUILD libva-2.8.0.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1 EBUILD libva-2.9.0.ebuild 2203 BLAKE2B f17547730d5133eea144d8e6a582dc180284650cb47b1e76926644f9c95bba1d5b48caf21df4172f6d288157c056ed9a7b1a9ea1204279894d1b95f63666f891 SHA512 5e7a024dd37094c8c9726c5907a9feffbbb74a81693ba475b892d9377c0f52b9d58f78aa16b6781fa49b96529aa84473145f395ce975f77e047f8365416836ce -EBUILD libva-9999.ebuild 2196 BLAKE2B cb99d1084562e6e920263669007872ddc6efedd3ce8755f0a8c62382eec24a97de2ed5286250884b117e6ecf2fb356835f0397f73773b865f21e9de1d2bb098e SHA512 57f80b7e4047c098437ffbff25883716bd46452f5b3162f14804dd732e01a1ca497a50dc4f3fb53cb04442c31129ca880559d2680e9d0bc35e1eb9cba695ebd1 +EBUILD libva-2.9.1.ebuild 2536 BLAKE2B c454fcb746f256f118e638307e8e3214f6a9120b2843e1583b0f2ac46acf2c7a51bed11d2b047408bcc056e124837a385abb53b1ffc1a2c0b9d3782e271ff822 SHA512 9d6df49bb14d1cdf943cdf62a0a86a01f5a803099b4675f60327d92d5786f37d2fb643ea75e060daea44f12c5e38426d425955cbdb45afb2ead0f9d2f4fb29e3 +EBUILD libva-9999.ebuild 2547 BLAKE2B a5ad3a164861a344fa5ac0c2bfb0da1a2701b2e72e90366346f3ad2f12f3bad62d00354f66fc8e26ca792d2685969c778073eb426001ac8bfdc8fe01eb0641d9 SHA512 8eddaef78665a1e99f57e53bebaf538e11879b8d1d320d7dfabdc923fbc4a4d3dc81fa5a9d853b1137b5212c9f77889f8f875f242f95076799bc918d5a31d3d0 MISC metadata.xml 469 BLAKE2B 86258c66689544ac1709503e76a23d84d090393d1358158b47ea2fd0936f5d3828c4be00ea8490a531f63956274b9411e3b698207899eaf98a6bcf2f88572145 SHA512 2ad27b3a2dadd6e89f2f6700cff4aa5a76ee2770f0daa8a3b523ec5c19718e333528fee6919c7df6d53c58368c67fcb3836aae256d61bf4d7e042d00ab9f74b4 diff --git a/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch b/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch new file mode 100644 index 000000000000..411c6c475589 --- /dev/null +++ b/x11-libs/libva/files/libva-2.10.0-unbreak_gnu_sed.patch @@ -0,0 +1,31 @@ +From 508cf475854c83b61a63d4c5f143b9a405fef77c Mon Sep 17 00:00:00 2001 +From: Lars Wendler <polynomial-c@gentoo.org> +Date: Sat, 9 Jan 2021 01:21:55 +0100 +Subject: [PATCH] Revert "autotools: unbreak --enable-wayland with BSD sed" + +This reverts commit 78431a361bed0b6e9f1f3ebc0de8897b069b3848 +as it breaks GNU sed + +https://github.com/intel/libva/issues/489 + +Signed-off-by: Lars Wendler <polynomial-c@gentoo.org> +--- + va/wayland/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am +index f48afb4..705efa3 100644 +--- a/va/wayland/Makefile.am ++++ b/va/wayland/Makefile.am +@@ -70,7 +70,7 @@ va_wayland_drm.c: $(protocol_source_h) + %-client-protocol-export.c : %.xml + $(AM_V_GEN)$(WAYLAND_SCANNER) code < $< > $@ + %-client-protocol.c: %-client-protocol-export.c +- $(AM_V_GEN)$(SED) -e $$'1i\\\n#include "sysdeps.h"\n' \ ++ $(AM_V_GEN)$(SED) -e '1i#include "sysdeps.h"' \ + -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@ + + EXTRA_DIST = \ +-- +2.30.0 + diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild new file mode 100644 index 000000000000..8f6274df2517 --- /dev/null +++ b/x11-libs/libva/libva-2.10.0.ebuild @@ -0,0 +1,88 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools multilib-minimal + +DESCRIPTION="Video Acceleration (VA) API for Linux" +HOMEPAGE="https://01.org/linuxmedia/vaapi" + +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 + EGIT_BRANCH=master + EGIT_REPO_URI="https://github.com/intel/libva" +else + SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1)" +IUSE="+drm opengl utils vdpau wayland X" + +VIDEO_CARDS="nvidia intel i965 nouveau" +for x in ${VIDEO_CARDS}; do + IUSE+=" video_cards_${x}" +done + +RDEPEND=" + >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" +PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) + video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) + video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) + video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) + utils? ( media-video/libva-utils ) +" + +REQUIRED_USE="|| ( drm wayland X ) + opengl? ( X )" + +DOCS=( NEWS ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/va/va_backend_glx.h + /usr/include/va/va_x11.h + /usr/include/va/va_dri2.h + /usr/include/va/va_dricommon.h + /usr/include/va/va_glx.h +) + +PATCHES=( + "${FILESDIR}/${PN}-2.10.0-unbreak_gnu_sed.patch" +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" + $(use_enable opengl glx) + $(use_enable X x11) + $(use_enable wayland) + $(use_enable drm) + --enable-va-messaging + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + default + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/x11-libs/libva/libva-2.9.1.ebuild b/x11-libs/libva/libva-2.9.1.ebuild new file mode 100644 index 000000000000..89ac22133fa6 --- /dev/null +++ b/x11-libs/libva/libva-2.9.1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit multilib-minimal + +DESCRIPTION="Video Acceleration (VA) API for Linux" +HOMEPAGE="https://01.org/linuxmedia/vaapi" + +inherit autotools + +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 + EGIT_BRANCH=master + EGIT_REPO_URI="https://github.com/intel/libva" +else + # SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" + # The upstream provides periodically tarball with pre-built 'configure'. + # To simplify updates, portage use tarballs without pre-build 'configure' + # which are always available. + SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" +fi + +LICENSE="MIT" +SLOT="0/$(ver_cut 1)" +IUSE="+drm opengl utils vdpau wayland X" + +VIDEO_CARDS="nvidia intel i965 nouveau" +for x in ${VIDEO_CARDS}; do + IUSE+=" video_cards_${x}" +done + +RDEPEND=" + >=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}] + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + virtual/pkgconfig +" +PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) + video_cards_nouveau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r3[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB_USEDEP}] ) + video_cards_intel? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) + video_cards_i965? ( >=x11-libs/libva-intel-driver-2.0.0[${MULTILIB_USEDEP}] ) + utils? ( media-video/libva-utils ) +" + +REQUIRED_USE="|| ( drm wayland X ) + opengl? ( X )" + +# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs +DOCS=( NEWS CONTRIBUTING.md README.md ) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/va/va_backend_glx.h + /usr/include/va/va_x11.h + /usr/include/va/va_dri2.h + /usr/include/va/va_dricommon.h + /usr/include/va/va_glx.h +) + +src_prepare() { + default + eautoreconf +} + +multilib_src_configure() { + local myeconfargs=( + --with-drivers-path="${EPREFIX}/usr/$(get_libdir)/va/drivers" + $(use_enable opengl glx) + $(use_enable X x11) + $(use_enable wayland) + $(use_enable drm) + --enable-va-messaging + ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" +} + +multilib_src_install_all() { + default + find "${ED}" -type f -name "*.la" -delete || die +} diff --git a/x11-libs/libva/libva-9999.ebuild b/x11-libs/libva/libva-9999.ebuild index 016d79e6442e..812111b4ebad 100644 --- a/x11-libs/libva/libva-9999.ebuild +++ b/x11-libs/libva/libva-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 @@ -8,14 +8,19 @@ inherit multilib-minimal DESCRIPTION="Video Acceleration (VA) API for Linux" HOMEPAGE="https://01.org/linuxmedia/vaapi" -if [[ ${PV} = *9999* ]] ; then # Live ebuild - inherit autotools git-r3 +inherit autotools + +if [[ ${PV} = *9999 ]] ; then + inherit git-r3 EGIT_BRANCH=master EGIT_REPO_URI="https://github.com/intel/libva" - AUTOTOOLS_AUTORECONF="yes" else - SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux" + # SRC_URI="https://github.com/intel/libva/releases/download/${PV}/${P}.tar.bz2" + # The upstream provides periodically tarball with pre-built 'configure'. + # To simplify updates, portage use tarballs without pre-build 'configure' + # which are always available. + SRC_URI="https://github.com/intel/libva/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" fi LICENSE="MIT" @@ -52,19 +57,20 @@ PDEPEND="video_cards_nvidia? ( >=x11-libs/libva-vdpau-driver-0.7.4-r1[${MULTILIB REQUIRED_USE="|| ( drm wayland X ) opengl? ( X )" -DOCS=( NEWS ) +# CONTRIBUTING.md and README.md are avaialbe only in .tar.gz tarballs and in git +DOCS=( NEWS CONTRIBUTING.md README.md ) MULTILIB_WRAPPED_HEADERS=( -/usr/include/va/va_backend_glx.h -/usr/include/va/va_x11.h -/usr/include/va/va_dri2.h -/usr/include/va/va_dricommon.h -/usr/include/va/va_glx.h + /usr/include/va/va_backend_glx.h + /usr/include/va/va_x11.h + /usr/include/va/va_dri2.h + /usr/include/va/va_dricommon.h + /usr/include/va/va_glx.h ) src_prepare() { default - [[ "${PV}" == *9999* ]] && eautoreconf + eautoreconf } multilib_src_configure() { @@ -74,10 +80,12 @@ multilib_src_configure() { $(use_enable X x11) $(use_enable wayland) $(use_enable drm) + --enable-va-messaging ) ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_install_all() { + default find "${ED}" -type f -name "*.la" -delete || die } diff --git a/x11-libs/libvdpau/Manifest b/x11-libs/libvdpau/Manifest index b47fc53aa7e1..4f90dae65170 100644 --- a/x11-libs/libvdpau/Manifest +++ b/x11-libs/libvdpau/Manifest @@ -3,6 +3,6 @@ DIST libvdpau-1.4.tar.bz2 139504 BLAKE2B de2b9251060f10e3126b59f44595c3b9cc65c3f DIST libvdpau-libvdpau-1.2.tar.bz2 140017 BLAKE2B 0420961c48fcd5c92e7e98f84f629946f6234c28781bd7d8c9eb4aa2ab11b76e89e05f50cc423a2935b3376ff3b919ad9e6ef1710ff3549369567f298b5efa50 SHA512 f76c2283a1bd2e854aa6b86a564f7f08c1ff7da34e971c7c39f36e77fbd51fe0440d1ba01bff0b80be6c0326817ee4e6bff719dbe8dbf5e1ec7a94fad5016b7e EBUILD libvdpau-1.2.ebuild 1073 BLAKE2B b6b30a1065a56c6c17ebe03db3667f3ee4098a26c6c8000c765afbabbd327c2b416d74c61c7f44e89ba5dd126935f43154d219c5f33bc1c972f2d24837218ffd SHA512 ad19038048c4ec1aafbc940912e6b5f214bdbe899b63d8c7ae2990be9d1d52c54d11ba1963afb187e8bc8da49deb7ca53e30c0eb58851ebd087c9b331bb70c1b EBUILD libvdpau-1.3.ebuild 1160 BLAKE2B f8b155db62eee4a49ceaf03d399052673ad39cd932fefa9ae77f1f00113a7c64eb5edf3adc467c35f7b83e7dfc19ed4224248b9fed1f7993c0368f555e856137 SHA512 b399f7ed6b67a88cd372921c34bce9e0f21b2e7d5b279e84275ea2a03f44994659fc8861660a44fe4c98cd4f5f3365815abefa892f4b583b6fd84f01565c5e09 -EBUILD libvdpau-1.4.ebuild 1167 BLAKE2B d7fef65087045f1146f65aa56de2a0c9cb266635aece92b9e4be179b7878cad57860cd320c30bc6dd48fbd6fbec7e0d8a259405ec1fa8d1ca4123cfa4634a99f SHA512 587ce8f8c676291f0d72651838a26cddd22498c3c6ad63369109ba43cf7bc700eedd296e3d7638c1dd2d44a6e901ddbbba705d708b41199f30dee9594011e682 +EBUILD libvdpau-1.4.ebuild 1166 BLAKE2B 6c76c57c35253773701109010f194c1ede5a39f93f65740e2ea1af3ff23200d9c51fffbcce37b334db726ea39ef685ba63d2c8d500a033b3951becf24137c40a SHA512 c11923ca850b667e1349b1148bbe9c9c7e9f19378af643ffd59e966e03a825fa6ffa83090b7cf78be67c9ff69f0790cee839adbc1f5d7b00f82eebec8e90f96e EBUILD libvdpau-99999.ebuild 1122 BLAKE2B b2e74c53c093e22e58257b67b91b59f51e98cc3715f68c67958a57e366df36bb660436e3bb7abdcb0fe11490f60d6a0c5bc8b2658c58d3979125385f6d7f7276 SHA512 8da6e8637191f4b8c198498e4f81fb4e7a0f5fa8108c16edf3ae89d52ee7ab360a2c2e505b3b5341076e7cfe18f1ad1093c251cad96f456ad81f134fdd940851 MISC metadata.xml 167 BLAKE2B e4dadf27fd344484f2bccb5b904909c89aac568c32e5b3c44bdf139eacefd4b4fae74419f503d2b7da0dccc1b68ba05d777d11292c0f89270d1ac5c9c703e8ca SHA512 7c8decb24ee3a850e38186cf3c7f8933a28017426806870ad6ef9ceb2533be147a2681fc789b535a81cb528af8c29d90d3006e4f250aee23bd7dea4561294e33 diff --git a/x11-libs/libvdpau/libvdpau-1.4.ebuild b/x11-libs/libvdpau/libvdpau-1.4.ebuild index f7c53efbb4a2..aa4fe3e48777 100644 --- a/x11-libs/libvdpau/libvdpau-1.4.ebuild +++ b/x11-libs/libvdpau/libvdpau-1.4.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://gitlab.freedesktop.org/vdpau/${PN}/-/archive/${PV}/${P}.tar.bz2 LICENSE="MIT" SLOT="0" -KEYWORDS="~alpha amd64 arm64 ~riscv ~x86" +KEYWORDS="~alpha amd64 arm64 ~riscv x86" IUSE="doc dri" RDEPEND=" diff --git a/x11-libs/qwt/Manifest b/x11-libs/qwt/Manifest index 3eac0fd08b7f..1159646e858d 100644 --- a/x11-libs/qwt/Manifest +++ b/x11-libs/qwt/Manifest @@ -4,5 +4,5 @@ AUX qwt-6.1.4-qt-5.15.patch 8857 BLAKE2B 539dd05419d36428aee36a78f92a875c5067366 DIST qwt-6.1.4.tar.bz2 4227315 BLAKE2B dd7212adb3c8fda081b1feeeb9d59b3b087deb0ef56bdbc7bb95e01992e41d5d91065f0b8aaf3337e1c66d4ad431bfb313f9b04bb2e43915f4cb21fb65725e36 SHA512 6135ce47fd4f9ff5b705193fc1f7410cfd5a0b84931bb17db750f6a5486ae810c261dae32431bd52838c36eadee02487148e1efa71c465c63aa43062eec160da DIST qwt-6.1.5.tar.bz2 4408268 BLAKE2B 5f42e0cfc95a7dade8e376438234abded91390b52a793eba6aef21027379f12ab2441fd80121e05c1fba13ac1b526bb6c1a6c0e8442c87cb06dcf2c520269373 SHA512 0dd1a8278751f0bb26e33ccbf120a20e406109a440d314e4525ce9a2d6f1fc56dccff2dc11c500fe2cfcbd42f4a641e87a231f93f321edc588d9353ffaccbd22 EBUILD qwt-6.1.4.ebuild 3209 BLAKE2B bf5198b9a6a9b78d078cd05c53c14cca5b760cb37a703ffd5813d8c1b93105080704460cdae529feb8594829b84107b27895b000e04f5ee0c56bc41bbaace35d SHA512 496804a34ef7e9f50d05ac24f2280ba1c13badb10b36d6c65117b2973e6256a44b48f991e5f0eb1963e3bb5fc5fa1f6766964e24eb928325b1fcafa76326b36e -EBUILD qwt-6.1.5.ebuild 3171 BLAKE2B d74fc4aa6b60ebbc754f66dcd6fb8de4e0bec5d79278a34540b8e6b6888b2f7ce73b2000c8db48081a249830c1b29bf2ffae3cb72c97323f8fccca4327660d81 SHA512 ad6aa67423c8cf954aa34747cf891093bc3420b290a451767a10bcbf6c0f764d6ebdaabcc0565ae8b7b755ebfbb5c263d0bd9de0359091b673a728a58e4cfcb3 +EBUILD qwt-6.1.5.ebuild 3169 BLAKE2B ea5707109597a519ee5fa05dd1f86ef2c2832cc3c371dfc12e4cd9116d849ae8e8ed94abdc9bf6ca4e3158fceef2a5b53566a370038ca6368a5aa29d11abf25a SHA512 a7215cbf4fe78eb2965dbac1d1170bd562279c1d44554d45fe1d2c243aaa9b24e2acd7aeb3ae37185265e2080a8f1569fbcc2d53dbfc601d9880f4b4a7011f43 MISC metadata.xml 870 BLAKE2B 1e2262a74f86901bfdb2a897fb40885880391898e60ca6ddb001ea6f7a1bca4586e2cc2c3af28b8d3f455aac4d93204efb370d491ac6749207cf584c8b08f589 SHA512 53e10079699529613ece87ae1e2908e7f7144d041f62618512d00df0b6bf9ae2c5b70afc8309cef0523e10a6605126f3ce871589c3133d64ac52db9ff7346b43 diff --git a/x11-libs/qwt/qwt-6.1.5.ebuild b/x11-libs/qwt/qwt-6.1.5.ebuild index 43b1263c98ca..3328e27fd94b 100644 --- a/x11-libs/qwt/qwt-6.1.5.ebuild +++ b/x11-libs/qwt/qwt-6.1.5.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://qwt.sourceforge.net/" SRC_URI="mirror://sourceforge/project/${PN}/${PN}/${PV}/${P}.tar.bz2" LICENSE="qwt mathml? ( LGPL-2.1 Nokia-Qt-LGPL-Exception-1.1 )" -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86 ~amd64-linux ~x86-linux" SLOT="6/1.5" IUSE="designer doc examples mathml opengl svg" diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest index 47878fe1c197..e8a13d910ecd 100644 --- a/x11-libs/wxGTK/Manifest +++ b/x11-libs/wxGTK/Manifest @@ -4,6 +4,6 @@ AUX wxGTK-ignore-c++-abi.patch 1657 BLAKE2B 5d865c83174f2540b798a2930f8d5ae8336f DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9 DIST wxWidgets-3.0.4-docs-html.tar.bz2 24122986 BLAKE2B ffd38d50e6cb44077f346597863a8dfb1cb5172b9380995082acb23b5b5dae060bc1e3d14307a1146ccd93b5ae9c4fd8fb206346c8d5aced5a535cd3d7f8961a SHA512 2b4cefc98f5f034a8c36237c4979bd02e8b0ed60aaeb31946d8661fb8e5297172cec807e45c96fe2939b012f093950721cda8bf9f750697b50e3741711011ccd DIST wxWidgets-3.0.4.tar.bz2 20204622 BLAKE2B 97b9f3f44f080104cae290bc3e162b51ce27a96fb22b191d52f30db1f1dc7951defcc220afc4dcb8417cfe23490762c2a25f62164ac21809f73ccf442dd19347 SHA512 c9e6b35d541a99921c54cfdac260843f574f146b27f924a7a0fca5007344fa99865a96ded95e6802329ad9221b4880d62b92277a1b4c1ce71420acb672ad9158 -EBUILD wxGTK-3.0.4-r2.ebuild 3987 BLAKE2B 4daa5ff78e50f0c429dc307830f242b76af13d85c81c58407776b56896eb27c3939f7b19d6888223e5dc79bc06f584a283c328e2d2df7f0e07f011e89bcd1e6e SHA512 b6f24a0025559bcc4fc8dc5807b552caa5dea92ac7359d2bfc4bc414220e3350ac8f4df36f51db2447b3bf4d637abe5f7dd8af6c875e0176dd7cc985fe87ea1e -EBUILD wxGTK-3.0.4-r302.ebuild 5211 BLAKE2B 3b1b0c59bb5a12e3168e15eb05aab33b28bb9c0c0bad4ca1ef965dbc9e03e909f155ef379affcd9fdb7a481738b437699b2c512c181f6fd23a5be76026857994 SHA512 cee65ec2e396abf97a7703ea48f13188d81738e257b664dbfa469db706420170ed70661a59451c5c34c1ad98666279c4a4ca7cc8347a3ec0beaae5a21b247d7a +EBUILD wxGTK-3.0.4-r2.ebuild 3600 BLAKE2B 019f83f1fb028982123b691988bc1513fc7f71ef517e6fa696b693ca53baa88ce424c1c779c1904e75956d6629a5f42b1977a6ac2b1d78bd5a7533714cbc1976 SHA512 c687c3bcddaf4c934e1616651d982bd0b175db8eedb4babb6820a39503f1b6484dd2b219a685f12931f0937e427d2d068065d0247c364e6dfe55aae73655a66b +EBUILD wxGTK-3.0.4-r302.ebuild 4824 BLAKE2B bc5a1a4266fe8dad373ed7efc86ed6b4df84e119047146b2aceb2ddd085399184ff38b9bdf7adf1b1543f907db56d210a271e67d8ba025331802d453ae603207 SHA512 9d3c39b3a9c5350eb75f35822898f29f1e7941bb449ec8e1221edfd75a4c51bfd4649128163827c3ba76b1c23eba03444e00e45f519d4929fc6b417897d7e6bf MISC metadata.xml 759 BLAKE2B 4bafb6bd1d082eae5773d84fb116779f337e662090c4d01e22296f891114458de4a50f1f10775b61f06f22c6db7d4288c66c0c59836cc362298c23fecef499af SHA512 a7bf3b8cecf7ffba0dbfded9884fb7df3866c1a00c473f9ecb2d3fc1c84c5713dcde949f6acc35ee688741efb2da74fc189ed9c58b24bd2874c7e95908eb1f60 diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild index 80c06b04b624..30aaaa87ceef 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl sdl tiff" SLOT="3.0" @@ -35,11 +35,6 @@ RDEPEND=" libnotify? ( x11-libs/libnotify[${MULTILIB_USEDEP}] ) opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) - ) - aqua? ( - x11-libs/gtk+:2[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} @@ -96,19 +91,8 @@ multilib_src_configure() { $(use_with opengl) $(use_with tiff libtiff sys)" - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken - # wxBase options - if use !X && use !aqua ; then + if use !X ; then myconf="${myconf} --disable-gui" fi diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild index e165e79b71ea..d147f35a694a 100644 --- a/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild +++ b/x11-libs/wxGTK/wxGTK-3.0.4-r302.ebuild @@ -11,8 +11,8 @@ SRC_URI="https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidge https://dev.gentoo.org/~leio/distfiles/wxGTK-3.0.4_p20190713.tar.xz doc? ( https://github.com/wxWidgets/wxWidgets/releases/download/v${PV}/wxWidgets-${PV}-docs-html.tar.bz2 )" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="+X aqua doc debug gstreamer libnotify opengl sdl tiff webkit" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux" +IUSE="+X doc debug gstreamer libnotify opengl sdl tiff webkit" WXSUBVERSION=${PV}.0-gtk3 # 3.0.3.0-gtk3 WXVERSION=${WXSUBVERSION%.*} # 3.0.3 @@ -43,11 +43,6 @@ RDEPEND=" opengl? ( virtual/opengl[${MULTILIB_USEDEP}] ) tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) webkit? ( net-libs/webkit-gtk:4 ) - ) - aqua? ( - x11-libs/gtk+:3[aqua=,${MULTILIB_USEDEP}] - virtual/jpeg:0=[${MULTILIB_USEDEP}] - tiff? ( media-libs/tiff:0[${MULTILIB_USEDEP}] ) )" DEPEND="${RDEPEND} @@ -130,19 +125,8 @@ multilib_src_configure() { $(use_with opengl) $(use_with tiff libtiff sys)" - use aqua && \ - myconf="${myconf} - --enable-graphics_ctx - --enable-gui - --with-libpng=sys - --with-libxpm=sys - --with-libjpeg=sys - --with-mac - --with-opengl" - # cocoa toolkit seems to be broken - # wxBase options - if use !X && use !aqua ; then + if use !X ; then myconf="${myconf} --disable-gui" fi diff --git a/x11-libs/xforms/Manifest b/x11-libs/xforms/Manifest index 5ea82890e6d9..60c08f8b5305 100644 --- a/x11-libs/xforms/Manifest +++ b/x11-libs/xforms/Manifest @@ -1,5 +1,4 @@ AUX xforms-1.2.4-fno-common.patch 1265 BLAKE2B d75cab39e1adaad1ee3f9c9ab49e2520832421592f9879bee6be68e0306cbcf26d2a70767322efe4881e47c091898d1be1e112337731cfc1624f3453115fc028 SHA512 1ebb08da290d7d33963afa65115b8acaf92a8ab3686fb35310e2c33ab0f2af3528abd97eafe379c89d5877e8542db7623034a4366e18732a5bd08a160a221d77 DIST xforms-1.2.4.tar.gz 1438503 BLAKE2B 5027fbd06d001f3291419e5d4e71f7c55e97394b7bda5bf0b4796ba34d7804e7b0bdd12271c082de150d7718039fc3ec6da1b1c530f6a36dcc3a7841c2cd416d SHA512 58669a64b2390da4f4c8b76b1dc34c2e6a4094ebbcfa7f75e0846db4d5c4455d772d9ef59e5aff09edd777957140015faea129c180600634a8d0962b01b912aa EBUILD xforms-1.2.4-r1.ebuild 927 BLAKE2B 3a5a9900ff6ed0eb1c986d6e915177d290dbb835d441911f3c02835accf2ed357b73b34451027069daeb6392f2293739203de455f92e851aa59dcf3cb9bec270 SHA512 425f4655515ec1f6a8815dfb69a68acc07c47dd3a86b0b004f1c18a6241c688f7260b08faf6241d9163ae9b5c821bd00b3982d740f7fd9fbfc9d35cefd2070e4 -EBUILD xforms-1.2.4.ebuild 900 BLAKE2B d78daacd5dc30239ee5f97d5919eac394a25e844d7f20933fcf1f415349d3111e01c555c139da68eecc89f233ff8fa1c96dbe2322eab2a664761f7317348b262 SHA512 b2d0194145754648b26e0d96acf9605f788527a443d5012e1f05bbc9426c716531235c4a29511a7aedd1cdec09efe0876a602af870651de0f5e5ca9bf61a75b0 MISC metadata.xml 251 BLAKE2B f3c965f619454b2d17e1039b6c218308c83af9214f41a5b18244ce9bd811b0a0b6e0227fdaac9b1659a2e2467e6b992b771ff6cf431220648363ab8173ee76f2 SHA512 e8203a24b5e739dcf0d94742215ee6ccdccbd00bb43001f9df58d27100fa427b01937065e1d7399e3552532b09179611e06099e3af14aac5fcf9ddc4ca5463da diff --git a/x11-libs/xforms/xforms-1.2.4.ebuild b/x11-libs/xforms/xforms-1.2.4.ebuild deleted file mode 100644 index cf658a52cc1a..000000000000 --- a/x11-libs/xforms/xforms-1.2.4.ebuild +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit autotools eutils ltprune - -MY_P="${P/-/_}" - -DESCRIPTION="A graphical user interface toolkit for X" -HOMEPAGE="http://xforms-toolkit.org/" -SRC_URI="https://dev.gentoo.org/~monsieurp/packages/${P}.tar.gz" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 arm ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris" -IUSE="doc opengl static-libs" - -RDEPEND=" - virtual/jpeg:0= - x11-libs/libSM - x11-libs/libX11 - x11-libs/libXpm - opengl? ( virtual/opengl )" - -DEPEND=" - ${RDEPEND} - x11-base/xorg-proto" - -S="${WORKDIR}/${MY_P}" - -DOCS=( ChangeLog README ) - -src_prepare() { - default - AT_M4DIR=config eautoreconf -} - -src_configure() { - econf \ - $(use_enable doc docs) \ - $(use_enable opengl gl) \ - $(use_enable static-libs static) -} - -src_install() { - default - prune_libtool_files -} diff --git a/x11-libs/xtrans/Manifest b/x11-libs/xtrans/Manifest index 1d34136f3f10..bdca481ce396 100644 --- a/x11-libs/xtrans/Manifest +++ b/x11-libs/xtrans/Manifest @@ -1,3 +1,3 @@ DIST xtrans-1.4.0.tar.bz2 185371 BLAKE2B 15e5ff810f8df94fa6a050dab00158646003ecc7b200e199eb713d8bd6e7ca8df1769490ebc3d8b8920915bb5f2ede698f01a1a120ca09acfc85f225c4d618f8 SHA512 4fea89a3455c0e13321cbefa43340016dbb59bdd0dbdb5b796c1a6d2a6b1fd63cf1327b769ab426286b9c54b32ec764a50cd2b46228e4e43b841bda6b94de214 -EBUILD xtrans-1.4.0.ebuild 632 BLAKE2B af241bfd4ad7f175b97cc30f581be369a67a25b31a5eb4cc3fc2bc29a71c3049e2ebb5000bc4d1ea3827da1da73249fc192b4289715c7a8905f594208e30aba3 SHA512 28706107aebefbe443f991bcee713756d348ed6cc589c21b60c967b78371265bf2c63e56958ad71d333a7bebb9d9d1df5fb53453c8a9bcee7065bc0daf2b4dc6 +EBUILD xtrans-1.4.0.ebuild 617 BLAKE2B 620a1b488a82e1fc9294663ab293851a4a16c011e03b6971a7dbc9d22473778a01c1964aa9d7bb76aeecdd565f7be0f99aa616b85c9c54cdca4df7702ceb8ff1 SHA512 300010e4f554d0e69714eb058d0f48bf7b43c9a9ab3e274f757c094b69340d44b59035978b7d24a3745f2f0e0742e84878a9eaff99d030706201180d527c89d4 MISC metadata.xml 230 BLAKE2B 70bf59e64305ef14908197f2aa7ffbc1769ade265097da68e001245451658af5921760c91cb74aae717543ea0017e2471fd94bfc5c4c447d2d60e2c23aa3b007 SHA512 d7a2643abd1904cc5ff4d91cbb6f1baeb7f75fd1db542c5e14f19412f4f0bd4b903f8e703a7662ba7482c79dac5529057760b6427599d35e0842755fd946e057 diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild index 910cfc06abf0..fe2fd8a45255 100644 --- a/x11-libs/xtrans/xtrans-1.4.0.ebuild +++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild @@ -5,7 +5,6 @@ EAPI=7 XORG_PACKAGE_NAME="lib${PN}" # this package just installs some .c and .h files, no libraries -XORG_STATIC=no XORG_DOC=doc inherit xorg-3 |