From abb073ca00a7b6b8cdf7ef6cb58e9da614aadc18 Mon Sep 17 00:00:00 2001 From: Stephan Raue Date: Thu, 15 Nov 2012 12:30:55 +0100 Subject: [PATCH] libva-driver-intel: update to libva-driver-intel-1.0.19 Signed-off-by: Stephan Raue --- packages/multimedia/libva-driver-intel/meta | 2 +- .../libva-driver-intel-1.0.18-drm_state.patch | 58 ------------------- 2 files changed, 1 insertion(+), 59 deletions(-) delete mode 100644 packages/multimedia/libva-driver-intel/patches/libva-driver-intel-1.0.18-drm_state.patch diff --git a/packages/multimedia/libva-driver-intel/meta b/packages/multimedia/libva-driver-intel/meta index abf9de4c4d..59fe22b461 100644 --- a/packages/multimedia/libva-driver-intel/meta +++ b/packages/multimedia/libva-driver-intel/meta @@ -19,7 +19,7 @@ ################################################################################ PKG_NAME="libva-driver-intel" -PKG_VERSION="1.0.18" +PKG_VERSION="1.0.19" PKG_REV="1" PKG_ARCH="i386 x86_64" PKG_LICENSE="GPL" diff --git a/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-1.0.18-drm_state.patch b/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-1.0.18-drm_state.patch deleted file mode 100644 index 58e842c8ac..0000000000 --- a/packages/multimedia/libva-driver-intel/patches/libva-driver-intel-1.0.18-drm_state.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff -Naur intel-driver-1.0.18-old/src/i965_drv_video.c intel-driver-1.0.18-new/src/i965_drv_video.c ---- intel-driver-1.0.18-old/src/i965_drv_video.c 2012-08-01 22:58:37.000000000 -0700 -+++ intel-driver-1.0.18-new/src/i965_drv_video.c 2012-10-10 14:34:35.000000000 -0700 -@@ -2275,7 +2275,7 @@ - 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 dri_state *dri_state = (struct dri_state *)ctx->drm_state; - struct i965_render_state *render_state = &i965->render_state; - struct dri_drawable *dri_drawable; - union dri_buffer *buffer; -@@ -2288,7 +2288,7 @@ - int pp_flag = 0; - - /* Currently don't support DRI1 */ -- if (dri_state->driConnectedFlag != VA_DRI2) -+ if (dri_state->base.auth_type != VA_DRM_AUTH_DRI2) - return VA_STATUS_ERROR_UNKNOWN; - - /* Some broken sources such as H.264 conformance case FM2_SVA_C -diff -Naur intel-driver-1.0.18-old/src/intel_driver.c intel-driver-1.0.18-new/src/intel_driver.c ---- intel-driver-1.0.18-old/src/intel_driver.c 2012-08-01 22:58:37.000000000 -0700 -+++ intel-driver-1.0.18-new/src/intel_driver.c 2012-10-10 14:34:35.000000000 -0700 -@@ -29,7 +29,7 @@ - - #include - --#include -+#include - - #include "intel_batchbuffer.h" - #include "intel_memman.h" -@@ -50,15 +50,17 @@ - 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; -+ struct drm_state * const drm_state = (struct drm_state *)ctx->drm_state; - int has_exec2, has_bsd, has_blt; - -- 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); -+ assert(drm_state); -+ assert(drm_state->auth_type == VA_DRM_AUTH_DRI1 || -+ drm_state->auth_type == VA_DRM_AUTH_DRI2 || -+ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); -+ -+ intel->fd = drm_state->fd; -+ intel->dri2Enabled = (drm_state->auth_type == VA_DRM_AUTH_DRI2 || -+ drm_state->auth_type == VA_DRM_AUTH_CUSTOM); - - if (!intel->dri2Enabled) { - return False;