From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-635070-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	by finch.gentoo.org (Postfix) with ESMTP id 83615138202
	for <garchives@archives.gentoo.org>; Sat, 12 Oct 2013 08:12:54 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 17F64E0B64;
	Sat, 12 Oct 2013 08:12:49 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 6867EE0B64
	for <gentoo-commits@lists.gentoo.org>; Sat, 12 Oct 2013 08:12:48 +0000 (UTC)
Received: from flycatcher.gentoo.org (flycatcher.gentoo.org [81.93.255.6])
	(using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id 5917433F00B
	for <gentoo-commits@lists.gentoo.org>; Sat, 12 Oct 2013 08:12:47 +0000 (UTC)
Received: by flycatcher.gentoo.org (Postfix, from userid 2139)
	id 1FC7B2004E; Sat, 12 Oct 2013 08:12:46 +0000 (UTC)
From: "Alexis Ballier (aballier)" <aballier@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Reply-To: gentoo-dev@lists.gentoo.org, aballier@gentoo.org
Subject: [gentoo-commits] gentoo-x86 commit in media-plugins/gst-plugins-libav: ChangeLog gst-plugins-libav-1.2.0.ebuild
X-VCS-Repository: gentoo-x86
X-VCS-Files: ChangeLog gst-plugins-libav-1.2.0.ebuild
X-VCS-Directories: media-plugins/gst-plugins-libav
X-VCS-Committer: aballier
X-VCS-Committer-Name: Alexis Ballier
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Message-Id: <20131012081246.1FC7B2004E@flycatcher.gentoo.org>
Date: Sat, 12 Oct 2013 08:12:46 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 2d1662cd-80bb-4efd-95f2-8bc4cc8fe631
X-Archives-Hash: 65efb1ca0deb5e1d0fac9288c70d5e31

aballier    13/10/12 08:12:46

  Modified:             ChangeLog gst-plugins-libav-1.2.0.ebuild
  Log:
  fix build with ffmpeg2 (again)
  
  (Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 160F534A)

Revision  Changes    Path
1.31                 media-plugins/gst-plugins-libav/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog?rev=1.31&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog?rev=1.31&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog?r1=1.30&r2=1.31

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- ChangeLog	11 Oct 2013 05:18:46 -0000	1.30
+++ ChangeLog	12 Oct 2013 08:12:45 -0000	1.31
@@ -1,6 +1,10 @@
 # ChangeLog for media-plugins/gst-plugins-libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.30 2013/10/11 05:18:46 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/ChangeLog,v 1.31 2013/10/12 08:12:45 aballier Exp $
+
+  12 Oct 2013; Alexis Ballier <aballier@gentoo.org>
+  gst-plugins-libav-1.2.0.ebuild, +files/gst-plugins-libav-1.2.0-ffmpeg2.patch:
+  fix build with ffmpeg2 (again)
 
   11 Oct 2013; Agostino Sarubbo <ago@gentoo.org>
   gst-plugins-libav-1.1.0_pre20130128-r1.ebuild:



1.2                  media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild?r1=1.1&r2=1.2

Index: gst-plugins-libav-1.2.0.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gst-plugins-libav-1.2.0.ebuild	29 Sep 2013 21:15:29 -0000	1.1
+++ gst-plugins-libav-1.2.0.ebuild	12 Oct 2013 08:12:45 -0000	1.2
@@ -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-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild,v 1.1 2013/09/29 21:15:29 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-plugins/gst-plugins-libav/gst-plugins-libav-1.2.0.ebuild,v 1.2 2013/10/12 08:12:45 aballier Exp $
 
 EAPI="5"
 
@@ -31,6 +31,16 @@
 
 src_prepare() {
 	sed -e 's/sleep 15//' -i configure.ac configure || die
+
+	# compatibility with recent releases 
+	# TODO: likely apply them with libav-10 when it's out but there will
+	# probably be an upstream gst-libav release compatible at that time.
+	if has_version '>=media-video/ffmpeg-2.0' ; then
+		sed -i -e 's/ CODEC_ID/ AV_CODEC_ID/g' \
+			   -e 's/ CodecID/ AVCodecID/g' \
+			   ext/libav/*.{c,h} || die
+		epatch "${FILESDIR}/${P}-ffmpeg2.patch"
+	fi
 }
 
 src_configure() {