From 7c306a9a2732eeb192c0fc994a91f6753279138a Mon Sep 17 00:00:00 2001 From: "Karlson2k (Evgeny Grin)" Date: Tue, 2 Feb 2021 22:14:04 +0300 Subject: media-tv/kodi: marked libcdio is required dependency Kodi build system ignores user settings for libcdio. Closes: https://bugs.gentoo.org/768294 Signed-off-by: Karlson2k (Evgeny Grin) Closes: https://github.com/gentoo/gentoo/pull/19309 Signed-off-by: Craig Andrews --- media-tv/kodi/kodi-19.0_rc1-r2.ebuild | 6 +++--- media-tv/kodi/kodi-19.9999.ebuild | 6 +++--- media-tv/kodi/kodi-9999.ebuild | 6 +++--- media-tv/kodi/metadata.xml | 1 - 4 files changed, 9 insertions(+), 10 deletions(-) (limited to 'media-tv') diff --git a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild index 68d594537b69..675cf6bbbaf8 100644 --- a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild +++ b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild @@ -39,7 +39,7 @@ SLOT="0" # use flag is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" +IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -79,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/pillow[${PYTHON_MULTI_USEDEP}] dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] ') - cdio? ( >=dev-libs/libcdio-2.1.0 ) + >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) @@ -242,7 +242,7 @@ src_configure() { -DENABLE_BLUETOOTH=$(usex bluetooth) -DENABLE_BLURAY=$(usex bluray) -DENABLE_CCACHE=OFF - -DENABLE_ISO9660PP=$(usex cdio) + -DENABLE_ISO9660PP=ON -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild index 68d594537b69..675cf6bbbaf8 100644 --- a/media-tv/kodi/kodi-19.9999.ebuild +++ b/media-tv/kodi/kodi-19.9999.ebuild @@ -39,7 +39,7 @@ SLOT="0" # use flag is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" +IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -79,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/pillow[${PYTHON_MULTI_USEDEP}] dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] ') - cdio? ( >=dev-libs/libcdio-2.1.0 ) + >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) @@ -242,7 +242,7 @@ src_configure() { -DENABLE_BLUETOOTH=$(usex bluetooth) -DENABLE_BLURAY=$(usex bluray) -DENABLE_CCACHE=OFF - -DENABLE_ISO9660PP=$(usex cdio) + -DENABLE_ISO9660PP=ON -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 68d594537b69..675cf6bbbaf8 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -39,7 +39,7 @@ SLOT="0" # use flag is called libusb so that it doesn't fool people in thinking that # it is _required_ for USB support. Otherwise they'll disable udev and # that's going to be worse. -IUSE="airplay alsa bluetooth bluray caps cdio cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" +IUSE="airplay alsa bluetooth bluray caps cec +css dav1d dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" IUSE="${IUSE} cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon" REQUIRED_USE=" ${PYTHON_REQUIRED_USE} @@ -79,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS} dev-python/pillow[${PYTHON_MULTI_USEDEP}] dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}] ') - cdio? ( >=dev-libs/libcdio-2.1.0 ) + >=dev-libs/libcdio-2.1.0 >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( media-libs/mesa[gbm] ) @@ -242,7 +242,7 @@ src_configure() { -DENABLE_BLUETOOTH=$(usex bluetooth) -DENABLE_BLURAY=$(usex bluray) -DENABLE_CCACHE=OFF - -DENABLE_ISO9660PP=$(usex cdio) + -DENABLE_ISO9660PP=ON -DENABLE_CEC=$(usex cec) -DENABLE_DBUS=$(usex dbus) -DENABLE_DVDCSS=$(usex css) diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml index 81a59deb4e93..a30254b912a9 100644 --- a/media-tv/kodi/metadata.xml +++ b/media-tv/kodi/metadata.xml @@ -9,7 +9,6 @@ enable AirPlay support Enable playback of Blu-ray filesystems Use sys-libs/libcap to bind to privileged ports as non-root - Enable reading of Audio-CD, Video-CD, and CD-ROM disks and images by dev-libs/libcdio Enable support for HDMI-CEC devices via libcec Use the Graphics Buffer Manager for EGL on KMS. Enable support for GLES -- cgit v1.2.3-65-gdbad