From: Craig Andrews Date: Thu, 19 Jan 2017 19:19:03 +0000 (-0500) Subject: media-tv/kodi: cleanup, fix build problem X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=e51d1977652b578378593e5c85111ae36c227d6b;p=gentoo.git media-tv/kodi: cleanup, fix build problem -17.0_rc3-r2, -9999: fix typo -14.1, -14.1, -15.2, -16.0, -16.1-r1, -17.0_rc3-r1, -17.0_rc3-r2, -17.0_rc3: remove obsoleted ebuilds -16.1-r2: fix loss of precision defined behavior build failure -9999: don't delete fontconfig files because upstream now handles that Gentoo-bugs: 606124, 600930 Closes: https://github.com/gentoo/gentoo/pull/3545 --- diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest index 0ff87d77f051..2cb91ec7d18a 100644 --- a/media-tv/kodi/Manifest +++ b/media-tv/kodi/Manifest @@ -1,9 +1,3 @@ -DIST kodi-14.1-generated-addons.tar.xz 71072 SHA256 0666eae88a3214f7577544975524b95a9f55b107cde5124d5d299351427c5d39 SHA512 a26889ba8af33316ac61bbf5a55ec6cd72cb867eac9b6d7c626ff890f3287de8704cf8372a5e2b72d6075ab8c31ba3d8465d1da0c9437065fe6e0171a560142f WHIRLPOOL 34a7067964febd71d5e07333a1ef90c14ad3d7d09e82aa4a3245b8174b068a1b2b31d0d6e5d20a449d11d34701b59611b725c8f37ce61702489c84bda16f227a -DIST kodi-14.1.tar.gz 70832109 SHA256 a38059e292cf8523918834e49fcc2d688525ceb7951ddf7f5ee535f4147255d6 SHA512 05dccad279073fc804faf2f179ba370f612d53c823dd333fdd151e05de37eb8202cc981ba48afff695d475bafde9c8f05f562fe09883593a70299a2f098a9849 WHIRLPOOL 464ff2673c9e65466dff73d3c91b8754ee68d64b4a18ebb0b0c6e8efa2da1cc32ab22686530a8469a105bf7a089d8928db64c5c61d272462c13485006875b506 -DIST kodi-15.2-generated-addons.tar.xz 73912 SHA256 8c604be6188e03569209632dca96a9e333fa898e41651ac81f7fad2a45163610 SHA512 094ac1373a80d08371daad8fb1ee4422b8c16f77430fcd4a2b78ed0dc1883027086081e5788e07333c345121a20fda89b0bd5bcb2c8922b79573aca6e4726b9a WHIRLPOOL 560b8de1fa506ea1a73b5a0c539563649159dbb83b9996dc550e706037c5ff15dc657f382e55b2812797c1eee596b2b3b84a0061b6c74b2a5179a126a1841583 -DIST kodi-15.2.tar.gz 61484128 SHA256 dd8aeb942e6de5d1488e243e1346cff3f6597e21b5131a3ba72ff5cc82037110 SHA512 870f67b83aaa96b1a4111f34824eb47c24616d067adf930f4456ca8f1ac57052c41aa73915304ea85b1d10390865b88d88c85e6cd425b42ec5a504908adf4b67 WHIRLPOOL 5d484ff8eb8b48de643bf6dbff0ca824d528143d2f6f78f124bae19a0f67db72271c865786520672ef716cedba4ad4ad11c59fe857c8b34ec9331724f09046c2 -DIST kodi-16.0-generated-addons.tar.xz 76876 SHA256 fb164bf2aaf54d0c4a6da60b768b40f47c61456ac9bfd5c859593e37c56080c4 SHA512 7b06e3dc7c7cad4b4bb43dafadb756e3b6064452d289b81097a5a340f33a0fd6b7da82954578039f980dd6338de4b6e0105ed69678c01548b4e79f072a120800 WHIRLPOOL bcff75cdc21cebff305052d985de9f88a3043d4a0aa81509c8daff3ace28fd18ca625f3394bd1b109ec242c3310a4934b4f4837355f39de47be6ff6031a1d13f -DIST kodi-16.0.tar.gz 52093964 SHA256 0421ea1337cdee674f8a36d995f54152b5ddc4100e53410b3aeeb3b3f7d53946 SHA512 b187f57601dfadc2119622f19558dbaca6ba7c708f5c24d65b876ee32888251940ffa8caadf978ee1afbd7c8da5007771e013d639819b998c345e968149995ac WHIRLPOOL ca19325b52c4c7de72a8d18cc9d68a83203274d3a432bcd83188904a9a2ba4e69372144c40ada3b3cd89ed12d740a1dceec75c5511b706b922374784bf817b3f DIST kodi-16.1-gcc-6.patch 63436 SHA256 cc4d730f163fcc3a99cb67480953cb043c17097d815bf41da441c7e66caaa0dc SHA512 9236608e26685feccd4492c58e7b5c4262e0ac100aabda46a565685eaa19af5b9bbe11f59cecc91de33474ac024ff74d670fe137fa2490f4ec1207817fb7fd23 WHIRLPOOL 336ba43387c154e67a5a3592675f802a50771e3bac14af79f9413773185f6b35e85a1af10988b96238a00e6a9c300caf856435f356572b7fb441e652164c8917 DIST kodi-16.1-generated-addons-r1.tar.xz 54528 SHA256 ffa06845ed95597b46a178575e361f0641f78778be553d7a9f51b4cc190d2629 SHA512 32c9a5bb6ed5f5d8e73a37c35268c1a7176c6a4c52c5b5e8f6c5c76a3c51445ff0a5b8802be94ada5d63ecbea4d7e69b61d579c931900f6ba6abb583bbe542d9 WHIRLPOOL 3cd62abee6854efbee0070d811d0ef03f7b2d1d629c91d43fb2a2883c83733267affef60339459ce1ca7e30b1b856e20b929883cd12958348803c428d69e142e DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d diff --git a/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch deleted file mode 100644 index 94b86666f9ed..000000000000 --- a/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch +++ /dev/null @@ -1,16 +0,0 @@ -sniped from: -http://cvs.rpmfusion.org/viewvc/rpms/kodi/devel/kodi-14.0-dvddemux-ffmpeg.patch?root=free&view=markup - ---- xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -+++ xbmc/cores/dvdplayer/DVDDemuxers/DVDDemuxFFmpeg.cpp -@@ -519,10 +519,6 @@ - - void CDVDDemuxFFmpeg::Flush() - { -- // naughty usage of an internal ffmpeg function -- if (m_pFormatContext) -- av_read_frame_flush(m_pFormatContext); -- - m_currentPts = DVD_NOPTS_VALUE; - - m_pkt.result = -1; diff --git a/media-tv/kodi/files/kodi-14.1-gcc-5.patch b/media-tv/kodi/files/kodi-14.1-gcc-5.patch deleted file mode 100644 index 5134ea1e10bd..000000000000 --- a/media-tv/kodi/files/kodi-14.1-gcc-5.patch +++ /dev/null @@ -1,47 +0,0 @@ -https://bugs.gentoo.org/557300 - -fix from upstream - -From 2d792707c7ad60c598616183bd1e7c41382961c3 Mon Sep 17 00:00:00 2001 -From: Michael Cronenworth -Date: Tue, 19 May 2015 16:43:36 -0500 -Subject: [PATCH] Always declare gnu89 inline standard - -GCC5 switches the minimum inline standard requirements from gnu89 to gnu11. ---- - xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h | 4 ---- - xbmc/screensavers/rsxs-0.9/lib/argp.h | 2 +- - 2 files changed, 1 insertion(+), 5 deletions(-) - -diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -index ff4f575..92eda3b 100644 ---- a/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -+++ b/xbmc/screensavers/rsxs-0.9/lib/argp-fmtstream.h -@@ -198,11 +198,7 @@ extern int __argp_fmtstream_ensure (argp_fmtstream_t __fs, size_t __amount); - #endif - - #ifndef ARGP_FS_EI --#ifdef __clang__ - #define ARGP_FS_EI extern inline __attribute__ ((__gnu_inline__)) --#else --#define ARGP_FS_EI extern inline --#endif - #endif - - ARGP_FS_EI size_t -diff --git a/xbmc/screensavers/rsxs-0.9/lib/argp.h b/xbmc/screensavers/rsxs-0.9/lib/argp.h -index ae7fa04..c83c75e 100644 ---- a/xbmc/screensavers/rsxs-0.9/lib/argp.h -+++ b/xbmc/screensavers/rsxs-0.9/lib/argp.h -@@ -559,7 +559,7 @@ extern void *__argp_input (const struct argp *__restrict __argp, - # endif - - # ifndef ARGP_EI --# define ARGP_EI extern __inline__ -+# define ARGP_EI extern __inline__ __attribute__ ((gnu_inline)) - # endif - - ARGP_EI void --- -2.4.4 - diff --git a/media-tv/kodi/files/kodi-15.1-texturepacker.patch b/media-tv/kodi/files/kodi-15.1-texturepacker.patch deleted file mode 100644 index 19309c58d447..000000000000 --- a/media-tv/kodi/files/kodi-15.1-texturepacker.patch +++ /dev/null @@ -1,25 +0,0 @@ ---- tools/depends/native/TexturePacker/Makefile -+++ tools/depends/native/TexturePacker/Makefile -@@ -9,14 +9,10 @@ - - ifeq ($(NATIVEPLATFORM),) - PLATFORM = native -- EXTRA_CONFIGURE = --enable-static - else - PLATFORM = $(NATIVEPLATFORM) - endif - --ifeq ($(NATIVE_OS), linux) -- EXTRA_CONFIGURE = --enable-static --endif - ifeq ($(NATIVE_OS), android) - EXTRA_CONFIGURE = --enable-static - endif -@@ -35,7 +35,6 @@ all: .installed-$(PLATFORM) - $(PLATFORM): ../libsquish-native/.installed-$(PLATFORM) - -rm -rf $(PLATFORM)/*; mkdir -p $(PLATFORM) - cd $(PLATFORM); cp -a $(SOURCE)/* . -- cd $(PLATFORM); ./autogen.sh - cd $(PLATFORM); ./configure --prefix=$(PREFIX) $(EXTRA_CONFIGURE) EXTRA_DEFINES="$(NATIVE_ARCH_DEFINES)" - - diff --git a/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch b/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch new file mode 100644 index 000000000000..30ed1e06793c --- /dev/null +++ b/media-tv/kodi/files/kodi-16.1-GUIFontTTFGL-loses-precision.patch @@ -0,0 +1,63 @@ +From fa6f5d761b600b0a8b52db18168e540b03f79ceb Mon Sep 17 00:00:00 2001 +From: Memphiz +Date: Mon, 21 Dec 2015 11:29:23 +0100 +Subject: [PATCH] [GUIFont] - the BufferHandle is a GLUInt for gl and gles and + a void * for dx + +--- + xbmc/guilib/GUIFontCache.h | 10 ++++++++-- + xbmc/guilib/GUIFontTTFGL.cpp | 4 ++-- + 2 files changed, 10 insertions(+), 4 deletions(-) + +diff --git a/xbmc/guilib/GUIFontCache.h b/xbmc/guilib/GUIFontCache.h +index 7cbe91d..ab35919 100644 +--- a/xbmc/guilib/GUIFontCache.h ++++ b/xbmc/guilib/GUIFontCache.h +@@ -37,6 +37,7 @@ + #include + + #include "TransformMatrix.h" ++#include "system.h" + + #define FONT_CACHE_TIME_LIMIT (1000) + #define FONT_CACHE_DIST_LIMIT (0.01f) +@@ -231,10 +232,15 @@ struct CGUIFontCacheDynamicPosition + + struct CVertexBuffer + { +- void *bufferHandle; ++#if defined(HAS_GL) || defined(HAS_GLES) ++ typedef unsigned int BufferHandleType; ++#elif defined(HAS_DX) ++ typedef void* BufferHandleType; ++#endif ++ BufferHandleType bufferHandle; // this is really a GLuint + size_t size; + CVertexBuffer() : bufferHandle(NULL), size(0), m_font(NULL) {} +- CVertexBuffer(void *bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} ++ CVertexBuffer(BufferHandleType bufferHandle, size_t size, const CGUIFontTTFBase *font) : bufferHandle(bufferHandle), size(size), m_font(font) {} + CVertexBuffer(const CVertexBuffer &other) : bufferHandle(other.bufferHandle), size(other.size), m_font(other.m_font) + { + /* In practice, the copy constructor is only called before a vertex buffer +diff --git a/xbmc/guilib/GUIFontTTFGL.cpp b/xbmc/guilib/GUIFontTTFGL.cpp +index f2f3a41..c4aaa3b 100644 +--- a/xbmc/guilib/GUIFontTTFGL.cpp ++++ b/xbmc/guilib/GUIFontTTFGL.cpp +@@ -232,7 +232,7 @@ void CGUIFontTTFGL::LastEnd() + glUniformMatrix4fv(modelLoc, 1, GL_FALSE, glMatrixModview.Get()); + + // Bind the buffer to the OpenGL context's GL_ARRAY_BUFFER binding point +- glBindBuffer(GL_ARRAY_BUFFER, (GLuint) m_vertexTrans[i].vertexBuffer->bufferHandle); ++ glBindBuffer(GL_ARRAY_BUFFER, m_vertexTrans[i].vertexBuffer->bufferHandle); + + // Do the actual drawing operation, split into groups of characters no + // larger than the pre-determined size of the element array +@@ -285,7 +285,7 @@ CVertexBuffer CGUIFontTTFGL::CreateVertexBuffer(const std::vector &vert + // Unbind GL_ARRAY_BUFFER + glBindBuffer(GL_ARRAY_BUFFER, 0); + +- return CVertexBuffer((void *) bufferHandle, vertices.size() / 4, this); ++ return CVertexBuffer(bufferHandle, vertices.size() / 4, this); + } + + void CGUIFontTTFGL::DestroyVertexBuffer(CVertexBuffer &buffer) const diff --git a/media-tv/kodi/files/kodi-9999-nomythtv.patch b/media-tv/kodi/files/kodi-9999-nomythtv.patch deleted file mode 100644 index 40ab23b98d1c..000000000000 --- a/media-tv/kodi/files/kodi-9999-nomythtv.patch +++ /dev/null @@ -1,67 +0,0 @@ -http://trac.xbmc.org/ticket/11775 - -make mythtv support optional - -diff --git a/Makefile.in b/Makefile.in -index 9ffae7e..17cc525 100755 ---- a/Makefile.in -+++ b/Makefile.in -@@ -209,7 +209,7 @@ LIB_DIRS=\ - lib/cpluff \ - lib/xbmc-dll-symbols - --ifeq (@USE_MYSQL@,1) -+ifeq (@USE_MYTHTV@,1) - LIB_DIRS += lib/cmyth - CMYTH=cmyth - endif -diff --git a/configure.in b/configure.in -index d44825f..629d7b4 100755 ---- a/configure.in -+++ b/configure.in -@@ -479,6 +479,12 @@ AC_ARG_ENABLE([mysql], - [AS_HELP_STRING([--disable-mysql], - [disable mysql])], - -+AC_ARG_ENABLE([mythtv], -+ [AS_HELP_STRING([--disable-mythtv], -+ [disable mythtv])], -+ [use_mythtv=$enableval], -+ [use_mythtv=yes]) -+ - AC_ARG_ENABLE([webserver], - [AS_HELP_STRING([--disable-webserver], - [disable webserver])], -@@ -1080,6 +1086,9 @@ if test "$use_mysql" = "yes"; then - else - AC_MSG_ERROR($missing_program) - fi -+ if test "$use_mythtv" = "yes"; then -+ AC_DEFINE([HAVE_MYTHTV],[1],["Define to 1 if you want mythtv support"]) -+ fi - fi - AC_CHECK_HEADER([ass/ass.h],, AC_MSG_ERROR($missing_library)) - AC_CHECK_HEADER([mpeg2dec/mpeg2.h],, AC_MSG_ERROR($missing_library)) -@@ -2372,6 +2381,15 @@ else - final_message="$final_message\n MySQL:\tNo" - USE_MYSQL=0 - fi -+ -+if test "$use_mythtv" = "yes"; then -+ final_message="$final_message\n MythTV:\tYes" -+ USE_MYTHTV=1 -+else -+ final_message="$final_message\n MythTV:\tNo" -+ USE_MYTHTV=0 -+fi -+ - if test "$use_webserver" = "yes"; then - final_message="$final_message\n Webserver:\tYes" - USE_WEB_SERVER=1 -@@ -2675,6 +2693,7 @@ AC_SUBST(USE_LIBUDEV) - AC_SUBST(USE_LIBUSB) - AC_SUBST(USE_LIBCEC) - AC_SUBST(USE_MYSQL) -+AC_SUBST(USE_MYTHTV) - AC_SUBST(USE_WAYLAND) - diff --git a/media-tv/kodi/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild deleted file mode 100644 index dcbc0a2a9089..000000000000 --- a/media-tv/kodi/kodi-14.1.ebuild +++ /dev/null @@ -1,283 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Does not work with py3 here -# It might work with py:2.5 but I didn't test that -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils python-single-r1 multiprocessing autotools - -CODENAME="Helix" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-2 - ;; -*|*_p*) - MY_PV=${PV/_p/_r} - MY_P="${PN}-${MY_PV}" - SRC_URI="http://mirrors.kodi.tv/releases/source/old/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz - https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz" - KEYWORDS="amd64 x86" - - S=${WORKDIR}/xbmc-${PV}-${CODENAME} - ;; -esac - -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" -IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs rtmp +samba sdl sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X +xrandr" -# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 -REQUIRED_USE=" - || ( gles opengl ) - gles? ( !vaapi ) - vaapi? ( !gles ) - pvr? ( mysql ) - rsxs? ( X ) - xrandr? ( X ) - joystick? ( sdl ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-i18n/enca - airplay? ( app-pda/libplist ) - dev-libs/boost - dev-libs/expat - dev-libs/fribidi - dev-libs/libcdio[-minimal] - cec? ( >=dev-libs/libcec-2.2 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - dev-libs/yajl - dev-python/simplejson[${PYTHON_USEDEP}] - media-fonts/corefonts - media-fonts/roboto - media-libs/alsa-lib - media-libs/flac - media-libs/fontconfig - media-libs/freetype - >=media-libs/glew-1.5.6:0= - media-libs/jasper:= - media-libs/jbigkit - >=media-libs/libass-0.9.7 - bluray? ( media-libs/libbluray ) - css? ( media-libs/libdvdcss ) - media-libs/libmad - media-libs/libmodplug - media-libs/libmpeg2 - media-libs/libogg - media-libs/libpng:0= - projectm? ( media-libs/libprojectm ) - media-libs/libsamplerate - sdl? ( media-libs/libsdl2 ) - >=media-libs/taglib-1.8 - media-libs/libvorbis - media-libs/tiff:0 - pulseaudio? ( media-sound/pulseaudio ) - media-sound/wavpack - >=media-video/ffmpeg-2.4:=[encode] - rtmp? ( media-video/rtmpdump ) - avahi? ( net-dns/avahi ) - nfs? ( net-fs/libnfs ) - net-libs/libmicrohttpd[messages] - sftp? ( net-libs/libssh[sftp] ) - net-misc/curl - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - bluetooth? ( net-wireless/bluez ) - sys-apps/dbus - caps? ( sys-libs/libcap ) - sys-libs/zlib - virtual/jpeg:0 - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - opengl? ( - virtual/glu - virtual/opengl - ) - gles? ( - virtual/opengl - media-libs/mesa[gles2] - ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] - ) - X? ( - x11-apps/xdpyinfo - x11-apps/mesa-progs - x11-libs/libXinerama - xrandr? ( x11-libs/libXrandr ) - x11-libs/libXrender - )" -RDEPEND="${COMMON_DEPEND} - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-lang/swig - dev-util/gperf - texturepacker? ( - media-libs/libsdl - media-libs/sdl-image - ) - sdl? ( media-libs/sdl-image ) - X? ( x11-proto/xineramaproto ) - dev-util/cmake - x86? ( dev-lang/nasm ) - java? ( virtual/jre ) - test? ( dev-cpp/gtest )" -# Force java for latest git version to avoid having to hand maintain the -# generated addons package. #488118 -[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" - -pkg_setup() { - python-single-r1_pkg_setup -} - -src_unpack() { - [[ ${PV} == "9999" ]] && git-2_src_unpack || default -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch - epatch "${FILESDIR}"/${P}-no-arm-flags.patch #400617 - epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36 - epatch "${FILESDIR}"/${P}-gcc-5.patch #557300 - epatch_user #293109 - - # The mythtv patch touches configure.ac, so force a regen - rm -f configure - - # some dirs ship generated autotools, some dont - multijob_init - local d - for d in $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) ; do - [[ -e ${d} ]] && continue - pushd ${d/%configure/.} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ - multijob_child_init eautoreconf - popd >/dev/null - done - multijob_finish - elibtoolize - - [[ ${PV} == "9999" ]] && emake -f codegenerator.mk - - # Disable internal func checks as our USE/DEPEND - # stuff handles this just fine already #408395 - export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes - - # Fix the final version string showing as "exported" - # instead of the SVN revision number. - export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} - - # 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 - - # Tweak autotool timestamps to avoid regeneration - find . -type f -exec touch -r configure {} + -} - -src_configure() { - # Disable documentation generation - export ac_cv_path_LATEX=no - # Avoid help2man - export HELP2MAN=$(type -P help2man || echo true) - # No configure flage for this #403561 - export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) - # Requiring java is asine #434662 - [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) - - econf \ - --docdir=/usr/share/doc/${PF} \ - --disable-ccache \ - --disable-optimizations \ - --with-ffmpeg=shared \ - $(use_enable airplay) \ - $(use_enable avahi) \ - $(use_enable bluray libbluray) \ - $(use_enable caps libcap) \ - $(use_enable cec libcec) \ - $(use_enable css dvdcss) \ - $(use_enable debug) \ - $(use_enable fishbmc) \ - $(use_enable gles) \ - $(use_enable goom) \ - $(use_enable joystick) \ - $(use_enable midi mid) \ - $(use_enable mysql) \ - $(use_enable nfs) \ - $(use_enable opengl gl) \ - $(use_enable profile profiling) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable pvr mythtv) \ - $(use_enable rsxs) \ - $(use_enable rtmp) \ - $(use_enable samba) \ - $(use_enable sdl) \ - $(use_enable sftp ssh) \ - $(use_enable usb libusb) \ - $(use_enable test gtest) \ - $(use_enable texturepacker) \ - $(use_enable upnp) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable webserver) \ - $(use_enable X x11) \ - $(use_enable xrandr) -} - -src_install() { - default - rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* - - domenu tools/Linux/kodi.desktop - newicon media/icon48x48.png kodi.png - - # Remove optional addons (platform specific and disabled by USE flag). - local disabled_addons=( - repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org - visualization.dxspectrum - ) - use fishbmc || disabled_addons+=( visualization.fishbmc ) - use projectm || disabled_addons+=( visualization.{milkdrop,projectm} ) - use rsxs || disabled_addons+=( screensaver.rsxs.{euphoria,plasma,solarwinds} ) - rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}" - - # Remove fonconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc - - # Replace bundled fonts with system ones - # teletext.ttf: unknown - # bold-caps.ttf: unknown - # roboto: roboto-bold, roboto-regular - # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514 - rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* - dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf - dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.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-15.2.ebuild b/media-tv/kodi/kodi-15.2.ebuild deleted file mode 100644 index b91644fb566e..000000000000 --- a/media-tv/kodi/kodi-15.2.ebuild +++ /dev/null @@ -1,288 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Does not work with py3 here -# It might work with py:2.5 but I didn't test that -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs - -CODENAME="Isengard" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-r3 - ;; -*|*_p*) - MY_PV=${PV/_p/_r} - MY_P="${PN}-${MY_PV}" - SRC_URI="http://mirrors.kodi.tv/releases/source/old/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz - https://github.com/xbmc/xbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz - !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons.tar.xz )" - KEYWORDS="~amd64 ~x86" - - S=${WORKDIR}/xbmc-${PV}-${CODENAME} - ;; -esac - -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" -IUSE="airplay alsa avahi bluetooth bluray caps cec css dbus debug +fishbmc gles goom java joystick midi mysql nfs +opengl profile +projectm pulseaudio +rsxs rtmp +samba sftp +spectrum test +texturepacker udisks upnp upower +usb vaapi vdpau +waveform webserver +X" -# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 -REQUIRED_USE=" - || ( gles opengl ) - gles? ( !vaapi ) - vaapi? ( !gles ) - rsxs? ( X ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-i18n/enca - airplay? ( app-pda/libplist ) - dev-libs/boost - dev-libs/expat - dev-libs/fribidi - dev-libs/libcdio[-minimal] - cec? ( >=dev-libs/libcec-3.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/simplejson[${PYTHON_USEDEP}] - media-fonts/corefonts - media-fonts/roboto - alsa? ( media-libs/alsa-lib ) - media-libs/flac - media-libs/fontconfig - media-libs/freetype - media-libs/jasper:= - media-libs/jbigkit - >=media-libs/libass-0.9.7 - bluray? ( media-libs/libbluray ) - css? ( media-libs/libdvdcss ) - media-libs/libmad - media-libs/libmodplug - media-libs/libmpeg2 - media-libs/libogg - media-libs/libpng:0= - projectm? ( media-libs/libprojectm ) - media-libs/libsamplerate - joystick? ( media-libs/libsdl2 ) - >=media-libs/taglib-1.8 - media-libs/libvorbis - media-libs/tiff:0= - pulseaudio? ( media-sound/pulseaudio ) - media-sound/wavpack - >=media-video/ffmpeg-2.6:=[encode] - rtmp? ( media-video/rtmpdump ) - avahi? ( net-dns/avahi ) - nfs? ( net-fs/libnfs:= ) - webserver? ( net-libs/libmicrohttpd[messages] ) - sftp? ( net-libs/libssh[sftp] ) - net-misc/curl - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - bluetooth? ( net-wireless/bluez ) - dbus? ( sys-apps/dbus ) - caps? ( sys-libs/libcap ) - sys-libs/zlib - virtual/jpeg:0= - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - opengl? ( - virtual/glu - virtual/opengl - >=media-libs/glew-1.5.6:0= - ) - gles? ( - media-libs/mesa[gles2] - ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( x11-libs/libvdpau >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] - ) - X? ( - x11-apps/xdpyinfo - x11-apps/mesa-progs - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - )" -RDEPEND="${COMMON_DEPEND} - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-lang/swig - dev-util/gperf - texturepacker? ( media-libs/giflib ) - X? ( x11-proto/xineramaproto ) - dev-util/cmake - x86? ( dev-lang/nasm ) - java? ( virtual/jre ) - test? ( dev-cpp/gtest )" -# Force java for latest git version to avoid having to hand maintain the -# generated addons package. #488118 -[[ ${PV} == "9999" ]] && DEPEND+=" 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() { - [[ ${PV} == "9999" ]] && git-r3_src_unpack || default -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617 - epatch "${FILESDIR}"/${PN}-15.1-texturepacker.patch - epatch_user #293109 - - # some dirs ship generated autotools, some dont - multijob_init - local d dirs=( - tools/depends/native/TexturePacker/src/configure - $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) - ) - for d in "${dirs[@]}" ; do - [[ -e ${d} ]] && continue - pushd ${d/%configure/.} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ - multijob_child_init eautoreconf - popd >/dev/null - done - multijob_finish - elibtoolize - - if [[ ${PV} == "9999" ]] || use java ; then #558798 - tc-env_build emake -f codegenerator.mk - fi - - # Disable internal func checks as our USE/DEPEND - # stuff handles this just fine already #408395 - export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes - - # Fix the final version string showing as "exported" - # instead of the SVN revision number. - export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} - - # 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 - - # Tweak autotool timestamps to avoid regeneration - find . -type f -exec touch -r configure {} + -} - -src_configure() { - # Disable documentation generation - export ac_cv_path_LATEX=no - # Avoid help2man - export HELP2MAN=$(type -P help2man || echo true) - # No configure flage for this #403561 - export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) - # Requiring java is asine #434662 - [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) - - econf \ - --docdir=/usr/share/doc/${PF} \ - --disable-ccache \ - --disable-optimizations \ - --with-ffmpeg=shared \ - $(use_enable alsa) \ - $(use_enable airplay) \ - $(use_enable avahi) \ - $(use_enable bluray libbluray) \ - $(use_enable caps libcap) \ - $(use_enable cec libcec) \ - $(use_enable css dvdcss) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable fishbmc) \ - $(use_enable gles) \ - $(use_enable goom) \ - $(use_enable joystick) \ - $(use_enable midi mid) \ - $(use_enable mysql) \ - $(use_enable nfs) \ - $(use_enable opengl gl) \ - $(use_enable profile profiling) \ - $(use_enable projectm) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rsxs) \ - $(use_enable rtmp) \ - $(use_enable samba) \ - $(use_enable sftp ssh) \ - $(use_enable spectrum) \ - $(use_enable usb libusb) \ - $(use_enable test gtest) \ - $(use_enable texturepacker) \ - $(use_enable upnp) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable waveform) \ - $(use_enable webserver) \ - $(use_enable X x11) -} - -src_compile() { - emake V=1 -} - -src_install() { - default - rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* - - domenu tools/Linux/kodi.desktop - newicon media/icon48x48.png kodi.png - - # Remove optional addons (platform specific). - local disabled_addons=( - repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org - visualization.dxspectrum - visualization.vortex - ) - rm -rf "${disabled_addons[@]/#/${ED}/usr/share/kodi/addons/}" - - # Remove fonconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc - - # Replace bundled fonts with system ones - # teletext.ttf: unknown - # bold-caps.ttf: unknown - # roboto: roboto-bold, roboto-regular - # arial.ttf: font mashed from droid/roboto, not removed wrt bug#460514 - rm -rf "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* - dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf - dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.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-16.0.ebuild b/media-tv/kodi/kodi-16.0.ebuild deleted file mode 100644 index faa7ec2919b6..000000000000 --- a/media-tv/kodi/kodi-16.0.ebuild +++ /dev/null @@ -1,294 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs - -CODENAME="Jarvis" -case ${PV} in -9999) - EGIT_REPO_URI="git://github.com/xbmc/xbmc.git" - inherit git-r3 - ;; -*|*_p*) - MY_PV=${PV/_p/_r} - MY_P="${PN}-${MY_PV}" - SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz - https://github.com/xbmc/xbmc/archive/${PV}-${CODENAME}.tar.gz -> ${P}.tar.gz - !java? ( http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz )" - KEYWORDS="~amd64 ~x86" - - S=${WORKDIR}/xbmc-${PV}-${CODENAME} - ;; -esac - -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" -IUSE="airplay alsa bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X zeroconf" -# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 -REQUIRED_USE=" - || ( gles opengl ) - gles? ( !vaapi ) - vaapi? ( !gles ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-i18n/enca - airplay? ( app-pda/libplist ) - dev-libs/boost - dev-libs/expat - dev-libs/fribidi - dev-libs/libcdio[-minimal] - cec? ( >=dev-libs/libcec-3.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/simplejson[${PYTHON_USEDEP}] - media-fonts/corefonts - media-fonts/roboto - alsa? ( media-libs/alsa-lib ) - media-libs/flac - media-libs/fontconfig - media-libs/freetype - media-libs/jasper:= - media-libs/jbigkit - >=media-libs/libass-0.9.7 - bluray? ( >=media-libs/libbluray-0.7.0 ) - css? ( media-libs/libdvdcss ) - media-libs/libmad - media-libs/libmodplug - media-libs/libmpeg2 - media-libs/libogg - media-libs/libpng:0= - media-libs/libsamplerate - joystick? ( media-libs/libsdl2 ) - >=media-libs/taglib-1.8 - media-libs/libvorbis - media-libs/tiff:0= - media-sound/dcadec - pulseaudio? ( media-sound/pulseaudio ) - media-sound/wavpack - >=media-video/ffmpeg-2.6:=[encode] - rtmp? ( media-video/rtmpdump ) - nfs? ( net-fs/libnfs:= ) - webserver? ( net-libs/libmicrohttpd[messages] ) - sftp? ( net-libs/libssh[sftp] ) - net-misc/curl - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - bluetooth? ( net-wireless/bluez ) - dbus? ( sys-apps/dbus ) - caps? ( sys-libs/libcap ) - sys-libs/zlib - virtual/jpeg:0= - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - opengl? ( - virtual/glu - virtual/opengl - >=media-libs/glew-1.5.6:0= - ) - gles? ( - media-libs/mesa[gles2] - ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] - ) - X? ( - x11-apps/xdpyinfo - x11-apps/mesa-progs - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - ) - zeroconf? ( net-dns/avahi ) -" -RDEPEND="${COMMON_DEPEND} - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-lang/swig - dev-libs/crossguid - dev-util/gperf - texturepacker? ( media-libs/giflib ) - X? ( x11-proto/xineramaproto ) - dev-util/cmake - x86? ( dev-lang/nasm ) - java? ( virtual/jre ) - test? ( dev-cpp/gtest ) - virtual/pkgconfig" -# Force java for latest git version to avoid having to hand maintain the -# generated addons package. #488118 -[[ ${PV} == "9999" ]] && DEPEND+=" 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() { - [[ ${PV} == "9999" ]] && git-r3_src_unpack || default -} - -src_prepare() { - epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617 - epatch "${FILESDIR}"/${PN}-9999-texturepacker.patch - epatch "${FILESDIR}"/${PN}-16-ffmpeg3.patch - epatch_user #293109 - - # some dirs ship generated autotools, some dont - multijob_init - local d dirs=( - tools/depends/native/TexturePacker/src/configure - $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) - ) - for d in "${dirs[@]}" ; do - [[ -e ${d} ]] && continue - pushd ${d/%configure/.} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ - multijob_child_init eautoreconf - popd >/dev/null - done - multijob_finish - elibtoolize - - # Cross-compiler support - # We need JsonSchemaBuilder and TexturePacker binaries for the host system - # Later we need libsquish for the target system - if tc-is-cross-compiler ; then - mkdir "${WORKDIR}"/${CBUILD} || die - pushd "${WORKDIR}"/${CBUILD} >/dev/null || die - einfo "Building host tools" - cp -a "$S"/{tools,xbmc} ./ || die - local tools=( JsonSchemaBuilder ) - use texturepacker && tools+=( TexturePacker ) - for tool in "${tools[@]}" ; do - tc-env_build emake -C tools/depends/native/$tool - mkdir "$S"/tools/depends/native/$tool/bin || die - ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die - done - popd >/dev/null || die - - emake -f codegenerator.mk - - # Binary kodi.bin links against libsquish, - # so we need libsquish compiled for the target system - emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX) - elif [[ ${PV} == "9999" ]] || use java ; then #558798 - tc-env_build emake -f codegenerator.mk - fi - - # Disable internal func checks as our USE/DEPEND - # stuff handles this just fine already #408395 - export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes - - # Fix the final version string showing as "exported" - # instead of the SVN revision number. - export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} - - # 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 - - # Tweak autotool timestamps to avoid regeneration - find . -type f -exec touch -r configure {} + -} - -src_configure() { - # Disable documentation generation - export ac_cv_path_LATEX=no - # Avoid help2man - export HELP2MAN=$(type -P help2man || echo true) - # No configure flage for this #403561 - export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) - # Requiring java is asine #434662 - [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) - - econf \ - --docdir=/usr/share/doc/${PF} \ - --disable-ccache \ - --disable-optimizations \ - --with-ffmpeg=shared \ - $(use_enable alsa) \ - $(use_enable airplay) \ - $(use_enable bluray libbluray) \ - $(use_enable caps libcap) \ - $(use_enable cec libcec) \ - $(use_enable css dvdcss) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable gles) \ - $(use_enable joystick) \ - $(use_enable midi mid) \ - $(use_enable mysql) \ - $(use_enable nfs) \ - $(use_enable opengl gl) \ - $(use_enable profile profiling) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rtmp) \ - $(use_enable samba) \ - $(use_enable sftp ssh) \ - $(use_enable usb libusb) \ - $(use_enable test gtest) \ - $(use_enable texturepacker) \ - $(use_enable upnp) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable webserver) \ - $(use_enable X x11) \ - $(use_enable zeroconf avahi) -} - -src_compile() { - emake V=1 -} - -src_install() { - default - rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - domenu tools/Linux/kodi.desktop - newicon media/icon48x48.png kodi.png - - # Remove fonconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - rm -rf "${ED}"/usr/share/kodi/system/players/dvdplayer/etc - - # Replace bundled fonts with system ones. - rm "${ED}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die - dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf - dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.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-16.1-r1.ebuild b/media-tv/kodi/kodi-16.1-r1.ebuild deleted file mode 100644 index cd4c0e74cf12..000000000000 --- a/media-tv/kodi/kodi-16.1-r1.ebuild +++ /dev/null @@ -1,302 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 multiprocessing autotools toolchain-funcs - -CODENAME="Jarvis" -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 - https://dev.gentoo.org/~soap/distfiles/${PN}-${PV}-gcc-6.patch - !java? ( https://github.com/candrews/gentoo-kodi/raw/master/${MY_P}-generated-addons-r1.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/" - -LICENSE="GPL-2" -SLOT="0" -IUSE="airplay alsa bluetooth bluray caps cec css dbus debug gles java joystick midi mysql nfs +opengl profile pulseaudio rtmp +samba sftp systemd test +texturepacker udisks upnp upower +usb vaapi vdpau webserver +X zeroconf" -# gles/vaapi: http://trac.kodi.tv/ticket/10552 #464306 -REQUIRED_USE=" - || ( gles opengl ) - ?? ( gles vaapi ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - app-arch/bzip2 - app-arch/unzip - app-arch/zip - app-i18n/enca - airplay? ( app-pda/libplist ) - dev-libs/boost:= - dev-libs/expat - dev-libs/fribidi - dev-libs/libcdio[-minimal] - cec? ( >=dev-libs/libcec-3.0 ) - dev-libs/libpcre[cxx] - dev-libs/libxml2 - dev-libs/libxslt - >=dev-libs/lzo-2.04 - dev-libs/tinyxml[stl] - >=dev-libs/yajl-2 - dev-python/simplejson[${PYTHON_USEDEP}] - media-fonts/corefonts - media-fonts/roboto - alsa? ( media-libs/alsa-lib ) - media-libs/flac - media-libs/fontconfig - media-libs/freetype - media-libs/jasper:= - media-libs/jbigkit - >=media-libs/libass-0.9.7 - bluray? ( >=media-libs/libbluray-0.7.0 ) - css? ( media-libs/libdvdcss ) - media-libs/libmad - media-libs/libmodplug - media-libs/libmpeg2 - media-libs/libogg - media-libs/libpng:0= - media-libs/libsamplerate - joystick? ( media-libs/libsdl2 ) - >=media-libs/taglib-1.8 - media-libs/libvorbis - media-libs/tiff:0= - media-sound/dcadec - pulseaudio? ( media-sound/pulseaudio ) - media-sound/wavpack - >=media-video/ffmpeg-2.6:=[encode] - rtmp? ( media-video/rtmpdump ) - nfs? ( net-fs/libnfs:= ) - webserver? ( net-libs/libmicrohttpd[messages] ) - sftp? ( net-libs/libssh[sftp] ) - net-misc/curl - samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) - bluetooth? ( net-wireless/bluez ) - dbus? ( sys-apps/dbus ) - caps? ( sys-libs/libcap ) - sys-libs/zlib - virtual/jpeg:0= - usb? ( virtual/libusb:1 ) - mysql? ( virtual/mysql ) - opengl? ( - virtual/glu - virtual/opengl - >=media-libs/glew-1.5.6:= - ) - gles? ( - media-libs/mesa[gles2] - ) - vaapi? ( x11-libs/libva[opengl] ) - vdpau? ( - || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) - media-video/ffmpeg[vdpau] - ) - X? ( - x11-apps/xdpyinfo - x11-apps/mesa-progs - x11-libs/libXinerama - x11-libs/libXrandr - x11-libs/libXrender - ) - zeroconf? ( net-dns/avahi[dbus] ) -" -RDEPEND="${COMMON_DEPEND} - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( - systemd? ( sys-power/upower ) - !systemd? ( sys-power/upower-pm-utils ) - )" -DEPEND="${COMMON_DEPEND} - app-arch/xz-utils - dev-lang/swig - dev-libs/crossguid - dev-util/gperf - texturepacker? ( media-libs/giflib ) - X? ( x11-proto/xineramaproto ) - dev-util/cmake - x86? ( dev-lang/nasm ) - java? ( virtual/jre ) - test? ( dev-cpp/gtest ) - virtual/pkgconfig" -# Force java for latest git version to avoid having to hand maintain the -# generated addons package. #488118 -[[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre" - -PATCHES=( - "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887 - "${FILESDIR}"/${PN}-9999-texturepacker.patch - "${FILESDIR}"/${PN}-16-ffmpeg3.patch - "${DISTDIR}"/${PN}-${PV}-gcc-6.patch #592446 -) - -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() { - [[ ${PV} == "9999" ]] && git-r3_src_unpack || default -} - -src_prepare() { - default - - # some dirs ship generated autotools, some dont - multijob_init - local d dirs=( - tools/depends/native/TexturePacker/src/configure - $(printf 'f:\n\t@echo $(BOOTSTRAP_TARGETS)\ninclude bootstrap.mk\n' | emake -f - f) - ) - for d in "${dirs[@]}" ; do - [[ -e ${d} ]] && continue - pushd ${d/%configure/.} >/dev/null || die - AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \ - multijob_child_init eautoreconf - popd >/dev/null || die - done - multijob_finish - elibtoolize - - # Cross-compiler support - # We need JsonSchemaBuilder and TexturePacker binaries for the host system - # Later we need libsquish for the target system - if tc-is-cross-compiler ; then - mkdir "${WORKDIR}"/${CBUILD} || die - pushd "${WORKDIR}"/${CBUILD} >/dev/null || die - einfo "Building host tools" - cp -a "$S"/{tools,xbmc} ./ || die - local tools=( JsonSchemaBuilder ) - use texturepacker && tools+=( TexturePacker ) - for tool in "${tools[@]}" ; do - tc-env_build emake -C tools/depends/native/$tool - mkdir "$S"/tools/depends/native/$tool/bin || die - ln -s "${WORKDIR}"/${CBUILD}/tools/depends/native/$tool/bin/$tool "$S"/tools/depends/native/$tool/bin/$tool || die - done - popd >/dev/null || die - - emake -f codegenerator.mk - - # Binary kodi.bin links against libsquish, - # so we need libsquish compiled for the target system - emake -C tools/depends/native/libsquish-native/ CXX=$(tc-getCXX) - elif [[ ${PV} == "9999" ]] || use java ; then #558798 - tc-env_build emake -f codegenerator.mk - fi - - # Disable internal func checks as our USE/DEPEND - # stuff handles this just fine already #408395 - export ac_cv_lib_avcodec_ff_vdpau_vc1_decode_picture=yes - - # Fix the final version string showing as "exported" - # instead of the SVN revision number. - export HAVE_GIT=no GIT_REV=${EGIT_VERSION:-exported} - - # 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 - - # Tweak autotool timestamps to avoid regeneration - find . -type f -exec touch -r configure {} + || die -} - -src_configure() { - # Disable documentation generation - export ac_cv_path_LATEX=no - # Avoid help2man - export HELP2MAN=$(type -P help2man || echo true) - # No configure flage for this #403561 - export ac_cv_lib_bluetooth_hci_devid=$(usex bluetooth) - # Requiring java is asine #434662 - [[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java java true)) - - econf \ - --disable-ccache \ - --disable-optimizations \ - --with-ffmpeg=shared \ - $(use_enable alsa) \ - $(use_enable airplay) \ - $(use_enable bluray libbluray) \ - $(use_enable caps libcap) \ - $(use_enable cec libcec) \ - $(use_enable css dvdcss) \ - $(use_enable dbus) \ - $(use_enable debug) \ - $(use_enable gles) \ - $(use_enable joystick) \ - $(use_enable midi mid) \ - $(use_enable mysql) \ - $(use_enable nfs) \ - $(use_enable opengl gl) \ - $(use_enable profile profiling) \ - $(use_enable pulseaudio pulse) \ - $(use_enable rtmp) \ - $(use_enable samba) \ - $(use_enable sftp ssh) \ - $(use_enable usb libusb) \ - $(use_enable test gtest) \ - $(use_enable texturepacker) \ - $(use_enable upnp) \ - $(use_enable vaapi) \ - $(use_enable vdpau) \ - $(use_enable webserver) \ - $(use_enable X x11) \ - $(use_enable zeroconf avahi) -} - -src_compile() { - emake V=1 -} - -src_install() { - default - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - domenu tools/Linux/kodi.desktop - newicon media/icon48x48.png kodi.png - - # Remove fontconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.confluence/fonts/Roboto-* || die - dosym /usr/share/fonts/roboto/Roboto-Regular.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Regular.ttf - dosym /usr/share/fonts/roboto/Roboto-Bold.ttf \ - /usr/share/kodi/addons/skin.confluence/fonts/Roboto-Bold.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-16.1-r2.ebuild b/media-tv/kodi/kodi-16.1-r2.ebuild index e95080f1d98e..890e3881d44c 100644 --- a/media-tv/kodi/kodi-16.1-r2.ebuild +++ b/media-tv/kodi/kodi-16.1-r2.ebuild @@ -153,6 +153,7 @@ PATCHES=( "${FILESDIR}"/${PN}-9999-texturepacker.patch "${FILESDIR}"/${PN}-16-ffmpeg3.patch "${DISTDIR}"/${PN}-${PV}-gcc-6.patch #592446 + "${FILESDIR}"/${PN}-${PV}-GUIFontTTFGL-loses-precision.patch ) CONFIG_CHECK="~IP_MULTICAST" diff --git a/media-tv/kodi/kodi-17.0_rc3-r1.ebuild b/media-tv/kodi/kodi-17.0_rc3-r1.ebuild deleted file mode 100644 index 4fa9342bad2e..000000000000 --- a/media-tv/kodi/kodi-17.0_rc3-r1.ebuild +++ /dev/null @@ -1,277 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 cmake-utils autotools - -LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" -LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" -LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" -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" - -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 +ssl pulseaudio samba sftp systemd test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( app-pda/libplist ) - 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 - dvd? ( dev-libs/libcdio[-minimal] ) - 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 - >=media-video/ffmpeg-3.1.6:=[encode] - mysql? ( virtual/mysql ) - >=net-misc/curl-7.51.0 - nfs? ( net-fs/libnfs:= ) - opengl? ( media-libs/glu ) - ssl? ( - !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 ) - 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 ) - ) -" -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 -} - -src_configure() { - local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) - - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=OFF - -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=OFF - -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=$(usex ssl) - -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) ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usev test) -} - -src_install() { - cmake-utils_src_install - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - newicon media/icon48x48.png kodi.png - - # Remove fontconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - # Will be fixed upstream so this deletion will be unnecesssary, see https://github.com/xbmc/xbmc/pull/11451 - rm -rf "${ED%/}"/usr/share/kodi/system/players/VideoPlayer/etc || die - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die - dosym /usr/share/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 /usr/share/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 /usr/share/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.0_rc3-r2.ebuild b/media-tv/kodi/kodi-17.0_rc3-r2.ebuild index de9404cdba83..6eb7278d3edf 100644 --- a/media-tv/kodi/kodi-17.0_rc3-r2.ebuild +++ b/media-tv/kodi/kodi-17.0_rc3-r2.ebuild @@ -201,7 +201,7 @@ src_configure() { local mycmakeargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DNABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 + -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 -DENABLE_ALSA=$(usex alsa) -DENABLE_AIRTUNES=OFF -DENABLE_AVAHI=$(usex zeroconf) diff --git a/media-tv/kodi/kodi-17.0_rc3.ebuild b/media-tv/kodi/kodi-17.0_rc3.ebuild deleted file mode 100644 index cf1ad1bb860f..000000000000 --- a/media-tv/kodi/kodi-17.0_rc3.ebuild +++ /dev/null @@ -1,251 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -# Does not work with py3 here -PYTHON_COMPAT=( python2_7 ) -PYTHON_REQ_USE="sqlite" - -inherit eutils linux-info python-single-r1 cmake-utils - -LIBDVDCSS_COMMIT="2f12236bc1c92f73c21e973363f79eb300de603f" -LIBDVDREAD_COMMIT="17d99db97e7b8f23077b342369d3c22a6250affd" -LIBDVDNAV_COMMIT="43b5f81f5fe30bceae3b7cecf2b0ca57fc930dac" -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" - -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 +ssl pulseaudio samba sftp test +udev udisks upnp upower vaapi vdpau webserver +X +xslt zeroconf" -REQUIRED_USE=" - ${PYTHON_REQUIRED_USE} - || ( gles opengl ) - udev? ( !libusb ) - udisks? ( dbus ) - upower? ( dbus ) -" - -COMMON_DEPEND="${PYTHON_DEPS} - airplay? ( app-pda/libplist ) - 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}] - dvd? ( dev-libs/libcdio[-minimal] ) - gles? ( media-libs/mesa[gles2] ) - libusb? ( virtual/libusb:1 ) - media-fonts/corefonts - media-fonts/noto - 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 - >=media-video/ffmpeg-3.1.6:=[encode] - mysql? ( virtual/mysql ) - >=net-misc/curl-7.51.0 - nfs? ( net-fs/libnfs:= ) - opengl? ( media-libs/glu ) - ssl? ( - !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 ) - 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 ) -" -RDEPEND="${COMMON_DEPEND} - lirc? ( - || ( app-misc/lirc app-misc/inputlircd ) - ) - !media-tv/xbmc - udisks? ( sys-fs/udisks:0 ) - upower? ( || ( sys-power/upower sys-power/upower-pm-utils ) ) -" -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 -} - -src_configure() { - local CMAKE_BUILD_TYPE=$(usex debug Debug RelWithDebInfo) - - local mycmakeargs=( - -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AIRTUNES=OFF - -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=OFF - -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=$(usex ssl) - -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) ) - - cmake-utils_src_configure -} - -src_compile() { - cmake-utils_src_compile all $(usev test) -} - -src_install() { - cmake-utils_src_install - rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die - - newicon media/icon48x48.png kodi.png - - # Remove fontconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - rm -rf "${ED%/}"/usr/share/kodi/system/players/dvdplayer/etc || die - - # Replace bundled fonts with system ones. - rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die - dosym /usr/share/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 /usr/share/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 /usr/share/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-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild index 47143985fc7e..543b9d37200f 100644 --- a/media-tv/kodi/kodi-9999.ebuild +++ b/media-tv/kodi/kodi-9999.ebuild @@ -199,7 +199,7 @@ src_configure() { local mycmakeargs=( -Ddocdir="${EPREFIX}/usr/share/doc/${PF}" - -DNABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 + -DENABLE_LDGOLD=OFF # https://bugs.gentoo.org/show_bug.cgi?id=606124 -DENABLE_ALSA=$(usex alsa) -DENABLE_AIRTUNES=OFF -DENABLE_AVAHI=$(usex zeroconf) @@ -251,12 +251,6 @@ src_install() { newicon media/icon48x48.png kodi.png - # Remove fontconfig settings that are used only on MacOSX. - # Can't be patched upstream because they just find all files and install - # them into same structure like they have in git. - # Will be fixed upstream so this deletion will be unnecesssary, see https://github.com/xbmc/xbmc/pull/11451 - rm -rf "${ED%/}"/usr/share/kodi/system/players/VideoPlayer/etc || die - # Replace bundled fonts with system ones. rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/NotoSans-Regular.ttf || die dosym /usr/share/fonts/noto/NotoSans-Regular.ttf \ diff --git a/media-tv/kodi/metadata.xml b/media-tv/kodi/metadata.xml index b66ff11ec367..b6237a3dd8fd 100644 --- a/media-tv/kodi/metadata.xml +++ b/media-tv/kodi/metadata.xml @@ -13,26 +13,18 @@ enable AirPlay support Enable playback of Blu-ray filesystems Enable support for HDMI-CEC devices via libcec - Enable fishBMC visualization plugin Enable support for GLES - Enable GOOM visualization plugin Enable support for controlling Totem with a remote control using app-misc/lirc Support MIDI files Enable NFS client support Enable non-free components Enable optical (CD/DVD drive) support - Enable projectM visualization plugin - Enable MythTV support Enable Real Time Messaging Protocol using librtmp - Enable really slick X screensavers Support browsing files over SFTP - Enable spectrum visualization plugin Support packing skin textures Use virtual/libusb for usb device hotplug support. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use sys-fs/udev. Use sys-fs/udev rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness. - Enable waveform visualization plugin Enable internal webserver - Support X randr extension Enable XSLT support using dev-libs/libxslt