commit: 10e30924944bb593d9712d83774a90c167b4d1d2
Author: Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 22 03:47:21 2015 +0000
Commit: Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon Jun 22 03:47:21 2015 +0000
URL: https://gitweb.gentoo.org/dev/anarchy.git/commit/?id=10e30924
use more system libraries, bug #545002
media-tv/kodi/Manifest | 8 +-
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 +++++++++
.../kodi/{kodi-14.2.ebuild => kodi-14.2-r1.ebuild} | 75 +++++++++-
8 files changed, 481 insertions(+), 8 deletions(-)
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index 420eb61..f38a31e 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -1,7 +1,13 @@
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.ebuild 7803 SHA256
fd476d6d5d26ccb49c921de0ffed03c458fbdbefaefad9ba9bd41b3bef4cd367 SHA512
631dcdf7d024bae5ca12eb4cac330b4034054f2e600e94b9d9c42e3bab6d627cff6be7c17e5538dd20ca6eaa5c8eac31d72dcd99f21194cc956ca50fe05c02e9
WHIRLPOOL
311c44781ab6e6c7465c6fce0479eba6de0371210770bc7e4ece77c32bbb8994eebe2144284874e9ab63b1fa6a840e8666c28078666d1f0008cc489529223b43
+EBUILD kodi-14.2-r1.ebuild 9337 SHA256
c898c46f7100e89432f32cc397df0b52151df16879494ad97b152970577482de SHA512
f203adc88609de111414ecec76964c7d6d9fb8d1943f0e63010b4b78b28a97ccc6df70aab2784050e53e19c39b59f99400e885219530a67e86816e7ff335e874
WHIRLPOOL
40e8a2ed23c2a6c39b6325ebd8650423196eb9df900dd664848ec5a2ffa275c98f02641f8eb43911e102f8f2a1d1c51d156a5fdad05f6faa7910af5d39974717
MISC metadata.xml 1363 SHA256
7a84053a0098a072ad36501caa9510eb4ae1ccd452044fe12a35f25308db7975 SHA512
f15de59f24fc15b6f4449f868f62151ebef3a90c4640072c3e19ce527825006f105a1eda2fb16f4341f228505adc2e3a3d2b582ad43784355e565f4435f61309
WHIRLPOOL
c1f9d69ff1a2a2ae4155b725bdc1706a46abedf78c973859ef85aa84fc0afc5b0e0a6bc70799c1224b7cd70c1a95028701aa44aa77178ae39b586ad8dc2049a8
diff --git a/media-tv/kodi/files/kodi-14.2-disable-gtest.patch
b/media-tv/kodi/files/kodi-14.2-disable-gtest.patch
new file mode 100644
index 0000000..23ca131
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.2-disable-gtest.patch
@@ -0,0 +1,13 @@
+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
new file mode 100644
index 0000000..0b5ebfe
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.2-privacy.patch
@@ -0,0 +1,14 @@
+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
new file mode 100644
index 0000000..7fa52cb
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.2-remove-ljbig-and-ljasper.patch
@@ -0,0 +1,37 @@
+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
new file mode 100644
index 0000000..636c460
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.2-use-external-dvdread.patch
@@ -0,0 +1,126 @@
+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
new file mode 100644
index 0000000..c12c4d3
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.2-use-external-libhdhomerun.patch
@@ -0,0 +1,154 @@
+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
new file mode 100644
index 0000000..e85e64f
--- /dev/null
+++ b/media-tv/kodi/files/kodi-14.2-use-external-libsidplay.patch
@@ -0,0 +1,62 @@
+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/kodi-14.2.ebuild b/media-tv/kodi/kodi-14.2-r1.ebuild
similarity index 78%
rename from media-tv/kodi/kodi-14.2.ebuild
rename to media-tv/kodi/kodi-14.2-r1.ebuild
index 353fea7..c87922f 100644
--- a/media-tv/kodi/kodi-14.2.ebuild
+++ b/media-tv/kodi/kodi-14.2-r1.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.7
2015/04/08 18:15:30 mgorny Exp $
+# $Header: $
EAPI="5"
@@ -9,7 +9,7 @@ EAPI="5"
PYTHON_COMPAT=( python2_7 )
PYTHON_REQ_USE="sqlite"
-inherit eutils python-single-r1 multiprocessing autotools
+inherit flag-o-matic eutils python-single-r1 multiprocessing autotools
CODENAME="Helix"
case ${PV} in
@@ -32,7 +32,7 @@ HOMEPAGE="http://kodi.tv/ http://kodi.wiki/";
LICENSE="GPL-2"
SLOT="0"
-IUSE="airplay avahi bluetooth bluray caps cec css debug +fishbmc gles goom
java joystick midi mysql nfs +opengl profile +projectm pulseaudio pvr +rsxs
rtmp +samba sdl sftp test +texturepacker udisks upnp upower +usb vaapi vdpau
webserver +X +xrandr"
+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"
REQUIRED_USE="
pvr? ( mysql )
rsxs? ( X )
@@ -65,11 +65,11 @@ COMMON_DEPEND="${PYTHON_DEPS}
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 )
media-libs/libmad
media-libs/libmodplug
media-libs/libmpeg2
@@ -77,11 +77,15 @@ COMMON_DEPEND="${PYTHON_DEPS}
media-libs/libpng
projectm? ( media-libs/libprojectm )
media-libs/libsamplerate
- sdl? ( media-libs/libsdl2 )
+ sdl? (
+ media-libs/libsdl2
+ media-libs/sdl-image
+ )
>=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]
rtmp? ( media-video/rtmpdump )
@@ -130,7 +134,6 @@ DEPEND="${COMMON_DEPEND}
media-libs/libsdl
media-libs/sdl-image
)
- sdl? ( media-libs/sdl-image )
X? ( x11-proto/xineramaproto )
dev-util/cmake
x86? ( dev-lang/nasm )
@@ -150,9 +153,62 @@ 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
+
# some dirs ship generated autotools, some dont
multijob_init
local d
@@ -201,6 +257,11 @@ 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 \
