Gentoo Archives: gentoo-commits

From: Jory Pratt <anarchy@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/musl:master commit in: media-tv/kodi/
Date: Wed, 03 Feb 2021 15:19:14
Message-Id: 1612365544.2fdb2f1ac295effe383e2c1131b80075c5408010.anarchy@gentoo
1 commit: 2fdb2f1ac295effe383e2c1131b80075c5408010
2 Author: Jory Pratt <anarchy <AT> gentoo <DOT> org>
3 AuthorDate: Wed Feb 3 15:19:04 2021 +0000
4 Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
5 CommitDate: Wed Feb 3 15:19:04 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=2fdb2f1a
7
8 media-tv/kodi: sync with ::gentoo
9
10 Package-Manager: Portage-3.0.14, Repoman-3.0.2
11 Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>
12
13 ...odi-19.0_rc1.ebuild => kodi-19.0_rc1-r2.ebuild} | 31 +++++++++++++++++++---
14 media-tv/kodi/metadata.xml | 5 +++-
15 2 files changed, 32 insertions(+), 4 deletions(-)
16
17 diff --git a/media-tv/kodi/kodi-19.0_rc1.ebuild b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
18 similarity index 86%
19 rename from media-tv/kodi/kodi-19.0_rc1.ebuild
20 rename to media-tv/kodi/kodi-19.0_rc1-r2.ebuild
21 index d190d9d..abda01f 100644
22 --- a/media-tv/kodi/kodi-19.0_rc1.ebuild
23 +++ b/media-tv/kodi/kodi-19.0_rc1-r2.ebuild
24 @@ -39,7 +39,8 @@ SLOT="0"
25 # use flag is called libusb so that it doesn't fool people in thinking that
26 # it is _required_ for USB support. Otherwise they'll disable udev and
27 # that's going to be worse.
28 -IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio raspberry-pi samba systemd +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf"
29 +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"
30 +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"
31 REQUIRED_USE="
32 ${PYTHON_REQUIRED_USE}
33 || ( gles opengl )
34 @@ -49,6 +50,7 @@ REQUIRED_USE="
35 udev? ( !libusb )
36 udisks? ( dbus )
37 upower? ( dbus )
38 + power-control? ( dbus )
39 "
40 RESTRICT="!test? ( test )"
41
42 @@ -88,17 +90,17 @@ COMMON_DEPEND="${PYTHON_DEPS}
43 libusb? ( virtual/libusb:1 )
44 virtual/ttf-fonts
45 media-fonts/roboto
46 - media-libs/dav1d
47 >=media-libs/fontconfig-2.13.1
48 >=media-libs/freetype-2.10.1
49 >=media-libs/libass-0.13.4
50 !raspberry-pi? ( media-libs/mesa[egl] )
51 >=media-libs/taglib-1.11.1
52 system-ffmpeg? (
53 - >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
54 + >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
55 libressl? ( media-video/ffmpeg[libressl,-openssl] )
56 !libressl? ( media-video/ffmpeg[-libressl,openssl] )
57 )
58 + !system-ffmpeg? ( dav1d? ( media-libs/dav1d ) )
59 mysql? ( dev-db/mysql-connector-c:= )
60 mariadb? ( dev-db/mariadb-connector-c:= )
61 >=net-misc/curl-7.68.0[http2]
62 @@ -147,6 +149,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
63 "
64 RDEPEND="${COMMON_DEPEND}
65 lirc? ( app-misc/lirc )
66 + power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
67 udisks? ( sys-fs/udisks:2 )
68 upower? ( sys-power/upower )
69 "
70 @@ -230,7 +233,16 @@ src_configure() {
71 use X && platform+=( x11 )
72 local core_platform_name="${platform[@]}"
73 local mycmakeargs=(
74 + -DENABLE_SSE=$(usex cpu_flags_x86_sse)
75 + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
76 + -DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
77 + -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
78 + -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
79 + -DENABLE_AVX=$(usex cpu_flags_x86_avx)
80 + -DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
81 + -DENABLE_NEON=$(usex cpu_flags_arm_neon)
82 -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
83 + -DVERBOSE=ON
84 -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
85 -DENABLE_ALSA=$(usex alsa)
86 -DENABLE_AIRTUNES=$(usex airplay)
87 @@ -238,18 +250,25 @@ src_configure() {
88 -DENABLE_BLUETOOTH=$(usex bluetooth)
89 -DENABLE_BLURAY=$(usex bluray)
90 -DENABLE_CCACHE=OFF
91 + -DENABLE_ISO9660PP=ON
92 -DENABLE_CEC=$(usex cec)
93 -DENABLE_DBUS=$(usex dbus)
94 -DENABLE_DVDCSS=$(usex css)
95 -DENABLE_INTERNAL_CROSSGUID=OFF
96 + -DENABLE_INTERNAL_RapidJSON=OFF
97 + -DENABLE_INTERNAL_FMT=OFF
98 -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
99 -DENABLE_INTERNAL_FSTRCMP=OFF
100 + -DENABLE_INTERNAL_FLATBUFFERS=OFF
101 + -DENABLE_INTERNAL_DAV1D=OFF
102 -DENABLE_INTERNAL_GTEST=OFF
103 -DENABLE_INTERNAL_UDFREAD=OFF
104 + -DENABLE_INTERNAL_SPDLOG=OFF
105 -DENABLE_CAP=$(usex caps)
106 -DENABLE_LCMS2=$(usex lcms)
107 -DENABLE_LIRCCLIENT=$(usex lirc)
108 -DENABLE_MARIADBCLIENT=$(usex mariadb)
109 + -DENABLE_MDNS=OFF # used only on Android
110 -DENABLE_MICROHTTPD=$(usex webserver)
111 -DENABLE_MYSQLCLIENT=$(usex mysql)
112 -DENABLE_NFS=$(usex nfs)
113 @@ -259,6 +278,7 @@ src_configure() {
114 -DENABLE_PLIST=$(usex airplay)
115 -DENABLE_PULSEAUDIO=$(usex pulseaudio)
116 -DENABLE_SMBCLIENT=$(usex samba)
117 + -DENABLE_SNDIO=OFF
118 -DENABLE_TESTING=$(usex test)
119 -DENABLE_UDEV=$(usex udev)
120 -DENABLE_UDFREAD=$(usex udf)
121 @@ -283,6 +303,11 @@ src_configure() {
122 mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
123 fi
124
125 + if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
126 + CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
127 + CXXFLAGS+=' -DNDEBUG'
128 + fi
129 +
130 cmake_src_configure
131 }
132
133
134 diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml
135 index 1fa46ec..a30254b 100644
136 --- a/media-tv/kodi/metadata.xml
137 +++ b/media-tv/kodi/metadata.xml
138 @@ -8,13 +8,16 @@
139 <use>
140 <flag name="airplay">enable AirPlay support</flag>
141 <flag name="bluray">Enable playback of Blu-ray filesystems</flag>
142 + <flag name="caps">Use <pkg>sys-libs/libcap</pkg> to bind to privileged ports as non-root</flag>
143 <flag name="cec">Enable support for HDMI-CEC devices via libcec</flag>
144 <flag name="gbm">Use the Graphics Buffer Manager for EGL on KMS.</flag>
145 <flag name="gles">Enable support for GLES</flag>
146 - <flag name="lirc">Enable support for controlling Totem with a remote control using <pkg>app-misc/lirc</pkg></flag>
147 + <flag name="lirc">Enable support for IR remote controls using <pkg>app-misc/lirc</pkg></flag>
148 <flag name="mariadb">Add MariaDB support</flag>
149 + <flag name="dav1d">Enables AV1 decoding via <pkg>media-libs/dav1d</pkg></flag>
150 <flag name="nfs">Enable NFS client support</flag>
151 <flag name="dvd">Enable optical (CD/DVD drive) support</flag>
152 + <flag name="power-control">Enable control of shutdown, reboot, suspend, and hibernate</flag>
153 <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag>
154 <flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag>
155 <flag name="libusb">Use <pkg>virtual/libusb</pkg> for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag>