1 |
commit: 85cc36eb4685f8b8ed374c02020139a7a95ba241 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Mar 31 12:44:46 2016 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu Mar 31 12:45:11 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85cc36eb |
7 |
|
8 |
media-video/handbrake: Bump live ebuild to EAPI-6. |
9 |
|
10 |
Package-Manager: portage-2.2.28 |
11 |
Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org> |
12 |
|
13 |
media-video/handbrake/handbrake-9999.ebuild | 33 ++++++++++++++++------------- |
14 |
1 file changed, 18 insertions(+), 15 deletions(-) |
15 |
|
16 |
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild |
17 |
index adb5fc3..8fb14e6 100644 |
18 |
--- a/media-video/handbrake/handbrake-9999.ebuild |
19 |
+++ b/media-video/handbrake/handbrake-9999.ebuild |
20 |
@@ -1,8 +1,8 @@ |
21 |
-# Copyright 1999-2015 Gentoo Foundation |
22 |
+# Copyright 1999-2016 Gentoo Foundation |
23 |
# Distributed under the terms of the GNU General Public License v2 |
24 |
# $Id$ |
25 |
|
26 |
-EAPI="5" |
27 |
+EAPI=6 |
28 |
|
29 |
PYTHON_COMPAT=( python2_7 ) |
30 |
|
31 |
@@ -13,8 +13,9 @@ if [[ ${PV} = *9999* ]]; then |
32 |
inherit git-r3 |
33 |
KEYWORDS="" |
34 |
else |
35 |
- SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2" |
36 |
- S="${WORKDIR}/HandBrake-${PV}" |
37 |
+ MY_P="HandBrake-${PV}" |
38 |
+ SRC_URI="http://handbrake.fr/rotation.php?file=${MY_P}.tar.bz2 -> ${P}.tar.bz2" |
39 |
+ S="${WORKDIR}/${MY_P}" |
40 |
KEYWORDS="~amd64 ~x86" |
41 |
fi |
42 |
|
43 |
@@ -73,27 +74,29 @@ DEPEND="${RDEPEND} |
44 |
dev-util/intltool |
45 |
sys-devel/automake" |
46 |
|
47 |
+PATCHES=( |
48 |
+ # Remove libdvdnav duplication and call it on the original instead. |
49 |
+ # It may work this way; if not, we should try to mimic the duplication. |
50 |
+ "${FILESDIR}/${PN}-9999-remove-dvdnav-dup.patch" |
51 |
+ |
52 |
+ # Remove faac dependency; TODO: figure out if we need to do this at all. |
53 |
+ "${FILESDIR}/${PN}-9999-remove-faac-dependency.patch" |
54 |
+ |
55 |
+ # Fix missing x265 link flag |
56 |
+ "${FILESDIR}/${PN}-9999-fix-missing-x265-link-flag.patch" |
57 |
+) |
58 |
+ |
59 |
pkg_setup() { |
60 |
python-any-r1_pkg_setup |
61 |
} |
62 |
|
63 |
src_prepare() { |
64 |
- epatch_user |
65 |
- |
66 |
# Get rid of leftover bundled library build definitions, |
67 |
sed -i 's:.*\(/contrib\|contrib/\).*::g' \ |
68 |
"${S}"/make/include/main.defs \ |
69 |
|| die "Contrib removal failed." |
70 |
|
71 |
- # Remove libdvdnav duplication and call it on the original instead. |
72 |
- # It may work this way; if not, we should try to mimic the duplication. |
73 |
- epatch "${FILESDIR}"/${PN}-9999-remove-dvdnav-dup.patch |
74 |
- |
75 |
- # Remove faac dependency; TODO: figure out if we need to do this at all. |
76 |
- epatch "${FILESDIR}"/${PN}-9999-remove-faac-dependency.patch |
77 |
- |
78 |
- # Fix missing x265 link flag |
79 |
- epatch "${FILESDIR}"/${PN}-9999-fix-missing-x265-link-flag.patch |
80 |
+ default |
81 |
|
82 |
cd "${S}/gtk" |
83 |
# Don't run autogen.sh. |