Gentoo Archives: gentoo-commits

From: "Luca Barbato (lu_zero)" <lu_zero@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in media-video/x264-encoder: ChangeLog x264-encoder-0.0.20111220.ebuild
Date: Wed, 21 Dec 2011 23:10:57
Message-Id: 20111221231047.015D720034@flycatcher.gentoo.org
1 lu_zero 11/12/21 23:10:46
2
3 Modified: ChangeLog
4 Added: x264-encoder-0.0.20111220.ebuild
5 Log:
6 New version using the 120 api
7
8 (Portage version: 2.2.0_alpha81/cvs/Linux x86_64)
9
10 Revision Changes Path
11 1.62 media-video/x264-encoder/ChangeLog
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?rev=1.62&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?rev=1.62&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/ChangeLog?r1=1.61&r2=1.62
16
17 Index: ChangeLog
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v
20 retrieving revision 1.61
21 retrieving revision 1.62
22 diff -u -r1.61 -r1.62
23 --- ChangeLog 19 Dec 2011 17:17:22 -0000 1.61
24 +++ ChangeLog 21 Dec 2011 23:10:46 -0000 1.62
25 @@ -1,6 +1,12 @@
26 # ChangeLog for media-video/x264-encoder
27 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
28 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.61 2011/12/19 17:17:22 aballier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.62 2011/12/21 23:10:46 lu_zero Exp $
30 +
31 +*x264-encoder-0.0.20111220 (21 Dec 2011)
32 +
33 + 21 Dec 2011; Luca Barbato <lu_zero@g.o>
34 + +x264-encoder-0.0.20111220.ebuild:
35 + New version using the 120 api
36
37 *x264-encoder-0.0.20111218 (19 Dec 2011)
38
39
40
41
42 1.1 media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild
43
44 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild?rev=1.1&view=markup
45 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild?rev=1.1&content-type=text/plain
46
47 Index: x264-encoder-0.0.20111220.ebuild
48 ===================================================================
49 # Copyright 1999-2011 Gentoo Foundation
50 # Distributed under the terms of the GNU General Public License v2
51 # $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20111220.ebuild,v 1.1 2011/12/21 23:10:46 lu_zero Exp $
52
53 EAPI=4
54
55 if [ "${PV#9999}" != "${PV}" ] ; then
56 V_ECLASS="git-2"
57 else
58 V_ECLASS="versionator"
59 fi
60
61 inherit flag-o-matic multilib toolchain-funcs ${V_ECLASS}
62
63 if [ "${PV#9999}" = "${PV}" ] ; then
64 MY_P="x264-snapshot-$(get_version_component_range 3)-2245"
65 fi
66 DESCRIPTION="A free commandline encoder for X264/AVC streams"
67 HOMEPAGE="http://www.videolan.org/developers/x264.html"
68 if [ "${PV#9999}" != "${PV}" ] ; then
69 EGIT_REPO_URI="git://git.videolan.org/x264.git"
70 SRC_URI=""
71 else
72 SRC_URI="http://download.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"
73 fi
74
75 LICENSE="GPL-2"
76 SLOT="0"
77 if [ "${PV#9999}" != "${PV}" ] ; then
78 KEYWORDS=""
79 else
80 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
81 fi
82 IUSE="10bit custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads"
83
84 REQUIRED_USE="ffmpegsource? ( ffmpeg )"
85
86 RDEPEND="ffmpeg? ( virtual/ffmpeg )
87 ffmpegsource? ( media-libs/ffmpegsource )
88 mp4? ( >=media-video/gpac-0.4.1_pre20060122 )"
89
90 DEPEND="${RDEPEND}
91 amd64? ( >=dev-lang/yasm-0.6.2 )
92 x86? ( >=dev-lang/yasm-0.6.2 )
93 x86-fbsd? ( >=dev-lang/yasm-0.6.2 )
94 dev-util/pkgconfig"
95
96 if [ "${PV#9999}" = "${PV}" ] ; then
97 S=${WORKDIR}/${MY_P}
98 fi
99
100 src_configure() {
101 tc-export CC
102
103 local myconf=""
104 use 10bit && myconf+=" --bit-depth=10"
105 use debug && myconf+=" --enable-debug"
106 use ffmpeg || myconf+=" --disable-lavf --disable-swscale"
107 use ffmpegsource || myconf+=" --disable-ffms"
108 use interlaced || myconf+=" --disable-interlaced"
109 use mp4 || myconf+=" --disable-gpac"
110 use threads || myconf+=" --disable-thread"
111
112 # let upstream pick the optimization level by default
113 use custom-cflags || filter-flags -O?
114
115 ./configure \
116 --prefix="${EPREFIX}"/usr \
117 --libdir="${EPREFIX}"/usr/$(get_libdir) \
118 --disable-avs \
119 --system-libx264 \
120 --host="${CHOST}" \
121 ${myconf} || die
122
123 # this is a nasty workaround for bug #376925 for x264 that also applies
124 # here, needed because as upstream doesn't like us fiddling with their CFLAGS
125 if use custom-cflags; then
126 local cflags
127 cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')"
128 cflags="${cflags//$(get-flag O)/}"
129 cflags="${cflags//-O? /$(get-flag O) }"
130 cflags="${cflags//-g /}"
131 sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak
132 fi
133 }