Date: Friday, November 9, 2012 @ 14:57:33 Author: ibiru Revision: 170693
update to 1.0.19 Modified: libva-intel-driver/trunk/PKGBUILD Deleted: libva-intel-driver/trunk/build-fix.patch -----------------+ PKGBUILD | 11 +++----- build-fix.patch | 68 ------------------------------------------------------ 2 files changed, 4 insertions(+), 75 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2012-11-09 19:50:58 UTC (rev 170692) +++ PKGBUILD 2012-11-09 19:57:33 UTC (rev 170693) @@ -2,7 +2,7 @@ # Maintainer : Ionut Biru <[email protected]> pkgname=libva-intel-driver -pkgver=1.0.18 +pkgver=1.0.19 pkgrel=1 pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family." arch=('i686' 'x86_64') @@ -11,15 +11,12 @@ depends=('libva') options=('!libtool') replaces=('libva-driver-intel') -source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2 - build-fix.patch) -sha1sums=('2cbf6f8c9f59516cceb5c4245576d53d26612256' - '447987d81800b2a5c434e6b6b19b6f8ec9c675d1') +source=(http://www.freedesktop.org/software/vaapi/releases/$pkgname/$pkgname-$pkgver.tar.bz2) +sha1sums=('9b1c92ca2b59b3b150fd45cb01775e0c114a41a7') build() { cd $pkgname-$pkgver - patch -Np1 -i ../build-fix.patch - ./configure --prefix=/usr + ./autogen.sh --prefix=/usr make } Deleted: build-fix.patch =================================================================== --- build-fix.patch 2012-11-09 19:50:58 UTC (rev 170692) +++ build-fix.patch 2012-11-09 19:57:33 UTC (rev 170693) @@ -1,68 +0,0 @@ -From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001 -From: Gwenole Beauchesne <[email protected]> -Date: Fri, 06 Apr 2012 15:24:36 +0000 -Subject: dri: cope with drm_state changes. - -Signed-off-by: Gwenole Beauchesne <[email protected]> ---- -diff --git a/src/i965_drv_video.c b/src/i965_drv_video.c -index 3bea253..20fed99 100644 ---- a/src/i965_drv_video.c -+++ b/src/i965_drv_video.c -@@ -2380,7 +2380,7 @@ 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 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; -@@ -2393,7 +2393,7 @@ i965_PutSurface(VADriverContextP ctx, - 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 --git a/src/intel_driver.c b/src/intel_driver.c -index 4e6df81..b34d9a1 100644 ---- a/src/intel_driver.c -+++ b/src/intel_driver.c -@@ -29,7 +29,7 @@ - - #include <assert.h> - --#include <va/va_dricommon.h> -+#include <va/va_drmcommon.h> - - #include "intel_batchbuffer.h" - #include "intel_memman.h" -@@ -50,15 +50,17 @@ 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; -+ 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); -+ 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 = dri_state->fd; -- intel->dri2Enabled = (dri_state->driConnectedFlag == VA_DRI2); -+ 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; --- -cgit v0.9.0.2-2-gbebe
