Fix to build with latest ffmpeg

Package-Manager: portage-2.1.3_rc6

4 files changed, 133 insertions, 14 deletions

diff --git a/media-tv/xdtv/ChangeLog b/media-tv/xdtv/ChangeLog
index ffb541455744..d688e43fc64b 100644
--- a/media-tv/xdtv/ChangeLog
+++ b/media-tv/xdtv/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-tv/xdtv
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.48 2007/06/12 14:01:27 zzam Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/ChangeLog,v 1.49 2007/07/04 08:27:25 aballier Exp $
+
+  04 Jul 2007; Alexis Ballier <aballier@gentoo.org>
+  +files/xdtv-2.4.0-ffmpeg.patch, xdtv-2.4.0.ebuild:
+  Fix to build with latest ffmpeg
 
   12 Jun 2007; Matthias Schwarzott <zzam@gentoo.org> xdtv-2.2.0-r1.ebuild,
   xdtv-2.3.3.ebuild:
diff --git a/media-tv/xdtv/Manifest b/media-tv/xdtv/Manifest
index d6681560f62a..625558f8baf0 100644
--- a/media-tv/xdtv/Manifest
+++ b/media-tv/xdtv/Manifest
@@ -17,6 +17,10 @@ AUX xdtv-2.3.3-external-ffmpeg.patch 2757 RMD160 dd960503bfbf7764461f2fc7d00a4d2
 MD5 452027e9d3f95bea616e63b1ede9e149 files/xdtv-2.3.3-external-ffmpeg.patch 2757
 RMD160 dd960503bfbf7764461f2fc7d00a4d2401dbd2b8 files/xdtv-2.3.3-external-ffmpeg.patch 2757
 SHA256 edc34f3ada92f5513fc010702ffac96425228aa2ece24c344df554c4976072a7 files/xdtv-2.3.3-external-ffmpeg.patch 2757
+AUX xdtv-2.4.0-ffmpeg.patch 4069 RMD160 fa0c1c926cabf65bd4996e53f1f85fc81e709546 SHA1 bdfc8db21546ba188f5b781e743f671d305fa5f5 SHA256 a8126adac7bb8506bfd8daf2327bc805f3884a87b3d87c5f0f988a885e9b86d8
+MD5 c8731252d543671e8cab627fd8f23a6e files/xdtv-2.4.0-ffmpeg.patch 4069
+RMD160 fa0c1c926cabf65bd4996e53f1f85fc81e709546 files/xdtv-2.4.0-ffmpeg.patch 4069
+SHA256 a8126adac7bb8506bfd8daf2327bc805f3884a87b3d87c5f0f988a885e9b86d8 files/xdtv-2.4.0-ffmpeg.patch 4069
 DIST libxdtv-i18n-ca-1.2.0.tar.gz 561158 RMD160 27b46861a1979254f313ff60ce0312c1cf383a09 SHA1 847863b33224ffc87336727db369b5e6cfe929c4 SHA256 dc8cdeda683054d035f0596484b65e2ebd9bbecca7490661e050280742423f5c
 DIST libxdtv-i18n-ca-1.3.0.tar.gz 638256 RMD160 e9e0de1a1c37bee4b7cf001fc42976599df1527e SHA1 d3160655c1c83cabd08dd9561bf14943ac0f5ad3 SHA256 6dc2cc65128e9e5d11a536f0b86a57cd193fbc12cbf2817a28e53a2049ed198a
 DIST libxdtv-i18n-ca-2.4.0.tar.gz 673690 RMD160 f8e82962b6c08c145cb730661c6f422102360912 SHA1 b90285e055812827f7a0185d02d89d014e12403f SHA256 7a7970dfa6049b472974754fa962dd2810efff17c1e93b250c407c4d9207da96
@@ -113,14 +117,14 @@ EBUILD xdtv-2.3.3.ebuild 6108 RMD160 932fc3f7b3ba6c7dcf8367fd46de475111902f8f SH
 MD5 43f79be3cb8aa957e6fce57288af131e xdtv-2.3.3.ebuild 6108
 RMD160 932fc3f7b3ba6c7dcf8367fd46de475111902f8f xdtv-2.3.3.ebuild 6108
 SHA256 5e893367b5869c0144600efb57042cb5ca0f2615beba717c66af44862662bf7b xdtv-2.3.3.ebuild 6108
-EBUILD xdtv-2.4.0.ebuild 5303 RMD160 917c5148f4a22cf19f875b7b5f29e1ecd799683a SHA1 cb36b3babfa8ca883e038299358d2ffd8119d042 SHA256 b8bc79102656770308cf9c1decf6d0df9729d4acf20507f6af5abc63f157ef6d
-MD5 9d45d87586e91375b34f1ed1c98c7ca6 xdtv-2.4.0.ebuild 5303
-RMD160 917c5148f4a22cf19f875b7b5f29e1ecd799683a xdtv-2.4.0.ebuild 5303
-SHA256 b8bc79102656770308cf9c1decf6d0df9729d4acf20507f6af5abc63f157ef6d xdtv-2.4.0.ebuild 5303
-MISC ChangeLog 7918 RMD160 e03683d4d63fdcaa01783bec085d95ec2cd0d8d6 SHA1 a12933e620c964a793e995ac8456c635ca8c88a4 SHA256 b62e00880d322979ef70f25c6d1aa350bceb0e94cdb2a610094528157e97cf1c
-MD5 c2267a194d67d4fa7a8dd8c2f347150b ChangeLog 7918
-RMD160 e03683d4d63fdcaa01783bec085d95ec2cd0d8d6 ChangeLog 7918
-SHA256 b62e00880d322979ef70f25c6d1aa350bceb0e94cdb2a610094528157e97cf1c ChangeLog 7918
+EBUILD xdtv-2.4.0.ebuild 5394 RMD160 81e72ac43b3d68e1dd9ba0a418b422ba03b62d42 SHA1 54de06adce2a8c884e761d273028aa2370d933c9 SHA256 0b30083450f0c311cf7546b60527d8045428f73c2ac5c2b5602afc47c8d668fe
+MD5 eb0adddb5d5edc05cc77394d3da41f60 xdtv-2.4.0.ebuild 5394
+RMD160 81e72ac43b3d68e1dd9ba0a418b422ba03b62d42 xdtv-2.4.0.ebuild 5394
+SHA256 0b30083450f0c311cf7546b60527d8045428f73c2ac5c2b5602afc47c8d668fe xdtv-2.4.0.ebuild 5394
+MISC ChangeLog 8062 RMD160 b4a71d0473d87ba74350ebd07e691c24eb206b11 SHA1 c34c0f1fb379588c1bf6ca99578b79b9bdf514ec SHA256 346c8576663585f133bfeaed3b582a1d63cfe9a159b1ba9b60cd34c5f67800ee
+MD5 2349776eda05f1e0bfc6f775e924b6df ChangeLog 8062
+RMD160 b4a71d0473d87ba74350ebd07e691c24eb206b11 ChangeLog 8062
+SHA256 346c8576663585f133bfeaed3b582a1d63cfe9a159b1ba9b60cd34c5f67800ee ChangeLog 8062
 MISC metadata.xml 251 RMD160 5a95bc58fcda94b2d82b3040b6730442e120f8ea SHA1 06b6e03f61417e4af6428787da39f3e5f76b6bf1 SHA256 27a61643c6fa329d9ffed2f5517d4f142d60b94836413a2fdfe3cfdc085a9d38
 MD5 e94a425466daf4d1f823b904e88608cd metadata.xml 251
 RMD160 5a95bc58fcda94b2d82b3040b6730442e120f8ea metadata.xml 251
@@ -137,7 +141,7 @@ SHA256 61eda25e36006d44ec76fb8cc360ae82ba81ea27124dce074f6cf15966020f7a files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGbqdBt2vP6XvVdOcRAnAtAJwJxKd7oZcWUgaSuHVDwwAjT4NBRQCg10bU
-uTAAasbUbiI+CapbOEXc7ic=
-=3E7y
+iD8DBQFGi1oGvFcC4BYPU0oRAgmnAKCSS3s/IhmM0/lwpWDW4dpoDt5PQACfZ70V
+7IW1+YUq4/IxFetrWGXqG/4=
+=ReTL
 -----END PGP SIGNATURE-----
diff --git a/media-tv/xdtv/files/xdtv-2.4.0-ffmpeg.patch b/media-tv/xdtv/files/xdtv-2.4.0-ffmpeg.patch
new file mode 100644
index 000000000000..b57a953f0673
--- /dev/null
+++ b/media-tv/xdtv/files/xdtv-2.4.0-ffmpeg.patch
@@ -0,0 +1,103 @@
+Index: xdtv-2.4.0/src/divx.c
+===================================================================
+--- xdtv-2.4.0.orig/src/divx.c
++++ xdtv-2.4.0/src/divx.c
+@@ -1200,70 +1200,7 @@ void divx_init(int width, int height)
+     sprintf(xawmesstmp, translate("divx_init: initializing %s - build %i.%i.%i\n"), codec_name, A_div.quot, B_div.quot, B_div.rem);}
+ #endif
+     strcat(xawmessage,xawmesstmp);
+-    switch(divx.codec) {
+-#ifdef HAVE_FFMPEG_XVID
+-#if LIBAVCODEC_BUILD >= 4719
+-      case FFMPEG_XVID: register_avcodec(&xvid_encoder); break;
+-#endif
+-#endif
+-      case FFMPEG_MPEG4: register_avcodec(&mpeg4_encoder); break;
+-      case FFMPEG_MPEG1: register_avcodec(&mpeg1video_encoder); break;
+-#if LIBAVCODEC_BUILD >= 4676
+-      case FFMPEG_MPEG2: register_avcodec(&mpeg2video_encoder); break;
+-#endif
+-      case FFMPEG_MJPEG: register_avcodec(&mjpeg_encoder); break;
+-#if LIBAVCODEC_BUILD >= 4670
+-      case FFMPEG_LJPEG: register_avcodec(&ljpeg_encoder); break;
+-      case FFMPEG_FLV1: register_avcodec(&flv_encoder); break;
+-#endif
+-#if LIBAVCODEC_BUILD >= 4735
+-      case FFMPEG_RV20: register_avcodec(&rv20_encoder); break;
+-#endif
+-      case FFMPEG_RV10: register_avcodec(&rv10_encoder); break;
+-#ifdef HAVE_FFMPEG_X264
+-#if LIBAVCODEC_BUILD >= 4748
+-      case FFMPEG_X264: register_avcodec(&x264_encoder); break;
+-#endif
+-#endif
+-      case FFMPEG_H263P: register_avcodec(&h263p_encoder); break;
+-      case FFMPEG_H263: register_avcodec(&h263_encoder); break;
+-#if LIBAVCODEC_BUILD >= 4729
+-      case FFMPEG_H261: register_avcodec(&h261_encoder); break;
+-#endif
+-      case FFMPEG_MSMPEG4V3: register_avcodec(&msmpeg4v3_encoder); break;
+-      case FFMPEG_MSMPEG4V2: register_avcodec(&msmpeg4v2_encoder); break;
+-/* Already implemented into the 0.4.6 version but only work correctly with the 0.4.7 version */
+-#if LIBAVCODEC_BUILD >= 4675
+-      case FFMPEG_WMV2: register_avcodec(&wmv2_encoder); break;
+-#endif
+-      case FFMPEG_WMV1: register_avcodec(&wmv1_encoder); break;
+-#if LIBAVCODEC_BUILD >= 4677
+-      case FFMPEG_ASV2: register_avcodec(&asv2_encoder); break;
+-#endif
+-#if LIBAVCODEC_BUILD >= 4668
+-      case FFMPEG_ASV1: register_avcodec(&asv1_encoder); break;
+-#endif
+-/* appeared with the 4719 version but don't work correctly actually */
+-#if LIBAVCODEC_BUILD >= 16777215
+-      case FFMPEG_SVQ1: register_avcodec(&svq1_encoder); break;
+-#endif
+-/* appeared with the 4669 version
+-but only work correctly with the 4755 version */
+-#if LIBAVCODEC_BUILD >= 4755
+-      case FFMPEG_FFV1: register_avcodec(&ffv1_encoder); break;
+-#endif
+-#if LIBAVCODEC_BUILD >= 4719
+-      case FFMPEG_SNOW: register_avcodec(&snow_encoder); break;
+-#endif
+-
+-#if LIBAVCODEC_BUILD >= 4734
+-      case FFMPEG_FFVHUFF: register_avcodec(&ffvhuff_encoder); break;
+-#endif
+-      case FFMPEG_HUFFYUV: register_avcodec(&huffyuv_encoder); break;
+-#if LIBAVCODEC_BUILD >= 4707
+-      case FFMPEG_DVVIDEO: register_avcodec(&dvvideo_encoder); break;
+-#endif
+-    }
++    avcodec_register_all();
+     codec = avcodec_find_encoder(xdtv_to_ffmpeg(divx.codec));
+     if (codec == NULL)
+     {
+@@ -2092,25 +2029,7 @@ codec_context->mv0_threshold            
+       return;
+     }
+     avcodec_init();
+-    switch(divx.audio_codec) {
+-      case FFMPEG_MP2: register_avcodec(&mp2_encoder); break;
+-#ifdef HAVE_FFMPEG_MP3
+-      case FFMPEG_MP3: register_avcodec(&mp3lame_encoder); break;
+-#endif
+-#ifdef HAVE_FFMPEG_AC3
+-      case FFMPEG_AC3: register_avcodec(&ac3_encoder); break;
+-#endif
+-#ifdef HAVE_FFMPEG_AAC
+-      case FFMPEG_AAC: register_avcodec(&faac_encoder); break;
+-#endif
+-      case FFMPEG_PCMS16LE: register_avcodec(&pcm_s16le_encoder); break;
+-#ifdef HAVE_FFMPEG_AMR_NB
+-      case FFMPEG_AMR_NB: register_avcodec(&amr_nb_encoder); break;
+-#endif
+-#ifdef HAVE_FFMPEG_AMR_WB
+-      case FFMPEG_AMR_WB: register_avcodec(&amr_wb_encoder); break;
+-#endif
+-    }
++    avcodec_register_all();
+     if (audio_codec_context == NULL)
+       audio_codec_context = avcodec_alloc_context();
+     audio_codec_context->codec_id = xdtv_to_audioffmpeg(divx.audio_codec);
diff --git a/media-tv/xdtv/xdtv-2.4.0.ebuild b/media-tv/xdtv/xdtv-2.4.0.ebuild
index 8ac1a9e5d345..503bde9f7d03 100644
--- a/media-tv/xdtv/xdtv-2.4.0.ebuild
+++ b/media-tv/xdtv/xdtv-2.4.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.1 2007/02/24 12:19:40 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-tv/xdtv/xdtv-2.4.0.ebuild,v 1.2 2007/07/04 08:27:25 aballier Exp $
 
-inherit multilib flag-o-matic toolchain-funcs
+inherit eutils multilib flag-o-matic toolchain-funcs
 
 IUSE="alsa jpeg encode ffmpeg xvid lirc xinerama neXt Xaw3d mmx zvbi aqua_theme
 carbone_theme xv debug ogg png nls schedule"
@@ -99,6 +99,14 @@ extension_install() {
 		&& emake DESTDIR="${D}" LIBDIR="/usr/$(get_libdir)/${PN}" install
 }
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}/${P}-ffmpeg.patch"
+
+}
+
 src_compile() {
 	# Makes the xaw widgets choice deterministic
 	local xawconf="--disable-xaw95 --disable-xawm"