remove leftover patch

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

3 files changed, 9 insertions, 66 deletions

diff --git a/x11-libs/libva-intel-driver/ChangeLog b/x11-libs/libva-intel-driver/ChangeLog
index bab14539bbb8..b4c4115ee382 100644
--- a/x11-libs/libva-intel-driver/ChangeLog
+++ b/x11-libs/libva-intel-driver/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libva-intel-driver
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.17 2012/12/08 15:26:41 aballier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libva-intel-driver/ChangeLog,v 1.18 2013/03/07 15:36:21 aballier Exp $
+
+  07 Mar 2013; Alexis Ballier <aballier@gentoo.org> -files/libva-1.1.0.patch:
+  remove leftover patch
 
   08 Dec 2012; Alexis Ballier <aballier@gentoo.org>
   libva-intel-driver-1.0.19.ebuild, +files/libm.patch:
diff --git a/x11-libs/libva-intel-driver/Manifest b/x11-libs/libva-intel-driver/Manifest
index 0a27ba3c3462..e2feb552b803 100644
--- a/x11-libs/libva-intel-driver/Manifest
+++ b/x11-libs/libva-intel-driver/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA256
 
 AUX libm.patch 837 SHA256 22750ea795bcb4423dc584daec6a59c610e78aa4176cf86a7bc7b1b0df21a888 SHA512 c78073107c2fe9c4734ceb3f735ca10ff46421c4b86fe5758606a8586fa5478180fa0b0751ba8026da2a7df2106a067ca4889a1a75f8d2035bf3a167ae535901 WHIRLPOOL be670c3041652c99bfde1b9cb89c2f2dd21f0749bc42d76b1a2d7182338892b466cb3e85a41c0d4e4f1294344aa29d14dc46c69ffb7aa0232154b906845aabb1
-AUX libva-1.1.0.patch 2330 SHA256 3392e244e16b555292efff11b4bf20507352fbaad828eee956b1863ffd76b267 SHA512 61b4e4c2f283be49a6ffc35183efd9a97d3539f330fce44fc470b5cbc78b1e3525f059a5c7318417ed959b5dd6154060fd9fb15d202fb1f76bbee166a8552680 WHIRLPOOL e401256c46482838aedb4fa6ce661123e497478c51804f277958ce409caa967fd8ec6d8370a759f5b28b9a95a569ec7835c5fd2cd1fbe68e7bd26bcd9553eb8a
 DIST intel-driver-1.0.17.tar.bz2 289359 SHA256 83bee4de6e156b3a95af3ac41bcb2dbfecbb547444e8ff8ef005dc5ad92e0b3f SHA512 33d2108596ed3562f2db7404b5cbab30a319ca88b905b658d5a619841dbada6a6e69f7f3f7205f3fd0b86afbec1aaa45e1baac2b8740e4cb5bbe81c6c6740447 WHIRLPOOL 79e1663b3dc238f51351d09bd570cfe662294813b645e1dae9a4fb554fa711536f4ef93fbf405080c15abf3cb31bad5df1bcbba32a3a56aaf9521a98a44ac802
 DIST libva-intel-driver-1.0.19.tar.bz2 448951 SHA256 2db68da9f4cea9b726ce2cd7c6246d902085310d83609082e453aa01559ea792 SHA512 a08bd474024869d0b6bd2eca6f039d571f199c1e4037938c2d6c6f7d01ab773bf61c5bf31e6af469280d9baf674f4f0827768b963999280cc1d9285a2ad44b57 WHIRLPOOL 124526b730c8836adaab31712715f531ba26ab8be1e6914a82b94e39d36e3a5f8c8dbd526f00ada44233023554a928f845940628fbcb03f9a0db0dc2c5bc9350
 EBUILD libva-intel-driver-1.0.17.ebuild 1250 SHA256 d25b493322e39cd9899cb8feb84e427980e2c3d44993c31d6bc5fcd7695aabcf SHA512 7e19809b286c4631e466f3c879c8c807b9b57753e4e12d9a717e33ee76455f160b8f683e0d2893eb418042d6e1ea40a8538bff89b207c63127cb4147bfecd1b4 WHIRLPOOL d37189f84a7f727a1d24c7a610aeefd04ba5ede136c915572854d2b33f6e5843fb1b853b03554dc7494c9a42391e60b618b30fa74a35570de7eae82a9ce3173c
 EBUILD libva-intel-driver-1.0.19.ebuild 1427 SHA256 c175524ca1c8c573286f57856c39709431902c8f7144a4d95e909197bc3fe389 SHA512 9ee17abe86bc2b9fa4c53587035c2b8b3cae29a516d7e1cd0f4524af81f2dbca9ef7907c542fe0cade970b3c8d8594eb88d5f37151bedddddb12b364b6c04a7e WHIRLPOOL 0ea37a3b0701ce7e97d9550b0408f1c936740da0ab7d6bc7b39b69908a8ae9e1c17093af41d3d7e5ef04ec808e1b6ff9724df70c948a1a3af207d4a28f77132d
 EBUILD libva-intel-driver-9999.ebuild 1385 SHA256 670703935eaff510695211568b028a8ec6d2c69cf28ecefe8f778b414034d033 SHA512 7bef0e126b48bb1633cabc89c07b8659bfd2ceb9340a5e8c0d56e235940b01d7a07c9b0f02a7e9de443f6d8664963c5cb2f9c5cdfdee2963924729d393f1f7d9 WHIRLPOOL 488a4f7c9ec595a674accf5aec14635f05c95814679c80f2bcf77ca01f69ebf5e50192db32b73a0f11d34273d4f3dc2a6c679288c6e838ae4de7c4144765f630
-MISC ChangeLog 2938 SHA256 1a20227ae6c2510d380d38b82900fd5a13982194c557b1d3b685e4539e32e70c SHA512 30fb55f1cdd6e0e0ad3ff338e01e9cc1f7842b44731c92b8ea0db32e22126507fd6047fa7559bb334f8ad539b25404b0a20e3ffcd7c1de069a36ecb9cae41ee3 WHIRLPOOL 50ed4be33d8121e6598bd29c17ef5344450418a61b11cb64874b1ad41d9dbdc14125e49064825dd6e303e06fc374a6465e4ef437d9aa1e2b8bdd4fe53fb312f9
+MISC ChangeLog 3041 SHA256 a42c39eb73347e9420acd3effeb6493c2d7ee58d322257e797a95e279c769cd1 SHA512 b0859fa2a156fa93450142153acafeaf7d5f7ff06dac43f12259671305cc6286bfe113be49a9c88be8ca0f2b5b0386d77a884a75c6927a4b00b2131cc9406389 WHIRLPOOL 1711cff37e22c9f86a9202dfeb4849a15e29093b6fbd0cd0ec603f7f931bf53fe89830c0c42aee82cfd1094482fa73c2360bf5685dc2a1f4fd631a0c60d4967d
 MISC metadata.xml 334 SHA256 ff01365596ec939564f4d1c648daeb7407d997db5d3de4127fae2bfba89cca2d SHA512 d4de2cd05bbc990f8dfa1fbe22812863e49a717017e1c48226cdebd2d54d7f3d09aa5b5980eed290fb4630352411af40aab428f7918f5f5005d7f2cbcf980f18 WHIRLPOOL 8f0ba8486374a7050a1b7d1e9bf6649534f37187355b35a39a7c1a62eccf4099863cda75ac7467249a158734afea0b985e1a2bbeeb585852a7e5b54817a9745f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDDXDIACgkQvFcC4BYPU0qVMgCgtfRKtzdssD2LHHiHXqerf3lG
-zjEAnRMbprrIbqOeSX8cE9RfNlqcOt3S
-=iCS5
+iEYEAREIAAYFAlE4s/YACgkQvFcC4BYPU0qZaQCaAnTPk6X0grPqCgiryhinxbk1
+jWcAoMOVUHq1OlPOKZ3XHTqgxhRhGa5V
+=OUdW
 -----END PGP SIGNATURE-----
diff --git a/x11-libs/libva-intel-driver/files/libva-1.1.0.patch b/x11-libs/libva-intel-driver/files/libva-1.1.0.patch
deleted file mode 100644
index a152f006db60..000000000000
--- a/x11-libs/libva-intel-driver/files/libva-1.1.0.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Similar to 4178cd1cece5a7b2b7efe32318f6fa168a1f8bcd
-Ported to apply to 1.0.18: Fix build with libva-1.1.0
-
-Index: intel-driver-1.0.18/src/i965_drv_video.c
-===================================================================
---- intel-driver-1.0.18.orig/src/i965_drv_video.c
-+++ intel-driver-1.0.18/src/i965_drv_video.c
-@@ -2275,7 +2275,6 @@ i965_PutSurface(VADriverContextP ctx,
-                 unsigned int flags) /* de-interlacing flags */
- {
-     struct i965_driver_data *i965 = i965_driver_data(ctx); 
--    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-     struct i965_render_state *render_state = &i965->render_state;
-     struct dri_drawable *dri_drawable;
-     union dri_buffer *buffer;
-@@ -2288,7 +2287,11 @@ i965_PutSurface(VADriverContextP ctx,
-     int pp_flag = 0;
- 
-     /* Currently don't support DRI1 */
--    if (dri_state->driConnectedFlag != VA_DRI2)
-+#if VA_CHECK_VERSION(0,33,0)
-+    if (((struct drm_state *)ctx->drm_state)->auth_type != VA_DRI2)
-+#else
-+    if (((struct dri_state *)ctx->dri_state)->driConnectedFlag != VA_DRI2)
-+#endif
-         return VA_STATUS_ERROR_UNKNOWN;
- 
-     /* Some broken sources such as H.264 conformance case FM2_SVA_C
-Index: intel-driver-1.0.18/src/intel_driver.c
-===================================================================
---- intel-driver-1.0.18.orig/src/intel_driver.c
-+++ intel-driver-1.0.18/src/intel_driver.c
-@@ -50,15 +50,25 @@ Bool
- intel_driver_init(VADriverContextP ctx)
- {
-     struct intel_driver_data *intel = intel_driver_data(ctx);
--    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-     int has_exec2, has_bsd, has_blt;
- 
-+#if VA_CHECK_VERSION(0,33,0)
-+    struct drm_state *drm_state = (struct drm_state *)ctx->drm_state;
-+    assert(drm_state);
-+    assert(drm_state->auth_type == VA_DRI2 || 
-+           drm_state->auth_type == VA_DRI1);
-+
-+    intel->fd = drm_state->fd;
-+    intel->dri2Enabled = (drm_state->auth_type == VA_DRI2);
-+#else
-+    struct dri_state *dri_state = (struct dri_state *)ctx->dri_state;
-     assert(dri_state);
-     assert(dri_state->driConnectedFlag == VA_DRI2 || 
-            dri_state->driConnectedFlag == VA_DRI1);
- 
-     intel->fd = dri_state->fd;
-     intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2);
-+#endif
- 
-     if (!intel->dri2Enabled) {
-         return False;