| 1 |
aballier 13/08/01 16:39:38 |
| 2 |
|
| 3 |
Modified: x264-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
drop custom-cflags useflag, bug #473816 |
| 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.12 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.12&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.12&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.11&r2=1.12 |
| 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.11 |
| 20 |
retrieving revision 1.12 |
| 21 |
diff -u -r1.11 -r1.12 |
| 22 |
--- x264-9999.ebuild 1 Aug 2013 16:16:28 -0000 1.11 |
| 23 |
+++ x264-9999.ebuild 1 Aug 2013 16:39:38 -0000 1.12 |
| 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.11 2013/08/01 16:16:28 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.12 2013/08/01 16:39:38 aballier Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
@@ -23,7 +23,7 @@ |
| 33 |
SLOT="0/${SONAME}" |
| 34 |
|
| 35 |
LICENSE="GPL-2" |
| 36 |
-IUSE="10bit custom-cflags +interlaced pic static-libs +threads" |
| 37 |
+IUSE="10bit +interlaced pic static-libs +threads" |
| 38 |
|
| 39 |
ASM_DEP=">=dev-lang/yasm-1.2.0" |
| 40 |
DEPEND="amd64? ( ${ASM_DEP} ) |
| 41 |
@@ -42,9 +42,6 @@ |
| 42 |
tc-export CC |
| 43 |
local asm_conf="" |
| 44 |
|
| 45 |
- # let upstream pick the optimization level by default |
| 46 |
- use custom-cflags || filter-flags -O? |
| 47 |
- |
| 48 |
if use x86 && use pic || [[ ${ABI} == "x32" ]]; then |
| 49 |
asm_conf=" --disable-asm" |
| 50 |
fi |
| 51 |
@@ -66,15 +63,4 @@ |
| 52 |
$(usex static-libs "" "--enable-static") \ |
| 53 |
$(usex threads "" "--disable-thread") \ |
| 54 |
${asm_conf} || die |
| 55 |
- |
| 56 |
- # this is a nasty workaround for bug #376925 as upstream doesn't like us |
| 57 |
- # fiddling with their CFLAGS |
| 58 |
- if use custom-cflags; then |
| 59 |
- local cflags |
| 60 |
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" |
| 61 |
- cflags="${cflags//$(get-flag O)/}" |
| 62 |
- cflags="${cflags//-O? /$(get-flag O) }" |
| 63 |
- cflags="${cflags//-g /}" |
| 64 |
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak |
| 65 |
- fi |
| 66 |
} |
| 67 |
|
| 68 |
|
| 69 |
|
| 70 |
1.93 media-libs/x264/ChangeLog |
| 71 |
|
| 72 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.93&view=markup |
| 73 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.93&content-type=text/plain |
| 74 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.92&r2=1.93 |
| 75 |
|
| 76 |
Index: ChangeLog |
| 77 |
=================================================================== |
| 78 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v |
| 79 |
retrieving revision 1.92 |
| 80 |
retrieving revision 1.93 |
| 81 |
diff -u -r1.92 -r1.93 |
| 82 |
--- ChangeLog 1 Aug 2013 16:16:28 -0000 1.92 |
| 83 |
+++ ChangeLog 1 Aug 2013 16:39:38 -0000 1.93 |
| 84 |
@@ -1,6 +1,9 @@ |
| 85 |
# ChangeLog for media-libs/x264 |
| 86 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 87 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.92 2013/08/01 16:16:28 aballier Exp $ |
| 88 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.93 2013/08/01 16:39:38 aballier Exp $ |
| 89 |
+ |
| 90 |
+ 01 Aug 2013; Alexis Ballier <aballier@g.o> x264-9999.ebuild: |
| 91 |
+ drop custom-cflags useflag, bug #473816 |
| 92 |
|
| 93 |
01 Aug 2013; Alexis Ballier <aballier@g.o> x264-9999.ebuild: |
| 94 |
inherit eutils for the x32 patch |
Archives