diff options
| author |   Luca Barbato <lu_zero@gentoo.org> | 2012-07-06 01:11:41 +0000 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-07-06 01:11:41 +0000 |
| commit | 0b288d2b64e39befe3005a0f3644e3a6a8c977d8 (patch) | |
| tree | 343115ff36605845f495fec42d514b32f32d8032 | |
| parent | marked x86 per bug 424743 (diff) | |
| download | gentoo-2-0b288d2b64e39befe3005a0f3644e3a6a8c977d8.tar.gz gentoo-2-0b288d2b64e39befe3005a0f3644e3a6a8c977d8.tar.bz2 gentoo-2-0b288d2b64e39befe3005a0f3644e3a6a8c977d8.zip | |
Fix mistake in the version check for AVFrame.age
(Portage version: 2.2.0_alpha116/cvs/Linux x86_64)
| -rw-r--r-- | media-libs/xine-lib/ChangeLog | 7 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch | 2 | ||||
| -rw-r--r-- | media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch | 12 | ||||
| -rw-r--r-- | media-libs/xine-lib/xine-lib-1.2.2.ebuild | 6 |
4 files changed, 22 insertions, 5 deletions
diff --git a/media-libs/xine-lib/ChangeLog b/media-libs/xine-lib/ChangeLog index f515cfe1e25a..a0f0c32c340c 100644 --- a/media-libs/xine-lib/ChangeLog +++ b/media-libs/xine-lib/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for media-libs/xine-lib # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.685 2012/06/16 19:49:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/ChangeLog,v 1.686 2012/07/06 01:11:41 lu_zero Exp $ + + 06 Jul 2012; Luca Barbato <lu_zero@gentoo.org> + files/xine-lib-1.2.1-ffmpeg-git.patch, xine-lib-1.2.2.ebuild, + +files/xine-lib-1.2.2-libav.patch: + Fix mistake in the version check for AVFrame.age *xine-lib-1.2.2 (16 Jun 2012) diff --git a/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch b/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch index c036a0ec9fa0..73a3206d3728 100644 --- a/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch +++ b/media-libs/xine-lib/files/xine-lib-1.2.1-ffmpeg-git.patch @@ -68,7 +68,7 @@ diff -r 61f51ebc2659 -r 69983efb1c92 src/combined/ffmpeg/ffmpeg_compat.h #endif +/* AVFrame.age */ -+#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1) ++#if !(LIBAVCODEC_VERSION_MAJOR > 53 || LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR >= 28) +# define AVFRAMEAGE 1 +#endif diff --git a/media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch b/media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch new file mode 100644 index 000000000000..2cfa4da26f61 --- /dev/null +++ b/media-libs/xine-lib/files/xine-lib-1.2.2-libav.patch @@ -0,0 +1,12 @@ +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 + + /* AVFrame.age */ +-#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1) ++#if !(LIBAVCODEC_VERSION_MAJOR > 53 || LIBAVCODEC_VERSION_MAJOR == 53 && LIBAVCODEC_VERSION_MINOR >= 28) + # define AVFRAMEAGE 1 + #endif + diff --git a/media-libs/xine-lib/xine-lib-1.2.2.ebuild b/media-libs/xine-lib/xine-lib-1.2.2.ebuild index f2e11e471770..7b5ece2176de 100644 --- a/media-libs/xine-lib/xine-lib-1.2.2.ebuild +++ b/media-libs/xine-lib/xine-lib-1.2.2.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.2.ebuild,v 1.1 2012/06/16 19:49:12 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-libs/xine-lib/xine-lib-1.2.2.ebuild,v 1.2 2012/07/06 01:11:41 lu_zero Exp $ EAPI=4 -inherit libtool multilib +inherit eutils libtool multilib if [[ ${PV} == *9999* ]]; then EHG_REPO_URI="http://hg.debian.org/hg/xine-lib/xine-lib-1.2" @@ -118,7 +118,7 @@ REQUIRED_USE="vidix? ( || ( X fbcon ) ) src_prepare() { sed -i -e '/define VDR_ABS_FIFO_DIR/s|".*"|"/var/vdr/xine"|' src/vdr/input_vdr.c || die - + epatch ${FILESDIR}/${P}-libav.patch if [[ ${PV} == *9999* ]]; then epatch_user eautoreconf |