From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.77) (envelope-from ) id 1Smx5L-0004Lc-Ja for garchives@archives.gentoo.org; Fri, 06 Jul 2012 01:11:51 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 63D40E071D; Fri, 6 Jul 2012 01:11:43 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 371EBE071D for ; Fri, 6 Jul 2012 01:11:43 +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 97F5D1B401A for ; Fri, 6 Jul 2012 01:11:42 +0000 (UTC) Received: by flycatcher.gentoo.org (Postfix, from userid 591) id 44F802004C; Fri, 6 Jul 2012 01:11:41 +0000 (UTC) From: "Luca Barbato (lu_zero)" To: gentoo-commits@lists.gentoo.org Reply-To: gentoo-dev@lists.gentoo.org, lu_zero@gentoo.org Subject: [gentoo-commits] gentoo-x86 commit in media-libs/xine-lib/files: xine-lib-1.2.2-libav.patch xine-lib-1.2.1-ffmpeg-git.patch X-VCS-Repository: gentoo-x86 X-VCS-Files: xine-lib-1.2.2-libav.patch xine-lib-1.2.1-ffmpeg-git.patch X-VCS-Directories: media-libs/xine-lib/files X-VCS-Committer: lu_zero X-VCS-Committer-Name: Luca Barbato Content-Type: text/plain; charset=utf8 Message-Id: <20120706011141.44F802004C@flycatcher.gentoo.org> Date: Fri, 6 Jul 2012 01:11:41 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: c10ec97f-5fe2-426c-90e4-57299465c312 X-Archives-Hash: 6c3f86431d8c703258b5397fbea8631e lu_zero 12/07/06 01:11:41 Modified: xine-lib-1.2.1-ffmpeg-git.patch Added: xine-lib-1.2.2-libav.patch Log: Fix mistake in the version check for AVFrame.age =20 (Portage version: 2.2.0_alpha116/cvs/Linux x86_64) Revision Changes Path 1.2 media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.= patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-li= b/files/xine-lib-1.2.1-ffmpeg-git.patch?rev=3D1.2&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-li= b/files/xine-lib-1.2.1-ffmpeg-git.patch?rev=3D1.2&content-type=3Dtext/pla= in diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-li= b/files/xine-lib-1.2.1-ffmpeg-git.patch?r1=3D1.1&r2=3D1.2 Index: xine-lib-1.2.1-ffmpeg-git.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D RCS file: /var/cvsroot/gentoo-x86/media-libs/xine-lib/files/xine-lib-1.2.= 1-ffmpeg-git.patch,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- xine-lib-1.2.1-ffmpeg-git.patch 29 Feb 2012 01:12:55 -0000 1.1 +++ xine-lib-1.2.1-ffmpeg-git.patch 6 Jul 2012 01:11:41 -0000 1.2 @@ -68,7 +68,7 @@ #endif =20 +/* AVFrame.age */ -+#if !(LIBAVCODEC_VERSION_MAJOR >=3D 53 && LIBAVCODEC_VERSION_MAJOR >=3D= 28 && LIBAVCODEC_VERSION_MICRO >=3D 1) ++#if !(LIBAVCODEC_VERSION_MAJOR > 53 || LIBAVCODEC_VERSION_MAJOR =3D=3D = 53 && LIBAVCODEC_VERSION_MINOR >=3D 28) +# define AVFRAMEAGE 1 +#endif =20 1.1 media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-li= b/files/xine-lib-1.2.2-libav.patch?rev=3D1.1&view=3Dmarkup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-libs/xine-li= b/files/xine-lib-1.2.2-libav.patch?rev=3D1.1&content-type=3Dtext/plain Index: xine-lib-1.2.2-libav.patch =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D diff -r 2ebe9d14fb3c src/combined/ffmpeg/ffmpeg_compat.h --- a/src/combined/ffmpeg/ffmpeg_compat.h Wed Jul 04 21:39:20 2012 +0300 +++ b/src/combined/ffmpeg/ffmpeg_compat.h Thu Jul 05 21:36:43 2012 +0200 @@ -101,7 +101,7 @@ #endif =20 /* AVFrame.age */ -#if !(LIBAVCODEC_VERSION_MAJOR >=3D 53 && LIBAVCODEC_VERSION_MAJOR >=3D = 28 && LIBAVCODEC_VERSION_MICRO >=3D 1) +#if !(LIBAVCODEC_VERSION_MAJOR > 53 || LIBAVCODEC_VERSION_MAJOR =3D=3D 5= 3 && LIBAVCODEC_VERSION_MINOR >=3D 28) # define AVFRAMEAGE 1 #endif =20