Gentoo Archives: gentoo-commits

From: Craig Andrews <candrews@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/
Date: Tue, 02 Feb 2021 19:37:24
Message-Id: 1612294635.7c306a9a2732eeb192c0fc994a91f6753279138a.candrews@gentoo
1 commit: 7c306a9a2732eeb192c0fc994a91f6753279138a
2 Author: Karlson2k (Evgeny Grin) <k2k <AT> narod <DOT> ru>
3 AuthorDate: Tue Feb 2 19:14:04 2021 +0000
4 Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 2 19:37:15 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7c306a9a
7
8 media-tv/kodi: marked libcdio is required dependency
9
10 Kodi build system ignores user settings for libcdio.
11
12 Closes: https://bugs.gentoo.org/768294
13 Signed-off-by: Karlson2k (Evgeny Grin) <k2k <AT> narod.ru>
14 Closes: https://github.com/gentoo/gentoo/pull/19309
15 Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
16
17 media-tv/kodi/kodi-19.0_rc1-r2.ebuild | 6 +++---
18 media-tv/kodi/kodi-19.9999.ebuild | 6 +++---
19 media-tv/kodi/kodi-9999.ebuild | 6 +++---
20 media-tv/kodi/metadata.xml | 1 -
21 4 files changed, 9 insertions(+), 10 deletions(-)
22
23 diff --git a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
24 index 68d594537b6..675cf6bbbaf 100644
25 --- a/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
26 +++ b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
27 @@ -39,7 +39,7 @@ SLOT="0"
28 # use flag is called libusb so that it doesn't fool people in thinking that
29 # it is _required_ for USB support. Otherwise they'll disable udev and
30 # that's going to be worse.
31 -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"
32 +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"
33 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"
34 REQUIRED_USE="
35 ${PYTHON_REQUIRED_USE}
36 @@ -79,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
37 dev-python/pillow[${PYTHON_MULTI_USEDEP}]
38 dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
39 ')
40 - cdio? ( >=dev-libs/libcdio-2.1.0 )
41 + >=dev-libs/libcdio-2.1.0
42 >=dev-libs/libfmt-6.1.2
43 dev-libs/libfstrcmp
44 gbm? ( media-libs/mesa[gbm] )
45 @@ -242,7 +242,7 @@ src_configure() {
46 -DENABLE_BLUETOOTH=$(usex bluetooth)
47 -DENABLE_BLURAY=$(usex bluray)
48 -DENABLE_CCACHE=OFF
49 - -DENABLE_ISO9660PP=$(usex cdio)
50 + -DENABLE_ISO9660PP=ON
51 -DENABLE_CEC=$(usex cec)
52 -DENABLE_DBUS=$(usex dbus)
53 -DENABLE_DVDCSS=$(usex css)
54
55 diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild
56 index 68d594537b6..675cf6bbbaf 100644
57 --- a/media-tv/kodi/kodi-19.9999.ebuild
58 +++ b/media-tv/kodi/kodi-19.9999.ebuild
59 @@ -39,7 +39,7 @@ SLOT="0"
60 # use flag is called libusb so that it doesn't fool people in thinking that
61 # it is _required_ for USB support. Otherwise they'll disable udev and
62 # that's going to be worse.
63 -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"
64 +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"
65 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"
66 REQUIRED_USE="
67 ${PYTHON_REQUIRED_USE}
68 @@ -79,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
69 dev-python/pillow[${PYTHON_MULTI_USEDEP}]
70 dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
71 ')
72 - cdio? ( >=dev-libs/libcdio-2.1.0 )
73 + >=dev-libs/libcdio-2.1.0
74 >=dev-libs/libfmt-6.1.2
75 dev-libs/libfstrcmp
76 gbm? ( media-libs/mesa[gbm] )
77 @@ -242,7 +242,7 @@ src_configure() {
78 -DENABLE_BLUETOOTH=$(usex bluetooth)
79 -DENABLE_BLURAY=$(usex bluray)
80 -DENABLE_CCACHE=OFF
81 - -DENABLE_ISO9660PP=$(usex cdio)
82 + -DENABLE_ISO9660PP=ON
83 -DENABLE_CEC=$(usex cec)
84 -DENABLE_DBUS=$(usex dbus)
85 -DENABLE_DVDCSS=$(usex css)
86
87 diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
88 index 68d594537b6..675cf6bbbaf 100644
89 --- a/media-tv/kodi/kodi-9999.ebuild
90 +++ b/media-tv/kodi/kodi-9999.ebuild
91 @@ -39,7 +39,7 @@ SLOT="0"
92 # use flag is called libusb so that it doesn't fool people in thinking that
93 # it is _required_ for USB support. Otherwise they'll disable udev and
94 # that's going to be worse.
95 -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"
96 +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"
97 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"
98 REQUIRED_USE="
99 ${PYTHON_REQUIRED_USE}
100 @@ -79,7 +79,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
101 dev-python/pillow[${PYTHON_MULTI_USEDEP}]
102 dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
103 ')
104 - cdio? ( >=dev-libs/libcdio-2.1.0 )
105 + >=dev-libs/libcdio-2.1.0
106 >=dev-libs/libfmt-6.1.2
107 dev-libs/libfstrcmp
108 gbm? ( media-libs/mesa[gbm] )
109 @@ -242,7 +242,7 @@ src_configure() {
110 -DENABLE_BLUETOOTH=$(usex bluetooth)
111 -DENABLE_BLURAY=$(usex bluray)
112 -DENABLE_CCACHE=OFF
113 - -DENABLE_ISO9660PP=$(usex cdio)
114 + -DENABLE_ISO9660PP=ON
115 -DENABLE_CEC=$(usex cec)
116 -DENABLE_DBUS=$(usex dbus)
117 -DENABLE_DVDCSS=$(usex css)
118
119 diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
120 index 81a59deb4e9..a30254b912a 100644
121 --- a/media-tv/kodi/metadata.xml
122 +++ b/media-tv/kodi/metadata.xml
123 @@ -9,7 +9,6 @@
124 <flag name="airplay">enable AirPlay support</flag>
125 <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
126 <flag name="caps">Use <pkg>sys-libs/libcap</pkg> to bind to privileged ports as non-root</flag>
127 - <flag name="cdio">Enable reading of Audio-CD, Video-CD, and CD-ROM disks and images by <pkg>dev-libs/libcdio</pkg></flag>
128 <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
129 <flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag>
130 <flag name="gles">Enable support for GLES</flag>