vapier 15/02/17 00:05:03 Modified: kodi-9999.ebuild kodi-14.1.ebuild ChangeLog Log: Fix build with external ffmpeg #526992 by Manuel Rüger. (Portage version: 2.2.17/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
Revision Changes Path 1.2 media-tv/kodi/kodi-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/kodi-9999.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/kodi-9999.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/kodi-9999.ebuild?r1=1.1&r2=1.2 Index: kodi-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kodi-9999.ebuild 16 Feb 2015 07:35:00 -0000 1.1 +++ kodi-9999.ebuild 17 Feb 2015 00:05:03 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.1 2015/02/16 07:35:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-9999.ebuild,v 1.2 2015/02/17 00:05:03 vapier Exp $ EAPI="5" @@ -80,7 +80,7 @@ media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack - >=media-video/ffmpeg-2.4:0=[encode] + >=media-video/ffmpeg-2.4:=[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) @@ -143,6 +143,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617 + epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36 # The mythtv patch touches configure.ac, so force a regen rm -f configure 1.2 media-tv/kodi/kodi-14.1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild?r1=1.1&r2=1.2 Index: kodi-14.1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- kodi-14.1.ebuild 16 Feb 2015 07:35:00 -0000 1.1 +++ kodi-14.1.ebuild 17 Feb 2015 00:05:03 -0000 1.2 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild,v 1.1 2015/02/16 07:35:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/kodi-14.1.ebuild,v 1.2 2015/02/17 00:05:03 vapier Exp $ EAPI="5" @@ -22,8 +22,7 @@ MY_P="${PN}-${MY_PV}" SRC_URI="http://mirrors.kodi.tv/releases/source/${MY_PV}-${CODENAME}.tar.gz -> ${P}.tar.gz http://mirrors.kodi.tv/releases/source/${MY_P}-generated-addons.tar.xz"; - # ffmpeg system build is broken #526992 - #KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 ~x86" S=${WORKDIR}/xbmc-${PV}-${CODENAME} ;; @@ -81,7 +80,7 @@ media-libs/tiff pulseaudio? ( media-sound/pulseaudio ) media-sound/wavpack - >=media-video/ffmpeg-2.4:0=[encode] + >=media-video/ffmpeg-2.4:=[encode] rtmp? ( media-video/rtmpdump ) avahi? ( net-dns/avahi ) nfs? ( net-fs/libnfs ) @@ -144,6 +143,7 @@ src_prepare() { epatch "${FILESDIR}"/${PN}-9999-nomythtv.patch epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617 + epatch "${FILESDIR}"/${PN}-14.0-dvddemux-ffmpeg.patch #526992#36 # The mythtv patch touches configure.ac, so force a regen rm -f configure 1.2 media-tv/kodi/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/ChangeLog?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/ChangeLog?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-tv/kodi/ChangeLog?r1=1.1&r2=1.2 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- ChangeLog 16 Feb 2015 07:35:00 -0000 1.1 +++ ChangeLog 17 Feb 2015 00:05:03 -0000 1.2 @@ -1,6 +1,10 @@ # ChangeLog for media-tv/kodi # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.1 2015/02/16 07:35:00 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-tv/kodi/ChangeLog,v 1.2 2015/02/17 00:05:03 vapier Exp $ + + 17 Feb 2015; Mike Frysinger <[email protected]> + +files/kodi-14.0-dvddemux-ffmpeg.patch, kodi-14.1.ebuild, kodi-9999.ebuild: + Fix build with external ffmpeg #526992 by Manuel Rüger. *kodi-9999 (16 Feb 2015) *kodi-14.1 (16 Feb 2015)
