summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'x11-libs')
-rw-r--r--x11-libs/cairo/cairo-1.16.0-r5.ebuild (renamed from x11-libs/cairo/cairo-1.16.0-r4.ebuild)2
-rw-r--r--x11-libs/cairo/cairo-9999.ebuild2
-rw-r--r--x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild2
-rw-r--r--x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild2
-rw-r--r--x11-libs/gl2ps/gl2ps-1.4.2.ebuild2
-rw-r--r--x11-libs/gtk+/gtk+-3.24.29.ebuild2
-rw-r--r--x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild4
-rw-r--r--x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild4
-rw-r--r--x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild2
-rw-r--r--x11-libs/libICE/libICE-1.0.10.ebuild2
-rw-r--r--x11-libs/libSM/libSM-1.2.3-r1.ebuild2
-rw-r--r--x11-libs/libX11/libX11-1.7.2.ebuild2
-rw-r--r--x11-libs/libXau/libXau-1.0.9-r1.ebuild2
-rw-r--r--x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild2
-rw-r--r--x11-libs/libXcursor/libXcursor-1.2.0.ebuild2
-rw-r--r--x11-libs/libXdamage/libXdamage-1.1.5.ebuild2
-rw-r--r--x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild2
-rw-r--r--x11-libs/libXext/libXext-1.3.4.ebuild2
-rw-r--r--x11-libs/libXfixes/libXfixes-6.0.0.ebuild2
-rw-r--r--x11-libs/libXfont2/Manifest1
-rw-r--r--x11-libs/libXfont2/libXfont2-2.0.4.ebuild34
-rw-r--r--x11-libs/libXfont2/libXfont2-2.0.5.ebuild2
-rw-r--r--x11-libs/libXft/Manifest1
-rw-r--r--x11-libs/libXft/libXft-2.3.3.ebuild21
-rw-r--r--x11-libs/libXft/libXft-2.3.4.ebuild2
-rw-r--r--x11-libs/libXi/Manifest2
-rw-r--r--x11-libs/libXi/libXi-1.7.10.ebuild28
-rw-r--r--x11-libs/libXi/libXi-1.7.99.2.ebuild28
-rw-r--r--x11-libs/libXi/libXi-1.8.ebuild2
-rw-r--r--x11-libs/libXmu/libXmu-1.1.3.ebuild2
-rw-r--r--x11-libs/libXrandr/libXrandr-1.5.2.ebuild2
-rw-r--r--x11-libs/libXrender/libXrender-0.9.10-r2.ebuild2
-rw-r--r--x11-libs/libXt/libXt-1.2.1.ebuild2
-rw-r--r--x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild2
-rw-r--r--x11-libs/libdrm/Manifest2
-rw-r--r--x11-libs/libdrm/libdrm-2.4.107.ebuild11
-rw-r--r--x11-libs/libdrm/libdrm-2.4.108.ebuild66
-rw-r--r--x11-libs/libdrm/libdrm-2.4.109.ebuild66
-rw-r--r--x11-libs/libdrm/libdrm-9999.ebuild9
-rw-r--r--x11-libs/libfakekey/libfakekey-0.3-r1.ebuild4
-rw-r--r--x11-libs/libfm-qt/Manifest1
-rw-r--r--x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild47
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild31
-rw-r--r--x11-libs/libpciaccess/libpciaccess-0.16.ebuild2
-rw-r--r--x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild (renamed from x11-libs/libva-compat/libva-compat-1.8.3.ebuild)2
-rw-r--r--x11-libs/libva-compat/libva-compat-1.8.3-r2.ebuild67
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild (renamed from x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild)2
-rw-r--r--x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild2
-rw-r--r--x11-libs/libva-intel-media-driver/Manifest10
-rw-r--r--x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch87
-rw-r--r--x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch43
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild53
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild55
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild63
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild62
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild (renamed from x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild)8
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild (renamed from x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild)8
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2.ebuild (renamed from x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild)27
-rw-r--r--x11-libs/libva-intel-media-driver/libva-intel-media-driver-9999.ebuild27
-rw-r--r--x11-libs/libva-intel-media-driver/metadata.xml1
-rw-r--r--x11-libs/libva/Manifest10
-rw-r--r--x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch29
-rw-r--r--x11-libs/libva/libva-2.10.0.ebuild91
-rw-r--r--x11-libs/libva/libva-2.11.0.ebuild91
-rw-r--r--x11-libs/libva/libva-2.13.0-r1.ebuild (renamed from x11-libs/libva/libva-2.12.0.ebuild)26
-rw-r--r--x11-libs/libva/libva-2.5.0-r1.ebuild83
-rw-r--r--x11-libs/libva/libva-2.6.1.ebuild83
-rw-r--r--x11-libs/libva/libva-2.7.1.ebuild83
-rw-r--r--x11-libs/libva/libva-2.8.0.ebuild83
-rw-r--r--x11-libs/libva/libva-2.9.0.ebuild83
-rw-r--r--x11-libs/libva/libva-2.9.1.ebuild91
-rw-r--r--x11-libs/libva/libva-9999.ebuild24
-rw-r--r--x11-libs/libxcb/libxcb-1.14.ebuild4
-rw-r--r--x11-libs/libxcvt/Manifest2
-rw-r--r--x11-libs/libxcvt/libxcvt-0.1.1.ebuild (renamed from x11-libs/libxcvt/libxcvt-0.1.0.ebuild)2
-rw-r--r--x11-libs/libxcvt/libxcvt-9999.ebuild2
-rw-r--r--x11-libs/libxkbcommon/Manifest2
-rw-r--r--x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild (renamed from x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild)2
-rw-r--r--x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild2
-rw-r--r--x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild2
-rw-r--r--x11-libs/mx/Manifest1
-rw-r--r--x11-libs/mx/files/mx-1.4.7-gl-types.patch53
-rw-r--r--x11-libs/mx/metadata.xml11
-rw-r--r--x11-libs/mx/mx-1.4.7-r2.ebuild57
-rw-r--r--x11-libs/pango/pango-1.48.10-r1.ebuild (renamed from x11-libs/pango/pango-1.48.10.ebuild)13
-rw-r--r--x11-libs/pango/pango-1.48.7-r2.ebuild (renamed from x11-libs/pango/pango-1.48.7-r1.ebuild)11
-rw-r--r--x11-libs/pixman/pixman-0.40.0.ebuild9
-rw-r--r--x11-libs/pixman/pixman-9999.ebuild9
-rw-r--r--x11-libs/qscintilla/Manifest2
-rw-r--r--x11-libs/qscintilla/qscintilla-2.13.1.ebuild (renamed from x11-libs/qscintilla/qscintilla-2.13.0.ebuild)2
-rw-r--r--x11-libs/qtermwidget/Manifest1
-rw-r--r--x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild31
-rw-r--r--x11-libs/qwt/qwt-5.2.3_p20210211.ebuild2
-rw-r--r--x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild2
-rw-r--r--x11-libs/wxGTK/Manifest2
-rw-r--r--x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild2
-rw-r--r--x11-libs/xapps/Manifest2
-rw-r--r--x11-libs/xapps/xapps-2.2.4.ebuild (renamed from x11-libs/xapps/xapps-2.2.3.ebuild)2
-rw-r--r--x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild2
-rw-r--r--x11-libs/xtrans/xtrans-1.4.0.ebuild2
100 files changed, 437 insertions, 1503 deletions
diff --git a/x11-libs/cairo/cairo-1.16.0-r4.ebuild b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
index d5b20a6b420..03d9d52ed6a 100644
--- a/x11-libs/cairo/cairo-1.16.0-r4.ebuild
+++ b/x11-libs/cairo/cairo-1.16.0-r5.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
>=x11-libs/pixman-0.32.4[${MULTILIB_USEDEP}]
gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/cairo/cairo-9999.ebuild b/x11-libs/cairo/cairo-9999.ebuild
index 804c6cdb000..526be1dcbbf 100644
--- a/x11-libs/cairo/cairo-9999.ebuild
+++ b/x11-libs/cairo/cairo-9999.ebuild
@@ -38,7 +38,7 @@ RDEPEND="
>=x11-libs/pixman-0.36.0[${MULTILIB_USEDEP}]
gles2-only? ( >=media-libs/mesa-9.1.6[gles2,${MULTILIB_USEDEP}] )
glib? ( >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] )
- opengl? ( >=media-libs/mesa-9.1.6[egl,X(+),${MULTILIB_USEDEP}] )
+ opengl? ( >=media-libs/mesa-9.1.6[egl(+),X(+),${MULTILIB_USEDEP}] )
X? (
>=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
index cbb0d925ec2..06630bfcffb 100644
--- a/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
+++ b/x11-libs/gdk-pixbuf-xlib/gdk-pixbuf-xlib-2.40.2.ebuild
@@ -28,7 +28,7 @@ BDEPEND="
multilib_src_configure() {
local emesonargs=(
- $(meson_native_use_bool gtk-doc)
+ $(meson_native_use_bool gtk-doc gtk_doc)
)
meson_src_configure
}
diff --git a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
index 146867dc375..a0f63462d96 100644
--- a/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
+++ b/x11-libs/gdk-pixbuf/gdk-pixbuf-2.42.6.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://gitlab.gnome.org/GNOME/gdk-pixbuf"
LICENSE="LGPL-2.1+"
SLOT="2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="gtk-doc +introspection jpeg tiff"
# TODO: For windows/darwin support: shared-mime-info conditional, native_windows_loaders option review
diff --git a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
index a8f74181e30..e248470f2bd 100644
--- a/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
+++ b/x11-libs/gl2ps/gl2ps-1.4.2.ebuild
@@ -10,7 +10,7 @@ SRC_URI="http://geuz.org/${PN}/src/${P}.tgz"
LICENSE="LGPL-2"
SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos"
IUSE="doc png zlib"
RDEPEND="
diff --git a/x11-libs/gtk+/gtk+-3.24.29.ebuild b/x11-libs/gtk+/gtk+-3.24.29.ebuild
index b98e6b84f35..e4eb90947dc 100644
--- a/x11-libs/gtk+/gtk+-3.24.29.ebuild
+++ b/x11-libs/gtk+/gtk+-3.24.29.ebuild
@@ -17,7 +17,7 @@ REQUIRED_USE="
xinerama? ( X )
"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
# Upstream wants us to do their job:
# https://bugzilla.gnome.org/show_bug.cgi?id=768662#c1
diff --git a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild b/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
index cd3521b0b52..02ce2f809e4 100644
--- a/x11-libs/gtk+extra/gtk+extra-3.3.4.ebuild
+++ b/x11-libs/gtk+extra/gtk+extra-3.3.4.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=6
@@ -10,7 +10,7 @@ SRC_URI="mirror://sourceforge/gtkextra/gtkextra-${PV}.tar.gz"
LICENSE="FDL-1.1 LGPL-2"
SLOT="0"
-KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~sparc x86"
+KEYWORDS="amd64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
IUSE="+introspection static-libs test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild b/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
index 353bbe0234e..7db2b001cb0 100644
--- a/x11-libs/gtksourceview/gtksourceview-3.24.11.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-3.24.11.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="6"
@@ -16,7 +16,7 @@ SLOT="3.0/3"
IUSE="glade +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.48:2
diff --git a/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild b/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
index bf81d9a8aeb..303e382be39 100644
--- a/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
+++ b/x11-libs/gtksourceview/gtksourceview-4.8.2.ebuild
@@ -14,7 +14,7 @@ SLOT="4"
IUSE="glade gtk-doc +introspection +vala"
REQUIRED_USE="vala? ( introspection )"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
RDEPEND="
>=dev-libs/glib-2.48:2
diff --git a/x11-libs/libICE/libICE-1.0.10.ebuild b/x11-libs/libICE/libICE-1.0.10.ebuild
index 562ebccf2e7..57851fba296 100644
--- a/x11-libs/libICE/libICE-1.0.10.ebuild
+++ b/x11-libs/libICE/libICE-1.0.10.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Inter-Client Exchange library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6"
DEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libSM/libSM-1.2.3-r1.ebuild b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
index f53cb5e85b6..7feb0c6c5e4 100644
--- a/x11-libs/libSM/libSM-1.2.3-r1.ebuild
+++ b/x11-libs/libSM/libSM-1.2.3-r1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Session Management library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="ipv6 +uuid"
RDEPEND="x11-base/xorg-proto
diff --git a/x11-libs/libX11/libX11-1.7.2.ebuild b/x11-libs/libX11/libX11-1.7.2.ebuild
index 1a618ccdebc..c50508e8170 100644
--- a/x11-libs/libX11/libX11-1.7.2.ebuild
+++ b/x11-libs/libX11/libX11-1.7.2.ebuild
@@ -10,7 +10,7 @@ inherit toolchain-funcs xorg-3
# Note: please bump this with x11-misc/compose-tables
DESCRIPTION="X.Org X11 library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
IUSE="ipv6 test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libXau/libXau-1.0.9-r1.ebuild b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
index b5e09145422..fb485435a64 100644
--- a/x11-libs/libXau/libXau-1.0.9-r1.ebuild
+++ b/x11-libs/libXau/libXau-1.0.9-r1.ebuild
@@ -9,6 +9,6 @@ inherit xorg-3
DESCRIPTION="X.Org X authorization library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
index eb91b2f0c58..844e94539a6 100644
--- a/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
+++ b/x11-libs/libXcomposite/libXcomposite-0.4.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xcomposite library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
index 22ce06996bf..91d22c5b049 100644
--- a/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
+++ b/x11-libs/libXcursor/libXcursor-1.2.0.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xcursor library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="doc"
RDEPEND=">=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
index 08f830f3af2..bdaef2c048c 100644
--- a/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
+++ b/x11-libs/libXdamage/libXdamage-1.1.5.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xdamage 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 ~x86-winnt"
+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 ~x86-winnt"
IUSE=""
RDEPEND="
diff --git a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
index 5ce4c7ca078..61a5ecc3008 100644
--- a/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
+++ b/x11-libs/libXdmcp/libXdmcp-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org X Display Manager Control Protocol library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="elibc_glibc? ( dev-libs/libbsd )"
DEPEND="${RDEPEND}
diff --git a/x11-libs/libXext/libXext-1.3.4.ebuild b/x11-libs/libXext/libXext-1.3.4.ebuild
index d05404352ed..4ef042cb11c 100644
--- a/x11-libs/libXext/libXext-1.3.4.ebuild
+++ b/x11-libs/libXext/libXext-1.3.4.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xext library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND=">=x11-libs/libX11-1.6.2:=[${MULTILIB_USEDEP}]"
DEPEND="${RDEPEND}
diff --git a/x11-libs/libXfixes/libXfixes-6.0.0.ebuild b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
index 5ee138037d4..65822f02b74 100644
--- a/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
+++ b/x11-libs/libXfixes/libXfixes-6.0.0.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xfixes library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXfont2/Manifest b/x11-libs/libXfont2/Manifest
index 06e37d3b3a8..ed01b2e0d8c 100644
--- a/x11-libs/libXfont2/Manifest
+++ b/x11-libs/libXfont2/Manifest
@@ -1,2 +1 @@
-DIST libXfont2-2.0.4.tar.bz2 513167 BLAKE2B 924cf8462a8fc593755080866b63d6cca6e58b5d875f1d25b95271a56d883e983445f72f8950adf1964e0bf10ca5b8bb2ddfe0c56d4395086e460952a5933bd7 SHA512 7cf6c58e520e48e24fc4f05fec760fcbeaaac0cedeed57dded262c855e1515cc34cd033222945a0b016f6857b83009fc2a6946c7d632c2f7bb0060f8e8a8a106
DIST libXfont2-2.0.5.tar.bz2 524868 BLAKE2B 0b26d4c93452bcb3f5c740ac8984b9873a8241405d270e2d3fa5f440be820db417c9eff59c7a1a8c175513e40df70ada9c037d45c3a9ae2ccf62eb12f81c1d8f SHA512 64d0635d14676bb645d61932afb177eb3808a46525b26e7ee31abc975eca75207743e85523fdd82b08010ce124eb4802338b508ee7b126875d2a3c12f8ac4faa
diff --git a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild b/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
deleted file mode 100644
index 7a77ae02471..00000000000
--- a/x11-libs/libXfont2/libXfont2-2.0.4.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_PACKAGE_NAME=libxfont
-XORG_DOC=doc
-inherit xorg-3
-
-DESCRIPTION="X.Org Xfont library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 ipv6 truetype"
-
-RDEPEND="sys-libs/zlib
- x11-base/xorg-proto
- x11-libs/libfontenc
- bzip2? ( app-arch/bzip2 )
- truetype? ( >=media-libs/freetype-2 )"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto
- x11-libs/xtrans"
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- $(use_enable ipv6)
- $(use_enable doc devel-docs)
- $(use_with doc xmlto)
- $(use_with bzip2)
- $(use_enable truetype freetype)
- --without-fop
- )
- xorg-3_src_configure
-}
diff --git a/x11-libs/libXfont2/libXfont2-2.0.5.ebuild b/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
index a07d98ab583..b7a1082d87e 100644
--- a/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
+++ b/x11-libs/libXfont2/libXfont2-2.0.5.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xfont library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="bzip2 ipv6 truetype"
RDEPEND="sys-libs/zlib
diff --git a/x11-libs/libXft/Manifest b/x11-libs/libXft/Manifest
index 5e0f42c6ed0..e87b5e36ab0 100644
--- a/x11-libs/libXft/Manifest
+++ b/x11-libs/libXft/Manifest
@@ -1,2 +1 @@
-DIST libXft-2.3.3.tar.bz2 353465 BLAKE2B 05a91225d09b5e1800a8272c72f7220d9987e3828591bf73d8307a9c4fca1ce7c4c62b36805f44e385c3a4269ebaafdaed70d3b2006208e860f8e982b53c975f SHA512 28fdaf3baa3b156a4a7fdd6e39c4d8026d7d21eaa9be27c9797c8d329dab691a1bc82ea6042f9d4729a9343d93787536fb7e4b606f722f33cbe608b2e79910e8
DIST libXft-2.3.4.tar.bz2 359088 BLAKE2B 37f8522ad744e99ae8372f4292017eed1f2c2a84169497441c3c12696cbb7b3cf33e04864b50433e46f8723cc6c6006226c743a0d491a3784baf3f21ea062399 SHA512 5bb019750982ed4643880efd7368bc226ad49cfa8c0c8c6d4614dfeed74f588c65e1ba69adcc12284ec07d841e5b58fc1c27f3fddf83fe1a2837b29dd9ecec51
diff --git a/x11-libs/libXft/libXft-2.3.3.ebuild b/x11-libs/libXft/libXft-2.3.3.ebuild
deleted file mode 100644
index 8087fa12d34..00000000000
--- a/x11-libs/libXft/libXft-2.3.3.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xft library"
-
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="doc"
-
-RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1[${MULTILIB_USEDEP}]
- virtual/ttf-fonts
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}
- x11-base/xorg-proto"
diff --git a/x11-libs/libXft/libXft-2.3.4.ebuild b/x11-libs/libXft/libXft-2.3.4.ebuild
index 19c704e2da0..8087fa12d34 100644
--- a/x11-libs/libXft/libXft-2.3.4.ebuild
+++ b/x11-libs/libXft/libXft-2.3.4.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xft library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc"
RDEPEND=">=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXi/Manifest b/x11-libs/libXi/Manifest
index af452b5991a..285f5daeafb 100644
--- a/x11-libs/libXi/Manifest
+++ b/x11-libs/libXi/Manifest
@@ -1,3 +1 @@
-DIST libXi-1.7.10.tar.bz2 484519 BLAKE2B b4a3a090045d65c351d21a65fdf2f3d252e11546a5eaba9bf5f22c837b84ee758fe325eff39b32df55f65ab3d6cdc0d2c7ac7e134fec0983baeb0103d109c810 SHA512 591f0860bf5904897587c4990d6c852f3729a212d1ef390362d41242440e078221877c31db2232d5cc81727fe97f4e194b077f7de917e251e60641bbd06ee218
-DIST libXi-1.7.99.2.tar.bz2 494804 BLAKE2B 103fe7d559f6e60417795d6f7278dc90375fa6889f8532a398986d163fd3f478396f8c71f81cba5bc2c37304d2dc5a229e1361a7e5237a04728f8c39466df0b6 SHA512 9e66315528152baabcf6333f5d0c9b829ca4f2055a90523de45f3022b726fdfbcb99e6459f8b18147b8305144cd7f7e0d4b2e9ebdd81f65efa29da08ffac1b39
DIST libXi-1.8.tar.bz2 494579 BLAKE2B 6804aa5c666ff489180c7d468e666fd3c986c7e24396f80f69164cc351c4aff5ab3c8e22ded61f03b96e37bceb5fd86d707220479100c5ec44a2a05fe5345d60 SHA512 4b2c667a8466eb389f253d77285c3f506c4a2b6c75054c722974a864565d565cc0c5701f8ea773eb929ceb94adfeb737ecd7a0bfc2c240157416a5f343c07aba
diff --git a/x11-libs/libXi/libXi-1.7.10.ebuild b/x11-libs/libXi/libXi-1.7.10.ebuild
deleted file mode 100644
index 91e357dbaa9..00000000000
--- a/x11-libs/libXi/libXi-1.7.10.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="
- >=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}
- x11-base/xorg-proto"
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- $(use_enable doc specs)
- $(use_with doc xmlto)
- $(use_with doc asciidoc)
- --without-fop
- )
- xorg-3_src_configure
-}
diff --git a/x11-libs/libXi/libXi-1.7.99.2.ebuild b/x11-libs/libXi/libXi-1.7.99.2.ebuild
deleted file mode 100644
index b3f6f57be0a..00000000000
--- a/x11-libs/libXi/libXi-1.7.99.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-XORG_DOC=doc
-XORG_MULTILIB=yes
-inherit xorg-3
-
-DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-
-RDEPEND="
- >=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}
- >=x11-base/xorg-proto-2021.4.99.2"
-
-src_configure() {
- local XORG_CONFIGURE_OPTIONS=(
- $(use_enable doc specs)
- $(use_with doc xmlto)
- $(use_with doc asciidoc)
- --without-fop
- )
- xorg-3_src_configure
-}
diff --git a/x11-libs/libXi/libXi-1.8.ebuild b/x11-libs/libXi/libXi-1.8.ebuild
index b3f6f57be0a..6c73c17f243 100644
--- a/x11-libs/libXi/libXi-1.8.ebuild
+++ b/x11-libs/libXi/libXi-1.8.ebuild
@@ -8,7 +8,7 @@ XORG_MULTILIB=yes
inherit xorg-3
DESCRIPTION="X.Org Xi library"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libXmu/libXmu-1.1.3.ebuild b/x11-libs/libXmu/libXmu-1.1.3.ebuild
index a6421846f98..99fd2100223 100644
--- a/x11-libs/libXmu/libXmu-1.1.3.ebuild
+++ b/x11-libs/libXmu/libXmu-1.1.3.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xmu library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="ipv6"
RDEPEND="
diff --git a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
index a28dfeb4eaa..ae058440d1a 100644
--- a/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
+++ b/x11-libs/libXrandr/libXrandr-1.5.2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xrandr library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="doc"
RDEPEND="
diff --git a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
index c6af1e489a8..b9dfac5f40f 100644
--- a/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
+++ b/x11-libs/libXrender/libXrender-0.9.10-r2.ebuild
@@ -8,7 +8,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xrender library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
RDEPEND="x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libXt/libXt-1.2.1.ebuild b/x11-libs/libXt/libXt-1.2.1.ebuild
index b0e36cae59e..1fbf8a0dd20 100644
--- a/x11-libs/libXt/libXt-1.2.1.ebuild
+++ b/x11-libs/libXt/libXt-1.2.1.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org X Toolkit Intrinsics library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
index 26bba73312e..ec377af6168 100644
--- a/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
+++ b/x11-libs/libXxf86vm/libXxf86vm-1.1.4-r2.ebuild
@@ -9,7 +9,7 @@ inherit xorg-3
DESCRIPTION="X.Org Xxf86vm 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 ~x86-winnt"
+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 ~x86-winnt"
RDEPEND="x11-base/xorg-proto
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 49988eb4a98..0c7d4531c61 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,2 +1,4 @@
DIST libdrm-2.4.106.tar.xz 418176 BLAKE2B b0f935297239560179ec8994b62c7161494d4c1aa33bbfdc4d5e4ecff97d252f7556575391ebf486e24257c365415e656b9f84ac883dc9d56baf39e79ff8c5f2 SHA512 33140e579906ab54b716149056af500c628ce41cd9ae3b0c33496693d2f5903fbcfccee8a942dd1560e1591111ed240da42612d5af5e75558db6f6a85d14617d
DIST libdrm-2.4.107.tar.xz 425612 BLAKE2B a685cd9a6549c7bdf1efb4e7ebddd0ea49554fa718f8328c868a1f245e7c072933e49546591c056ba7ece8d8841b8138e4247dd8697238a18c2cd92fe5446341 SHA512 c7542ba15c4c934519a6a1f3cb1ec21effa820a805a030d0175313bb1cc796cd311f39596ead883f9f251679d701e262894c5a297d5cf45093c80a6cd818def0
+DIST libdrm-2.4.108.tar.xz 432492 BLAKE2B 943107e4ece51336c2cec690b2805cac3ebe4502c548401ba7add1b1cdcb6c9959e4a9fe75890438e0b30646f8dde1b322585544aa33abb5257a23cc3eeed3ab SHA512 6a841dc3eb8eae7d75e1d35d23a14d51aff758e5a251dbcf6fc8c28d973d935a4a2f6751b405e956b2777d93c651721199ac80c3cd14b87d021668120d6bc974
+DIST libdrm-2.4.109.tar.xz 433708 BLAKE2B 99c612a4f9a8e9068debbecfc428f4af530705fca47df9c8e6f0fe6ed740610ded1db0d0e37a063ae893e1697c2f8c4dcc8e15b8909d8ba7c66cd941d7400d24 SHA512 45194bb28207421afcff3e247930d2eeab77a5fea58e6be22f67525f2e0aab2f410a9ae0ab315b55ef56b80c481bba40b1660468b7cda539758b2bbb8e814fd8
diff --git a/x11-libs/libdrm/libdrm-2.4.107.ebuild b/x11-libs/libdrm/libdrm-2.4.107.ebuild
index 218b87fe703..a4ec5f0969d 100644
--- a/x11-libs/libdrm/libdrm-2.4.107.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.107.ebuild
@@ -4,12 +4,13 @@
EAPI=7
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+PYTHON_COMPAT=( python3_{8..10} )
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-inherit ${GIT_ECLASS} meson-multilib
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -17,7 +18,7 @@ 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"
+ 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"
@@ -34,6 +35,12 @@ RDEPEND="
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )"
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+ has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
multilib_src_configure() {
local emesonargs=(
diff --git a/x11-libs/libdrm/libdrm-2.4.108.ebuild b/x11-libs/libdrm/libdrm-2.4.108.ebuild
new file mode 100644
index 00000000000..c34f20fb240
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.108.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 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"
+PYTHON_COMPAT=( python3_{8..10} )
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
+
+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 )"
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+ has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ # Udev is only used by tests now.
+ -Dudev=false
+ -Dcairo-tests=false
+ $(meson_use video_cards_amdgpu amdgpu)
+ $(meson_use video_cards_exynos exynos)
+ $(meson_use video_cards_freedreno freedreno)
+ $(meson_use video_cards_intel intel)
+ $(meson_use video_cards_nouveau nouveau)
+ $(meson_use video_cards_omap omap)
+ $(meson_use video_cards_radeon radeon)
+ $(meson_use video_cards_tegra tegra)
+ $(meson_use video_cards_vc4 vc4)
+ $(meson_use video_cards_vivante etnaviv)
+ $(meson_use video_cards_vmware vmwgfx)
+ $(meson_use libkms)
+ # valgrind installs its .pc file to the pkgconfig for the primary arch
+ -Dvalgrind=$(usex valgrind auto false)
+ )
+ meson_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-2.4.109.ebuild b/x11-libs/libdrm/libdrm-2.4.109.ebuild
new file mode 100644
index 00000000000..c34f20fb240
--- /dev/null
+++ b/x11-libs/libdrm/libdrm-2.4.109.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2021 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"
+PYTHON_COMPAT=( python3_{8..10} )
+
+if [[ ${PV} = 9999* ]]; then
+ GIT_ECLASS="git-r3"
+fi
+
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
+
+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 )"
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+ has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
+
+multilib_src_configure() {
+ local emesonargs=(
+ # Udev is only used by tests now.
+ -Dudev=false
+ -Dcairo-tests=false
+ $(meson_use video_cards_amdgpu amdgpu)
+ $(meson_use video_cards_exynos exynos)
+ $(meson_use video_cards_freedreno freedreno)
+ $(meson_use video_cards_intel intel)
+ $(meson_use video_cards_nouveau nouveau)
+ $(meson_use video_cards_omap omap)
+ $(meson_use video_cards_radeon radeon)
+ $(meson_use video_cards_tegra tegra)
+ $(meson_use video_cards_vc4 vc4)
+ $(meson_use video_cards_vivante etnaviv)
+ $(meson_use video_cards_vmware vmwgfx)
+ $(meson_use libkms)
+ # valgrind installs its .pc file to the pkgconfig for the primary arch
+ -Dvalgrind=$(usex valgrind auto false)
+ )
+ meson_src_configure
+}
diff --git a/x11-libs/libdrm/libdrm-9999.ebuild b/x11-libs/libdrm/libdrm-9999.ebuild
index f603cf78370..c34f20fb240 100644
--- a/x11-libs/libdrm/libdrm-9999.ebuild
+++ b/x11-libs/libdrm/libdrm-9999.ebuild
@@ -4,12 +4,13 @@
EAPI=7
EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/drm.git"
+PYTHON_COMPAT=( python3_{8..10} )
if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-inherit ${GIT_ECLASS} meson-multilib
+inherit ${GIT_ECLASS} python-any-r1 meson-multilib
DESCRIPTION="X.Org libdrm library"
HOMEPAGE="https://dri.freedesktop.org/ https://gitlab.freedesktop.org/mesa/drm"
@@ -34,6 +35,12 @@ RDEPEND="
video_cards_intel? ( >=x11-libs/libpciaccess-0.13.1-r1:=[${MULTILIB_USEDEP}] )"
DEPEND="${RDEPEND}
valgrind? ( dev-util/valgrind )"
+BDEPEND="${PYTHON_DEPS}
+ $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')"
+
+python_check_deps() {
+ has_version -b "dev-python/docutils[${PYTHON_USEDEP}]"
+}
multilib_src_configure() {
local emesonargs=(
diff --git a/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild b/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
index 298324e0228..4957afca44d 100644
--- a/x11-libs/libfakekey/libfakekey-0.3-r1.ebuild
+++ b/x11-libs/libfakekey/libfakekey-0.3-r1.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
@@ -11,7 +11,7 @@ SRC_URI="https://git.yoctoproject.org/cgit/cgit.cgi/${PN}/snapshot/${P}.tar.bz2"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 x86"
+KEYWORDS="amd64 ~arm arm64 ~hppa ppc ppc64 ~riscv x86"
IUSE="debug doc"
BDEPEND="doc? ( app-doc/doxygen )"
diff --git a/x11-libs/libfm-qt/Manifest b/x11-libs/libfm-qt/Manifest
index 0b38a25215e..7e332010540 100644
--- a/x11-libs/libfm-qt/Manifest
+++ b/x11-libs/libfm-qt/Manifest
@@ -1,2 +1 @@
-DIST libfm-qt-0.16.0.tar.xz 348548 BLAKE2B 41c52efc5b71d924c06d55a5b94e7f9a1c4feda0a664d83b0de906479bdb644260a68136720baeb1958a48b08019b72de34b6066f51c19e5c5fb65afcd9e903c SHA512 5de63408a641b0e77cb319952e428aee9cd35db9ec3e6726a8327ebc53f5641cf66b28dbabd96797c64a253b1e41421dbe05dcb9f4bc7941bd92676bbfa9cc84
DIST libfm-qt-0.17.1.tar.xz 363052 BLAKE2B 5931a5f06f0d085aedf0b178efe4f47ccc90d6e99dfa88955d692736d0dbc4fb8ebc9c5b834547b473b84ce815bb7e1e2e991fee38f390e7ff85c8a3effe8f26 SHA512 1e1781a01446f381625361a50f77422827e7ac5ab6039b4246369e2281edf78d3ccba866fa472667bcbb6737c44ebc350cb30a0055fc84d1f5d7e1c83e1241c1
diff --git a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild b/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild
deleted file mode 100644
index 7b04c4a72eb..00000000000
--- a/x11-libs/libfm-qt/libfm-qt-0.16.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake xdg-utils
-
-DESCRIPTION="Qt Library for Building File Managers"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
- 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"
-fi
-
-LICENSE="BSD GPL-2+ LGPL-2.1+"
-SLOT="0/7"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.8.0
- virtual/pkgconfig
-"
-DEPEND="
- dev-libs/glib:2
- dev-qt/qtcore:5
- dev-qt/qtgui:5=
- dev-qt/qtwidgets:5
- dev-qt/qtx11extras:5
- >=lxde-base/menu-cache-1.1.0:=
- media-libs/libexif
- x11-libs/libxcb
-"
-RDEPEND="${DEPEND}
- !lxqt-base/lxqt-l10n
-"
-
-pkg_postinst() {
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_mimeinfo_database_update
-}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild
new file mode 100644
index 00000000000..1f46f6ac692
--- /dev/null
+++ b/x11-libs/libpciaccess/libpciaccess-0.16-r1.ebuild
@@ -0,0 +1,31 @@
+# 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"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="zlib"
+
+DEPEND="
+ zlib? ( >=sys-libs/zlib-1.2.8-r1:=[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+ sys-apps/hwdata"
+
+src_prepare() {
+ # Let autotools install scanpci (#765706)
+ sed 's@^noinst_@bin_@' -i scanpci/Makefile.am || die
+ xorg-3_src_prepare
+}
+
+src_configure() {
+ local XORG_CONFIGURE_OPTIONS=(
+ $(use_with zlib)
+ --with-pciids-path="${EPREFIX}"/usr/share/hwdata
+ )
+ xorg-3_src_configure
+}
diff --git a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
index 784b93f6147..7355b217f89 100644
--- a/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
+++ b/x11-libs/libpciaccess/libpciaccess-0.16.ebuild
@@ -8,7 +8,7 @@ XORG_EAUTORECONF=yes
inherit xorg-3
DESCRIPTION="Library providing generic access to the PCI bus and devices"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
IUSE="zlib"
DEPEND="
diff --git a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild b/x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild
index 31cdf24dbf5..1ad904ecd9e 100644
--- a/x11-libs/libva-compat/libva-compat-1.8.3.ebuild
+++ b/x11-libs/libva-compat/libva-compat-1.8.3-r1.ebuild
@@ -28,7 +28,7 @@ RDEPEND=">=x11-libs/libdrm-2.4.46[${MULTILIB_USEDEP}]
>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
>=x11-libs/libXfixes-5.0.1[${MULTILIB_USEDEP}]
)
- egl? ( >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}] )
+ egl? ( >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}] )
opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
!x11-libs/libva:0/0"
diff --git a/x11-libs/libva-compat/libva-compat-1.8.3-r2.ebuild b/x11-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
new file mode 100644
index 00000000000..af57dbec426
--- /dev/null
+++ b/x11-libs/libva-compat/libva-compat-1.8.3-r2.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools multilib-minimal optfeature
+
+MY_PN="${PN%-compat}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Video Acceleration (VA) API for Linux"
+HOMEPAGE="https://01.org/linuxmedia/vaapi"
+SRC_URI="https://github.com/01org/libva/archive/${PV}.tar.gz -> ${MY_P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="1"
+KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="+drm egl opengl wayland X"
+
+RDEPEND=">=x11-libs/libdrm-2.4.46[${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}]
+ )
+ egl? ( >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}] )
+ opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
+ wayland? ( >=dev-libs/wayland-1.0.6[${MULTILIB_USEDEP}] )
+ !x11-libs/libva:0/0"
+
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="|| ( drm wayland X )
+ opengl? ( X )"
+
+S="${WORKDIR}/${MY_P}"
+DOCS=( NEWS )
+
+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 egl)
+ $(use_enable drm)
+ )
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+ emake -C va DESTDIR="${D}" install-libLTLIBRARIES
+ rm -vf "${ED}"/usr/$(get_libdir)/*.{la,so} || die
+}
+
+pkg_postinst() {
+ optfeature_header
+ optfeature "NVIDIA GPU support" x11-libs/libva-vdpau-driver
+ optfeature "Older Intel GPU support" x11-libs/libva-intel-driver
+ optfeature "Newer Intel GPU support" x11-libs/libva-intel-media-driver
+}
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild
index b7af94433cc..6952b1401a4 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-2.4.1-r1.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
wayland? (
>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
index 4e4df0e3170..4f49ea34369 100644
--- a/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
+++ b/x11-libs/libva-intel-driver/libva-intel-driver-9999.ebuild
@@ -29,7 +29,7 @@ RDEPEND="
>=x11-libs/libva-2.4.0:=[X?,wayland?,drm,${MULTILIB_USEDEP}]
wayland? (
>=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
- >=media-libs/mesa-9.1.6[egl,${MULTILIB_USEDEP}]
+ >=media-libs/mesa-9.1.6[egl(+),${MULTILIB_USEDEP}]
)
"
DEPEND="${RDEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/Manifest b/x11-libs/libva-intel-media-driver/Manifest
index 04a1cc25c03..421c0510d6a 100644
--- a/x11-libs/libva-intel-media-driver/Manifest
+++ b/x11-libs/libva-intel-media-driver/Manifest
@@ -1,8 +1,4 @@
-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
-DIST intel-media-21.1.2.tar.gz 22487027 BLAKE2B 819b7c4a4fc9295034af77f1e95d4b23ca974629f0ff70f14d84c881fa8ae2558708878e045b700fef30bb28a1af9ec61306854e91d0df4881e7d9dc229715b2 SHA512 046942ebedad2e40de3c592ed92bd7d266402f1f94d30ee7674adcb147774f6d90af18c56a19a8d16465144a7bded9cc7b6eeefdeb50f349c7d3ef6840c30ea4
-DIST intel-media-21.1.3.tar.gz 22507169 BLAKE2B 68962db57d6f4c11e50b5d44584adf0458d08a118234a091aa55734885ee9fab6449658a8736c4a23233be38b58311953492482c3d9b258dd2cf8008cf363f20 SHA512 a5a4c26d86191138245e0cc62304aeeccfb6627b04310e4b1d35cc2050b909d9b856b6176d868562336dd6342f93b1909b46fb481eb353ef02cc188eea5da121
-DIST intel-media-21.2.2.tar.gz 23021952 BLAKE2B 0173eb8fb81c3012af30bb755b87e5f4ad8e0ea1d7fd4c844dda8d08d72968e3080f320384dcc50caf0ad4f013eec69fe4e8d1444fac665623e6f72521fc3a95 SHA512 f88fd02af55538045e01982e7bda8a7e781ad7fa57a8e60e61681a705a87a402ceab433a5362fe0f6269366ea54b60f91ffd2689641370f20c66dc10d26d1c4a
-DIST intel-media-21.2.3.tar.gz 23025524 BLAKE2B 0652563f8e8494c9fa181822a7af348cc5ce1e2446063c743fa89072ae46c6a4af0c71001fb8249b0306d67a220312f883a8f54dde1981078e6ee8fad71eaaa1 SHA512 b12ff5b3afbc4d4f34353c7a4ea50b1c66746b33920e450d7d17cffdc234921e82fc4c1afb025274caf2a5efbe87e577b6790d0648a52de08ea19b11a103ac81
-DIST intel-media-21.3.2.tar.gz 23069924 BLAKE2B cb7035698bc19eb65f0cf338e7fb0e11a379a27c243566b6f884d63897da10e2ded39523fcc81131f41885508d1413e7960e38cf9cf2d129d7a6a3994fa9b384 SHA512 27a1849ed2f2367e5de63189faa6e14a1a23f6708c45392f661fab819f856bb4a3d0d31754213b084c4f05be3b155b0a80c2f4e330c79879597910f77e3f1597
+DIST intel-media-21.3.5.tar.gz 23110985 BLAKE2B 1dbbc1efa9ae2c8f3b4a34596c71173101f8a43591bf9e07d269a8499b7a57969d9af5c1d4ffb7774a6947947e572b441f871760d3ca695335bfa2976ac2cf6f SHA512 e7836b19050677e81aa34ce5d7cea661ca3b5ac55d73d5aa0bab93f1daba8ee010d84b1c585f62fcec65a4361ef2b7f14ed574858f56b85b4c4d59840ecb6cb6
+DIST intel-media-21.4.0.tar.gz 23116624 BLAKE2B d913e379c4990bd0f5a5d07654baeb374d3b4f7adbe607338a96ac6555631560005d6124fb0124bafe5e94107b54acdfd0fbcfdabc820210b453ebb61c828c36 SHA512 e338e645677d90d4c2e91d5096a9002b87cec602ec354283b67e4ee31fcd6a2454918c4e179b86189126d30742ab2814bc8400072fb1d06638c3bc0bf66385e4
+DIST intel-media-21.4.2.tar.gz 23185132 BLAKE2B 257f1a8a65928aee897d84ed8df69a129958bcf5fd6ea263283e1f2341a845651a86367cff7988c0d4b04accf48664dbd4d1e0bd106883e92feff095e5f88225 SHA512 1b906ce75ef70395e36296de1e1e4b39d4a82c8b8532497faf47bcb101cf2103bba67a125da7ea1be9f901699288520f704b43fef01339a1f1b7691040d7618e
diff --git a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch
deleted file mode 100644
index 4aebd7cdc03..00000000000
--- a/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.1.2_custom_cflags.patch
+++ /dev/null
@@ -1,87 +0,0 @@
- Prevent overriding of user-defined CFLAGS.
-
-
---- 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(OVERRIDE_COMPILER_FLAGS)
- 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(OVERRIDE_COMPILER_FLAGS)
- 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
-@@ -51,16 +51,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
- )
-
-@@ -73,6 +83,7 @@ if(${UFO_MARCH} STREQUAL "slm")
- -mtune=atom
- )
- endif()
-+endif(OVERRIDE_COMPILER_FLAGS)
-
- if(${ARCH} STREQUAL "64")
- set(MEDIA_COMPILER_FLAGS_COMMON
-@@ -189,9 +200,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-21.4.2-Remove-unwanted-CFLAGS.patch b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch
new file mode 100644
index 00000000000..288fe2d7f51
--- /dev/null
+++ b/x11-libs/libva-intel-media-driver/files/libva-intel-media-driver-21.4.2-Remove-unwanted-CFLAGS.patch
@@ -0,0 +1,43 @@
+From f1c5c12d866783f7a3079be440c06fdb8a931ed2 Mon Sep 17 00:00:00 2001
+From: Matt Turner <mattst88@gmail.com>
+Date: Tue, 23 Nov 2021 12:28:05 -0800
+Subject: [PATCH] Remove unwanted CFLAGS
+
+---
+ media_driver/cmake/linux/media_compile_flags_linux.cmake | 7 -------
+ 1 file changed, 7 deletions(-)
+
+diff --git a/media_driver/cmake/linux/media_compile_flags_linux.cmake b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+index 512ef17b..e8ade76d 100755
+--- a/media_driver/cmake/linux/media_compile_flags_linux.cmake
++++ b/media_driver/cmake/linux/media_compile_flags_linux.cmake
+@@ -52,16 +52,12 @@ set(MEDIA_COMPILER_FLAGS_COMMON
+ -ffunction-sections
+ -Wl,--gc-sections
+
+- # -m32 or -m64
+- -m${ARCH}
+-
+ # Global defines
+ -DLINUX=1
+ -DLINUX
+ -DNO_RTTI
+ -DNO_EXCEPTION_HANDLING
+ -DINTEL_NOT_PUBLIC
+- -g
+ )
+
+
+@@ -189,9 +185,6 @@ 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}")
+- 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}>")
+
+ foreach (flag ${MEDIA_COMPILER_CXX_FLAGS_COMMON})
+ SET (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${flag}")
+--
+2.32.0
+
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
deleted file mode 100644
index 91a9328035e..00000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.1.1-r2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# 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
deleted file mode 100644
index 45e9262fd45..00000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-20.2.0-r2.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# 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-21.1.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
deleted file mode 100644
index 885636cf2e3..00000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.2_pre.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# 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
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- # No keywords for _pre releases
- #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?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.1.2_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-21.2.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild
deleted file mode 100644
index fc67874d04c..00000000000
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.3.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
- MY_PV="${PV%_pre}"
- SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
- S="${WORKDIR}/media-driver-intel-media-${MY_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-21.2.1
- >=x11-libs/libva-2.12.0[X?]
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
- "${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_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-21.2.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
index 6eec248e7f0..fb2d94e7416 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.2.2_pre.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.5.ebuild
@@ -15,7 +15,9 @@ else
MY_PV="${PV%_pre}"
SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="" # no keywords for '_pre' releases
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="amd64"
+ fi
fi
DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
@@ -27,8 +29,8 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.1.3
- >=x11-libs/libva-2.11.0[X?]
+DEPEND=">=media-libs/gmmlib-21.3.1
+ >=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild
index 6eec248e7f0..15ca5a26b62 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.3.2_pre.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.0.ebuild
@@ -15,7 +15,9 @@ else
MY_PV="${PV%_pre}"
SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="" # no keywords for '_pre' releases
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="~amd64"
+ fi
fi
DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
@@ -27,8 +29,8 @@ IUSE="+custom-cflags set-as-default test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.1.3
- >=x11-libs/libva-2.11.0[X?]
+DEPEND=">=media-libs/gmmlib-21.3.1
+ >=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
diff --git a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2.ebuild
index 072d1d906b9..53f1093683e 100644
--- a/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.1.3.ebuild
+++ b/x11-libs/libva-intel-media-driver/libva-intel-media-driver-21.4.2.ebuild
@@ -15,26 +15,28 @@ else
MY_PV="${PV%_pre}"
SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="~amd64"
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="~amd64"
+ fi
fi
DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
HOMEPAGE="https://github.com/intel/media-driver"
-LICENSE="MIT BSD"
+LICENSE="MIT BSD redistributable? ( no-source-code )"
SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
+IUSE="+redistributable test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.1.1
- >=x11-libs/libva-2.11.0[X?]
+DEPEND=">=media-libs/gmmlib-21.3.1
+ >=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.1.2_custom_cflags.patch
+ "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
)
@@ -45,18 +47,9 @@ src_configure() {
-DBUILD_TYPE=Release
-DPLATFORM=linux
-DUSE_X11=$(usex X)
+ -DENABLE_NONFREE_KERNELS=$(usex redistributable)
-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
)
-
+ local CMAKE_BUILD_TYPE="Release"
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 7e53505dd38..53f1093683e 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
@@ -15,26 +15,28 @@ else
MY_PV="${PV%_pre}"
SRC_URI="https://github.com/intel/media-driver/archive/intel-media-${MY_PV}.tar.gz"
S="${WORKDIR}/media-driver-intel-media-${MY_PV}"
- KEYWORDS="~amd64"
+ if [[ ${PV} != *_pre* ]] ; then
+ KEYWORDS="~amd64"
+ fi
fi
DESCRIPTION="Intel Media Driver for VAAPI (iHD)"
HOMEPAGE="https://github.com/intel/media-driver"
-LICENSE="MIT BSD"
+LICENSE="MIT BSD redistributable? ( no-source-code )"
SLOT="0"
-IUSE="+custom-cflags set-as-default test X"
+IUSE="+redistributable test X"
RESTRICT="!test? ( test )"
-DEPEND=">=media-libs/gmmlib-21.1.3
- >=x11-libs/libva-2.11.0[X?]
+DEPEND=">=media-libs/gmmlib-21.3.1
+ >=x11-libs/libva-2.13.0[X?]
"
RDEPEND="${DEPEND}"
PATCHES=(
"${FILESDIR}"/${PN}-20.2.0_x11_optional.patch
- "${FILESDIR}"/${PN}-21.2.2_custom_cflags.patch
+ "${FILESDIR}"/${PN}-21.4.2-Remove-unwanted-CFLAGS.patch
"${FILESDIR}"/${PN}-20.4.5_testing_in_src_test.patch
)
@@ -45,18 +47,9 @@ src_configure() {
-DBUILD_TYPE=Release
-DPLATFORM=linux
-DUSE_X11=$(usex X)
+ -DENABLE_NONFREE_KERNELS=$(usex redistributable)
-DLATEST_CPP_NEEDED=ON # Seems to be the best option for now
- -DOVERRIDE_COMPILER_FLAGS=$(usex !custom-cflags)
)
-
+ local CMAKE_BUILD_TYPE="Release"
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 6afcc149822..706003d8000 100644
--- a/x11-libs/libva-intel-media-driver/metadata.xml
+++ b/x11-libs/libva-intel-media-driver/metadata.xml
@@ -9,6 +9,7 @@
<name>Evgeny Grin</name>
</maintainer>
<use>
+ <flag name="redistributable">Install redistributable media kernel binaries (no source code) files (primarily needed for video encoding support)</flag>
<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>
diff --git a/x11-libs/libva/Manifest b/x11-libs/libva/Manifest
index 85d761252f4..dd28070f774 100644
--- a/x11-libs/libva/Manifest
+++ b/x11-libs/libva/Manifest
@@ -1,9 +1 @@
-DIST libva-2.10.0.tar.bz2 484741 BLAKE2B 9c3912d5337d3624af9ffc537a972479385285413712948159641d10b60a39b60754b3bc6467a0508a878df29be23c0e2bace488bdf9047f3e162ca0b573fa5f SHA512 9225120f17e0d935927cb0046c3a6086c776beac71a8ef7fd800d2c6a721d0e28a13be89221c5ef3cca1634317aaa2a513554ccf25a54f25b2a339603c4a11a1
-DIST libva-2.11.0.tar.gz 252204 BLAKE2B b56c47296493a9ecce7758661386d98d9a47082d8f16ab3b352f84591291e85aefc336a209433a901f7c4be1f54570221e9955666b22125740cc060542099394 SHA512 592df16bca06c93d252d27b2105032f020b0ca30f7937533918a497f385ec59b8a1e19c5d89047c197ddc1aab056128ab114b9ec29de3e968cb96bfa8d85f02a
-DIST libva-2.12.0.tar.gz 257645 BLAKE2B 8436f654e3fec57dd490aad6ff19d7fd9aa33a90f32535c0bd57ad47ab6c5728b7a67b277c46f854b781747fd641a76d068f052d95104d515eb9a9b206041edc SHA512 53b22dd5166b92bceb508e7ecd73ae023d95928a76db0e61f4326652f23f6603c507b2ee604779293c7d7a02ef0f7b082e3b181bbb55f0a63416196088af1b51
-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
+DIST libva-2.13.0.tar.gz 256724 BLAKE2B 97dd51bf488dc88027125973399e17dedcce03b7bf5104fd9bf17156c5013e1e9d46f2bf78c16431141294f75549a00fed3542b4f79dd31b032f4505c11d07d7 SHA512 226d09956754c9942348ed289f210268bad64dbba95d948b33ae063f7ecb276af9da083a48c03c3c79ad4305716d203898bc75a109945d064a5fe6fb43398dea
diff --git a/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch b/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch
deleted file mode 100644
index cf799cd3d68..00000000000
--- a/x11-libs/libva/files/libva-2.10.0-fix_wayland_build.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 3a71a012b72480ffdf1e2361845036f3cc9d7154 Mon Sep 17 00:00:00 2001
-From: Jan Beich <jbeich@FreeBSD.org>
-Date: Sat, 9 Jan 2021 13:17:38 +0000
-Subject: [PATCH] autotools: use shell grouping instead of sed to prepend a
- line
-
-dash and pdksh don't support $'...'
-
-/bin/sed: -e expression #1, char 2: unknown command: `1'
----
- va/wayland/Makefile.am | 5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/va/wayland/Makefile.am b/va/wayland/Makefile.am
-index f48afb4d..40a54616 100644
---- a/va/wayland/Makefile.am
-+++ b/va/wayland/Makefile.am
-@@ -70,8 +70,9 @@ 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' \
-- -e 's@WL_EXPORT@DLL_HIDDEN@g' < $< > $@
-+ $(AM_V_GEN){ echo '#include "sysdeps.h"'; $(SED) \
-+ -e 's@WL_EXPORT@DLL_HIDDEN@g' \
-+ < $<; } > $@
-
- EXTRA_DIST = \
- wayland-drm.xml \
diff --git a/x11-libs/libva/libva-2.10.0.ebuild b/x11-libs/libva/libva-2.10.0.ebuild
deleted file mode 100644
index f25b39d46be..00000000000
--- a/x11-libs/libva/libva-2.10.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="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}]
- dev-util/wayland-scanner[${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-fix_wayland_build.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.11.0.ebuild b/x11-libs/libva/libva-2.11.0.ebuild
deleted file mode 100644
index 953e353bda4..00000000000
--- a/x11-libs/libva/libva-2.11.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="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"
- # 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.60[${MULTILIB_USEDEP}]
- opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] )
- wayland? (
- >=dev-libs/wayland-1.11[${MULTILIB_USEDEP}]
- dev-util/wayland-scanner[${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
-)
-
-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.12.0.ebuild b/x11-libs/libva/libva-2.13.0-r1.ebuild
index 6dbcb7faaaa..a3eb6a58e73 100644
--- a/x11-libs/libva/libva-2.12.0.ebuild
+++ b/x11-libs/libva/libva-2.13.0-r1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal optfeature
DESCRIPTION="Video Acceleration (VA) API for Linux"
HOMEPAGE="https://01.org/linuxmedia/vaapi"
@@ -18,17 +18,12 @@ else
# 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"
+ 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
+IUSE="+drm opengl utils wayland X"
RDEPEND="
>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -47,13 +42,7 @@ 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 )
-"
+PDEPEND="utils? ( media-video/libva-utils )"
REQUIRED_USE="|| ( drm wayland X )
opengl? ( X )"
@@ -89,3 +78,10 @@ multilib_src_install_all() {
default
find "${ED}" -type f -name "*.la" -delete || die
}
+
+pkg_postinst() {
+ optfeature_header
+ optfeature "NVIDIA GPU support" x11-libs/libva-vdpau-driver
+ optfeature "Older Intel GPU support" x11-libs/libva-intel-driver
+ optfeature "Newer Intel GPU support" x11-libs/libva-intel-media-driver
+}
diff --git a/x11-libs/libva/libva-2.5.0-r1.ebuild b/x11-libs/libva/libva-2.5.0-r1.ebuild
deleted file mode 100644
index f23c9f5ecc5..00000000000
--- a/x11-libs/libva/libva-2.5.0-r1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2019 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"
-
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
- inherit autotools 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 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
-)
-
-src_prepare() {
- default
- [[ "${PV}" == *9999* ]] && 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)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/x11-libs/libva/libva-2.6.1.ebuild b/x11-libs/libva/libva-2.6.1.ebuild
deleted file mode 100644
index 016d79e6442..00000000000
--- a/x11-libs/libva/libva-2.6.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 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"
-
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
- inherit autotools 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"
-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
-)
-
-src_prepare() {
- default
- [[ "${PV}" == *9999* ]] && 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)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/x11-libs/libva/libva-2.7.1.ebuild b/x11-libs/libva/libva-2.7.1.ebuild
deleted file mode 100644
index e68b8032b1f..00000000000
--- a/x11-libs/libva/libva-2.7.1.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 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"
-
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
- inherit autotools 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"
-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
-)
-
-src_prepare() {
- default
- [[ "${PV}" == *9999* ]] && 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)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/x11-libs/libva/libva-2.8.0.ebuild b/x11-libs/libva/libva-2.8.0.ebuild
deleted file mode 100644
index 016d79e6442..00000000000
--- a/x11-libs/libva/libva-2.8.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 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"
-
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
- inherit autotools 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"
-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
-)
-
-src_prepare() {
- default
- [[ "${PV}" == *9999* ]] && 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)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/x11-libs/libva/libva-2.9.0.ebuild b/x11-libs/libva/libva-2.9.0.ebuild
deleted file mode 100644
index 8f2102c46d6..00000000000
--- a/x11-libs/libva/libva-2.9.0.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2020 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"
-
-if [[ ${PV} = *9999* ]] ; then # Live ebuild
- inherit autotools 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 ~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
-)
-
-src_prepare() {
- default
- [[ "${PV}" == *9999* ]] && 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)
- )
- ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
- 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
deleted file mode 100644
index 89ac22133fa..00000000000
--- a/x11-libs/libva/libva-2.9.1.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# 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 045f07425bd..a5e8ebf286e 100644
--- a/x11-libs/libva/libva-9999.ebuild
+++ b/x11-libs/libva/libva-9999.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-inherit autotools multilib-minimal
+inherit autotools multilib-minimal optfeature
DESCRIPTION="Video Acceleration (VA) API for Linux"
HOMEPAGE="https://01.org/linuxmedia/vaapi"
@@ -23,12 +23,7 @@ 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
+IUSE="+drm opengl utils wayland X"
RDEPEND="
>=x11-libs/libdrm-2.4.60[${MULTILIB_USEDEP}]
@@ -47,13 +42,7 @@ 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 )
-"
+PDEPEND="utils? ( media-video/libva-utils )"
REQUIRED_USE="|| ( drm wayland X )
opengl? ( X )"
@@ -89,3 +78,10 @@ multilib_src_install_all() {
default
find "${ED}" -type f -name "*.la" -delete || die
}
+
+pkg_postinst() {
+ optfeature_header
+ optfeature "NVIDIA GPU support" x11-libs/libva-vdpau-driver
+ optfeature "Older Intel GPU support" x11-libs/libva-intel-driver
+ optfeature "Newer Intel GPU support" x11-libs/libva-intel-media-driver
+}
diff --git a/x11-libs/libxcb/libxcb-1.14.ebuild b/x11-libs/libxcb/libxcb-1.14.ebuild
index b20b8c3487c..4bf62d4bcc5 100644
--- a/x11-libs/libxcb/libxcb-1.14.ebuild
+++ b/x11-libs/libxcb/libxcb-1.14.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8..10} )
PYTHON_REQ_USE=xml
XORG_TARBALL_SUFFIX="xz"
@@ -15,7 +15,7 @@ inherit python-any-r1 xorg-3
DESCRIPTION="X C-language Bindings library"
HOMEPAGE="https://xcb.freedesktop.org/ https://gitlab.freedesktop.org/xorg/lib/libxcb"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
IUSE="doc selinux test +xkb"
RESTRICT="!test? ( test )"
SLOT="0/1.12"
diff --git a/x11-libs/libxcvt/Manifest b/x11-libs/libxcvt/Manifest
index c82809b1314..d71c4dad414 100644
--- a/x11-libs/libxcvt/Manifest
+++ b/x11-libs/libxcvt/Manifest
@@ -1 +1 @@
-DIST libxcvt-0.1.0.tar.xz 7912 BLAKE2B 31653a085fc8c60ff3eb1cb3749e382f2b98b1aa967bfe6f4e8ec94536b35ec73f0d8cbd76be782f46c81255c166a889141dfebb41448db5ad8e29797b340d3b SHA512 c2ca7abfc2954cf4427e0b3c3e302aad438525118dc9fa2047fce2bce6578863696387af8eb7adfad40af6313d9d9c87a9dcaf7e026e8049d48118063f6f0088
+DIST libxcvt-0.1.1.tar.xz 9600 BLAKE2B 47628fc10d9d75207b7d09cb5b789e58fae485c95a5e3e95345c289f0eeb20859dff6384049e22532ddcb3c04a84ceca6557c3490e5cd8c6956c6ac6c81d6636 SHA512 50e9cd0283858823d4cfde75f06e23ffc42983272cb1f75408052fb5b76a4bb6f9de7d42d8ff9ec0dae6e95eefebc6273e03c919a92f237585db55eaf1a57005
diff --git a/x11-libs/libxcvt/libxcvt-0.1.0.ebuild b/x11-libs/libxcvt/libxcvt-0.1.1.ebuild
index 27041453c6a..ae1345214fc 100644
--- a/x11-libs/libxcvt/libxcvt-0.1.0.ebuild
+++ b/x11-libs/libxcvt/libxcvt-0.1.1.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
inherit xorg-3 meson
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc x86"
+ KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86"
fi
DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/libxcvt/libxcvt-9999.ebuild b/x11-libs/libxcvt/libxcvt-9999.ebuild
index 0ad3f5af940..4da7a73c761 100644
--- a/x11-libs/libxcvt/libxcvt-9999.ebuild
+++ b/x11-libs/libxcvt/libxcvt-9999.ebuild
@@ -7,7 +7,7 @@ XORG_TARBALL_SUFFIX="xz"
inherit xorg-3 meson
if [[ ${PV} != *9999* ]]; then
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
fi
DESCRIPTION="X.Org xcvt library and cvt program"
diff --git a/x11-libs/libxkbcommon/Manifest b/x11-libs/libxkbcommon/Manifest
index 4d717f518ba..78e37feb74d 100644
--- a/x11-libs/libxkbcommon/Manifest
+++ b/x11-libs/libxkbcommon/Manifest
@@ -1 +1 @@
-DIST libxkbcommon-1.3.0.tar.xz 455256 BLAKE2B f53a47005dd411855d1d5c39a33ef58d22982b2d4c2014320722f7fe9a9b468366c6090fadd067e50a846f22de7b80164b684615a8bcb1b14a478609cc4deb74 SHA512 9585ab1df7f2d95b991a786ee1f1de0a645aa315edb93cb093f3409fc76ef7b8f8189a6a7bfd179dc01c5d105d9c9eea40a395762eeffe0618b0c3ee116c0d18
+DIST libxkbcommon-1.3.1.tar.xz 471036 BLAKE2B c46d39876bd4477fe838e17e744ed04388417cfae8bb77c7de48237d31f51fe230d2705733dc0873253b48c61530fbe932e4da7317217c31a7897702fa1d03b4 SHA512 3b2cf6ae9ba4dc8b6fe702ac1fa700034fbc9bd147c73bd2cd93546bcfb71865734b3e46bad35a8fd618ed97266a02dad1dc966c63e6b10404a64919459d933e
diff --git a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild b/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
index 7d5c2eb0168..513cfd69b0c 100644
--- a/x11-libs/libxkbcommon/libxkbcommon-1.3.0.ebuild
+++ b/x11-libs/libxkbcommon/libxkbcommon-1.3.1.ebuild
@@ -11,7 +11,7 @@ else
KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
fi
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{7..10} )
inherit meson-multilib ${GIT_ECLASS} python-any-r1 virtualx
diff --git a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
index 15403f69d2f..3c81299b992 100644
--- a/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
+++ b/x11-libs/libxkbfile/libxkbfile-1.1.0.ebuild
@@ -7,7 +7,7 @@ inherit xorg-3
DESCRIPTION="X.Org xkbfile library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE=""
RDEPEND="x11-libs/libX11[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
index 0ee4dd83fe9..08253db81cb 100644
--- a/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
+++ b/x11-libs/libxshmfence/libxshmfence-1.3-r2.ebuild
@@ -8,6 +8,6 @@ inherit xorg-3
DESCRIPTION="Shared memory fences using futexes"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
DEPEND="x11-base/xorg-proto"
diff --git a/x11-libs/mx/Manifest b/x11-libs/mx/Manifest
deleted file mode 100644
index 64d8ec2d3af..00000000000
--- a/x11-libs/mx/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mx-1.4.7.tar.xz 939672 BLAKE2B 3f55018c6d282af95b80852748a6baa7a56ea1ea69e1b3740b6d936633818f3b18124f1bec2d5bc51596df75a5633d355362d1d22549c5a7e490e053fcca2bae SHA512 6870898548c947d43947ea6ded7c06d01d18aa721c81927fabf3ee0cfe20f65739e927d32277acce5c2e13968502828e29e043f9a8cf31af8f2bc20ec1ad0349
diff --git a/x11-libs/mx/files/mx-1.4.7-gl-types.patch b/x11-libs/mx/files/mx-1.4.7-gl-types.patch
deleted file mode 100644
index 85c691378d8..00000000000
--- a/x11-libs/mx/files/mx-1.4.7-gl-types.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-From 297b654133436c6ee5146fce31529da4e52dfe74 Mon Sep 17 00:00:00 2001
-From: Brian Pepple <bpepple@fedoraproject.org>
-Date: Sat, 25 Aug 2012 17:41:59 -0400
-Subject: [PATCH] Replace GL data types with equivalent glib types.
-
----
- mx/mx-deform-texture.c | 8 ++++----
- mx/mx-texture-frame.c | 2 +-
- 2 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/mx/mx-deform-texture.c b/mx/mx-deform-texture.c
-index 93c54d7..466cc9f 100644
---- a/mx/mx-deform-texture.c
-+++ b/mx/mx-deform-texture.c
-@@ -493,9 +493,9 @@ mx_deform_texture_class_init (MxDeformTextureClass *klass)
- static void
- mx_deform_texture_init_arrays (MxDeformTexture *self)
- {
-- GLushort *idx, *bf_idx;
-+ gushort *idx, *bf_idx;
- gint x, y, direction;
-- GLushort *static_indices, *static_bf_indices;
-+ gushort *static_indices, *static_bf_indices;
- MxDeformTexturePrivate *priv = self->priv;
-
- mx_deform_texture_free_arrays (self);
-@@ -503,8 +503,8 @@ mx_deform_texture_init_arrays (MxDeformTexture *self)
- priv->n_indices = (2 + 2 * priv->tiles_x) *
- priv->tiles_y +
- (priv->tiles_y - 1);
-- static_indices = g_new (GLushort, priv->n_indices);
-- static_bf_indices = g_new (GLushort, priv->n_indices);
-+ static_indices = g_new (gushort, priv->n_indices);
-+ static_bf_indices = g_new (gushort, priv->n_indices);
-
- #define MESH_INDEX(X, Y) (Y) * (priv->tiles_x + 1) + (X)
-
-diff --git a/mx/mx-texture-frame.c b/mx/mx-texture-frame.c
-index bde57ff..a88985f 100644
---- a/mx/mx-texture-frame.c
-+++ b/mx/mx-texture-frame.c
-@@ -200,7 +200,7 @@ mx_texture_frame_paint (ClutterActor *self)
-
-
- {
-- GLfloat rectangles[] =
-+ gfloat rectangles[] =
- {
- /* top left corner */
- 0, 0,
---
-1.7.12
-
diff --git a/x11-libs/mx/metadata.xml b/x11-libs/mx/metadata.xml
deleted file mode 100644
index 64496ad22c4..00000000000
--- a/x11-libs/mx/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
- <maintainer type="project">
- <email>gnome@gentoo.org</email>
- <name>Gentoo GNOME Desktop</name>
- </maintainer>
- <upstream>
- <remote-id type="github">clutter-project/mx</remote-id>
- </upstream>
-</pkgmetadata>
diff --git a/x11-libs/mx/mx-1.4.7-r2.ebuild b/x11-libs/mx/mx-1.4.7-r2.ebuild
deleted file mode 100644
index 5a85ae7c71a..00000000000
--- a/x11-libs/mx/mx-1.4.7-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-GCONF_DEBUG="yes"
-
-inherit gnome2 epatch
-
-DESCRIPTION="A widget toolkit using Clutter"
-HOMEPAGE="http://clutter-project.org/"
-SRC_URI="https://github.com/downloads/clutter-project/${PN}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="1.0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
-IUSE="dbus +gtk +introspection startup-notification"
-
-RDEPEND="
- >=dev-libs/glib-2.28.0:2
- >=media-libs/clutter-1.7.91:1.0
- media-libs/cogl:=
- >=x11-apps/xrandr-1.2.0
-
- x11-libs/gdk-pixbuf:2[introspection?]
-
- dbus? ( >=dev-libs/dbus-glib-0.82 )
- gtk? ( >=x11-libs/gtk+-2.20:2[introspection?] )
- introspection? ( >=dev-libs/gobject-introspection-0.6.4:= )
- startup-notification? ( >=x11-libs/startup-notification-0.9 )
-"
-DEPEND="${RDEPEND}
- dev-util/glib-utils
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.35.0
- sys-devel/gettext
- virtual/pkgconfig
-"
-
-src_prepare() {
- # Tests are interactive, no use for us
- sed -e 's/^\(SUBDIRS .*\)tests\(.*\)/\1 \2/g' \
- -i Makefile.am -i Makefile.in || die
- # In 1.4.8
- epatch "${FILESDIR}/${P}-gl-types.patch"
-
- gnome2_src_prepare
-}
-
-src_configure() {
- gnome2_src_configure \
- --with-winsys=x11 \
- --without-glade \
- $(use_enable gtk gtk-widgets) \
- $(use_enable introspection) \
- $(use_with dbus) \
- $(use_with startup-notification)
-}
diff --git a/x11-libs/pango/pango-1.48.10.ebuild b/x11-libs/pango/pango-1.48.10-r1.ebuild
index 31ec4a4021c..c83171f103b 100644
--- a/x11-libs/pango/pango-1.48.10.ebuild
+++ b/x11-libs/pango/pango-1.48.10-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz
LICENSE="LGPL-2+"
SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86"
IUSE="debug +introspection sysprof X"
@@ -21,7 +21,7 @@ RDEPEND="
>=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -73,3 +73,12 @@ multilib_src_install_all() {
# This will install PangoXft API docs regardless of USE=-X, but this is intentional
doins -r "${S}"/docs/Pango*
}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if has_version 'media-libs/freetype[-harfbuzz]' ; then
+ ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+ ewarn "lead to minor font rendering problems, see bug 712374."
+ fi
+}
diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r2.ebuild
index aef9e1d9db1..cc225cce0cd 100644
--- a/x11-libs/pango/pango-1.48.7-r1.ebuild
+++ b/x11-libs/pango/pango-1.48.7-r2.ebuild
@@ -21,7 +21,7 @@ RDEPEND="
>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
- >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}]
+ >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
X? (
>=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
@@ -73,3 +73,12 @@ multilib_src_install_all() {
# This will install PangoXft API docs regardless of USE=-X, but this is intentional
doins -r "${S}"/docs/Pango*
}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+
+ if has_version 'media-libs/freetype[-harfbuzz]' ; then
+ ewarn "media-libs/freetype is installed without harfbuzz support. This may"
+ ewarn "lead to minor font rendering problems, see bug 712374."
+ fi
+}
diff --git a/x11-libs/pixman/pixman-0.40.0.ebuild b/x11-libs/pixman/pixman-0.40.0.ebuild
index 65d7123b398..a269bcee708 100644
--- a/x11-libs/pixman/pixman-0.40.0.ebuild
+++ b/x11-libs/pixman/pixman-0.40.0.ebuild
@@ -9,14 +9,14 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs
+inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs
DESCRIPTION="Low-level pixel manipulation routines"
HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
fi
@@ -28,6 +28,11 @@ multilib_src_configure() {
local openmp=disabled
tc-has-openmp && openmp=enabled
+ if use arm && tc-is-clang ; then
+ # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
+ append-cflags $(test-flags-CC -fno-integrated-as)
+ fi
+
local emesonargs=(
$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
$(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2)
diff --git a/x11-libs/pixman/pixman-9999.ebuild b/x11-libs/pixman/pixman-9999.ebuild
index d79304a2d1a..e6332d53863 100644
--- a/x11-libs/pixman/pixman-9999.ebuild
+++ b/x11-libs/pixman/pixman-9999.ebuild
@@ -9,14 +9,14 @@ if [[ ${PV} = 9999* ]]; then
GIT_ECLASS="git-r3"
fi
-inherit ${GIT_ECLASS} meson-multilib multiprocessing toolchain-funcs
+inherit ${GIT_ECLASS} flag-o-matic meson-multilib multiprocessing toolchain-funcs
DESCRIPTION="Low-level pixel manipulation routines"
HOMEPAGE="http://www.pixman.org/ https://gitlab.freedesktop.org/pixman/pixman/"
if [[ ${PV} = 9999* ]]; then
SRC_URI=""
else
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+ KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
SRC_URI="https://www.x.org/releases/individual/lib/${P}.tar.xz"
fi
@@ -28,6 +28,11 @@ multilib_src_configure() {
local openmp=disabled
tc-has-openmp && openmp=enabled
+ if use arm && tc-is-clang ; then
+ # See bug #768138 and https://gitlab.freedesktop.org/pixman/pixman/-/issues/46
+ append-cflags $(test-flags-CC -fno-integrated-as)
+ fi
+
local emesonargs=(
$(meson_feature cpu_flags_arm_iwmmxt iwmmxt)
$(meson_use cpu_flags_arm_iwmmxt2 iwmmxt2)
diff --git a/x11-libs/qscintilla/Manifest b/x11-libs/qscintilla/Manifest
index 31ba2a34aea..8247ffec01a 100644
--- a/x11-libs/qscintilla/Manifest
+++ b/x11-libs/qscintilla/Manifest
@@ -1,2 +1,2 @@
DIST QScintilla-2.11.6.tar.gz 3027764 BLAKE2B 1eb5d9ba44040cbff30e8b0028e164cf2aa86c565a5368890500614b9395dbe861c5cd268cf6a4ec06e2c7d77860b2ad6064bc3d07fd63a6ede2b060f44a7117 SHA512 8055d72a40f9f5a7d45c6592055c1b8eb5e5c50ce9e51673babd5e567c769d60c64d244ba5a7def5731a3120099e9528d01ed94327a06bb56ae2fa2e5e37b198
-DIST QScintilla_src-2.13.0.tar.gz 3059601 BLAKE2B 8de5440c3019cb3f67ea25db2935dc8d8cd711298a8a49ce3f632937c538da5b8b337851c3f68c59eb3cb8df8396eebd8ac4f0b4d6d715c2519598eeda9b6586 SHA512 c72676e2d8463dde6e7c620e15a526eae056cfbf00bb5d013c315ebbf20340fcc79188c6e60c336679f7d18287066a26bdc96be2f1ef8a98b3adcada3ee09fd1
+DIST QScintilla_src-2.13.1.tar.gz 3059819 BLAKE2B 147d61cea2d557da6d922599f826a62c4b216f3252226892076ff785a080c9de1fef199297156fce55a00006567240af45e2833e085e423ad47e29c4f9b2241e SHA512 edf7f358e188235d8a39a7d4a8332ca478460a65a8829d9cafcab8f22b84abcd8d624de2076d81a66a56d5a5c53edc6ecc223459bbbb8ac876c5befd8873f700
diff --git a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
index b724431bd16..28e0c4e73dc 100644
--- a/x11-libs/qscintilla/qscintilla-2.13.0.ebuild
+++ b/x11-libs/qscintilla/qscintilla-2.13.1.ebuild
@@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}
LICENSE="GPL-3"
SLOT="0/15"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
IUSE="designer doc"
RDEPEND="
diff --git a/x11-libs/qtermwidget/Manifest b/x11-libs/qtermwidget/Manifest
index b672a6ac59d..d68053121b7 100644
--- a/x11-libs/qtermwidget/Manifest
+++ b/x11-libs/qtermwidget/Manifest
@@ -1,2 +1 @@
-DIST qtermwidget-0.16.1.tar.xz 182764 BLAKE2B ba041130d8d67c08db07b91a5eb513c6fee548df3abef3ac7d7ccc5114771f2a14fff3c3f01a762670d8e3d9887fd7f62e1c018ea98ee7cc8e68b77317871966 SHA512 689d067e259aa07b22e1d3344467180109e871a8d45551085625c04670f1422b821bbbf52caf2b67e10ce8e78214c8e65811e6eb4fc61dd246fc25598ed095c5
DIST qtermwidget-0.17.0.tar.xz 187424 BLAKE2B 8053eae3674f12839a205b0686bdb42d83662604da1f43ee6c4feb60c35af6a2f7b65a095a89b64ffd9d2c3ac10e7c78df721862f15f401126fcab3d321fb92e SHA512 c8f75dcd5182a6eea933452c89126fbe64035b278e8e9817d6966693f741691244e5766c49046e83add8f38cb00ff08e2640d2fa149c5aa46b20d8a06a22e78f
diff --git a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild b/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
deleted file mode 100644
index f739ad66dc1..00000000000
--- a/x11-libs/qtermwidget/qtermwidget-0.16.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Qt terminal emulator widget"
-HOMEPAGE="https://lxqt.github.io/"
-
-if [[ "${PV}" == "9999" ]]; then
- inherit git-r3
- 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"
-fi
-
-LICENSE="BSD GPL-2 LGPL-2+"
-SLOT="0/${PV}"
-
-BDEPEND="
- dev-qt/linguist-tools:5
- >=dev-util/lxqt-build-tools-0.8.0
-"
-DEPEND="
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtwidgets:5
-"
-RDEPEND="${DEPEND}"
diff --git a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
index 5762259d2e3..aa64d85aa9c 100644
--- a/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
+++ b/x11-libs/qwt/qwt-5.2.3_p20210211.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://qwt.sourceforge.io/ https://github.com/SciDAVis/qwt5-qt5"
SRC_URI="https://github.com/SciDAVis/qwt5-qt5/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
LICENSE="qwt"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ppc ppc64 x86"
SLOT="5"
IUSE="designer examples"
diff --git a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
index 4d88523fddf..a57a16a0ba2 100644
--- a/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
+++ b/x11-libs/snorenotify/snorenotify-0.7.0-r1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz"
LICENSE="LGPL-3+"
SLOT="0"
-KEYWORDS="amd64 ~arm arm64 x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
IUSE="sound test"
RESTRICT="!test? ( test )"
diff --git a/x11-libs/wxGTK/Manifest b/x11-libs/wxGTK/Manifest
index d9aa3ba85a2..4bb5a247f62 100644
--- a/x11-libs/wxGTK/Manifest
+++ b/x11-libs/wxGTK/Manifest
@@ -1,6 +1,6 @@
DIST wxGTK-3.0.4_p20190713.tar.xz 53640 BLAKE2B 89eabc44660f8f9b19fc850717eb83244a746f2f8c28bcec89fa9ccd1828f103df114bce24406ff14875220de86276f9e51870d58e716f0c94d310707f7eae4c SHA512 44a4e92ccc9c143a0e70e015116e952b0529001a3a1e23193d501826720a505259ead6feaa08de75b4a7a8753f8b16f5cc14e4bff5d15585870066ccd1de53b9
+DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335
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
-DIST wxGTK-3.0.5_p20210214.tar.xz 4560 BLAKE2B ac1815e679adfb2c36d74be0a4a9cc32d52e6b0b05a14393334bc5d30a8bc0da1386415a5b59a3f6dc4807d283272d36f033caa55a300c8c30cf0c402554b8bd SHA512 f1e34379b8bf594a68486bb6eccbd93f36dc2aeca37c0a7eb23de81c1c3825396437a65c43ed8d94673131e97414d49449ed51729970bf8b8e4608d36974a335
DIST wxWidgets-3.0.5-docs-html.tar.bz2 23844256 BLAKE2B f5b5bef129302ae1ded7a651e652b127ad9d548a00a498f06a4d4f868dc3bc33411ded2602c04c8329e927550d032bdbe633c2c7d1a7f89265874685d3cb3d9b SHA512 f839e67660f2b08aa28d1596a3b7af2c35f7c2c0505c6e6d45888845397212b3dd71c8d34115321e9a4347b9d92a0ce767bb76defd14c172e51c2a3df96cc3ac
DIST wxWidgets-3.0.5.1.tar.bz2 19739206 BLAKE2B da270cb8e4fc22b8d892ba80fbb4cc71578f642ca07102006f914a80331a254e746de6c91e61b585c0b1ab3abadd17d80a0eaa3efd48a3d412cf7202101abc7a SHA512 0a789fc5e71d414e43f75b5c16076fe8b1bcd7671be0770e4269dcef66d830c1bc74e183f49db270b928862f13472666c283fe2aa98b9006681722e06100725d
diff --git a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
index 30aaaa87cee..ce1c918692a 100644
--- a/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
+++ b/x11-libs/wxGTK/wxGTK-3.0.4-r2.ebuild
@@ -11,7 +11,7 @@ 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"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
IUSE="+X doc debug gstreamer libnotify opengl sdl tiff"
SLOT="3.0"
diff --git a/x11-libs/xapps/Manifest b/x11-libs/xapps/Manifest
index e379195d8b8..a24c4be3427 100644
--- a/x11-libs/xapps/Manifest
+++ b/x11-libs/xapps/Manifest
@@ -1,2 +1,2 @@
DIST xapps-2.2.1.tar.gz 239789 BLAKE2B ee7f3f2b3c54b0b40158dff6abbe2233c0d1a1fa4e134ce4bd6ee48842335b16e0d94ad430cb59301529dd85e2705cbb1c1f5ba10844b6fb85f598ca0c42d1db SHA512 412f5c207d81d2507f2aa5cc69beed2036db07058f08613793aa7c277bac30191a02d9aff4eca0aeb8829e3e39d5f3a87e34232bf51220c4d4bc7c8ee37b9e65
-DIST xapps-2.2.3.tar.gz 242330 BLAKE2B dba7f77eea7314fe978a1ba2b691f5c2d7e5d88f499d2f8533c8b1141262ce981cc395f8d6a0b1feaba715c63034e8dfe887e4183b5e119a0947b1ad85d99bbd SHA512 e8ac24decfa89aa949cf837a2e7a7ccdb8ef9d777081d0f3ea0e3a0b42378c721eed3eafacae669244a64c7f4202cb5c2a878d3574823f8f94bfdf51ec29f9ae
+DIST xapps-2.2.4.tar.gz 242171 BLAKE2B a2e53123776f3f0739778673d08f165d268f5d632ce57d722ac443a7201c22c14c1c88e08247f6c16dd708a01b2dd566d4bd9d55289d70eb50ba29b8f2a0987d SHA512 428fd4dc1911905d6f940c6e38fc8b572d55bcb2691d45ac807276ef554b781c9f6c57bbd6d0a95bf52ca1703a38d260f36a61b88a94bc2dc0812b575839a983
diff --git a/x11-libs/xapps/xapps-2.2.3.ebuild b/x11-libs/xapps/xapps-2.2.4.ebuild
index a7434062a55..b28d0fefec5 100644
--- a/x11-libs/xapps/xapps-2.2.3.ebuild
+++ b/x11-libs/xapps/xapps-2.2.4.ebuild
@@ -14,7 +14,7 @@ LICENSE="GPL-3"
SRC_URI="https://github.com/linuxmint/xapp/archive/${PV}.tar.gz -> ${P}.tar.gz"
S="${WORKDIR}/xapp-${PV}"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
SLOT="0"
IUSE="gtk-doc introspection static-libs"
diff --git a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
index fb12007f954..ae080147164 100644
--- a/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
+++ b/x11-libs/xcb-util-xrm/xcb-util-xrm-1.3-r1.ebuild
@@ -10,7 +10,7 @@ DESCRIPTION="X C-language Bindings sample implementations"
HOMEPAGE="https://xcb.freedesktop.org/"
SRC_URI="https://github.com/Airblader/${PN}/releases/download/v${PV}/${P}.tar.bz2"
-KEYWORDS="amd64 arm ~arm64 ppc ppc64 ~riscv x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
RDEPEND=">=x11-libs/libxcb-1.9.1:=[${MULTILIB_USEDEP}]
x11-libs/xcb-util[${MULTILIB_USEDEP}]"
diff --git a/x11-libs/xtrans/xtrans-1.4.0.ebuild b/x11-libs/xtrans/xtrans-1.4.0.ebuild
index d2a46b26aee..5bc8a31b5f2 100644
--- a/x11-libs/xtrans/xtrans-1.4.0.ebuild
+++ b/x11-libs/xtrans/xtrans-1.4.0.ebuild
@@ -9,7 +9,7 @@ XORG_DOC=doc
inherit xorg-3
DESCRIPTION="X.Org xtrans library"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
src_configure() {
local XORG_CONFIGURE_OPTIONS=(