From: Alexis Ballier Date: Wed, 16 Jun 2010 12:29:30 +0000 (+0000) Subject: fix build with ffmpeg >= 0.6 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4e8953bd975a0ef2816011a9355f486fdac9b3b0;p=gentoo.git fix build with ffmpeg >= 0.6 Package-Manager: portage-2.2_rc67/cvs/Linux x86_64 --- diff --git a/media-plugins/vdr-audiorecorder/ChangeLog b/media-plugins/vdr-audiorecorder/ChangeLog index 1e59ea43acb5..86f07e7f6c22 100644 --- a/media-plugins/vdr-audiorecorder/ChangeLog +++ b/media-plugins/vdr-audiorecorder/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-audiorecorder -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.10 2008/10/18 09:35:15 aballier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/ChangeLog,v 1.11 2010/06/16 12:27:56 aballier Exp $ + + 16 Jun 2010; Alexis Ballier + vdr-audiorecorder-0.1.0_pre6.ebuild: + fix build with ffmpeg >= 0.6 18 Oct 2008; Alexis Ballier +files/vdr-audiorecorder-0.1.0_pre6-avcodec52.patch, diff --git a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild index df104a25e74d..f38998be189a 100644 --- a/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild +++ b/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild,v 1.6 2008/10/18 09:35:15 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-audiorecorder/vdr-audiorecorder-0.1.0_pre6.ebuild,v 1.7 2010/06/16 12:27:56 aballier Exp $ -inherit vdr-plugin +inherit vdr-plugin flag-o-matic MY_P=${P/_pre/-pre} @@ -33,6 +33,8 @@ src_unpack() { if has_version ">=media-video/ffmpeg-0.4.9_p20080326"; then epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff" fi + # UINT64_C is needed by ffmpeg headers + append-flags -D__STDC_CONSTANT_MACROS } src_install() { diff --git a/media-plugins/vdr-graphtft/ChangeLog b/media-plugins/vdr-graphtft/ChangeLog index 54682d86143b..cd5b485308e3 100644 --- a/media-plugins/vdr-graphtft/ChangeLog +++ b/media-plugins/vdr-graphtft/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-graphtft # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.22 2010/04/03 10:07:49 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/ChangeLog,v 1.23 2010/06/16 12:21:31 aballier Exp $ + + 16 Jun 2010; Alexis Ballier + vdr-graphtft-0.3.2.24.ebuild: + fix build with ffmpeg >= 0.6 03 Apr 2010; Joerg Bornkessel vdr-graphtft-0.3.2.24.ebuild: diff --git a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild index b8c656f20fb4..ebae64eadba8 100644 --- a/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild +++ b/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild @@ -1,10 +1,10 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild,v 1.4 2010/04/03 10:07:49 hd_brummy Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-graphtft/vdr-graphtft-0.3.2.24.ebuild,v 1.5 2010/06/16 12:21:31 aballier Exp $ EAPI="2" -inherit eutils vdr-plugin +inherit eutils vdr-plugin flag-o-matic #MY_P="${PN}-${PV/_rc/-rc}" #S="${WORKDIR}/graphtft-${PV/_rc/-rc}" @@ -81,6 +81,8 @@ src_prepare() { sed -i "${S}"/imlibrenderer/fbrenderer/fbrenderer.c \ -i "${S}"/imlibrenderer/dvbrenderer/mpeg2encoder.c \ -e "s:libavutil/avcodec.h:libavcodec/avcodec.h:" + # UINT64_C is needed by ffmpeg headers + append-flags -D__STDC_CONSTANT_MACROS } src_compile() { diff --git a/media-plugins/vdr-image/ChangeLog b/media-plugins/vdr-image/ChangeLog index 4eb63994ee7f..2f5c69204e99 100644 --- a/media-plugins/vdr-image/ChangeLog +++ b/media-plugins/vdr-image/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-image -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.28 2009/01/06 02:22:11 hd_brummy Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/ChangeLog,v 1.29 2010/06/16 12:24:14 aballier Exp $ + + 16 Jun 2010; Alexis Ballier vdr-image-0.3.0.ebuild: + fix build with ffmpeg >= 0.6 *vdr-image-0.3.0 (06 Jan 2009) diff --git a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild index 5cf4e8ece625..400bd2fba97d 100644 --- a/media-plugins/vdr-image/vdr-image-0.3.0.ebuild +++ b/media-plugins/vdr-image/vdr-image-0.3.0.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.2 2009/01/06 06:03:04 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-image/vdr-image-0.3.0.ebuild,v 1.3 2010/06/16 12:24:14 aballier Exp $ -inherit vdr-plugin eutils +inherit vdr-plugin eutils flag-o-matic DESCRIPTION="VDR plugin: display of digital images, like jpeg, tiff, png, bmp" HOMEPAGE="http://vdr-image.berlios.de/" @@ -36,6 +36,8 @@ src_unpack() { if has_version "<=media-video/ffmpeg-0.4.9_p20061016"; then BUILD_PARAMS="${BUILD_PARAMS} WITHOUT_SWSCALER=1" fi + # UINT64_C is needed by ffmpeg headers + append-flags -D__STDC_CONSTANT_MACROS } src_install() { diff --git a/media-plugins/vdr-osdpip/ChangeLog b/media-plugins/vdr-osdpip/ChangeLog index 20ca079b9eaf..956a72409810 100644 --- a/media-plugins/vdr-osdpip/ChangeLog +++ b/media-plugins/vdr-osdpip/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for media-plugins/vdr-osdpip -# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.10 2009/09/22 05:28:32 aballier Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/ChangeLog,v 1.11 2010/06/16 12:29:30 aballier Exp $ + + 16 Jun 2010; Alexis Ballier + vdr-osdpip-0.0.10.ebuild: + fix build with ffmpeg >= 0.6 22 Sep 2009; Alexis Ballier vdr-osdpip-0.0.10.ebuild, +files/vdr-osdpip-0.0.10-avutil50.patch: diff --git a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild index eac8961c492b..d05dac0938e2 100644 --- a/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild +++ b/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2009 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild,v 1.3 2009/09/22 05:28:32 aballier Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-osdpip/vdr-osdpip-0.0.10.ebuild,v 1.4 2010/06/16 12:29:30 aballier Exp $ -inherit vdr-plugin +inherit vdr-plugin flag-o-matic DESCRIPTION="VDR plugin: Show another channel in the OSD" HOMEPAGE="http://www.magoa.net/linux" @@ -33,4 +33,6 @@ src_unpack() { #epatch "${FILESDIR}/${P}-ffmpeg-0.4.9_p20080326-new_header.diff" sed -i Makefile -e 's/#WITH_NEW_FFMPEG_HEADERS/WITH_NEW_FFMPEG_HEADERS/' fi + # UINT64_C is needed by ffmpeg headers + append-flags -D__STDC_CONSTANT_MACROS } diff --git a/media-plugins/vdr-pcd/ChangeLog b/media-plugins/vdr-pcd/ChangeLog index bd33d1607ae5..0c4d35d83cd9 100644 --- a/media-plugins/vdr-pcd/ChangeLog +++ b/media-plugins/vdr-pcd/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for media-plugins/vdr-pcd -# Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.2 2008/03/29 14:50:20 hd_brummy Exp $ +# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/ChangeLog,v 1.3 2010/06/16 12:25:44 aballier Exp $ + + 16 Jun 2010; Alexis Ballier vdr-pcd-0.9.ebuild: + fix build with ffmpeg >= 0.6 29 Mar 2008; Joerg Bornkessel vdr-pcd-0.9.ebuild: fix new ffmpeg header structur added; bug #214740 diff --git a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild index 4ddf318a5898..2c8c9e5edda5 100644 --- a/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild +++ b/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild @@ -1,8 +1,8 @@ -# Copyright 1999-2008 Gentoo Foundation +# Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.4 2008/03/30 04:22:07 mr_bones_ Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-plugins/vdr-pcd/vdr-pcd-0.9.ebuild,v 1.5 2010/06/16 12:25:44 aballier Exp $ -inherit vdr-plugin +inherit vdr-plugin flag-o-matic DESCRIPTION="VDR Plugin: adds the functionality to view PhotoCDs" HOMEPAGE="http://www.heiligenmann.de/vdr/vdr/plugins/pcd.html" @@ -23,4 +23,6 @@ src_unpack() { if has_version ">=media-video/ffmpeg-0.4.9_p20080326" ; then sed -e "s:ffmpeg/avcodec.h:libavcodec/avcodec.h:" -i mpeg.h fi + # UINT64_C is needed by ffmpeg headers + append-flags -D__STDC_CONSTANT_MACROS }