Fix libav9 build. Fixes bug#443430. Also fix the new gl api while at it.

Package-Manager: portage-2.2.0_alpha184/cvs/Linux x86_64
Manifest-Sign-Key: 0x8EEE3BE8

4 files changed, 67 insertions, 9 deletions

diff --git a/media-video/hwdecode-demos/ChangeLog b/media-video/hwdecode-demos/ChangeLog
index 113d7adfa7ef..113b429648a2 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-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 $
+# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/ChangeLog,v 1.9 2013/06/22 17:50:48 scarabeus Exp $
+
+  22 Jun 2013; Tomáš Chvátal <scarabeus@gentoo.org> +files/libav9.patch,
+  hwdecode-demos-0.9.5.ebuild:
+  Fix libav9 build. Fixes bug#443430. Also fix the new gl api while at it.
 
   17 Jan 2013; Alexis Ballier <aballier@gentoo.org>
   hwdecode-demos-0.9.5.ebuild, +files/ffmpeg-1.patch:
diff --git a/media-video/hwdecode-demos/Manifest b/media-video/hwdecode-demos/Manifest
index 7cf5f4aeca05..ee0c8d1028db 100644
--- a/media-video/hwdecode-demos/Manifest
+++ b/media-video/hwdecode-demos/Manifest
@@ -3,14 +3,25 @@ Hash: SHA256
 
 AUX ffmpeg-1.patch 2195 SHA256 cf1bb61d83fea3cc3f41d4ee167857e58639c8ac7f914f1015b7acc7f4831f8e SHA512 a733adb59b8a1729de78516d2803e6a38d86d709dd09b8fd4c84a51dd5636adb4d5684ca952db6159d27076815119b016c5262cf8c0870856acfc869426dd8ca WHIRLPOOL 0235b3d6235278de9c8e8c77b956e67637c465adc2679d18abea879e7281458cc00dcf4a2369fde20366e05d7c94c76b5494bc3ebeb59ccd387e76e6117fb0d6
 AUX ffmpeg.patch 1367 SHA256 0255db5d35bded209b7a8d1445a69a93c3cf5c485a0f10973b0fac4962a1be15 SHA512 befcaa4167dc7d0b966fb1075b38e91651c0d7082eda88e09db4af7ca21e80dcfceee6018a00fc2f23126a50bd6043224428353a6c9e9929fc9a4eff9caf62e8 WHIRLPOOL 3e8c20fdbd7cf178dee47524c892dc5f32e7c3d47adc6c6b5ec4991826b3045dcf009cea4328effa21492dd5b1e403310d2b660b6530c9e8c538a2cd57d9db0f
+AUX libav9.patch 1836 SHA256 962286908689fb9e088f7699f554e0220417263fc5bf379fa23b7c5eb80ab5b1 SHA512 218db0214ed368a9bb8f322f9d5e9fb5b37098893ed8379c38ca69777c4068f1bca254f495f6d3dd74763f90f68b21fe4863d63c02732bdee6065e24b6a422d2 WHIRLPOOL 2443745a55004da0b195a4066d440ceefdc1f7f406036a2b42fa8f5aff08332b6a2053ecb64133a78123d971efe5445e586dfd0a6fd464d84f588887f428e4ad
 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
+EBUILD hwdecode-demos-0.9.5.ebuild 1045 SHA256 fce6fa3409098151d3fbceeb136fd2924234ab98b78398aa398836e11feb55da SHA512 7623a87ec3515bed038f1f224c789eed4225227688c3ad18a71eb383eeb3bb29f91143e2c0e4d677b330f5ce7166c556287b609c2e3891d6c940d3444d3b20e0 WHIRLPOOL 1d4ca923ed647935e17e95ea98784603c956c4c397fa28ab262c30b4d0916f44b3a4b406fe771278753e1967e4693b9fab38d02a9b99453db7b6c97532f05dca
+MISC ChangeLog 1570 SHA256 711946e9f87c94245fa32b5c4f6577a4c4e9827f01f08ec9f15fb56d565be131 SHA512 3f1bd95afdf564364c45b8cc8d65be5f9c17245f42090a3b9e6bc16f634ce01918dee4f1a9fae79d6f363ada465a90f0a1cedb580277eee5692306051cba35c4 WHIRLPOOL 78f0976a886cf141dcb4f12ac501071acc3905a36f9ec5c9ed39d305d88cc2f7686e276e7c3efc48da99c184cabf4e5f1378bd5b50c493c19d033f8a62360324
 MISC metadata.xml 338 SHA256 d76b8a6061864d38597426502c79fd2fee0cdc19458c8e20c560e5e0afec9c0f SHA512 544ee5f8c40683a5e88b368ca6323339a55d534ceb51fb8af36654ddbff8837918fda54b190053d51c82a9e791f1b1a4db0273d04611c336940c4f793cdeb2f0 WHIRLPOOL c8bb1edfbdb5c995590448a0b439fba5c2213da70ecde3c55d68d789a6c7c420dc53b9e848b262ffd48e5cd676de600f6bc5d7ce8e14f6dc4538c67baa233ceb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlD4bVoACgkQvFcC4BYPU0qMjgCgjLC/k6Dk03zw2zlB7rhCiEbl
-UnIAmwWH3nVRzLbT1usxKTYq8mTOfV61
-=TNV1
+iQIcBAEBCAAGBQJRxePtAAoJEOSiRoyO7jvoUCYP/jFxYsd+dGwxa6p/pdR3yatV
+MY4qg2E52TXt6YtFoVkbFLPZ18vNo1P1cdkodhjwkC6fmy3gKrRXyCltsxD6dl3w
+OR9dr/1GWgkJIiEaCQrmJB2qF3oq7mK5vWQJl9MDhmHR5Q6EsMalMMWweG6pmAp1
+nj3DUGUhZD+9TbwzGS0e7HedEbrZ3SQsUcxleS2BmoPZI43gZSAqiQHtkGfHow/m
+4tuHv1fU+iMjnMJd6bchgYcYILagGm+Cddkt9MyVd9KPSnJWeI+KigerHPoubPjJ
+4rbVvje8GvyIcYMPujcWfK+xd7R4U+HEAqs76B60KI9GoTJytjj23aAjSbfjo/uH
+tI1Ei44ZOrAiYmaS8qTFv137x+M9BAiNGbjTC5LtO8IRJoufWslQj5+TaigAdqHS
+hR+uKSXM1PAq0NE4YnZ8Zb7upEVKTUSsrCK/bgvlnNml5IUV7CAHtsAKz0imn+8v
+Tzktu0Pl9DMBb07MRVeUESqNcbNGCYhDIzZ5fWM//T0Z8dXW5h+1BDBdSt7OGR71
+L3q/GxxwF7WI3XucCCdd0Twtih189ltkJyPxZO9V5OxMt9viafCQT/gNDPZBZ9tV
+eqP6Bu4I2rJogWR+mffjxUBcUJxq12lpnD1zidnuB7tm7KRxr8SRfTnnjGNf6IHF
+xHapW1wsVgQ652C7gXcJ
+=o18U
 -----END PGP SIGNATURE-----
diff --git a/media-video/hwdecode-demos/files/libav9.patch b/media-video/hwdecode-demos/files/libav9.patch
new file mode 100644
index 000000000000..df5dbdf03be1
--- /dev/null
+++ b/media-video/hwdecode-demos/files/libav9.patch
@@ -0,0 +1,42 @@
+Pouze v /tmp/hwdecode-demos-0.9.5/src/: config.h
+Pouze v /tmp/hwdecode-demos-0.9.5/src/: .deps
+diff -ur /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/ffmpeg_video.c /tmp/hwdecode-demos-0.9.5/src/ffmpeg_video.c
+--- /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/ffmpeg_video.c	2013-06-22 19:45:54.776768969 +0200
++++ /tmp/hwdecode-demos-0.9.5/src/ffmpeg_video.c	2013-06-22 19:45:44.720769327 +0200
+@@ -96,7 +96,7 @@
+     if (avformat_open_input(&ic, "", format, NULL) < 0)
+         goto end;
+ 
+-    if (av_find_stream_info(ic) < 0)
++    if (avformat_find_stream_info(ic, NULL) < 0)
+         goto end;
+     av_dump_format(ic, 0, "", 0);
+ 
+@@ -115,7 +115,7 @@
+ 
+     if ((codec = avcodec_find_decoder(avctx->codec_id)) == NULL)
+         goto end;
+-    if (avcodec_open(avctx, codec) < 0)
++    if (avcodec_open2(avctx, codec, NULL) < 0)
+         goto end;
+ 
+     got_picture = 0;
+Pouze v /tmp/hwdecode-demos-0.9.5/src/: Makefile
+Pouze v /tmp/hwdecode-demos-0.9.5/src/: stamp-h1
+diff -ur /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/utils_glx.h /tmp/hwdecode-demos-0.9.5/src/utils_glx.h
+--- /var/tmp/portage/media-video/hwdecode-demos-0.9.5/work/hwdecode-demos-0.9.5/src/utils_glx.h	2011-01-06 09:15:35.000000000 +0100
++++ /tmp/hwdecode-demos-0.9.5/src/utils_glx.h	2013-06-22 19:45:44.720769327 +0200
+@@ -28,6 +28,13 @@
+ #include <GL/glx.h>
+ #include <GL/glxext.h>
+ 
++#if GL_GLEXT_VERSION >= 85
++	/* XXX: PFNGLMULTITEXCOORD2FPROC got out of the GL_VERSION_1_3_DEPRECATED
++	  block and is not defined if GL_VERSION_1_3 is defined in <GL/gl.h>
++	  Redefine the type here as an interim solution */
++	typedef void (*PFNGLMULTITEXCOORD2FPROC) (GLenum target, GLfloat s, GLfloat t);
++#endif
++
+ const char *
+ gl_get_error_string(GLenum 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 030887db0254..b24816e4fa65 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-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.4 2013/01/17 21:30:01 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/hwdecode-demos/hwdecode-demos-0.9.5.ebuild,v 1.5 2013/06/22 17:50:48 scarabeus Exp $
 
 EAPI=2
 
@@ -25,7 +25,8 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	"${FILESDIR}/ffmpeg.patch"
 	"${FILESDIR}/ffmpeg-1.patch"
-	)
+	"${FILESDIR}/libav9.patch"
+)
 
 src_configure() {
 	econf \