* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2011-05-28 6:30 Tim Harder (radhermit)
0 siblings, 0 replies; 9+ messages in thread
From: Tim Harder (radhermit) @ 2011-05-28 6:30 UTC (permalink / raw
To: gentoo-commits
radhermit 11/05/28 06:30:08
Modified: ChangeLog
Added: x264-9999.ebuild
Log:
Import live ebuild from the multimedia overlay (requested by Nikoli).
(Portage version: 2.2.0_alpha37/cvs/Linux x86_64)
Revision Changes Path
1.50 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.50&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.50&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.49&r2=1.50
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -r1.49 -r1.50
--- ChangeLog 27 Apr 2011 17:20:07 -0000 1.49
+++ ChangeLog 28 May 2011 06:30:08 -0000 1.50
@@ -1,6 +1,11 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.49 2011/04/27 17:20:07 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.50 2011/05/28 06:30:08 radhermit Exp $
+
+*x264-9999 (28 May 2011)
+
+ 28 May 2011; Tim Harder <radhermit@gentoo.org> +x264-9999.ebuild:
+ Import live ebuild from the multimedia overlay (requested by Nikoli).
*x264-0.0.20110426 (27 Apr 2011)
1.1 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.1&content-type=text/plain
Index: x264-9999.ebuild
===================================================================
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.1 2011/05/28 06:30:08 radhermit Exp $
EAPI=4
if [ "${PV#9999}" != "${PV}" ] ; then
V_ECLASS="git-2"
else
V_ECLASS="versionator"
fi
inherit multilib toolchain-funcs ${V_ECLASS}
if [ "${PV#9999}" = "${PV}" ] ; then
MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
fi
DESCRIPTION="A free library for encoding X264/AVC streams"
HOMEPAGE="http://www.videolan.org/developers/x264.html"
if [ "${PV#9999}" != "${PV}" ] ; then
EGIT_REPO_URI="git://git.videolan.org/x264.git"
SRC_URI=""
else
SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
fi
LICENSE="GPL-2"
SLOT="0"
if [ "${PV#9999}" != "${PV}" ] ; then
KEYWORDS=""
else
KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
fi
IUSE="debug +threads pic static-libs"
RDEPEND=""
ASM_DEP=">=dev-lang/yasm-0.6.2"
DEPEND="
amd64? ( ${ASM_DEP} )
x86? ( ${ASM_DEP} )
x86-fbsd? ( ${ASM_DEP} )
"
if [ "${PV#9999}" = "${PV}" ] ; then
S=${WORKDIR}/${MY_P}
fi
DOCS="AUTHORS doc/*.txt"
src_configure() {
tc-export CC
local myconf=""
use debug && myconf+=" --enable-debug"
use static-libs && myconf+=" --enable-static"
use threads || myconf+=" --disable-thread"
if use x86 && use pic; then
myconf+=" --disable-asm"
fi
./configure \
--prefix="${EPREFIX}"/usr \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--disable-cli \
--disable-avs \
--disable-lavf \
--disable-swscale \
--disable-ffms \
--disable-gpac \
--enable-pic \
--enable-shared \
--extra-asflags="${ASFLAGS}" \
--extra-cflags="${CFLAGS}" \
--extra-ldflags="${LDFLAGS}" \
--host="${CHOST}" \
${myconf} \
|| die
}
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2011-09-03 18:39 Maxim Koltsov (maksbotan)
0 siblings, 0 replies; 9+ messages in thread
From: Maxim Koltsov (maksbotan) @ 2011-09-03 18:39 UTC (permalink / raw
To: gentoo-commits
maksbotan 11/09/03 18:39:24
Modified: x264-9999.ebuild ChangeLog
Log:
Fix SRC_URI in 9999
(Portage version: 2.1.10.11/cvs/Linux x86_64)
Revision Changes Path
1.2 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.1&r2=1.2
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- x264-9999.ebuild 28 May 2011 06:30:08 -0000 1.1
+++ x264-9999.ebuild 3 Sep 2011 18:39:24 -0000 1.2
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.1 2011/05/28 06:30:08 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.2 2011/09/03 18:39:24 maksbotan Exp $
EAPI=4
@@ -13,7 +13,7 @@
inherit multilib toolchain-funcs ${V_ECLASS}
if [ "${PV#9999}" = "${PV}" ] ; then
- MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
+ MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable"
fi
DESCRIPTION="A free library for encoding X264/AVC streams"
HOMEPAGE="http://www.videolan.org/developers/x264.html"
@@ -21,7 +21,7 @@
EGIT_REPO_URI="git://git.videolan.org/x264.git"
SRC_URI=""
else
- SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
+ SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
fi
LICENSE="GPL-2"
@@ -72,6 +72,5 @@
--extra-cflags="${CFLAGS}" \
--extra-ldflags="${LDFLAGS}" \
--host="${CHOST}" \
- ${myconf} \
- || die
+ ${myconf} || die
}
1.57 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.57&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.57&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.56&r2=1.57
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- ChangeLog 27 Aug 2011 17:47:04 -0000 1.56
+++ ChangeLog 3 Sep 2011 18:39:24 -0000 1.57
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.56 2011/08/27 17:47:04 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.57 2011/09/03 18:39:24 maksbotan Exp $
+
+ 03 Sep 2011; Maxim Koltsov <maksbotan@gentoo.org> x264-9999.ebuild:
+ Fix SRC_URI & some cosmetic change. Thanks to Nikoli <nikoli@lavabit.com>
27 Aug 2011; Raúl Porcel <armin76@gentoo.org> x264-0.0.20110426.ebuild:
alpha/sparc stable wrt #378801
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2013-08-01 16:14 Alexis Ballier (aballier)
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-01 16:14 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/01 16:14:49
Modified: x264-9999.ebuild ChangeLog
Log:
Give a subslot even to -9999 and update soname
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.10 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.10&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.10&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.9&r2=1.10
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- x264-9999.ebuild 26 Jun 2013 04:38:09 -0000 1.9
+++ x264-9999.ebuild 1 Aug 2013 16:14:49 -0000 1.10
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.9 2013/06/26 04:38:09 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.10 2013/08/01 16:14:49 aballier Exp $
EAPI=5
@@ -11,19 +11,17 @@
if [[ ${PV} == 9999 ]]; then
inherit git-2
EGIT_REPO_URI="git://git.videolan.org/x264.git"
- SLOT="0"
else
inherit versionator
MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
-
- SONAME="132"
- SLOT="0/${SONAME}"
-
S="${WORKDIR}/${MY_P}"
fi
+SONAME="135"
+SLOT="0/${SONAME}"
+
LICENSE="GPL-2"
IUSE="10bit custom-cflags +interlaced pic static-libs +threads"
1.91 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.91&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.91&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.90&r2=1.91
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.90
retrieving revision 1.91
diff -u -r1.90 -r1.91
--- ChangeLog 26 Jun 2013 04:38:09 -0000 1.90
+++ ChangeLog 1 Aug 2013 16:14:49 -0000 1.91
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.90 2013/06/26 04:38:09 chutzpah Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.91 2013/08/01 16:14:49 aballier Exp $
+
+ 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
+ Give a subslot even to -9999 and update soname
26 Jun 2013; Patrick McLean <chutzpah@gentoo.org> x264-0.0.20130506.ebuild,
x264-9999.ebuild:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2013-08-01 16:16 Alexis Ballier (aballier)
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-01 16:16 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/01 16:16:28
Modified: x264-9999.ebuild ChangeLog
Log:
inherit eutils for the x32 patch
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.11 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.11&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.11&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.10&r2=1.11
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- x264-9999.ebuild 1 Aug 2013 16:14:49 -0000 1.10
+++ x264-9999.ebuild 1 Aug 2013 16:16:28 -0000 1.11
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.10 2013/08/01 16:14:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.11 2013/08/01 16:16:28 aballier Exp $
EAPI=5
-inherit flag-o-matic multilib toolchain-funcs
+inherit flag-o-matic multilib toolchain-funcs eutils
DESCRIPTION="A free library for encoding X264/AVC streams"
HOMEPAGE="http://www.videolan.org/developers/x264.html"
1.92 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.92&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.92&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.91&r2=1.92
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -r1.91 -r1.92
--- ChangeLog 1 Aug 2013 16:14:49 -0000 1.91
+++ ChangeLog 1 Aug 2013 16:16:28 -0000 1.92
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.91 2013/08/01 16:14:49 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.92 2013/08/01 16:16:28 aballier Exp $
+
+ 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
+ inherit eutils for the x32 patch
01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
Give a subslot even to -9999 and update soname
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2013-08-01 16:39 Alexis Ballier (aballier)
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-01 16:39 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/01 16:39:38
Modified: x264-9999.ebuild ChangeLog
Log:
drop custom-cflags useflag, bug #473816
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.12 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.12&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.12&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.11&r2=1.12
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- x264-9999.ebuild 1 Aug 2013 16:16:28 -0000 1.11
+++ x264-9999.ebuild 1 Aug 2013 16:39:38 -0000 1.12
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.11 2013/08/01 16:16:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.12 2013/08/01 16:39:38 aballier Exp $
EAPI=5
@@ -23,7 +23,7 @@
SLOT="0/${SONAME}"
LICENSE="GPL-2"
-IUSE="10bit custom-cflags +interlaced pic static-libs +threads"
+IUSE="10bit +interlaced pic static-libs +threads"
ASM_DEP=">=dev-lang/yasm-1.2.0"
DEPEND="amd64? ( ${ASM_DEP} )
@@ -42,9 +42,6 @@
tc-export CC
local asm_conf=""
- # let upstream pick the optimization level by default
- use custom-cflags || filter-flags -O?
-
if use x86 && use pic || [[ ${ABI} == "x32" ]]; then
asm_conf=" --disable-asm"
fi
@@ -66,15 +63,4 @@
$(usex static-libs "" "--enable-static") \
$(usex threads "" "--disable-thread") \
${asm_conf} || die
-
- # this is a nasty workaround for bug #376925 as upstream doesn't like us
- # fiddling with their CFLAGS
- if use custom-cflags; then
- local cflags
- cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
- cflags="${cflags//$(get-flag O)/}"
- cflags="${cflags//-O? /$(get-flag O) }"
- cflags="${cflags//-g /}"
- sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
- fi
}
1.93 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.93&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.93&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.92&r2=1.93
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.92
retrieving revision 1.93
diff -u -r1.92 -r1.93
--- ChangeLog 1 Aug 2013 16:16:28 -0000 1.92
+++ ChangeLog 1 Aug 2013 16:39:38 -0000 1.93
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.92 2013/08/01 16:16:28 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.93 2013/08/01 16:39:38 aballier Exp $
+
+ 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
+ drop custom-cflags useflag, bug #473816
01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
inherit eutils for the x32 patch
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2013-08-01 16:59 Alexis Ballier (aballier)
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-01 16:59 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/01 16:59:00
Modified: x264-9999.ebuild ChangeLog
Log:
Do not mess too much with CFLAGS. Should fix bug #413661 and bug #351219.
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.13 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.13&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.13&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.12&r2=1.13
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- x264-9999.ebuild 1 Aug 2013 16:39:38 -0000 1.12
+++ x264-9999.ebuild 1 Aug 2013 16:59:00 -0000 1.13
@@ -1,6 +1,6 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.12 2013/08/01 16:39:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.13 2013/08/01 16:59:00 aballier Exp $
EAPI=5
@@ -23,7 +23,7 @@
SLOT="0/${SONAME}"
LICENSE="GPL-2"
-IUSE="10bit +interlaced pic static-libs +threads"
+IUSE="10bit +interlaced pic static-libs sse +threads"
ASM_DEP=">=dev-lang/yasm-1.2.0"
DEPEND="amd64? ( ${ASM_DEP} )
@@ -35,7 +35,8 @@
src_prepare() {
# Initial support for x32 ABI, bug #420241
- epatch "${FILESDIR}"/x264-x32.patch
+ # Avoid messing too much with CFLAGS.
+ epatch "${FILESDIR}"/x264-cflags.patch
}
src_configure() {
@@ -46,6 +47,9 @@
asm_conf=" --disable-asm"
fi
+ # Upstream uses this, see the cflags patch
+ use sse && append-flags "-msse" "-mfpmath=sse"
+
./configure \
--prefix="${EPREFIX}"/usr \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
1.94 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.94&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.94&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.93&r2=1.94
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -r1.93 -r1.94
--- ChangeLog 1 Aug 2013 16:39:38 -0000 1.93
+++ ChangeLog 1 Aug 2013 16:59:00 -0000 1.94
@@ -1,6 +1,10 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.93 2013/08/01 16:39:38 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.94 2013/08/01 16:59:00 aballier Exp $
+
+ 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild,
+ +files/x264-cflags.patch:
+ Do not mess too much with CFLAGS. Should fix bug #413661 and bug #351219.
01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
drop custom-cflags useflag, bug #473816
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2013-08-01 17:24 Alexis Ballier (aballier)
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier (aballier) @ 2013-08-01 17:24 UTC (permalink / raw
To: gentoo-commits
aballier 13/08/01 17:24:03
Modified: x264-9999.ebuild ChangeLog
Log:
Go multilib and stack for for medialibs r8
(Portage version: 2.2.0_alpha191/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.14 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.14&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.14&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.13&r2=1.14
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- x264-9999.ebuild 1 Aug 2013 16:59:00 -0000 1.13
+++ x264-9999.ebuild 1 Aug 2013 17:24:02 -0000 1.14
@@ -1,10 +1,10 @@
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.13 2013/08/01 16:59:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.14 2013/08/01 17:24:02 aballier Exp $
EAPI=5
-inherit flag-o-matic multilib toolchain-funcs eutils
+inherit flag-o-matic multilib toolchain-funcs eutils multilib-minimal
DESCRIPTION="A free library for encoding X264/AVC streams"
HOMEPAGE="http://www.videolan.org/developers/x264.html"
@@ -26,10 +26,10 @@
IUSE="10bit +interlaced pic static-libs sse +threads"
ASM_DEP=">=dev-lang/yasm-1.2.0"
-DEPEND="amd64? ( ${ASM_DEP} )
- amd64-fbsd? ( ${ASM_DEP} )
- x86? ( ${ASM_DEP} )
- x86-fbsd? ( ${ASM_DEP} )"
+DEPEND="abi_x86_32? ( ${ASM_DEP} )
+ abi_x86_64? ( ${ASM_DEP} )"
+RDEPEND="abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
+ !app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
DOCS="AUTHORS doc/*.txt"
@@ -39,18 +39,18 @@
epatch "${FILESDIR}"/x264-cflags.patch
}
-src_configure() {
+multilib_src_configure() {
tc-export CC
local asm_conf=""
- if use x86 && use pic || [[ ${ABI} == "x32" ]]; then
+ if [[ ${ABI} == x86* ]] && use pic || [[ ${ABI} == "x32" ]]; then
asm_conf=" --disable-asm"
fi
# Upstream uses this, see the cflags patch
use sse && append-flags "-msse" "-mfpmath=sse"
- ./configure \
+ "${S}/configure" \
--prefix="${EPREFIX}"/usr \
--libdir="${EPREFIX}"/usr/$(get_libdir) \
--disable-cli \
1.95 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.95&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.95&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.94&r2=1.95
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.94
retrieving revision 1.95
diff -u -r1.94 -r1.95
--- ChangeLog 1 Aug 2013 16:59:00 -0000 1.94
+++ ChangeLog 1 Aug 2013 17:24:02 -0000 1.95
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.94 2013/08/01 16:59:00 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.95 2013/08/01 17:24:02 aballier Exp $
+
+ 01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
+ Go multilib and stack for for medialibs r8
01 Aug 2013; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild,
+files/x264-cflags.patch:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2014-03-09 9:54 Alexis Ballier (aballier)
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier (aballier) @ 2014-03-09 9:54 UTC (permalink / raw
To: gentoo-commits
aballier 14/03/09 09:54:58
Modified: x264-9999.ebuild ChangeLog
Log:
add multilib-usedep on opencl
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.18 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.18&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.18&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.17&r2=1.18
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -r1.17 -r1.18
--- x264-9999.ebuild 22 Sep 2013 09:19:28 -0000 1.17
+++ x264-9999.ebuild 9 Mar 2014 09:54:58 -0000 1.18
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.17 2013/09/22 09:19:28 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.18 2014/03/09 09:54:58 aballier Exp $
EAPI=5
@@ -29,7 +29,7 @@
DEPEND="abi_x86_32? ( ${ASM_DEP} )
abi_x86_64? ( ${ASM_DEP} )
opencl? ( dev-lang/perl )"
-RDEPEND="opencl? ( virtual/opencl )
+RDEPEND="opencl? ( virtual/opencl[${MULTILIB_USEDEP}] )
abi_x86_32? ( !<=app-emulation/emul-linux-x86-medialibs-20130224-r7
!app-emulation/emul-linux-x86-medialibs[-abi_x86_32(-)] )"
1.101 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.101&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.101&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.100&r2=1.101
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- ChangeLog 22 Sep 2013 09:19:28 -0000 1.100
+++ ChangeLog 9 Mar 2014 09:54:58 -0000 1.101
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/x264
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.100 2013/09/22 09:19:28 ssuominen Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.101 2014/03/09 09:54:58 aballier Exp $
+
+ 09 Mar 2014; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
+ add multilib-usedep on opencl
22 Sep 2013; Samuli Suominen <ssuominen@gentoo.org> x264-0.0.20130912.ebuild,
x264-9999.ebuild:
^ permalink raw reply [flat|nested] 9+ messages in thread
* [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog
@ 2014-03-09 9:56 Alexis Ballier (aballier)
0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier (aballier) @ 2014-03-09 9:56 UTC (permalink / raw
To: gentoo-commits
aballier 14/03/09 09:56:53
Modified: x264-9999.ebuild ChangeLog
Log:
current git uses .so.142: update subslot
(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 160F534A)
Revision Changes Path
1.19 media-libs/x264/x264-9999.ebuild
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.19&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?rev=1.19&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-9999.ebuild?r1=1.18&r2=1.19
Index: x264-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- x264-9999.ebuild 9 Mar 2014 09:54:58 -0000 1.18
+++ x264-9999.ebuild 9 Mar 2014 09:56:53 -0000 1.19
@@ -1,6 +1,6 @@
# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.18 2014/03/09 09:54:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/x264-9999.ebuild,v 1.19 2014/03/09 09:56:53 aballier Exp $
EAPI=5
@@ -19,7 +19,7 @@
S="${WORKDIR}/${MY_P}"
fi
-SONAME="138"
+SONAME="142"
SLOT="0/${SONAME}"
LICENSE="GPL-2"
1.102 media-libs/x264/ChangeLog
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.102&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.102&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.101&r2=1.102
Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- ChangeLog 9 Mar 2014 09:54:58 -0000 1.101
+++ ChangeLog 9 Mar 2014 09:56:53 -0000 1.102
@@ -1,6 +1,9 @@
# ChangeLog for media-libs/x264
# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.101 2014/03/09 09:54:58 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.102 2014/03/09 09:56:53 aballier Exp $
+
+ 09 Mar 2014; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
+ current git uses .so.142: update subslot
09 Mar 2014; Alexis Ballier <aballier@gentoo.org> x264-9999.ebuild:
add multilib-usedep on opencl
^ permalink raw reply [flat|nested] 9+ messages in thread
end of thread, other threads:[~2014-03-09 9:56 UTC | newest]
Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-08-01 17:24 [gentoo-commits] gentoo-x86 commit in media-libs/x264: x264-9999.ebuild ChangeLog Alexis Ballier (aballier)
-- strict thread matches above, loose matches on Subject: below --
2014-03-09 9:56 Alexis Ballier (aballier)
2014-03-09 9:54 Alexis Ballier (aballier)
2013-08-01 16:59 Alexis Ballier (aballier)
2013-08-01 16:39 Alexis Ballier (aballier)
2013-08-01 16:16 Alexis Ballier (aballier)
2013-08-01 16:14 Alexis Ballier (aballier)
2011-09-03 18:39 Maxim Koltsov (maksbotan)
2011-05-28 6:30 Tim Harder (radhermit)
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox