1 |
lu_zero 12/09/01 10:21:10 |
2 |
|
3 |
Modified: ChangeLog x264-0.0.20120707.ebuild |
4 |
Log: |
5 |
Update to support prefix, fix bug #351219, thanks to the people involved |
6 |
|
7 |
(Portage version: 2.2.0_alpha121/cvs/Linux x86_64) |
8 |
|
9 |
Revision Changes Path |
10 |
1.75 media-libs/x264/ChangeLog |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.75&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.75&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.74&r2=1.75 |
15 |
|
16 |
Index: ChangeLog |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v |
19 |
retrieving revision 1.74 |
20 |
retrieving revision 1.75 |
21 |
diff -u -r1.74 -r1.75 |
22 |
--- ChangeLog 8 Jul 2012 17:27:19 -0000 1.74 |
23 |
+++ ChangeLog 1 Sep 2012 10:21:10 -0000 1.75 |
24 |
@@ -1,6 +1,9 @@ |
25 |
# ChangeLog for media-libs/x264 |
26 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.74 2012/07/08 17:27:19 lu_zero Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.75 2012/09/01 10:21:10 lu_zero Exp $ |
29 |
+ |
30 |
+ 01 Sep 2012; Luca Barbato <lu_zero@g.o> x264-0.0.20120707.ebuild: |
31 |
+ Update to support prefix, fix bug #351219, thanks to the people involved |
32 |
|
33 |
*x264-0.0.20120707 (08 Jul 2012) |
34 |
|
35 |
|
36 |
|
37 |
|
38 |
1.2 media-libs/x264/x264-0.0.20120707.ebuild |
39 |
|
40 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild?rev=1.2&view=markup |
41 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild?rev=1.2&content-type=text/plain |
42 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild?r1=1.1&r2=1.2 |
43 |
|
44 |
Index: x264-0.0.20120707.ebuild |
45 |
=================================================================== |
46 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v |
47 |
retrieving revision 1.1 |
48 |
retrieving revision 1.2 |
49 |
diff -u -r1.1 -r1.2 |
50 |
--- x264-0.0.20120707.ebuild 8 Jul 2012 17:27:19 -0000 1.1 |
51 |
+++ x264-0.0.20120707.ebuild 1 Sep 2012 10:21:10 -0000 1.2 |
52 |
@@ -1,6 +1,6 @@ |
53 |
# Copyright 1999-2012 Gentoo Foundation |
54 |
# Distributed under the terms of the GNU General Public License v2 |
55 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.1 2012/07/08 17:27:19 lu_zero Exp $ |
56 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-0.0.20120707.ebuild,v 1.2 2012/09/01 10:21:10 lu_zero Exp $ |
57 |
|
58 |
EAPI=4 |
59 |
|
60 |
@@ -29,14 +29,18 @@ |
61 |
if [ "${PV#9999}" != "${PV}" ]; then |
62 |
KEYWORDS="" |
63 |
else |
64 |
- KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
65 |
+ KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" |
66 |
fi |
67 |
IUSE="10bit custom-cflags debug +interlaced pic static-libs +threads" |
68 |
|
69 |
RDEPEND="" |
70 |
DEPEND="amd64? ( >=dev-lang/yasm-1 ) |
71 |
x86? ( >=dev-lang/yasm-1 ) |
72 |
- x86-fbsd? ( >=dev-lang/yasm-1 )" |
73 |
+ x86-fbsd? ( >=dev-lang/yasm-1 ) |
74 |
+ x86-macos? ( >=dev-lang/yasm-1 ) |
75 |
+ x64-macos? ( >=dev-lang/yasm-1 ) |
76 |
+ x86-solaris? ( >=dev-lang/yasm-1 ) |
77 |
+ x64-solaris? ( >=dev-lang/yasm-1 )" |
78 |
|
79 |
if [ "${PV#9999}" = "${PV}" ]; then |
80 |
S="${WORKDIR}/${MY_P}" |
81 |
@@ -44,6 +48,17 @@ |
82 |
|
83 |
DOCS="AUTHORS doc/*.txt" |
84 |
|
85 |
+src_prepare() { |
86 |
+ # Solaris' /bin/sh doesn't grok the syntax in these files |
87 |
+ sed -i -e '1c\#!/usr/bin/env sh' configure version.sh || die |
88 |
+ # for sparc-solaris |
89 |
+ if [[ ${CHOST} == sparc*-solaris* ]] ; then |
90 |
+ sed -i -e 's:-DPIC::g' configure || die |
91 |
+ fi |
92 |
+ # for OSX |
93 |
+ sed -i -e "s|-arch x86_64||g" configure || die |
94 |
+} |
95 |
+ |
96 |
src_configure() { |
97 |
tc-export CC |