commit: 1c7440d02b98185f11050d5d5dbe096598f922b1
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 27 05:28:31 2015 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Aug 27 05:28:31 2015 +0000
URL: https://gitweb.gentoo.org/dev/anarchy.git/commit/?id=1c7440d0
Fix texturepacker dep
media-tv/kodi/Manifest | 18 +--
media-tv/kodi/files/generate.sh | 34 ----
.../kodi/files/kodi-14.0-dvddemux-ffmpeg.patch | 16 --
media-tv/kodi/files/kodi-14.2-disable-gtest.patch | 13 --
media-tv/kodi/files/kodi-14.2-privacy.patch | 14 --
.../files/kodi-14.2-remove-ljbig-and-ljasper.patch | 37 -----
.../files/kodi-14.2-use-external-dvdread.patch | 126 ---------------
.../kodi-14.2-use-external-libhdhomerun.patch | 154 ------------------
.../files/kodi-14.2-use-external-libsidplay.patch | 62 --------
media-tv/kodi/files/kodi-15.1-gcc-5.patch | 172 +++++++++++++++++++++
media-tv/kodi/files/kodi-15.1-texturepacker.patch | 25 +++
...rm-flags.patch => kodi-9999-no-arm-flags.patch} | 4 +-
media-tv/kodi/files/kodi-9999-nomythtv.patch | 67 --------
.../kodi/{kodi-14.2-r1.ebuild => kodi-15.1.ebuild} | 160 +++++++------------
14 files changed, 257 insertions(+), 645 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index f38a31e..7197787 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,13 +1,7 @@
-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-14.2-disable-gtest.patch 624 SHA256
5631e0ef53e0429d6c30dfea33e91122b8b623c0c475d0f5713a0903bb46024e SHA512
68b669c163c9f2a6b379ca9ea4833e047b3c17be0441d939ae403a39de1b95224aeafd494d027c95bd6c73611cc236dca49144ab2a7371b59131b249ee767976
WHIRLPOOL
5ae6d150d6e9db0839c47e6770bc9279d5cd4dfdc1c1332bc7fb21a8bfd6598e959dc27236e158d392ad326f82354ad675befcd5d332e3fcfa86352094a3814c
-AUX kodi-14.2-no-arm-flags.patch 478 SHA256
075db2562d31914d86b4394500d4b3168ea77114b63d1a7929ddae96111017a2 SHA512
b958cf3ab4877dbae4e5bd1376e8b9bd82f0dab43b1695c1d85e0e8ff366ef278ff686fe6394a04b3d79e19f11d8c92689fc049d2874e3fc12c907e36e993064
WHIRLPOOL
f322fa4db24ff6f3372bdadd3dba8fbd4aed5849dc676f8c63d654f2c83de2165e60b26af821647a46cfa5ff129e7e0cb7c39c5cddbc2e5d9ec675bb148b2d63
-AUX kodi-14.2-privacy.patch 584 SHA256
9153314a16675cdd5cf8a1eb005236a4ee6524c31ff51d7ac2e98acde15b29c1 SHA512
642bf1f488858dcc435f464a68870b88d2758d4a29958825589b6e53e569f4b796ac53d88508dfb300b456aa8215af9e4dee8432e10a6cf373a97a9db99df13a
WHIRLPOOL
a3e439267a712bc1db45997a8c464da177917d0bbf4d866af66171bf7e6a600c86fb2a67445da552d67ddf4f14efe894b3b7db06486613625809a681c55af3e2
-AUX kodi-14.2-remove-ljbig-and-ljasper.patch 1523 SHA256
c4ae0e779296ccc7b2dec5fea6db4e23f58aeaf7ffd2d62c46c609c77d60472c SHA512
1d76319285449c3edf4bb38c52bb49fa0ab0968a6a9e6c394fb0ecee89461637245589672a5625d0f4aa71d13cf1c98580997f426cfa656bfb05882df9ca8421
WHIRLPOOL
0de8a701d09e1b275369d62ff9167ccee0a9fa111c05b603c63372af72efe3655e9f14881177c69d2e4996ac1b4331cb240b29f1eedd6bc50defa2390bfc8152
-AUX kodi-14.2-use-external-dvdread.patch 5112 SHA256
56c9e4b780482c9790158b4460e05d5c24c9dc83ce65d27aad8ddac8c8802bba SHA512
83c520bd25b8529cbe329d3bb676a69588d134776203c44fcb2709e0e487b9e51f99aa5b077cb8b357ca6bddf25ab209c1c4ef5b9818f074fa2a3e4ee617da1c
WHIRLPOOL
56fb9e0b6c3fe4d96c7bbbc8031b05f20f7eb2d9ca09c3fcf8e66491175a514c2cf0f8071010582776ef719d1cd5e00caaa532d4b9b195ee89da61ff1d600487
-AUX kodi-14.2-use-external-libhdhomerun.patch 7084 SHA256
9c75cbb693d66c80471a05eebb106943d34558e86ff71ffe58c49b5886a56fbe SHA512
510481ff08884752a1bcef1333ae6a3af71c77ad4ffa1627abadb1aed904a739f923f606f96c5f74a349275aaa00f7cfe44fa068a0118dd54ec84b53c14382d5
WHIRLPOOL
48dc8908bbf990e1720557e1f5cb81b55d64414ef42b1f23337556f6d7139675e0f41693370a33606dfe149061089bbff32371cef5cc0c00757db68c9dd13d74
-AUX kodi-14.2-use-external-libsidplay.patch 2754 SHA256
a670a79a178dcf9fa499e80056ef5ac73a268c88c910cc405d322e556e653afa SHA512
939309db1adc3c23d912faa55878bf64842da09260a6cb0b95244ae183fefb33d05bbb40660e149026bec6849644b6554871de90ba4be42747617849e9714ac8
WHIRLPOOL
40c3b398cf84d6b31966d0043744995b44b7506c8c74ac46fdb8d10deb4c4510c238fd930c7b9a7d1b871e2783911e9f49aa871d56923d2d6febff3ac2594734
-AUX kodi-9999-nomythtv.patch 1689 SHA256
b54e52be122890affca5eb726873817bfbaa1b5da0d58231bd0c098681ce6b35 SHA512
ebd3deef88fdef0b54bb5936f9a479523297c1224595ea021af0674b9cb422f3a3bdc03c3cdf9e96f475b23e68983a62241d91cb74fd4f69b2635e6f7d4a80e4
WHIRLPOOL
0d2ad77fee3a4cce535cb25c07c481d9133c867f6de1fba5cd1dcc6f79d480f496673c223e464d90cab9602651e226792679eaa499959d7cae01b94f64a2f345
-DIST kodi-14.2.tar.gz 70703786 SHA256
d9cb8590430a925fb789a5beb4da2695cdcd2d2500dd31126f3b77b31aa267f4 SHA512
08330a47cc87d0c2ea74ed29f60987d77f39a9241b4b9dde015eef6ed8af07ea1307e3eba4dd8d10cca0a9d46be9b611e99ecee2f1fe8d9200b5739f1087a9fa
WHIRLPOOL
1403d74cca5dbaf520a97d89370151058c2c455d9525ca1ec2d72759f2a9a4fdc37232fec6fdaa97e511a183eb6c3906c47fc13373297eb72fe3860506cc9eb8
-EBUILD kodi-14.2-r1.ebuild 9337 SHA256
c898c46f7100e89432f32cc397df0b52151df16879494ad97b152970577482de SHA512
f203adc88609de111414ecec76964c7d6d9fb8d1943f0e63010b4b78b28a97ccc6df70aab2784050e53e19c39b59f99400e885219530a67e86816e7ff335e874
WHIRLPOOL
40e8a2ed23c2a6c39b6325ebd8650423196eb9df900dd664848ec5a2ffa275c98f02641f8eb43911e102f8f2a1d1c51d156a5fdad05f6faa7910af5d39974717
+AUX kodi-15.1-gcc-5.patch 6890 SHA256
503e296e1911c28fd99579c02f56c2a3965aeb18378f552dbcef5e63382a0b8d SHA512
8c0f8925b2d70f2c0e186be43b80749a1998e0fd6b6131ceb8189e3efffff1de2662078666a5cc76b4a1790d99cfa7b7ab839d907febac37d4c30999124334e1
WHIRLPOOL
4f4f070f798c8e26908cdb0b63ada53459133308d67979b903a29c905799f49ff5dd5b46c8338f32f2a42e0812cbaf55cb217374542a4abb6596251ebc786582
+AUX kodi-15.1-texturepacker.patch 723 SHA256
4e0843a63d9d2386029b4cb34734491efbf4999b9b121bfb774e8c203be8bdcb SHA512
357d293cbc5d03b8f93f1822c68bdc5a74a28ca37e2191f42be70973b85a29fef14b29473d537a2ca0fd069018a6bd196db27509768feb71e7b58462ea241f0a
WHIRLPOOL
d22fa29b83d81e66200834697f0541f58e156c7e26963a165ec9a13348aefd574d1963cce8e80207e0dfbeb8ea937f82e473b0114040ca1f0ea6ee6e51ce067e
+AUX kodi-9999-no-arm-flags.patch 478 SHA256
5eb086595c1d645f1f10e6cb53179d7f9732b67d3cd58f2fc5558de50eee4d68 SHA512
672ad8512939d7362bbb0933998dfc0f316bce8407c305e36aad3509336bce3b28388799e83a9de9db446a1345000343e3d051099a60240e2f8c701c118f7eee
WHIRLPOOL
8868b9e74175f539fe12260c987d2531c27c5d33d0532eab526ea7f9ebd797d953c1f75686a92f43ccf582323dab3c374cbe0aaee1fdb818251a116ee774af8b
+DIST kodi-15.1-generated-addons.tar.xz 73988 SHA256
97f0236542044a909d982cbf9a031f76395a59a1d4a79187c1102845579ed8f2 SHA512
559c188471c84503840b8b2010b73f15cf083367a1e1d0d5cfe7c144e36821a07c6fff1ff379ad8e8b254bc0cc2555c0a17ae998003adf86b051febde97bf2f1
WHIRLPOOL
01b76391d6aa7c624ad23329c962416cdf4662b96e99724bb566d7ed20b08b1525acd4f12671eef04ac10e5255d097f7c2452d2bfd87f7dfd3f4c1cd621fe2a6
+DIST kodi-15.1.tar.gz 61477835 SHA256
72b2610d8fbff807128d74429f25bf6716ba880c27c2c5d9fad012ec7fc70705 SHA512
b597253aa51d3d446ecb85ffe163362b5e55717d6fee16eab81725b9cdf0a5a9e4a2291aa526b9e63fbb34ef206100df30c9368684e2ddedc49e35f140d604f0
WHIRLPOOL
3596c00f9d25193e1e84cdfbf7fe5a6e6bdcce37caa710b8dd2b0b7aaa043164410459009dc793991373886abed8755298ee8803edf7b90227509d0c3578b8b9
+EBUILD kodi-15.1.ebuild 7895 SHA256
bd6e987d49721e397c14cba3e6b75a26ee42c019169fde86ea90364a4604079c SHA512
8de96ecd16e6237ed78ed54cf7eedeec01a037bb7fe448b69b87f9d9c0d5a9e565867e67b43d42dd82f3efcb87964e5848d4785e51080a602ac0a906d399f26e
WHIRLPOOL
74290574bad8851dd9c2cf179cc6d6746c4720e521064e646d77e78ca23b3f78062067122f3eba238adf7d986f126f2d3d21bbd12966aca7694539c897925d63
MISC metadata.xml 1363 SHA256
7a84053a0098a072ad36501caa9510eb4ae1ccd452044fe12a35f25308db7975 SHA512
f15de59f24fc15b6f4449f868f62151ebef3a90c4640072c3e19ce527825006f105a1eda2fb16f4341f228505adc2e3a3d2b582ad43784355e565f4435f61309
WHIRLPOOL
c1f9d69ff1a2a2ae4155b725bdc1706a46abedf78c973859ef85aa84fc0afc5b0e0a6bc70799c1224b7cd70c1a95028701aa44aa77178ae39b586ad8dc2049a8
diff --git a/media-tv/kodi/files/generate.sh b/media-tv/kodi/files/generate.sh
deleted file mode 100755
index 2e5b67f..0000000
--- a/media-tv/kodi/files/generate.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-# Generate the various interface files that normally requires java.
-# This makes building the release versions much nicer.
-
-set -eux
-
-PV=$1
-PN=kodi
-P="${PN}-${PV}"
-DISTDIR="/usr/portage/distfiles"
-GITDIR="/usr/local/src/kodi/git"
-
-if [[ ${PV} != "9999" ]] ; then
- rm -rf xbmc-*/
- tar xf ${DISTDIR}/${P}.tar.gz
- d=$(echo xbmc-*/)
-else
- stamp=$(date --date="$(git log -n1 --pretty=format:%ci master)" -u
+%Y%m%d)
- P+="-${stamp}"
- cd ${GITDIR}
- d=.
-fi
-#cd ${d} && git init . && git add . && git commit -qmm && cd ..
-make -C ${d} -j -f codegenerator.mk
-tar="${DISTDIR}/${P}-generated-addons.tar.xz"
-tar cf - \
- ${d}/xbmc/interfaces/python/generated/*.cpp \
- ${d}/xbmc/interfaces/json-rpc/ServiceDescription.h \
- | xz > "${tar}"
-if [[ ${PV} != "9999" ]] ; then
- rm -rf xbmc-*/
-fi
-
-du -b "${tar}"
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 94b8666..0000000
--- 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.2-disable-gtest.patch
b/media-tv/kodi/files/kodi-14.2-disable-gtest.patch
deleted file mode 100644
index 23ca131..0000000
--- a/media-tv/kodi/files/kodi-14.2-disable-gtest.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff -Nur xbmc-14.1-Helix.orig/bootstrap.mk xbmc-14.1-Helix.new/bootstrap.mk
---- xbmc-14.1-Helix.orig/bootstrap.mk 2015-03-29 13:38:25.594436410 +0200
-+++ xbmc-14.1-Helix.new/bootstrap.mk 2015-03-29 13:39:03.601098833 +0200
-@@ -2,7 +2,7 @@
- BOOTSTRAP_SUBDIRS += xbmc/screensavers/rsxs-0.9/configure.ac
- BOOTSTRAP_SUBDIRS += xbmc/visualizations/Goom/goom2k4-0/configure.in
- BOOTSTRAP_SUBDIRS += lib/cpluff/configure.ac
--BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac
-+#BOOTSTRAP_SUBDIRS += lib/gtest/configure.ac
-
- ifneq ($(wildcard lib/libdvd/libdvdcss/configure.ac),)
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
-
diff --git a/media-tv/kodi/files/kodi-14.2-privacy.patch
b/media-tv/kodi/files/kodi-14.2-privacy.patch
deleted file mode 100644
index 0b5ebfe..0000000
--- a/media-tv/kodi/files/kodi-14.2-privacy.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/system/settings/settings.xml b/system/settings/settings.xml
-index f92bd59..a856784 100644
---- a/system/settings/settings.xml
-+++ b/system/settings/settings.xml
-@@ -92,7 +92,7 @@
- <group id="2">
- <setting id="lookandfeel.enablerssfeeds" type="boolean" label="13305"
help="36111">
- <level>1</level>
-- <default>true</default>
-+ <default>false</default>
- <control type="toggle" />
- </setting>
- <setting id="lookandfeel.rssedit" type="string"
parent="lookandfeel.enablerssfeeds" label="21450" help="36112">
-
diff --git a/media-tv/kodi/files/kodi-14.2-remove-ljbig-and-ljasper.patch
b/media-tv/kodi/files/kodi-14.2-remove-ljbig-and-ljasper.patch
deleted file mode 100644
index 7fa52cb..0000000
--- a/media-tv/kodi/files/kodi-14.2-remove-ljbig-and-ljasper.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff -Nur xbmc-14.1-Helix.orig/configure.in xbmc-14.1-Helix.new/configure.in
---- xbmc-14.1-Helix.orig/configure.in 2015-01-29 23:57:10.000000000 +0100
-+++ xbmc-14.1-Helix.new/configure.in 2015-03-30 22:08:00.661976231 +0200
-@@ -1206,9 +1206,6 @@
- AC_DEFINE([SDL_VERSION],[1],["SDL major version"])
- fi
- else
--if test "$target_platform" != "target_android" ; then
-- AC_CHECK_LIB([jasper], [main],, AC_MSG_ERROR($missing_library)) # check
for cximage
--fi
- if test "x$use_alsa" != "xno"; then
- PKG_CHECK_MODULES([ALSA], [alsa],
- [INCLUDES="$INCLUDES $ALSA_CFLAGS"; LIBS="$LIBS $ALSA_LIBS";
use_alsa=yes],
-diff -Nur xbmc-14.1-Helix.orig/lib/cximage-6.0/Makefile.in
xbmc-14.1-Helix.new/lib/cximage-6.0/Makefile.in
---- xbmc-14.1-Helix.orig/lib/cximage-6.0/Makefile.in 2015-01-29
23:57:10.000000000 +0100
-+++ xbmc-14.1-Helix.new/lib/cximage-6.0/Makefile.in 2015-03-30
21:38:27.188665277 +0200
-@@ -4,8 +4,8 @@
- ARCHIVE=$(SO:.so=.a)
- SYSDIR=../../system
- SLIB=$(SYSDIR)/$(SO)
--DIRS=CxImage raw jbig
--SLIBS=CxImage/cximage.a raw/raw.a jbig/jbig.a
-+DIRS=CxImage raw
-+SLIBS=CxImage/cximage.a raw/raw.a
-
- ifeq ($(findstring osx,$(ARCH)), osx)
- export ARCH
-@@ -21,7 +21,7 @@
- CxImage/*.o jasper/*/*.o jbig/*.o raw/*.o
- else
- $(CXX) $(CFLAGS) $(LDFLAGS) -shared -o $(SLIB) -Wl,--whole-archive
$(SLIBS) \
-- -Wl,--no-whole-archive -lpng -ljasper -ljpeg -ltiff -lz
-Wl,--unresolved-symbols=ignore-all
-+ -Wl,--no-whole-archive -lpng -ljpeg -ltiff -lz
-Wl,--unresolved-symbols=ignore-all
- endif
-
- $(SLIBS): compile
-
diff --git a/media-tv/kodi/files/kodi-14.2-use-external-dvdread.patch
b/media-tv/kodi/files/kodi-14.2-use-external-dvdread.patch
deleted file mode 100644
index 636c460..0000000
--- a/media-tv/kodi/files/kodi-14.2-use-external-dvdread.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-diff -Nur xbmc-14.1-Helix.orig/bootstrap.mk xbmc-14.1-Helix.new/bootstrap.mk
---- xbmc-14.1-Helix.orig/bootstrap.mk 2015-03-29 14:04:47.011082386 +0200
-+++ xbmc-14.1-Helix.new/bootstrap.mk 2015-03-29 16:47:34.189335973 +0200
-@@ -8,7 +8,6 @@
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdcss/configure.ac
- DVD_CSS=lib/libdvd/libdvdcss/configure
- endif
--BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdread/configure.ac
- BOOTSTRAP_SUBDIRS += lib/libdvd/libdvdnav/configure.ac
-
- ifneq ($(wildcard pvr-addons/Makefile.am),)
-@@ -18,10 +17,6 @@
- BOOTSTRAP_TARGETS=$(basename $(BOOTSTRAP_SUBDIRS))
- all: $(BOOTSTRAP_TARGETS)
-
--#preserve order for libdvd. dvdcss (if present) -> dvdread -> dvdnav.
--lib/libdvd/libdvdread/configure: $(DVD_CSS)
--lib/libdvd/libdvdnav/configure: lib/libdvd/libdvdread/configure
--
- %: %.ac
- autoreconf -vif $(@D)
- -@rm -rf $(@D)/autom4te.cache
-diff -Nur xbmc-14.1-Helix.orig/configure.in xbmc-14.1-Helix.new/configure.in
---- xbmc-14.1-Helix.orig/configure.in 2015-03-29 14:04:45.591082404 +0200
-+++ xbmc-14.1-Helix.new/configure.in 2015-03-29 22:08:05.119084347 +0200
-@@ -1155,6 +1155,9 @@
- PKG_CHECK_MODULES([SIDPLAY], [libsidplay2],
- [INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],
- AC_MSG_ERROR($missing_library))
-+PKG_CHECK_MODULES([DVDREAD], [dvdread],
-+ [INCLUDES="$INCLUDES $DVDREAD_CFLAGS"; LIBS="$LIBS $DVDREAD_LIBS"],
-+ AC_MSG_ERROR($missing_library))
-
- if test "$use_optical_drive" = "yes"; then
- PKG_CHECK_MODULES([CDIO], [libcdio],
-@@ -2684,27 +2687,9 @@
- --with-pic
- ], [$SKIP_CONFIG_DVDCSS])
-
--XB_CONFIG_MODULE([lib/libdvd/libdvdread], [
-- ./configure2 \
-- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../libdvdcss/src
$DROID_DVDLIB_SEEK64" \
-- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}"
--datadir="${datadir}" \
-- --host=$host_alias \
-- --build=$build_alias \
-- --target=$target_alias \
-- --enable-static \
-- --disable-shared \
-- --disable-strip \
-- --disable-opts \
-- --cc="$CC" &&
-- mkdir -p `pwd`/../includes/dvdread
-- cp `pwd`/../libdvdread/src/*.h `pwd`/../includes/dvdread
-- cp `pwd`/../libdvdread/src/dvdread/*.h `pwd`/../includes/dvdread
--], [0])
--
- XB_CONFIG_MODULE([lib/libdvd/libdvdnav], [
- ./configure2 \
- --extra-cflags="$CFLAGS $DVDREAD_CFLAGS -I`pwd`/../includes
$DROID_DVDLIB_SEEK64" \
-- --extra-ldflags="-L`pwd`/../libdvdread/obj" \
- --with-dvdread-config="`pwd`/../dvdread-config" \
- --prefix="${prefix}" --includedir="${includedir}" --libdir="${libdir}"
--datadir="${datadir}" \
- --host=$host_alias \
-diff -Nur xbmc-14.1-Helix.orig/lib/libdvd/Makefile.in
xbmc-14.1-Helix.new/lib/libdvd/Makefile.in
---- xbmc-14.1-Helix.orig/lib/libdvd/Makefile.in 2015-03-29
14:04:46.297749062 +0200
-+++ xbmc-14.1-Helix.new/lib/libdvd/Makefile.in 2015-03-29 22:09:58.232416198
+0200
-@@ -5,8 +5,7 @@
-
- SYSDIR=@abs_top_srcdir@/system/players/dvdplayer
- SOS= libdvdnav-$(ARCH).so
--DIRS= libdvdread \
-- libdvdnav
-+DIRS= libdvdnav
-
- WRAPPER=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper.o
-
WRAPPER_MACH_ALIAS=@abs_top_srcdir@/xbmc/cores/DllLoader/exports/wrapper_mach_alias
-@@ -48,9 +47,9 @@
- $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
- $(WRAPPER) libdvdcss/src/*.o $(BUNDLE1_O)
-
--$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A)
libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
-+$(SYSDIR)/libdvdnav-$(ARCH).so: $($(WRAPPER)) $(DVDCSS_A)
libdvdnav/obj/libdvdnav.a
- $(CC) $(LDFLAGS) -Wl,-alias_list,$(WRAPPER_MACH_ALIAS) -o $@ \
-- $(WRAPPER) $(DVDCSS_O) libdvdread/obj/*.o libdvdnav/obj/*.o
$(BUNDLE1_O)
-+ $(WRAPPER) $(DVDCSS_O) libdvdnav/obj/*.o $(BUNDLE1_O)
-
- else
-
-@@ -59,10 +58,10 @@
- libdvdcss/src/*.o -Wl,--unresolved-symbols=ignore-all -lm \
- `cat $(WRAPPER:.o=.def)` $(WRAPPER)
-
--$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A)
libdvdread/obj/libdvdread.a libdvdnav/obj/libdvdnav.a
-- $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdread/obj/*.o
libdvdnav/obj/*.o -lm \
-+$(SYSDIR)/libdvdnav-$(ARCH).so: $(WRAPPER) $(DVDCSS_A)
libdvdnav/obj/libdvdnav.a
-+ $(CC) -o $@ $(LDFLAGS) -Wl,--soname,$@ $(DVDCSS_O) libdvdnav/obj/*.o
-lm \
- -Wl,--unresolved-symbols=ignore-all \
-- `cat $(WRAPPER:.o=.def)` $(WRAPPER)
-+ `cat $(WRAPPER:.o=.def)` $(WRAPPER) -ldvdread
-
- endif
-
-@@ -70,10 +69,6 @@
- libdvdcss: compile
- $(MAKE) -C $@
-
--libdvdread/obj/libdvdread.a: libdvdread;
--libdvdread: compile
-- $(MAKE) -C $@
--
- libdvdnav/obj/libdvdnav.a: libdvdnav;
- libdvdnav: compile
- $(MAKE) -C $@
-diff -Nur
xbmc-14.1-Helix.orig/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
xbmc-14.1-Helix.new/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
---- xbmc-14.1-Helix.orig/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
2015-03-29 14:04:45.834415734 +0200
-+++ xbmc-14.1-Helix.new/xbmc/cores/dvdplayer/DVDInputStreams/DllDvdNav.h
2015-03-29 22:11:12.095748564 +0200
-@@ -34,6 +34,8 @@
- #define HAVE_CONFIG_H
- #endif
-
-+ // pull in Kodi's config h instead of dvdnav's one
-+ #include "xbmc/config.h"
- #include "dvdnav/dvdnav_internal.h"
- #include "dvdnav/vm.h"
- #include "dvdnav/dvd_types.h"
-
diff --git a/media-tv/kodi/files/kodi-14.2-use-external-libhdhomerun.patch
b/media-tv/kodi/files/kodi-14.2-use-external-libhdhomerun.patch
deleted file mode 100644
index c12c4d3..0000000
--- a/media-tv/kodi/files/kodi-14.2-use-external-libhdhomerun.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-diff -Nur xbmc-14.1-Helix.orig/Makefile.in xbmc-14.1-Helix.new/Makefile.in
---- xbmc-14.1-Helix.orig/Makefile.in 2015-03-29 13:22:15.207782443 +0200
-+++ xbmc-14.1-Helix.new/Makefile.in 2015-03-29 13:24:11.881114247 +0200
-@@ -203,7 +203,6 @@
- LIB_DIRS=\
- lib/cximage-6.0 \
- lib/libexif \
-- lib/libhdhomerun \
- lib/cpluff \
- lib/xbmc-dll-symbols
-
-@@ -424,8 +423,6 @@
- $(MAKE) -C lib/libexif
- cmyth: dllloader
- $(MAKE) -C lib/cmyth
--libhdhomerun: dllloader
-- $(MAKE) -C lib/libhdhomerun
- papcodecs: dllloader dvdpcodecs
- test -d system/players/paplayer || mkdir system/players/paplayer
- $(MAKE) -C lib/vgmstream
-@@ -453,7 +450,7 @@
-
- codecs: papcodecs dvdpcodecs dvdpextcodecs
-
--libs: $(LIBSSE4) libhdhomerun imagelib libexif system/libcpluff-@[email protected]
$(CMYTH)
-+libs: $(LIBSSE4) imagelib libexif system/libcpluff-@[email protected] $(CMYTH)
-
- externals: codecs libs visualizations screensavers libaddon pvraddons
-
-diff -Nur xbmc-14.1-Helix.orig/configure.in xbmc-14.1-Helix.new/configure.in
---- xbmc-14.1-Helix.orig/configure.in 2015-03-29 13:22:15.131115777 +0200
-+++ xbmc-14.1-Helix.new/configure.in 2015-03-29 13:33:17.384440443 +0200
-@@ -1246,6 +1246,7 @@
- XB_FIND_SONAME([MODPLUG], [modplug])
- XB_FIND_SONAME([ASS], [ass])
- XB_FIND_SONAME([MPEG2], [mpeg2])
-+XB_FIND_SONAME([HDHOMERUN], [hdhomerun])
- XB_FIND_SONAME([SIDPLAY2], [sidplay2])
-
- # WebServer
-@@ -2467,7 +2468,6 @@
- lib/libexif/Makefile \
- lib/libXDAAP/Makefile \
- lib/cmyth/Makefile \
-- lib/libhdhomerun/Makefile \
- lib/libsquish/Makefile \
- lib/cximage-6.0/Makefile \
- lib/libUPnP/Makefile \
-diff -Nur xbmc-14.1-Helix.orig/xbmc/DllPaths_generated.h.in
xbmc-14.1-Helix.new/xbmc/DllPaths_generated.h.in
---- xbmc-14.1-Helix.orig/xbmc/DllPaths_generated.h.in 2015-03-29
13:22:15.334449107 +0200
-+++ xbmc-14.1-Helix.new/xbmc/DllPaths_generated.h.in 2015-03-29
13:34:43.741105982 +0200
-@@ -28,7 +28,7 @@
- #define DLL_PATH_CPLUFF "special://xbmcbin/system/libcpluff-@[email protected]"
- #define DLL_PATH_IMAGELIB "special://xbmcbin/system/ImageLib-@[email protected]"
- #define DLL_PATH_LIBEXIF "special://xbmcbin/system/libexif-@[email protected]"
--#define DLL_PATH_LIBHDHOMERUN "special://xbmcbin/system/hdhomerun-@[email protected]"
-+#define DLL_PATH_LIBHDHOMERUN "@HDHOMERUN_SONAME@"
- #define DLL_PATH_MEDIAINFO "special://xbmcbin/system/mediainfo-@[email protected]"
- #define DLL_PATH_LIBCMYTH "special://xbmcbin/system/libcmyth-@[email protected]"
-
-diff -Nur xbmc-14.1-Helix.orig/xbmc/filesystem/DllHDHomeRun.h
xbmc-14.1-Helix.new/xbmc/filesystem/DllHDHomeRun.h
---- xbmc-14.1-Helix.orig/xbmc/filesystem/DllHDHomeRun.h 2015-03-29
13:22:15.421115773 +0200
-+++ xbmc-14.1-Helix.new/xbmc/filesystem/DllHDHomeRun.h 2015-03-29
13:37:08.767771175 +0200
-@@ -20,7 +20,7 @@
- */
-
- #include "DynamicDll.h"
--#include "lib/libhdhomerun/hdhomerun.h"
-+#include <hdhomerun/hdhomerun.h>
-
- class DllHdHomeRunInterface
- {
-@@ -41,30 +41,55 @@
-
- class DllHdHomeRun : public DllDynamic, public DllHdHomeRunInterface
- {
-- DECLARE_DLL_WRAPPER(DllHdHomeRun, DLL_PATH_LIBHDHOMERUN)
-- DEFINE_METHOD5(int, discover_find_devices_custom, (uint32_t p1, uint32_t
p2, uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5))
-- DEFINE_METHOD2(struct hdhomerun_device_t*, device_create_from_str, (const
char* p1, struct hdhomerun_debug_t *p2))
-- DEFINE_METHOD1(void, device_destroy, (struct hdhomerun_device_t* p1))
-- DEFINE_METHOD1(int, device_stream_start, (struct hdhomerun_device_t* p1))
-- DEFINE_METHOD3(uint8_t*, device_stream_recv, (struct hdhomerun_device_t*
p1, size_t p2, size_t* p3))
-- DEFINE_METHOD1(void, device_stream_stop, (struct hdhomerun_device_t* p1))
-- DEFINE_METHOD2(int, device_set_tuner_channel, (struct hdhomerun_device_t
*p1, const char *p2))
-- DEFINE_METHOD2(int, device_set_tuner_program, (struct hdhomerun_device_t
*p1, const char *p2))
-- DEFINE_METHOD2(int, device_set_tuner_from_str, (struct hdhomerun_device_t
*p1, const char *p2))
-- DEFINE_METHOD2(void, device_set_tuner, (struct hdhomerun_device_t *p1,
unsigned int p2))
-- DEFINE_METHOD3(int, device_get_tuner_status, (struct hdhomerun_device_t
*p1, char **p2, struct hdhomerun_tuner_status_t *p3));
-- BEGIN_METHOD_RESOLVE()
-- RESOLVE_METHOD_RENAME(hdhomerun_discover_find_devices_custom,
discover_find_devices_custom)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_create_from_str,
device_create_from_str)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_destroy, device_destroy)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_start, device_stream_start)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_recv, device_stream_recv)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_stream_stop, device_stream_stop)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_channel,
device_set_tuner_channel)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_program,
device_set_tuner_program)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner_from_str,
device_set_tuner_from_str)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_set_tuner, device_set_tuner)
-- RESOLVE_METHOD_RENAME(hdhomerun_device_get_tuner_status,
device_get_tuner_status)
-- END_METHOD_RESOLVE()
-+ virtual ~DllHdHomeRun () {};
-+
-+ virtual int discover_find_devices_custom (uint32_t p1, uint32_t p2,
uint32_t p3, struct hdhomerun_discover_device_t p4[], int p5)
-+ { return ::hdhomerun_discover_find_devices_custom (p1, p2, p3, p4, p5); }
-+
-+ virtual struct hdhomerun_device_t *device_create_from_str (const char* p1,
struct hdhomerun_debug_t *p2)
-+ { return ::hdhomerun_device_create_from_str (p1, p2); }
-+
-+ virtual void device_destroy (struct hdhomerun_device_t* p1)
-+ { ::hdhomerun_device_destroy (p1); }
-+
-+ virtual int device_stream_start (struct hdhomerun_device_t* p1)
-+ { return ::hdhomerun_device_stream_start (p1); }
-+
-+
-+ virtual uint8_t *device_stream_recv (struct hdhomerun_device_t* p1, size_t
p2, size_t* p3)
-+ {
-+ uint8_t *retval;
-+
-+ size_t tmp = *p3;
-+ retval = ::hdhomerun_device_stream_recv (p1, p2, &tmp);
-+ *p3 = tmp;
-+
-+ return retval;
-+ }
-+
-+ virtual void device_stream_stop (struct hdhomerun_device_t* p1)
-+ { ::hdhomerun_device_stream_stop (p1); }
-+
-+ virtual int device_set_tuner_channel (struct hdhomerun_device_t *p1, const
char *p2)
-+ { return ::hdhomerun_device_set_tuner_channel (p1, p2); }
-+
-+ virtual int device_set_tuner_program (struct hdhomerun_device_t *p1, const
char *p2)
-+ { return ::hdhomerun_device_set_tuner_program (p1, p2); }
-+
-+
-+ virtual int device_set_tuner_from_str (struct hdhomerun_device_t *p1, const
char *p2)
-+ { return ::hdhomerun_device_set_tuner_from_str (p1, p2); }
-+
-+
-+ virtual void device_set_tuner (struct hdhomerun_device_t *p1, unsigned int
p2)
-+ { ::hdhomerun_device_set_tuner (p1, p2); }
-+
-+ virtual int device_get_tuner_status (struct hdhomerun_device_t *p1, char
**p2, struct hdhomerun_tuner_status_t *p3)
-+ { return ::hdhomerun_device_get_tuner_status (p1, p2, p3); }
-+
-+ // DLL faking.
-+ virtual bool ResolveExports() { return true; }
-+ virtual bool Load() { return true; }
-+ virtual void Unload() {}
- };
-
-
diff --git a/media-tv/kodi/files/kodi-14.2-use-external-libsidplay.patch
b/media-tv/kodi/files/kodi-14.2-use-external-libsidplay.patch
deleted file mode 100644
index e85e64f..0000000
--- a/media-tv/kodi/files/kodi-14.2-use-external-libsidplay.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-diff -Nur xbmc-14.1-Helix.orig/Makefile.in xbmc-14.1-Helix.new/Makefile.in
---- xbmc-14.1-Helix.orig/Makefile.in 2015-01-29 23:57:10.000000000 +0100
-+++ xbmc-14.1-Helix.new/Makefile.in 2015-03-29 13:13:12.564456208 +0200
-@@ -191,7 +191,6 @@
- PAPCODECS_DIRS= \
- lib/nosefart \
- lib/timidity \
-- lib/libsidplay2 \
- lib/stsound/StSoundLibrary \
- lib/snesapu/SNES/SNESAPU \
- lib/vgmstream
-@@ -433,7 +432,7 @@
- $(MAKE) -C lib/timidity
- $(MAKE) -C lib/nosefart
- ifneq ($(findstring arm-osx,@ARCH@), arm-osx)
-- $(MAKE) -C lib/libsidplay2
-+# $(MAKE) -C lib/libsidplay2
- endif
- ifeq (@USE_ASAP_CODEC@,1)
- ifneq ($(findstring osx,@ARCH@), osx)
-diff -Nur xbmc-14.1-Helix.orig/configure.in xbmc-14.1-Helix.new/configure.in
---- xbmc-14.1-Helix.orig/configure.in 2015-01-29 23:57:10.000000000 +0100
-+++ xbmc-14.1-Helix.new/configure.in 2015-03-29 13:18:54.094451741 +0200
-@@ -1152,6 +1152,9 @@
- PKG_CHECK_MODULES([TAGLIB], [taglib >= 1.8],
- [INCLUDES="$INCLUDES $TAGLIB_CFLAGS"; LIBS="$LIBS $TAGLIB_LIBS"],
- AC_MSG_ERROR($missing_library))
-+PKG_CHECK_MODULES([SIDPLAY], [libsidplay2],
-+ [INCLUDES="$INCLUDES $SIDPLAY_CFLAGS"; LIBS="$LIBS $SIDPLAY_LIBS"],
-+ AC_MSG_ERROR($missing_library))
-
- if test "$use_optical_drive" = "yes"; then
- PKG_CHECK_MODULES([CDIO], [libcdio],
-@@ -1243,6 +1246,7 @@
- XB_FIND_SONAME([MODPLUG], [modplug])
- XB_FIND_SONAME([ASS], [ass])
- XB_FIND_SONAME([MPEG2], [mpeg2])
-+XB_FIND_SONAME([SIDPLAY2], [sidplay2])
-
- # WebServer
- if test "$use_webserver" = "yes"; then
-@@ -2448,7 +2452,6 @@
- lib/timidity/Makefile \
- lib/asap/Makefile \
- lib/nosefart/Makefile \
-- lib/libsidplay2/Makefile \
- lib/vgmstream/Makefile \
- lib/snesapu/SNES/SNESAPU/Makefile \
- lib/stsound/StSoundLibrary/Makefile \
-diff -Nur xbmc-14.1-Helix.orig/xbmc/DllPaths_generated.h.in
xbmc-14.1-Helix.new/xbmc/DllPaths_generated.h.in
---- xbmc-14.1-Helix.orig/xbmc/DllPaths_generated.h.in 2015-01-29
23:57:10.000000000 +0100
-+++ xbmc-14.1-Helix.new/xbmc/DllPaths_generated.h.in 2015-03-29
13:19:41.124451123 +0200
-@@ -54,7 +54,7 @@
- #define DLL_PATH_MODULE_CODEC
"special://xbmcbin/system/players/paplayer/dumb-@[email protected]"
- #define DLL_PATH_MPC_CODEC
"special://xbmcbin/system/players/paplayer/libmpcdec-@[email protected]"
- #define DLL_PATH_NSF_CODEC
"special://xbmcbin/system/players/paplayer/nosefart-@[email protected]"
--#define DLL_PATH_SID_CODEC
"special://xbmcbin/system/players/paplayer/libsidplay2-@[email protected]"
-+#define DLL_PATH_SID_CODEC "@SIDPLAY2_SONAME@"
- #define DLL_PATH_SPC_CODEC
"special://xbmcbin/system/players/paplayer/SNESAPU-@[email protected]"
- #define DLL_PATH_VGM_CODEC
"special://xbmcbin/system/players/paplayer/vgmstream-@[email protected]"
- #define DLL_PATH_WAVPACK_CODEC "@WAVPACK_SONAME@"
-
diff --git a/media-tv/kodi/files/kodi-15.1-gcc-5.patch
b/media-tv/kodi/files/kodi-15.1-gcc-5.patch
new file mode 100644
index 0000000..b96cc82
--- /dev/null
+++ b/media-tv/kodi/files/kodi-15.1-gcc-5.patch
@@ -0,0 +1,172 @@
+fix from upstream
+
+From 38693b251f5d80a7414b077e02c1636af65afb3d Mon Sep 17 00:00:00 2001
+From: Craig Andrews <[email protected]>
+Date: Thu, 30 Jul 2015 23:06:41 -0400
+Subject: [PATCH] [rsxs] Use stdbool.h from GCC 5.2.0
+
+---
+ xbmc/screensavers/rsxs-0.9/lib/stdbool_.h | 137 +++++++++---------------------
+ 1 file changed, 38 insertions(+), 99 deletions(-)
+
+diff --git a/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h
b/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h
+index efa80ba..a951510 100644
+--- a/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h
++++ b/xbmc/screensavers/rsxs-0.9/lib/stdbool_.h
+@@ -1,115 +1,54 @@
+-/* Copyright (C) 2001, 2002, 2003, 2006 Free Software Foundation, Inc.
+- Written by Bruno Haible <[email protected]>, 2001.
++/* Copyright (C) 1998-2015 Free Software Foundation, Inc.
+
+- This program is free software; you can redistribute it and/or modify
+- it under the terms of the GNU General Public License as published by
+- the Free Software Foundation; either version 2, or (at your option)
+- any later version.
++This file is part of GCC.
+
+- This program is distributed in the hope that it will be useful,
+- but WITHOUT ANY WARRANTY; without even the implied warranty of
+- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+- GNU General Public License for more details.
++GCC is free software; you can redistribute it and/or modify
++it under the terms of the GNU General Public License as published by
++the Free Software Foundation; either version 3, or (at your option)
++any later version.
+
+- You should have received a copy of the GNU General Public License
+- along with this program; if not, write to the Free Software Foundation,
+- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
++GCC is distributed in the hope that it will be useful,
++but WITHOUT ANY WARRANTY; without even the implied warranty of
++MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
++GNU General Public License for more details.
+
+-#ifndef _STDBOOL_H
+-#define _STDBOOL_H
+-
+-/* ISO C 99 <stdbool.h> for platforms that lack it. */
+-
+-/* Usage suggestions:
+-
+- Programs that use <stdbool.h> should be aware of some limitations
+- and standards compliance issues.
+-
+- Standards compliance:
++Under Section 7 of GPL version 3, you are granted additional
++permissions described in the GCC Runtime Library Exception, version
++3.1, as published by the Free Software Foundation.
+
+- - <stdbool.h> must be #included before 'bool', 'false', 'true'
+- can be used.
++You should have received a copy of the GNU General Public License and
++a copy of the GCC Runtime Library Exception along with this program;
++see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
++<http://www.gnu.org/licenses/>. */
+
+- - You cannot assume that sizeof (bool) == 1.
++/*
++ * ISO C Standard: 7.16 Boolean type and values <stdbool.h>
++ */
+
+- - Programs should not undefine the macros bool, true, and false,
+- as C99 lists that as an "obsolescent feature".
+-
+- Limitations of this substitute, when used in a C89 environment:
+-
+- - <stdbool.h> must be #included before the '_Bool' type can be used.
+-
+- - You cannot assume that _Bool is a typedef; it might be a macro.
++#ifndef _STDBOOL_H
++#define _STDBOOL_H
+
+- - In C99, casts and automatic conversions to '_Bool' or 'bool' are
+- performed in such a way that every nonzero value gets converted
+- to 'true', and zero gets converted to 'false'. This doesn't work
+- with this substitute. With this substitute, only the values 0 and 1
+- give the expected result when converted to _Bool' or 'bool'.
++#ifndef __cplusplus
+
+- Also, it is suggested that programs use 'bool' rather than '_Bool';
+- this isn't required, but 'bool' is more common. */
++#define bool _Bool
++#define true 1
++#define false 0
+
++#else /* __cplusplus */
+
+-/* 7.16. Boolean type and values */
++/* Supporting _Bool in C++ is a GCC extension. */
++#define _Bool bool
+
+-/* BeOS <sys/socket.h> already #defines false 0, true 1. We use the same
+- definitions below, but temporarily we have to #undef them. */
+-#ifdef __BEOS__
+-# include <OS.h> /* defines bool but not _Bool */
+-# undef false
+-# undef true
++#if __cplusplus < 201103L
++/* Defining these macros in C++98 is a GCC extension. */
++#define bool bool
++#define false false
++#define true true
+ #endif
+
+-/* For the sake of symbolic names in gdb, we define true and false as
+- enum constants, not only as macros.
+- It is tempting to write
+- typedef enum { false = 0, true = 1 } _Bool;
+- so that gdb prints values of type 'bool' symbolically. But if we do
+- this, values of type '_Bool' may promote to 'int' or 'unsigned int'
+- (see ISO C 99 6.7.2.2.(4)); however, '_Bool' must promote to 'int'
+- (see ISO C 99 6.3.1.1.(2)). So we add a negative value to the
+- enum; this ensures that '_Bool' promotes to 'int'. */
+-#if defined __cplusplus || defined __BEOS__
+- /* A compiler known to have 'bool'. */
+- /* If the compiler already has both 'bool' and '_Bool', we can assume they
+- are the same types. */
+-# if !@HAVE__BOOL@
+-typedef bool _Bool;
+-# endif
+-#else
+-# if !defined __GNUC__
+- /* If @HAVE__BOOL@:
+- Some HP-UX cc and AIX IBM C compiler versions have compiler bugs when
+- the built-in _Bool type is used. See
+- http://gcc.gnu.org/ml/gcc-patches/2003-12/msg02303.html
+-
http://lists.gnu.org/archive/html/bug-coreutils/2005-11/msg00161.html
+-
http://lists.gnu.org/archive/html/bug-coreutils/2005-10/msg00086.html
+- Similar bugs are likely with other compilers as well; this file
+- wouldn't be used if <stdbool.h> was working.
+- So we override the _Bool type.
+- If !@HAVE__BOOL@:
+- Need to define _Bool ourselves. As 'signed char' or as an enum type?
+- Use of a typedef, with SunPRO C, leads to a stupid
+- "warning: _Bool is a keyword in ISO C99".
+- Use of an enum type, with IRIX cc, leads to a stupid
+- "warning(1185): enumerated type mixed with another type".
+- The only benefit of the enum type, debuggability, is not important
+- with these compilers. So use 'signed char' and no typedef. */
+-# define _Bool signed char
+-enum { false = 0, true = 1 };
+-# else
+- /* With this compiler, trust the _Bool type if the compiler has it. */
+-# if !@HAVE__BOOL@
+-typedef enum { _Bool_must_promote_to_int = -1, false = 0, true = 1 } _Bool;
+-# endif
+-# endif
+-#endif
+-#define bool _Bool
++#endif /* __cplusplus */
+
+-/* The other macros must be usable in preprocessor directives. */
+-#define false 0
+-#define true 1
+-#define __bool_true_false_are_defined 1
++/* Signal that all the definitions are present. */
++#define __bool_true_false_are_defined 1
+
+-#endif /* _STDBOOL_H */
++#endif /* stdbool.h */
+--
+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
new file mode 100644
index 0000000..19309c5
--- /dev/null
+++ b/media-tv/kodi/files/kodi-15.1-texturepacker.patch
@@ -0,0 +1,25 @@
+--- 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-14.2-no-arm-flags.patch
b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch
similarity index 92%
rename from media-tv/kodi/files/kodi-14.2-no-arm-flags.patch
rename to media-tv/kodi/files/kodi-9999-no-arm-flags.patch
index 82a7383..64c1cfb 100644
--- a/media-tv/kodi/files/kodi-14.2-no-arm-flags.patch
+++ b/media-tv/kodi/files/kodi-9999-no-arm-flags.patch
@@ -3,8 +3,8 @@ http://bugs.gentoo.org/400617
do not force any particular ABI or FPU or SIMD compiler flags for arm
targets. let the toolchain and user CFLAGS control that.
---- a/configure.in
-+++ b/configure.in
+--- a/configure.ac
++++ b/configure.ac
@@ -571,7 +571,7 @@
elif test "$target_platform" = "target_raspberry_pi"; then
ARCH="arm"
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 40ab23b..0000000
--- 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.2-r1.ebuild b/media-tv/kodi/kodi-15.1.ebuild
similarity index 63%
rename from media-tv/kodi/kodi-14.2-r1.ebuild
rename to media-tv/kodi/kodi-15.1.ebuild
index c87922f..5ecba7b 100644
--- a/media-tv/kodi/kodi-14.2-r1.ebuild
+++ b/media-tv/kodi/kodi-15.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
EAPI="5"
@@ -9,18 +9,20 @@ EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
-inherit flag-o-matic eutils python-single-r1 multiprocessing autotools
+inherit eutils linux-info python-single-r1 multiprocessing autotools
-CODENAME="Helix"
+CODENAME="Isengard"
case ${PV} in
9999)
EGIT_REPO_URI="git://github.com/xbmc/xbmc.git"
- inherit git-2
+ inherit git-r3
;;
*|*_p*)
MY_PV=${PV/_p/_r}
MY_P="${PN}-${MY_PV}"
-
SRC_URI="https://github.com/xbmc/xbmc/archive/${MY_PV}-${CODENAME}.tar.gz ->
${P}.tar.gz"
+
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}
@@ -32,12 +34,11 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/";
LICENSE="GPL-2"
SLOT="0"
-IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom
hdhomerun 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"
+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"
REQUIRED_USE="
- pvr? ( mysql )
rsxs? ( X )
- xrandr? ( X )
- joystick? ( sdl )
+ udisks? ( dbus )
+ upower? ( dbus )
"
COMMON_DEPEND="${PYTHON_DEPS}
@@ -50,7 +51,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-libs/expat
dev-libs/fribidi
dev-libs/libcdio[-minimal]
- cec? ( >=dev-libs/libcec-2.2 )
+ cec? ( >=dev-libs/libcec-3.0 )
dev-libs/libpcre[cxx]
dev-libs/libxml2
dev-libs/libxslt
@@ -60,16 +61,16 @@ COMMON_DEPEND="${PYTHON_DEPS}
dev-python/simplejson[${PYTHON_USEDEP}]
media-fonts/corefonts
media-fonts/roboto
- media-libs/alsa-lib
+ alsa? ( media-libs/alsa-lib )
media-libs/flac
media-libs/fontconfig
media-libs/freetype
- >=media-libs/glew-1.5.6
+ media-libs/jasper
+ media-libs/jbigkit
>=media-libs/libass-0.9.7
bluray? ( media-libs/libbluray )
css? ( media-libs/libdvdcss )
- media-libs/libdvdread[css?]
- hdhomerun? ( >=media-libs/libhdhomerun-20140121 )
+ texturepacker? ( media-libs/giflib )
media-libs/libmad
media-libs/libmodplug
media-libs/libmpeg2
@@ -77,17 +78,13 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/libpng
projectm? ( media-libs/libprojectm )
media-libs/libsamplerate
- sdl? (
- media-libs/libsdl2
- media-libs/sdl-image
- )
+ joystick? ( media-libs/libsdl2 )
>=media-libs/taglib-1.8
media-libs/libvorbis
media-libs/tiff
pulseaudio? ( media-sound/pulseaudio )
- media-sound/sidplay
media-sound/wavpack
- >=media-video/ffmpeg-2.4:=[encode]
+ >=media-video/ffmpeg-2.6:=[encode]
rtmp? ( media-video/rtmpdump )
avahi? ( net-dns/avahi )
nfs? ( net-fs/libnfs )
@@ -96,7 +93,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
net-misc/curl
samba? ( >=net-fs/samba-3.4.6[smbclient(+)] )
bluetooth? ( net-wireless/bluez )
- sys-apps/dbus
+ dbus? ( sys-apps/dbus )
caps? ( sys-libs/libcap )
sys-libs/zlib
virtual/jpeg
@@ -105,9 +102,9 @@ COMMON_DEPEND="${PYTHON_DEPS}
opengl? (
virtual/glu
virtual/opengl
+ >=media-libs/glew-1.5.6
)
gles? (
- virtual/opengl
media-libs/mesa[gles2]
)
vaapi? ( x11-libs/libva[opengl] )
@@ -119,7 +116,7 @@ COMMON_DEPEND="${PYTHON_DEPS}
x11-apps/xdpyinfo
x11-apps/mesa-progs
x11-libs/libXinerama
- xrandr? ( x11-libs/libXrandr )
+ x11-libs/libXrandr
x11-libs/libXrender
)"
RDEPEND="${COMMON_DEPEND}
@@ -130,89 +127,42 @@ DEPEND="${COMMON_DEPEND}
app-arch/xz-utils
dev-lang/swig
dev-util/gperf
- texturepacker? (
- media-libs/libsdl
- media-libs/sdl-image
- )
X? ( x11-proto/xineramaproto )
dev-util/cmake
x86? ( dev-lang/nasm )
java? ( virtual/jre )
- test? ( dev-cpp/gtest )
- 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-2_src_unpack || default
+ [[ ${PV} == "9999" ]] && git-r3_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
-
- # Patches snatched from Debian and Fedora
- epatch "${FILESDIR}"/${P}-privacy.patch
- epatch "${FILESDIR}"/${P}-use-external-libsidplay.patch
- epatch "${FILESDIR}"/${P}-use-external-libhdhomerun.patch
- epatch "${FILESDIR}"/${P}-disable-gtest.patch
- epatch "${FILESDIR}"/${P}-use-external-dvdread.patch
- epatch "${FILESDIR}"/${P}-remove-ljbig-and-ljasper.patch
-
- # The mythtv patch touches configure.ac, so force a regen
- rm -f configure
-
- # Snatched from Fedora
- if ! use hdhomerun; then
- sed -i configure.in -e '/hdhomerun/d'
- cd xbmc/filesystem
- rm HDHomeRunFile.cpp HDHomeRunFile.h
- rm HDHomeRunDirectory.cpp HDHomeRunDirectory.h
- sed -i Makefile.in -e '/HDHomeRunFile\.cpp/d'
- sed -i Makefile.in -e '/HDHomeRunDirectory\.cpp/d'
- sed -i DirectoryFactory.cpp -e '/HomeRun/d'
- sed -i FileFactory.cpp -e '/HomeRun/d'
- cd "${S}"
- fi
-
- # Snatched from Debian & Fedora - remove bundled libraries, forces
- # build system to use external versions
- rm -r lib/afpfs-ng \
- lib/cximage-6.0/jasper \
- lib/cximage-6.0/jbig \
- lib/cximage-6.0/jpeg \
- lib/cximage-6.0/mng \
- lib/cximage-6.0/png \
- lib/cximage-6.0/tiff \
- lib/cximage-6.0/zlib \
- lib/enca \
- lib/gtest \
- lib/libUPnP/Neptune/ThirdParty/zlib-* \
- lib/libbluray \
- lib/libcec \
- lib/libhdhomerun \
- lib/libmicrohttpd \
- lib/libmodplug \
- lib/libmpeg2 \
- lib/librtmp \
- lib/libsidplay2 \
- lib/taglib \
- lib/win32 \
- project/Win32BuildSetup \
- xbmc/cores/dvdplayer/DVDCodecs/Video/libmpeg2
-
- for i in libdvdcss libdvdread includes
- do
- rm -r lib/libdvd/$i
- done
+ epatch "${FILESDIR}"/${PN}-9999-no-arm-flags.patch #400617
+ epatch "${FILESDIR}"/${P}-texturepacker.patch
+ epatch "${FILESDIR}"/${P}-gcc-5.patch #544760
# 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
+ 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" \
@@ -222,11 +172,7 @@ src_prepare() {
multijob_finish
elibtoolize
- # Ensure jsonschemabuilder is avaliable
- emake -C tools/depends/native/JsonSchemaBuilder/
-
- # Must generate files
- emake -f codegenerator.mk
+ [[ ${PV} == "9999" ]] && emake -f codegenerator.mk
# Disable internal func checks as our USE/DEPEND
# stuff handles this just fine already #408395
@@ -257,22 +203,19 @@ src_configure() {
# Requiring java is asine #434662
[[ ${PV} != "9999" ]] && export ac_cv_path_JAVA_EXE=$(which $(usex java
java true))
- # Snatched from Fedora
- if use hdhomerun; then
- append-libs -lhdhomerun
- fi
-
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) \
@@ -285,21 +228,24 @@ src_configure() {
$(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 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) \
- $(use_enable xrandr)
+ $(use_enable X x11)
+}
+
+src_compile() {
+ emake V=1
}
src_install() {
@@ -309,14 +255,12 @@ src_install() {
domenu tools/Linux/kodi.desktop
newicon media/icon48x48.png kodi.png
- # Remove optional addons (platform specific and disabled by USE flag).
+ # Remove optional addons (platform specific).
local disabled_addons=(
repository.pvr-{android,ios,osx{32,64},win32}.xbmc.org
visualization.dxspectrum
+ visualization.vortex
)
- 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.
