Skip to content

Commit

Permalink
*/*: Depend on media-libs/mesa[X(+)]
Browse files Browse the repository at this point in the history
This changes any package that depends on media-libs/mesa (though not
virtual/opengl) to depend on media-libs/mesa[X(+)] instead.

Bug: https://bugs.gentoo.org/560096
Signed-off-by: Philipp Ammann <[email protected]>
Signed-off-by: Matt Turner <[email protected]>
  • Loading branch information
trilean authored and mattst88 committed Aug 17, 2019
1 parent 22f05cd commit 97c3d2d
Show file tree
Hide file tree
Showing 94 changed files with 95 additions and 90 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.

RDEPEND="
media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.

RDEPEND="
media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ SLOT="0"
# Steam's Proton.

RDEPEND="
media-libs/mesa[d3d9,dri3,${MULTILIB_USEDEP}]
media-libs/mesa[d3d9,dri3,X(+),${MULTILIB_USEDEP}]
x11-libs/libX11[${MULTILIB_USEDEP}]
x11-libs/libxcb[${MULTILIB_USEDEP}]
"
Expand Down
2 changes: 1 addition & 1 deletion dev-libs/beignet/beignet-1.3.2-r3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ IUSE="ocl-icd ocl20"
BDEPEND="${PYTHON_DEPS}
virtual/pkgconfig"
COMMON="app-eselect/eselect-opencl
media-libs/mesa[${MULTILIB_USEDEP}]
media-libs/mesa[X(+),${MULTILIB_USEDEP}]
<sys-devel/clang-8.0.0:=[static-analyzer,${MULTILIB_USEDEP}]
>=x11-libs/libdrm-2.4.70[video_cards_intel,${MULTILIB_USEDEP}]
x11-libs/libXext[${MULTILIB_USEDEP}]
Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtwebengine/qtwebengine-5.12.3.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
Expand Down
2 changes: 1 addition & 1 deletion dev-qt/qtwebengine/qtwebengine-5.12.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ RDEPEND="
media-libs/libpng:0=
>=media-libs/libvpx-1.5:=[svc]
media-libs/libwebp:=
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
media-libs/opus
sys-apps/dbus
sys-apps/pciutils
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ RDEPEND=">=virtual/jdk-1.7
>=media-libs/fontconfig-2.10.92
>=media-libs/freetype-2.5.5
>=media-libs/libpng-1.2.51
>=media-libs/mesa-10.2.8
>=media-libs/mesa-10.2.8[X(+)]
|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
>=sys-libs/zlib-1.2.8-r1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
>=media-libs/fontconfig-2.10.92
>=media-libs/freetype-2.5.5
>=media-libs/libpng-1.2.51
>=media-libs/mesa-10.2.8
>=media-libs/mesa-10.2.8[X(+)]
|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
>=sys-libs/zlib-1.2.8-r1
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ RDEPEND="${DEPEND}
>=media-libs/fontconfig-2.10.92
>=media-libs/freetype-2.5.5
>=media-libs/libpng-1.2.51
>=media-libs/mesa-10.2.8
>=media-libs/mesa-10.2.8[X(+)]
|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
>=sys-libs/ncurses-5.9-r3:5/5[tinfo]
>=sys-libs/zlib-1.2.8-r1
Expand Down
2 changes: 1 addition & 1 deletion dev-util/apitrace/apitrace-8.0.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
DEPEND="${PYTHON_DEPS}
app-arch/brotli:=
media-libs/libpng:0=
media-libs/mesa[egl?,${MULTILIB_USEDEP}]
media-libs/mesa[egl?,X(+),${MULTILIB_USEDEP}]
sys-libs/zlib[${MULTILIB_USEDEP}]
sys-process/procps:=
x11-libs/libX11
Expand Down
2 changes: 1 addition & 1 deletion dev-util/gource/gource-0.49.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ COMMON_DEPEND="
dev-libs/libpcre:3
dev-libs/tinyxml
media-libs/freetype:2
media-libs/mesa
media-libs/mesa[X(+)]
virtual/glu:0
"
RDEPEND="${COMMON_DEPEND}
Expand Down
2 changes: 1 addition & 1 deletion games-board/gambit/gambit-1.0.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ DEPEND="dev-qt/qtcore:5
dev-qt/qtnetwork:5
dev-qt/qtopengl:5
dev-qt/qtwidgets:5
media-libs/mesa
media-libs/mesa[X(+)]
x11-libs/libX11"
RDEPEND="${DEPEND}"

Expand Down
2 changes: 1 addition & 1 deletion gnome-base/gnome-session/gnome-session-3.30.1-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ COMMON_DEPEND="
x11-libs/libX11
>=gnome-base/gnome-desktop-3.18:3=
>=dev-libs/json-glib-0.10
media-libs/mesa[egl,gles2]
media-libs/mesa[egl,gles2,X(+)]
media-libs/libepoxy
x11-libs/libXcomposite
Expand Down
2 changes: 1 addition & 1 deletion gnome-base/gnome-shell/gnome-shell-3.26.2-r4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ COMMON_DEPEND="
${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_USEDEP}]
media-libs/mesa
media-libs/mesa[X(+)]
"
# Runtime-only deps are probably incomplete and approximate.
# Introspection deps generated using:
Expand Down
2 changes: 1 addition & 1 deletion gnome-base/gnome-shell/gnome-shell-3.30.2-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ DEPEND="
${PYTHON_DEPS}
dev-python/pygobject:3[${PYTHON_USEDEP}]
media-libs/mesa
media-libs/mesa[X(+)]
"
# Runtime-only deps are probably incomplete and approximate.
# Introspection deps generated using:
Expand Down
2 changes: 1 addition & 1 deletion kde-plasma/kinfocenter/kinfocenter-5.15.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ COMMON_DEPEND="
ieee1394? ( sys-libs/libraw1394 )
opengl? (
$(add_qt_dep qtgui 'gles2=')
media-libs/mesa[gles2?]
media-libs/mesa[gles2?,X(+)]
!gles2? ( media-libs/glu )
)
pci? ( sys-apps/pciutils )
Expand Down
2 changes: 1 addition & 1 deletion kde-plasma/kinfocenter/kinfocenter-5.16.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ COMMON_DEPEND="
ieee1394? ( sys-libs/libraw1394 )
opengl? (
$(add_qt_dep qtgui 'gles2=')
media-libs/mesa[gles2?]
media-libs/mesa[gles2?,X(+)]
!gles2? ( media-libs/glu )
)
pci? ( sys-apps/pciutils )
Expand Down
2 changes: 1 addition & 1 deletion kde-plasma/kwin/kwin-5.15.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/libepoxy
media-libs/mesa[egl,gbm,gles2?,wayland]
media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
virtual/libudev:=
x11-libs/libICE
x11-libs/libSM
Expand Down
2 changes: 1 addition & 1 deletion kde-plasma/kwin/kwin-5.16.4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ COMMON_DEPEND="
media-libs/fontconfig
media-libs/freetype
media-libs/libepoxy
media-libs/mesa[egl,gbm,gles2?,wayland]
media-libs/mesa[egl,gbm,gles2?,wayland,X(+)]
virtual/libudev:=
x11-libs/libICE
x11-libs/libSM
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/asymptote/asymptote-2.41-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
opengl? ( >=media-libs/mesa-8 )
opengl? ( >=media-libs/mesa-8[X(+)] )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/asymptote/asymptote-2.47.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
opengl? ( >=media-libs/mesa-8 )
opengl? ( >=media-libs/mesa-8[X(+)] )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/asymptote/asymptote-2.48-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/asymptote/asymptote-2.49.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ RDEPEND="
>=sys-libs/ncurses-5.4-r5:0=
>=sys-libs/readline-4.3-r5:0=
imagemagick? ( media-gfx/imagemagick[png] )
opengl? ( media-libs/mesa media-libs/freeglut media-libs/glew:0 media-libs/glm )
opengl? ( media-libs/mesa[X(+)] media-libs/freeglut media-libs/glew:0 media-libs/glm )
offscreen? ( media-libs/mesa[osmesa] )
svg? ( app-text/dvisvgm )
sigsegv? ( dev-libs/libsigsegv )
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/fbida/fbida-2.12.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CDEPEND="
>=media-libs/freetype-2.0
media-libs/libepoxy
media-libs/libexif
media-libs/mesa
media-libs/mesa[X(+)]
virtual/jpeg:*
virtual/ttf-fonts
x11-libs/cairo[opengl]
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/fbida/fbida-2.13-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CDEPEND="
>=media-libs/freetype-2.0
media-libs/libepoxy
media-libs/libexif
media-libs/mesa
media-libs/mesa[X(+)]
virtual/jpeg:*
virtual/ttf-fonts
x11-libs/cairo[opengl]
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/fbida/fbida-2.14.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ CDEPEND="
>=media-libs/freetype-2.0
media-libs/libepoxy
media-libs/libexif
media-libs/mesa
media-libs/mesa[X(+)]
virtual/jpeg:*
virtual/ttf-fonts
x11-libs/cairo[opengl]
Expand Down
2 changes: 1 addition & 1 deletion media-gfx/fbida/fbida-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ CDEPEND="
media-libs/libexif
media-libs/libpng:*
media-libs/libwebp
media-libs/mesa
media-libs/mesa[X(+)]
media-libs/tiff:*
net-misc/curl
virtual/jpeg:*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ RDEPEND="
x11-libs/libXmu
x11-libs/libXt
media-libs/glu
media-libs/mesa
media-libs/mesa[X(+)]
media-libs/freeglut
amd64? ( abi_x86_32? (
>=media-libs/glu-9.0.0-r1[abi_x86_32(-)]
Expand Down
2 changes: 1 addition & 1 deletion media-libs/libprojectm/libprojectm-2.1.0-r2.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ IUSE="debug openmp video_cards_nvidia"
RDEPEND="media-fonts/dejavu
>=media-libs/ftgl-2.1.3_rc5
media-libs/freetype:2
media-libs/mesa
media-libs/mesa[X(+)]
media-libs/glew:=
sys-libs/zlib
video_cards_nvidia? ( media-gfx/nvidia-cg-toolkit )"
Expand Down
2 changes: 1 addition & 1 deletion media-libs/libprojectm/libprojectm-3.1.0-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ IUSE="gles2 qt5 sdl"

RDEPEND="gles2? ( media-libs/mesa[gles2] )
media-libs/glm
media-libs/mesa
media-libs/mesa[X(+)]
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
Expand Down
2 changes: 1 addition & 1 deletion media-libs/libprojectm/libprojectm-9999.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ IUSE="gles2 qt5 sdl"

RDEPEND="gles2? ( media-libs/mesa[gles2] )
media-libs/glm
media-libs/mesa
media-libs/mesa[X(+)]
qt5? (
dev-qt/qtcore:5
dev-qt/qtgui:5
Expand Down
2 changes: 1 addition & 1 deletion media-libs/sg/sg-1.5.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RDEPEND="
x11-libs/libXaw
x11-libs/motif
|| (
( media-libs/mesa x11-libs/libGLw )
( media-libs/mesa[X(+)] x11-libs/libGLw )
media-libs/opengl-apple
)"
DEPEND="
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ REQUIRED_USE="
GST_REQ="1.14.1"
GL_DEPS="
>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
media-libs/mesa[gles2?,egl?,${MULTILIB_USEDEP}]
media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
"
RDEPEND="
>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ REQUIRED_USE="
GST_REQ="${PV}"
GL_DEPS="
>=media-libs/gst-plugins-base-${GST_REQ}:${SLOT}[egl?,gles2?,opengl?,wayland?,X?]
media-libs/mesa[gles2?,egl?,${MULTILIB_USEDEP}]
media-libs/mesa[gles2?,egl?,X(+),${MULTILIB_USEDEP}]
"
RDEPEND="
>=dev-libs/glib-2.40:2[${MULTILIB_USEDEP}]
Expand Down
2 changes: 1 addition & 1 deletion media-radio/ax25-tools/ax25-tools-0.0.10_rc4.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ S=${WORKDIR}/${MY_P}

DEPEND="dev-libs/libax25
X? ( x11-libs/libX11
media-libs/mesa )"
media-libs/mesa[X(+)] )"
RDEPEND=${DEPEND}

src_configure() {
Expand Down
2 changes: 1 addition & 1 deletion media-sound/spotify/spotify-1.0.72-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ RDEPEND="
media-libs/alsa-lib
media-libs/harfbuzz
media-libs/fontconfig
media-libs/mesa
media-libs/mesa[X(+)]
net-misc/curl[ssl,curl_ssl_openssl]
net-print/cups[ssl]
x11-libs/gtk+:2
Expand Down
2 changes: 1 addition & 1 deletion media-sound/spotify/spotify-1.1.10-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ RDEPEND="
media-libs/alsa-lib
media-libs/fontconfig
media-libs/harfbuzz
media-libs/mesa
media-libs/mesa[X(+)]
net-misc/curl[ssl]
net-print/cups[ssl]
|| ( media-sound/pulseaudio media-sound/apulse )
Expand Down
2 changes: 1 addition & 1 deletion media-tv/kodi/kodi-17.3-r1.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
>=media-libs/taglib-1.11.1
system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
mysql? ( virtual/mysql )
Expand Down
2 changes: 1 addition & 1 deletion media-tv/kodi/kodi-17.6-r10.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
>=media-libs/taglib-1.11.1
system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
Expand Down
2 changes: 1 addition & 1 deletion media-tv/kodi/kodi-17.6-r11.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
>=media-libs/taglib-1.11.1
system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
Expand Down
2 changes: 1 addition & 1 deletion media-tv/kodi/kodi-17.6-r6.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
>=media-libs/taglib-1.11.1
system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
Expand Down
2 changes: 1 addition & 1 deletion media-tv/kodi/kodi-17.6-r7.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
>=media-libs/taglib-1.11.1
system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
Expand Down
2 changes: 1 addition & 1 deletion media-tv/kodi/kodi-17.6-r8.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
>=media-libs/taglib-1.11.1
system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
Expand Down
2 changes: 1 addition & 1 deletion media-tv/kodi/kodi-17.6-r9.ebuild
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/fontconfig
media-libs/freetype
>=media-libs/libass-0.13.4
media-libs/mesa[egl]
media-libs/mesa[egl,X(+)]
>=media-libs/taglib-1.11.1
system-ffmpeg? (
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc]
Expand Down
Loading

0 comments on commit 97c3d2d

Please sign in to comment.