[arch-commits] Commit in libva-intel-driver/repos (6 files)
Ionut Biru
ibiru at archlinux.org
Tue Oct 9 16:37:26 UTC 2012
Date: Tuesday, October 9, 2012 @ 12:37:25
Author: ibiru
Revision: 168383
archrelease: copy trunk to extra-i686, extra-x86_64
Added:
libva-intel-driver/repos/extra-i686/PKGBUILD
(from rev 168382, libva-intel-driver/trunk/PKGBUILD)
libva-intel-driver/repos/extra-i686/build-fix.patch
(from rev 168382, libva-intel-driver/trunk/build-fix.patch)
libva-intel-driver/repos/extra-x86_64/PKGBUILD
(from rev 168382, libva-intel-driver/trunk/PKGBUILD)
libva-intel-driver/repos/extra-x86_64/build-fix.patch
(from rev 168382, libva-intel-driver/trunk/build-fix.patch)
Deleted:
libva-intel-driver/repos/extra-i686/PKGBUILD
libva-intel-driver/repos/extra-x86_64/PKGBUILD
------------------------------+
extra-i686/PKGBUILD | 61 +++++++++++++++++++-----------------
extra-i686/build-fix.patch | 68 +++++++++++++++++++++++++++++++++++++++++
extra-x86_64/PKGBUILD | 61 +++++++++++++++++++-----------------
extra-x86_64/build-fix.patch | 68 +++++++++++++++++++++++++++++++++++++++++
4 files changed, 200 insertions(+), 58 deletions(-)
Deleted: extra-i686/PKGBUILD
===================================================================
--- extra-i686/PKGBUILD 2012-10-09 16:32:34 UTC (rev 168382)
+++ extra-i686/PKGBUILD 2012-10-09 16:37:25 UTC (rev 168383)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-
-pkgname=libva-driver-intel
-pkgver=1.0.18
-pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libva')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('d8c52f07148dfb2e0407549b90300bc1')
-
-build() {
- cd intel-driver-$pkgver
- ./autogen.sh
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd intel-driver-$pkgver
- make DESTDIR="$pkgdir" install
- install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
Copied: libva-intel-driver/repos/extra-i686/PKGBUILD (from rev 168382, libva-intel-driver/trunk/PKGBUILD)
===================================================================
--- extra-i686/PKGBUILD (rev 0)
+++ extra-i686/PKGBUILD 2012-10-09 16:37:25 UTC (rev 168383)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.0.18
+pkgrel=1
+pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('MIT')
+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')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../build-fix.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+# vim:set ts=2 sw=2 et:
Copied: libva-intel-driver/repos/extra-i686/build-fix.patch (from rev 168382, libva-intel-driver/trunk/build-fix.patch)
===================================================================
--- extra-i686/build-fix.patch (rev 0)
+++ extra-i686/build-fix.patch 2012-10-09 16:37:25 UTC (rev 168383)
@@ -0,0 +1,68 @@
+From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001
+From: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
+Date: Fri, 06 Apr 2012 15:24:36 +0000
+Subject: dri: cope with drm_state changes.
+
+Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
+---
+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
Deleted: extra-x86_64/PKGBUILD
===================================================================
--- extra-x86_64/PKGBUILD 2012-10-09 16:32:34 UTC (rev 168382)
+++ extra-x86_64/PKGBUILD 2012-10-09 16:37:25 UTC (rev 168383)
@@ -1,29 +0,0 @@
-# $Id$
-# Maintainer : Ionut Biru <ibiru at archlinux.org>
-
-pkgname=libva-driver-intel
-pkgver=1.0.18
-pkgrel=1
-pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
-arch=('i686' 'x86_64')
-url="http://freedesktop.org/wiki/Software/vaapi"
-license=('MIT')
-depends=('libva')
-options=('!libtool')
-source=(http://cgit.freedesktop.org/vaapi/intel-driver/snapshot/intel-driver-${pkgver}.tar.bz2)
-md5sums=('d8c52f07148dfb2e0407549b90300bc1')
-
-build() {
- cd intel-driver-$pkgver
- ./autogen.sh
- ./configure --prefix=/usr
- make
-}
-
-package() {
- cd intel-driver-$pkgver
- make DESTDIR="$pkgdir" install
- install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
-
-# vim:set ts=2 sw=2 et:
Copied: libva-intel-driver/repos/extra-x86_64/PKGBUILD (from rev 168382, libva-intel-driver/trunk/PKGBUILD)
===================================================================
--- extra-x86_64/PKGBUILD (rev 0)
+++ extra-x86_64/PKGBUILD 2012-10-09 16:37:25 UTC (rev 168383)
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer : Ionut Biru <ibiru at archlinux.org>
+
+pkgname=libva-intel-driver
+pkgver=1.0.18
+pkgrel=1
+pkgdesc="VA-API implementation for Intel G45 chipsets and Intel HD Graphics for Intel Core processor family."
+arch=('i686' 'x86_64')
+url="http://freedesktop.org/wiki/Software/vaapi"
+license=('MIT')
+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')
+
+build() {
+ cd $pkgname-$pkgver
+ patch -Np1 -i ../build-fix.patch
+ ./configure --prefix=/usr
+ make
+}
+
+package() {
+ cd $pkgname-$pkgver
+ make DESTDIR="$pkgdir" install
+ install -m644 -D COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
+}
+
+# vim:set ts=2 sw=2 et:
Copied: libva-intel-driver/repos/extra-x86_64/build-fix.patch (from rev 168382, libva-intel-driver/trunk/build-fix.patch)
===================================================================
--- extra-x86_64/build-fix.patch (rev 0)
+++ extra-x86_64/build-fix.patch 2012-10-09 16:37:25 UTC (rev 168383)
@@ -0,0 +1,68 @@
+From 73ccb0c88d53298befa6a896d2bb39a041169b36 Mon Sep 17 00:00:00 2001
+From: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
+Date: Fri, 06 Apr 2012 15:24:36 +0000
+Subject: dri: cope with drm_state changes.
+
+Signed-off-by: Gwenole Beauchesne <gwenole.beauchesne at intel.com>
+---
+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
More information about the arch-commits
mailing list