[gentoo-commits] gentoo-x86 commit in media-libs/x264: ChangeLog x264-0.0.20110825.ebuild

[Patrick McLean (chutzpah)]

chutzpah    11/09/07 02:24:28

  Modified:             ChangeLog
  Added:                x264-0.0.20110825.ebuild
  Log:
  Version bump, pull a lot of fixes by Nikoli <nikoli@×××××××.com> from the live ebuild. Add custom-cflags USE flag with workaround for bug #376925. Also contains fix for bug #378303.
  
  (Portage version: 2.1.10.11/cvs/Linux x86_64)

Revision  Changes    Path
1.58                 media-libs/x264/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.58&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?rev=1.58&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/ChangeLog?r1=1.57&r2=1.58

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -r1.57 -r1.58
--- ChangeLog	3 Sep 2011 18:39:24 -0000	1.57
+++ ChangeLog	7 Sep 2011 02:24:28 -0000	1.58
@@ -1,6 +1,13 @@
 # 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.57 2011/09/03 18:39:24 maksbotan Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/x264/ChangeLog,v 1.58 2011/09/07 02:24:28 chutzpah Exp $
+
+*x264-0.0.20110825 (07 Sep 2011)
+
+  07 Sep 2011; Patrick McLean <chutzpah@g.o> +x264-0.0.20110825.ebuild:
+  Version bump, pull a lot of fixes by Nikoli <nikoli@×××××××.com> from the
+  live ebuild. Add custom-cflags USE flag with workaround for bug #376925. Also
+  contains fix for bug #378303.
 
   03 Sep 2011; Maxim Koltsov <maksbotan@g.o> x264-9999.ebuild:
   Fix SRC_URI & some cosmetic change. Thanks to Nikoli <nikoli@×××××××.com>



1.1                  media-libs/x264/x264-0.0.20110825.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-0.0.20110825.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/x264/x264-0.0.20110825.ebuild?rev=1.1&content-type=text/plain

Index: x264-0.0.20110825.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-0.0.20110825.ebuild,v 1.1 2011/09/07 02:24:28 chutzpah Exp $

EAPI=4
inherit eutils flag-o-matic multilib toolchain-funcs versionator

MY_P=x264-snapshot-$(get_version_component_range 3)-2245

DESCRIPTION="A free library for encoding X264/AVC streams"
HOMEPAGE="http://www.videolan.org/developers/x264.html"
SRC_URI="ftp://ftp.videolan.org/pub/videolan/x264/snapshots/${MY_P}.tar.bz2"

LICENSE="GPL-2"
SLOT="0"
KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
IUSE="custom-cflags debug +threads pic static-libs"

RDEPEND=""
DEPEND="amd64? ( >=dev-lang/yasm-0.6.2 )
	x86? ( >=dev-lang/yasm-0.6.2 )
	x86-fbsd? ( >=dev-lang/yasm-0.6.2 )"

S=${WORKDIR}/${MY_P}

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"

	# let upstream pick the optimization level by default
	use custom-cflags || filter-flags -O?

	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 \
		--host="${CHOST}" \
		${myconf} \
		|| 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
}