| 1 |
aballier 13/08/01 17:24:03 |
| 2 |
|
| 3 |
Modified: x264-9999.ebuild ChangeLog |
| 4 |
Log: |
| 5 |
Go multilib and stack for for medialibs r8 |
| 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.14 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.14&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.14&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.13&r2=1.14 |
| 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.13 |
| 20 |
retrieving revision 1.14 |
| 21 |
diff -u -r1.13 -r1.14 |
| 22 |
--- x264-9999.ebuild 1 Aug 2013 16:59:00 -0000 1.13 |
| 23 |
+++ x264-9999.ebuild 1 Aug 2013 17:24:02 -0000 1.14 |
| 24 |
@@ -1,10 +1,10 @@ |
| 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.13 2013/08/01 16:59:00 aballier Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.14 2013/08/01 17:24:02 aballier Exp $ |
| 29 |
|
| 30 |
EAPI=5 |
| 31 |
|
| 32 |
-inherit flag-o-matic multilib toolchain-funcs eutils |
| 33 |
+inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal |
| 34 |
|
| 35 |
DESCRIPTION="A free library for encoding X264/AVC streams" |
| 36 |
HOMEPAGE="http://www.videolan.org/developers/x264.html" |
| 37 |
@@ -26,10 +26,10 @@ |
| 38 |
IUSE="10bit +interlaced pic static-libs sse +threads" |
| 39 |
|
| 40 |
ASM_DEP=">=dev-lang/yasm-1.2.0" |
| 41 |
-DEPEND="amd64? ( ${ASM_DEP} ) |
| 42 |
- amd64-fbsd? ( ${ASM_DEP} ) |
| 43 |
- x86? ( ${ASM_DEP} ) |
| 44 |
- x86-fbsd? ( ${ASM_DEP} )" |
| 45 |
+DEPEND="abi_x86_32? ( ${ASM_DEP} ) |
| 46 |
+ abi_x86_64? ( ${ASM_DEP} )" |
| 47 |
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7 |
| 48 |
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )" |
| 49 |
|
| 50 |
DOCS="AUTHORS doc/*.txt" |
| 51 |
|
| 52 |
@@ -39,18 +39,18 @@ |
| 53 |
epatch "${FILESDIR}"/x264-cflags.patch |
| 54 |
} |
| 55 |
|
| 56 |
-src_configure() { |
| 57 |
+multilib_src_configure() { |
| 58 |
tc-export CC |
| 59 |
local asm_conf="" |
| 60 |
|
| 61 |
- if use x86 && use pic || [[ ${ABI} == "x32" ]]; then |
| 62 |
+ if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then |
| 63 |
asm_conf=" --disable-asm" |
| 64 |
fi |
| 65 |
|
| 66 |
# Upstream uses this, see the cflags patch |
| 67 |
use sse && append-flags "-msse" "-mfpmath=sse" |
| 68 |
|
| 69 |
- ./configure \ |
| 70 |
+ "${S}/configure" \ |
| 71 |
--prefix="${EPREFIX}"/usr \ |
| 72 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
| 73 |
--disable-cli \ |
| 74 |
|
| 75 |
|
| 76 |
|
| 77 |
1.95 media-libs/x264/ChangeLog |
| 78 |
|
| 79 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.95&view=markup |
| 80 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.95&content-type=text/plain |
| 81 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.94&r2=1.95 |
| 82 |
|
| 83 |
Index: ChangeLog |
| 84 |
=================================================================== |
| 85 |
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v |
| 86 |
retrieving revision 1.94 |
| 87 |
retrieving revision 1.95 |
| 88 |
diff -u -r1.94 -r1.95 |
| 89 |
--- ChangeLog 1 Aug 2013 16:59:00 -0000 1.94 |
| 90 |
+++ ChangeLog 1 Aug 2013 17:24:02 -0000 1.95 |
| 91 |
@@ -1,6 +1,9 @@ |
| 92 |
# ChangeLog for media-libs/x264 |
| 93 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
| 94 |
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.94 2013/08/01 16:59:00 aballier Exp $ |
| 95 |
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.95 2013/08/01 17:24:02 aballier Exp $ |
| 96 |
+ |
| 97 |
+ 01 Aug 2013; Alexis Ballier <aballier@g.o> x264-9999.ebuild: |
| 98 |
+ Go multilib and stack for for medialibs r8 |
| 99 |
|
| 100 |
01 Aug 2013; Alexis Ballier <aballier@g.o> x264-9999.ebuild, |
| 101 |
+files/x264-cflags.patch: |
Archives