Fix build with latest ffmpeg. Part of bug #443430

Package-Manager: portage-2.2.0_alpha154/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 92 insertions, 21 deletions

diff --git a/media-video/hwdecode-demos/ChangeLog b/media-video/hwdecode-demos/ChangeLog
index d931443a0af8..113d7adfa7ef 100644
--- a/media-video/hwdecode-demos/ChangeLog
+++ b/media-video/hwdecode-demos/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for media-video/hwdecode-demos
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/ChangeLog,v 1.7 2012/11/26 14:21:48 scarabeus Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/ChangeLog,v 1.8 2013/01/17 21:30:01 aballier Exp $
+
+  17 Jan 2013; Alexis Ballier <aballier@gentoo.org>
+  hwdecode-demos-0.9.5.ebuild, +files/ffmpeg-1.patch:
+  Fix build with latest ffmpeg. Part of bug #443430
 
   26 Nov 2012; Tomáš Chvátal <scarabeus@gentoo.org> metadata.xml:
   Update to global useflag.
diff --git a/media-video/hwdecode-demos/Manifest b/media-video/hwdecode-demos/Manifest
index 45bcb6bfcbf2..7cf5f4aeca05 100644
--- a/media-video/hwdecode-demos/Manifest
+++ b/media-video/hwdecode-demos/Manifest
@@ -1,25 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX ffmpeg-1.patch 2195 SHA256 cf1bb61d83fea3cc3f41d4ee167857e58639c8ac7f914f1015b7acc7f4831f8e SHA512 a733adb59b8a1729de78516d2803e6a38d86d709dd09b8fd4c84a51dd5636adb4d5684ca952db6159d27076815119b016c5262cf8c0870856acfc869426dd8ca WHIRLPOOL 0235b3d6235278de9c8e8c77b956e67637c465adc2679d18abea879e7281458cc00dcf4a2369fde20366e05d7c94c76b5494bc3ebeb59ccd387e76e6117fb0d6
 AUX ffmpeg.patch 1367 SHA256 0255db5d35bded209b7a8d1445a69a93c3cf5c485a0f10973b0fac4962a1be15 SHA512 befcaa4167dc7d0b966fb1075b38e91651c0d7082eda88e09db4af7ca21e80dcfceee6018a00fc2f23126a50bd6043224428353a6c9e9929fc9a4eff9caf62e8 WHIRLPOOL 3e8c20fdbd7cf178dee47524c892dc5f32e7c3d47adc6c6b5ec4991826b3045dcf009cea4328effa21492dd5b1e403310d2b660b6530c9e8c538a2cd57d9db0f
-DIST hwdecode-demos-0.9.5.tar.gz 642660 SHA256 35ef7bac5b95c61920ab6bae825060755051659c610c095739d9ae33b3d39d07
-EBUILD hwdecode-demos-0.9.5.ebuild 983 SHA256 b648ff6275bed27c458a14a022cbf3b399f6d315a5dcc6a1ab1827ac98f0ee37 SHA512 0db3ac91d78439bc1129e43b04cd46f19478318478fdbccaa261ca3ad55a1064b2e8adc41f2fdafb3735cbd4468d2f4800fe5c08d0da2c3a06481ac65c846fd7 WHIRLPOOL 8dbd7150e3ab2320ea49df1411a4067a2e94da84cbcb94d3c1f6d39d58c40bbe2623e2c8edbb99907e4a01c72da0de66bde5364831f7f48aa0ac3dfc06ed20f1
-MISC ChangeLog 1228 SHA256 78451aeae3633793758e0eb1f458a4880ec15a8ad606ec2e2a0f73bb01bf593e SHA512 f13ca6adec6e9ae459a6d87fea243ee211041915ffada1beb186b81016f1ab5237d7bc9b3c89f8bd24e724ea86fd7ee7788cfb3fc9cb142594ca4ecc73e91b81 WHIRLPOOL cc3e66d3ec2dda981ef16d21fe1c5bc794353eac42cb035ce05b823c8a04062ea1ecc5eba6d069ebaaccc0f8180d61be0af43cbeca20d92f46964938a7191ee3
+DIST hwdecode-demos-0.9.5.tar.gz 642660 SHA256 35ef7bac5b95c61920ab6bae825060755051659c610c095739d9ae33b3d39d07 SHA512 2596949a6027c7d9a4053911501febaca319a4593cad23fc854d5f366e8be914fdbb7ecd08aac784fc9798dcf46147de249bf848a5a3fa513d06585c1f9f6748 WHIRLPOOL d494537d25dc17d0d8c4c058625898ea5be28522d2b7b8a30eea01662a053795fe0065d75db12a6babdeb081642689300123196d8a27ba9bb38d970cfbde614c
+EBUILD hwdecode-demos-0.9.5.ebuild 1017 SHA256 c73013adf5af7017ec9b42d7acc0d48cb215c5966c9e8a95c6699470eb7c784f SHA512 efcd9b15952a58f1b655002d50edb4d4f13bb24393fe45aee09f038ff3ba31c11124f3cf31328a38ecfb37d7919e755e8e7b157e4f5ec03d4758214191adbfa8 WHIRLPOOL 7efb5b578970b7704a6dfc4e66daba3c3905131a049faddbc2500808034c3922e5aa3aceb0778f0d9df9302443144a68772ac969d868532256b8af01a6b09dc0
+MISC ChangeLog 1386 SHA256 9b6415d1b86f174058f8a6a8610fca221c56b31e2a6df74ca63962e7b672b2f5 SHA512 1bca60e7abcb218f2cde78d61e06878c402a197e1922707295c2b7aebeafe0a19bc7abde0dd77421c9ca238286b6f89b59bcc9b25c2914bbf79197b55069f05f WHIRLPOOL 3959ddb095b43a35342ecd6d802515a8daf0fd7c25c5a7348c44e2987bb8a57d1d93716fd0f05f9c5547df8fe63b4e454c3ba2777a5a8d48f7bcf30f58b64054
 MISC metadata.xml 338 SHA256 d76b8a6061864d38597426502c79fd2fee0cdc19458c8e20c560e5e0afec9c0f SHA512 544ee5f8c40683a5e88b368ca6323339a55d534ceb51fb8af36654ddbff8837918fda54b190053d51c82a9e791f1b1a4db0273d04611c336940c4f793cdeb2f0 WHIRLPOOL c8bb1edfbdb5c995590448a0b439fba5c2213da70ecde3c55d68d789a6c7c420dc53b9e848b262ffd48e5cd676de600f6bc5d7ce8e14f6dc4538c67baa233ceb
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQs3ruAAoJEOSiRoyO7jvoSqMQAKjdDF7XvW9sBX7lqs9xoUSO
-u40Pp13A9ZswymIIzurajt+JdnOaP4Zys+855swCFwkYz0Iw8C8GYXzkPsRZMoAK
-kp0B5WWihGS5uZFdlD4cFdEanDKIdpmk95PGV6TtprugV9G6XWNQKdGnXmHWMeev
-bREstYcjM4hLDxe9DPdq34WUqcs1tXh7lCkAM5OuTvfe2BrdYUuv52tcfIdWHN3Q
-njyzXMRGg/yPKzXdEhPcOcrHE9C9C2qwBlgqRLusaWLGcJpwZ0BBJoR/7fb+rOvF
-R+q1NiyfXNoUZGoWELSG5d6T9eTSfG60lhNIZ2SxELPkfsvHeFgWiinVi0IbaTRB
-8IcRNFxjcp8R9TO5+O0Nxkv6E8Ted7T+jC6Jvk1TnrViry3NiW0KUwUt7NWjbNWu
-zwAq3ZPJYN0u14KwhSSyt9xd4M9nid4zPfZDTkOOUuPbJra6dBmmJ0WI8Vs5o642
-3pGBLoRh5nDucvLOOGE2jpbTPKuaitX6o+HKPgcYGb+dMwTkpkKC9x/+t/IydBQ0
-HwUmnoz4QBtRJ2nodcxT2Bte/orA8yDCZ/Pk3EMBTjGUpO+tN8vVgIOaUfLCpIVX
-MYLKwOJcQLfiphYYwgzk3lh+Wi06mU/FoiLJCrh2O1Yayg8/dmr9+y9VhkYhumWA
-11vD0htuJs9PLi/FRjcF
-=42em
+iEYEAREIAAYFAlD4bVoACgkQvFcC4BYPU0qMjgCgjLC/k6Dk03zw2zlB7rhCiEbl
+UnIAmwWH3nVRzLbT1usxKTYq8mTOfV61
+=TNV1
 -----END PGP SIGNATURE-----
diff --git a/media-video/hwdecode-demos/files/ffmpeg-1.patch b/media-video/hwdecode-demos/files/ffmpeg-1.patch
new file mode 100644
index 000000000000..f0b223e1401c
--- /dev/null
+++ b/media-video/hwdecode-demos/files/ffmpeg-1.patch
@@ -0,0 +1,73 @@
+Index: hwdecode-demos-0.9.5/src/ffmpeg.c
+===================================================================
+--- hwdecode-demos-0.9.5.orig/src/ffmpeg.c
++++ hwdecode-demos-0.9.5/src/ffmpeg.c
+@@ -53,7 +53,6 @@ static int ffmpeg_init(void)
+         return -1;
+     }
+ 
+-    avcodec_init();
+     avcodec_register_all();
+ 
+     ffmpeg_context = ffmpeg;
+@@ -148,7 +147,6 @@ static int get_buffer(struct AVCodecCont
+     void *surface = (void *)(uintptr_t)vaapi->surface_id;
+ 
+     pic->type           = FF_BUFFER_TYPE_USER;
+-    pic->age            = 1;
+     pic->data[0]        = surface;
+     pic->data[1]        = NULL;
+     pic->data[2]        = NULL;
+Index: hwdecode-demos-0.9.5/src/ffmpeg_video.c
+===================================================================
+--- hwdecode-demos-0.9.5.orig/src/ffmpeg_video.c
++++ hwdecode-demos-0.9.5/src/ffmpeg_video.c
+@@ -23,6 +23,7 @@
+ 
+ #ifdef HAVE_LIBAVFORMAT_AVFORMAT_H
+ # include <libavformat/avformat.h>
++# include <libavformat/avio.h>
+ #endif
+ #ifdef HAVE_FFMPEG_AVFORMAT_H
+ # include <ffmpeg/avformat.h>
+@@ -59,7 +60,7 @@
+ int decode(void)
+ {
+     AVProbeData pd;
+-    ByteIOContext ioctx;
++    AVIOContext *ioctx;
+     AVInputFormat *format = NULL;
+     AVFormatContext *ic = NULL;
+     AVCodec *codec;
+@@ -84,15 +85,20 @@ int decode(void)
+         goto end;
+     format->flags |= AVFMT_NOFILE;
+ 
+-    if (init_put_byte(&ioctx, (uint8_t *)video_data, video_data_size, 0, NULL, NULL, NULL, NULL) < 0)
++    ioctx = avio_alloc_context((uint8_t *)video_data, video_data_size, 0, NULL, NULL, NULL, NULL);
++    if (!ioctx)
+         goto end;
+ 
+-    if (av_open_input_stream(&ic, &ioctx, "", format, NULL) < 0)
++    ic = avformat_alloc_context();
++    if(!ic)
++        goto end;
++    ic->pb = ioctx;
++    if (avformat_open_input(&ic, "", format, NULL) < 0)
+         goto end;
+ 
+     if (av_find_stream_info(ic) < 0)
+         goto end;
+-    dump_format(ic, 0, "", 0);
++    av_dump_format(ic, 0, "", 0);
+ 
+     video_stream = NULL;
+     for (i = 0; i < ic->nb_streams; i++) {
+@@ -135,6 +141,6 @@ end:
+     if (avctx)
+         avcodec_close(avctx);
+     if (ic)
+-        av_close_input_stream(ic);
++        avformat_close_input(&ic);
+     return error;
+ }
diff --git a/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild b/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild
index 649f9a1f620b..030887db0254 100644
--- a/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild
+++ b/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild,v 1.3 2012/05/05 08:58:59 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild,v 1.4 2013/01/17 21:30:01 aballier Exp $
 
 EAPI=2
 
@@ -22,7 +22,10 @@ RDEPEND="virtual/ffmpeg
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
-PATCHES=( "${FILESDIR}/ffmpeg.patch" )
+PATCHES=(
+	"${FILESDIR}/ffmpeg.patch"
+	"${FILESDIR}/ffmpeg-1.patch"
+	)
 
 src_configure() {
 	econf \