1 |
aballier 13/08/01 16:59:00 |
2 |
|
3 |
Modified: x264-9999.ebuild ChangeLog |
4 |
Log: |
5 |
Do not mess too much with CFLAGS. Should fix bug #413661 and bug #351219. |
6 |
|
7 |
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A) |
8 |
|
9 |
Revision Changes Path |
10 |
1.13 media-libs/x264/x264-9999.ebuild |
11 |
|
12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.13&view=markup |
13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.13&content-type=text/plain |
14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.12&r2=1.13 |
15 |
|
16 |
Index: x264-9999.ebuild |
17 |
=================================================================== |
18 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v |
19 |
retrieving revision 1.12 |
20 |
retrieving revision 1.13 |
21 |
diff -u -r1.12 -r1.13 |
22 |
--- x264-9999.ebuild 1 Aug 2013 16:39:38 -0000 1.12 |
23 |
+++ x264-9999.ebuild 1 Aug 2013 16:59:00 -0000 1.13 |
24 |
@@ -1,6 +1,6 @@ |
25 |
# Copyright 1999-2013 Gentoo Foundation |
26 |
# Distributed under the terms of the GNU General Public License v2 |
27 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.12 2013/08/01 16:39:38 aballier Exp $ |
28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.13 2013/08/01 16:59:00 aballier Exp $ |
29 |
|
30 |
EAPI=5 |
31 |
|
32 |
@@ -23,7 +23,7 @@ |
33 |
SLOT="0/${SONAME}" |
34 |
|
35 |
LICENSE="GPL-2" |
36 |
-IUSE="10bit +interlaced pic static-libs +threads" |
37 |
+IUSE="10bit +interlaced pic static-libs sse +threads" |
38 |
|
39 |
ASM_DEP=">=dev-lang/yasm-1.2.0" |
40 |
DEPEND="amd64? ( ${ASM_DEP} ) |
41 |
@@ -35,7 +35,8 @@ |
42 |
|
43 |
src_prepare() { |
44 |
# Initial support for x32 ABI, bug #420241 |
45 |
- epatch "${FILESDIR}"/x264-x32.patch |
46 |
+ # Avoid messing too much with CFLAGS. |
47 |
+ epatch "${FILESDIR}"/x264-cflags.patch |
48 |
} |
49 |
|
50 |
src_configure() { |
51 |
@@ -46,6 +47,9 @@ |
52 |
asm_conf=" --disable-asm" |
53 |
fi |
54 |
|
55 |
+ # Upstream uses this, see the cflags patch |
56 |
+ use sse && append-flags "-msse" "-mfpmath=sse" |
57 |
+ |
58 |
./configure \ |
59 |
--prefix="${EPREFIX}"/usr \ |
60 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
61 |
|
62 |
|
63 |
|
64 |
1.94 media-libs/x264/ChangeLog |
65 |
|
66 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.94&view=markup |
67 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.94&content-type=text/plain |
68 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.93&r2=1.94 |
69 |
|
70 |
Index: ChangeLog |
71 |
=================================================================== |
72 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v |
73 |
retrieving revision 1.93 |
74 |
retrieving revision 1.94 |
75 |
diff -u -r1.93 -r1.94 |
76 |
--- ChangeLog 1 Aug 2013 16:39:38 -0000 1.93 |
77 |
+++ ChangeLog 1 Aug 2013 16:59:00 -0000 1.94 |
78 |
@@ -1,6 +1,10 @@ |
79 |
# ChangeLog for media-libs/x264 |
80 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
81 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.93 2013/08/01 16:39:38 aballier Exp $ |
82 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.94 2013/08/01 16:59:00 aballier Exp $ |
83 |
+ |
84 |
+ 01 Aug 2013; Alexis Ballier <aballier@g.o> x264-9999.ebuild, |
85 |
+ +files/x264-cflags.patch: |
86 |
+ Do not mess too much with CFLAGS. Should fix bug #413661 and bug #351219. |
87 |
|
88 |
01 Aug 2013; Alexis Ballier <aballier@g.o> x264-9999.ebuild: |
89 |
drop custom-cflags useflag, bug #473816 |