* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2017-01-10 15:07 David Seifert
0 siblings, 0 replies; 15+ messages in thread
From: David Seifert @ 2017-01-10 15:07 UTC (permalink / raw
To: gentoo-commits
commit: 2e9b30910afbcb83b21a563be618cff2219af229
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Tue Jan 10 03:13:35 2017 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Tue Jan 10 15:07:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e9b3091
media-tv/kodi: fix building with USE="-java"
Closes: https://github.com/gentoo/gentoo/pull/3410
media-tv/kodi/files/kodi-cmake-no-java.patch | 56 ++++++++++++++++++++++++++++
media-tv/kodi/kodi-17.0_rc2.ebuild | 54 +++++++++++++++------------
media-tv/kodi/kodi-9999.ebuild | 54 +++++++++++++++------------
3 files changed, 118 insertions(+), 46 deletions(-)
diff --git a/media-tv/kodi/files/kodi-cmake-no-java.patch b/media-tv/kodi/files/kodi-cmake-no-java.patch
new file mode 100644
index 00000000..2d965ab
--- /dev/null
+++ b/media-tv/kodi/files/kodi-cmake-no-java.patch
@@ -0,0 +1,56 @@
+diff --git a/xbmc/interfaces/swig/CMakeLists.txt b/xbmc/interfaces/swig/CMakeLists.txt
+index 6e676159eb..d45a2ecbab 100644
+--- a/xbmc/interfaces/swig/CMakeLists.txt
++++ b/xbmc/interfaces/swig/CMakeLists.txt
+@@ -1,43 +1,21 @@
+ function(generate_file file)
+- set(classpath ${GROOVY_DIR}/groovy-all-${GROOVY_VER}.jar
+- ${GROOVY_DIR}/commons-lang-${COMMONS_VER}.jar
+- ${CORE_SOURCE_DIR}/tools/codegenerator
+- ${CMAKE_CURRENT_SOURCE_DIR}/../python)
+- if(NOT CORE_SYSTEM_NAME STREQUAL windows)
+- set(devnull "/dev/null")
+- string(REPLACE ";" ":" classpath "${classpath}")
+- else()
+- set(devnull "nul")
+- endif()
+-
+- set(CPP_FILE ${file}.cpp)
+- add_custom_command(OUTPUT ${CPP_FILE}
+- COMMAND ${SWIG_EXECUTABLE}
+- ARGS -w401 -c++ -o ${file}.xml -xml -I${CORE_SOURCE_DIR}/xbmc -xmllang python ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file}
+- COMMAND ${Java_JAVA_EXECUTABLE}
+- ARGS -cp "${classpath}" groovy.ui.GroovyMain ${CORE_SOURCE_DIR}/tools/codegenerator/Generator.groovy ${file}.xml ${CMAKE_CURRENT_SOURCE_DIR}/../python/PythonSwig.cpp.template ${file}.cpp > ${devnull}
+- DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/../swig/${file})
++ set(CPP_FILE ${CORE_SOURCE_DIR}/xbmc/interfaces/python/generated/${file}.cpp)
+ set(SOURCES ${SOURCES} "${CPP_FILE}" PARENT_SCOPE)
+ endfunction()
+
+-find_package(Java COMPONENTS Runtime REQUIRED)
+ find_package(SWIG REQUIRED)
+
+ # The generated bindings
+-set(INPUTS AddonModuleXbmcaddon.i
+- AddonModuleXbmcgui.i
+- AddonModuleXbmc.i
+- AddonModuleXbmcplugin.i
+- AddonModuleXbmcvfs.i
+- AddonModuleXbmcwsgi.i)
+-
+-set(GROOVY_DIR ${CORE_SOURCE_DIR}/tools/codegenerator/groovy)
+-set(GROOVY_VER 2.4.4)
+-set(COMMONS_VER 2.6)
++set(INPUTS AddonModuleXbmcaddon
++ AddonModuleXbmcgui
++ AddonModuleXbmc
++ AddonModuleXbmcplugin
++ AddonModuleXbmcvfs
++ AddonModuleXbmcwsgi)
+
+ foreach(INPUT IN LISTS INPUTS)
+ generate_file(${INPUT})
+- list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.cpp)
++ list(APPEND GEN_SRCS ${CMAKE_CURRENT_BINARY_DIR}/${INPUT}.i.cpp)
+ endforeach()
+
+ add_library(python_binding STATIC ${SOURCES})
diff --git a/media-tv/kodi/kodi-17.0_rc2.ebuild b/media-tv/kodi/kodi-17.0_rc2.ebuild
index 632eaad..cf1ad1b 100644
--- a/media-tv/kodi/kodi-17.0_rc2.ebuild
+++ b/media-tv/kodi/kodi-17.0_rc2.ebuild
@@ -17,24 +17,6 @@ CODENAME="Krypton"
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-case ${PV} in
-9999)
- EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
- inherit git-r3
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="~amd64 ~x86"
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
@@ -44,7 +26,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 cec +css dbus debug dvd gles java libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( gles opengl )
@@ -127,7 +109,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/crossguid
dev-util/cmake
dev-util/gperf
- java? ( virtual/jre )
media-libs/giflib
>=media-libs/libjpeg-turbo-1.5.1:=
>=media-libs/libpng-1.6.26:0=
@@ -135,9 +116,33 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
x86? ( dev-lang/nasm )
"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package. #488118
-[[ ${PV} == 9999 ]] && DEPEND+=" virtual/jre"
+case ${PV} in
+9999)
+ EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+ inherit git-r3
+ # Force java for latest git version to avoid having to hand maintain the
+ # generated addons package. #488118
+ DEPEND+="
+ virtual/jre
+ "
+ ;;
+*)
+ MY_PV=${PV/_p/_r}
+ MY_PV=${MY_PV/_alpha/a}
+ MY_PV=${MY_PV/_beta/b}
+ MY_PV=${MY_PV/_rc/rc}
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+ !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+ KEYWORDS="~amd64 ~x86"
+ IUSE+=" java"
+ DEPEND+="
+ java? ( virtual/jre )
+ "
+
+ S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+ ;;
+esac
CONFIG_CHECK="~IP_MULTICAST"
ERROR_IP_MULTICAST="
@@ -153,6 +158,9 @@ pkg_setup() {
}
src_prepare() {
+ if in_iuse java && use !java; then
+ eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+ fi
cmake-utils_src_prepare
# avoid long delays when powerkit isn't running #348580
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index c79997c..769a097 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -17,24 +17,6 @@ CODENAME="Krypton"
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
-case ${PV} in
-9999)
- EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
- inherit git-r3
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="~amd64 ~x86"
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
@@ -44,7 +26,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 cec +css dbus debug dvd gles java libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+IUSE="airplay alsa bluetooth bluray caps cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl +ssl pulseaudio samba sftp test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
REQUIRED_USE="
${PYTHON_REQUIRED_USE}
|| ( gles opengl )
@@ -127,7 +109,6 @@ DEPEND="${COMMON_DEPEND}
dev-libs/crossguid
dev-util/cmake
dev-util/gperf
- java? ( virtual/jre )
media-libs/giflib
>=media-libs/libjpeg-turbo-1.5.1:=
>=media-libs/libpng-1.6.26:0=
@@ -135,9 +116,33 @@ DEPEND="${COMMON_DEPEND}
virtual/pkgconfig
x86? ( dev-lang/nasm )
"
-# Force java for latest git version to avoid having to hand maintain the
-# generated addons package. #488118
-[[ ${PV} == 9999 ]] && DEPEND+=" virtual/jre"
+case ${PV} in
+9999)
+ EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+ inherit git-r3
+ # Force java for latest git version to avoid having to hand maintain the
+ # generated addons package. #488118
+ DEPEND+="
+ virtual/jre
+ "
+ ;;
+*)
+ MY_PV=${PV/_p/_r}
+ MY_PV=${MY_PV/_alpha/a}
+ MY_PV=${MY_PV/_beta/b}
+ MY_PV=${MY_PV/_rc/rc}
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+ !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+ KEYWORDS="~amd64 ~x86"
+ IUSE+=" java"
+ DEPEND+="
+ java? ( virtual/jre )
+ "
+
+ S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+ ;;
+esac
CONFIG_CHECK="~IP_MULTICAST"
ERROR_IP_MULTICAST="
@@ -151,6 +156,9 @@ pkg_setup() {
}
src_prepare() {
+ if in_iuse java && use !java; then
+ eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+ fi
cmake-utils_src_prepare
# avoid long delays when powerkit isn't running #348580
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2017-07-11 21:54 Michał Górny
0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2017-07-11 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 28aa98a74131809706a3b57d26d0842ef5933cb6
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Sun Jul 9 01:54:34 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 21:54:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=28aa98a7
media-tv/kodi: Fix ‘string’ was not declared in this scope #624280
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../kodi/files/kodi-17.3-ftpparse_string.patch | 82 ++++++++++++++++++++++
media-tv/kodi/kodi-17.3.ebuild | 3 +
2 files changed, 85 insertions(+)
diff --git a/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch b/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
new file mode 100644
index 00000000000..da8d57a3d6b
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.3-ftpparse_string.patch
@@ -0,0 +1,82 @@
+From 634153c85115b44015cdb1ddd6263f5a87e4e41b Mon Sep 17 00:00:00 2001
+From: Stefan Saraev <stefan@saraev.ca>
+Date: Sun, 7 May 2017 17:30:47 +0300
+Subject: [PATCH] FTPParse.cpp: use std::string
+
+---
+ xbmc/filesystem/FTPParse.cpp | 44 ++++++++++++++++++++++----------------------
+ 1 file changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/xbmc/filesystem/FTPParse.cpp b/xbmc/filesystem/FTPParse.cpp
+index 8dd9633ae19e..d78349adb580 100644
+--- a/xbmc/filesystem/FTPParse.cpp
++++ b/xbmc/filesystem/FTPParse.cpp
+@@ -30,7 +30,7 @@ CFTPParse::CFTPParse()
+ m_time = 0;
+ }
+
+-string CFTPParse::getName()
++std::string CFTPParse::getName()
+ {
+ return m_name;
+ }
+@@ -55,16 +55,16 @@ time_t CFTPParse::getTime()
+ return m_time;
+ }
+
+-void CFTPParse::setTime(string str)
++void CFTPParse::setTime(std::string str)
+ {
+ /* Variables used to capture patterns via the regexes */
+- string month;
+- string day;
+- string year;
+- string hour;
+- string minute;
+- string second;
+- string am_or_pm;
++ std::string month;
++ std::string day;
++ std::string year;
++ std::string hour;
++ std::string minute;
++ std::string second;
++ std::string am_or_pm;
+
+ /* time struct used to set the time_t variable */
+ struct tm time_struct = {};
+@@ -334,21 +334,21 @@ int CFTPParse::getDayOfWeek(int month, int date, int year)
+ return day_of_week;
+ }
+
+-int CFTPParse::FTPParse(string str)
++int CFTPParse::FTPParse(std::string str)
+ {
+ /* Various variable to capture patterns via the regexes */
+- string permissions;
+- string link_count;
+- string owner;
+- string group;
+- string size;
+- string date;
+- string name;
+- string type;
+- string stuff;
+- string facts;
+- string version;
+- string file_id;
++ std::string permissions;
++ std::string link_count;
++ std::string owner;
++ std::string group;
++ std::string size;
++ std::string date;
++ std::string name;
++ std::string type;
++ std::string stuff;
++ std::string facts;
++ std::string version;
++ std::string file_id;
+
+ /* Regex for standard Unix listing formats */
+ pcrecpp::RE unix_re("^([-bcdlps])" // type
diff --git a/media-tv/kodi/kodi-17.3.ebuild b/media-tv/kodi/kodi-17.3.ebuild
index aa7fc74b28b..2f1e876a97c 100644
--- a/media-tv/kodi/kodi-17.3.ebuild
+++ b/media-tv/kodi/kodi-17.3.ebuild
@@ -14,6 +14,9 @@ LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
FFMPEG_VERSION="3.1.6"
CODENAME="Krypton"
+PATCHES=(
+ "${FILESDIR}/${P}-ftpparse_string.patch"
+)
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2017-07-11 21:54 Michał Górny
0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2017-07-11 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 78bdbdb57cefd63c573530c424c41ad411bbe467
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Sun Jun 25 20:49:15 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 21:54:22 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=78bdbdb5
media-tv/kodi: add -17.3-r2 fixing 10 bit h.265 playback #622634
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../kodi-17.3-10-bit-h265-hardware-decoding.patch | 28 ++
media-tv/kodi/kodi-17.3-r2.ebuild | 286 +++++++++++++++++++++
2 files changed, 314 insertions(+)
diff --git a/media-tv/kodi/files/kodi-17.3-10-bit-h265-hardware-decoding.patch b/media-tv/kodi/files/kodi-17.3-10-bit-h265-hardware-decoding.patch
new file mode 100644
index 00000000000..792a1e0cd5c
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.3-10-bit-h265-hardware-decoding.patch
@@ -0,0 +1,28 @@
+From e1c9ffaaddb5e7d114cc6ed363e00df22c6fc344 Mon Sep 17 00:00:00 2001
+From: fritsch <Peter.Fruehberger@gmail.com>
+Date: Sun, 25 Jun 2017 18:40:59 +0200
+Subject: [PATCH] VAAPI: Explicitely don't open for hevc 10 bit. Some distros
+ package systemwide ffmpeg and their users en up with a black screen for that
+ kind of videos. As kodi krypton is meant to be used with ffmpeg 3.1 this is
+ not needed for us.
+
+---
+ xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+index ed27cbbb6ec9..2f6502561de8 100644
+--- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
++++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
+@@ -558,6 +558,11 @@ bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum A
+ }
+ case AV_CODEC_ID_HEVC:
+ {
++ // for distributions using far newer ffmpeg
++ // not available when Krypton was released
++ if (avctx->profile == FF_PROFILE_HEVC_MAIN_10)
++ return false;
++
+ profile = VAProfileHEVCMain;
+ if (!m_vaapiConfig.context->SupportsProfile(profile))
+ return false;
diff --git a/media-tv/kodi/kodi-17.3-r2.ebuild b/media-tv/kodi/kodi-17.3-r2.ebuild
new file mode 100644
index 00000000000..e1d233e708f
--- /dev/null
+++ b/media-tv/kodi/kodi-17.3-r2.ebuild
@@ -0,0 +1,286 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.6"
+CODENAME="Krypton"
+PATCHES=(
+ "${FILESDIR}/${P}-ftpparse_string.patch"
+ "${FILESDIR}/${P}-unrar-vulnerability.patch"
+ "${FILESDIR}/${P}-10-bit-h265-hardware-decoding.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+ https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+ https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+ !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+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 cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( gles opengl )
+ gles? ( X )
+ opengl? ( X )
+ udev? ( !libusb )
+ udisks? ( dbus )
+ upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ airplay? (
+ app-pda/libplist
+ net-libs/shairplay
+ )
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez )
+ bluray? ( >=media-libs/libbluray-0.7.0 )
+ caps? ( sys-libs/libcap )
+ dbus? ( sys-apps/dbus )
+ dev-db/sqlite
+ dev-libs/expat
+ dev-libs/fribidi
+ cec? ( >=dev-libs/libcec-4.0 )
+ dev-libs/libpcre[cxx]
+ dev-libs/libxml2
+ >=dev-libs/lzo-2.04
+ dev-libs/tinyxml[stl]
+ >=dev-libs/yajl-2
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-libs/libcdio
+ gles? ( media-libs/mesa[gles2] )
+ libusb? ( virtual/libusb:1 )
+ media-fonts/corefonts
+ >=media-fonts/noto-20160531
+ media-fonts/roboto
+ media-libs/fontconfig
+ media-libs/freetype
+ >=media-libs/libass-0.13.4
+ media-libs/mesa[egl]
+ >=media-libs/taglib-1.11.1
+ system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
+ mysql? ( virtual/mysql )
+ >=net-misc/curl-7.51.0
+ nfs? ( net-fs/libnfs:= )
+ opengl? ( media-libs/glu )
+ !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+ libressl? ( dev-libs/libressl:0= )
+ pulseaudio? ( media-sound/pulseaudio )
+ samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+ sftp? ( net-libs/libssh[sftp] )
+ sys-libs/zlib
+ udev? ( virtual/udev )
+ vaapi? ( x11-libs/libva[opengl] )
+ vdpau? (
+ || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+ system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+ )
+ webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+ X? (
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ )
+ xslt? ( dev-libs/libxslt )
+ zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+ lirc? (
+ || ( app-misc/lirc app-misc/inputlircd )
+ )
+ !media-tv/xbmc
+ udisks? ( sys-fs/udisks:0 )
+ upower? (
+ systemd? ( sys-power/upower )
+ !systemd? (
+ || ( sys-power/upower-pm-utils sys-power/upower )
+ )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/bzip2
+ app-arch/unzip
+ app-arch/xz-utils
+ app-arch/zip
+ dev-lang/swig
+ dev-libs/crossguid
+ dev-util/cmake
+ dev-util/gperf
+ media-libs/giflib
+ >=media-libs/libjpeg-turbo-1.5.1:=
+ >=media-libs/libpng-1.6.26:0=
+ test? ( dev-cpp/gtest )
+ virtual/pkgconfig
+ x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+ EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+ inherit git-r3
+ # Force java for latest git version to avoid having to hand maintain the
+ # generated addons package. #488118
+ DEPEND+="
+ virtual/jre
+ "
+ ;;
+*)
+ MY_PV=${PV/_p/_r}
+ MY_PV=${MY_PV/_alpha/a}
+ MY_PV=${MY_PV/_beta/b}
+ MY_PV=${MY_PV/_rc/rc}
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+ !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+ KEYWORDS="~amd64 ~x86"
+ IUSE+=" java"
+ DEPEND+="
+ java? ( virtual/jre )
+ "
+
+ S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+ ;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+ check_extra_config
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ if in_iuse java && use !java; then
+ eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+ fi
+ cmake-utils_src_prepare
+
+ # avoid long delays when powerkit isn't running #348580
+ sed -i \
+ -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+ xbmc/linux/*.cpp || die
+
+ # Prepare tools and libs witch are configured with autotools during compile time
+ AUTOTOOLS_DIRS=(
+ "${S}"/lib/cpluff
+ "${S}"/tools/depends/native/TexturePacker/src
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src
+ )
+
+ local d
+ for d in "${AUTOTOOLS_DIRS[@]}" ; do
+ pushd ${d} >/dev/null || die
+ AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+ popd >/dev/null || die
+ done
+ elibtoolize
+
+ # Prevent autoreconf rerun
+ sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+ "${S}"/project/cmake/modules/FindCpluff.cmake \
+ "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+ || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+ -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_AIRTUNES=$(usex airplay)
+ -DENABLE_AVAHI=$(usex zeroconf)
+ -DENABLE_BLUETOOTH=$(usex bluetooth)
+ -DENABLE_BLURAY=$(usex bluray)
+ -DENABLE_CCACHE=OFF
+ -DENABLE_CEC=$(usex cec)
+ -DENABLE_DBUS=$(usex dbus)
+ -DENABLE_DVDCSS=$(usex css)
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+ -DENABLE_CAP=$(usex caps)
+ -DENABLE_LIRC=$(usex lirc)
+ -DENABLE_MICROHTTPD=$(usex webserver)
+ -DENABLE_MYSQLCLIENT=$(usex mysql)
+ -DENABLE_NFS=$(usex nfs)
+ -DENABLE_NONFREE=$(usex nonfree)
+ -DENABLE_OPENGLES=$(usex gles)
+ -DENABLE_OPENGL=$(usex opengl)
+ -DENABLE_OPENSSL=ON
+ -DENABLE_OPTICAL=$(usex dvd)
+ -DENABLE_PLIST=$(usex airplay)
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+ -DENABLE_SMBCLIENT=$(usex samba)
+ -DENABLE_SSH=$(usex sftp)
+ -DENABLE_UDEV=$(usex udev)
+ -DENABLE_UPNP=$(usex upnp)
+ -DENABLE_VAAPI=$(usex vaapi)
+ -DENABLE_VDPAU=$(usex vdpau)
+ -DENABLE_X11=$(usex X)
+ -DENABLE_XSLT=$(usex xslt)
+ -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+ -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+ -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+ )
+
+ use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+ use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile all $(usev test)
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+ rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+ newicon media/icon48x48.png kodi.png
+
+ # Replace bundled fonts with system ones.
+ rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+ dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+ usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+ local f
+ for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+ rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+ dosym ../../../../fonts/noto/"${f}" \
+ usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+ done
+
+ rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+ dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+ usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+ python_domodule tools/EventClients/lib/python/xbmcclient.py
+ python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2017-07-11 21:54 Michał Górny
0 siblings, 0 replies; 15+ messages in thread
From: Michał Górny @ 2017-07-11 21:54 UTC (permalink / raw
To: gentoo-commits
commit: 89ee3377a67cf18832a0e6f577b14d84734944d6
Author: Craig Andrews <candrews <AT> integralblue <DOT> com>
AuthorDate: Wed Jun 21 21:04:29 2017 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Tue Jul 11 21:54:20 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=89ee3377
media-tv/kodi: Fix VMSF_DELTA vulnerability in embedded UnRAR #622384
Package-Manager: Portage-2.3.6, Repoman-2.3.2
.../kodi/files/kodi-17.3-unrar-vulnerability.patch | 45 ++++
media-tv/kodi/kodi-17.3-r1.ebuild | 285 +++++++++++++++++++++
2 files changed, 330 insertions(+)
diff --git a/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch b/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch
new file mode 100644
index 00000000000..95644d6921e
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.3-unrar-vulnerability.patch
@@ -0,0 +1,45 @@
+See https://trac.kodi.tv/ticket/17510
+diff --git a/lib/UnrarXLib/rarvm.cpp b/lib/UnrarXLib/rarvm.cpp
+index 901c35dcb4..42df0a0110 100644
+--- a/lib/UnrarXLib/rarvm.cpp
++++ b/lib/UnrarXLib/rarvm.cpp
+@@ -873,14 +873,16 @@ void RarVM::ExecuteStandardFilter(VM_StandardFilters FilterType)
+ break;
+ case VMSF_DELTA:
+ {
+- int DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
+- SET_VALUE(false,&Mem[VM_GLOBALMEMADDR+0x20],DataSize);
+- if (DataSize>=VM_GLOBALMEMADDR/2)
+- break;
+- for (int CurChannel=0;CurChannel<Channels;CurChannel++)
++ uint DataSize=R[4],Channels=R[0],SrcPos=0,Border=DataSize*2;
++ if (DataSize>VM_MEMSIZE/2 || Channels>MAX3_UNPACK_CHANNELS || Channels==0)
++ break;
++
++ // Bytes from same channels are grouped to continual data blocks,
++ // so we need to place them back to their interleaving positions.
++ for (uint CurChannel=0;CurChannel<Channels;CurChannel++)
+ {
+ byte PrevByte=0;
+- for (int DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
++ for (uint DestPos=DataSize+CurChannel;DestPos<Border;DestPos+=Channels)
+ Mem[DestPos]=(PrevByte-=Mem[SrcPos++]);
+ }
+ }
+diff --git a/lib/UnrarXLib/unpack.hpp b/lib/UnrarXLib/unpack.hpp
+index 83fb0f0254..36ac30d181 100644
+--- a/lib/UnrarXLib/unpack.hpp
++++ b/lib/UnrarXLib/unpack.hpp
+@@ -1,6 +1,12 @@
+ #ifndef _RAR_UNPACK_
+ #define _RAR_UNPACK_
+
++// Limit maximum number of channels in RAR3 delta filter to some reasonable
++// value to prevent too slow processing of corrupt archives with invalid
++// channels number. Must be equal or larger than v3_MAX_FILTER_CHANNELS.
++// No need to provide it for RAR5, which uses only 5 bits to store channels.
++#define MAX3_UNPACK_CHANNELS 1024
++
+ enum BLOCK_TYPES {BLOCK_LZ,BLOCK_PPM};
+
+ struct Decode
diff --git a/media-tv/kodi/kodi-17.3-r1.ebuild b/media-tv/kodi/kodi-17.3-r1.ebuild
new file mode 100644
index 00000000000..7c7b190ddec
--- /dev/null
+++ b/media-tv/kodi/kodi-17.3-r1.ebuild
@@ -0,0 +1,285 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+# Does not work with py3 here
+PYTHON_COMPAT=( python2_7 )
+PYTHON_REQ_USE="sqlite"
+
+inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
+
+LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
+LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
+LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
+FFMPEG_VERSION="3.1.6"
+CODENAME="Krypton"
+PATCHES=(
+ "${FILESDIR}/${P}-ftpparse_string.patch"
+ "${FILESDIR}/${P}-unrar-vulnerability.patch"
+)
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
+ https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
+ https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
+ !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
+
+DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
+
+LICENSE="GPL-2"
+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 cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
+REQUIRED_USE="
+ ${PYTHON_REQUIRED_USE}
+ || ( gles opengl )
+ gles? ( X )
+ opengl? ( X )
+ udev? ( !libusb )
+ udisks? ( dbus )
+ upower? ( dbus )
+"
+
+COMMON_DEPEND="${PYTHON_DEPS}
+ airplay? (
+ app-pda/libplist
+ net-libs/shairplay
+ )
+ alsa? ( media-libs/alsa-lib )
+ bluetooth? ( net-wireless/bluez )
+ bluray? ( >=media-libs/libbluray-0.7.0 )
+ caps? ( sys-libs/libcap )
+ dbus? ( sys-apps/dbus )
+ dev-db/sqlite
+ dev-libs/expat
+ dev-libs/fribidi
+ cec? ( >=dev-libs/libcec-4.0 )
+ dev-libs/libpcre[cxx]
+ dev-libs/libxml2
+ >=dev-libs/lzo-2.04
+ dev-libs/tinyxml[stl]
+ >=dev-libs/yajl-2
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-libs/libcdio
+ gles? ( media-libs/mesa[gles2] )
+ libusb? ( virtual/libusb:1 )
+ media-fonts/corefonts
+ >=media-fonts/noto-20160531
+ media-fonts/roboto
+ media-libs/fontconfig
+ media-libs/freetype
+ >=media-libs/libass-0.13.4
+ media-libs/mesa[egl]
+ >=media-libs/taglib-1.11.1
+ system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
+ mysql? ( virtual/mysql )
+ >=net-misc/curl-7.51.0
+ nfs? ( net-fs/libnfs:= )
+ opengl? ( media-libs/glu )
+ !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
+ libressl? ( dev-libs/libressl:0= )
+ pulseaudio? ( media-sound/pulseaudio )
+ samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+ sftp? ( net-libs/libssh[sftp] )
+ sys-libs/zlib
+ udev? ( virtual/udev )
+ vaapi? ( x11-libs/libva[opengl] )
+ vdpau? (
+ || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+ system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+ )
+ webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
+ X? (
+ x11-libs/libdrm
+ x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ )
+ xslt? ( dev-libs/libxslt )
+ zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND}
+ lirc? (
+ || ( app-misc/lirc app-misc/inputlircd )
+ )
+ !media-tv/xbmc
+ udisks? ( sys-fs/udisks:0 )
+ upower? (
+ systemd? ( sys-power/upower )
+ !systemd? (
+ || ( sys-power/upower-pm-utils sys-power/upower )
+ )
+ )
+"
+DEPEND="${COMMON_DEPEND}
+ app-arch/bzip2
+ app-arch/unzip
+ app-arch/xz-utils
+ app-arch/zip
+ dev-lang/swig
+ dev-libs/crossguid
+ dev-util/cmake
+ dev-util/gperf
+ media-libs/giflib
+ >=media-libs/libjpeg-turbo-1.5.1:=
+ >=media-libs/libpng-1.6.26:0=
+ test? ( dev-cpp/gtest )
+ virtual/pkgconfig
+ x86? ( dev-lang/nasm )
+"
+case ${PV} in
+9999)
+ EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
+ inherit git-r3
+ # Force java for latest git version to avoid having to hand maintain the
+ # generated addons package. #488118
+ DEPEND+="
+ virtual/jre
+ "
+ ;;
+*)
+ MY_PV=${PV/_p/_r}
+ MY_PV=${MY_PV/_alpha/a}
+ MY_PV=${MY_PV/_beta/b}
+ MY_PV=${MY_PV/_rc/rc}
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
+ !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
+ KEYWORDS="~amd64 ~x86"
+ IUSE+=" java"
+ DEPEND+="
+ java? ( virtual/jre )
+ "
+
+ S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
+ ;;
+esac
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+CMAKE_USE_DIR=${S}/project/cmake/
+
+pkg_setup() {
+ check_extra_config
+ python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ if in_iuse java && use !java; then
+ eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
+ fi
+ cmake-utils_src_prepare
+
+ # avoid long delays when powerkit isn't running #348580
+ sed -i \
+ -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+ xbmc/linux/*.cpp || die
+
+ # Prepare tools and libs witch are configured with autotools during compile time
+ AUTOTOOLS_DIRS=(
+ "${S}"/lib/cpluff
+ "${S}"/tools/depends/native/TexturePacker/src
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src
+ )
+
+ local d
+ for d in "${AUTOTOOLS_DIRS[@]}" ; do
+ pushd ${d} >/dev/null || die
+ AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+ popd >/dev/null || die
+ done
+ elibtoolize
+
+ # Prevent autoreconf rerun
+ sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+ "${S}"/project/cmake/modules/FindCpluff.cmake \
+ "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+ || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+ -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_AIRTUNES=$(usex airplay)
+ -DENABLE_AVAHI=$(usex zeroconf)
+ -DENABLE_BLUETOOTH=$(usex bluetooth)
+ -DENABLE_BLURAY=$(usex bluray)
+ -DENABLE_CCACHE=OFF
+ -DENABLE_CEC=$(usex cec)
+ -DENABLE_DBUS=$(usex dbus)
+ -DENABLE_DVDCSS=$(usex css)
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+ -DENABLE_CAP=$(usex caps)
+ -DENABLE_LIRC=$(usex lirc)
+ -DENABLE_MICROHTTPD=$(usex webserver)
+ -DENABLE_MYSQLCLIENT=$(usex mysql)
+ -DENABLE_NFS=$(usex nfs)
+ -DENABLE_NONFREE=$(usex nonfree)
+ -DENABLE_OPENGLES=$(usex gles)
+ -DENABLE_OPENGL=$(usex opengl)
+ -DENABLE_OPENSSL=ON
+ -DENABLE_OPTICAL=$(usex dvd)
+ -DENABLE_PLIST=$(usex airplay)
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+ -DENABLE_SMBCLIENT=$(usex samba)
+ -DENABLE_SSH=$(usex sftp)
+ -DENABLE_UDEV=$(usex udev)
+ -DENABLE_UPNP=$(usex upnp)
+ -DENABLE_VAAPI=$(usex vaapi)
+ -DENABLE_VDPAU=$(usex vdpau)
+ -DENABLE_X11=$(usex X)
+ -DENABLE_XSLT=$(usex xslt)
+ -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
+ -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
+ -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
+ )
+
+ use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+ use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
+
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile all $(usev test)
+}
+
+src_install() {
+ cmake-utils_src_install
+
+ pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+ rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+
+ newicon media/icon48x48.png kodi.png
+
+ # Replace bundled fonts with system ones.
+ rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
+ dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
+ usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
+
+ local f
+ for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
+ rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
+ dosym ../../../../fonts/noto/"${f}" \
+ usr/share/kodi/addons/skin.estuary/fonts/"${f}"
+ done
+
+ rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+ dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+ usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+ python_domodule tools/EventClients/lib/python/xbmcclient.py
+ python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2017-08-29 14:42 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2017-08-29 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 700b83cd97246d4efdd905845d0a579bc4609031
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 14:34:28 2017 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 14:36:52 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=700b83cd
media-tv/kodi: 17.4-r1 compatibility with MariaDB
Gentoo-bug: 629084
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-tv/kodi/files/kodi-17.4-mariadb.patch | 23 +++++++++++++++++++++++
media-tv/kodi/kodi-17.4-r1.ebuild | 3 +++
2 files changed, 26 insertions(+)
diff --git a/media-tv/kodi/files/kodi-17.4-mariadb.patch b/media-tv/kodi/files/kodi-17.4-mariadb.patch
new file mode 100644
index 00000000000..6def8f8a304
--- /dev/null
+++ b/media-tv/kodi/files/kodi-17.4-mariadb.patch
@@ -0,0 +1,23 @@
+From ff848b104182467e5048351fdf27a07dd55a34a6 Mon Sep 17 00:00:00 2001
+From: Wolfgang Schupp <w.schupp@a1.net>
+Date: Tue, 29 Aug 2017 09:08:05 +0200
+Subject: [PATCH] Merge pull request #12727 from candrews/patch-6
+
+[cmake] FindMySqlClient: Compatibility with MariaDB
+---
+ project/cmake/modules/FindMySqlClient.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/project/cmake/modules/FindMySqlClient.cmake b/project/cmake/modules/FindMySqlClient.cmake
+index ceccea39b1e3..7b485778e4fc 100644
+--- a/project/cmake/modules/FindMySqlClient.cmake
++++ b/project/cmake/modules/FindMySqlClient.cmake
+@@ -21,7 +21,7 @@ else()
+ set(EXTRA_FIND_ARGS)
+ endif()
+
+-find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql_time.h)
++find_path(MYSQLCLIENT_INCLUDE_DIR NAMES mysql/mysql.h mysql/server/mysql.h)
+ find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient libmysql
+ PATH_SUFFIXES mysql
+ ${EXTRA_FIND_ARGS})
diff --git a/media-tv/kodi/kodi-17.4-r1.ebuild b/media-tv/kodi/kodi-17.4-r1.ebuild
index e4099e51e0e..de54ded326d 100644
--- a/media-tv/kodi/kodi-17.4-r1.ebuild
+++ b/media-tv/kodi/kodi-17.4-r1.ebuild
@@ -15,6 +15,9 @@ LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
FFMPEG_VERSION="3.1.9"
FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
CODENAME="Krypton"
+PATCHES=(
+ "${FILESDIR}/${P}-mariadb.patch"
+)
SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2017-08-29 14:42 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2017-08-29 14:42 UTC (permalink / raw
To: gentoo-commits
commit: 7de39cf65e3eaaf0fb4307251861bb84a22e8756
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 29 14:38:53 2017 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Aug 29 14:39:35 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7de39cf6
media-tv/kodi: Cleanup old versions
Package-Manager: Portage-2.3.8, Repoman-2.3.3
media-tv/kodi/Manifest | 2 -
.../kodi-17.3-10-bit-h265-hardware-decoding.patch | 28 --
media-tv/kodi/kodi-17.3-r2.ebuild | 291 ---------------------
media-tv/kodi/kodi-17.3-r3.ebuild | 291 ---------------------
media-tv/kodi/kodi-17.4_rc1.ebuild | 286 --------------------
5 files changed, 898 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 5045192b8eb..f8d42b3fbb3 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -5,8 +5,6 @@ DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8
DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634
DIST kodi-17.4-generated-addons.tar.xz 57576 SHA256 dffa734a5fd40493b338ce76cdf49e42572b437fd449ceded3183ac09929e015 SHA512 80bb6b159c3556c75ad02110c5431fbc21339b74988421269f049cdf9b630a7e819aa5816f315aa7279247cab3d09680c5966449642d0c3e25ef1c789b285581 WHIRLPOOL 39715af523582b1eb982b6da7bb6f2a6557f99f9bb38cfd69899f0e92db977cf965648c1ff2ad6bf2e77d09b26ef655256b5c1025bc224984f0040a3713958ba
DIST kodi-17.4.tar.gz 58475144 SHA256 b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f SHA512 fc4eff6606c84459ab24323888d39bf1f5d433aaf7136c17d85631f768761f61e498297c500befc986dd6de14de87a5a28f7a9c36c8d7c35d49ca15c99db37ef WHIRLPOOL 15f35516da71f9e64b4e7fdfa2a285236961db36ccc98fe2fa65809a0ef355c5e7b2a37cf3e36cd3bc9bc6717a3e26b7537e77d8828c09daaca7d79f9150c7d6
-DIST kodi-17.4rc1-generated-addons.tar.xz 57560 SHA256 b8fc905c58a0fc97418938f0e93155eda91e7389de44b1b20d5245c4a4a92900 SHA512 00255d3764074a1709b6a8b6e75122e100ce9ae2e6fbf9cda8149a2b4bbd0e0f0391e9fef5ca888c028a7d290cd88ac1bf0fd17e04eda6b2882850a4e1a4abb4 WHIRLPOOL 8f1389f59d745568953dd4dbf41a13c5d9813142e4ee63edb94ea22157acd1b0aa47b677adb35e720ab1aa441bcfb8ed324c7343e05f9186ea6073497dca4ebd
-DIST kodi-17.4rc1.tar.gz 58473381 SHA256 dd0604419528e00e14669c5c2ae9285ea60a7588eebf203bd2f399f9b8033e8c SHA512 47b4347fd4cb1ac10e5a659a77134f217646d2c2c9af1204af4d4230534eee81392dae3d18517d5e5cb53898447d44c33da913a6f280708ff055f5b7a378c347 WHIRLPOOL 6a6075683ff9ee7297213a1be89c4d5b48762730b69c35a11bd4c2d3575bfdc34a3fc06b407c5c169755f628258d7cd20e07ad8ad5b5e7f56bf791635ed10186
DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
DIST libdvdnav-43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac.tar.gz 130603 SHA256 8e3f0563e16df898fe115e1723e3f78dbc953f6e9cf4f04568add215371d9ed2 SHA512 901c6f24afa1d78b6ed78d1ee30daf634ca0bbc0467ef9cc3416bcab4fbc4fda6869ffa051791d85c0b510de748805328627681ef044668a7857299f0035232e WHIRLPOOL 588d060f418f18ef193061ff88260ac7929647b2babde5b78ab73141ffc7f3782ce1254bfee1234ec0da8bb28bc16ede301b4ec1e2d3073b9c6d22cb526f06ca
DIST libdvdread-17d99db97e7b8f23077b342369d3c22a6250affd.tar.gz 124326 SHA256 e7179b2054163652596a56301c9f025515cb08c6d6310b42b897c3ad11c0199b SHA512 e59ae0bfdc62698e407e3d70503c6a7c5e308545c9dae7843e25db3b5b62d9b26256be77ef4e884263add6b4abec3438c324bfd5715f6ca2ce7fa5962d43a6c2 WHIRLPOOL b42130027d201e545fabc27677bd4238d04bcbc5a0e622ca6da396ac340ea94b5c60004557334464a31dac880603dab99e2f189e41d6cddbe9e32728c626085a
diff --git a/media-tv/kodi/files/kodi-17.3-10-bit-h265-hardware-decoding.patch b/media-tv/kodi/files/kodi-17.3-10-bit-h265-hardware-decoding.patch
deleted file mode 100644
index 792a1e0cd5c..00000000000
--- a/media-tv/kodi/files/kodi-17.3-10-bit-h265-hardware-decoding.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From e1c9ffaaddb5e7d114cc6ed363e00df22c6fc344 Mon Sep 17 00:00:00 2001
-From: fritsch <Peter.Fruehberger@gmail.com>
-Date: Sun, 25 Jun 2017 18:40:59 +0200
-Subject: [PATCH] VAAPI: Explicitely don't open for hevc 10 bit. Some distros
- package systemwide ffmpeg and their users en up with a black screen for that
- kind of videos. As kodi krypton is meant to be used with ffmpeg 3.1 this is
- not needed for us.
-
----
- xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp | 5 +++++
- 1 file changed, 5 insertions(+)
-
-diff --git a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-index ed27cbbb6ec9..2f6502561de8 100644
---- a/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-+++ b/xbmc/cores/VideoPlayer/DVDCodecs/Video/VAAPI.cpp
-@@ -558,6 +558,11 @@ bool CDecoder::Open(AVCodecContext* avctx, AVCodecContext* mainctx, const enum A
- }
- case AV_CODEC_ID_HEVC:
- {
-+ // for distributions using far newer ffmpeg
-+ // not available when Krypton was released
-+ if (avctx->profile == FF_PROFILE_HEVC_MAIN_10)
-+ return false;
-+
- profile = VAProfileHEVCMain;
- if (!m_vaapiConfig.context->SupportsProfile(profile))
- return false;
diff --git a/media-tv/kodi/kodi-17.3-r2.ebuild b/media-tv/kodi/kodi-17.3-r2.ebuild
deleted file mode 100644
index 952298e4e44..00000000000
--- a/media-tv/kodi/kodi-17.3-r2.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.6"
-CODENAME="Krypton"
-PATCHES=(
- "${FILESDIR}/${P}-ftpparse_string.patch"
- "${FILESDIR}/${P}-unrar-vulnerability.patch"
- "${FILESDIR}/${P}-10-bit-h265-hardware-decoding.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-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 cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- gles? ( X )
- opengl? ( X )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- app-pda/libplist
- net-libs/shairplay
- )
- alsa? ( media-libs/alsa-lib )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-0.7.0 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/fribidi
- cec? ( >=dev-libs/libcec-4.0 )
- dev-libs/libpcre[cxx]
- dev-libs/libxml2
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- >=dev-libs/yajl-2
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-libs/libcdio
- gles? ( media-libs/mesa[gles2] )
- libusb? ( virtual/libusb:1 )
- media-fonts/corefonts
- >=media-fonts/noto-20160531
- media-fonts/roboto
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/libass-0.13.4
- media-libs/mesa[egl]
- >=media-libs/taglib-1.11.1
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
- mysql? ( virtual/mysql )
- >=net-misc/curl-7.51.0
- nfs? ( net-fs/libnfs:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- sftp? ( net-libs/libssh[sftp] )
- sys-libs/zlib
- udev? ( virtual/udev )
- vaapi? ( x11-libs/libva[opengl] )
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
- X? (
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- )
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? (
- || ( app-misc/lirc app-misc/inputlircd )
- )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:0 )
- upower? (
- systemd? ( sys-power/upower )
- !systemd? (
- || ( sys-power/upower-pm-utils sys-power/upower )
- )
- )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/unzip
- app-arch/xz-utils
- app-arch/zip
- dev-lang/swig
- dev-libs/crossguid
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
- # Force java for latest git version to avoid having to hand maintain the
- # generated addons package. #488118
- DEPEND+="
- virtual/jre
- "
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="~amd64 ~x86"
- IUSE+=" java"
- DEPEND+="
- java? ( virtual/jre )
- "
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if in_iuse java && use !java; then
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
- fi
- cmake-utils_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/project/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LIRC=$(usex lirc)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_NONFREE=$(usex nonfree)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPENSSL=ON
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_SSH=$(usex sftp)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_X11=$(usex X)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile all
- use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
- cmake-utils_src_install
-
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
- newicon media/icon48x48.png kodi.png
-
- # Replace bundled fonts with system ones.
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
- dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
- local f
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
- dosym ../../../../fonts/noto/"${f}" \
- usr/share/kodi/addons/skin.estuary/fonts/"${f}"
- done
-
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.3-r3.ebuild b/media-tv/kodi/kodi-17.3-r3.ebuild
deleted file mode 100644
index 06acdb53681..00000000000
--- a/media-tv/kodi/kodi-17.3-r3.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.6"
-CODENAME="Krypton"
-PATCHES=(
- "${FILESDIR}/${P}-ftpparse_string.patch"
- "${FILESDIR}/${P}-unrar-vulnerability.patch"
- "${FILESDIR}/${P}-10-bit-h265-hardware-decoding.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-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 cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- gles? ( X )
- opengl? ( X )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- app-pda/libplist
- net-libs/shairplay
- )
- alsa? ( media-libs/alsa-lib )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-0.7.0 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/fribidi
- cec? ( >=dev-libs/libcec-4.0 )
- dev-libs/libpcre[cxx]
- dev-libs/libxml2
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- >=dev-libs/yajl-2
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-libs/libcdio
- gles? ( media-libs/mesa[gles2] )
- libusb? ( virtual/libusb:1 )
- media-fonts/corefonts
- >=media-fonts/noto-20160531
- media-fonts/roboto
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/libass-0.13.4
- media-libs/mesa[egl]
- >=media-libs/taglib-1.11.1
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
- mysql? ( virtual/mysql )
- >=net-misc/curl-7.51.0
- nfs? ( net-fs/libnfs:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- sftp? ( net-libs/libssh[sftp] )
- sys-libs/zlib
- udev? ( virtual/udev )
- vaapi? ( x11-libs/libva[opengl] )
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
- X? (
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- )
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? (
- || ( app-misc/lirc app-misc/inputlircd )
- )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:0 )
- upower? (
- systemd? ( sys-power/upower )
- !systemd? (
- || ( sys-power/upower-pm-utils sys-power/upower )
- )
- )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/unzip
- app-arch/xz-utils
- app-arch/zip
- dev-lang/swig
- dev-libs/crossguid
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
- # Force java for latest git version to avoid having to hand maintain the
- # generated addons package. #488118
- DEPEND+="
- virtual/jre
- "
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="~amd64 ~x86"
- IUSE+=" java"
- DEPEND+="
- java? ( virtual/jre )
- "
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if in_iuse java && use !java; then
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
- fi
- cmake-utils_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/project/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LIRC=$(usex lirc)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_NONFREE=$(usex nonfree)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPENSSL=ON
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_SSH=$(usex sftp)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_X11=$(usex X)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile all
- use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
- cmake-utils_src_install
-
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
- newicon media/icon48x48.png kodi.png
-
- # Replace bundled fonts with system ones.
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
- dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
- local f
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
- dosym ../../../../fonts/noto/"${f}" \
- usr/share/kodi/addons/skin.estuary/fonts/"${f}"
- done
-
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.4_rc1.ebuild b/media-tv/kodi/kodi-17.4_rc1.ebuild
deleted file mode 100644
index 7c03f9c20d2..00000000000
--- a/media-tv/kodi/kodi-17.4_rc1.ebuild
+++ /dev/null
@@ -1,286 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.9"
-FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
-CODENAME="Krypton"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-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 cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- gles? ( X )
- opengl? ( X )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- app-pda/libplist
- net-libs/shairplay
- )
- alsa? ( media-libs/alsa-lib )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-0.7.0 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/fribidi
- cec? ( >=dev-libs/libcec-4.0 )
- dev-libs/libpcre[cxx]
- dev-libs/libxml2
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- >=dev-libs/yajl-2
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-libs/libcdio
- gles? ( media-libs/mesa[gles2] )
- libusb? ( virtual/libusb:1 )
- media-fonts/corefonts
- >=media-fonts/noto-20160531
- media-fonts/roboto
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/libass-0.13.4
- media-libs/mesa[egl]
- >=media-libs/taglib-1.11.1
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
- mysql? ( virtual/mysql )
- >=net-misc/curl-7.51.0
- nfs? ( net-fs/libnfs:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- sftp? ( net-libs/libssh[sftp] )
- sys-libs/zlib
- udev? ( virtual/udev )
- vaapi? ( x11-libs/libva[opengl] )
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
- X? (
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- )
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? (
- || ( app-misc/lirc app-misc/inputlircd )
- )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:0 )
- upower? (
- systemd? ( sys-power/upower )
- !systemd? (
- || ( sys-power/upower-pm-utils sys-power/upower )
- )
- )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/unzip
- app-arch/xz-utils
- app-arch/zip
- dev-lang/swig
- dev-libs/crossguid
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
- # Force java for latest git version to avoid having to hand maintain the
- # generated addons package. #488118
- DEPEND+="
- virtual/jre
- "
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="~amd64 ~x86"
- IUSE+=" java"
- DEPEND+="
- java? ( virtual/jre )
- "
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if in_iuse java && use !java; then
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
- fi
- cmake-utils_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/project/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LIRC=$(usex lirc)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_NONFREE=$(usex nonfree)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPENSSL=ON
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_SSH=$(usex sftp)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_X11=$(usex X)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile all $(usev test)
-}
-
-src_install() {
- cmake-utils_src_install
-
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
- newicon media/icon48x48.png kodi.png
-
- # Replace bundled fonts with system ones.
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
- dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
- local f
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
- dosym ../../../../fonts/noto/"${f}" \
- usr/share/kodi/addons/skin.estuary/fonts/"${f}"
- done
-
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2017-10-24 19:09 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2017-10-24 19:09 UTC (permalink / raw
To: gentoo-commits
commit: 43e303c235fc57fd040302d18f8a82838d382679
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 24 19:07:47 2017 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Oct 24 19:08:36 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43e303c2
media-tv/kodi: Cleanup old versions
Package-Manager: Portage-2.3.12, Repoman-2.3.3
media-tv/kodi/Manifest | 3 -
media-tv/kodi/files/kodi-17.4-mariadb.patch | 23 ---
media-tv/kodi/kodi-17.3.ebuild | 284 --------------------------
media-tv/kodi/kodi-17.4-r1.ebuild | 296 ----------------------------
media-tv/kodi/kodi-17.4.ebuild | 291 ---------------------------
5 files changed, 897 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index a2b4caddc22..2f963cf6ab5 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,11 +1,8 @@
DIST ffmpeg-kodi-3.1.11-Krypton-17.5.tar.gz 11188798 SHA256 7df8bce40765b39de5766ca9d08b5b9ac1f498c65c805c989461b907cee6b7c0 SHA512 b28bb6970c6767213f34e5f4f3e48ad5219a6c668a5264ff7de0a42712cb7393f389ddd88f56785a2dc8089f8231ae5fd05adfa10dbf15ea3e0ad7bc2ccd4d73 WHIRLPOOL 34055af438910a82ee7f2571c2bc5515d6988af51b4f5a2e0eb8f183f6a7e9ea3cdc4b16a6d8d166ad52f46d29a9625fbb72e8f47ed95c732482b33393445f7a
DIST ffmpeg-kodi-3.1.6-Krypton.tar.gz 11170735 SHA256 01f914742f6af8afd1d2eb076425975e24c4eed75f5d57f1c816086dc4625192 SHA512 060d06946ee71106196587b36eccf7fb7d0710d6ee72dae2e08f23e5bf7e223a3bac77f1730121f494ecf5f860a40635978023317a06f27a3b28752fa537f1a1 WHIRLPOOL ae6f0b3b798e92cd72aed8eb3e6dc82708c86052590b30ae93e1b8275dca89c5a4470dbc8ff51bfefd72bd40036b7bd1b7695ee77e90bab35b5e80bcb8b79826
-DIST ffmpeg-kodi-3.1.9-Krypton-17.4.tar.gz 11186492 SHA256 ead247d5d804399951531ba904d1b59b60c9163e2d8fbab014cf495a40f91266 SHA512 4f399578f95d42357c73dc01fb5372042070ce11ff82e97695cc5a69574f35b9a860042ea0d43cfd562f03ac06fd888c074a838944c0c1aef7a692f89ea85dda WHIRLPOOL 24c3c926bb0f204a66d4e01c9d96e34ab22d20389f9274ead9ff01393c62a1502f8604f9096f36f1fafb5c0526d6ccb5062a8b90e34a9773f2cfa89f8f87d069
DIST ffmpeg-kodi-3.4-Leia-Alpha-1.tar.gz 12147515 SHA256 0b5b7446dd5b9eeef427617e140058fbe7be94f5893055bc38cce3ca96375e03 SHA512 84fa07f88a3ee89b5dec8bf0f06a9d5f8b9e4a8f52656c6509aa081b87e59ae7ea643bc4bd668b555128b75e2a4d89fe82d7fc4586d37d9ea737eedb25508910 WHIRLPOOL e4a54744dcac947f0a9b1ca28eb1176bafc491f74e5f1142bb6b1a0b9aa57abc38c6c8af6fd41239da72b9cbdd595bfb815998f6f1a6d2baa568bf5ea08fe24d
DIST kodi-17.3-generated-addons.tar.xz 57548 SHA256 6175ac64dbcbe2c747cd77f876b8e2bb3e516daa4707d7ccf768d76a89b27bd1 SHA512 56d1912f5e24d3fcda3010783a5b32728ece9c81c718ac6f8db2cbbd096059fe97b8d1971b34bbde1216558a8e5db874f7b2179e1f18942774ae5486167bca9a WHIRLPOOL 1023c69687ac9958e72ab70c15a280800ea4866f8e0dc2740d9bfd50f75bef71c28f23f01a841f254022610e1388d14217ea384213161264dae721515c9dabe3
DIST kodi-17.3.tar.gz 58466114 SHA256 1de8653a3729cefd1baaf09ecde5ace01a1e3a58fbf29d48c1363f2503d331a1 SHA512 832071c3e9f332281a767f29168f6d6d003a86b42df849e81d907c2280f81f959ae42a850eddc889ae2280bba6106de3355e701ff2d71c88ee14cb20c84e7987 WHIRLPOOL 0ed5585f891459292a1cfd4451bee1f2b19af217e462b810468b00395ee024ba346300f84c67c6dc428d27abcaef4eec9dc7b844e66e2ab83543830a106a1634
-DIST kodi-17.4-generated-addons.tar.xz 57576 SHA256 dffa734a5fd40493b338ce76cdf49e42572b437fd449ceded3183ac09929e015 SHA512 80bb6b159c3556c75ad02110c5431fbc21339b74988421269f049cdf9b630a7e819aa5816f315aa7279247cab3d09680c5966449642d0c3e25ef1c789b285581 WHIRLPOOL 39715af523582b1eb982b6da7bb6f2a6557f99f9bb38cfd69899f0e92db977cf965648c1ff2ad6bf2e77d09b26ef655256b5c1025bc224984f0040a3713958ba
-DIST kodi-17.4.tar.gz 58475144 SHA256 b05e11b2d108222bfc3ff0c9a466d798c0feedf1228166239948e6ed37c3cb4f SHA512 fc4eff6606c84459ab24323888d39bf1f5d433aaf7136c17d85631f768761f61e498297c500befc986dd6de14de87a5a28f7a9c36c8d7c35d49ca15c99db37ef WHIRLPOOL 15f35516da71f9e64b4e7fdfa2a285236961db36ccc98fe2fa65809a0ef355c5e7b2a37cf3e36cd3bc9bc6717a3e26b7537e77d8828c09daaca7d79f9150c7d6
DIST kodi-17.5-generated-addons.tar.xz 57556 SHA256 41a2a02ee3eaaab6de9da3e2e7eef4ab8ae94e8654487cc4f4f13d2ea749fbcc SHA512 c0458c9086ae3df7eb6a17ac9bfe33f1d2b4d9897bdb5831af8bbb01d927263e99ab1dd0f7eb7795dac04d757d04a8ad2346c8b29bfe1faf95b84218792bcb8e WHIRLPOOL cc4e68be47bc4318d995ecafe977af95d17443f7f81743bb2a321e72ee56e2de037402810f97a606aa6a55c9e4e18fa8a9733a44e5ac3c4ae59916097910562a
DIST kodi-17.5.tar.gz 58292301 SHA256 84c64acc270b9e845a67fbbe481ae5ddeb9b4568d76e42f2d5f9160fe0ce2de2 SHA512 e47f8a53ccee675031dfb816ffbe338dd2e94c22c944b814f332c1abdab16182304474c6b0d5cd7ad7eb9bc0500de6f5fc97b965dc5828635b58a6c596f82736 WHIRLPOOL ca743b927a19d81c71072c8a7bc5f87eec73367275633de79f5bcc950eee9ed60380ee49a599f49023e48ff29495d361fa2a071617f7fa6bd18606015cd8d15d
DIST libdvdcss-2f12236bc1c92f73c21e973363f79eb300de603f.tar.gz 95395 SHA256 b6eb2d929ff56cb051152c32010afc5e7cf5fe8c5ae32dca412a2b46b6b57e34 SHA512 12ba7aa653fcb26d5336bf2a8110c924d634cec79f684bbf19dc38ea33f69fb68c22c97f4c09e5ca7c35f95f6c324a6d70ccc2c501a99122a9321cafd33b2cd9 WHIRLPOOL 8570ad8d2b6e629cc1c7e544be2853cab3bb50fd73438cea47c7a0919b251cecf906f7446ef3714c54ee3e636278dc0dabab47f772440624ff49877068b7b50a
diff --git a/media-tv/kodi/files/kodi-17.4-mariadb.patch b/media-tv/kodi/files/kodi-17.4-mariadb.patch
deleted file mode 100644
index 6def8f8a304..00000000000
--- a/media-tv/kodi/files/kodi-17.4-mariadb.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From ff848b104182467e5048351fdf27a07dd55a34a6 Mon Sep 17 00:00:00 2001
-From: Wolfgang Schupp <w.schupp@a1.net>
-Date: Tue, 29 Aug 2017 09:08:05 +0200
-Subject: [PATCH] Merge pull request #12727 from candrews/patch-6
-
-[cmake] FindMySqlClient: Compatibility with MariaDB
----
- project/cmake/modules/FindMySqlClient.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/project/cmake/modules/FindMySqlClient.cmake b/project/cmake/modules/FindMySqlClient.cmake
-index ceccea39b1e3..7b485778e4fc 100644
---- a/project/cmake/modules/FindMySqlClient.cmake
-+++ b/project/cmake/modules/FindMySqlClient.cmake
-@@ -21,7 +21,7 @@ else()
- set(EXTRA_FIND_ARGS)
- endif()
-
--find_path(MYSQLCLIENT_INCLUDE_DIR mysql/mysql_time.h)
-+find_path(MYSQLCLIENT_INCLUDE_DIR NAMES mysql/mysql.h mysql/server/mysql.h)
- find_library(MYSQLCLIENT_LIBRARY_RELEASE NAMES mysqlclient libmysql
- PATH_SUFFIXES mysql
- ${EXTRA_FIND_ARGS})
diff --git a/media-tv/kodi/kodi-17.3.ebuild b/media-tv/kodi/kodi-17.3.ebuild
deleted file mode 100644
index 48000044633..00000000000
--- a/media-tv/kodi/kodi-17.3.ebuild
+++ /dev/null
@@ -1,284 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.6"
-CODENAME="Krypton"
-PATCHES=(
- "${FILESDIR}/${P}-ftpparse_string.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-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 cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- gles? ( X )
- opengl? ( X )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- app-pda/libplist
- net-libs/shairplay
- )
- alsa? ( media-libs/alsa-lib )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-0.7.0 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/fribidi
- cec? ( >=dev-libs/libcec-4.0 )
- dev-libs/libpcre[cxx]
- dev-libs/libxml2
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- >=dev-libs/yajl-2
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-libs/libcdio
- gles? ( media-libs/mesa[gles2] )
- libusb? ( virtual/libusb:1 )
- media-fonts/corefonts
- >=media-fonts/noto-20160531
- media-fonts/roboto
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/libass-0.13.4
- media-libs/mesa[egl]
- >=media-libs/taglib-1.11.1
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc] )
- mysql? ( virtual/mysql )
- >=net-misc/curl-7.51.0
- nfs? ( net-fs/libnfs:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- sftp? ( net-libs/libssh[sftp] )
- sys-libs/zlib
- udev? ( virtual/udev )
- vaapi? ( x11-libs/libva[opengl] )
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
- X? (
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- )
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? (
- || ( app-misc/lirc app-misc/inputlircd )
- )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:0 )
- upower? (
- systemd? ( sys-power/upower )
- !systemd? (
- || ( sys-power/upower-pm-utils sys-power/upower )
- )
- )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/unzip
- app-arch/xz-utils
- app-arch/zip
- dev-lang/swig
- dev-libs/crossguid
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
- # Force java for latest git version to avoid having to hand maintain the
- # generated addons package. #488118
- DEPEND+="
- virtual/jre
- "
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="amd64 x86"
- IUSE+=" java"
- DEPEND+="
- java? ( virtual/jre )
- "
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if in_iuse java && use !java; then
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
- fi
- cmake-utils_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/project/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LIRC=$(usex lirc)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_NONFREE=$(usex nonfree)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPENSSL=ON
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_SSH=$(usex sftp)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_X11=$(usex X)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- use !system-ffmpeg && mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}.tar.gz" )
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile all $(usev test)
-}
-
-src_install() {
- cmake-utils_src_install
-
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
- newicon media/icon48x48.png kodi.png
-
- # Replace bundled fonts with system ones.
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
- dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
- local f
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
- dosym ../../../../fonts/noto/"${f}" \
- usr/share/kodi/addons/skin.estuary/fonts/"${f}"
- done
-
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.4-r1.ebuild b/media-tv/kodi/kodi-17.4-r1.ebuild
deleted file mode 100644
index de54ded326d..00000000000
--- a/media-tv/kodi/kodi-17.4-r1.ebuild
+++ /dev/null
@@ -1,296 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.9"
-FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
-CODENAME="Krypton"
-PATCHES=(
- "${FILESDIR}/${P}-mariadb.patch"
-)
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-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 cec +css dbus debug dvd gles lcms libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- gles? ( X )
- opengl? ( X )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- app-pda/libplist
- net-libs/shairplay
- )
- alsa? ( media-libs/alsa-lib )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-0.7.0 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/fribidi
- cec? ( >=dev-libs/libcec-4.0 )
- dev-libs/libpcre[cxx]
- dev-libs/libxml2
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- >=dev-libs/yajl-2
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-libs/libcdio
- gles? ( media-libs/mesa[gles2] )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- media-fonts/corefonts
- >=media-fonts/noto-20160531
- media-fonts/roboto
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/libass-0.13.4
- media-libs/mesa[egl]
- >=media-libs/taglib-1.11.1
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
- mysql? ( virtual/mysql )
- >=net-misc/curl-7.51.0
- nfs? ( net-fs/libnfs:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- sftp? ( net-libs/libssh[sftp] )
- sys-libs/zlib
- udev? ( virtual/udev )
- vaapi? ( x11-libs/libva[opengl] )
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
- X? (
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- )
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? (
- || ( app-misc/lirc app-misc/inputlircd )
- )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:0 )
- upower? (
- systemd? ( sys-power/upower )
- !systemd? (
- || ( sys-power/upower-pm-utils sys-power/upower )
- )
- )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/unzip
- app-arch/xz-utils
- app-arch/zip
- dev-lang/swig
- dev-libs/crossguid
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
- # Force java for latest git version to avoid having to hand maintain the
- # generated addons package. #488118
- DEPEND+="
- virtual/jre
- "
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="~amd64 ~x86"
- IUSE+=" java"
- DEPEND+="
- java? ( virtual/jre )
- "
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if in_iuse java && use !java; then
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
- fi
- cmake-utils_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/project/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRC=$(usex lirc)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_NONFREE=$(usex nonfree)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPENSSL=ON
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_SSH=$(usex sftp)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_X11=$(usex X)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile all
- use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
- cmake-utils_src_install
-
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
- newicon media/icon48x48.png kodi.png
-
- # Replace bundled fonts with system ones.
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
- dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
- local f
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
- dosym ../../../../fonts/noto/"${f}" \
- usr/share/kodi/addons/skin.estuary/fonts/"${f}"
- done
-
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-17.4.ebuild b/media-tv/kodi/kodi-17.4.ebuild
deleted file mode 100644
index 50e4a9c8325..00000000000
--- a/media-tv/kodi/kodi-17.4.ebuild
+++ /dev/null
@@ -1,291 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# Does not work with py3 here
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE="sqlite"
-
-inherit autotools cmake-utils eutils linux-info pax-utils python-single-r1 versionator
-
-LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f"
-LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd"
-LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac"
-FFMPEG_VERSION="3.1.9"
-FFMPEG_KODI_VERSION="$(get_version_component_range 1-2)"
-CODENAME="Krypton"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_COMMIT}.tar.gz -> libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_COMMIT}.tar.gz -> libdvdread-${LIBDVDREAD_COMMIT}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_COMMIT}.tar.gz -> libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-
-DESCRIPTION="Kodi is a free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
-
-LICENSE="GPL-2"
-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 cec +css dbus debug dvd gles libressl libusb lirc mysql nfs nonfree +opengl pulseaudio samba sftp systemd +system-ffmpeg test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- gles? ( X )
- opengl? ( X )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- app-pda/libplist
- net-libs/shairplay
- )
- alsa? ( media-libs/alsa-lib )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-0.7.0 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/fribidi
- cec? ( >=dev-libs/libcec-4.0 )
- dev-libs/libpcre[cxx]
- dev-libs/libxml2
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- >=dev-libs/yajl-2
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-libs/libcdio
- gles? ( media-libs/mesa[gles2] )
- libusb? ( virtual/libusb:1 )
- media-fonts/corefonts
- >=media-fonts/noto-20160531
- media-fonts/roboto
- media-libs/fontconfig
- media-libs/freetype
- >=media-libs/libass-0.13.4
- media-libs/mesa[egl]
- >=media-libs/taglib-1.11.1
- system-ffmpeg? ( >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,openssl,postproc] )
- mysql? ( virtual/mysql )
- >=net-misc/curl-7.51.0
- nfs? ( net-fs/libnfs:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2j:0= )
- libressl? ( dev-libs/libressl:0= )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- sftp? ( net-libs/libssh[sftp] )
- sys-libs/zlib
- udev? ( virtual/udev )
- vaapi? ( x11-libs/libva[opengl] )
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.50[messages] )
- X? (
- x11-libs/libdrm
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- )
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? (
- || ( app-misc/lirc app-misc/inputlircd )
- )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:0 )
- upower? (
- systemd? ( sys-power/upower )
- !systemd? (
- || ( sys-power/upower-pm-utils sys-power/upower )
- )
- )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/unzip
- app-arch/xz-utils
- app-arch/zip
- dev-lang/swig
- dev-libs/crossguid
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- x86? ( dev-lang/nasm )
-"
-case ${PV} in
-9999)
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
- # Force java for latest git version to avoid having to hand maintain the
- # generated addons package. #488118
- DEPEND+="
- virtual/jre
- "
- ;;
-*)
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz
- !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )"
- KEYWORDS="~amd64 ~x86"
- IUSE+=" java"
- DEPEND+="
- java? ( virtual/jre )
- "
-
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
- ;;
-esac
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-CMAKE_USE_DIR=${S}/project/cmake/
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_prepare() {
- if in_iuse java && use !java; then
- eapply "${FILESDIR}"/${PN}-cmake-no-java.patch
- fi
- cmake-utils_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/project/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LIRC=$(usex lirc)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_NONFREE=$(usex nonfree)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPENSSL=ON
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_SSH=$(usex sftp)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_X11=$(usex X)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_COMMIT}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_COMMIT}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_COMMIT}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- cmake-utils_src_configure
-}
-
-src_compile() {
- cmake-utils_src_compile all
- use test && emake -C "${BUILD_DIR}" kodi-test
-}
-
-src_test() {
- emake -C "${BUILD_DIR}" test
-}
-
-src_install() {
- cmake-utils_src_install
-
- pax-mark Em "${ED%/}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
-
- newicon media/icon48x48.png kodi.png
-
- # Replace bundled fonts with system ones.
- rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die
- dosym ../../../../fonts/noto/NotoSans-Regular.ttf \
- usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf
-
- local f
- for f in NotoMono-Regular.ttf NotoSans-Bold.ttf NotoSans-Regular.ttf ; do
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/"${f}" || die
- dosym ../../../../fonts/noto/"${f}" \
- usr/share/kodi/addons/skin.estuary/fonts/"${f}"
- done
-
- rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2020-09-01 18:59 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2020-09-01 18:59 UTC (permalink / raw
To: gentoo-commits
commit: c21fa21f38c9600fd6c8aaf216e411ef4dfe843f
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Tue Sep 1 18:58:12 2020 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Tue Sep 1 18:58:12 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c21fa21f
media-tv/kodi: Cleanup old versions
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
media-tv/kodi/Manifest | 3 -
...19.0_alpha1-conditional-TestHTTPDirectory.patch | 31 --
media-tv/kodi/kodi-18.7.1.ebuild | 324 --------------------
media-tv/kodi/kodi-18.8.ebuild | 319 --------------------
media-tv/kodi/kodi-19.0_alpha1-r1.ebuild | 325 ---------------------
5 files changed, 1002 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 9488cd70cea..bcf8587bbc1 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,11 +1,8 @@
DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
DIST ffmpeg-kodi-4.3-Matrix-Alpha1.tar.gz 13478011 BLAKE2B 6219293fba86981c34c22b1a91c6dce0c298d523ecafe2e0ddce8b1ec4213d4f8f65610e4555a124a582d7fa8e858d0ad6921015fa4e639d64a02e955f7faf46 SHA512 23220650b550fe2008c38c955e10baf55e1ceaac780cf170db5349b156ac399ff3eda39509773f0c973c50083e75823b1da8e92b3751c04bb06a7f5687bef850
DIST kodi-18-libmicrohttpd-0.9.71.patch 84981 BLAKE2B e07c7df63bdfbaf9dfc5d0989adf96eb663a8c99ea11c42dfc585d8b91343a3445e9bc2f1797e845b0895e79568526e8e594a76e8cb3d7b591153a0ad45ce807 SHA512 286a1466174d847eac460b2a7a1b66b082148f2a3e91c4f5f881b909a59b8fdb2037eda074bd3c6e5dbe6a65dc2bef9f1d6746d7db2cb78d285c4b7750c366c2
-DIST kodi-18.7.1.tar.gz 51052174 BLAKE2B 8e341d1b047cf170e845c775427f9fa54dabe2a9ad56afa80e90e0b6b508f2606907c813decdbdcc75eeeeb742ae1a600cc4d1bb40021bc6624a234f1aeb9946 SHA512 db44c2d3c998af37948ccd042932545c9d781b622dba85ec11b7dd97ec0be80f03d2687249a9483d1b2a7178179bf5a003f8d0f4c0e55c9f2a41f67a27a19e0f
DIST kodi-18.7.tar.gz 51051040 BLAKE2B 7ff04cd0ddcf74e46eef4318cf870662b9e076b362322958a6b8019d49134e37981f7ca21b5806e38b942adc4c29ea2b25a19f46e5da3d469613cf19a29f4e8c SHA512 7e5678f5e23e8af929056a49b0ce0b992a1f53a1fe970a149610c5a24adb591085bb06cc405e8bdc6040eef853d23e99df660d7006fc1ea4e79afd3a697875c5
-DIST kodi-18.8.tar.gz 51052219 BLAKE2B 6e49b08b5e2bfe778dafb687658e82b90226a9f1c1a7827a4290d601fe4c98e5cbaabaa39563c19a2956b83ce3a76640f081a56a41dfea4d65fb8b503c6f37b0 SHA512 242eaa9144ba0d9b15f02ab41282295de76d375cf66d595e7f6687d47c996133fcf5647448dcd06759df9f30bd86cdba239720b9bdd8b57827b6f261c08c4aaa
DIST kodi-19.0_alpha1_p20200830.tar.gz 51683611 BLAKE2B 8957e76bc0558d5ba8efb4c9884021b644376a8fe56d1d23086485d596d5f91ccf110bdbe2fdb9fd650da03eed5558fb55dd017ef1550b2b676b2baeae13c554 SHA512 4a9c407b2a0384297083bbfa279dda07fd70489e2da45542182a8faf9f1fbe92fb17f6aa9b8b14f8e95d7e00b5edd732587667649d91ff89b2ff43f3da95b32f
-DIST kodi-19.0a1.tar.gz 51653713 BLAKE2B 7fb9e4e2a98f1ae77b8889c66f10d938d7aa63f1c77858a3b75d61e12eaf896472e05a13d0f4f0f953978349366e58190a86003bead481e915cddaec7c865b41 SHA512 52fb4b851a394b52fd50b99e13d4ed19cc7c069df52d29e1816faee4dfebde73501582a733d7d5112ad9ff20a7b7df5a8c26dfa29e886160ff8e06b5bedab4fc
DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
DIST libdvdnav-6.0.0-Leia-Alpha-3.tar.gz 137942 BLAKE2B 7573434a0ae8e8ccabf48173f81fcde29074eb138e119a2ae9156cde3c3d8bfd716f5d0e605b97f2dcac21f570781137c8533c5ae306b51e3905822fda318355 SHA512 11c93eaacd156f8fd7dec7c43d366438b201f31ad55b2870463a9e286912b6ada08882319a021fb7992190f87b909a49f2b83e0321cc17aedc29f7fe5898fa72
DIST libdvdread-6.0.0-Leia-Alpha-3.tar.gz 130649 BLAKE2B 0c206acdaf0776841ab792c74e023af07d9539eb72e03ae164382a31ed950f60e5e15f1d055979d28f1398924471b294d11f064b11b8373353b3962a3777ff3c SHA512 b3419ba0a1a2dd70f1bb6236afdfe1c6e88c9ad4264198b289e3bba9375e077cecf7f89848c7b09debaa445327f3507101f3d157e692f7a7163b2bb52643e1e7
diff --git a/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch b/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch
deleted file mode 100644
index 096a4032628..00000000000
--- a/media-tv/kodi/files/kodi-19.0_alpha1-conditional-TestHTTPDirectory.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 3be79a564343886ade7e88f447944fd4b5452959 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Fri, 31 Jul 2020 14:56:21 -0400
-Subject: [PATCH] [test] [webserver] Conditional TestHTTPDirectory
-
-TestHTTPDirectory.cpp requires microhttpd so only include it if microhttpd is found.
-
-TestHTTPDirectory.cpp includes network/WebServer.h which includes network/httprequesthandler/IHTTPRequestHandler.h which includes microhttpd.h
----
- xbmc/filesystem/test/CMakeLists.txt | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/filesystem/test/CMakeLists.txt b/xbmc/filesystem/test/CMakeLists.txt
-index 235acc8549cf..9572459cf198 100644
---- a/xbmc/filesystem/test/CMakeLists.txt
-+++ b/xbmc/filesystem/test/CMakeLists.txt
-@@ -1,10 +1,13 @@
- set(SOURCES TestDirectory.cpp
- TestFile.cpp
- TestFileFactory.cpp
-- TestHTTPDirectory.cpp
- TestZipFile.cpp
- TestZipManager.cpp)
-
-+if(MICROHTTPD_FOUND)
-+ list(APPEND SOURCES TestHTTPDirectory.cpp)
-+endif()
-+
- if(NFS_FOUND)
- list(APPEND SOURCES TestNfsFile.cpp)
- endif()
diff --git a/media-tv/kodi/kodi-18.7.1.ebuild b/media-tv/kodi/kodi-18.7.1.ebuild
deleted file mode 100644
index 1500d25880b..00000000000
--- a/media-tv/kodi/kodi-18.7.1.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
- https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
-PATCHES=(
- "${FILESDIR}/${PN}-18.5-cassert.patch"
- "${FILESDIR}/${PN}-18-remove-useless-test.patch"
- "${DISTDIR}/${PN}-18-libmicrohttpd-0.9.71.patch"
-)
-
-if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
-else
- PYTHON_COMPAT=( python2_7 )
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-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 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"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- ^^ ( gbm raspberry-pi wayland X )
- ?? ( mariadb mysql )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
- dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl,X(+)] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
- raspberry-pi? (
- || ( 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(+)] )
- >=sys-libs/zlib-1.2.11
- udev? ( virtual/udev )
- vaapi? (
- x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- vdpau? ( x11-libs/libva[vdpau] )
- wayland? ( x11-libs/libva[wayland] )
- X? ( x11-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? ( app-misc/lirc )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
- dev-libs/rapidjson
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- virtual/jre
- x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if use gbm; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="gbm"
- -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use wayland; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="wayland"
- -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use raspberry-pi; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
- fi
-
- if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
- KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-18.8.ebuild b/media-tv/kodi/kodi-18.8.ebuild
deleted file mode 100644
index 4311cb82d79..00000000000
--- a/media-tv/kodi/kodi-18.8.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
- https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
-
-if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
-else
- PYTHON_COMPAT=( python2_7 )
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-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 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"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- ^^ ( gbm raspberry-pi wayland X )
- ?? ( mariadb mysql )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
- dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl,X(+)] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
- raspberry-pi? (
- || ( 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(+)] )
- >=sys-libs/zlib-1.2.11
- udev? ( virtual/udev )
- vaapi? (
- x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- vdpau? ( x11-libs/libva[vdpau] )
- wayland? ( x11-libs/libva[wayland] )
- X? ( x11-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? ( app-misc/lirc )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
- dev-libs/rapidjson
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- virtual/jre
- x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if use gbm; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="gbm"
- -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use wayland; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="wayland"
- -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use raspberry-pi; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
- fi
-
- if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
- KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild b/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild
deleted file mode 100644
index b90267ed518..00000000000
--- a/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3"
-CODENAME="Matrix"
-FFMPEG_KODI_VERSION="Alpha1"
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
-else
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-PATCHES=(
- "${FILESDIR}/${P}-conditional-TestHTTPDirectory.patch"
-)
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-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 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"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- ^^ ( gbm raspberry-pi wayland X )
- ?? ( mariadb mysql )
- bluray? ( udf )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.1.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- >=dev-libs/flatbuffers-1.11.0
- >=dev-libs/fribidi-1.0.5
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
- >=dev-libs/spdlog-1.5.0:=
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_MULTI_USEDEP}]
- dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]
- ')
- >=dev-libs/libcdio-2.1.0
- >=dev-libs/libfmt-6.1.2
- dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- media-libs/dav1d
- >=media-libs/fontconfig-2.13.1
- >=media-libs/freetype-2.10.1
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d,encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.68.0[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
- raspberry-pi? (
- || ( 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(+)] )
- >=sys-libs/zlib-1.2.11
- udf? ( >=dev-libs/libudfread-1.0.0 )
- udev? ( virtual/udev )
- vaapi? (
- x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- vdpau? ( x11-libs/libva[vdpau] )
- wayland? ( x11-libs/libva[wayland] )
- X? ( x11-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- media-libs/mesa[X]
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? ( app-misc/lirc )
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
- dev-libs/rapidjson
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-2.0.4:=
- >=media-libs/libpng-1.6.26:0=
- test? ( >=dev-cpp/gtest-1.10.0 )
- virtual/pkgconfig
- virtual/jre
- x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_INTERNAL_GTEST=OFF
- -DENABLE_INTERNAL_UDFREAD=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_TESTING=$(usex test)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UDFREAD=$(usex udf)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if use gbm; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="gbm"
- -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use wayland; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="wayland"
- -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use raspberry-pi; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
- fi
-
- if use X; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="x11"
- -DX11_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
- KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2020-11-19 19:46 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2020-11-19 19:46 UTC (permalink / raw
To: gentoo-commits
commit: 47a1b34c41f1bf77204e0e90be03790db530141b
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 18:14:13 2020 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Nov 19 19:46:00 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47a1b34c
media-tv/kodi: Cleanup kodi 18
Kodi 18 requires python 2 which is EOL
Closes: https://bugs.gentoo.org/743535
Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
media-tv/kodi/Manifest | 5 -
.../kodi/files/kodi-18-remove-useless-test.patch | 51 ----
media-tv/kodi/files/kodi-18.5-cassert.patch | 42 ---
media-tv/kodi/kodi-18.7.ebuild | 324 ---------------------
media-tv/kodi/kodi-18.8.ebuild | 319 --------------------
media-tv/kodi/kodi-18.9.ebuild | 319 --------------------
6 files changed, 1060 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 46a8fc56542..876fc65d057 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,10 +1,5 @@
-DIST ffmpeg-kodi-4.0.4-Leia-18.4.tar.gz 12430413 BLAKE2B 6de6fde2c16264f851466b46f87c23c34e7d503203f69d47342d46034f153860190d196da51221f866315405c8a33325b2160283333256ee5d5e293336afae99 SHA512 c6dd75dbff7119adeeda246cfb640b5e8d3b4c242ef83e5ba070207b60f0c715c3fe3cb328d87687b70a133f122a03aba990f0e95f3aac7d5dbcee25bec59078
DIST ffmpeg-kodi-4.3.1-Matrix-Alpha1-2.tar.gz 13477450 BLAKE2B c33a2aad8b895be3ea5be76de238680284487d38a8c22ce57f17c3944a6ba214c0dfa9ef1e4717244ff8f70f6dd640b36715842d61ddaed65867a6c096470283 SHA512 7f614d0dd2b319414cb31853be9cd52e5e81b780a4049e36470f992e78e52bcd65e99bfd268df5f8781ad030bb60f99d15bd5e8c4d7c2fd9a4011b55a3efc40c
DIST ffmpeg-kodi-4.3.1-Matrix-Beta1.tar.gz 13477440 BLAKE2B 49415f76fd2a888b0efadb19597bd89db65c3d9e1224ab529ff0d73ab5734a23982b4d4905ddeb105ce59a816c4642cdb9f5568b0c39c29f5fb9431f9623d4ec SHA512 ce43390e816dabeed4ca231f5f7adade6c721c38e17996a57810fb6025ea49b812133c2a6e29aac7c674d4e4af3a21dbd7e605d85fb966935a01bda983b884ac
-DIST kodi-18-libmicrohttpd-0.9.71.patch 84981 BLAKE2B e07c7df63bdfbaf9dfc5d0989adf96eb663a8c99ea11c42dfc585d8b91343a3445e9bc2f1797e845b0895e79568526e8e594a76e8cb3d7b591153a0ad45ce807 SHA512 286a1466174d847eac460b2a7a1b66b082148f2a3e91c4f5f881b909a59b8fdb2037eda074bd3c6e5dbe6a65dc2bef9f1d6746d7db2cb78d285c4b7750c366c2
-DIST kodi-18.7.tar.gz 51051040 BLAKE2B 7ff04cd0ddcf74e46eef4318cf870662b9e076b362322958a6b8019d49134e37981f7ca21b5806e38b942adc4c29ea2b25a19f46e5da3d469613cf19a29f4e8c SHA512 7e5678f5e23e8af929056a49b0ce0b992a1f53a1fe970a149610c5a24adb591085bb06cc405e8bdc6040eef853d23e99df660d7006fc1ea4e79afd3a697875c5
-DIST kodi-18.8.tar.gz 51052219 BLAKE2B 6e49b08b5e2bfe778dafb687658e82b90226a9f1c1a7827a4290d601fe4c98e5cbaabaa39563c19a2956b83ce3a76640f081a56a41dfea4d65fb8b503c6f37b0 SHA512 242eaa9144ba0d9b15f02ab41282295de76d375cf66d595e7f6687d47c996133fcf5647448dcd06759df9f30bd86cdba239720b9bdd8b57827b6f261c08c4aaa
-DIST kodi-18.9.tar.gz 51052509 BLAKE2B e7cd888a38ed81e90566ae5e8a6f28c93688c8293af4b210674f224b02e7452ac81c25128cfbeaa3c67980fc00e18631060640ddff61263c782c807f8c5ea00e SHA512 72e4e2afa46d5d2061ed348af5c9a4218474589cb38d630e6d0643b35aff3b0aefb3db81333d52da6c799c530a1b709b1d7ccb6ec77dcb0cba06fce6791cb353
DIST kodi-19.0_alpha3_p20201109.tar.gz 52322634 BLAKE2B 4a69422811119ecc4b706a1b1f950b19bae16088ea8717b22c3015fe1dd448d37dccc46b2f756049ab71519c72a2e8a639f07128590dd94f227fce73e12efe10 SHA512 2fe0abfa8a8e4c3dd73021cf1aedb6dadda9c14588380276fc5ab05dee13e397d4f893ee5a62301fc79ebe5fe9129b8d37489edc0014c5a15564c63696d89d93
DIST kodi-19.0b1.tar.gz 52314501 BLAKE2B 35090e969160f7ea6619d6c720f92a3ecf97391d12548927fcfd03ccc15091132f795f4636a4c4b8c15b2a623ee8b892c4b395e2e4e811152c63ffc19474ff90 SHA512 51a5a060c9ee51dd05303259cf59164bf273b05430f0987998a90879dfb52c1e95669e1c432476df65247fb70e920058119713a627ed7e12bf8dcd13645ffc40
DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
diff --git a/media-tv/kodi/files/kodi-18-remove-useless-test.patch b/media-tv/kodi/files/kodi-18-remove-useless-test.patch
deleted file mode 100644
index 144626718b6..00000000000
--- a/media-tv/kodi/files/kodi-18-remove-useless-test.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 6cf1d4aaf9807a209f19e0aea97b44a7ae617f27 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Tue, 23 Jun 2020 14:30:29 -0400
-Subject: [PATCH] [test] TestCPUInfo: remove useless test as we cannot
- guarantee that they exist
-
----
- xbmc/utils/test/TestCPUInfo.cpp | 30 ------------------------------
- 1 file changed, 30 deletions(-)
-
-diff --git a/xbmc/utils/test/TestCPUInfo.cpp b/xbmc/utils/test/TestCPUInfo.cpp
-index fab473891356..df74ca3ee995 100644
---- a/xbmc/utils/test/TestCPUInfo.cpp
-+++ b/xbmc/utils/test/TestCPUInfo.cpp
-@@ -73,36 +73,6 @@ TEST(TestCPUInfo, getTemperature)
- }
- #endif
-
--TEST(TestCPUInfo, getCPUModel)
--{
-- std::string s = g_cpuInfo.getCPUModel();
-- EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPUBogoMips)
--{
-- std::string s = g_cpuInfo.getCPUBogoMips();
-- EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPUHardware)
--{
-- std::string s = g_cpuInfo.getCPUHardware();
-- EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPURevision)
--{
-- std::string s = g_cpuInfo.getCPURevision();
-- EXPECT_STRNE("", s.c_str());
--}
--
--TEST(TestCPUInfo, getCPUSerial)
--{
-- std::string s = g_cpuInfo.getCPUSerial();
-- EXPECT_STRNE("", s.c_str());
--}
--
- TEST(TestCPUInfo, CoreInfo)
- {
- ASSERT_TRUE(g_cpuInfo.HasCoreId(0));
diff --git a/media-tv/kodi/files/kodi-18.5-cassert.patch b/media-tv/kodi/files/kodi-18.5-cassert.patch
deleted file mode 100644
index 9558baa9e18..00000000000
--- a/media-tv/kodi/files/kodi-18.5-cassert.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-https://github.com/xbmc/xbmc/pull/17000
-
-From bbfc36f06c191d3bdea19cacc498afb86bd25404 Mon Sep 17 00:00:00 2001
-From: Craig Andrews <candrews@integralblue.com>
-Date: Thu, 5 Dec 2019 14:49:50 -0500
-Subject: [PATCH] Add missing cassert includes
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Without these includes, ‘assert’ was not declared in this scope errors
-occur.
----
- xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp | 1 +
- xbmc/windowing/GraphicContext.cpp | 2 ++
- 2 files changed, 3 insertions(+)
-
-diff --git a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-index 1303d894478c..aa85d95b3234 100644
---- a/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-+++ b/xbmc/profiles/dialogs/GUIDialogProfileSettings.cpp
-@@ -31,6 +31,7 @@
- #include "utils/Variant.h"
- #include "utils/log.h"
-
-+#include <cassert>
- #include <utility>
-
- #define SETTING_PROFILE_NAME "profile.name"
-diff --git a/xbmc/windowing/GraphicContext.cpp b/xbmc/windowing/GraphicContext.cpp
-index b47bafba57dc..75b333ea6daa 100644
---- a/xbmc/windowing/GraphicContext.cpp
-+++ b/xbmc/windowing/GraphicContext.cpp
-@@ -25,6 +25,8 @@
- #include "settings/lib/Setting.h"
- #include "utils/log.h"
-
-+#include <cassert>
-+
- using namespace KODI::MESSAGING;
-
- CGraphicContext::CGraphicContext(void) = default;
diff --git a/media-tv/kodi/kodi-18.7.ebuild b/media-tv/kodi/kodi-18.7.ebuild
deleted file mode 100644
index af2df125627..00000000000
--- a/media-tv/kodi/kodi-18.7.ebuild
+++ /dev/null
@@ -1,324 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
- https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
-PATCHES=(
- "${FILESDIR}/${PN}-18.5-cassert.patch"
- "${FILESDIR}/${PN}-18-remove-useless-test.patch"
- "${DISTDIR}/${PN}-18-libmicrohttpd-0.9.71.patch"
-)
-
-if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
-else
- PYTHON_COMPAT=( python2_7 )
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="amd64 x86"
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-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 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"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- ^^ ( gbm raspberry-pi wayland X )
- ?? ( mariadb mysql )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
- dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl,X(+)] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
- raspberry-pi? (
- || ( 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(+)] )
- >=sys-libs/zlib-1.2.11
- udev? ( virtual/udev )
- vaapi? (
- x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- vdpau? ( x11-libs/libva[vdpau] )
- wayland? ( x11-libs/libva[wayland] )
- X? ( x11-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? ( app-misc/lirc )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
- dev-libs/rapidjson
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- virtual/jre
- x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if use gbm; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="gbm"
- -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use wayland; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="wayland"
- -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use raspberry-pi; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
- fi
-
- if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
- KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-18.8.ebuild b/media-tv/kodi/kodi-18.8.ebuild
deleted file mode 100644
index 4311cb82d79..00000000000
--- a/media-tv/kodi/kodi-18.8.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
- https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
-
-if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
-else
- PYTHON_COMPAT=( python2_7 )
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-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 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"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- ^^ ( gbm raspberry-pi wayland X )
- ?? ( mariadb mysql )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
- dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl,X(+)] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
- raspberry-pi? (
- || ( 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(+)] )
- >=sys-libs/zlib-1.2.11
- udev? ( virtual/udev )
- vaapi? (
- x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- vdpau? ( x11-libs/libva[vdpau] )
- wayland? ( x11-libs/libva[wayland] )
- X? ( x11-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? ( app-misc/lirc )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
- dev-libs/rapidjson
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- virtual/jre
- x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if use gbm; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="gbm"
- -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use wayland; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="wayland"
- -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use raspberry-pi; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
- fi
-
- if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
- KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
diff --git a/media-tv/kodi/kodi-18.9.ebuild b/media-tv/kodi/kodi-18.9.ebuild
deleted file mode 100644
index 4311cb82d79..00000000000
--- a/media-tv/kodi/kodi-18.9.ebuild
+++ /dev/null
@@ -1,319 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="libressl?,sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.0.4"
-CODENAME="Leia"
-FFMPEG_KODI_VERSION="18.4"
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )
- https://dev.gentoo.org/~candrews/kodi-18-libmicrohttpd-0.9.71.patch"
-
-if [[ ${PV} == *9999 ]] ; then
- PYTHON_COMPAT=( python2_7 python3_{6,7} )
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- inherit git-r3
-else
- PYTHON_COMPAT=( python2_7 )
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/rc}
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="~amd64 ~arm ~arm64 ~x86"
- S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
-fi
-
-inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-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 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"
-REQUIRED_USE="
- ${PYTHON_REQUIRED_USE}
- || ( gles opengl )
- ^^ ( gbm raspberry-pi wayland X )
- ?? ( mariadb mysql )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.0.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- dev-libs/expat
- dev-libs/flatbuffers
- >=dev-libs/fribidi-0.19.7
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/libinput-1.10.5
- >=dev-libs/libxml2-2.9.4
- >=dev-libs/lzo-2.04
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_MULTI_USEDEP}]')
- $(python_gen_cond_dep 'dev-python/pycryptodome[${PYTHON_MULTI_USEDEP}]' 'python3*')
- >=dev-libs/libcdio-0.94
- >=dev-libs/libfmt-3.0.1
- dev-libs/libfstrcmp
- gbm? ( media-libs/mesa[gbm] )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- >=media-libs/fontconfig-2.12.4
- >=media-libs/freetype-2.8
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl,X(+)] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[encode,postproc]
- libressl? ( media-video/ffmpeg[libressl,-openssl] )
- !libressl? ( media-video/ffmpeg[-libressl,openssl] )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.56.1[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- opengl? ( media-libs/glu )
- !libressl? ( >=dev-libs/openssl-1.0.2l:0= )
- libressl? ( dev-libs/libressl:0= )
- raspberry-pi? (
- || ( 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(+)] )
- >=sys-libs/zlib-1.2.11
- udev? ( virtual/udev )
- vaapi? (
- x11-libs/libva:=
- opengl? ( x11-libs/libva[opengl] )
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- vdpau? ( x11-libs/libva[vdpau] )
- wayland? ( x11-libs/libva[wayland] )
- X? ( x11-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- >=x11-libs/libxkbcommon-0.4.1
- xslt? ( dev-libs/libxslt )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND}
- lirc? ( app-misc/lirc )
- !media-tv/xbmc
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND}
- app-arch/bzip2
- app-arch/xz-utils
- dev-lang/swig
- dev-libs/crossguid
- dev-libs/rapidjson
- dev-util/cmake
- dev-util/gperf
- media-libs/giflib
- >=media-libs/libjpeg-turbo-1.5.1:=
- >=media-libs/libpng-1.6.26:0=
- test? ( dev-cpp/gtest )
- virtual/pkgconfig
- virtual/jre
- x86? ( dev-lang/nasm )
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- if python_is_python3; then
- EGIT_BRANCH="feature_python3"
- ewarn "Using the experimental Python 3 branch!"
- ewarn "See https://kodi.wiki/view/Migration_to_Python_3 for more information."
- ewarn "To use the non-experimental Python 2 version:"
- ewarn "echo '~${CATEGORY}/${P} PYTHON_TARGETS: -* python2_7 PYTHON_SINGLE_TARGET: -* python2_7' >> /etc/portage/package.use"
- ewarn "then re-merge using: emerge -a =${CATEGORY}/${PF}"
- fi
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/lib/cpluff
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/cmake/modules/FindCpluff.cmake \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex opengl)
- -DENABLE_OPTICAL=$(usex dvd)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- )
-
- use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if use gbm; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="gbm"
- -DGBM_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use wayland; then
- mycmakeargs+=(
- -DCORE_PLATFORM_NAME="wayland"
- -DWAYLAND_RENDER_SYSTEM="$(usex opengl gl gles)"
- )
- fi
-
- if use raspberry-pi; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="rbpi" )
- fi
-
- if use X; then
- mycmakeargs+=( -DCORE_PLATFORM_NAME="x11" )
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
- KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- python_domodule tools/EventClients/lib/python/xbmcclient.py
- python_newscript "tools/EventClients/Clients/KodiSend/kodi-send.py" kodi-send
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2021-06-25 13:35 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2021-06-25 13:35 UTC (permalink / raw
To: gentoo-commits
commit: 0e9e4120aff7a0bc400e9823f0ca24c08c97abd4
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 25 13:34:34 2021 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Fri Jun 25 13:35:00 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e9e4120
media-tv/kodi: support fmt 8
Closes: https://bugs.gentoo.org/797619
See: https://github.com/xbmc/xbmc/pull/19904
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
media-tv/kodi/files/kodi-19.1-fmt-8.patch | 28 ++++++++++++++++++++++++++++
media-tv/kodi/kodi-19.1.ebuild | 4 ++++
2 files changed, 32 insertions(+)
diff --git a/media-tv/kodi/files/kodi-19.1-fmt-8.patch b/media-tv/kodi/files/kodi-19.1-fmt-8.patch
new file mode 100644
index 00000000000..ea82d007910
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.1-fmt-8.patch
@@ -0,0 +1,28 @@
+https://github.com/xbmc/xbmc/pull/19904
+
+From 18ff80a9c169fb969b75e2143d9f1f234b71a730 Mon Sep 17 00:00:00 2001
+From: Craig Andrews <candrews@integralblue.com>
+Date: Thu, 24 Jun 2021 20:41:11 -0400
+Subject: [PATCH] [utils] include fmt/xchar.h
+
+fmt 8 moved wchar/custom char overloads to xchar.h, so for fmt 8 compatibility, xchar.h must be included
+
+See https://github.com/fmtlib/fmt/commit/76ee490468212f8705a1421b4c88f8f814b2d351
+---
+ xbmc/utils/StringUtils.h | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/xbmc/utils/StringUtils.h b/xbmc/utils/StringUtils.h
+index ca6f82953d90a..2dc5c3f03af2f 100644
+--- a/xbmc/utils/StringUtils.h
++++ b/xbmc/utils/StringUtils.h
+@@ -36,6 +36,9 @@
+ #if FMT_VERSION >= 40000
+ #include <fmt/printf.h>
+ #endif
++#if FMT_VERSION >= 80000
++#include <fmt/xchar.h>
++#endif
+
+ #include "XBDateTime.h"
+ #include "utils/params_check_macros.h"
diff --git a/media-tv/kodi/kodi-19.1.ebuild b/media-tv/kodi/kodi-19.1.ebuild
index 11329e6f470..d8e43ce073b 100644
--- a/media-tv/kodi/kodi-19.1.ebuild
+++ b/media-tv/kodi/kodi-19.1.ebuild
@@ -30,6 +30,10 @@ else
S=${WORKDIR}/xbmc-${MY_PV}
fi
+PATCHES=(
+ "${FILESDIR}/${P}-fmt-8.patch"
+)
+
inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
DESCRIPTION="A free and open source media-player and entertainment hub"
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2022-07-14 14:00 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2022-07-14 14:00 UTC (permalink / raw
To: gentoo-commits
commit: b7dcb304d8c881fe17c306f0697fefae07229412
Author: Craig Andrews <candrews <AT> gentoo <DOT> org>
AuthorDate: Thu Jul 14 13:59:14 2022 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Thu Jul 14 14:00:02 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b7dcb304
media-tv/kodi: libfmt-9 compatibility
Closes: https://bugs.gentoo.org/857936
See: https://github.com/xbmc/xbmc/pull/21674
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
media-tv/kodi/files/kodi-19.4-fmt-9.patch | 74 ++++++
media-tv/kodi/kodi-19.4-r2.ebuild | 365 ++++++++++++++++++++++++++++++
2 files changed, 439 insertions(+)
diff --git a/media-tv/kodi/files/kodi-19.4-fmt-9.patch b/media-tv/kodi/files/kodi-19.4-fmt-9.patch
new file mode 100644
index 000000000000..b60d9ccc93aa
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.4-fmt-9.patch
@@ -0,0 +1,74 @@
+From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Wed, 6 Jul 2022 22:48:35 +1000
+Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers
+ is disallowed
+
+---
+ xbmc/utils/GLUtils.cpp | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
+index 1ef804709ff56..c36dcf6a20fec 100644
+--- a/xbmc/utils/GLUtils.cpp
++++ b/xbmc/utils/GLUtils.cpp
+@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
+ void LogGraphicsInfo()
+ {
+ #if defined(HAS_GL) || defined(HAS_GLES)
+- const GLubyte *s;
++ const char* s;
+
+- s = glGetString(GL_VENDOR);
++ s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
+ if (s)
+ CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
+ else
+ CLog::Log(LOGINFO, "GL_VENDOR = NULL");
+
+- s = glGetString(GL_RENDERER);
++ s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
+ if (s)
+ CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
+ else
+ CLog::Log(LOGINFO, "GL_RENDERER = NULL");
+
+- s = glGetString(GL_VERSION);
++ s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
+ if (s)
+ CLog::Log(LOGINFO, "GL_VERSION = %s", s);
+ else
+ CLog::Log(LOGINFO, "GL_VERSION = NULL");
+
+- s = glGetString(GL_SHADING_LANGUAGE_VERSION);
++ s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
+ if (s)
+ CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
+ else
+
+From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi@heitbaum.com>
+Date: Mon, 11 Jul 2022 09:39:02 +0000
+Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void
+ pointers is disallowed
+
+---
+ xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
+index 8a18288fd8af0..033c0f77bf454 100644
+--- a/xbmc/windowing/X11/WinSystemX11.cpp
++++ b/xbmc/windowing/X11/WinSystemX11.cpp
+@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager()
+
+ if(status == Success && items_read)
+ {
+- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
++ const char* s;
++
++ s = reinterpret_cast<const char*>(data);
++ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
+ }
+ else
+ CLog::Log(LOGDEBUG,"Window Manager Name: ");
diff --git a/media-tv/kodi/kodi-19.4-r2.ebuild b/media-tv/kodi/kodi-19.4-r2.ebuild
new file mode 100644
index 000000000000..060512a9f02d
--- /dev/null
+++ b/media-tv/kodi/kodi-19.4-r2.ebuild
@@ -0,0 +1,365 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_REQ_USE="sqlite,ssl"
+LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
+LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
+LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
+FFMPEG_VERSION="4.3.2"
+CODENAME="Matrix"
+FFMPEG_KODI_VERSION="19.1"
+PYTHON_COMPAT=( python3_{8,9,10} )
+SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
+ https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
+ https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
+ !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
+if [[ ${PV} == *9999 ]] ; then
+ EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
+ EGIT_BRANCH="Matrix"
+ inherit git-r3
+else
+ MY_PV=${PV/_p/_r}
+ MY_PV=${MY_PV/_alpha/a}
+ MY_PV=${MY_PV/_beta/b}
+ MY_PV=${MY_PV/_rc/RC}
+ MY_PV="${MY_PV}-${CODENAME}"
+ MY_P="${PN}-${MY_PV}"
+ SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
+ KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+ S=${WORKDIR}/xbmc-${MY_PV}
+fi
+
+inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg
+
+PATCHES=(
+ "${FILESDIR}/${P}-fmt-9.patch"
+)
+
+DESCRIPTION="A free and open source media-player and entertainment hub"
+HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
+
+LICENSE="GPL-2+"
+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 cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical 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}
+ || ( gbm wayland X )
+ ?? ( mariadb mysql )
+ bluray? ( udf )
+ udev? ( !libusb )
+ udisks? ( dbus )
+ upower? ( dbus )
+ power-control? ( dbus )
+ vdpau? (
+ X
+ !gles
+ !gbm
+ )
+ zeroconf? ( dbus )
+"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+ >=dev-libs/lzo-2.04
+ >=dev-libs/flatbuffers-1.12.0:=
+ >=media-libs/libjpeg-turbo-2.0.4:=
+ >=media-libs/libpng-1.6.26:0=
+"
+COMMON_TARGET_DEPEND="${PYTHON_DEPS}
+ airplay? (
+ >=app-pda/libplist-2.0.0
+ net-libs/shairplay
+ )
+ alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
+ bluetooth? ( net-wireless/bluez )
+ bluray? ( >=media-libs/libbluray-1.1.2 )
+ caps? ( sys-libs/libcap )
+ dbus? ( sys-apps/dbus )
+ dev-db/sqlite
+ dev-libs/crossguid
+ >=dev-libs/fribidi-1.0.5
+ cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
+ dev-libs/libpcre[cxx]
+ >=dev-libs/spdlog-1.5.0:=
+ dev-libs/tinyxml[stl]
+ $(python_gen_cond_dep '
+ dev-python/pillow[${PYTHON_USEDEP}]
+ dev-python/pycryptodome[${PYTHON_USEDEP}]
+ ')
+ >=dev-libs/libcdio-2.1.0[cxx]
+ >=dev-libs/libfmt-6.1.2
+ dev-libs/libfstrcmp
+ gbm? (
+ >=dev-libs/libinput-1.10.5
+ media-libs/mesa[gbm(+)]
+ x11-libs/libxkbcommon
+ )
+ gles? (
+ !raspberry-pi? ( media-libs/mesa[gles2] )
+ )
+ lcms? ( media-libs/lcms:2 )
+ libusb? ( virtual/libusb:1 )
+ virtual/ttf-fonts
+ media-fonts/roboto
+ >=media-libs/freetype-2.10.1
+ >=media-libs/libass-0.13.4
+ !raspberry-pi? ( media-libs/mesa[egl(+)] )
+ >=media-libs/taglib-1.11.1
+ system-ffmpeg? (
+ >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
+ =media-video/ffmpeg-4*[openssl]
+ )
+ !system-ffmpeg? (
+ app-arch/bzip2
+ dav1d? ( media-libs/dav1d )
+ )
+ mysql? ( dev-db/mysql-connector-c:= )
+ mariadb? ( dev-db/mariadb-connector-c:= )
+ >=net-misc/curl-7.68.0[http2]
+ nfs? ( >=net-fs/libnfs-2.0.0:= )
+ !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] )
+ )
+ pulseaudio? ( media-sound/pulseaudio )
+ samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
+ >=sys-libs/zlib-1.2.11
+ udf? ( >=dev-libs/libudfread-1.0.0 )
+ udev? ( virtual/udev )
+ vaapi? (
+ x11-libs/libva:=
+ system-ffmpeg? ( media-video/ffmpeg[vaapi] )
+ vdpau? ( x11-libs/libva-vdpau-driver )
+ wayland? ( x11-libs/libva[wayland] )
+ X? ( x11-libs/libva[X] )
+ )
+ virtual/libiconv
+ vdpau? (
+ || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
+ system-ffmpeg? ( media-video/ffmpeg[vdpau] )
+ )
+ wayland? (
+ >=dev-cpp/waylandpp-0.2.3:=
+ media-libs/mesa[wayland]
+ >=dev-libs/wayland-protocols-1.7
+ >=x11-libs/libxkbcommon-0.4.1
+ )
+ webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+ X? (
+ media-libs/mesa[X]
+ !gles? ( media-libs/libglvnd[X] )
+ x11-libs/libX11
+ x11-libs/libXrandr
+ x11-libs/libXrender
+ system-ffmpeg? ( media-video/ffmpeg[X] )
+ )
+ x11-libs/libdrm
+ xslt? (
+ dev-libs/libxslt
+ >=dev-libs/libxml2-2.9.4
+ )
+ zeroconf? ( net-dns/avahi[dbus] )
+"
+RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+ lirc? ( app-misc/lirc )
+ power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
+ udisks? ( sys-fs/udisks:2 )
+ upower? ( sys-power/upower )
+"
+DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
+ dev-libs/rapidjson
+ test? ( >=dev-cpp/gtest-1.10.0 )
+"
+BDEPEND="${COMMON_DEPEND}
+ dev-lang/swig
+ dev-util/cmake
+ media-libs/giflib
+ >=dev-libs/flatbuffers-1.11.0
+ >=media-libs/libjpeg-turbo-2.0.4:=
+ >=media-libs/libpng-1.6.26:0=
+ virtual/pkgconfig
+ virtual/jre
+"
+
+CONFIG_CHECK="~IP_MULTICAST"
+ERROR_IP_MULTICAST="
+In some cases Kodi needs to access multicast addresses.
+Please consider enabling IP_MULTICAST under Networking options.
+"
+
+pkg_setup() {
+ check_extra_config
+ python-single-r1_pkg_setup
+}
+
+src_unpack() {
+ if [[ ${PV} == *9999 ]] ; then
+ git-r3_src_unpack
+ else
+ default
+ fi
+}
+
+src_prepare() {
+ cmake_src_prepare
+
+ # avoid long delays when powerkit isn't running #348580
+ sed -i \
+ -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
+ xbmc/platform/linux/*.cpp || die
+
+ # Prepare tools and libs witch are configured with autotools during compile time
+ AUTOTOOLS_DIRS=(
+ "${S}"/tools/depends/native/TexturePacker/src
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src
+ )
+
+ local d
+ for d in "${AUTOTOOLS_DIRS[@]}" ; do
+ pushd ${d} >/dev/null || die
+ AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
+ popd >/dev/null || die
+ done
+ elibtoolize
+
+ # Prevent autoreconf rerun
+ sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
+ "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
+ "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
+ || die
+}
+
+src_configure() {
+ local platform=()
+ use gbm && platform+=( gbm )
+ use wayland && platform+=( wayland )
+ use X && platform+=( x11 )
+ local core_platform_name="${platform[@]}"
+ local mycmakeargs=(
+ -DENABLE_SSE=$(usex cpu_flags_x86_sse)
+ -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+ -DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
+ -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
+ -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
+ -DENABLE_AVX=$(usex cpu_flags_x86_avx)
+ -DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
+ -DENABLE_NEON=$(usex cpu_flags_arm_neon)
+ -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
+ -DVERBOSE=ON
+ -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
+ -DENABLE_ALSA=$(usex alsa)
+ -DENABLE_AIRTUNES=$(usex airplay)
+ -DENABLE_AVAHI=$(usex zeroconf)
+ -DENABLE_BLUETOOTH=$(usex bluetooth)
+ -DENABLE_BLURAY=$(usex bluray)
+ -DENABLE_CCACHE=OFF
+ -DENABLE_CLANGFORMAT=OFF
+ -DENABLE_CLANGTIDY=OFF
+ -DENABLE_CPPCHECK=OFF
+ -DENABLE_ISO9660PP=$(usex optical)
+ -DENABLE_CEC=$(usex cec)
+ -DENABLE_DBUS=$(usex dbus)
+ -DENABLE_DVDCSS=$(usex css)
+ -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
+ -DENABLE_INTERNAL_CROSSGUID=OFF
+ -DENABLE_INTERNAL_RapidJSON=OFF
+ -DENABLE_INTERNAL_FMT=OFF
+ -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
+ -DENABLE_INTERNAL_FSTRCMP=OFF
+ -DENABLE_INTERNAL_FLATBUFFERS=OFF
+ -DENABLE_INTERNAL_DAV1D=OFF
+ -DENABLE_INTERNAL_GTEST=OFF
+ -DENABLE_INTERNAL_UDFREAD=OFF
+ -DENABLE_INTERNAL_SPDLOG=OFF
+ -DENABLE_CAP=$(usex caps)
+ -DENABLE_LCMS2=$(usex lcms)
+ -DENABLE_LIRCCLIENT=$(usex lirc)
+ -DENABLE_MARIADBCLIENT=$(usex mariadb)
+ -DENABLE_MDNS=OFF # used only on Android
+ -DENABLE_MICROHTTPD=$(usex webserver)
+ -DENABLE_MYSQLCLIENT=$(usex mysql)
+ -DENABLE_NFS=$(usex nfs)
+ -DENABLE_OPENGLES=$(usex gles)
+ -DENABLE_OPENGL=$(usex !gles)
+ -DENABLE_OPTICAL=$(usex optical)
+ -DENABLE_PLIST=$(usex airplay)
+ -DENABLE_PULSEAUDIO=$(usex pulseaudio)
+ -DENABLE_SMBCLIENT=$(usex samba)
+ -DENABLE_SNDIO=OFF
+ -DENABLE_TESTING=$(usex test)
+ -DENABLE_UDEV=$(usex udev)
+ -DENABLE_UDFREAD=$(usex udf)
+ -DENABLE_UPNP=$(usex upnp)
+ -DENABLE_VAAPI=$(usex vaapi)
+ -DENABLE_VDPAU=$(usex vdpau)
+ -DENABLE_XSLT=$(usex xslt)
+ -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
+ -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
+ -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
+ -DPYTHON_LIBRARY="$(python_get_library_path)"
+ -DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
+ -DCORE_PLATFORM_NAME="${core_platform_name}"
+ )
+
+ use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
+
+ use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
+
+ if use system-ffmpeg; then
+ mycmakeargs+=( -DWITH_FFMPEG="yes" )
+ else
+ mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
+ fi
+
+ if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
+ CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
+ CXXFLAGS+=' -DNDEBUG'
+ fi
+
+ cmake_src_configure
+}
+
+src_compile() {
+ cmake_src_compile all
+}
+
+src_test() {
+ local myctestargs=(
+ # Known failing, unreliable test
+ # bug #743938
+ -E "(TestCPUInfo.GetCPUFrequency)"
+ )
+
+ # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
+ KODI_HOME="${BUILD_DIR}" cmake_build check
+}
+
+src_install() {
+ cmake_src_install
+
+ pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
+
+ newicon media/icon48x48.png kodi.png
+
+ rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
+ dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
+ usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
+
+ if use !eventclients ; then
+ rm -f "${ED}"/usr/bin/kodi-ps3remote || die
+ rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
+ rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
+ rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
+ rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
+ fi
+
+ python_optimize "${D}$(python_get_sitedir)"
+}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2022-11-23 6:01 Craig Andrews
0 siblings, 0 replies; 15+ messages in thread
From: Craig Andrews @ 2022-11-23 6:01 UTC (permalink / raw
To: gentoo-commits
commit: 6c45cb2f21571bc67827dce5be44eba75c18330d
Author: V3n3RiX <venerix <AT> koprulu <DOT> sector>
AuthorDate: Tue Nov 22 19:27:24 2022 +0000
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org>
CommitDate: Wed Nov 23 06:01:39 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6c45cb2f
media-tv/kodi : fix build with dav1d 1.0.0
Closes: https://github.com/gentoo/gentoo/pull/28389
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org>
media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch | 94 +++++++++++++++++++++++++
media-tv/kodi/kodi-19.4-r3.ebuild | 6 +-
media-tv/kodi/kodi-19.4-r4.ebuild | 3 +-
3 files changed, 101 insertions(+), 2 deletions(-)
diff --git a/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch b/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch
new file mode 100644
index 000000000000..e1d69a983c35
--- /dev/null
+++ b/media-tv/kodi/files/kodi-19.4-dav1d-1.0.0.patch
@@ -0,0 +1,94 @@
+diff -Nur a/cmake/modules/FindFFMPEG.cmake b/cmake/modules/FindFFMPEG.cmake
+--- a/cmake/modules/FindFFMPEG.cmake 2022-03-02 18:38:51.000000000 +0000
++++ b/cmake/modules/FindFFMPEG.cmake 2022-11-22 19:15:38.690434650 +0000
+@@ -275,6 +275,8 @@
+ PATCH_COMMAND ${CMAKE_COMMAND} -E copy
+ ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/CMakeLists.txt
+ <SOURCE_DIR> &&
++ # patch internal ffmpeg, fix build against dav1d 1.0.0
++ patch -p1 < ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch
+ ${CMAKE_COMMAND} -E copy
+ ${CMAKE_SOURCE_DIR}/tools/depends/target/ffmpeg/FindGnuTls.cmake
+ <SOURCE_DIR>)
+diff -Nur a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch
+--- a/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch 1970-01-01 01:00:00.000000000 +0100
++++ b/tools/depends/target/ffmpeg/build-fix-for-dav1d-1.0.0.patch 2022-11-22 19:12:09.566420470 +0000
+@@ -0,0 +1,78 @@
++From 2546e1ed27f92a840a2cf319e3c1833799974cf1 Mon Sep 17 00:00:00 2001
++From: BlackEagle <ike.devolder@gmail.com>
++Date: Fri, 29 Apr 2022 14:33:12 +0200
++Subject: [PATCH] add build fix for dav1d 1.0.0
++
++Taken from https://github.com/FFmpeg/FFmpeg/commit/e204846ec16c1ab34c7f3a681734cf5190433018
++
++add FF_DAV1D_VERSION_AT_LEAST
++
++Extracted from https://github.com/FFmpeg/FFmpeg/commit/7ee17ec7e46afef0e0af20af196292ec75f50b62
++
++Signed-off-by: BlackEagle <ike.devolder@gmail.com>
++---
++ libavcodec/libdav1d.c | 24 ++++++++++++++++++++++--
++ 1 file changed, 22 insertions(+), 2 deletions(-)
++
++diff --git a/libavcodec/libdav1d.c b/libavcodec/libdav1d.c
++index bbb3ec1e6c..08b4af8ac8 100644
++--- a/libavcodec/libdav1d.c
+++++ b/libavcodec/libdav1d.c
++@@ -30,6 +30,9 @@
++ #include "decode.h"
++ #include "internal.h"
++
+++#define FF_DAV1D_VERSION_AT_LEAST(x,y) \
+++ (DAV1D_API_VERSION_MAJOR > (x) || DAV1D_API_VERSION_MAJOR == (x) && DAV1D_API_VERSION_MINOR >= (y))
+++
++ typedef struct Libdav1dContext {
++ AVClass *class;
++ Dav1dContext *c;
++@@ -140,6 +143,15 @@ static av_cold int libdav1d_init(AVCodecContext *c)
++ if (dav1d->operating_point >= 0)
++ s.operating_point = dav1d->operating_point;
++
+++#if FF_DAV1D_VERSION_AT_LEAST(6,0)
+++ if (dav1d->frame_threads || dav1d->tile_threads)
+++ s.n_threads = FFMAX(dav1d->frame_threads, dav1d->tile_threads);
+++ else
+++ s.n_threads = FFMIN(threads, DAV1D_MAX_THREADS);
+++ s.max_frame_delay = (c->flags & AV_CODEC_FLAG_LOW_DELAY) ? 1 : s.n_threads;
+++ av_log(c, AV_LOG_DEBUG, "Using %d threads, %d max_frame_delay\n",
+++ s.n_threads, s.max_frame_delay);
+++#else
++ s.n_tile_threads = dav1d->tile_threads
++ ? dav1d->tile_threads
++ : FFMIN(floor(sqrt(threads)), DAV1D_MAX_TILE_THREADS);
++@@ -148,6 +160,7 @@ static av_cold int libdav1d_init(AVCodecContext *c)
++ : FFMIN(ceil(threads / s.n_tile_threads), DAV1D_MAX_FRAME_THREADS);
++ av_log(c, AV_LOG_DEBUG, "Using %d frame threads, %d tile threads\n",
++ s.n_frame_threads, s.n_tile_threads);
+++#endif
++
++ res = dav1d_open(&dav1d->c, &s);
++ if (res < 0)
++@@ -384,11 +397,18 @@ static av_cold int libdav1d_close(AVCodecContext *c)
++ return 0;
++ }
++
+++#ifndef DAV1D_MAX_FRAME_THREADS
+++#define DAV1D_MAX_FRAME_THREADS DAV1D_MAX_THREADS
+++#endif
+++#ifndef DAV1D_MAX_TILE_THREADS
+++#define DAV1D_MAX_TILE_THREADS DAV1D_MAX_THREADS
+++#endif
+++
++ #define OFFSET(x) offsetof(Libdav1dContext, x)
++ #define VD AV_OPT_FLAG_VIDEO_PARAM | AV_OPT_FLAG_DECODING_PARAM
++ static const AVOption libdav1d_options[] = {
++- { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD },
++- { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD },
+++ { "tilethreads", "Tile threads", OFFSET(tile_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_TILE_THREADS, VD | AV_OPT_FLAG_DEPRECATED },
+++ { "framethreads", "Frame threads", OFFSET(frame_threads), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, DAV1D_MAX_FRAME_THREADS, VD | AV_OPT_FLAG_DEPRECATED },
++ { "filmgrain", "Apply Film Grain", OFFSET(apply_grain), AV_OPT_TYPE_BOOL, { .i64 = -1 }, -1, 1, VD },
++ { "oppoint", "Select an operating point of the scalable bitstream", OFFSET(operating_point), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 31, VD },
++ { "alllayers", "Output all spatial layers", OFFSET(all_layers), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VD },
++--
++2.36.0
++
diff --git a/media-tv/kodi/kodi-19.4-r3.ebuild b/media-tv/kodi/kodi-19.4-r3.ebuild
index e933af071cc2..caecc50cdfca 100644
--- a/media-tv/kodi/kodi-19.4-r3.ebuild
+++ b/media-tv/kodi/kodi-19.4-r3.ebuild
@@ -33,6 +33,10 @@ fi
inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
+PATCHES=(
+ "${FILESDIR}/${P}-dav1d-1.0.0.patch"
+)
+
DESCRIPTION="A free and open source media-player and entertainment hub"
HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
@@ -113,7 +117,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
)
!system-ffmpeg? (
app-arch/bzip2
- dav1d? ( media-libs/dav1d )
+ dav1d? ( media-libs/dav1d:= )
)
mysql? ( dev-db/mysql-connector-c:= )
mariadb? ( dev-db/mariadb-connector-c:= )
diff --git a/media-tv/kodi/kodi-19.4-r4.ebuild b/media-tv/kodi/kodi-19.4-r4.ebuild
index 237fc5a593d9..3fcd9b13f6b0 100644
--- a/media-tv/kodi/kodi-19.4-r4.ebuild
+++ b/media-tv/kodi/kodi-19.4-r4.ebuild
@@ -36,6 +36,7 @@ inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xd
PATCHES=(
"${FILESDIR}/${P}-fmt-9.patch"
"${FILESDIR}/${P}-atomic.patch"
+ "${FILESDIR}/${P}-dav1d-1.0.0.patch"
)
DESCRIPTION="A free and open source media-player and entertainment hub"
@@ -118,7 +119,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
)
!system-ffmpeg? (
app-arch/bzip2
- dav1d? ( media-libs/dav1d )
+ dav1d? ( media-libs/dav1d:= )
)
mysql? ( dev-db/mysql-connector-c:= )
mariadb? ( dev-db/mariadb-connector-c:= )
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2023-05-14 10:29 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2023-05-14 10:29 UTC (permalink / raw
To: gentoo-commits
commit: c437dbd042a0f90923bdc39776740c4d6119e14a
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun May 14 09:20:20 2023 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun May 14 10:27:55 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c437dbd0
media-tv/kodi: drop 19.4-r4
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-tv/kodi/Manifest | 1 -
media-tv/kodi/files/kodi-19.4-fmt-9.patch | 74 ------
media-tv/kodi/kodi-19.4-r4.ebuild | 371 ------------------------------
3 files changed, 446 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 21f467d53b27..f5c5af7c5b95 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,6 +1,5 @@
DIST ffmpeg-kodi-4.3.2-Matrix-19.1.tar.gz 13490949 BLAKE2B 90007f2c4bac0e0a52b419d9333cf75b00e291f1ea7447cbdc579ee2f860de7c436c924253600f3fbd6e3faaabe97aaf46db083a5bbd2f5f03badcca5d643e89 SHA512 d3719253d674b16638b873545583b82fba3176803c81ba8bcb37e90456dd956f1c2ee8996493840cff2d61c6399f06ed0524a759f46e4ce174bce23e9c6eda4a
DIST ffmpeg-kodi-5.1.2-Nexus-Alpha3.tar.gz 14416966 BLAKE2B fe35ef6a9aa2d60a2b34432ae8063850003d550208f223ea43af8ebcaa73e6993639e8cfe8a38676bac79e6b1816bd791b75b66ef58ff4d740bc9a5e0e7f9b78 SHA512 ce60852b8456d6f4bfc60de0ceadb33034d9b3eea8c0bc84d8b7199984ecbf334a2c4d9b42eade439d0ef30ce22e3b2ca0a49d4df837a18cd3136b4343ed3113
-DIST kodi-19.4-Matrix.tar.gz 53487622 BLAKE2B 75432f0fe225d10548c9cbce1ec5a1722ce75e9bc6f19ba9a8deffc50874be94ca1552c5bd75b3ea1712344ebdf6f5934bca3ee315e6acccd2141df7de3304e9 SHA512 2804c57d85877873dae8e62f083b86f51fceebb802819523654a231f50f9850022956e1a9b91702e7c8b3f7ab437ceea7b10319239a8289dbf877ce94bba07c9
DIST kodi-19.5-Matrix.tar.gz 53496968 BLAKE2B 89855e4d59faa5734e945e50267c2ec8d8e8bef91ecfa49ae49dd99f749a59609b55c57821042939082a8f98ea95f7edc3de0fa0494e218d454c67b79807ef87 SHA512 b560c068491a7f62894167da99be082f0e6a8a840cbfe1fb0cef5c844cda959bd3b5479a435b58616bb2a8454083ad393a4d49de05fbbdb0817a0fad9726e52f
DIST libdvdcss-1.4.2-Leia-Beta-5.tar.gz 101068 BLAKE2B 283aa2cec0a2200d3569bc280cb9659e9224a6b3a77db8a35b269cd8caf1337ac9d8b92b806df66f63ef7458a46bd6261f0b8b14678b10e26644a79dcbeea5da SHA512 5185dbdbeb1bd13ea9d8723f1f4ab599d6f3102f5ba1096cd085aa1cda252c045f327c719227bba8e1b742352ade5e335106c8d0c1637a5a6b93ce661620dd7e
DIST libdvdcss-1.4.3-Next-Nexus-Alpha2.tar.gz 102251 BLAKE2B c7499013a44e81e1aac736f40802db4bc2a8f70664f4d15a81b9c717861894d99a0e2b58ec922ed2f80f9335cc7647b2607daee2a297252827b17075a50ae739 SHA512 a8cc334036888599feaafc7e563ca079a22e52ca3d0a5f5579571f95fe27d22778f390c86b72912a1bacb0ea6b8a6008ff9d47b32383e3eac810e6ba92e8dea1
diff --git a/media-tv/kodi/files/kodi-19.4-fmt-9.patch b/media-tv/kodi/files/kodi-19.4-fmt-9.patch
deleted file mode 100644
index b60d9ccc93aa..000000000000
--- a/media-tv/kodi/files/kodi-19.4-fmt-9.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 6e081841981af8fc0d88d4f549456fd93b7ae2ac Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Wed, 6 Jul 2022 22:48:35 +1000
-Subject: [PATCH 1/2] GLUtils: cast as char as formatting of non-void pointers
- is disallowed
-
----
- xbmc/utils/GLUtils.cpp | 10 +++++-----
- 1 file changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/xbmc/utils/GLUtils.cpp b/xbmc/utils/GLUtils.cpp
-index 1ef804709ff56..c36dcf6a20fec 100644
---- a/xbmc/utils/GLUtils.cpp
-+++ b/xbmc/utils/GLUtils.cpp
-@@ -148,27 +148,27 @@ void _VerifyGLState(const char* szfile, const char* szfunction, int lineno)
- void LogGraphicsInfo()
- {
- #if defined(HAS_GL) || defined(HAS_GLES)
-- const GLubyte *s;
-+ const char* s;
-
-- s = glGetString(GL_VENDOR);
-+ s = reinterpret_cast<const char*>(glGetString(GL_VENDOR));
- if (s)
- CLog::Log(LOGINFO, "GL_VENDOR = %s", s);
- else
- CLog::Log(LOGINFO, "GL_VENDOR = NULL");
-
-- s = glGetString(GL_RENDERER);
-+ s = reinterpret_cast<const char*>(glGetString(GL_RENDERER));
- if (s)
- CLog::Log(LOGINFO, "GL_RENDERER = %s", s);
- else
- CLog::Log(LOGINFO, "GL_RENDERER = NULL");
-
-- s = glGetString(GL_VERSION);
-+ s = reinterpret_cast<const char*>(glGetString(GL_VERSION));
- if (s)
- CLog::Log(LOGINFO, "GL_VERSION = %s", s);
- else
- CLog::Log(LOGINFO, "GL_VERSION = NULL");
-
-- s = glGetString(GL_SHADING_LANGUAGE_VERSION);
-+ s = reinterpret_cast<const char*>(glGetString(GL_SHADING_LANGUAGE_VERSION));
- if (s)
- CLog::Log(LOGINFO, "GL_SHADING_LANGUAGE_VERSION = %s", s);
- else
-
-From 6a504c306b743b73225bd81e490ef7dc9fae2c25 Mon Sep 17 00:00:00 2001
-From: Rudi Heitbaum <rudi@heitbaum.com>
-Date: Mon, 11 Jul 2022 09:39:02 +0000
-Subject: [PATCH 2/2] WinSystemX11: cast as char as formatting of non-void
- pointers is disallowed
-
----
- xbmc/windowing/X11/WinSystemX11.cpp | 5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/xbmc/windowing/X11/WinSystemX11.cpp b/xbmc/windowing/X11/WinSystemX11.cpp
-index 8a18288fd8af0..033c0f77bf454 100644
---- a/xbmc/windowing/X11/WinSystemX11.cpp
-+++ b/xbmc/windowing/X11/WinSystemX11.cpp
-@@ -1038,7 +1038,10 @@ bool CWinSystemX11::HasWindowManager()
-
- if(status == Success && items_read)
- {
-- CLog::Log(LOGDEBUG,"Window Manager Name: %s", data);
-+ const char* s;
-+
-+ s = reinterpret_cast<const char*>(data);
-+ CLog::Log(LOGDEBUG, "Window Manager Name: {}", s);
- }
- else
- CLog::Log(LOGDEBUG,"Window Manager Name: ");
diff --git a/media-tv/kodi/kodi-19.4-r4.ebuild b/media-tv/kodi/kodi-19.4-r4.ebuild
deleted file mode 100644
index 319a0c88d9f9..000000000000
--- a/media-tv/kodi/kodi-19.4-r4.ebuild
+++ /dev/null
@@ -1,371 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_REQ_USE="sqlite,ssl"
-LIBDVDCSS_VERSION="1.4.2-Leia-Beta-5"
-LIBDVDREAD_VERSION="6.0.0-Leia-Alpha-3"
-LIBDVDNAV_VERSION="6.0.0-Leia-Alpha-3"
-FFMPEG_VERSION="4.3.2"
-CODENAME="Matrix"
-FFMPEG_KODI_VERSION="19.1"
-PYTHON_COMPAT=( python3_{9,10} )
-SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
- https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
- https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
- !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz -> ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz )"
-if [[ ${PV} == *9999 ]] ; then
- EGIT_REPO_URI="https://github.com/xbmc/xbmc.git"
- EGIT_BRANCH="Matrix"
- inherit git-r3
-else
- MY_PV=${PV/_p/_r}
- MY_PV=${MY_PV/_alpha/a}
- MY_PV=${MY_PV/_beta/b}
- MY_PV=${MY_PV/_rc/RC}
- MY_PV="${MY_PV}-${CODENAME}"
- MY_P="${PN}-${MY_PV}"
- SRC_URI+=" https://github.com/xbmc/xbmc/archive/${MY_PV}.tar.gz -> ${MY_P}.tar.gz"
- KEYWORDS="amd64 ~arm ~arm64 ~riscv ~x86"
- S=${WORKDIR}/xbmc-${MY_PV}
-fi
-
-inherit autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-
-PATCHES=(
- "${FILESDIR}/${P}-fmt-9.patch"
- "${FILESDIR}/${P}-atomic.patch"
- "${FILESDIR}/${P}-dav1d-1.0.0.patch"
-)
-
-DESCRIPTION="A free and open source media-player and entertainment hub"
-HOMEPAGE="https://kodi.tv/ https://kodi.wiki/"
-
-LICENSE="GPL-2+"
-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 cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical 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}
- || ( gbm wayland X )
- ?? ( mariadb mysql )
- bluray? ( udf )
- udev? ( !libusb )
- udisks? ( dbus )
- upower? ( dbus )
- power-control? ( dbus )
- vdpau? (
- X
- !gles
- !gbm
- )
- zeroconf? ( dbus )
-"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
- >=dev-libs/lzo-2.04
- >=dev-libs/flatbuffers-1.12.0:=
- >=media-libs/libjpeg-turbo-2.0.4:=
- >=media-libs/libpng-1.6.26:0=
-"
-COMMON_TARGET_DEPEND="${PYTHON_DEPS}
- airplay? (
- >=app-pda/libplist-2.0.0
- net-libs/shairplay
- )
- alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
- bluetooth? ( net-wireless/bluez )
- bluray? ( >=media-libs/libbluray-1.1.2 )
- caps? ( sys-libs/libcap )
- dbus? ( sys-apps/dbus )
- dev-db/sqlite
- <dev-libs/crossguid-0.2.2_p20190529
- >=dev-libs/fribidi-1.0.5
- cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] )
- dev-libs/libpcre[cxx]
- >=dev-libs/spdlog-1.5.0:=
- dev-libs/tinyxml[stl]
- $(python_gen_cond_dep '
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/pycryptodome[${PYTHON_USEDEP}]
- ')
- >=dev-libs/libcdio-2.1.0[cxx]
- >=dev-libs/libfmt-6.1.2
- dev-libs/libfstrcmp
- gbm? (
- >=dev-libs/libinput-1.10.5
- media-libs/mesa[gbm(+)]
- x11-libs/libxkbcommon
- )
- gles? (
- !raspberry-pi? ( media-libs/mesa[gles2] )
- )
- lcms? ( media-libs/lcms:2 )
- libusb? ( virtual/libusb:1 )
- virtual/ttf-fonts
- media-fonts/roboto
- >=media-libs/freetype-2.10.1
- >=media-libs/libass-0.13.4
- !raspberry-pi? ( media-libs/mesa[egl(+)] )
- >=media-libs/taglib-1.11.1
- system-ffmpeg? (
- >=media-video/ffmpeg-${FFMPEG_VERSION}:=[dav1d?,encode,postproc]
- =media-video/ffmpeg-4*[openssl]
- )
- !system-ffmpeg? (
- app-arch/bzip2
- dav1d? ( media-libs/dav1d:= )
- )
- mysql? ( dev-db/mysql-connector-c:= )
- mariadb? ( dev-db/mariadb-connector-c:= )
- >=net-misc/curl-7.68.0[http2]
- nfs? ( >=net-fs/libnfs-2.0.0:= )
- !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] )
- )
- pulseaudio? ( media-sound/pulseaudio )
- samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
- >=sys-libs/zlib-1.2.11
- udf? ( >=dev-libs/libudfread-1.0.0 )
- udev? ( virtual/udev )
- vaapi? (
- media-libs/libva:=
- system-ffmpeg? ( media-video/ffmpeg[vaapi] )
- wayland? ( media-libs/libva[wayland] )
- X? ( media-libs/libva[X] )
- )
- virtual/libiconv
- vdpau? (
- || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 )
- system-ffmpeg? ( media-video/ffmpeg[vdpau] )
- )
- wayland? (
- >=dev-cpp/waylandpp-0.2.3:=
- media-libs/mesa[wayland]
- >=dev-libs/wayland-protocols-1.7
- >=x11-libs/libxkbcommon-0.4.1
- )
- webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
- X? (
- media-libs/mesa[X]
- !gles? ( media-libs/libglvnd[X] )
- x11-libs/libX11
- x11-libs/libXrandr
- x11-libs/libXrender
- system-ffmpeg? ( media-video/ffmpeg[X] )
- )
- x11-libs/libdrm
- xslt? (
- dev-libs/libxslt
- >=dev-libs/libxml2-2.9.4
- )
- zeroconf? ( net-dns/avahi[dbus] )
-"
-RDEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
- lirc? ( app-misc/lirc )
- power-control? ( || ( sys-apps/systemd sys-auth/elogind ) )
- udisks? ( sys-fs/udisks:2 )
- upower? ( sys-power/upower )
-"
-DEPEND="${COMMON_DEPEND} ${COMMON_TARGET_DEPEND}
- dev-libs/rapidjson
- test? ( >=dev-cpp/gtest-1.10.0 )
-"
-BDEPEND="${COMMON_DEPEND}
- dev-lang/swig
- dev-util/cmake
- media-libs/giflib
- >=dev-libs/flatbuffers-1.11.0
- >=media-libs/libjpeg-turbo-2.0.4:=
- >=media-libs/libpng-1.6.26:0=
- virtual/pkgconfig
- virtual/jre
-"
-
-CONFIG_CHECK="~IP_MULTICAST"
-ERROR_IP_MULTICAST="
-In some cases Kodi needs to access multicast addresses.
-Please consider enabling IP_MULTICAST under Networking options.
-"
-
-pkg_setup() {
- check_extra_config
- python-single-r1_pkg_setup
-}
-
-src_unpack() {
- if [[ ${PV} == *9999 ]] ; then
- git-r3_src_unpack
- else
- default
- fi
-}
-
-src_prepare() {
- # https://bugs.gentoo.org/885419
- if has_version ">=media-libs/mesa-22.3.0"; then
- PATCHES+=( "${FILESDIR}/${P}-fix-mesa-22.3.0-build.patch" )
- fi
-
- cmake_src_prepare
-
- # avoid long delays when powerkit isn't running #348580
- sed -i \
- -e '/dbus_connection_send_with_reply_and_block/s:-1:3000:' \
- xbmc/platform/linux/*.cpp || die
-
- # Prepare tools and libs witch are configured with autotools during compile time
- AUTOTOOLS_DIRS=(
- "${S}"/tools/depends/native/TexturePacker/src
- "${S}"/tools/depends/native/JsonSchemaBuilder/src
- )
-
- local d
- for d in "${AUTOTOOLS_DIRS[@]}" ; do
- pushd ${d} >/dev/null || die
- AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" eautoreconf
- popd >/dev/null || die
- done
- elibtoolize
-
- # Prevent autoreconf rerun
- sed -e 's/autoreconf -vif/echo "autoreconf already done in src_prepare()"/' -i \
- "${S}"/tools/depends/native/TexturePacker/src/autogen.sh \
- "${S}"/tools/depends/native/JsonSchemaBuilder/src/autogen.sh \
- || die
-}
-
-src_configure() {
- local platform=()
- use gbm && platform+=( gbm )
- use wayland && platform+=( wayland )
- use X && platform+=( x11 )
- local core_platform_name="${platform[@]}"
- local mycmakeargs=(
- -DENABLE_SSE=$(usex cpu_flags_x86_sse)
- -DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
- -DENABLE_SSE3=$(usex cpu_flags_x86_sse3)
- -DENABLE_SSE4_1=$(usex cpu_flags_x86_sse4_1)
- -DENABLE_SSE4_2=$(usex cpu_flags_x86_sse4_2)
- -DENABLE_AVX=$(usex cpu_flags_x86_avx)
- -DENABLE_AVX2=$(usex cpu_flags_x86_avx2)
- -DENABLE_NEON=$(usex cpu_flags_arm_neon)
- -Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
- -DVERBOSE=ON
- -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124
- -DENABLE_ALSA=$(usex alsa)
- -DENABLE_AIRTUNES=$(usex airplay)
- -DENABLE_AVAHI=$(usex zeroconf)
- -DENABLE_BLUETOOTH=$(usex bluetooth)
- -DENABLE_BLURAY=$(usex bluray)
- -DENABLE_CCACHE=OFF
- -DENABLE_CLANGFORMAT=OFF
- -DENABLE_CLANGTIDY=OFF
- -DENABLE_CPPCHECK=OFF
- -DENABLE_ISO9660PP=$(usex optical)
- -DENABLE_CEC=$(usex cec)
- -DENABLE_DBUS=$(usex dbus)
- -DENABLE_DVDCSS=$(usex css)
- -DENABLE_EVENTCLIENTS=ON # alway enable to have 'kodi-send' and filter extra staff in 'src_install()'
- -DENABLE_INTERNAL_CROSSGUID=OFF
- -DENABLE_INTERNAL_RapidJSON=OFF
- -DENABLE_INTERNAL_FMT=OFF
- -DENABLE_INTERNAL_FFMPEG="$(usex !system-ffmpeg)"
- -DENABLE_INTERNAL_FSTRCMP=OFF
- -DENABLE_INTERNAL_FLATBUFFERS=OFF
- -DENABLE_INTERNAL_DAV1D=OFF
- -DENABLE_INTERNAL_GTEST=OFF
- -DENABLE_INTERNAL_UDFREAD=OFF
- -DENABLE_INTERNAL_SPDLOG=OFF
- -DENABLE_CAP=$(usex caps)
- -DENABLE_LCMS2=$(usex lcms)
- -DENABLE_LIRCCLIENT=$(usex lirc)
- -DENABLE_MARIADBCLIENT=$(usex mariadb)
- -DENABLE_MDNS=OFF # used only on Android
- -DENABLE_MICROHTTPD=$(usex webserver)
- -DENABLE_MYSQLCLIENT=$(usex mysql)
- -DENABLE_NFS=$(usex nfs)
- -DENABLE_OPENGLES=$(usex gles)
- -DENABLE_OPENGL=$(usex !gles)
- -DENABLE_OPTICAL=$(usex optical)
- -DENABLE_PLIST=$(usex airplay)
- -DENABLE_PULSEAUDIO=$(usex pulseaudio)
- -DENABLE_SMBCLIENT=$(usex samba)
- -DENABLE_SNDIO=OFF
- -DENABLE_TESTING=$(usex test)
- -DENABLE_UDEV=$(usex udev)
- -DENABLE_UDFREAD=$(usex udf)
- -DENABLE_UPNP=$(usex upnp)
- -DENABLE_VAAPI=$(usex vaapi)
- -DENABLE_VDPAU=$(usex vdpau)
- -DENABLE_XSLT=$(usex xslt)
- -Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz"
- -Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz"
- -Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz"
- -DPYTHON_INCLUDE_DIR="$(python_get_includedir)"
- -DPYTHON_LIBRARY="$(python_get_library_path)"
- -DAPP_RENDER_SYSTEM="$(usex gles gles gl)"
- -DCORE_PLATFORM_NAME="${core_platform_name}"
- )
-
- use !udev && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) )
-
- use X && use !gles && mycmakeargs+=( -DENABLE_GLX=ON )
-
- if use system-ffmpeg; then
- mycmakeargs+=( -DWITH_FFMPEG="yes" )
- else
- mycmakeargs+=( -DFFMPEG_URL="${DISTDIR}/ffmpeg-${PN}-${FFMPEG_VERSION}-${CODENAME}-${FFMPEG_KODI_VERSION}.tar.gz" )
- fi
-
- if ! echo "${CFLAGS}" | grep -Fwqe '-DNDEBUG' - && ! echo "${CFLAGS}" | grep -Fwqe '-D_DEBUG' - ; then
- CFLAGS+=' -DNDEBUG' # Kodi requires one of the 'NDEBUG' or '_DEBUG' defines
- CXXFLAGS+=' -DNDEBUG'
- fi
-
- cmake_src_configure
-}
-
-src_compile() {
- cmake_src_compile all
-}
-
-src_test() {
- local myctestargs=(
- # Known failing, unreliable test
- # bug #743938
- -E "(TestCPUInfo.GetCPUFrequency)"
- )
-
- # see https://github.com/xbmc/xbmc/issues/17860#issuecomment-630120213
- KODI_HOME="${BUILD_DIR}" cmake_build check
-}
-
-src_install() {
- cmake_src_install
-
- pax-mark Em "${ED}"/usr/$(get_libdir)/${PN}/${PN}.bin
-
- newicon media/icon48x48.png kodi.png
-
- rm "${ED}"/usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf || die
- dosym ../../../../fonts/roboto/Roboto-Thin.ttf \
- usr/share/kodi/addons/skin.estuary/fonts/Roboto-Thin.ttf
-
- if use !eventclients ; then
- rm -f "${ED}"/usr/bin/kodi-ps3remote || die
- rm -f "${D}"$(python_get_sitedir)/kodi/ps3_remote.py || die
- rm -rf "${D}"$(python_get_sitedir)/kodi/ps3 || die
- rm -rf "${D}"$(python_get_sitedir)/kodi/bt || die
- rm -rf "${ED}"/usr/share/doc/${PF}/kodi-eventclients-dev || die
- fi
-
- python_optimize "${D}$(python_get_sitedir)"
-}
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2024-01-28 14:51 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-01-28 14:51 UTC (permalink / raw
To: gentoo-commits
commit: 2c5c14ab38b48203ca963170955686b19d400ef7
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sun Jan 28 09:28:36 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sun Jan 28 14:50:20 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c5c14ab
media-tv/kodi: include headers for gcc-14
Closes: https://bugs.gentoo.org/923041
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/34972
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-tv/kodi/files/kodi-20.3-gcc-14.patch | 72 ++++++++++++++++++++++++++++++
media-tv/kodi/kodi-20.3.ebuild | 1 +
2 files changed, 73 insertions(+)
diff --git a/media-tv/kodi/files/kodi-20.3-gcc-14.patch b/media-tv/kodi/files/kodi-20.3-gcc-14.patch
new file mode 100644
index 000000000000..b4c5ee94eb80
--- /dev/null
+++ b/media-tv/kodi/files/kodi-20.3-gcc-14.patch
@@ -0,0 +1,72 @@
+https://github.com/xbmc/xbmc/commit/3dcea03c915f2062d4f8740d66abdf033fba9d6c
+https://bugs.gentoo.org/923041
+
+From 3dcea03c915f2062d4f8740d66abdf033fba9d6c Mon Sep 17 00:00:00 2001
+From: Manuel Lauss <manuel.lauss@gmail.com>
+Date: Fri, 13 Oct 2023 12:27:15 +0200
+Subject: [PATCH] add missing c++ headers
+
+Add a few missing headers which are no longer indirectly included by
+other headers, fixes build with gcc-14
+--- a/xbmc/addons/AddonUpdateRules.cpp
++++ b/xbmc/addons/AddonUpdateRules.cpp
+@@ -12,6 +12,7 @@
+ #include "addons/addoninfo/AddonInfo.h"
+ #include "utils/log.h"
+
++#include <algorithm>
+ #include <mutex>
+
+ using namespace ADDON;
+--- a/xbmc/addons/binary-addons/AddonDll.cpp
++++ b/xbmc/addons/binary-addons/AddonDll.cpp
+@@ -27,6 +27,7 @@
+ #include "utils/Variant.h"
+ #include "utils/log.h"
+
++#include <algorithm>
+ #include <utility>
+
+ using namespace KODI::MESSAGING;
+--- a/xbmc/interfaces/json-rpc/TextureOperations.cpp
++++ b/xbmc/interfaces/json-rpc/TextureOperations.cpp
+@@ -14,6 +14,8 @@
+ #include "TextureDatabase.h"
+ #include "utils/Variant.h"
+
++#include <algorithm>
++
+ using namespace JSONRPC;
+
+ JSONRPC_STATUS CTextureOperations::GetTextures(const std::string &method, ITransportLayer *transport, IClient *client, const CVariant ¶meterObject, CVariant &result)
+--- a/xbmc/utils/EGLImage.cpp
++++ b/xbmc/utils/EGLImage.cpp
+@@ -14,6 +14,7 @@
+ #include "utils/StringUtils.h"
+ #include "utils/log.h"
+
++#include <algorithm>
+ #include <map>
+
+ namespace
+--- a/xbmc/windowing/gbm/drm/DRMConnector.cpp
++++ b/xbmc/windowing/gbm/drm/DRMConnector.cpp
+@@ -11,6 +11,7 @@
+ #include "utils/XTimeUtils.h"
+ #include "utils/log.h"
+
++#include <algorithm>
+ #include <map>
+
+ using namespace KODI::WINDOWING::GBM;
+--- a/xbmc/windowing/gbm/drm/DRMPlane.cpp
++++ b/xbmc/windowing/gbm/drm/DRMPlane.cpp
+@@ -13,6 +13,8 @@
+ #include "utils/StringUtils.h"
+ #include "utils/log.h"
+
++#include <algorithm>
++
+ using namespace KODI::WINDOWING::GBM;
+
+ CDRMPlane::CDRMPlane(int fd, uint32_t plane) : CDRMObject(fd), m_plane(drmModeGetPlane(m_fd, plane))
diff --git a/media-tv/kodi/kodi-20.3.ebuild b/media-tv/kodi/kodi-20.3.ebuild
index 887e7a594f77..f8421e429d8d 100644
--- a/media-tv/kodi/kodi-20.3.ebuild
+++ b/media-tv/kodi/kodi-20.3.ebuild
@@ -271,6 +271,7 @@ Please consider enabling IP_MULTICAST under Networking options.
PATCHES=(
"${FILESDIR}"/kodi-20.2-binutils-2.41.patch
+ "${FILESDIR}"/kodi-20.3-gcc-14.patch
)
pkg_setup() {
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/
@ 2024-09-14 19:56 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2024-09-14 19:56 UTC (permalink / raw
To: gentoo-commits
commit: 773ffba7ffaf7b9e33e3ac92a6871cfb39916383
Author: Alfred Wingate <parona <AT> protonmail <DOT> com>
AuthorDate: Sat Sep 14 14:33:51 2024 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Sep 14 19:55:53 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=773ffba7
media-tv/kodi: fix gcc-15
Closes: https://bugs.gentoo.org/938531
Signed-off-by: Alfred Wingate <parona <AT> protonmail.com>
Closes: https://github.com/gentoo/gentoo/pull/38606
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
media-tv/kodi/files/kodi-21.1-fix-gcc15.patch | 116 ++++++++++++++++++++++++++
media-tv/kodi/kodi-21.1.ebuild | 1 +
2 files changed, 117 insertions(+)
diff --git a/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch b/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch
new file mode 100644
index 000000000000..5ab776e70f50
--- /dev/null
+++ b/media-tv/kodi/files/kodi-21.1-fix-gcc15.patch
@@ -0,0 +1,116 @@
+https://bugs.gentoo.org/938531
+https://github.com/xbmc/xbmc/pull/25735
+
+From 75e7b25883af5d2c8c89dbe6d830a5c17e9452f2 Mon Sep 17 00:00:00 2001
+From: Alfred Wingate <parona@protonmail.com>
+Date: Sat, 14 Sep 2024 13:46:25 +0300
+Subject: [PATCH] Include missing <cstdint> includes
+
+* GCC-15 stopped implicitly including it.
+
+Signed-off-by: Alfred Wingate <parona@protonmail.com>
+--- a/xbmc/ContextMenuItem.h
++++ b/xbmc/ContextMenuItem.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <string>
+--- a/xbmc/addons/AddonManager.h
++++ b/xbmc/addons/AddonManager.h
+@@ -11,6 +11,7 @@
+ #include "threads/CriticalSection.h"
+ #include "utils/EventStream.h"
+
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <mutex>
+--- a/xbmc/addons/IAddon.h
++++ b/xbmc/addons/IAddon.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <string>
+--- a/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h
++++ b/xbmc/cores/RetroPlayer/streams/RetroPlayerVideo.h
+@@ -11,6 +11,8 @@
+ #include "IRetroPlayerStream.h"
+ #include "cores/RetroPlayer/RetroPlayerTypes.h"
+
++#include <cstdint>
++
+ extern "C"
+ {
+ #include <libavutil/pixfmt.h>
+--- a/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
++++ b/xbmc/cores/VideoPlayer/VideoRenderers/VideoShaders/ConversionMatrix.h
+@@ -10,6 +10,7 @@
+
+ #include <array>
+ #include <cmath>
++#include <cstdint>
+ #include <memory>
+
+ extern "C" {
+--- a/xbmc/guilib/FFmpegImage.h
++++ b/xbmc/guilib/FFmpegImage.h
+@@ -9,6 +9,8 @@
+ #pragma once
+
+ #include "iimage.h"
++
++#include <cstdint>
+ #include <memory>
+
+ extern "C"
+--- a/xbmc/input/keymaps/remote/IRTranslator.h
++++ b/xbmc/input/keymaps/remote/IRTranslator.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <map>
+ #include <memory>
+ #include <string>
+--- a/xbmc/messaging/ThreadMessage.h
++++ b/xbmc/messaging/ThreadMessage.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <memory>
+ #include <string>
+ #include <utility>
+--- a/xbmc/settings/AdvancedSettings.h
++++ b/xbmc/settings/AdvancedSettings.h
+@@ -13,6 +13,7 @@
+ #include "settings/lib/ISettingsHandler.h"
+ #include "utils/SortUtils.h"
+
++#include <cstdint>
+ #include <set>
+ #include <string>
+ #include <utility>
+--- a/xbmc/utils/Archive.h
++++ b/xbmc/utils/Archive.h
+@@ -8,6 +8,7 @@
+
+ #pragma once
+
++#include <cstdint>
+ #include <cstring>
+ #include <memory>
+ #include <string>
+--
+2.46.0
+
diff --git a/media-tv/kodi/kodi-21.1.ebuild b/media-tv/kodi/kodi-21.1.ebuild
index 09ed7be38e5e..7fb0e97e5bdf 100644
--- a/media-tv/kodi/kodi-21.1.ebuild
+++ b/media-tv/kodi/kodi-21.1.ebuild
@@ -278,6 +278,7 @@ BDEPEND="
PATCHES=(
"${FILESDIR}"/kodi-21-optional-ffmpeg-libx11.patch
"${FILESDIR}"/kodi-21.1-silence-libdvdread-git.patch
+ "${FILESDIR}"/kodi-21.1-fix-gcc15.patch
)
# bug #544020
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-09-14 19:56 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-11 21:54 [gentoo-commits] repo/gentoo:master commit in: media-tv/kodi/, media-tv/kodi/files/ Michał Górny
-- strict thread matches above, loose matches on Subject: below --
2024-09-14 19:56 Andreas Sturmlechner
2024-01-28 14:51 Sam James
2023-05-14 10:29 Andreas Sturmlechner
2022-11-23 6:01 Craig Andrews
2022-07-14 14:00 Craig Andrews
2021-06-25 13:35 Craig Andrews
2020-11-19 19:46 Craig Andrews
2020-09-01 18:59 Craig Andrews
2017-10-24 19:09 Craig Andrews
2017-08-29 14:42 Craig Andrews
2017-08-29 14:42 Craig Andrews
2017-07-11 21:54 Michał Górny
2017-07-11 21:54 Michał Górny
2017-01-10 15:07 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox