From 9e95dbf4937ba09ca9e99f5cd3b2fc91c903bbe5 Mon Sep 17 00:00:00 2001 From: Matt Turner Date: Wed, 21 Jul 2021 22:38:15 -0700 Subject: [PATCH] media-tv/kodi: Set USE-defaults for mesa[egl,gbm] Signed-off-by: Matt Turner Signed-off-by: Sam James --- media-tv/kodi/{kodi-19.0-r1.ebuild => kodi-19.0-r2.ebuild} | 6 +++--- media-tv/kodi/{kodi-19.1-r1.ebuild => kodi-19.1-r2.ebuild} | 6 +++--- media-tv/kodi/{kodi-19.2.ebuild => kodi-19.2-r1.ebuild} | 6 +++--- media-tv/kodi/{kodi-19.3.ebuild => kodi-19.3-r1.ebuild} | 6 +++--- media-tv/kodi/kodi-19.9999.ebuild | 6 +++--- media-tv/kodi/kodi-9999.ebuild | 6 +++--- 6 files changed, 18 insertions(+), 18 deletions(-) rename media-tv/kodi/{kodi-19.0-r1.ebuild => kodi-19.0-r2.ebuild} (98%) rename media-tv/kodi/{kodi-19.1-r1.ebuild => kodi-19.1-r2.ebuild} (98%) rename media-tv/kodi/{kodi-19.2.ebuild => kodi-19.2-r1.ebuild} (98%) rename media-tv/kodi/{kodi-19.3.ebuild => kodi-19.3-r1.ebuild} (98%) diff --git a/media-tv/kodi/kodi-19.0-r1.ebuild b/media-tv/kodi/kodi-19.0-r2.ebuild similarity index 98% rename from media-tv/kodi/kodi-19.0-r1.ebuild rename to media-tv/kodi/kodi-19.0-r2.ebuild index 011c42cd8f581..8540230410e96 100644 --- a/media-tv/kodi/kodi-19.0-r1.ebuild +++ b/media-tv/kodi/kodi-19.0-r2.ebuild @@ -92,7 +92,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm] + media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( @@ -104,7 +104,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl] ) + !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] @@ -121,7 +121,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} !gles? ( media-libs/glu ) >=dev-libs/openssl-1.0.2l:0= raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) diff --git a/media-tv/kodi/kodi-19.1-r1.ebuild b/media-tv/kodi/kodi-19.1-r2.ebuild similarity index 98% rename from media-tv/kodi/kodi-19.1-r1.ebuild rename to media-tv/kodi/kodi-19.1-r2.ebuild index 364b5cbd5ed3b..5dc4cc3fc8e98 100644 --- a/media-tv/kodi/kodi-19.1-r1.ebuild +++ b/media-tv/kodi/kodi-19.1-r2.ebuild @@ -96,7 +96,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm] + media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( @@ -108,7 +108,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl] ) + !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] @@ -125,7 +125,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} !gles? ( media-libs/glu ) >=dev-libs/openssl-1.0.2l:0= raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) diff --git a/media-tv/kodi/kodi-19.2.ebuild b/media-tv/kodi/kodi-19.2-r1.ebuild similarity index 98% rename from media-tv/kodi/kodi-19.2.ebuild rename to media-tv/kodi/kodi-19.2-r1.ebuild index 297409ecfaf0f..ce99caf2c47fc 100644 --- a/media-tv/kodi/kodi-19.2.ebuild +++ b/media-tv/kodi/kodi-19.2-r1.ebuild @@ -93,7 +93,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm] + media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( @@ -105,7 +105,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl] ) + !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] @@ -122,7 +122,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) diff --git a/media-tv/kodi/kodi-19.3.ebuild b/media-tv/kodi/kodi-19.3-r1.ebuild similarity index 98% rename from media-tv/kodi/kodi-19.3.ebuild rename to media-tv/kodi/kodi-19.3-r1.ebuild index 297409ecfaf0f..ce99caf2c47fc 100644 --- a/media-tv/kodi/kodi-19.3.ebuild +++ b/media-tv/kodi/kodi-19.3-r1.ebuild @@ -93,7 +93,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm] + media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( @@ -105,7 +105,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl] ) + !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] @@ -122,7 +122,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild index 297409ecfaf0f..ce99caf2c47fc 100644 --- a/media-tv/kodi/kodi-19.9999.ebuild +++ b/media-tv/kodi/kodi-19.9999.ebuild @@ -93,7 +93,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm] + media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( @@ -105,7 +105,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.13.4 - !raspberry-pi? ( media-libs/mesa[egl] ) + !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] @@ -122,7 +122,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.1k:0= raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index ba7860ec5fa30..e540c4b93607a 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -91,7 +91,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 - media-libs/mesa[gbm] + media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( @@ -103,7 +103,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 - !raspberry-pi? ( media-libs/mesa[egl] ) + !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc] @@ -120,7 +120,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS} !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,video_cards_vc4] ) + || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio )