media-tv/kodi-16.1 and media-tv/kodi-17.0_beta3: version bump
authorCraig Andrews <candrews@integralblue.com>
Sun, 3 Jul 2016 20:08:08 +0000 (16:08 -0400)
committerDavid Seifert <soap@gentoo.org>
Tue, 25 Oct 2016 08:13:15 +0000 (10:13 +0200)
Update to EAPI 6

Hard mask >=media-tv/kodi-17.0_alpha because it depends on >=media-video/ffmpeg-3.0 which is hard masked

Gentoo-bug: 581276
Closes: https://github.com/gentoo/gentoo/pull/1821

Signed-off-by: David Seifert <soap@gentoo.org>
media-tv/kodi/Manifest
media-tv/kodi/files/kodi-9999-texturepacker.patch
media-tv/kodi/kodi-16.1.ebuild [new file with mode: 0644]
media-tv/kodi/kodi-17.0_beta3.ebuild [new file with mode: 0644]
media-tv/kodi/kodi-9999.ebuild
profiles/package.mask

index 30575a0bf4faf4ce9277e07822dd72423ed1cec1..1b3f3b048fc70d918d93a91f121dd1581de76ffc 100644 (file)
@@ -4,3 +4,7 @@ DIST kodi-15.2-generated-addons.tar.xz 73912 SHA256 8c604be6188e03569209632dca96
 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-generated-addons.tar.xz 38988 SHA256 9e5187b26e9aa5e273ae84a2435db00d219a07631dc7b3a84a1c60aff61ef2f6 SHA512 e4da65ff96ccef7cb3be8bdc617917eb2dcec51241a8eeaefb908c99013d50a0dc8cd1fc16ac6c81409983c15f60958b19ef1baa84f638e9f888507f0df490be WHIRLPOOL b80161d54b8a7de2b2b0c907d42e574e5ccc0a4fac66f4a64d96cef6c8fa299a0f2704e93d02b42350eef044d3271d8614a24550b31aff026aec5a384fe69a1c
+DIST kodi-16.1.tar.gz 52091107 SHA256 7d82c8aff2715c83deecdf10c566e26105bec0473af530a1356d4c747ebdfd10 SHA512 fe7012ea899906d418faa19af5066e5976d092745e91030106ea4f75399ad67a4bb4e4f384605ab7b2d9e24174aab2e243531f31d79ff5ae33564361b25eb073 WHIRLPOOL eabe28e2d0bf35dc1272551e9179b2450607c97295daffcfa5ce90a56c5db42467fe0f9ba43cc542a0843cb867554682e9cd223a326c37bee7dfd086cb40ec4d
+DIST kodi-17.0b3-generated-addons.tar.xz 56996 SHA256 b475d2b0f1beff7e4775e99bfb2f5686d748202365a357bdeed3d7e5c7c01d20 SHA512 5318ec97e16864ff7a1f5fae1ac7f67636b2af58775389bde57fc7fee00eae6621f04810fffafeda215c8de0d47d2ed86025f585a9f18e10eae1d9193654fff2 WHIRLPOOL 928bdf9f7b3440c6300337e310cd1d4b8113d9f54819df6c91cab6f29a2919811dd418cb13bd3a02bef37289a5485f353d8ba814e454d62b3caea27ae304afd2
+DIST kodi-17.0b3.tar.gz 54917517 SHA256 c6008bb1320249a85f3f133897eab683ddd55c733b9b8984b53110e41cf5733c SHA512 ceaf0760c16f8b7c0f6ac0b0789389589bf7bc2a7c6d46b109a1772d5feabead1a13ee92852a6c6e3a85996129bc052e07f8ce6f5e4d8f5a9ffcf85a0f69b3cf WHIRLPOOL 7ba809c3e9944ec5e4340a038a9e8b56eec8d7be79079ad67d4909bad1e21b1ecd65e4f932e6afff72941fc2b66b9718697eedfd8e6a8dfea3910d257135aabd
index fe3dcdcf7a87bf0d6a3d35a8785dd8bff60b4a28..a39244312a42fa5dda13d182e7285cb0f36fb1cd 100644 (file)
@@ -1,5 +1,5 @@
---- tools/depends/native/TexturePacker/Makefile.old    2015-03-17 22:29:18.880029509 +0100
-+++ tools/depends/native/TexturePacker/Makefile        2015-03-17 22:29:41.459671679 +0100
+--- a/tools/depends/native/TexturePacker/Makefile      2015-03-17 22:29:18.880029509 +0100
++++ b/tools/depends/native/TexturePacker/Makefile      2015-03-17 22:29:41.459671679 +0100
 @@ -9,14 +9,10 @@
  
  ifeq ($(NATIVEPLATFORM),)
diff --git a/media-tv/kodi/kodi-16.1.ebuild b/media-tv/kodi/kodi-16.1.ebuild
new file mode 100644 (file)
index 0000000..f77dc64
--- /dev/null
@@ -0,0 +1,275 @@
+# Copyright 1999-2016 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
+               !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/"
+
+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 )
+       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 )
+"
+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"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887
+       "${FILESDIR}"/${PN}-9999-texturepacker.patch
+       "${FILESDIR}"/${PN}-16-ffmpeg3.patch
+)
+
+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
+
+       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 {} + || 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-17.0_beta3.ebuild b/media-tv/kodi/kodi-17.0_beta3.ebuild
new file mode 100644 (file)
index 0000000..b38f7f5
--- /dev/null
@@ -0,0 +1,267 @@
+# Copyright 1999-2016 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="Krypton"
+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/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="airplay alsa bluetooth bluray caps cec dbus debug gles java midi mysql nfs +opengl profile pulseaudio +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 )
+       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/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}]
+       dev-python/pillow[${PYTHON_USEDEP}]
+       media-fonts/anonymous-pro
+       media-fonts/corefonts
+       media-fonts/dejavu
+       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 )
+       media-libs/libmad
+       media-libs/libmodplug
+       media-libs/libmpeg2
+       media-libs/libsamplerate
+       >=media-libs/taglib-1.9
+       media-libs/tiff:0=
+       media-sound/wavpack
+       >=media-video/ffmpeg-3.0:=[encode]
+       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 )
+"
+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"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887
+       "${FILESDIR}"/${PN}-9999-texturepacker.patch
+)
+
+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
+
+       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 {} + || 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 dbus) \
+               $(use_enable debug) \
+               $(use_enable gles) \
+               $(use_enable midi mid) \
+               $(use_enable mysql) \
+               $(use_enable nfs) \
+               $(use_enable opengl gl) \
+               $(use_enable profile profiling) \
+               $(use_enable pulseaudio pulse) \
+               $(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.estouchy/fonts/DejaVuSans-Bold.ttf || die
+       dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+               /usr/share/kodi/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf
+       rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf || die
+       dosym /usr/share/fonts/anonymous-pro/Anonymous\ Pro.ttf \
+               /usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf
+       #lato is also present but cannot be unbundled because
+       #lato isn't (yet) in portage: https://bugs.gentoo.org/show_bug.cgi?id=589288
+
+       python_domodule tools/EventClients/lib/python/xbmcclient.py
+       python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
+}
index bdb4c68ddb62d10e33fe13ebfe7fc790498c66f9..b38f7f56a1159533cf35657e55fb9e3ac151fdc6 100644 (file)
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI="5"
+EAPI=6
 
 # Does not work with py3 here
 PYTHON_COMPAT=( python2_7 )
@@ -16,15 +16,17 @@ case ${PV} in
        EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
        inherit git-r3
        ;;
-*|*_p*)
+*)
        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="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 )"
+       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-${PV}-${CODENAME}
+       S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME}
        ;;
 esac
 
@@ -33,12 +35,11 @@ HOMEPAGE="https://kodi.tv/ http://kodi.wiki/"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="airplay alsa bluetooth bluray caps cec 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"
+IUSE="airplay alsa bluetooth bluray caps cec dbus debug gles java midi mysql nfs +opengl profile pulseaudio +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 )
+       ?? ( gles vaapi )
        udisks? ( dbus )
        upower? ( dbus )
 "
@@ -60,28 +61,26 @@ COMMON_DEPEND="${PYTHON_DEPS}
        dev-libs/tinyxml[stl]
        >=dev-libs/yajl-2
        dev-python/simplejson[${PYTHON_USEDEP}]
+       dev-python/pillow[${PYTHON_USEDEP}]
+       media-fonts/anonymous-pro
        media-fonts/corefonts
-       media-fonts/roboto
+       media-fonts/dejavu
        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 )
        media-libs/libmad
        media-libs/libmodplug
-       media-libs/libogg
-       media-libs/libpng:0=
+       media-libs/libmpeg2
        media-libs/libsamplerate
-       joystick? ( media-libs/libsdl2 )
-       >=media-libs/taglib-1.8
-       media-libs/libvorbis
-       media-sound/dcadec
-       pulseaudio? ( media-sound/pulseaudio )
+       >=media-libs/taglib-1.9
+       media-libs/tiff:0=
        media-sound/wavpack
-       >=media-video/ffmpeg-2.6:=[encode]
-       rtmp? ( media-video/rtmpdump )
+       >=media-video/ffmpeg-3.0:=[encode]
        nfs? ( net-fs/libnfs:= )
        webserver? ( net-libs/libmicrohttpd[messages] )
        sftp? ( net-libs/libssh[sftp] )
@@ -91,11 +90,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
        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]
@@ -134,6 +135,11 @@ DEPEND="${COMMON_DEPEND}
 # generated addons package.  #488118
 [[ ${PV} == "9999" ]] && DEPEND+=" virtual/jre"
 
+PATCHES=(
+       "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400618887
+       "${FILESDIR}"/${PN}-9999-texturepacker.patch
+)
+
 CONFIG_CHECK="~IP_MULTICAST"
 ERROR_IP_MULTICAST="
 In some cases Kodi needs to access multicast addresses.
@@ -150,9 +156,7 @@ src_unpack() {
 }
 
 src_prepare() {
-       epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
-       epatch "${FILESDIR}"/${PN}-9999-texturepacker.patch
-       epatch_user #293109
+       default
 
        # some dirs ship generated autotools, some dont
        multijob_init
@@ -165,7 +169,7 @@ src_prepare() {
                pushd ${d/%configure/.} >/dev/null || die
                AT_NOELIBTOOLIZE="yes" AT_TOPLEVEL_EAUTORECONF="yes" \
                multijob_child_init eautoreconf
-               popd >/dev/null
+               popd >/dev/null || die
        done
        multijob_finish
        elibtoolize
@@ -188,7 +192,7 @@ src_prepare() {
                xbmc/linux/*.cpp || die
 
        # Tweak autotool timestamps to avoid regeneration
-       find . -type f -exec touch -r configure {} +
+       find . -type f -exec touch -r configure {} + || die
 }
 
 src_configure() {
@@ -202,7 +206,6 @@ src_configure() {
        [[ ${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 \
@@ -214,14 +217,12 @@ src_configure() {
                $(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) \
@@ -241,7 +242,7 @@ src_compile() {
 
 src_install() {
        default
-       rm "${ED}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
+       rm "${ED%/}"/usr/share/doc/*/{LICENSE.GPL,copying.txt}* || die
 
        domenu tools/Linux/kodi.desktop
        newicon media/icon48x48.png kodi.png
@@ -249,14 +250,17 @@ src_install() {
        # 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
+       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
+       rm "${ED%/}"/usr/share/kodi/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf || die
+       dosym /usr/share/fonts/dejavu/DejaVuSans-Bold.ttf \
+               /usr/share/kodi/addons/skin.estouchy/fonts/DejaVuSans-Bold.ttf
+       rm "${ED%/}"/usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf || die
+       dosym /usr/share/fonts/anonymous-pro/Anonymous\ Pro.ttf \
+               /usr/share/kodi/addons/skin.estuary/fonts/AnonymousPro.ttf
+       #lato is also present but cannot be unbundled because
+       #lato isn't (yet) in portage: https://bugs.gentoo.org/show_bug.cgi?id=589288
 
        python_domodule tools/EventClients/lib/python/xbmcclient.py
        python_newscript "tools/EventClients/Clients/Kodi Send/kodi-send.py" kodi-send
index afc3dc6964dde288ecab89fade9fcd58d782f936..411a5264405f9d7a7c038e056a7bd4c9b4ce8e1a 100644 (file)
 
 #--- END OF EXAMPLES ---
 
+# Craig Andrews <candrews@integralblue.com> (25 Oct 2016)
+# >=media-tv/kodi-17.0_alpha requires >=media-video/ffmpeg-3.0
+# which is hard masked see #574788
+>=media-tv/kodi-17.0_beta3
+
 # Mike Gilbert <floppym@gentoo.org> (24 Oct 2016)
 # Dev channel releases are only for people who are developers or want more
 # experimental features and accept a more unstable release.