1 |
commit: c067131371d784a9ad3d42f59229f051d29de80c |
2 |
Author: Craig Andrews <candrews <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sun Aug 16 20:47:22 2020 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Sun Aug 16 20:49:28 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0671313 |
7 |
|
8 |
media-tv/kodi: follow PYTHON_SINGLE_TARGET selection |
9 |
|
10 |
Closes: https://bugs.gentoo.org/737240 |
11 |
Package-Manager: Portage-3.0.2, Repoman-2.3.23 |
12 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
13 |
|
14 |
media-tv/kodi/{kodi-19.9999.ebuild => kodi-19.0_alpha1-r1.ebuild} | 6 ++++++ |
15 |
media-tv/kodi/kodi-19.9999.ebuild | 2 ++ |
16 |
media-tv/kodi/kodi-9999.ebuild | 2 ++ |
17 |
3 files changed, 10 insertions(+) |
18 |
|
19 |
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild |
20 |
similarity index 98% |
21 |
copy from media-tv/kodi/kodi-19.9999.ebuild |
22 |
copy to media-tv/kodi/kodi-19.0_alpha1-r1.ebuild |
23 |
index d253bed8325..6da60ce1906 100644 |
24 |
--- a/media-tv/kodi/kodi-19.9999.ebuild |
25 |
+++ b/media-tv/kodi/kodi-19.0_alpha1-r1.ebuild |
26 |
@@ -29,6 +29,10 @@ else |
27 |
S=${WORKDIR}/xbmc-${MY_PV}-${CODENAME} |
28 |
fi |
29 |
|
30 |
+PATCHES=( |
31 |
+ "${FILESDIR}/${P}-conditional-TestHTTPDirectory.patch" |
32 |
+) |
33 |
+ |
34 |
inherit autotools cmake desktop linux-info pax-utils python-single-r1 xdg |
35 |
|
36 |
DESCRIPTION="A free and open source media-player and entertainment hub" |
37 |
@@ -255,6 +259,8 @@ src_configure() { |
38 |
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" |
39 |
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" |
40 |
-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" |
41 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
42 |
+ -DPYTHON_LIBRARY="$(python_get_library_path)" |
43 |
) |
44 |
|
45 |
use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) |
46 |
|
47 |
diff --git a/media-tv/kodi/kodi-19.9999.ebuild b/media-tv/kodi/kodi-19.9999.ebuild |
48 |
index d253bed8325..68f0cbca4ea 100644 |
49 |
--- a/media-tv/kodi/kodi-19.9999.ebuild |
50 |
+++ b/media-tv/kodi/kodi-19.9999.ebuild |
51 |
@@ -255,6 +255,8 @@ src_configure() { |
52 |
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" |
53 |
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" |
54 |
-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" |
55 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
56 |
+ -DPYTHON_LIBRARY="$(python_get_library_path)" |
57 |
) |
58 |
|
59 |
use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) |
60 |
|
61 |
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild |
62 |
index d253bed8325..68f0cbca4ea 100644 |
63 |
--- a/media-tv/kodi/kodi-9999.ebuild |
64 |
+++ b/media-tv/kodi/kodi-9999.ebuild |
65 |
@@ -255,6 +255,8 @@ src_configure() { |
66 |
-Dlibdvdread_URL="${DISTDIR}/libdvdread-${LIBDVDREAD_VERSION}.tar.gz" |
67 |
-Dlibdvdnav_URL="${DISTDIR}/libdvdnav-${LIBDVDNAV_VERSION}.tar.gz" |
68 |
-Dlibdvdcss_URL="${DISTDIR}/libdvdcss-${LIBDVDCSS_VERSION}.tar.gz" |
69 |
+ -DPYTHON_INCLUDE_DIR="$(python_get_includedir)" |
70 |
+ -DPYTHON_LIBRARY="$(python_get_library_path)" |
71 |
) |
72 |
|
73 |
use libusb && mycmakeargs+=( -DENABLE_LIBUSB=$(usex libusb) ) |