Fix build with external ffmpeg #526992 by Manuel Rüger.

Package-Manager: portage-2.2.17/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

diff --git a/media-tv/kodi/ChangeLog b/media-tv/kodi/ChangeLog
index 916a7f8dc3cd8daaafcaee6063a516eb85a296c1..231451ddf8abbad741542c47416fd79d4891128b 100644 (file)
--- a/media-tv/kodi/ChangeLog
+++ b/media-tv/kodi/ChangeLog
@@ -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 <vapier@gentoo.org>
+  +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)

diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 8217c36e88e5565242f8e56c386e5b40161ddcdd..034937f5e22ae21f839d1bfb359baea5d05c7b00 100644 (file)
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -2,28 +2,29 @@
 Hash: SHA256
 
 AUX generate.sh 803 SHA256 8e32ccbd56e2d36d9d0504282881b3ee1d33ee7293827b75444b917093955d09 SHA512 064b11416be5583202d92ab0c87156b7098bf4a97c7875ad3a0b11e048ebcfd69aeb22653e8175e7ad0cd400ed2d9c27aa8d1d25be04d34438f4c4f86e329986 WHIRLPOOL 3565b3f6ef9650bfbb3b9e4b6ee5b71d1d245e62520f00f88f1c0b2ade6bf923200a1e94efdbbea8d5e53449f38ac78bc4714280e276e085c91ada404ebfeb89
+AUX kodi-14.0-dvddemux-ffmpeg.patch 466 SHA256 dbfa9edf3592a4b06292a0813fc920e66d53808ff5bb3aa9192a750d11015ec5 SHA512 cbc71ae5f85374b15f19139a549fc10e5ebb363af0e6354d708043748b2d6e89903223bf4146472cf6281f4fb912b1c72407de4e81993a89811d4b1fab226f87 WHIRLPOOL 5c9167c97f057b57f6e2d2a57a1ce798a7c9f8e043db987e73261a45ec1f9e7e694385db1c5b7738e479d9be2ddeb1f26990d4df518710aeb5ee18ad02b838fd
 AUX kodi-9999-no-arm-flags.patch 478 SHA256 075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512 b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064 WHIRLPOOL f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
 AUX kodi-9999-nomythtv.patch 1689 SHA256 b54e52be122890affca5eb726873817bfbaa1b5da0d58231bd0c098681ce6b35 SHA512 ebd3deef88fdef0b54bb5936f9a479523297c1224595ea021af0674b9cb422f3a3bdc03c3cdf9e96f475b23e68983a62241d91cb74fd4f69b2635e6f7d4a80e4 WHIRLPOOL 0d2ad77fee3a4cce535cb25c07c481d9133c867f6de1fba5cd1dcc6f79d480f496673c223e464d90cab9602651e226792679eaa499959d7cae01b94f64a2f345
 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
-EBUILD kodi-14.1.ebuild 7687 SHA256 7416ae68c9afe6557ec17a3268fbd33ee5cb26fef660874d6d5ce34caf2abd74 SHA512 2175e9cdd4509400687b233e72be92f58736de4a0321b985ed0884114d1c21cc8fdc5dfe51ad35b9ef7b76c9292300b81ef99891a66599590d33e1843d3104ed WHIRLPOOL 13b51616f8540d0e13691fbc9e9c93980c79f15b54e17dd361155b18a3e70ac9513b4cc432a866bb0eeacd85cbfd3ef2c083788dc05c4ae1004ba1e86496fb0d
-EBUILD kodi-9999.ebuild 7645 SHA256 9c7782c713466794bb2e8ac5ecb275e067930db85fc9cd5b0dcf8ce6f8f84423 SHA512 54775d83e8aa4399f320b51a0c569f626ae6e72c536cbd1c7b9a1f5133ae03f2b5afd841a85662e39dd174e643b8c18f98e14331230819b184bff9801190e7d4 WHIRLPOOL f441422f501f24a6098bc8692b71816f70932a128b6c066aa759da993a51d34fefcaf851362922a9741c1cda5896751cd53f5eceafd901ee0961a81a99b4d3cf
-MISC ChangeLog 489 SHA256 db10c2d71cb926ec0f380c08dbbb9ec7658ec02d070fcf4068bccb0ede81feba SHA512 f583a4e7f3875f24f1a167311e6734fb04ed7bc6aaeff8f1a304a741818980b63f9dbfd933d3dbab4c7931f159f900ef2d6f674c74c11e80bd8b8d68a6db973d WHIRLPOOL a6bf041d66c173c75fc7f8d7fcd5f0cf2b5104bf2f01642dae2f19abadbad0311517667736ff3aadee7e105be7cbbd37bdf41a767a7992603bb9ee8e85bb2169
+EBUILD kodi-14.1.ebuild 7710 SHA256 25ee1cae139b270ac5bdff302741cf4c98c40d367bfecdd07b57698d3057ba52 SHA512 59be27c642aabf039a062a73923a05576f596d1fe9731d5b6ca45c37f5b651a1fff5eb7492adb661cc5cdd3a1cbd7f848994af0f7acddbefc83dd554d3082047 WHIRLPOOL 9dd70fc1a93e373da9ae7538c5d25c9136c559b31be61a847bde38b4252ea54052ffed86a35835b666b921349900f78e47baac6f48a4615dee2360927eb21e8b
+EBUILD kodi-9999.ebuild 7710 SHA256 07994dcfd92d6a7d3e58f7578c4ce554110ce99b7bcc2e56962dd4b2a29cb71a SHA512 69990c25d58cc26800e590ff2e4861d3768e4c4afccd26b5c2df41cf9d6367aa5d49f3e7c39c9704de4267d51bbb91b2878a08ce17055eff623f947386cbd363 WHIRLPOOL 600c3f6261f6ab0b6030d3ee7bd6d71a0e8b20e805289e93105b0567231ea70fc6f59521f5abe6d0a7b469e741571179326844ef7f319396f3afae6f6e677fad
+MISC ChangeLog 677 SHA256 c47c772e4762d5a45f7845351fb3ceecd6b8f3888b5f957d08e2d7cead442240 SHA512 eefc58e36251bc164fbbc32a84ba4a4b24ad096568987256e81d8f19e2617fbe909f83cab2ffe831137766033d241698544e77781a7a0df2d4a98fe9612508b9 WHIRLPOOL 3b7e19d755d3698ae5c0b0a9beb426266ddec2730ce179794914e4d06ad9fe453b74b432f5656efcd6375a2aafaf1369ff9605f4a2c836f67a6cfc39300a9abd
 MISC metadata.xml 1164 SHA256 f8e32d8b3a4347b197b5d1c6e983d6928b6516c437ab8fccb9d910c6f58c107f SHA512 49f19f115cf306447afa87c18724d717dc7b924b65b0fb4f5d55212b4d30650e28217bba4d848a786ecefd18622c89244b2f70e89c246372e4ce723f9932c76f WHIRLPOOL 6a905fce5cc388227f8f2ee471a198cabdd8dc203d52d21073c2a1999bbe12cb1620d693aba4468f88982a2eb3b876c912ceb710b615aeecaa92dc9bccfc7af6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJU4Z46AAoJEPGu1DbS6WIA1fEP/08ZVJ3q/R7jQPPCb9VXlCKx
-SrgQqYtfYwfTPNbVXXzxQS4LUlccpZfLtw8Wo4V8XCP0U2+spYM3VW2wJ7qZzVxH
-tiil4vdSsaa9l8hhkvIPqRIoAwOTLoIwATE0oH8rAgRYEWdfN5hUptUCtgIUvV/w
-anE4dkLD5bWVyyv7VmUAtUpm9aViSd7So8dj6mvNsv7wSvHqAgji2s8A+XmF9iqO
-XYSX2ecd4Pt++N0mHQrZoONwhGm10cuJaww+MHD5xmhkD0MvbccZMiVpOOT4uXjB
-mQr+tzeJG0xOaRKhXaTEbyz+3ta/VWZ8nyGlsG0LSUubYCDAqbB/ScxnlJ+tmn6y
-ruI2ICbXOT83ipPAK2/ZeAFc664tK8gntXNAA7X27Rf0m/iN+risv0/N9CnYGo85
-x/T50gnHXTI/3bAcwDI17Qq+Du2gSGBZGdqCDE/HbH6MeZw5UyJ6ooqkc4/tV5NO
-XfftaMw7xZnMtP7dvPy2D8M2Sod4Uc+SeO1fKCKaGQMW7liUMDHRq7ZPeWRTIFhu
-PrAxMigYBU2rbTNMJTCeOUv7ziloBsotTQZ1nioMb5Bcv5fQWg2dkqnWDk2gWlL0
-gvqMUq3LK+V7XG8YeewofnU7s/pefzZOe3GjbVXYvA2EbMmWerxv8rq6PC0AU7Du
-K2CToXlzFg2t05xMuEyU
-=8RLt
+iQIcBAEBCAAGBQJU4oZSAAoJEPGu1DbS6WIAvhAP/2O0XNaIZjfih1Ac+z5omhRB
+pg7GgTyhIcgyooAyWpB3KUPtpthSSy9PxeFQs87dBafSG3i8aXfvV4tVpHGkG2MR
+gqwzMb/ZYD0Ov7tV625vD8+2TFlSxhE3J8+NvRtjUnEvOZaJR5etFixNYn55AEKE
+v52H1BMtP+b+z1bkKfugcJ0pcc1r1OsVh9QiQ8cIhwkp+6/jp3CB1Q6dPDFNnUcB
+nyJG0/SDomeIfpYN1nxxwRMyT6QM9QmMf4CoQ+3ZBR2lVg5g5raoyXA0oqeQu6qp
+J5bzuKk5UrON2SkiL+y0WgNj92SN5T92ixwjfvio0nx7u8Lz8WaUTEOlLxCWLn3p
+4Br2KnDtHaKuKl21+psxf8J7FGRz0TRwbU0jF3AiI8cBmwpzEKUo8xeh16Ej5X9U
+Z9yj1TfFlucanCK02BlsL7zLFdt6fRg8NSxIwTyYGqbb8W5ztjLjVczJ62Sr+vDJ
+LKK4AT+sxzp6xrNP7Mw+u3MR2brPPQc04wYmFZ+tcwpms5udVF69q62a8MaSQnO3
+XuI+gd7LAbUbZPYpqkVbBXE/jmjWAoidMizqRjd6HDM+TdkN1WzemfJ4T734buQN
+WCbH7Y/rtFmoUrnVfuUCWPNSbeGrJxEQYUp7JMnPVdLJysirjLRzAW95k4R3RLHG
+faAbGOCz8/CU6kdbrnfQ
+=G37z
 -----END PGP SIGNATURE-----

diff --git a/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch
new file mode 100644 (file)
index 0000000..94b8666
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.0-dvddemux-ffmpeg.patch
@@ -0,0 +1,16 @@
+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/kodi-14.1.ebuild b/media-tv/kodi/kodi-14.1.ebuild
index 9e552e9d79abd703e6d9bb6e3fa8502821af2e7b..987ff73d38cb3b1350fea94fc42699e379896279 100644 (file)
--- a/media-tv/kodi/kodi-14.1.ebuild
+++ b/media-tv/kodi/kodi-14.1.ebuild
@@ -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 @@ case ${PV} in
        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 @@ COMMON_DEPEND="${PYTHON_DEPS}
        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_unpack() {
 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
 

diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index 564496d6de66d85640ce4a7a5a5bdab243dab7e8..869c37abf3e7cdfe7c5f6c73b2d6d7e0e6ed11ff 100644 (file)
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -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 @@ COMMON_DEPEND="${PYTHON_DEPS}
        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_unpack() {
 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