From: Patrick McLean Date: Wed, 7 Sep 2011 23:47:21 +0000 (+0000) Subject: Revision bump. Re-add ffmpegsource USE flag, add interlaced use flag as media-libs... X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b5b52ebf6f1b97ab1f368e77b538eb9cba5b8968;p=gentoo.git Revision bump. Re-add ffmpegsource USE flag, add interlaced use flag as media-libs/x264 now has. Add the 10bit USE flag from the multimedia overlay. Add custom-cflags USE flag as well, as upstream doesn't like us messing around with their CFLAGS. Use stable snapshot rather than unstable one. Package-Manager: portage-2.1.10.11/cvs/Linux x86_64 --- diff --git a/media-video/x264-encoder/ChangeLog b/media-video/x264-encoder/ChangeLog index 91708a72c568..d5c9f8ed2e70 100644 --- a/media-video/x264-encoder/ChangeLog +++ b/media-video/x264-encoder/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for media-video/x264-encoder # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.58 2011/09/07 15:09:35 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/ChangeLog,v 1.59 2011/09/07 23:47:21 chutzpah Exp $ + +*x264-encoder-0.0.20110825-r1 (07 Sep 2011) + + 07 Sep 2011; Patrick McLean + x264-encoder-0.0.20110825.ebuild, +x264-encoder-0.0.20110825-r1.ebuild, + metadata.xml: + Revision bump. Re-add ffmpegsource USE flag, add interlaced use flag as + media-libs/x264 now has. Add the 10bit USE flag from the multimedia overlay. + Add custom-cflags USE flag as well, as upstream doesn't like us messing + around with their CFLAGS. Use stable snapshot rather than unstable one. 07 Sep 2011; Alexis Ballier x264-encoder-0.0.20110825.ebuild, x264-encoder-9999.ebuild, metadata.xml: diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest index a92c84b38992..48897f03c235 100644 --- a/media-video/x264-encoder/Manifest +++ b/media-video/x264-encoder/Manifest @@ -1,19 +1,29 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 +Hash: SHA256 AUX x264-encoder-nolib-20110425.patch 1547 RMD160 ace0273445d751bf1b538abad364e3b738dad21c SHA1 2cdb96488785f1f355018d0b6727b3bd373d43a6 SHA256 124955cb5322d5f40771669798217991826dbc1f8ca9daac821d672238011c88 AUX x264-encoder-nostrip.patch 433 RMD160 81c3893b1a02839da38f34484c794996855fab5e SHA1 42c0807d6f2f13f848409d9545994c8b66338c8c SHA256 1210914cc52de908b840775ab8e4a107d95aeced690c2f115320d31e587a2ffa DIST x264-snapshot-20110426-2245.tar.bz2 495607 RMD160 3104b39f695a08c8199298eb89d5c500ffebfb45 SHA1 b2aa061648354aa80adeeba33819d8b961185dbc SHA256 2610ea30eb8857f7b8933137f8994f83243038fd8e336343e3422a5f25459fcc -DIST x264-snapshot-20110825-2245.tar.bz2 514353 RMD160 6aeb636d7b395969f9ad2a0e72ffc9ee0eea9e48 SHA1 d551f6f7482c6af022cdaded89668a0579bd88d5 SHA256 55afee361554818ccc4ee553d3d058a7fb584af155ec7eeab45cd778acec43c5 +DIST x264-snapshot-20110825-2245-stable.tar.bz2 516879 RMD160 4f1e00ddd170c75c6d3e140085358ff95c8e861f SHA1 0e8fff6252397d453b0f38cc0fdaf9699558194d SHA256 ab0ed4046a36093f00dfa572d7234c59cec5f6cb674d8bb0fe4e6bdd7604efa0 EBUILD x264-encoder-0.0.20110426.ebuild 1601 RMD160 662ea7c2892182b8f34c9dea40a4b2311716e145 SHA1 7c02087be895a085e1735feb9429fe19b0984346 SHA256 02761fcfe6dc5ba24bd994c5d9a74c95bb5e41633f52096f8b7d05374069ed70 -EBUILD x264-encoder-0.0.20110825.ebuild 1523 RMD160 7d0704db1e5c27b52e1e0543b138842885a81e96 SHA1 863644f7f52f2ed6d7f25faeea0e63e37c945f23 SHA256 d475d9b028c65d3065c3a4ae43e084ac240b5f86c624a4ae77fe3cde1a459b82 +EBUILD x264-encoder-0.0.20110825-r1.ebuild 2480 RMD160 8e7bf4f9877f2c6bb77fb307d3e9d9031a7637bf SHA1 92fa203a559060e0274e3fafd2613c46840ceb25 SHA256 cdd24a42c93ba69ab28031511f5f50f5722816244c90118b81672fda22ccdc55 EBUILD x264-encoder-9999.ebuild 1978 RMD160 9d8918893284f4dbc6b2472c6f214f17c740cf28 SHA1 7e55d81845b0bb522e12088840bf1630053a81a7 SHA256 b81858a1841906def5447eb36e385eec6d1ad00a6c484a9e4eb7955a09ee09db -MISC ChangeLog 9720 RMD160 704871c8965e00205f867ce7947b064626cfe152 SHA1 072f26f878d8c128f6da7675c1b169cac7c518bc SHA256 d53160015c1732742dfd01eb5fde0a2c71bada50d5b3e368bacc929ce4ca1368 -MISC metadata.xml 339 RMD160 a8aed4568a6644d6a42490ac4990e63b9e6c01e1 SHA1 33c2b6733410c0a58dfbb4138f32527fe41f9dd1 SHA256 bc94b0562cbff3f9c6e4a32e61c87f40184245098858bf1bef30b6ccf4f2a774 +MISC ChangeLog 10209 RMD160 ea16e8099600eace57e15f190fd2d933abaedea3 SHA1 582eed3ab609d8fd28f67fcf6e86d3a826a1eeea SHA256 77b333db97cd320a1c4125c51ca07d804ee68c66b55149ae2df4ecd17b97d5eb +MISC metadata.xml 518 RMD160 3440b9fcbcb5cf3ae84df312121c234cd798893d SHA1 7807975d69297fe975731d8626323abaeacb05e2 SHA256 3c234897ff680a5fe89179bd8da788695cee616a856c0e9fbc20eb6c388b01b5 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.18 (GNU/Linux) -iEYEARECAAYFAk5niTUACgkQvFcC4BYPU0rRogCgmcnoSlOlvrxSm6y7gZmROQvH -6cAAnipAEHIA+eQIKQKL0/2DvMAI/Krt -=elQO +iQIcBAEBCAAGBQJOaAKPAAoJEHy/RO9cNQiD9yYQAKzG8NABMMJej0UWJ1K3IdhB +bY1rqlLfb1z0aYAfs/QYA2WPaQ+NTcL7tf7uYhzxDI6d5LaNyoE/DWEX4h/BHJvr +RQA9kt554lak2rcGJiW788sHSQcC0Z+fbA4glXXlZGBoNTBJMJlGTp3Aefx+F9lY +o/0SSQaJrq/VlGkcC4gTXqIptY5ozqeW/IuR3lANDKQr/aZdB2fl58IX4g7+zbV0 +50EDuSngqzGugyhZnHhCvZ+9K3nlmLj/1gZdajacafZqNYFw6q3a86XcylB9PWoZ +Z6UH3YSNNcLqCj1ePazflIq+3vKrZDKrGkkgLL7rf/to0tqbXZxO9Mt55LJfX2xP +hjO+4vB9aFPJauK+1M760JGuGAuGjx2pXYrAZlutlYakGpV4T67wEXkpfWVC4gVn +XoSv7n7eOoWFB1wL5E257kyUOxG9hSzpnnOZMbIhpdbYdI08iJRK/hFeGrhp1Jbd +PScBAxn1eIWUyUE4l3mdawkMzO2Iv7fbzYD4fLcdOhCrS99YxMeiOLfUAlFYtbet +0I7Yt0NShZIXrNNX93eh3787maNUyQUfpCj2/qzo8XLVp53obnq+VEb+VFR1PvP1 +7hEwAsr7+hRyZz0zde0GMgTE4OmLniAggOrClHEAtldiNLowtbDZNflcAWdj4GRt +zDsDH/B/Im8+NJ9bTvv4 +=oDbn -----END PGP SIGNATURE----- diff --git a/media-video/x264-encoder/metadata.xml b/media-video/x264-encoder/metadata.xml index d8a22487e4b5..de9b645c7fb3 100644 --- a/media-video/x264-encoder/metadata.xml +++ b/media-video/x264-encoder/metadata.xml @@ -6,6 +6,8 @@ media-video@gentoo.org - Enable ffmpegsource aka ffms support, disables lavf + Set output bit depth to 10 + Enable interlaced encoding support, this can decrease encoding speed by up to 2% + Enable ffmpegsource aka ffms support, disables lavf diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild new file mode 100644 index 000000000000..74122f0bd673 --- /dev/null +++ b/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825-r1.ebuild,v 1.1 2011/09/07 23:47:21 chutzpah Exp $ + +EAPI=4 + +if [ "${PV#9999}" != "${PV}" ] ; then + V_ECLASS="git-2" +else + V_ECLASS="versionator" +fi + +inherit flag-o-matic multilib toolchain-funcs ${V_ECLASS} + +if [ "${PV#9999}" = "${PV}" ] ; then + MY_P="x264-snapshot-$(get_version_component_range 3)-2245-stable" +fi +DESCRIPTION="A free commandline encoder for 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://download.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 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" +fi +IUSE="10bit custom-cflags debug ffmpeg ffmpegsource +interlaced mp4 +threads" + +REQUIRED_USE="ffmpegsource? ( ffmpeg )" + +RDEPEND="ffmpeg? ( virtual/ffmpeg ) + ffmpegsource? ( media-libs/ffmpegsource ) + mp4? ( >=media-video/gpac-0.4.1_pre20060122 )" + +DEPEND="${RDEPEND} + amd64? ( >=dev-lang/yasm-0.6.2 ) + x86? ( >=dev-lang/yasm-0.6.2 ) + x86-fbsd? ( >=dev-lang/yasm-0.6.2 ) + dev-util/pkgconfig" + +if [ "${PV#9999}" = "${PV}" ] ; then + S=${WORKDIR}/${MY_P} +fi + +src_configure() { + tc-export CC + + local myconf="" + use 10bit && myconf+=" --bit-depth=10" + use debug && myconf+=" --enable-debug" + use ffmpeg || myconf+=" --disable-lavf --disable-swscale" + use ffmpegsource || myconf+=" --disable-ffms" + use interlaced || myconf+=" --disable-interlaced" + use mp4 || myconf+=" --disable-gpac" + use threads || myconf+=" --disable-thread" + + # let upstream pick the optimization level by default + use custom-cflags || filter-flags -O? + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --disable-avs \ + --system-libx264 \ + --host="${CHOST}" \ + ${myconf} || die + + # this is a nasty workaround for bug #376925 for x264 that also applies + # here, needed because 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 +} diff --git a/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild deleted file mode 100644 index 04440554e9dd..000000000000 --- a/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-video/x264-encoder/x264-encoder-0.0.20110825.ebuild,v 1.2 2011/09/07 15:09:35 aballier Exp $ - -EAPI=4 -inherit eutils multilib toolchain-funcs versionator - -MY_P=x264-snapshot-$(get_version_component_range 3)-2245 - -DESCRIPTION="A free commandline encoder for X264/AVC streams" -HOMEPAGE="http://www.videolan.org/developers/x264.html" -SRC_URI="http://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd" -IUSE="debug ffmpeg mp4 +threads" - -RDEPEND="ffmpeg? ( media-video/ffmpeg ) - mp4? ( >=media-video/gpac-0.4.1_pre20060122 ) - ~media-libs/x264-${PV}" -DEPEND="${RDEPEND} - amd64? ( >=dev-lang/yasm-0.6.2 ) - x86? ( || ( >=dev-lang/yasm-0.6.2 dev-lang/nasm ) - !=dev-lang/yasm-0.6.2 ) - dev-util/pkgconfig" - -S="${WORKDIR}/${MY_P}" - -src_configure() { - tc-export CC - - local myconf="" - use debug && myconf+=" --enable-debug" - use ffmpeg || myconf+=" --disable-lavf --disable-swscale" - use mp4 || myconf+=" --disable-gpac" - use threads || myconf+=" --disable-thread" - - ./configure \ - --prefix="${EPREFIX}"/usr \ - --libdir="${EPREFIX}"/usr/$(get_libdir) \ - --disable-avs \ - --disable-ffms \ - --extra-asflags="${ASFLAGS}" \ - --extra-cflags="${CFLAGS}" \ - --extra-ldflags="${LDFLAGS}" \ - --host="${CHOST}" \ - --system-libx264 \ - ${myconf} \ - || die -}