| 1 |
commit: 63cac960d501ac6cea62e1f52a2449a6bb8fac88 |
| 2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Jul 3 19:03:08 2019 +0000 |
| 4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Jul 4 13:32:58 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63cac960 |
| 7 |
|
| 8 |
media-tv/kodi: Add raspberry-pi USE flag |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/686686 |
| 11 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
| 12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
| 13 |
|
| 14 |
media-tv/kodi/kodi-18.3-r1.ebuild | 19 ++++++++++++++----- |
| 15 |
media-tv/kodi/kodi-9999.ebuild | 19 ++++++++++++++----- |
| 16 |
media-tv/kodi/metadata.xml | 1 + |
| 17 |
profiles/arch/arm/package.use.mask | 4 ++++ |
| 18 |
profiles/arch/base/package.use.mask | 5 +++++ |
| 19 |
5 files changed, 38 insertions(+), 10 deletions(-) |
| 20 |
|
| 21 |
diff --git a/media-tv/kodi/kodi-18.3-r1.ebuild b/media-tv/kodi/kodi-18.3-r1.ebuild |
| 22 |
index b2ca5cae2d3..83375bd4ab1 100644 |
| 23 |
--- a/media-tv/kodi/kodi-18.3-r1.ebuild |
| 24 |
+++ b/media-tv/kodi/kodi-18.3-r1.ebuild |
| 25 |
@@ -41,11 +41,11 @@ SLOT="0" |
| 26 |
# use flag is called libusb so that it doesn't fool people in thinking that |
| 27 |
# it is _required_ for USB support. Otherwise they'll disable udev and |
| 28 |
# that's going to be worse. |
| 29 |
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 30 |
+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 +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 31 |
REQUIRED_USE=" |
| 32 |
${PYTHON_REQUIRED_USE} |
| 33 |
|| ( gles opengl ) |
| 34 |
- ^^ ( gbm wayland X ) |
| 35 |
+ ^^ ( gbm raspberry-pi wayland X ) |
| 36 |
?? ( mariadb mysql ) |
| 37 |
udev? ( !libusb ) |
| 38 |
udisks? ( dbus ) |
| 39 |
@@ -66,7 +66,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 40 |
dev-libs/expat |
| 41 |
dev-libs/flatbuffers |
| 42 |
>=dev-libs/fribidi-0.19.7 |
| 43 |
- cec? ( >=dev-libs/libcec-4.0 ) |
| 44 |
+ cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) |
| 45 |
dev-libs/libpcre[cxx] |
| 46 |
>=dev-libs/libinput-1.10.5 |
| 47 |
>=dev-libs/libxml2-2.9.4 |
| 48 |
@@ -78,7 +78,9 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 49 |
>=dev-libs/libfmt-3.0.1 |
| 50 |
dev-libs/libfstrcmp |
| 51 |
gbm? ( media-libs/mesa[gbm] ) |
| 52 |
- gles? ( media-libs/mesa[gles2] ) |
| 53 |
+ gles? ( |
| 54 |
+ !raspberry-pi? ( media-libs/mesa[gles2] ) |
| 55 |
+ ) |
| 56 |
lcms? ( media-libs/lcms:2 ) |
| 57 |
libusb? ( virtual/libusb:1 ) |
| 58 |
virtual/ttf-fonts |
| 59 |
@@ -86,7 +88,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 60 |
>=media-libs/fontconfig-2.12.4 |
| 61 |
>=media-libs/freetype-2.8 |
| 62 |
>=media-libs/libass-0.13.4 |
| 63 |
- media-libs/mesa[egl] |
| 64 |
+ !raspberry-pi? ( media-libs/mesa[egl] ) |
| 65 |
>=media-libs/taglib-1.11.1 |
| 66 |
system-ffmpeg? ( |
| 67 |
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] |
| 68 |
@@ -100,6 +102,9 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 69 |
opengl? ( media-libs/glu ) |
| 70 |
!libressl? ( >=dev-libs/openssl-1.0.2l:0= ) |
| 71 |
libressl? ( dev-libs/libressl:0= ) |
| 72 |
+ raspberry-pi? ( |
| 73 |
+ || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) |
| 74 |
+ ) |
| 75 |
pulseaudio? ( media-sound/pulseaudio ) |
| 76 |
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
| 77 |
>=sys-libs/zlib-1.2.11 |
| 78 |
@@ -277,6 +282,10 @@ src_configure() { |
| 79 |
) |
| 80 |
fi |
| 81 |
|
| 82 |
+ if use raspberry-pi; then |
| 83 |
+ mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) |
| 84 |
+ fi |
| 85 |
+ |
| 86 |
if use X; then |
| 87 |
mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" ) |
| 88 |
fi |
| 89 |
|
| 90 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild |
| 91 |
index b2ca5cae2d3..83375bd4ab1 100644 |
| 92 |
--- a/media-tv/kodi/kodi-9999.ebuild |
| 93 |
+++ b/media-tv/kodi/kodi-9999.ebuild |
| 94 |
@@ -41,11 +41,11 @@ SLOT="0" |
| 95 |
# use flag is called libusb so that it doesn't fool people in thinking that |
| 96 |
# it is _required_ for USB support. Otherwise they'll disable udev and |
| 97 |
# that's going to be worse. |
| 98 |
-IUSE="airplay alsa bluetooth bluray caps cec +css dbus dvd gbm gles lcms libressl libusb lirc mariadb mysql nfs +opengl pulseaudio samba systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 99 |
+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 +udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf" |
| 100 |
REQUIRED_USE=" |
| 101 |
${PYTHON_REQUIRED_USE} |
| 102 |
|| ( gles opengl ) |
| 103 |
- ^^ ( gbm wayland X ) |
| 104 |
+ ^^ ( gbm raspberry-pi wayland X ) |
| 105 |
?? ( mariadb mysql ) |
| 106 |
udev? ( !libusb ) |
| 107 |
udisks? ( dbus ) |
| 108 |
@@ -66,7 +66,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 109 |
dev-libs/expat |
| 110 |
dev-libs/flatbuffers |
| 111 |
>=dev-libs/fribidi-0.19.7 |
| 112 |
- cec? ( >=dev-libs/libcec-4.0 ) |
| 113 |
+ cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) |
| 114 |
dev-libs/libpcre[cxx] |
| 115 |
>=dev-libs/libinput-1.10.5 |
| 116 |
>=dev-libs/libxml2-2.9.4 |
| 117 |
@@ -78,7 +78,9 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 118 |
>=dev-libs/libfmt-3.0.1 |
| 119 |
dev-libs/libfstrcmp |
| 120 |
gbm? ( media-libs/mesa[gbm] ) |
| 121 |
- gles? ( media-libs/mesa[gles2] ) |
| 122 |
+ gles? ( |
| 123 |
+ !raspberry-pi? ( media-libs/mesa[gles2] ) |
| 124 |
+ ) |
| 125 |
lcms? ( media-libs/lcms:2 ) |
| 126 |
libusb? ( virtual/libusb:1 ) |
| 127 |
virtual/ttf-fonts |
| 128 |
@@ -86,7 +88,7 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 129 |
>=media-libs/fontconfig-2.12.4 |
| 130 |
>=media-libs/freetype-2.8 |
| 131 |
>=media-libs/libass-0.13.4 |
| 132 |
- media-libs/mesa[egl] |
| 133 |
+ !raspberry-pi? ( media-libs/mesa[egl] ) |
| 134 |
>=media-libs/taglib-1.11.1 |
| 135 |
system-ffmpeg? ( |
| 136 |
>=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] |
| 137 |
@@ -100,6 +102,9 @@ COMMON_DEPEND="${PYTHON_DEPS} |
| 138 |
opengl? ( media-libs/glu ) |
| 139 |
!libressl? ( >=dev-libs/openssl-1.0.2l:0= ) |
| 140 |
libressl? ( dev-libs/libressl:0= ) |
| 141 |
+ raspberry-pi? ( |
| 142 |
+ || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl,gles2,vc4] ) |
| 143 |
+ ) |
| 144 |
pulseaudio? ( media-sound/pulseaudio ) |
| 145 |
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) |
| 146 |
>=sys-libs/zlib-1.2.11 |
| 147 |
@@ -277,6 +282,10 @@ src_configure() { |
| 148 |
) |
| 149 |
fi |
| 150 |
|
| 151 |
+ if use raspberry-pi; then |
| 152 |
+ mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" ) |
| 153 |
+ fi |
| 154 |
+ |
| 155 |
if use X; then |
| 156 |
mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" ) |
| 157 |
fi |
| 158 |
|
| 159 |
diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml |
| 160 |
index 47c36082ac5..2ddce679368 100644 |
| 161 |
--- a/media-tv/kodi/metadata.xml |
| 162 |
+++ b/media-tv/kodi/metadata.xml |
| 163 |
@@ -16,6 +16,7 @@ |
| 164 |
<flag name="nfs">Enable NFS client support</flag> |
| 165 |
<flag name="nonfree">Enable non-free components</flag> |
| 166 |
<flag name="dvd">Enable optical (CD/DVD drive) support</flag> |
| 167 |
+ <flag name="raspberry-pi">Enable support for the Raspberry Pi</flag> |
| 168 |
<flag name="sftp">Support browsing files over SFTP</flag> |
| 169 |
<flag name="system-ffmpeg">Use system ffmpeg instead of the bundled one</flag> |
| 170 |
<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> |
| 171 |
|
| 172 |
diff --git a/profiles/arch/arm/package.use.mask b/profiles/arch/arm/package.use.mask |
| 173 |
index b9cdb8f5252..a05a9ba416c 100644 |
| 174 |
--- a/profiles/arch/arm/package.use.mask |
| 175 |
+++ b/profiles/arch/arm/package.use.mask |
| 176 |
@@ -1,6 +1,10 @@ |
| 177 |
# Copyright 1999-2019 Gentoo Authors |
| 178 |
# Distributed under the terms of the GNU General Public License v2 |
| 179 |
|
| 180 |
+# Craig Andrews <candrews@g.o> (2019-07-03) |
| 181 |
+# Unmask Raspberry Pi support on arm. |
| 182 |
+media-tv/kodi -raspberry-pi |
| 183 |
+ |
| 184 |
# Matt Turner <mattst88@g.o> (2019-06-20) |
| 185 |
# dev-lang/spidermonkey:60[jit] fails to build on most platforms, but does |
| 186 |
# build on arm. |
| 187 |
|
| 188 |
diff --git a/profiles/arch/base/package.use.mask b/profiles/arch/base/package.use.mask |
| 189 |
index 32d1113a65e..2215c435345 100644 |
| 190 |
--- a/profiles/arch/base/package.use.mask |
| 191 |
+++ b/profiles/arch/base/package.use.mask |
| 192 |
@@ -1,6 +1,11 @@ |
| 193 |
# Copyright 1999-2019 Gentoo Authors |
| 194 |
# Distributed under the terms of the GNU General Public License v2 |
| 195 |
|
| 196 |
+# Craig Andrews <candrews@g.o> (2019-07-03) |
| 197 |
+# Raspberry Pi support is only available on arm. |
| 198 |
+# Mask raspberry-pi USE globally, unmask on arm. |
| 199 |
+media-tv/kodi raspberry-pi |
| 200 |
+ |
| 201 |
# Georgy Yakovlev <gyakovlev@g.o> (2019-06-22) |
| 202 |
# mask javafx until it's keyworded on other arches |
| 203 |
dev-java/openjdk:11 javafx |
Archives